diff --git a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java index 9ad9252a..2e017239 100644 --- a/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java +++ b/src/main/java/com/lz/modules/job/business/DingtalkBusiness.java @@ -234,7 +234,7 @@ public class DingtalkBusiness { public String sendWorkMSGWithAsyn(Long resultRecordId ,Long flowRecordId, int type) { - + logger.info("开始处理数据"); //流程跳转专用 ResultRecord resultRecord = resultRecordService.selectResultRecordById(resultRecordId); if(resultRecord != null){ @@ -244,59 +244,57 @@ public class DingtalkBusiness { fromStaff.setFlowStart(flowStart); fromStaff.setFlowRecordId(flowRecordId); if(type == WorkMsgTypeEnum.REJECT.getType()){//被拒 - sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.REJECT.getType()); + return sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.REJECT.getType()); }else if(type == WorkMsgTypeEnum.URGING.getType()){//被拒 - sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.URGING.getType()); + return sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.URGING.getType()); }else if(type == WorkMsgTypeEnum.SKIP.getType()){//被拒 - sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.SKIP.getType()); + return sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.SKIP.getType()); }else if(type == WorkMsgTypeEnum.TRANSFER.getType()){//被拒 - sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.TRANSFER.getType()); + return sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.TRANSFER.getType()); }else{ - sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.PROCESS.getType()); + return sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.PROCESS.getType()); } - - - } + logger.info("无记录"); return "error"; } //流程流转发送消息 public String sendWorkMSGWithAsyn(Long resultRecordId , int type) { + logger.info("流程流转发送消息"); return sendWorkMSGWithAsyn(resultRecordId, 0L, type); } public String sendWorkMSGWithAsyn(StaffSimpleInfo fromStaff, List toStaffids, int type) { - if(toStaffids != null && toStaffids.size() > 0){ - if (toStaffids.get(0).getEmployeeId() == null || toStaffids.get(0).getEmployeeId().length() == 0) { - //查询第三方id - List ids = toStaffids.stream().map(new Function() { - @Override - public Long apply(StaffSimpleInfo staffSimpleInfo) { - return staffSimpleInfo.getId(); - } - }).collect(Collectors.toList()); - List staffSimpleInfos = staffService.selectStaffSimpleInfos(ids); - Map map = toStaffids.stream().collect(Collectors.toMap(StaffSimpleInfo::getId, e -> e)); - for (StaffSimpleInfo staff : staffSimpleInfos - ) { - StaffSimpleInfo staff1 = map.get(staff.getId()); - staff1.setEmployeeId(staff1.getEmployeeId()); + + if (toStaffids != null && toStaffids.size() > 0 && (toStaffids.get(0).getEmployeeId() == null || toStaffids.get(0).getEmployeeId().length() == 0)) { + //查询第三方id + List ids = toStaffids.stream().map(new Function() { + @Override + public Long apply(StaffSimpleInfo staffSimpleInfo) { + return staffSimpleInfo.getId(); } + }).collect(Collectors.toList()); + List staffSimpleInfos = staffService.selectStaffSimpleInfos(ids); + Map map = toStaffids.stream().collect(Collectors.toMap(StaffSimpleInfo::getId, e -> e)); + for (StaffSimpleInfo staff : staffSimpleInfos + ) { + StaffSimpleInfo staff1 = map.get(staff.getId()); + staff1.setEmployeeId(staff1.getEmployeeId()); } - WorkMsgTypeEnum workMsgTypeEnum = WorkMsgTypeEnum.findRoleTypeByCode(type); - - ThreadSendMessage threadSendMessage = new ThreadSendMessage(fromStaff, toStaffids, workMsgTypeEnum, appid); - Thread thread = new Thread(threadSendMessage); - thread.start(); - - return "OK"; } - return "error"; + WorkMsgTypeEnum workMsgTypeEnum = WorkMsgTypeEnum.findRoleTypeByCode(type); + + ThreadSendMessage threadSendMessage = new ThreadSendMessage(fromStaff, toStaffids, workMsgTypeEnum, appid); + Thread thread = new Thread(threadSendMessage); + thread.start(); + + return "OK"; + } @@ -434,9 +432,10 @@ public class DingtalkBusiness { dingTalkUtil.updateWorkMSG(thirdMsgSendRecord, token); } }else{ - logger.info("开始批量推送消息,数量{}, appid{}", toStaffids.size(), appid); + logger.info("开始批量推送消息,appid{}", appid); if(toStaffids == null){//流程流转走的代码 + logger.info("需要处理人员信息{}", fromStaff); String url = hostUrl; if(url.contains("?")){ url += "&halokit=" + System.currentTimeMillis(); @@ -572,6 +571,7 @@ public class DingtalkBusiness { }else{//批量推送给指定人员 + logger.info("批量推送数量{}", toStaffids.size()); for (StaffSimpleInfo info:toStaffids ) { diff --git a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java index ab61ede1..91b5e54a 100644 --- a/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java +++ b/src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java @@ -62,7 +62,7 @@ public class OAuth2Filter extends AuthenticatingFilter { httpResponse.setHeader("Access-Control-Allow-Credentials", "true"); httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin()); - String json = new Gson().toJson(R.error(HttpStatus.SC_UNAUTHORIZED, "invalid token")); + String json = new Gson().toJson(R.error(HttpStatus.SC_UNAUTHORIZED, "登录已过期,请重新登录")); httpResponse.getWriter().print(json); return false; diff --git a/src/main/resources/mapper/flow/FlowRecordMapper.xml b/src/main/resources/mapper/flow/FlowRecordMapper.xml index 2a34cc6b..1055a137 100644 --- a/src/main/resources/mapper/flow/FlowRecordMapper.xml +++ b/src/main/resources/mapper/flow/FlowRecordMapper.xml @@ -175,25 +175,25 @@