From 2d036d97788c6a489d573386da4a1534e20bed99 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 03 十一月 2023 09:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
index 01e6be7..1497798 100644
--- a/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -1,6 +1,7 @@
package com.fzzy.push.whhpjl;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.api.dto.ResponseDto;
@@ -110,14 +111,22 @@
log.info("韬唤绛惧悕锛�" + accessToken);
reqData.setAccesstoken(MyMD5Util.encrypt(accessToken));
//鏁版嵁鎬绘潯鏁�
- List<Object> list = (List<Object>)data;
- reqData.setDatalength(list.size());
+ reqData.setDatalength(1);
//鏁版嵁涓讳綋锛岃繘琛孲M4鍔犲瘑
reqData.setData(SM4Util.encryptEcb(conf.getPublicKey(), jsonData));
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigest(MyMD5Util.encrypt(jsonData));
//鎿嶄綔绫诲瀷
- reqData.setOperator("insert");
+ JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(data));
+ String czbz = jsonObject.getString("czbz");
+ if("u".equals(czbz)){
+ czbz = "update";
+ }else if("d".equals(czbz)){
+ czbz = "delete";
+ }else {
+ czbz = "insert";
+ }
+ reqData.setOperator(czbz);
WhjlRespDto responseDto = whjl2023HttpClientUtil.postPushData(conf.getApiUrl() + inteId, reqData);
apiLog.setStatus(responseDto.getCode() == 200 ? 0 : responseDto.getCode());
@@ -160,22 +169,24 @@
case "1105":
return WhjlConstant.API_CODE_CFXX;
case "1106":
- return WhjlConstant.API_CODE_AJXX;
+ return WhjlConstant.API_CODE_YGXX;
case "1107":
- return WhjlConstant.API_CODE_HWXX;
+ return WhjlConstant.API_CODE_AJXX;
case "1108":
- return WhjlConstant.API_CODE_CCSSDZDA;
+ return WhjlConstant.API_CODE_HWXX;
case "1109":
- return WhjlConstant.API_CODE_CCSSWHJL;
+ return WhjlConstant.API_CODE_CCSSDZDA;
case "1110":
- return WhjlConstant.API_CODE_CCSSBFJL;
+ return WhjlConstant.API_CODE_CCSSWHJL;
case "1111":
- return WhjlConstant.API_CODE_CCSBXX;
+ return WhjlConstant.API_CODE_CCSSBFJL;
case "1112":
- return WhjlConstant.API_CODE_CCSBWHJL;
+ return WhjlConstant.API_CODE_CCSBXX;
case "1113":
- return WhjlConstant.API_CODE_CCSBWXJL;
+ return WhjlConstant.API_CODE_CCSBWHJL;
case "1114":
+ return WhjlConstant.API_CODE_CCSBWXJL;
+ case "11145":
return WhjlConstant.API_CODE_CCSBBFJL;
case "1201":
return WhjlConstant.API_CODE_FSGYSXX;
--
Gitblit v1.9.3