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

Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
陈绍鑫 2025-04-11 11:32:33 +08:00
parent 912a3e8379 1b77cf9e16
commit a03f6038a8
6 changed files with 76 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/backlogTack/ToDoResendTack.java
View File

@ -23,7 +23,10 @@ import shkd.sys.sys.midservice.handler.deleteToDoHandler;
import shkd.sys.sys.midservice.utils.GetUrlUtils;
import shkd.sys.sys.utils.AesUtils;
import java.util.*;
import java.util.Date;
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
public class ToDoResendTack extends AbstractTask {
private static final Log logger = LogFactory.getLog(ToDoResendTack.class);
@ -227,42 +230,42 @@ public class ToDoResendTack extends AbstractTask {
form.append("}");
CreateToDoHandler.get_CreateToDoHandler().sendCreateToDo(form.toString(),title,next.getLong("fid").toString(),userName,next.getString("fbillno"));
if(java.util.Objects.equals(shkd_type,"0")){
//正式环境
//旧 eoss 环境
CreateToDoHandler.get_CreateToDoHandler().sendCreateToDo(form.toString(),title,next.getLong("fid").toString(),userName,next.getString("fbillno"));
}else if(java.util.Objects.equals(shkd_type,"1")){
//测试环境
CreateToDoHandler.get_CreateToDoHandler().sendCreateToDoTest(form.toString(),title,next.getLong("fid").toString(),userName,next.getString("fbillno"));
//新 eoss 环境
CreateToDoHandler.get_CreateToDoHandler().sendCreateToDoNew(form.toString(),title,next.getLong("fid").toString(),userName,next.getString("fbillno"));
}else if(java.util.Objects.equals(shkd_type,"2")){
//二套环境
CreateToDoHandler.get_CreateToDoHandler().sendCreateToDo(form.toString(),title,next.getLong("fid").toString(),userName,next.getString("fbillno"));
CreateToDoHandler.get_CreateToDoHandler().sendCreateToDoTest(form.toString(),title,next.getLong("fid").toString(),userName,next.getString("fbillno"));
CreateToDoHandler.get_CreateToDoHandler().sendCreateToDoNew(form.toString(),title,next.getLong("fid").toString(),userName,next.getString("fbillno"));
}
break;
case "2":
if(java.util.Objects.equals(shkd_type,"0")){
//正式环境
//旧 eoss 环境
DealToDoHandler.get_DealToDoHandler().sendDealToDo(next.getLong("fid"),userName,next.getString("fbillno"));
}else if(java.util.Objects.equals(shkd_type,"1")){
//测试环境
DealToDoHandler.get_DealToDoHandler().sendDealToDoTest(next.getLong("fid"),userName,next.getString("fbillno"));
//新 eoss 环境
DealToDoHandler.get_DealToDoHandler().sendDealToDoNew(next.getLong("fid"),userName,next.getString("fbillno"));
}else if(java.util.Objects.equals(shkd_type,"2")){
//二套环境
DealToDoHandler.get_DealToDoHandler().sendDealToDo(next.getLong("fid"),userName,next.getString("fbillno"));
DealToDoHandler.get_DealToDoHandler().sendDealToDoTest(next.getLong("fid"),userName,next.getString("fbillno"));
DealToDoHandler.get_DealToDoHandler().sendDealToDoNew(next.getLong("fid"),userName,next.getString("fbillno"));
}
break;
case "5":
if(java.util.Objects.equals(shkd_type,"0")){
//正式环境
//旧 eoss 环境
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDo(next.getLong("fid"),userName,next.getString("fbillno"));
}else if(java.util.Objects.equals(shkd_type,"1")){
//测试环境
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDoTest(next.getLong("fid"),userName,next.getString("fbillno"));
//新 eoss 环境
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDoNew(next.getLong("fid"),userName,next.getString("fbillno"));
}else if(java.util.Objects.equals(shkd_type,"2")){
//二套环境
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDo(next.getLong("fid"),userName,next.getString("fbillno"));
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDoTest(next.getLong("fid"),userName,next.getString("fbillno"));
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDoNew(next.getLong("fid"),userName,next.getString("fbillno"));
}
break;
default:

25
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/handler/CreateToDoHandler.java
View File

@ -1,26 +1,11 @@
package shkd.sys.sys.midservice.handler;
import cn.hutool.crypto.SmUtil;
import com.alibaba.fastjson.JSONObject;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.exception.ErrorCode;
import kd.bos.exception.KDException;
import kd.bos.logging.Log;
import kd.bos.logging.LogFactory;
import kd.bos.orm.query.QFilter;
import kd.bos.servicehelper.QueryServiceHelper;
import kd.bos.workflow.engine.msg.ctx.MessageContext;
import kd.bos.workflow.engine.msg.info.ToDoInfo;
import shkd.sys.sys.midservice.constant.ToDoCenterConstant;
import shkd.sys.sys.midservice.model.BacklogMessage;
import shkd.sys.sys.midservice.utils.GetUrlUtils;
import shkd.sys.sys.midservice.utils.RequestClient;
import shkd.sys.sys.utils.AesUtils;
import java.util.List;
import java.util.Map;
import java.util.Objects;
/**
@ -77,27 +62,27 @@ public class CreateToDoHandler {
}
public boolean
sendCreateToDoTest(String messageInfo, String title, String appRecordId, String userId, String number) {
sendCreateToDoNew(String messageInfo, String title, String appRecordId, String userId, String number) {
logger.info("###进入待办推送接口数据组装");
try {
//调用接口结果
String result = RequestClient.getInstance().callServiceTest(ToDoCenterConstant.URI_send_addNew, messageInfo);
String result = RequestClient.getInstance().callServiceNew(ToDoCenterConstant.URI_send_addNew, messageInfo);
logger.info("###接口返回结果" + result);
//接口调用结果
JSONObject jsonObject = JSONObject.parseObject(result);
if (jsonObject == null) {
RequestClient.getInstance().saveCreateToDoTest(title, ToDoCenterConstant.URI_send_addNew, false, result, messageInfo, appRecordId, userId, number);
RequestClient.getInstance().saveCreateToDoNew(title, ToDoCenterConstant.URI_send_addNew, false, result, messageInfo, appRecordId, userId, number);
logger.info("###响应报文为空");
return false;
} else {
if (Objects.equals("success", jsonObject.getString("status"))) {
//发送成功
//调用保存操作
RequestClient.getInstance().saveCreateToDoTest(title, ToDoCenterConstant.URI_send_addNew, true, result, messageInfo, appRecordId, userId, number);
RequestClient.getInstance().saveCreateToDoNew(title, ToDoCenterConstant.URI_send_addNew, true, result, messageInfo, appRecordId, userId, number);
return true;
} else {
//调用保存操作
RequestClient.getInstance().saveCreateToDoTest(title, ToDoCenterConstant.URI_send_addNew, false, result, messageInfo, appRecordId, userId, number);
RequestClient.getInstance().saveCreateToDoNew(title, ToDoCenterConstant.URI_send_addNew, false, result, messageInfo, appRecordId, userId, number);
//发送失败
logger.error("###接口调通失败");
return false;

10
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/handler/DealToDoHandler.java
View File

@ -58,27 +58,27 @@ public class DealToDoHandler {
}
}
public boolean sendDealToDoTest(Long appRecordId, String userId,String number) {
public boolean sendDealToDoNew(Long appRecordId, String userId,String number) {
try {
String part = "{ \"appRecordId\": \""+appRecordId+"\", \"userId\": \""+userId+"\" }";
//调用接口结果
String result = RequestClient.getInstance().callServiceTest(ToDoCenterConstant.URI_SEND_finish, part);
String result = RequestClient.getInstance().callServiceNew(ToDoCenterConstant.URI_SEND_finish, part);
//保存发送消息日志
//接口调用结果
JSONObject jsonObject = JSONObject.parseObject(result);
if (jsonObject == null) {
//发送失败
RequestClient.getInstance().saveDeLToDoTest(appRecordId, userId, ToDoCenterConstant.URI_SEND_finish, false, result, part, "2",number);
RequestClient.getInstance().saveDeLToDoNew(appRecordId, userId, ToDoCenterConstant.URI_SEND_finish, false, result, part, "2",number);
logger.info("###响应报文为空");
return false;
} else {
if(Objects.equals("success",jsonObject.getString("status"))){
//发送成功
RequestClient.getInstance().saveDeLToDoTest(appRecordId, userId, ToDoCenterConstant.URI_SEND_finish, true, result, part, "2",number);
RequestClient.getInstance().saveDeLToDoNew(appRecordId, userId, ToDoCenterConstant.URI_SEND_finish, true, result, part, "2",number);
return true;
} else {
//发送失败
RequestClient.getInstance().saveDeLToDoTest(appRecordId, userId, ToDoCenterConstant.URI_SEND_finish, false, result, part, "2",number);
RequestClient.getInstance().saveDeLToDoNew(appRecordId, userId, ToDoCenterConstant.URI_SEND_finish, false, result, part, "2",number);
return false;
}
}

10
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/handler/deleteToDoHandler.java
View File

@ -57,26 +57,26 @@ public class deleteToDoHandler {
return false;
}
}
public boolean sendDeleteToDoTest(Long appRecordId,String userId,String number) {
public boolean sendDeleteToDoNew(Long appRecordId,String userId,String number) {
try {
//body
String part = "{ \"appRecordId\": \""+appRecordId+"\", \"userId\": \""+userId+"\" }";
//调用接口结果
String result = RequestClient.getInstance().callServiceTest(ToDoCenterConstant.URI_send_deleteP,part);
String result = RequestClient.getInstance().callServiceNew(ToDoCenterConstant.URI_send_deleteP,part);
//保存发送消息日志
//接口调用结果
JSONObject jsonObject = JSONObject.parseObject(result);
if(jsonObject== null){
RequestClient.getInstance().saveDeLToDoTest(appRecordId,userId,ToDoCenterConstant.URI_send_deleteP,false,result,part,"5",number);
RequestClient.getInstance().saveDeLToDoNew(appRecordId,userId,ToDoCenterConstant.URI_send_deleteP,false,result,part,"5",number);
logger.info("###响应报文为空");
return false;
}else{
if(Objects.equals("success",jsonObject.getString("status"))){
//发送成功
RequestClient.getInstance().saveDeLToDoTest(appRecordId,userId,ToDoCenterConstant.URI_send_deleteP,true,result,part,"5",number);
RequestClient.getInstance().saveDeLToDoNew(appRecordId,userId,ToDoCenterConstant.URI_send_deleteP,true,result,part,"5",number);
return true;
}else{
RequestClient.getInstance().saveDeLToDoTest(appRecordId,userId,ToDoCenterConstant.URI_send_deleteP,false,result,part,"5",number);
RequestClient.getInstance().saveDeLToDoNew(appRecordId,userId,ToDoCenterConstant.URI_send_deleteP,false,result,part,"5",number);
return false;
}
}

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

@ -1,6 +1,5 @@
package shkd.sys.sys.midservice.servicehandler;
import kd.bos.cloudmetric_plugin.utils.GetUrl;
import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.exception.ErrorCode;
@ -40,14 +39,14 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
logger.info("###创建待办_createToDo");
Object shkd_type = SystemParamServiceHelper.getPublicParameter("shkd_type");
if(Objects.equals(shkd_type,"0")){
//正式环境
//旧 eoss 环境
getToDoFormal(ctx,todoInfo);
}else if(Objects.equals(shkd_type,"1")){
//测试环境
getToDoTest(ctx,todoInfo);
//新eoss 环境
getToDoNew(ctx,todoInfo);
}else if(Objects.equals(shkd_type,"2")){
//二套环境
getToDoTest(ctx,todoInfo);
getToDoNew(ctx,todoInfo);
getToDoFormal(ctx,todoInfo);
}
logger.info("###结束待办_createToDo");
@ -110,14 +109,14 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
logger.info("###创建已办_dealToDo");
Object shkd_type = SystemParamServiceHelper.getPublicParameter("shkd_type");
if(Objects.equals(shkd_type,"0")){
//正式环境
//旧 eoss 环境
getDealFormal(ctx,info);
}else if(Objects.equals(shkd_type,"1")){
//测试环境
getDealTest(ctx,info);
//新 eoss 环境
getDealNew(ctx,info);
}else if(Objects.equals(shkd_type,"2")){
//二套环境
getDealTest(ctx,info);
getDealNew(ctx,info);
getDealFormal(ctx,info);
}
logger.info("###结束已办_dealToDo");
@ -128,14 +127,14 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
logger.info("###创建撤销_deleteToDo");
Object shkd_type = SystemParamServiceHelper.getPublicParameter("shkd_type");
if(Objects.equals(shkd_type,"0")){
//正式环境
//旧 eoss 环境
getDeleteFormal(ctx,info);
}else if(Objects.equals(shkd_type,"1")){
//测试环境
getDeleteTest(ctx,info);
//新 eoss 环境
getDeleteNew(ctx,info);
}else if(Objects.equals(shkd_type,"2")){
//二套环境
getDeleteTest(ctx,info);
getDeleteNew(ctx,info);
getDeleteFormal(ctx,info);
}
/* List<Long> userIds = info.getUserIds();
@ -253,7 +252,7 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
/***
* 测试环境、待办
*/
public void getToDoTest(MessageContext ctx, ToDoInfo todoInfo) {
public void getToDoNew(MessageContext ctx, ToDoInfo todoInfo) {
//几个待办
List<Long> userIds = todoInfo.getUserIds();
DynamicObjectCollection query = QueryServiceHelper.query("bos_user", "id,name,number" +
@ -304,7 +303,7 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
form.append("\"0\"");
form.append("}");
logger.info("###待办拼接请求体：" + form);
CreateToDoHandler.get_CreateToDoHandler().sendCreateToDoTest(form.toString(), todoInfo.getTitle(),
CreateToDoHandler.get_CreateToDoHandler().sendCreateToDoNew(form.toString(), todoInfo.getTitle(),
todoInfo.getTaskId().toString(), query_one.getString("username"), dynamicObject.getString("billno"));
}
}
@ -332,7 +331,7 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
/***
* 测试环境、已办
*/
public void getDealTest(MessageContext ctx, ToDoInfo info){
public void getDealNew(MessageContext ctx, ToDoInfo info){
//几个已办
List<Long> userIds = info.getUserIds();
logger.info("####已办taskid:"+info.getTaskId());
@ -343,9 +342,9 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
Long taskId = ctx.getTaskId();
for (DynamicObject queryOne : query) {
if(dynamicObject != null){
DealToDoHandler.get_DealToDoHandler().sendDealToDoTest(taskId,queryOne.getString("username"),dynamicObject.getString("billno"));
DealToDoHandler.get_DealToDoHandler().sendDealToDoNew(taskId,queryOne.getString("username"),dynamicObject.getString("billno"));
}else{
DealToDoHandler.get_DealToDoHandler().sendDealToDoTest(taskId,queryOne.getString("username"),"");
DealToDoHandler.get_DealToDoHandler().sendDealToDoNew(taskId,queryOne.getString("username"),"");
}
}
}
@ -373,7 +372,7 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
/***
* 测试环境、撤销
*/
public void getDeleteTest(MessageContext ctx, ToDoInfo info){
public void getDeleteNew(MessageContext ctx, ToDoInfo 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",
@ -383,9 +382,9 @@ public class BacklogServiceHandle extends AbstractServiceHandler {
logger.info("####撤销taskid:"+info.getTaskId());
for (DynamicObject queryOne : query) {
if(dynamicObject != null){
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDoTest(taskId,queryOne.getString("username"),dynamicObject.getString("billno"));
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDoNew(taskId,queryOne.getString("username"),dynamicObject.getString("billno"));
}else{
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDoTest(taskId,queryOne.getString("username"),"");
deleteToDoHandler.get_deleteToDoHandler().sendDeleteToDoNew(taskId,queryOne.getString("username"),"");
}
}
}

50
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/midservice/utils/RequestClient.java
View File

@ -29,10 +29,10 @@ public class RequestClient {
private final String port;// 端口
private final String clientKey;// 系统标识
private final String clientSecret;// clientSecret-scict
private final String testIp;// 域名
private final String testPort;// 域名
private final String testClientKey;// 系统标识
private final String testClientSecret;// clientSecret-scict
private final String newIp;// 域名
private final String newPort;// 域名
private final String newClientKey;// 系统标识
private final String newClientSecret;// clientSecret-scict
private RequestClient() {
this.protocal = System.getProperty("backlog-protocal");
@ -42,10 +42,10 @@ public class RequestClient {
this.clientKey= System.getProperty("clientKey-scict"); // scicsiku
this.clientSecret= System.getProperty("clientSecret-scict");// 0abbcc87-f1d4-4550-8df7-b45acaa305c8
//测试环境
this.testIp = System.getProperty("scnyfz-ip"); // ip
this.testPort = System.getProperty("scnyfz-port"); //port
this.testClientKey = System.getProperty("scnyfz-scict"); // scicsiku
this.testClientSecret = System.getProperty("scnyfz-scict"); // 18b9a506-d9d8-4d15-9e03-01867cff5824
this.newIp = System.getProperty("scnyfz-ip"); // ip
this.newPort = System.getProperty("scnyfz-port"); //port
this.newClientKey = System.getProperty("scnyfz-scict"); // scicsiku
this.newClientSecret = System.getProperty("scnyfz-clientKey"); // 18b9a506-d9d8-4d15-9e03-01867cff5824
}
/**
@ -103,18 +103,18 @@ public class RequestClient {
* @param body FORM格式字符串
* @return 响应结果报文
*/
public String callServiceTest(String url, String body){
public String callServiceNew(String url, String body){
StringBuffer urlStr = new StringBuffer();
urlStr.append(this.protocal).append("://").append(this.testIp);
if (!StringUtils.isEmpty(this.testPort)) {
urlStr.append(":").append(this.testPort);
urlStr.append(this.protocal).append("://").append(this.newIp);
if (!StringUtils.isEmpty(this.newPort)) {
urlStr.append(":").append(this.newPort);
}
logger.info("###环境参数,protocal:"+this.protocal+",ip:"+this.testIp+",this.port:"+this.testPort);
logger.info("###环境参数,protocal:"+this.protocal+",ip:"+this.newIp+",this.port:"+this.newPort);
urlStr.append(url);
String responseText = null;
String timestamp = Long.toString(System.currentTimeMillis() / 1000);
byte[] securityKey = this.testClientSecret.substring(10, 26).getBytes();
String authenticationCode = SmUtil.sm4(securityKey).encryptHex(testClientKey + testClientSecret + timestamp);
byte[] securityKey = this.newClientSecret.substring(10, 26).getBytes();
String authenticationCode = SmUtil.sm4(securityKey).encryptHex(newClientKey + newClientSecret + timestamp);
logger.info("###请求头主要参数:authen(sign)"+authenticationCode+"###时间戳"+timestamp);
Map<String,Object> params=new HashMap<>(2);
params.put("params",body);
@ -122,7 +122,7 @@ public class RequestClient {
//直接POST请求
responseText = HttpRequest.post(urlStr.toString())
.header("authen", authenticationCode)
.header("clientKey", testClientKey)
.header("clientKey", newClientKey)
.header("timestamp", timestamp)
.header("origin_client", "HttpToken")
.form(params)
@ -194,15 +194,15 @@ public class RequestClient {
* @param userId 用户id
* @param number 单据编码
*/
public void saveCreateToDoTest(String title,String url, boolean isTrue,String result,String jsonMessage,String appRecordId,String userId,String number){
public void saveCreateToDoNew(String title,String url, boolean isTrue,String result,String jsonMessage,String appRecordId,String userId,String number){
logger.info("###开始调用待办保存日志方法");
StringBuffer urlStr = new StringBuffer();
urlStr.append(this.protocal).append("://").append(this.testIp);
if (!StringUtils.isEmpty(this.testPort)) {
urlStr.append(":").append(this.testPort);
urlStr.append(this.protocal).append("://").append(this.newIp);
if (!StringUtils.isEmpty(this.newPort)) {
urlStr.append(":").append(this.newPort);
}
urlStr.append(url);;
logger.info("###保存时,环境参数,protocal:"+this.protocal+",ip:"+this.testIp+",this.port:"+this.testPort);
logger.info("###保存时,环境参数,protocal:"+this.protocal+",ip:"+this.newIp+",this.port:"+this.newPort);
try{
DynamicObject dynamicObject = BusinessDataServiceHelper.newDynamicObject("shkd_backlog1");
logger.info("###保存日志表id"+dynamicObject.getPkValue());
@ -284,12 +284,12 @@ public class RequestClient {
* @param jsonMessage 请求报文
* @param status 类型 2：已办 5：撤销
*/
public void saveDeLToDoTest(Long appRecordId,String userId,String url,boolean isTrue,String result,String jsonMessage,String status,String number){
public void saveDeLToDoNew(Long appRecordId,String userId,String url,boolean isTrue,String result,String jsonMessage,String status,String number){
logger.info("###开始调用已办、撤销保存日志方法");
StringBuffer urlStr = new StringBuffer();
urlStr.append(this.protocal).append("://").append(this.testIp);
if (!StringUtils.isEmpty(this.testPort)) {
urlStr.append(":").append(this.testPort);
urlStr.append(this.protocal).append("://").append(this.newIp);
if (!StringUtils.isEmpty(this.newPort)) {
urlStr.append(":").append(this.newPort);
}
urlStr.append(url);
try{