提交 354fe565 编写于 作者: ibizdev's avatar ibizdev

ibiz4j 发布系统代码 [ibiz-task,任务调度]

上级 e68798c1
......@@ -100,9 +100,8 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
@Transactional
public JobsInfo get(String key) {
JobsInfo et = getById(key);
if(et == null){
et = new JobsInfo();
et.setId(key);
if (et == null) {
throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
}
else {
}
......
......@@ -100,9 +100,8 @@ public class JobsLockServiceImpl extends ServiceImpl<JobsLockMapper, JobsLock> i
@Transactional
public JobsLock get(String key) {
JobsLock et = getById(key);
if(et == null){
et = new JobsLock();
et.setId(key);
if (et == null) {
throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
}
else {
}
......
......@@ -100,9 +100,8 @@ public class JobsLogServiceImpl extends ServiceImpl<JobsLogMapper, JobsLog> impl
@Transactional
public JobsLog get(String key) {
JobsLog et = getById(key);
if(et == null){
et = new JobsLog();
et.setId(key);
if (et == null) {
throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
}
else {
}
......
......@@ -100,9 +100,8 @@ public class JobsRegistryServiceImpl extends ServiceImpl<JobsRegistryMapper, Job
@Transactional
public JobsRegistry get(String key) {
JobsRegistry et = getById(key);
if(et == null){
et = new JobsRegistry();
et.setId(key);
if (et == null) {
throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
}
else {
}
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.ibizlab.core.task.mapper.JobsInfoMapper">
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.ibizlab.core.task.mapper.JobsLockMapper">
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.ibizlab.core.task.mapper.JobsLogMapper">
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
......
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.ibizlab.core.task.mapper.JobsRegistryMapper">
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
......
......@@ -12,4 +12,3 @@ public interface JobsInfoMapping extends MappingBase<JobsInfoDTO, JobsInfo> {
}
......@@ -12,4 +12,3 @@ public interface JobsLockMapping extends MappingBase<JobsLockDTO, JobsLock> {
}
......@@ -12,4 +12,3 @@ public interface JobsLogMapping extends MappingBase<JobsLogDTO, JobsLog> {
}
......@@ -12,4 +12,3 @@ public interface JobsRegistryMapping extends MappingBase<JobsRegistryDTO, JobsRe
}
......@@ -24,4 +24,5 @@ public interface IBZWFFeignClient
JSONObject wfstart(@PathVariable("system") String system, @PathVariable("appname") String appname,
@PathVariable("entity") String entity,
@PathVariable("businessKey") String businessKey, @RequestBody JSONObject instance);
}
......@@ -2,6 +2,7 @@ package cn.ibizlab.util.domain;
import lombok.Data;
import org.flowable.bpmn.model.Process;
import org.springframework.core.io.Resource;
import org.kie.api.runtime.KieContainer;
import java.io.File;
import java.io.Serializable;
......@@ -14,6 +15,6 @@ public class DELogic implements Serializable {
Process process;
KieContainer container;
List<DELogic> refLogic;
List<File> refRuleFiles;
List<Resource> refRuleFiles;
String md5;
}
......@@ -67,6 +67,7 @@ public class SearchContextBase implements ISearchContext{
* 工作流流程标识
*/
public String processDefinitionKey;
/**
* 获取工作流步骤标识
*/
......
......@@ -52,6 +52,11 @@ public class AuthenticationUser implements UserDetails
* 租户
*/
private String srfdcid;
/**
* 系统标识
*/
private String srfsystemid;
/**
/**
* 动态实例标识
*/
......@@ -254,6 +259,8 @@ public class AuthenticationUser implements UserDetails
if(this.sessionParams==null)
{
sessionParams = getUserSessionParam();
sessionParams.put("srfsystemid",this.getSrfsystemid());
sessionParams.put("srfdynainstid",this.getSrfdynainstid());
sessionParams.put("srfpersonid", this.getUserid());
sessionParams.put("srfpersonname", this.getPersonname());
sessionParams.put("srforgsectorid", this.getMdeptid());
......
......@@ -3,7 +3,6 @@ package cn.ibizlab.util.security;
import io.jsonwebtoken.ExpiredJwtException;
import lombok.extern.slf4j.Slf4j;
import cn.ibizlab.util.service.AuthenticationUserService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
......@@ -22,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.*;
import org.springframework.util.StringUtils;
@Slf4j
@Component
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册