|
|
|
@ -131,7 +131,7 @@ public class ZbomNodeDataPushListener {
|
|
|
|
|
.eq(ZbFactoryNodePushEntity::getDepartCode, value.getDepartCode()) |
|
|
|
|
); |
|
|
|
|
// 已经推送过了就不再推了
|
|
|
|
|
if(CollUtil.isNotEmpty(list)){ |
|
|
|
|
if (CollUtil.isNotEmpty(list)) { |
|
|
|
|
return; |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
@ -156,10 +156,11 @@ public class ZbomNodeDataPushListener {
|
|
|
|
|
Map<String, SendMsg> sendMsgMap = new HashMap<>(); |
|
|
|
|
// 构建提交参数
|
|
|
|
|
buildParam(entries, node, workNodeEnums, orders, noSignNumberMap, nodeOrderMap, nodeConfirmLsit, sendMsgMap); |
|
|
|
|
try { |
|
|
|
|
// 推送给志邦
|
|
|
|
|
if (CollUtil.isNotEmpty(nodeConfirmLsit)) { |
|
|
|
|
for (NodeConfirmParamDTO nodeConfirmParam : nodeConfirmLsit) { |
|
|
|
|
log.info("zb节点数据推送NodeConfirmParamDTO:{}", JSONUtil.toJsonStr(nodeConfirmParam)); |
|
|
|
|
try { |
|
|
|
|
// 推送给志邦
|
|
|
|
|
String key = nodeConfirmParam.getDepartCode() + nodeConfirmParam.getPlatformOrderCode(); |
|
|
|
|
String body = JSONUtil.toJsonStr(nodeConfirmParam); |
|
|
|
|
String result = null; |
|
|
|
@ -224,8 +225,6 @@ public class ZbomNodeDataPushListener {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
// 处理推送不成功的异常情况
|
|
|
|
|
log.error("zb节点推送数据异常:{}", e); |
|
|
|
@ -235,6 +234,8 @@ public class ZbomNodeDataPushListener {
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
private void buildParam(JSONObject entries, String node, WorkNodeEnums workNodeEnums, List<NodeDataDTO> orders, |
|
|
|
|
Map<String, Integer> noSignNumberMap, Map<String, ZbFactoryNodeOrderEntity> nodeOrderMap, |
|
|
|
|