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

ibiz4j 发布系统代码 [ibz-disk,存储]

上级 1f5554b4
...@@ -102,9 +102,8 @@ public class MetaDynamicModelServiceImpl extends ServiceImpl<MetaDynamicModelMap ...@@ -102,9 +102,8 @@ public class MetaDynamicModelServiceImpl extends ServiceImpl<MetaDynamicModelMap
@Transactional @Transactional
public MetaDynamicModel get(String key) { public MetaDynamicModel get(String key) {
MetaDynamicModel et = getById(key); MetaDynamicModel et = getById(key);
if(et == null){ if (et == null) {
et = new MetaDynamicModel(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
et.setConfigid(key);
} }
else { else {
} }
......
...@@ -100,9 +100,8 @@ public class SDFileServiceImpl extends ServiceImpl<SDFileMapper, SDFile> impleme ...@@ -100,9 +100,8 @@ public class SDFileServiceImpl extends ServiceImpl<SDFileMapper, SDFile> impleme
@Transactional @Transactional
public SDFile get(String key) { public SDFile get(String key) {
SDFile et = getById(key); SDFile et = getById(key);
if(et == null){ if (et == null) {
et = new SDFile(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), key);
et.setId(key);
} }
else { else {
} }
......
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.ibizlab.core.disk.mapper.MetaDynamicModelMapper"> <mapper namespace="cn.ibizlab.core.disk.mapper.MetaDynamicModelMapper">
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
......
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="cn.ibizlab.core.disk.mapper.SDFileMapper"> <mapper namespace="cn.ibizlab.core.disk.mapper.SDFileMapper">
<!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性--> <!--该方法用于重写mybatis中selectById方法,以实现查询逻辑属性-->
......
...@@ -12,4 +12,3 @@ public interface MetaDynamicModelMapping extends MappingBase<MetaDynamicModelDTO ...@@ -12,4 +12,3 @@ public interface MetaDynamicModelMapping extends MappingBase<MetaDynamicModelDTO
} }
...@@ -12,4 +12,3 @@ public interface SDFileMapping extends MappingBase<SDFileDTO, SDFile> { ...@@ -12,4 +12,3 @@ public interface SDFileMapping extends MappingBase<SDFileDTO, SDFile> {
} }
...@@ -2,6 +2,7 @@ package cn.ibizlab.util.domain; ...@@ -2,6 +2,7 @@ package cn.ibizlab.util.domain;
import lombok.Data; import lombok.Data;
import org.flowable.bpmn.model.Process; import org.flowable.bpmn.model.Process;
import org.springframework.core.io.Resource;
import org.kie.api.runtime.KieContainer; import org.kie.api.runtime.KieContainer;
import java.io.File; import java.io.File;
import java.io.Serializable; import java.io.Serializable;
...@@ -14,6 +15,6 @@ public class DELogic implements Serializable { ...@@ -14,6 +15,6 @@ public class DELogic implements Serializable {
Process process; Process process;
KieContainer container; KieContainer container;
List<DELogic> refLogic; List<DELogic> refLogic;
List<File> refRuleFiles; List<Resource> refRuleFiles;
String md5; String md5;
} }
...@@ -67,6 +67,7 @@ public class SearchContextBase implements ISearchContext{ ...@@ -67,6 +67,7 @@ public class SearchContextBase implements ISearchContext{
* 工作流流程标识 * 工作流流程标识
*/ */
public String processDefinitionKey; public String processDefinitionKey;
/** /**
* 获取工作流步骤标识 * 获取工作流步骤标识
*/ */
......
...@@ -52,6 +52,11 @@ public class AuthenticationUser implements UserDetails ...@@ -52,6 +52,11 @@ public class AuthenticationUser implements UserDetails
* 租户 * 租户
*/ */
private String srfdcid; private String srfdcid;
/**
* 系统标识
*/
private String srfsystemid;
/**
/** /**
* 动态实例标识 * 动态实例标识
*/ */
...@@ -254,6 +259,8 @@ public class AuthenticationUser implements UserDetails ...@@ -254,6 +259,8 @@ public class AuthenticationUser implements UserDetails
if(this.sessionParams==null) if(this.sessionParams==null)
{ {
sessionParams = getUserSessionParam(); sessionParams = getUserSessionParam();
sessionParams.put("srfsystemid",this.getSrfsystemid());
sessionParams.put("srfdynainstid",this.getSrfdynainstid());
sessionParams.put("srfpersonid", this.getUserid()); sessionParams.put("srfpersonid", this.getUserid());
sessionParams.put("srfpersonname", this.getPersonname()); sessionParams.put("srfpersonname", this.getPersonname());
sessionParams.put("srforgsectorid", this.getMdeptid()); sessionParams.put("srforgsectorid", this.getMdeptid());
......
...@@ -3,7 +3,6 @@ package cn.ibizlab.util.security; ...@@ -3,7 +3,6 @@ package cn.ibizlab.util.security;
import io.jsonwebtoken.ExpiredJwtException; import io.jsonwebtoken.ExpiredJwtException;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import cn.ibizlab.util.service.AuthenticationUserService; import cn.ibizlab.util.service.AuthenticationUserService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
...@@ -22,6 +21,7 @@ import javax.servlet.http.HttpServletRequest; ...@@ -22,6 +21,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import org.springframework.util.StringUtils;
@Slf4j @Slf4j
@Component @Component
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册