Dlp-Gyjd/dlp-entrustment
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250311 更新

Browse Source
This commit is contained in:
陈江保
2025-03-11 17:54:07 +08:00
parent 73d149c1d8
commit 92bce1a11f
2 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/digital/laboratory/platform/entrustment/listener/PushDataToLabsCareEventListener.java
View File

@@ -46,7 +46,10 @@ public class PushDataToLabsCareEventListener implements ApplicationListener<Push
@Resource
private EntrustmentIdentificationMaterialService entrustmentIdentificationMaterialService;
private DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
private final static DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日");
// "#NULL#" 作为空数据的占位符, 对于系统中没有的信息以占位符代替
private final static String NULL_PLACEHOLDER = "#NULL#";
/**
* 处理委托数据推送事件
@@ -130,7 +133,7 @@ public class PushDataToLabsCareEventListener implements ApplicationListener<Push
jsonObject.set("jdjbrqm", ""); /// 鉴定机构经办人签字 ，我们系统是单位自己打印出来，线下自己手签
jsonObject.set("jdyq", entrustVO.getEntrustRequirement()); // 鉴定要求
jsonObject.set("jyaq", entrustVO.getCaseBrief()); // 简要案情
jsonObject.set("lqrqm", ""); // 领取人签名
jsonObject.set("lqrqm", NULL_PLACEHOLDER); // 领取人签名
jsonObject.set("sjr1", entrustVO.getDeliverer1Name()); // 送检人1姓名
jsonObject.set("sjr2", entrustVO.getDeliverer2Name()); // 送检人2姓名
jsonObject.set("sjr1dh", entrustVO.getDeliverer1Phone()); // 送检人电话
@@ -142,8 +145,8 @@ public class PushDataToLabsCareEventListener implements ApplicationListener<Push
jsonObject.set("slbh", entrustVO.getAcceptNo());
jsonObject.set("slrq", entrustVO.getAcceptTime().format(formatter));
jsonObject.set("slr", commonFeignService.remoteGetUserById(entrustVO.getAcceptUser()).getName());
jsonObject.set("slrqm", ""); // 鉴定机构受理人签字
jsonObject.set("type", "");
jsonObject.set("slrqm", NULL_PLACEHOLDER); // 鉴定机构受理人签字
jsonObject.set("type", NULL_PLACEHOLDER);
jsonObject.set("wtbh", entrustVO.getAcceptNo()); // 委托书编号
jsonObject.set("wtdw", entrustVO.getClientOrgName());
jsonObject.set("wtsj", entrustVO.getEntrustmentTime().format(formatter));
@@ -199,14 +202,17 @@ public class PushDataToLabsCareEventListener implements ApplicationListener<Push
*/
private JSONObject buildEntrustLetterJsonPayload(EntrustmentVO entrustVO, Map<String, Object> dataMap) {
JSONObject jsonObject = new JSONObject();
jsonObject.set("afsj", entrustVO.getHappenTime());
jsonObject.set("ajmc", entrustVO.getCaseName());
jsonObject.set("jyaq", entrustVO.getCaseBrief());
jsonObject.set("sjr1", entrustVO.getDeliverer1Name());
jsonObject.set("afsj", entrustVO.getHappenTime()); // 案发时间
jsonObject.set("ajmc", entrustVO.getCaseName()); // 案事件名称
jsonObject.set("dwgz", NULL_PLACEHOLDER); // 单位盖章
jsonObject.set("jyaq", entrustVO.getCaseBrief()); // 简要案情
jsonObject.set("sjdwfzr", NULL_PLACEHOLDER); // 单位负责人签名
jsonObject.set("sjr1", entrustVO.getDeliverer1Name()); // 送检人
jsonObject.set("sjr2", entrustVO.getDeliverer2Name());
jsonObject.set("sjr1dh", entrustVO.getDeliverer1Phone());
jsonObject.set("sjr2dh", entrustVO.getDeliverer2Phone());
jsonObject.set("slrq", entrustVO.getAcceptTime().format(formatter));
jsonObject.set("type", NULL_PLACEHOLDER);
jsonObject.set("wtdw", entrustVO.getClientOrgName());
jsonObject.set("wtsj", entrustVO.getEntrustmentTime().format(formatter));
jsonObject.set("yjdqk", entrustVO.getOldIdentificationResult());

15
src/main/resources/bootstrap.yml
View File

@@ -79,11 +79,10 @@ config:
pub-sub-domain: true
msgListener:
hardwareTopicName: hardware
countryDrugSystem:
apiPath:
tokenPath: /api/token
taskListPath: /api/sample/environment/sample # 污水样品列表查询
receivePath: /api/sample/environment/receive # 样品签收
rejectPath: /api/sample/environment/reject # 样品拒收
returnPath: /api/sample/environment/return # 样品退回
closePath: /api/sample/environment/close # 样品作废申请
# 贵阳禁毒情报平台推送数据配置
gyjd:
labscare:
api:
host: http://lc2203.cdn.labscare.com
entrust-letter: /thirdparty/report-generate/jianDingWeiTuoShuReport/v1
confirm-letter: /thirdparty/report-generate/jianDingShiXiangQueRenShuReport/v1