wulin/wl_management
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交修改

Browse Source
This commit is contained in:
quyixiao 2020-11-23 12:01:32 +08:00
commit 6eda358235
3 changed files with 38 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/java/com/lz/modules/job/business/DingtalkBusiness.java
View File

@ -234,7 +234,7 @@ public class DingtalkBusiness {
public String sendWorkMSGWithAsyn(Long resultRecordId ,Long flowRecordId, int type) { public String sendWorkMSGWithAsyn(Long resultRecordId ,Long flowRecordId, int type) {
logger.info("开始处理数据");
//流程跳转专用 //流程跳转专用
ResultRecord resultRecord = resultRecordService.selectResultRecordById(resultRecordId); ResultRecord resultRecord = resultRecordService.selectResultRecordById(resultRecordId);
if(resultRecord != null){ if(resultRecord != null){
@ -244,59 +244,57 @@ public class DingtalkBusiness {
fromStaff.setFlowStart(flowStart); fromStaff.setFlowStart(flowStart);
fromStaff.setFlowRecordId(flowRecordId); fromStaff.setFlowRecordId(flowRecordId);
if(type == WorkMsgTypeEnum.REJECT.getType()){//被拒 if(type == WorkMsgTypeEnum.REJECT.getType()){//被拒
sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.REJECT.getType()); return sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.REJECT.getType());
}else if(type == WorkMsgTypeEnum.URGING.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()){//被拒 }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()){//被拒 }else if(type == WorkMsgTypeEnum.TRANSFER.getType()){//被拒
sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.TRANSFER.getType()); return sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.TRANSFER.getType());
}else{ }else{
sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.PROCESS.getType()); return sendWorkMSGWithAsyn(fromStaff, null, WorkMsgTypeEnum.PROCESS.getType());
} }
} }
logger.info("无记录");
return "error"; return "error";
} }
//流程流转发送消息 //流程流转发送消息
public String sendWorkMSGWithAsyn(Long resultRecordId , int type) { public String sendWorkMSGWithAsyn(Long resultRecordId , int type) {
logger.info("流程流转发送消息");
return sendWorkMSGWithAsyn(resultRecordId, 0L, type); return sendWorkMSGWithAsyn(resultRecordId, 0L, type);
} }
public String sendWorkMSGWithAsyn(StaffSimpleInfo fromStaff, List<StaffSimpleInfo> toStaffids, int type) { public String sendWorkMSGWithAsyn(StaffSimpleInfo fromStaff, List<StaffSimpleInfo> toStaffids, int type) {
if(toStaffids != null && toStaffids.size() > 0){
if (toStaffids.get(0).getEmployeeId() == null || toStaffids.get(0).getEmployeeId().length() == 0) { if (toStaffids != null && toStaffids.size() > 0 && (toStaffids.get(0).getEmployeeId() == null || toStaffids.get(0).getEmployeeId().length() == 0)) {
//查询第三方id //查询第三方id
List<Long> ids = toStaffids.stream().map(new Function<StaffSimpleInfo, Long>() { List<Long> ids = toStaffids.stream().map(new Function<StaffSimpleInfo, Long>() {
@Override @Override
public Long apply(StaffSimpleInfo staffSimpleInfo) { public Long apply(StaffSimpleInfo staffSimpleInfo) {
return staffSimpleInfo.getId(); return staffSimpleInfo.getId();
}
}).collect(Collectors.toList());
List<StaffSimpleInfo> staffSimpleInfos = staffService.selectStaffSimpleInfos(ids);
Map<Long, StaffSimpleInfo> map = toStaffids.stream().collect(Collectors.toMap(StaffSimpleInfo::getId, e -> e));
for (StaffSimpleInfo staff : staffSimpleInfos
) {
StaffSimpleInfo staff1 = map.get(staff.getId());
staff1.setEmployeeId(staff1.getEmployeeId());
} }
}).collect(Collectors.toList());
List<StaffSimpleInfo> staffSimpleInfos = staffService.selectStaffSimpleInfos(ids);
Map<Long, StaffSimpleInfo> 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); dingTalkUtil.updateWorkMSG(thirdMsgSendRecord, token);
} }
}else{ }else{
logger.info("开始批量推送消息，数量{}, appid{}", toStaffids.size(), appid); logger.info("开始批量推送消息，appid{}", appid);
if(toStaffids == null){//流程流转走的代码 if(toStaffids == null){//流程流转走的代码
logger.info("需要处理人员信息{}", fromStaff);
String url = hostUrl; String url = hostUrl;
if(url.contains("?")){ if(url.contains("?")){
url += "&halokit=" + System.currentTimeMillis(); url += "&halokit=" + System.currentTimeMillis();
@ -572,6 +571,7 @@ public class DingtalkBusiness {
}else{//批量推送给指定人员 }else{//批量推送给指定人员
logger.info("批量推送数量{}", toStaffids.size());
for (StaffSimpleInfo info:toStaffids for (StaffSimpleInfo info:toStaffids
) { ) {

2
src/main/java/com/lz/modules/sys/oauth2/OAuth2Filter.java
View File

@ -62,7 +62,7 @@ public class OAuth2Filter extends AuthenticatingFilter {
httpResponse.setHeader("Access-Control-Allow-Credentials", "true"); httpResponse.setHeader("Access-Control-Allow-Credentials", "true");
httpResponse.setHeader("Access-Control-Allow-Origin", HttpContextUtils.getOrigin()); 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); httpResponse.getWriter().print(json);
return false; return false;

8
src/main/resources/mapper/flow/FlowRecordMapper.xml
View File

@ -175,25 +175,25 @@
<select id="selectFinishTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto"> <select id="selectFinishTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto">
SELECT DISTINCT(record_id),f.flow_process,f.flow_name,f.approval_staff_id,f.record_staff_id,start_id,r.gmt_modified,f.type from lz_flow_record f SELECT DISTINCT(record_id),f.flow_process,f.flow_name,f.approval_staff_id,f.record_staff_id,start_id,f.gmt_modified,f.type from lz_flow_record f
LEFT JOIN lz_result_record r LEFT JOIN lz_result_record r
ON f.record_id = r.id ON f.record_id = r.id
where f.is_delete=0 and r.is_delete=0 where f.is_delete=0 and r.is_delete=0
and approval_staff_id = #{approvalStaffId} and approval_staff_id = #{approvalStaffId}
and f.status = 1 and f.status = 1
and f.flow_process != 2 and f.flow_process != 2
order by r.gmt_modified desc order by f.gmt_modified desc
</select> </select>
<select id="selectTodoTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto"> <select id="selectTodoTasksByApprovalStaffId" resultType="com.lz.modules.performance.dto.TaskListDto">
SELECT DISTINCT(record_id),f.flow_process,f.flow_name,f.approval_staff_id,f.record_staff_id,start_id,r.gmt_modified,f.type from lz_flow_record f SELECT DISTINCT(record_id),f.flow_process,f.flow_name,f.approval_staff_id,f.record_staff_id,start_id,f.gmt_modified,f.type from lz_flow_record f
LEFT JOIN lz_result_record r LEFT JOIN lz_result_record r
ON f.record_id = r.id ON f.record_id = r.id
where f.is_delete=0 and r.is_delete=0 where f.is_delete=0 and r.is_delete=0
and approval_staff_id = #{approvalStaffId} and approval_staff_id = #{approvalStaffId}
and f.status = 2 and f.status = 2
and f.flow_process != 2 and f.flow_process != 2
order by r.gmt_modified desc order by f.gmt_modified desc
</select> </select>
<insert id="insertFlowRecords"> <insert id="insertFlowRecords">