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

ibiz4j 发布系统代码 [ibiz-rt,ibizlab-runtime]

上级 cce8ad34
...@@ -88,8 +88,7 @@ public class DictCatalogServiceImpl implements IDictCatalogService { ...@@ -88,8 +88,7 @@ public class DictCatalogServiceImpl implements IDictCatalogService {
public DictCatalog get(String id) { public DictCatalog get(String id) {
DictCatalog et=dictCatalogFeignClient.get(id); DictCatalog et=dictCatalogFeignClient.get(id);
if(et==null){ if(et==null){
et=new DictCatalog(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class DictOptionServiceImpl implements IDictOptionService { ...@@ -88,8 +88,7 @@ public class DictOptionServiceImpl implements IDictOptionService {
public DictOption get(String value_key) { public DictOption get(String value_key) {
DictOption et=dictOptionFeignClient.get(value_key); DictOption et=dictOptionFeignClient.get(value_key);
if(et==null){ if(et==null){
et=new DictOption(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), value_key);
et.setValueKey(value_key);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class MetaDynamicModelServiceImpl implements IMetaDynamicModelService { ...@@ -88,8 +88,7 @@ public class MetaDynamicModelServiceImpl implements IMetaDynamicModelService {
public MetaDynamicModel get(String configid) { public MetaDynamicModel get(String configid) {
MetaDynamicModel et=metaDynamicModelFeignClient.get(configid); MetaDynamicModel et=metaDynamicModelFeignClient.get(configid);
if(et==null){ if(et==null){
et=new MetaDynamicModel(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), configid);
et.setConfigid(configid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SDFileServiceImpl implements ISDFileService { ...@@ -88,8 +88,7 @@ public class SDFileServiceImpl implements ISDFileService {
public SDFile get(String id) { public SDFile get(String id) {
SDFile et=sDFileFeignClient.get(id); SDFile et=sDFileFeignClient.get(id);
if(et==null){ if(et==null){
et=new SDFile(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class MsgBodyServiceImpl implements IMsgBodyService { ...@@ -88,8 +88,7 @@ public class MsgBodyServiceImpl implements IMsgBodyService {
public MsgBody get(String msg_id) { public MsgBody get(String msg_id) {
MsgBody et=msgBodyFeignClient.get(msg_id); MsgBody et=msgBodyFeignClient.get(msg_id);
if(et==null){ if(et==null){
et=new MsgBody(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), msg_id);
et.setMsgId(msg_id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class MsgOpenAccessServiceImpl implements IMsgOpenAccessService { ...@@ -88,8 +88,7 @@ public class MsgOpenAccessServiceImpl implements IMsgOpenAccessService {
public MsgOpenAccess get(String id) { public MsgOpenAccess get(String id) {
MsgOpenAccess et=msgOpenAccessFeignClient.get(id); MsgOpenAccess et=msgOpenAccessFeignClient.get(id);
if(et==null){ if(et==null){
et=new MsgOpenAccess(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class MsgTemplateServiceImpl implements IMsgTemplateService { ...@@ -88,8 +88,7 @@ public class MsgTemplateServiceImpl implements IMsgTemplateService {
public MsgTemplate get(String tid) { public MsgTemplate get(String tid) {
MsgTemplate et=msgTemplateFeignClient.get(tid); MsgTemplate et=msgTemplateFeignClient.get(tid);
if(et==null){ if(et==null){
et=new MsgTemplate(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), tid);
et.setTid(tid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class MsgUserAccountServiceImpl implements IMsgUserAccountService { ...@@ -88,8 +88,7 @@ public class MsgUserAccountServiceImpl implements IMsgUserAccountService {
public MsgUserAccount get(String id) { public MsgUserAccount get(String id) {
MsgUserAccount et=msgUserAccountFeignClient.get(id); MsgUserAccount et=msgUserAccountFeignClient.get(id);
if(et==null){ if(et==null){
et=new MsgUserAccount(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysDepartmentServiceImpl implements ISysDepartmentService { ...@@ -88,8 +88,7 @@ public class SysDepartmentServiceImpl implements ISysDepartmentService {
public SysDepartment get(String deptid) { public SysDepartment get(String deptid) {
SysDepartment et=sysDepartmentFeignClient.get(deptid); SysDepartment et=sysDepartmentFeignClient.get(deptid);
if(et==null){ if(et==null){
et=new SysDepartment(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), deptid);
et.setDeptid(deptid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysDeptMemberServiceImpl implements ISysDeptMemberService { ...@@ -88,8 +88,7 @@ public class SysDeptMemberServiceImpl implements ISysDeptMemberService {
public SysDeptMember get(String memberid) { public SysDeptMember get(String memberid) {
SysDeptMember et=sysDeptMemberFeignClient.get(memberid); SysDeptMember et=sysDeptMemberFeignClient.get(memberid);
if(et==null){ if(et==null){
et=new SysDeptMember(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), memberid);
et.setMemberid(memberid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysEmployeeServiceImpl implements ISysEmployeeService { ...@@ -88,8 +88,7 @@ public class SysEmployeeServiceImpl implements ISysEmployeeService {
public SysEmployee get(String userid) { public SysEmployee get(String userid) {
SysEmployee et=sysEmployeeFeignClient.get(userid); SysEmployee et=sysEmployeeFeignClient.get(userid);
if(et==null){ if(et==null){
et=new SysEmployee(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), userid);
et.setUserid(userid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysOrganizationServiceImpl implements ISysOrganizationService { ...@@ -88,8 +88,7 @@ public class SysOrganizationServiceImpl implements ISysOrganizationService {
public SysOrganization get(String orgid) { public SysOrganization get(String orgid) {
SysOrganization et=sysOrganizationFeignClient.get(orgid); SysOrganization et=sysOrganizationFeignClient.get(orgid);
if(et==null){ if(et==null){
et=new SysOrganization(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), orgid);
et.setOrgid(orgid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysPostServiceImpl implements ISysPostService { ...@@ -88,8 +88,7 @@ public class SysPostServiceImpl implements ISysPostService {
public SysPost get(String postid) { public SysPost get(String postid) {
SysPost et=sysPostFeignClient.get(postid); SysPost et=sysPostFeignClient.get(postid);
if(et==null){ if(et==null){
et=new SysPost(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), postid);
et.setPostid(postid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysTeamMemberServiceImpl implements ISysTeamMemberService { ...@@ -88,8 +88,7 @@ public class SysTeamMemberServiceImpl implements ISysTeamMemberService {
public SysTeamMember get(String teammemberid) { public SysTeamMember get(String teammemberid) {
SysTeamMember et=sysTeamMemberFeignClient.get(teammemberid); SysTeamMember et=sysTeamMemberFeignClient.get(teammemberid);
if(et==null){ if(et==null){
et=new SysTeamMember(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), teammemberid);
et.setTeammemberid(teammemberid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysTeamServiceImpl implements ISysTeamService { ...@@ -88,8 +88,7 @@ public class SysTeamServiceImpl implements ISysTeamService {
public SysTeam get(String teamid) { public SysTeam get(String teamid) {
SysTeam et=sysTeamFeignClient.get(teamid); SysTeam et=sysTeamFeignClient.get(teamid);
if(et==null){ if(et==null){
et=new SysTeam(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), teamid);
et.setTeamid(teamid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class PayOpenAccessServiceImpl implements IPayOpenAccessService { ...@@ -88,8 +88,7 @@ public class PayOpenAccessServiceImpl implements IPayOpenAccessService {
public PayOpenAccess get(String id) { public PayOpenAccess get(String id) {
PayOpenAccess et=payOpenAccessFeignClient.get(id); PayOpenAccess et=payOpenAccessFeignClient.get(id);
if(et==null){ if(et==null){
et=new PayOpenAccess(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class PayTradeServiceImpl implements IPayTradeService { ...@@ -88,8 +88,7 @@ public class PayTradeServiceImpl implements IPayTradeService {
public PayTrade get(String trade_id) { public PayTrade get(String trade_id) {
PayTrade et=payTradeFeignClient.get(trade_id); PayTrade et=payTradeFeignClient.get(trade_id);
if(et==null){ if(et==null){
et=new PayTrade(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), trade_id);
et.setTradeId(trade_id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class JobsInfoServiceImpl implements IJobsInfoService { ...@@ -88,8 +88,7 @@ public class JobsInfoServiceImpl implements IJobsInfoService {
public JobsInfo get(String id) { public JobsInfo get(String id) {
JobsInfo et=jobsInfoFeignClient.get(id); JobsInfo et=jobsInfoFeignClient.get(id);
if(et==null){ if(et==null){
et=new JobsInfo(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class JobsLockServiceImpl implements IJobsLockService { ...@@ -88,8 +88,7 @@ public class JobsLockServiceImpl implements IJobsLockService {
public JobsLock get(String id) { public JobsLock get(String id) {
JobsLock et=jobsLockFeignClient.get(id); JobsLock et=jobsLockFeignClient.get(id);
if(et==null){ if(et==null){
et=new JobsLock(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class JobsLogServiceImpl implements IJobsLogService { ...@@ -88,8 +88,7 @@ public class JobsLogServiceImpl implements IJobsLogService {
public JobsLog get(String id) { public JobsLog get(String id) {
JobsLog et=jobsLogFeignClient.get(id); JobsLog et=jobsLogFeignClient.get(id);
if(et==null){ if(et==null){
et=new JobsLog(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class JobsRegistryServiceImpl implements IJobsRegistryService { ...@@ -88,8 +88,7 @@ public class JobsRegistryServiceImpl implements IJobsRegistryService {
public JobsRegistry get(String id) { public JobsRegistry get(String id) {
JobsRegistry et=jobsRegistryFeignClient.get(id); JobsRegistry et=jobsRegistryFeignClient.get(id);
if(et==null){ if(et==null){
et=new JobsRegistry(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysAppServiceImpl implements ISysAppService { ...@@ -88,8 +88,7 @@ public class SysAppServiceImpl implements ISysAppService {
public SysApp get(String id) { public SysApp get(String id) {
SysApp et=sysAppFeignClient.get(id); SysApp et=sysAppFeignClient.get(id);
if(et==null){ if(et==null){
et=new SysApp(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysAuthLogServiceImpl implements ISysAuthLogService { ...@@ -88,8 +88,7 @@ public class SysAuthLogServiceImpl implements ISysAuthLogService {
public SysAuthLog get(String logid) { public SysAuthLog get(String logid) {
SysAuthLog et=sysAuthLogFeignClient.get(logid); SysAuthLog et=sysAuthLogFeignClient.get(logid);
if(et==null){ if(et==null){
et=new SysAuthLog(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), logid);
et.setLogid(logid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysOpenAccessServiceImpl implements ISysOpenAccessService { ...@@ -88,8 +88,7 @@ public class SysOpenAccessServiceImpl implements ISysOpenAccessService {
public SysOpenAccess get(String id) { public SysOpenAccess get(String id) {
SysOpenAccess et=sysOpenAccessFeignClient.get(id); SysOpenAccess et=sysOpenAccessFeignClient.get(id);
if(et==null){ if(et==null){
et=new SysOpenAccess(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysPSSystemServiceImpl implements ISysPSSystemService { ...@@ -88,8 +88,7 @@ public class SysPSSystemServiceImpl implements ISysPSSystemService {
public SysPSSystem get(String pssystemid) { public SysPSSystem get(String pssystemid) {
SysPSSystem et=sysPSSystemFeignClient.get(pssystemid); SysPSSystem et=sysPSSystemFeignClient.get(pssystemid);
if(et==null){ if(et==null){
et=new SysPSSystem(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), pssystemid);
et.setPssystemid(pssystemid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService { ...@@ -88,8 +88,7 @@ public class SysPermissionServiceImpl implements ISysPermissionService {
public SysPermission get(String permissionid) { public SysPermission get(String permissionid) {
SysPermission et=sysPermissionFeignClient.get(permissionid); SysPermission et=sysPermissionFeignClient.get(permissionid);
if(et==null){ if(et==null){
et=new SysPermission(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), permissionid);
et.setPermissionid(permissionid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysRolePermissionServiceImpl implements ISysRolePermissionService { ...@@ -88,8 +88,7 @@ public class SysRolePermissionServiceImpl implements ISysRolePermissionService {
public SysRolePermission get(String rolepermissionid) { public SysRolePermission get(String rolepermissionid) {
SysRolePermission et=sysRolePermissionFeignClient.get(rolepermissionid); SysRolePermission et=sysRolePermissionFeignClient.get(rolepermissionid);
if(et==null){ if(et==null){
et=new SysRolePermission(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), rolepermissionid);
et.setRolepermissionid(rolepermissionid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysRoleServiceImpl implements ISysRoleService { ...@@ -88,8 +88,7 @@ public class SysRoleServiceImpl implements ISysRoleService {
public SysRole get(String roleid) { public SysRole get(String roleid) {
SysRole et=sysRoleFeignClient.get(roleid); SysRole et=sysRoleFeignClient.get(roleid);
if(et==null){ if(et==null){
et=new SysRole(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), roleid);
et.setRoleid(roleid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysUserAuthServiceImpl implements ISysUserAuthService { ...@@ -88,8 +88,7 @@ public class SysUserAuthServiceImpl implements ISysUserAuthService {
public SysUserAuth get(String id) { public SysUserAuth get(String id) {
SysUserAuth et=sysUserAuthFeignClient.get(id); SysUserAuth et=sysUserAuthFeignClient.get(id);
if(et==null){ if(et==null){
et=new SysUserAuth(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysUserRoleServiceImpl implements ISysUserRoleService { ...@@ -88,8 +88,7 @@ public class SysUserRoleServiceImpl implements ISysUserRoleService {
public SysUserRole get(String userroleid) { public SysUserRole get(String userroleid) {
SysUserRole et=sysUserRoleFeignClient.get(userroleid); SysUserRole et=sysUserRoleFeignClient.get(userroleid);
if(et==null){ if(et==null){
et=new SysUserRole(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), userroleid);
et.setUserroleid(userroleid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class SysUserServiceImpl implements ISysUserService { ...@@ -88,8 +88,7 @@ public class SysUserServiceImpl implements ISysUserService {
public SysUser get(String userid) { public SysUser get(String userid) {
SysUser et=sysUserFeignClient.get(userid); SysUser et=sysUserFeignClient.get(userid);
if(et==null){ if(et==null){
et=new SysUser(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), userid);
et.setUserid(userid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class WFGroupServiceImpl implements IWFGroupService { ...@@ -88,8 +88,7 @@ public class WFGroupServiceImpl implements IWFGroupService {
public WFGroup get(String id) { public WFGroup get(String id) {
WFGroup et=wFGroupFeignClient.get(id); WFGroup et=wFGroupFeignClient.get(id);
if(et==null){ if(et==null){
et=new WFGroup(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class WFMemberServiceImpl implements IWFMemberService { ...@@ -88,8 +88,7 @@ public class WFMemberServiceImpl implements IWFMemberService {
public WFMember get(String memberid) { public WFMember get(String memberid) {
WFMember et=wFMemberFeignClient.get(memberid); WFMember et=wFMemberFeignClient.get(memberid);
if(et==null){ if(et==null){
et=new WFMember(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), memberid);
et.setMemberid(memberid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class WFProcessDefinitionServiceImpl implements IWFProcessDefinitionServi ...@@ -88,8 +88,7 @@ public class WFProcessDefinitionServiceImpl implements IWFProcessDefinitionServi
public WFProcessDefinition get(String definitionkey) { public WFProcessDefinition get(String definitionkey) {
WFProcessDefinition et=wFProcessDefinitionFeignClient.get(definitionkey); WFProcessDefinition et=wFProcessDefinitionFeignClient.get(definitionkey);
if(et==null){ if(et==null){
et=new WFProcessDefinition(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), definitionkey);
et.setDefinitionkey(definitionkey);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class WFProcessInstanceServiceImpl implements IWFProcessInstanceService { ...@@ -88,8 +88,7 @@ public class WFProcessInstanceServiceImpl implements IWFProcessInstanceService {
public WFProcessInstance get(String id) { public WFProcessInstance get(String id) {
WFProcessInstance et=wFProcessInstanceFeignClient.get(id); WFProcessInstance et=wFProcessInstanceFeignClient.get(id);
if(et==null){ if(et==null){
et=new WFProcessInstance(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class WFProcessNodeServiceImpl implements IWFProcessNodeService { ...@@ -88,8 +88,7 @@ public class WFProcessNodeServiceImpl implements IWFProcessNodeService {
public WFProcessNode get(String usertaskid) { public WFProcessNode get(String usertaskid) {
WFProcessNode et=wFProcessNodeFeignClient.get(usertaskid); WFProcessNode et=wFProcessNodeFeignClient.get(usertaskid);
if(et==null){ if(et==null){
et=new WFProcessNode(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), usertaskid);
et.setUsertaskid(usertaskid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class WFREModelServiceImpl implements IWFREModelService { ...@@ -88,8 +88,7 @@ public class WFREModelServiceImpl implements IWFREModelService {
public WFREModel get(String id) { public WFREModel get(String id) {
WFREModel et=wFREModelFeignClient.get(id); WFREModel et=wFREModelFeignClient.get(id);
if(et==null){ if(et==null){
et=new WFREModel(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class WFSystemServiceImpl implements IWFSystemService { ...@@ -88,8 +88,7 @@ public class WFSystemServiceImpl implements IWFSystemService {
public WFSystem get(String pssystemid) { public WFSystem get(String pssystemid) {
WFSystem et=wFSystemFeignClient.get(pssystemid); WFSystem et=wFSystemFeignClient.get(pssystemid);
if(et==null){ if(et==null){
et=new WFSystem(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), pssystemid);
et.setPssystemid(pssystemid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class WFTaskServiceImpl implements IWFTaskService { ...@@ -88,8 +88,7 @@ public class WFTaskServiceImpl implements IWFTaskService {
public WFTask get(String id) { public WFTask get(String id) {
WFTask et=wFTaskFeignClient.get(id); WFTask et=wFTaskFeignClient.get(id);
if(et==null){ if(et==null){
et=new WFTask(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class WFTaskWayServiceImpl implements IWFTaskWayService { ...@@ -88,8 +88,7 @@ public class WFTaskWayServiceImpl implements IWFTaskWayService {
public WFTaskWay get(String sequenceflowid) { public WFTaskWay get(String sequenceflowid) {
WFTaskWay et=wFTaskWayFeignClient.get(sequenceflowid); WFTaskWay et=wFTaskWayFeignClient.get(sequenceflowid);
if(et==null){ if(et==null){
et=new WFTaskWay(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), sequenceflowid);
et.setSequenceflowid(sequenceflowid);
} }
else{ else{
} }
......
...@@ -88,8 +88,7 @@ public class WFUserServiceImpl implements IWFUserService { ...@@ -88,8 +88,7 @@ public class WFUserServiceImpl implements IWFUserService {
public WFUser get(String id) { public WFUser get(String id) {
WFUser et=wFUserFeignClient.get(id); WFUser et=wFUserFeignClient.get(id);
if(et==null){ if(et==null){
et=new WFUser(); throw new BadRequestAlertException("数据不存在", this.getClass().getSimpleName(), id);
et.setId(id);
} }
else{ else{
} }
......
...@@ -12,4 +12,3 @@ public interface DictCatalogMapping extends MappingBase<DictCatalogDTO, DictCata ...@@ -12,4 +12,3 @@ public interface DictCatalogMapping extends MappingBase<DictCatalogDTO, DictCata
} }
...@@ -12,4 +12,3 @@ public interface DictOptionMapping extends MappingBase<DictOptionDTO, DictOption ...@@ -12,4 +12,3 @@ public interface DictOptionMapping extends MappingBase<DictOptionDTO, DictOption
} }
...@@ -12,4 +12,3 @@ public interface JobsInfoMapping extends MappingBase<JobsInfoDTO, JobsInfo> { ...@@ -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 JobsLockMapping extends MappingBase<JobsLockDTO, JobsLock> {
} }
...@@ -12,4 +12,3 @@ public interface JobsLogMapping extends MappingBase<JobsLogDTO, JobsLog> { ...@@ -12,4 +12,3 @@ public interface JobsLogMapping extends MappingBase<JobsLogDTO, JobsLog> {
} }
...@@ -12,4 +12,3 @@ public interface JobsRegistryMapping extends MappingBase<JobsRegistryDTO, JobsRe ...@@ -12,4 +12,3 @@ public interface JobsRegistryMapping extends MappingBase<JobsRegistryDTO, JobsRe
} }
...@@ -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 MsgBodyMapping extends MappingBase<MsgBodyDTO, MsgBody> { ...@@ -12,4 +12,3 @@ public interface MsgBodyMapping extends MappingBase<MsgBodyDTO, MsgBody> {
} }
...@@ -12,4 +12,3 @@ public interface MsgOpenAccessMapping extends MappingBase<MsgOpenAccessDTO, MsgO ...@@ -12,4 +12,3 @@ public interface MsgOpenAccessMapping extends MappingBase<MsgOpenAccessDTO, MsgO
} }
...@@ -12,4 +12,3 @@ public interface MsgTemplateMapping extends MappingBase<MsgTemplateDTO, MsgTempl ...@@ -12,4 +12,3 @@ public interface MsgTemplateMapping extends MappingBase<MsgTemplateDTO, MsgTempl
} }
...@@ -12,4 +12,3 @@ public interface MsgUserAccountMapping extends MappingBase<MsgUserAccountDTO, Ms ...@@ -12,4 +12,3 @@ public interface MsgUserAccountMapping extends MappingBase<MsgUserAccountDTO, Ms
} }
...@@ -12,4 +12,3 @@ public interface PayOpenAccessMapping extends MappingBase<PayOpenAccessDTO, PayO ...@@ -12,4 +12,3 @@ public interface PayOpenAccessMapping extends MappingBase<PayOpenAccessDTO, PayO
} }
...@@ -12,4 +12,3 @@ public interface PayTradeMapping extends MappingBase<PayTradeDTO, PayTrade> { ...@@ -12,4 +12,3 @@ public interface PayTradeMapping extends MappingBase<PayTradeDTO, PayTrade> {
} }
...@@ -12,4 +12,3 @@ public interface SysAppMapping extends MappingBase<SysAppDTO, SysApp> { ...@@ -12,4 +12,3 @@ public interface SysAppMapping extends MappingBase<SysAppDTO, SysApp> {
} }
...@@ -12,4 +12,3 @@ public interface SysAuthLogMapping extends MappingBase<SysAuthLogDTO, SysAuthLog ...@@ -12,4 +12,3 @@ public interface SysAuthLogMapping extends MappingBase<SysAuthLogDTO, SysAuthLog
} }
...@@ -12,4 +12,3 @@ public interface SysDepartmentMapping extends MappingBase<SysDepartmentDTO, SysD ...@@ -12,4 +12,3 @@ public interface SysDepartmentMapping extends MappingBase<SysDepartmentDTO, SysD
} }
...@@ -12,4 +12,3 @@ public interface SysDeptMemberMapping extends MappingBase<SysDeptMemberDTO, SysD ...@@ -12,4 +12,3 @@ public interface SysDeptMemberMapping extends MappingBase<SysDeptMemberDTO, SysD
} }
...@@ -12,4 +12,3 @@ public interface SysEmployeeMapping extends MappingBase<SysEmployeeDTO, SysEmplo ...@@ -12,4 +12,3 @@ public interface SysEmployeeMapping extends MappingBase<SysEmployeeDTO, SysEmplo
} }
...@@ -12,4 +12,3 @@ public interface SysOpenAccessMapping extends MappingBase<SysOpenAccessDTO, SysO ...@@ -12,4 +12,3 @@ public interface SysOpenAccessMapping extends MappingBase<SysOpenAccessDTO, SysO
} }
...@@ -12,4 +12,3 @@ public interface SysOrganizationMapping extends MappingBase<SysOrganizationDTO, ...@@ -12,4 +12,3 @@ public interface SysOrganizationMapping extends MappingBase<SysOrganizationDTO,
} }
...@@ -12,4 +12,3 @@ public interface SysPermissionMapping extends MappingBase<SysPermissionDTO, SysP ...@@ -12,4 +12,3 @@ public interface SysPermissionMapping extends MappingBase<SysPermissionDTO, SysP
} }
...@@ -12,4 +12,3 @@ public interface SysPostMapping extends MappingBase<SysPostDTO, SysPost> { ...@@ -12,4 +12,3 @@ public interface SysPostMapping extends MappingBase<SysPostDTO, SysPost> {
} }
...@@ -12,4 +12,3 @@ public interface SysRoleMapping extends MappingBase<SysRoleDTO, SysRole> { ...@@ -12,4 +12,3 @@ public interface SysRoleMapping extends MappingBase<SysRoleDTO, SysRole> {
} }
...@@ -12,4 +12,3 @@ public interface SysRolePermissionMapping extends MappingBase<SysRolePermissionD ...@@ -12,4 +12,3 @@ public interface SysRolePermissionMapping extends MappingBase<SysRolePermissionD
} }
...@@ -12,4 +12,3 @@ public interface SysTeamMapping extends MappingBase<SysTeamDTO, SysTeam> { ...@@ -12,4 +12,3 @@ public interface SysTeamMapping extends MappingBase<SysTeamDTO, SysTeam> {
} }
...@@ -12,4 +12,3 @@ public interface SysTeamMemberMapping extends MappingBase<SysTeamMemberDTO, SysT ...@@ -12,4 +12,3 @@ public interface SysTeamMemberMapping extends MappingBase<SysTeamMemberDTO, SysT
} }
...@@ -12,4 +12,3 @@ public interface SysUserAuthMapping extends MappingBase<SysUserAuthDTO, SysUserA ...@@ -12,4 +12,3 @@ public interface SysUserAuthMapping extends MappingBase<SysUserAuthDTO, SysUserA
} }
...@@ -12,4 +12,3 @@ public interface SysUserMapping extends MappingBase<SysUserDTO, SysUser> { ...@@ -12,4 +12,3 @@ public interface SysUserMapping extends MappingBase<SysUserDTO, SysUser> {
} }
...@@ -12,4 +12,3 @@ public interface SysUserRoleMapping extends MappingBase<SysUserRoleDTO, SysUserR ...@@ -12,4 +12,3 @@ public interface SysUserRoleMapping extends MappingBase<SysUserRoleDTO, SysUserR
} }
...@@ -12,4 +12,3 @@ public interface WFGroupMapping extends MappingBase<WFGroupDTO, WFGroup> { ...@@ -12,4 +12,3 @@ public interface WFGroupMapping extends MappingBase<WFGroupDTO, WFGroup> {
} }
...@@ -12,4 +12,3 @@ public interface WFMemberMapping extends MappingBase<WFMemberDTO, WFMember> { ...@@ -12,4 +12,3 @@ public interface WFMemberMapping extends MappingBase<WFMemberDTO, WFMember> {
} }
...@@ -12,4 +12,3 @@ public interface WFProcessDefinitionMapping extends MappingBase<WFProcessDefinit ...@@ -12,4 +12,3 @@ public interface WFProcessDefinitionMapping extends MappingBase<WFProcessDefinit
} }
...@@ -12,4 +12,3 @@ public interface WFREModelMapping extends MappingBase<WFREModelDTO, WFREModel> { ...@@ -12,4 +12,3 @@ public interface WFREModelMapping extends MappingBase<WFREModelDTO, WFREModel> {
} }
...@@ -12,4 +12,3 @@ public interface WFSystemMapping extends MappingBase<WFSystemDTO, WFSystem> { ...@@ -12,4 +12,3 @@ public interface WFSystemMapping extends MappingBase<WFSystemDTO, WFSystem> {
} }
...@@ -12,4 +12,3 @@ public interface WFUserMapping extends MappingBase<WFUserDTO, WFUser> { ...@@ -12,4 +12,3 @@ public interface WFUserMapping extends MappingBase<WFUserDTO, WFUser> {
} }
...@@ -24,4 +24,5 @@ public interface IBZWFFeignClient ...@@ -24,4 +24,5 @@ public interface IBZWFFeignClient
JSONObject wfstart(@PathVariable("system") String system, @PathVariable("appname") String appname, JSONObject wfstart(@PathVariable("system") String system, @PathVariable("appname") String appname,
@PathVariable("entity") String entity, @PathVariable("entity") String entity,
@PathVariable("businessKey") String businessKey, @RequestBody JSONObject instance); @PathVariable("businessKey") String businessKey, @RequestBody JSONObject instance);
} }
...@@ -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 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册