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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
root 2025-12-31 10:29:36 +08:00
parent 407cc35807 8e8940c6f8
commit 42fca60ce1
1 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
sys/shkd-sys-sys/src/main/java/shkd/sys/sys/plugin/task/SharePushTaskPlugin.java
View File

@ -71,11 +71,10 @@ public class SharePushTaskPlugin extends AbstractTask {
} }
dzhdqFilter=dzhdqFilter.and(zdyqFilter); dzhdqFilter=dzhdqFilter.and(zdyqFilter);
} }
logger.info("dzhdqFilter:"+dzhdqFilter);
DynamicObject[] bei_elecreceiptids = BusinessDataServiceHelper.load("bei_elecreceipt", "id", dzhdqFilter.toArray()); DynamicObject[] bei_elecreceiptids = BusinessDataServiceHelper.load("bei_elecreceipt", "id", dzhdqFilter.toArray());
logger.info("符合推送条件数据有：{}条", bei_elecreceiptids.length); logger.info("符合推送条件数据有：{}条", bei_elecreceiptids.length);
String shkd_url = shkd_apimapping.getString("shkd_url"); String shkd_url = shkd_apimapping.getString("shkd_url");
Map<String, Object> headMap = new HashMap<>(); Map<String, Object> headMap = new HashMap<>();
DynamicObjectCollection shkdHeade = shkd_apimapping.getDynamicObjectCollection("shkd_heade"); DynamicObjectCollection shkdHeade = shkd_apimapping.getDynamicObjectCollection("shkd_heade");
@ -107,15 +106,19 @@ public class SharePushTaskPlugin extends AbstractTask {
String dataflag = data.getString("flag"); String dataflag = data.getString("flag");
if ("0".equals(dataflag)){ if ("0".equals(dataflag)){
resultMap.put("shkd_issuccess",false);//是否成功 resultMap.put("shkd_issuccess",false);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx",false);
}else { }else {
resultMap.put("shkd_issuccess",true);//是否成功 resultMap.put("shkd_issuccess",true);//是否成功
bei_elecreceipt.set("shkd_sfcgtsgx",true); bei_elecreceipt.set("shkd_sfcgtsgx",true);
}
}
DynamicObject[] objects = (DynamicObject[]) saveThePushLog(resultMap);
String billno = objects[0].getString("billno");//对应日志编号
bei_elecreceipt.set("shkd_tsgxrzwybs",billno);//推送共享日志唯一标识
bei_elecreceipt.set("shkd_tsgxrtime",new Date());//推送共享时间
SaveServiceHelper.update(bei_elecreceipt); SaveServiceHelper.update(bei_elecreceipt);
} }
} }
ApiService.saveThePushLog(resultMap);
}
}
private QFilter getqFilter(String shkd_zdygltj) throws ParseException { private QFilter getqFilter(String shkd_zdygltj) throws ParseException {
// 将字符串转换为 JSON 数组 // 将字符串转换为 JSON 数组
@ -391,4 +394,27 @@ public class SharePushTaskPlugin extends AbstractTask {
} }
return resultString; return resultString;
} }
public static Object[] saveThePushLog(Map<String, Object> resultMap) {
String requestUrl = resultMap.get("shkd_requesturl").toString();//请求地址
String request = resultMap.get("shkd_request").toString();//请求体
String response = resultMap.get("shkd_response").toString();//响应数据
String thirdparty = resultMap.get("shkd_thirdpartysys").toString();//第三方系统
String issuccess = resultMap.get("shkd_issuccess").toString();//是否成功
String shkd_calldescription = resultMap.get("shkd_calldescription").toString();//调用说明
DynamicObject dynamicObject = BusinessDataServiceHelper.newDynamicObject("shkd_thirdpartylog");
// 生成随机UUID
UUID uuid = UUID.randomUUID();
dynamicObject.set("billno", "Log_" + uuid);
dynamicObject.set("billstatus", "C");
dynamicObject.set("shkd_calldescription", shkd_calldescription);
dynamicObject.set("shkd_requesturl", requestUrl);
dynamicObject.set("shkd_request", request);
dynamicObject.set("shkd_response", response);
dynamicObject.set("shkd_thirdpartysys", thirdparty);
dynamicObject.set("shkd_issuccess", issuccess);
dynamicObject.set("shkd_logdate", new Date());
Object[] save = SaveServiceHelper.save(new DynamicObject[]{dynamicObject});
return save;
}
} }