wenlukang1
/
CTSK_DEV
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

待办bug修复1

This commit is contained in:
wenlukang1 2025-07-02 19:12:59 +08:00
parent 05c555b621
commit 596e774d35
1 changed files with 22 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

178
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/servicehandler/BacklogServiceHandle.java
View File

@ -71,69 +71,13 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
if(contains){ if(contains){
return; return;
} }
/*String s = cache.get(ctx.getBusinessKey());
if (Objects.equals(s, "true")) {
return;
}*/
// 发送首节的已办 // 发送首节的已办
sendToDo(ctx); sendToDo(ctx);
} catch (Exception e) { } catch (Exception e) {
logger.info("###获得缓存失败，发送首节的已办失败:" + e.getMessage()+" ctx:"+ctx.toString()+" ctx.getBusinessKey："+ctx.getBusinessKey()); logger.info("###获得缓存失败，发送首节的已办失败:" + e.getMessage()+" ctx:"+ctx.toString()+" ctx.getBusinessKey："+ctx.getBusinessKey());
} }
} }
/* //几个待办
List<Long> userIds = todoInfo.getUserIds();
DynamicObjectCollection query = QueryServiceHelper.query("bos_user", "id,name,number" +
",phone,username", new QFilter[]{new QFilter("id", "in", userIds)});
DynamicObject dynamicObject = QueryServiceHelper.queryOne("wf_hitaskinst", "billno,startname,id,name",
new QFilter[]{new QFilter("id", "=", todoInfo.getTaskId())});
logger.info("####待办taskid:"+todoInfo.getTaskId());
for (DynamicObject query_one : query) {
String userName;
try {
userName = AesUtils.aesEncryptString(query_one.getString("username"));
logger.info("AES加密后user："+userName);
}catch (Exception e){
logger.info("####AES加密出现异常，请联系运维人员排查！");
ErrorCode errorCode = new ErrorCode("error_code", "AES加密出现异常，请联系运维人员排查！");
throw new KDException(errorCode, e);
}
StringBuilder form = new StringBuilder();
form.append("{");
form.append("\"title\":");
form.append("\"").append(todoInfo.getTitle()).append("\",");
form.append("\"bName\":");
form.append("\"").append("司库").append("\",");
form.append("\"bussinessCode\":");
form.append("\"").append("EOSS").append("\",");
form.append("\"urGency\":");
form.append("\"0\",");
form.append("\"currentStepName\":");
form.append("\"").append(dynamicObject.getString("name")).append("\",");
form.append("\"sendUserName\":");
form.append("\"").append(dynamicObject.getString("startname")).append("\",");
form.append("\"receiveUsersysName\":");
form.append("\"").append(query_one.getString("username")).append("\",");
form.append("\"receiveUserId\":");
form.append("\"").append(query_one.getString("username")).append("\",");
form.append("\"handleUrl\":");
Map<String, Object> taskInfo = GetUrlUtils.getTaskInfo(todoInfo.getTaskId());
String url = GetUrlUtils.buildTaskUrl(taskInfo);
form.append("\"").append(url).append("&userName=").append(userName).append("\",");
form.append("\"appHandleUrl\":");
form.append("\"").append(url).append("&userName=").append(userName).append("\",");
form.append("\"appName\":");
form.append("\"").append(ctx.getEntityName()).append("\",");
form.append("\"pendingId\":");
form.append("\"").append(todoInfo.getTaskId()).append("\",");
form.append("\"pendingAttr\":");
form.append("\"0\"");
form.append("}");
logger.info("###待办拼接请求体："+form);
CreateToDoHandler.get_CreateToDoHandler().sendCreateToDo(form.toString(),todoInfo.getTitle(),
todoInfo.getTaskId().toString(),query_one.getString("username"),dynamicObject.getString("billno"));
}
logger.info("###结束待办_createToDo");*/
} }
/*** /***
@ -235,15 +179,7 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
//接收人手机号 //接收人手机号
DynamicObject dynamicObject = QueryServiceHelper.queryOne("bos_user", "number,name," + DynamicObject dynamicObject = QueryServiceHelper.queryOne("bos_user", "number,name," +
"phone,username", new QFilter[]{new QFilter("id", "=", next.getString("freceiveuserid"))}); "phone,username", new QFilter[]{new QFilter("id", "=", next.getString("freceiveuserid"))});
String userName1 = dynamicObject.getString("username"); String userName = dynamicObject.getString("username");
String userName;
try {
userName = AesUtils.aesEncryptString(dynamicObject.getString("username"));
logger.info("AES加密后user：" + userName);
} catch (Exception e) {
ErrorCode errorCode = new ErrorCode("error_code", "AES加密出现异常，请联系运维人员排查！");
throw new KDException(errorCode, e);
}
//判断是否移动端 //判断是否移动端
boolean allowMobApprove = allowMobApprove(next.get("fid")); boolean allowMobApprove = allowMobApprove(next.get("fid"));
if (allowMobApprove) { if (allowMobApprove) {
@ -274,28 +210,28 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
form.append("\"sendUserName\":"); form.append("\"sendUserName\":");
form.append("\"").append(next.getString("fstartname")).append("\","); form.append("\"").append(next.getString("fstartname")).append("\",");
form.append("\"receiveUsersysName\":"); form.append("\"receiveUsersysName\":");
form.append("\"").append(userName1).append("\","); form.append("\"").append(userName).append("\",");
form.append("\"receiveUserId\":"); form.append("\"receiveUserId\":");
form.append("\"").append(userName1).append("\","); form.append("\"").append(userName).append("\",");
form.append("\"handleUrl\":"); form.append("\"handleUrl\":");
form.append("\"").append(pcUrl).append("&userName=").append(userName).append("\","); form.append("\"").append(pcUrl).append("\",");
form.append("\"appHandleUrl\":"); form.append("\"appHandleUrl\":");
form.append("\"").append(pcUrl).append("&userName=").append(userName).append("\","); form.append("\"").append(pcUrl).append("\",");
// appUrl移动端查看模式 // appUrl移动端查看模式
form.append("\"appViewUrl\":"); form.append("\"appViewUrl\":");
form.append("\"").append(pcUrl).append("&userName=").append(userName).append("&ado=view").append("\","); form.append("\"").append(pcUrl).append("&ado=view").append("\",");
form.append("\"appName\":"); form.append("\"appName\":");
form.append("\"").append(next.getString("fentityname")).append("\","); form.append("\"").append(next.getString("fentityname")).append("\",");
//pc端查看模式 //pc端查看模式
form.append("\"viewUrl\":"); form.append("\"viewUrl\":");
form.append("\"").append(pcUrl).append("&userName=").append(userName).append("&ado=view").append("\","); form.append("\"").append(pcUrl).append("&ado=view").append("\",");
form.append("\"pendingId\":"); form.append("\"pendingId\":");
form.append("\"").append(next.getLong("fid")).append("\","); form.append("\"").append(next.getLong("fid")).append("\",");
form.append("\"pendingAttr\":"); form.append("\"pendingAttr\":");
form.append("\"0\""); form.append("\"0\"");
form.append("}"); form.append("}");
Object shkd_cache = SystemParamServiceHelper.getPublicParameter("shkd_cache"); Object shkd_cache = SystemParamServiceHelper.getPublicParameter("shkd_cache");
Integer z = 0; int z = 0;
if (Objects.equals(shkd_type, "0")) { if (Objects.equals(shkd_type, "0")) {
//旧 eoss 环境 待办 //旧 eoss 环境 待办
CreateToDoHandler.get_CreateToDoHandler().sendCreateToDo(form.toString(), title, next.getLong("fid").toString(), userName, next.getString("fbillno")); CreateToDoHandler.get_CreateToDoHandler().sendCreateToDo(form.toString(), title, next.getLong("fid").toString(), userName, next.getString("fbillno"));
@ -304,7 +240,7 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
if (ObjectUtils.isEmpty(shkd_cache)) { if (ObjectUtils.isEmpty(shkd_cache)) {
z = 604800; z = 604800;
} else { } else {
z = Integer.valueOf(shkd_cache.toString()); z = Integer.parseInt(shkd_cache.toString());
} }
cache.put(ctx.getBusinessKey(), "true", z); cache.put(ctx.getBusinessKey(), "true", z);
} else if (Objects.equals(shkd_type, "1")) { } else if (Objects.equals(shkd_type, "1")) {
@ -315,7 +251,7 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
if (ObjectUtils.isEmpty(shkd_cache)) { if (ObjectUtils.isEmpty(shkd_cache)) {
z = 604800; z = 604800;
} else { } else {
z = Integer.valueOf(shkd_cache.toString()); z = Integer.parseInt(shkd_cache.toString());
} }
cache.put(ctx.getBusinessKey(), "true", z); cache.put(ctx.getBusinessKey(), "true", z);
} else if (Objects.equals(shkd_type, "2")) { } else if (Objects.equals(shkd_type, "2")) {
@ -328,7 +264,7 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
if (ObjectUtils.isEmpty(shkd_cache)) { if (ObjectUtils.isEmpty(shkd_cache)) {
z = 604800; z = 604800;
} else { } else {
z = Integer.valueOf(shkd_cache.toString()); z = Integer.parseInt(shkd_cache.toString());
} }
cache.put(ctx.getBusinessKey(), "true", z); cache.put(ctx.getBusinessKey(), "true", z);
} }
@ -381,21 +317,6 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
getDeleteNew(ctx, info); getDeleteNew(ctx, info);
getDeleteFormal(ctx, info); getDeleteFormal(ctx, info);
} }
/* List<Long> userIds = info.getUserIds();
DynamicObjectCollection query = QueryServiceHelper.query("bos_user", "id,name,phone,username", new QFilter[]{new QFilter("id", "in", userIds)});
DynamicObject dynamicObject = QueryServiceHelper.queryOne("wf_hitaskinst", "billno",
new QFilter[]{new QFilter("id", "=", info.getTaskId())});
//业务id
Long taskId = ctx.getTaskId();
logger.info("####撤销taskid:"+info.getTaskId());
for (DynamicObject queryOne : query) {
if(dynamicObject != null){
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDo(taskId,queryOne.getString("username"),dynamicObject.getString("billno"));
}else{
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDo(taskId,queryOne.getString("username"),"");
}
}*/
logger.info("###结束撤销_deleteToDo"); logger.info("###结束撤销_deleteToDo");
} }
} }
@ -412,15 +333,6 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
new QFilter[]{new QFilter("id", "=", todoInfo.getTaskId())}); new QFilter[]{new QFilter("id", "=", todoInfo.getTaskId())});
logger.info("####待办taskid:" + todoInfo.getTaskId()); logger.info("####待办taskid:" + todoInfo.getTaskId());
for (DynamicObject query_one : query) { for (DynamicObject query_one : query) {
String userName;
try {
userName = AesUtils.aesEncryptString(query_one.getString("username"));
logger.info("AES加密后user：" + userName);
} catch (Exception e) {
logger.info("####AES加密出现异常，请联系运维人员排查！");
ErrorCode errorCode = new ErrorCode("error_code", "AES加密出现异常，请联系运维人员排查！");
throw new KDException(errorCode, e);
}
StringBuilder form = new StringBuilder(); StringBuilder form = new StringBuilder();
// BacklogMessage backlogMessage = new BacklogMessage(); // BacklogMessage backlogMessage = new BacklogMessage();
form.append("{"); form.append("{");
@ -443,58 +355,22 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
form.append("\"handleUrl\":"); form.append("\"handleUrl\":");
Map<String, Object> taskInfo = GetUrlUtils.getTaskInfo(todoInfo.getTaskId()); Map<String, Object> taskInfo = GetUrlUtils.getTaskInfo(todoInfo.getTaskId());
String url = GetUrlUtils.buildTaskUrl(taskInfo); String url = GetUrlUtils.buildTaskUrl(taskInfo);
form.append("\"").append(url).append("&userName=").append(userName).append("\","); form.append("\"").append(url).append("\",");
form.append("\"appHandleUrl\":"); form.append("\"appHandleUrl\":");
form.append("\"").append(url).append("&userName=").append(userName).append("\","); form.append("\"").append(url).append("\",");
// appUrl移动端查看模式 // appUrl移动端查看模式
form.append("\"appViewUrl\":"); form.append("\"appViewUrl\":");
form.append("\"").append(url).append("&userName=").append(userName).append("&ado=view").append("\","); form.append("\"").append(url).append("&ado=view").append("\",");
form.append("\"appName\":"); form.append("\"appName\":");
form.append("\"").append(ctx.getEntityName()).append("\","); form.append("\"").append(ctx.getEntityName()).append("\",");
//pc端查看模式 //pc端查看模式
form.append("\"viewUrl\":"); form.append("\"viewUrl\":");
form.append("\"").append(url).append("&userName=").append(userName).append("&ado=view").append("\","); form.append("\"").append(url).append("&ado=view").append("\",");
form.append("\"pendingId\":"); form.append("\"pendingId\":");
form.append("\"").append(todoInfo.getTaskId()).append("\","); form.append("\"").append(todoInfo.getTaskId()).append("\",");
form.append("\"pendingAttr\":"); form.append("\"pendingAttr\":");
form.append("\"0\""); form.append("\"0\"");
form.append("}"); form.append("}");
/* //业务类型名称
backlogMessage.setbName("业务类型名称");
// 紧急程度
backlogMessage.setUrGency("0");
//当前节点名称
backlogMessage.setCurrentStepName(dynamicObject.getString("name"));
//上步骤名称
backlogMessage.setPreStepName("");
// startname发起人名称
backlogMessage.setSendUserName(dynamicObject.getString("startname"));
//接收人用户名
backlogMessage.setReceiveUserId(query_one.getString("username"));
//标题
backlogMessage.setTitle(todoInfo.getTitle());
//PC地址
backlogMessage.setHandleUrl(todoInfo.getUrl());
//PC地址查看
backlogMessage.setViewUrl(todoInfo.getUrl()+"&ado=view");
//app地址
backlogMessage.setAppHandleUrl(todoInfo.getUrl());
//App应用名称
backlogMessage.setAppName("");
//app地址查看
backlogMessage.setAppViewUrl(todoInfo.getUrl()+"&ado=view");
//业务id
backlogMessage.setPendingId(String.valueOf(todoInfo.getTaskId()));
// 业务编码
backlogMessage.setBussinessCode(dynamicObject.getString("billno"));
//属性
backlogMessage.setPendingAttr("0");
//notifyMsg 通知消息
backlogMessage.setNotifyMsg("");
//notifyMethod 通知方式
backlogMessage.setNotifyMethod("");
//业务自定义数据
backlogMessage.setJsonData("");*/
logger.info("###待办拼接请求体：" + form); logger.info("###待办拼接请求体：" + form);
CreateToDoHandler.get_CreateToDoHandler().sendCreateToDo(form.toString(), todoInfo.getTitle(), CreateToDoHandler.get_CreateToDoHandler().sendCreateToDo(form.toString(), todoInfo.getTitle(),
todoInfo.getTaskId().toString(), query_one.getString("username"), dynamicObject.getString("billno")); todoInfo.getTaskId().toString(), query_one.getString("username"), dynamicObject.getString("billno"));
@ -511,19 +387,9 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
",phone,username", new QFilter[]{new QFilter("id", "in", userIds)}); ",phone,username", new QFilter[]{new QFilter("id", "in", userIds)});
DynamicObject dynamicObject = QueryServiceHelper.queryOne("wf_hitaskinst", "billno,subject,startname,id,name", DynamicObject dynamicObject = QueryServiceHelper.queryOne("wf_hitaskinst", "billno,subject,startname,id,name",
new QFilter[]{new QFilter("id", "=", todoInfo.getTaskId())}); new QFilter[]{new QFilter("id", "=", todoInfo.getTaskId())});
logger.info("####待办taskid:" + todoInfo.getTaskId()); logger.info("####新EOSS待办taskid:" + todoInfo.getTaskId());
for (DynamicObject query_one : query) { for (DynamicObject query_one : query) {
String userName;
try {
userName = AesUtils.aesEncryptString(query_one.getString("username"));
logger.info("AES加密后user：" + userName);
} catch (Exception e) {
logger.info("####AES加密出现异常，请联系运维人员排查！");
ErrorCode errorCode = new ErrorCode("error_code", "AES加密出现异常，请联系运维人员排查！");
throw new KDException(errorCode, e);
}
StringBuilder form = new StringBuilder(); StringBuilder form = new StringBuilder();
// BacklogMessage backlogMessage = new BacklogMessage();
form.append("{"); form.append("{");
form.append("\"title\":"); form.append("\"title\":");
form.append("\"").append(dynamicObject.getString("subject")).append("\","); form.append("\"").append(dynamicObject.getString("subject")).append("\",");
@ -544,24 +410,24 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
form.append("\"handleUrl\":"); form.append("\"handleUrl\":");
Map<String, Object> taskInfo = GetUrlUtils.getTaskInfo(todoInfo.getTaskId()); Map<String, Object> taskInfo = GetUrlUtils.getTaskInfo(todoInfo.getTaskId());
String url = GetUrlUtils.buildTaskUrl(taskInfo); String url = GetUrlUtils.buildTaskUrl(taskInfo);
form.append("\"").append(url).append("&isNew=true&userName=").append(userName).append("\","); form.append("\"").append(url).append("&isNew=true").append("\",");
form.append("\"appHandleUrl\":"); form.append("\"appHandleUrl\":");
form.append("\"").append(url).append("&isNew=true&userName=").append(userName).append("\","); form.append("\"").append(url).append("&isNew=true").append("\",");
// appUrl移动端查看模式 // appUrl移动端查看模式
form.append("\"appViewUrl\":"); form.append("\"appViewUrl\":");
form.append("\"").append(url).append("&isNew=true&userName=").append(userName).append("&ado=view").append("\","); form.append("\"").append(url).append("&isNew=true").append("&ado=view").append("\",");
form.append("\"appName\":"); form.append("\"appName\":");
form.append("\"").append(ctx.getEntityName()).append("\","); form.append("\"").append(ctx.getEntityName()).append("\",");
//pc端查看模式 //pc端查看模式
form.append("\"viewUrl\":"); form.append("\"viewUrl\":");
form.append("\"").append(url).append("&isNew=true&userName=").append(userName).append("&ado=view").append("\","); form.append("\"").append(url).append("&isNew=true").append("&ado=view").append("\",");
form.append("\"pendingId\":"); form.append("\"pendingId\":");
form.append("\"").append(todoInfo.getTaskId()).append("\","); form.append("\"").append(todoInfo.getTaskId()).append("\",");
form.append("\"pendingAttr\":"); form.append("\"pendingAttr\":");
form.append("\"0\""); form.append("\"0\"");
form.append("}"); form.append("}");
logger.info("###待办拼接请求体：" + form); logger.info("###推送新EOSS待办拼接请求体：" + form);
CreateToDoHandler.get_CreateToDoHandler().sendCreateToDoNew(form.toString(), todoInfo.getTitle(), CreateToDoHandler.get_CreateToDoHandler().sendCreateToDoNew(form.toString(), todoInfo.getTitle(),
todoInfo.getTaskId().toString(), query_one.getString("username"), dynamicObject.getString("billno")); todoInfo.getTaskId().toString(), query_one.getString("username"), dynamicObject.getString("billno"));
} }