From 366bd9b4bd8f4323959fbf345c31ce38ea719553 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 18 九月 2023 22:09:57 +0800
Subject: [PATCH] 优化上海接口上传
---
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 154 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 102 insertions(+), 52 deletions(-)
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index e1abe87..665ac10 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -18,12 +18,13 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.BeanWrapper;
+import org.springframework.beans.BeanWrapperImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
+
+import java.beans.PropertyDescriptor;
+import java.util.*;
/**
* 涓婃捣甯傚钩鍙�2023鐗�-涓婁紶鏁版嵁鏈嶅姟绫�
@@ -128,13 +129,13 @@
reqData.setOrderid(orderData.getOrderid());
//韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡)
- reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
+ reqData.setAccess_token(ShRSAUtils.sign(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
//鏁版嵁鎬绘潯鏁�
List<Object> list = (List<Object>) data;
reqData.setDatalength(list.size());
//浣跨敤鍖虹骇骞冲彴鍏挜瀵规暟鎹繘琛孯SA鍔犲瘑
- reqData.setData(RSAUtils.encrypt(jsonData, conf.getPublicKey()));
+ reqData.setData(ShRSAUtils.encryptByPubKey(jsonData, conf.getPublicKey()));
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigst(MyMD5Util.encrypt(jsonData));
@@ -217,12 +218,14 @@
//鎸囦护id
reqData.setOrderid(orderData.getOrderid());
//韬唤绛惧悕锛屼娇鐢ㄨ嚜鏈塕SA绉侀挜杩涜鍔犲瘑(鍦板尯琛屾斂鍖哄垝浠ｇ爜_褰撳ぉ鏃ユ湡)
- reqData.setAccess_token(RSAUtils.encryptData(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
+ reqData.setAccess_token(ShRSAUtils.sign(reqData.getUid() + "_" + DateFormatUtils.format(new Date(), "yyyy-MM-dd"), conf.getPassword()));
//鏁版嵁鎬绘潯鏁�
List<Object> list = (List<Object>) data;
reqData.setDatalength(list.size());
+
//浣跨敤鍖虹骇骞冲彴鍏挜瀵规暟鎹繘琛孯SA鍔犲瘑
- reqData.setData(RSAUtils.encrypt(jsonData, conf.getPublicKey()));
+ reqData.setData(ShRSAUtils.encryptByPubKey(jsonData, conf.getPublicKey()));
+
//鎽樿锛屾暟鎹富浣撶殑MD5鍊�
reqData.setDigst(MyMD5Util.encrypt(jsonData));
@@ -250,6 +253,8 @@
* @throws Exception
*/
private String getJsonData(String inteId, Object data, String code) {
+
+
//鍏蜂綋鏍规嵁鎺ュ彛杩涜灏佽
if (SH2023Constant.SH_2023_API_CODE_1101.equals(inteId)) {
SH2023Api1101 api1101;
@@ -267,7 +272,8 @@
list.add(api1101);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1102.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1102.equals(inteId)) {
SH2023Api1102 api1102;
//鏈�鍚庤浆鎹负json
List<SH2023Api1102> list = new ArrayList<>();
@@ -285,11 +291,13 @@
BeanUtils.copyProperties(apiData, api1102);
api1102.setAjs(api1104List.size());
api1102.setBjw(ShAreaBjw.getBjw(code));
+ api1102.setKqsx("2");
api1102.setCbcr(count);
list.add(api1102);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1103.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1103.equals(inteId)) {
SH2023Api1103 api1103;
//鏈�鍚庤浆鎹负json
List<SH2023Api1103> list = new ArrayList<>();
@@ -305,7 +313,8 @@
list.add(api1103);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1104.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1104.equals(inteId)) {
SH2023Api1104 api1104;
//鏈�鍚庤浆鎹负json
List<SH2023Api1104> list = new ArrayList<>();
@@ -321,7 +330,8 @@
list.add(api1104);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1105.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1105.equals(inteId)) {
SH2023Api1105 api1105;
//鏈�鍚庤浆鎹负json
List<SH2023Api1105> list = new ArrayList<>();
@@ -334,7 +344,8 @@
list.add(api1105);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1106.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1106.equals(inteId)) {
SH2023Api1106 api1106;
//鏈�鍚庤浆鎹负json
List<SH2023Api1106> list = new ArrayList<>();
@@ -347,7 +358,8 @@
list.add(api1106);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1107.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1107.equals(inteId)) {
SH2023Api1107 api1107;
//鏈�鍚庤浆鎹负json
List<SH2023Api1107> list = new ArrayList<>();
@@ -360,7 +372,8 @@
list.add(api1107);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1108.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1108.equals(inteId)) {
SH2023Api1108 api1108;
//鏈�鍚庤浆鎹负json
List<SH2023Api1108> list = new ArrayList<>();
@@ -373,22 +386,29 @@
list.add(api1108);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1109.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1109.equals(inteId)) {
SH2023Api1109 api1109;
//鏈�鍚庤浆鎹负json
List<SH2023Api1109> list = new ArrayList<>();
- FileUtil file = new FileUtil();
//鎶奷ata杞寲鎴恖ist闆嗗悎
List<Api1109> api1109List = castList(data, Api1109.class);
+ Map<String, String> map;
for (Api1109 apiData : api1109List) {
api1109 = new SH2023Api1109();
BeanUtils.copyProperties(apiData, api1109);
api1109.setBjw(ShAreaBjw.getBjw(code));
- api1109.setWjl(file.imgToIo(apiData.getWjdz() + apiData.getWjmc()));
+ if("1".equals(api1109.getWjlx())){
+ api1109.setYwdh("鏃�");
+ }
+ map = new HashMap<>();
+ map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
+ api1109.setWjl(JSON.toJSONString(map));
list.add(api1109);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1110.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1110.equals(inteId)) {
SH2023Api1110 api1110;
//鏈�鍚庤浆鎹负json
List<SH2023Api1110> list = new ArrayList<>();
@@ -409,7 +429,8 @@
list.add(api1110);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1111.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1111.equals(inteId)) {
SH2023Api1111 api1111;
//鏈�鍚庤浆鎹负json
List<SH2023Api1111> list = new ArrayList<>();
@@ -422,7 +443,8 @@
list.add(api1111);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1112.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1112.equals(inteId)) {
SH2023Api1112 api1112;
//鏈�鍚庤浆鎹负json
List<SH2023Api1112> list = new ArrayList<>();
@@ -435,7 +457,8 @@
list.add(api1112);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1113.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1113.equals(inteId)) {
SH2023Api1113 api1113;
//鏈�鍚庤浆鎹负json
List<SH2023Api1113> list = new ArrayList<>();
@@ -448,7 +471,8 @@
list.add(api1113);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1201.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1201.equals(inteId)) {
SH2023Api1201 api1201;
//鏈�鍚庤浆鎹负json
List<SH2023Api1201> list = new ArrayList<>();
@@ -462,7 +486,8 @@
list.add(api1201);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1202.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1202.equals(inteId)) {
SH2023Api1202 api1202;
//鏈�鍚庤浆鎹负json
List<SH2023Api1202> list = new ArrayList<>();
@@ -478,7 +503,8 @@
list.add(api1202);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1203.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1203.equals(inteId)) {
SH2023Api1203 api1203;
//鏈�鍚庤浆鎹负json
List<SH2023Api1203> list = new ArrayList<>();
@@ -494,7 +520,8 @@
list.add(api1203);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1204.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1204.equals(inteId)) {
SH2023Api1204 api1204;
//鏈�鍚庤浆鎹负json
List<SH2023Api1204> list = new ArrayList<>();
@@ -508,7 +535,8 @@
list.add(api1204);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1205.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1205.equals(inteId)) {
SH2023Api1205 api1205;
//鏈�鍚庤浆鎹负json
List<SH2023Api1205> list = new ArrayList<>();
@@ -523,7 +551,8 @@
list.add(api1205);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1206.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1206.equals(inteId)) {
SH2023Api1206 api1206;
//鏈�鍚庤浆鎹负json
List<SH2023Api1206> list = new ArrayList<>();
@@ -538,7 +567,8 @@
list.add(api1206);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1207.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1207.equals(inteId)) {
SH2023Api1207 api1207;
//鏈�鍚庤浆鎹负json
List<SH2023Api1207> list = new ArrayList<>();
@@ -555,7 +585,8 @@
list.add(api1207);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1208.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1208.equals(inteId)) {
SH2023Api1208 api1208;
//鏈�鍚庤浆鎹负json
List<SH2023Api1208> list = new ArrayList<>();
@@ -573,7 +604,8 @@
list.add(api1208);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1209.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1209.equals(inteId)) {
SH2023Api1209 api1209;
//鏈�鍚庤浆鎹负json
List<SH2023Api1209> list = new ArrayList<>();
@@ -591,7 +623,8 @@
list.add(api1209);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1210.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1210.equals(inteId)) {
SH2023Api1210 api1210;
//鏈�鍚庤浆鎹负json
List<SH2023Api1210> list = new ArrayList<>();
@@ -606,7 +639,8 @@
list.add(api1210);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1211.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1211.equals(inteId)) {
SH2023Api1211 api1211;
//鏈�鍚庤浆鎹负json
List<SH2023Api1211> list = new ArrayList<>();
@@ -622,7 +656,8 @@
list.add(api1211);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1212.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1212.equals(inteId)) {
SH2023Api1212 api1212;
//鏈�鍚庤浆鎹负json
List<SH2023Api1212> list = new ArrayList<>();
@@ -635,7 +670,8 @@
list.add(api1212);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1301.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1301.equals(inteId)) {
SH2023Api1301 api1301;
//鏈�鍚庤浆鎹负json
List<SH2023Api1301> list = new ArrayList<>();
@@ -648,7 +684,8 @@
list.add(api1301);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1302.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1302.equals(inteId)) {
SH2023Api1302 api1302;
//鏈�鍚庤浆鎹负json
List<SH2023Api1302> list = new ArrayList<>();
@@ -663,7 +700,8 @@
list.add(api1302);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1303.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1303.equals(inteId)) {
SH2023Api1303 api1303;
//鏈�鍚庤浆鎹负json
List<SH2023Api1303> list = new ArrayList<>();
@@ -677,7 +715,8 @@
list.add(api1303);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1304.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1304.equals(inteId)) {
SH2023Api1304 api1304;
//鏈�鍚庤浆鎹负json
List<SH2023Api1304> list = new ArrayList<>();
@@ -691,7 +730,8 @@
list.add(api1304);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1305.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1305.equals(inteId)) {
SH2023Api1305 api1305;
//鏈�鍚庤浆鎹负json
List<SH2023Api1305> list = new ArrayList<>();
@@ -705,7 +745,8 @@
list.add(api1305);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1306.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1306.equals(inteId)) {
SH2023Api1306 api1306;
//鏈�鍚庤浆鎹负json
List<SH2023Api1306> list = new ArrayList<>();
@@ -720,7 +761,8 @@
list.add(api1306);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1307.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1307.equals(inteId)) {
SH2023Api1307 api1307;
//鏈�鍚庤浆鎹负json
List<SH2023Api1307> list = new ArrayList<>();
@@ -736,7 +778,8 @@
list.add(api1307);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1310.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1310.equals(inteId)) {
SH2023Api1310 api1310;
//鏈�鍚庤浆鎹负json
List<SH2023Api1310> list = new ArrayList<>();
@@ -753,7 +796,8 @@
list.add(api1310);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1401.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1401.equals(inteId)) {
SH2023Api1401 api1401;
//鏈�鍚庤浆鎹负json
List<SH2023Api1401> list = new ArrayList<>();
@@ -766,7 +810,8 @@
list.add(api1401);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1402.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1402.equals(inteId)) {
SH2023Api1402 api1402;
//鏈�鍚庤浆鎹负json
List<SH2023Api1402> list = new ArrayList<>();
@@ -779,7 +824,8 @@
list.add(api1402);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1403.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1403.equals(inteId)) {
SH2023Api1403 api1403;
//鏈�鍚庤浆鎹负json
List<SH2023Api1403> list = new ArrayList<>();
@@ -793,7 +839,8 @@
list.add(api1403);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_1404.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_1404.equals(inteId)) {
SH2023Api1404 api1404;
//鏈�鍚庤浆鎹负json
List<SH2023Api1404> list = new ArrayList<>();
@@ -809,7 +856,7 @@
return JSON.toJSONString(list);
}
// TODO 椤圭洰淇℃伅
-// else if (SH2023Constant.SH_2023_API_CODE_1405.equals(inteId)) {
+// if (SH2023Constant.SH_2023_API_CODE_1405.equals(inteId)) {
// SH2023Api1405 api1405;
// //鏈�鍚庤浆鎹负json
// List<SH2023Api1405> list = new ArrayList<>();
@@ -823,7 +870,8 @@
// }
// return JSON.toJSONString(list);
// }
- else if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
+
+ if (SH2023Constant.SH_2023_API_CODE_2102.equals(inteId)) {
SH2023Api2102 api2102;
//鏈�鍚庤浆鎹负json
List<SH2023Api2102> list = new ArrayList<>();
@@ -841,7 +889,8 @@
list.add(api2102);
}
return JSON.toJSONString(list);
- } else if (SH2023Constant.SH_2023_API_CODE_2203.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_2203.equals(inteId)) {
SH2023Api2203 api2203;
//鏈�鍚庤浆鎹负json
List<SH2023Api2203> list = new ArrayList<>();
@@ -863,7 +912,8 @@
list.add(api2203);
}
return JSON.toJSONString(list);
- }else if (SH2023Constant.SH_2023_API_CODE_2204.equals(inteId)) {
+ }
+ if (SH2023Constant.SH_2023_API_CODE_2204.equals(inteId)) {
SH2023Api2204 api2204;
//鏈�鍚庤浆鎹负json
List<SH2023Api2204> list = new ArrayList<>();
@@ -880,9 +930,9 @@
list.add(api2204);
}
return JSON.toJSONString(list);
- } else {
- return JSON.toJSONString(data);
}
+
+ return JSON.toJSONString(data);
}
/**
--
Gitblit v1.9.3