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/api/utils/ShRSAUtils.java | 173 +++++++++++++
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java | 4
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java | 13
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java | 32 --
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java | 12
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1113.java | 5
src/main/resources/application-pro.yml | 7
src/main/java/com/fzzy/push/gb2022/GBPushService11.java | 7
src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1109.java | 4
src/main/java/com/fzzy/push/gd2020/GDPushService11.java | 6
src/main/resources/application-pro5303.yml | 4
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java | 4
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java | 19 -
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java | 17
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1109.java | 10
src/main/resources/application-dev.yml | 8
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java | 8
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1114.java | 1
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java | 4
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java | 24 +
src/main/java/com/fzzy/api/view/pr/Api1101PR.java | 2
src/main/java/com/fzzy/api/view/pr/Api1103PR.java | 2
src/main/java/com/fzzy/api/utils/FileUtils.java | 99 +++++++
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 154 +++++++----
/dev/null | 73 -----
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1107.java | 12
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java | 26 -
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java | 17 -
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java | 17 -
29 files changed, 455 insertions(+), 309 deletions(-)
diff --git a/src/main/java/com/fzzy/api/utils/FileUtil.java b/src/main/java/com/fzzy/api/utils/FileUtil.java
deleted file mode 100644
index 2c1e52f..0000000
--- a/src/main/java/com/fzzy/api/utils/FileUtil.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.fzzy.api.utils;
-
-
-import org.apache.commons.lang.time.DateFormatUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.fzzy.data.ConfigData;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.util.Date;
-
-/**
- * 鏂囦欢宸ュ叿绫�
- *
- * @author chen
- * @date 2022-09-26 16:06
- */
-@Service(FileUtil.BEAN_ID)
-public class FileUtil {
-
- public static final String BEAN_ID = "base.fileUtil";
-
- @Autowired
- private ConfigData configData;
-
- public String getInoutFilePath(Date date) {
- if (null == date) {
- date = new Date();
- }
-
- String basePath = configData.getImgPath() + "INOUT/"
- + DateFormatUtils.format(date, "yyyyMM") + "/";
-
- File file = new File(basePath);
- if (!file.exists()) {
- file.mkdirs();
- }
- return basePath;
- }
-
- /**
- * 鑾峰彇鍥剧墖鐨勪簩杩涘埗娴�
- * @param imgPath
- * @return
- */
- @SuppressWarnings("resource")
- public String imgToIo(String imgPath){
- //鍥剧墖杞寲涓轰簩杩涘埗
- byte[] imageBytes = null;
- try {
-
- FileInputStream fileInputStream = new FileInputStream(new File(imgPath));
- imageBytes = new byte[fileInputStream.available()];
- fileInputStream.read(imageBytes);
- } catch (IOException e) {
-
- System.out.println(e);
- return null;
- }
- return UnicodeByteToStr(imageBytes);
- }
-
- private static String UnicodeByteToStr(byte[] b){
- StringBuilder sb = new StringBuilder();
- for(int i=0;i<b.length;i++) {
- sb.append(String.format("%02x", b[i]));
- }
- return sb.toString();
- }
-}
diff --git a/src/main/java/com/fzzy/api/utils/FileUtils.java b/src/main/java/com/fzzy/api/utils/FileUtils.java
new file mode 100644
index 0000000..0ff5bdb
--- /dev/null
+++ b/src/main/java/com/fzzy/api/utils/FileUtils.java
@@ -0,0 +1,99 @@
+package com.fzzy.api.utils;
+
+import com.fzzy.data.ConfigData;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * 灏嗘枃浠惰浆涓轰簩杩涘埗娴佸伐鍏风被
+ * @author czt
+ *
+ */
+@Service(FileUtils.BEAN_ID)
+public class FileUtils {
+ public static final String BEAN_ID = "base.fileUtil";
+
+ @Autowired
+ private ConfigData configData;
+
+
+ /**
+ * 鏍规嵁鏂囦欢璺緞灏嗘枃浠惰浆涓轰簩杩涘埗鏂囦欢娴佸瓧绗︿覆
+ * @param filePath:鏂囦欢璺緞
+ * @return
+ */
+ public static String fileToByteString(String filePath) {
+ byte[] bytes = file2byte(filePath);
+ return toHexString(bytes);
+ }
+
+ /**
+ * 鏍规嵁鏂囦欢璺緞灏嗘枃浠惰浆涓轰簩杩涘埗鏁扮粍
+ * @param filePath:鏂囦欢璺緞
+ * @return
+ */
+ private static byte[] file2byte(String filePath) {
+ byte[] buffer = null;
+ try {
+ File file = new File(filePath);
+ FileInputStream fis = new FileInputStream(file);
+ ByteArrayOutputStream bos = new ByteArrayOutputStream();
+ byte[] b = new byte[1024];
+ int n;
+ while ((n = fis.read(b)) != -1) {
+ bos.write(b, 0, n);
+ }
+ fis.close();
+ bos.close();
+ buffer = bos.toByteArray();
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ return buffer;
+ }
+
+ /**
+ * 灏嗕簩杩涘埗鏁扮粍杞负瀛楃涓�
+ * @param byteArray
+ * @return
+ */
+ private static String toHexString(byte[] byteArray) {
+ if (byteArray == null || byteArray.length < 1)
+ throw new IllegalArgumentException(
+ "this byteArray must not be null or empty");
+
+ final StringBuilder hexString = new StringBuilder();
+ for (int i = 0; i < byteArray.length; i++) {
+ if ((byteArray[i] & 0xff) < 0x10)// 0~F鍓嶉潰涓嶉浂
+ hexString.append("0");
+ hexString.append(Integer.toHexString(0xFF & byteArray[i]));
+ }
+ return hexString.toString().toLowerCase();
+ }
+
+ public String getInoutFilePath(Date date) {
+ if (null == date) {
+ date = new Date();
+ }
+
+ String basePath = configData.getImgPath() + "INOUT/"
+ + DateFormatUtils.format(date, "yyyyMM") + "/";
+
+ File file = new File(basePath);
+ if (!file.exists()) {
+ file.mkdirs();
+ }
+
+ return basePath;
+ }
+}
diff --git a/src/main/java/com/fzzy/api/utils/ShRSAUtils.java b/src/main/java/com/fzzy/api/utils/ShRSAUtils.java
new file mode 100644
index 0000000..b9f6503
--- /dev/null
+++ b/src/main/java/com/fzzy/api/utils/ShRSAUtils.java
@@ -0,0 +1,173 @@
+package com.fzzy.api.utils;
+
+;
+
+import org.apache.commons.codec.binary.Base64;
+
+
+import javax.crypto.Cipher;
+import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.security.*;
+import java.security.spec.PKCS8EncodedKeySpec;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * date: 2022-08-31
+ * 涓婃捣鏄钩鍙版帴鍙ｄ汉鍛樻彁渚�
+ */
+public class ShRSAUtils {
+
+ // 鏁板瓧绛惧悕锛屽瘑閽ョ畻娉�
+ private static final String RSA_KEY_ALGORITHM = "RSA";
+ // 鏁板瓧绛惧悕绛惧悕/楠岃瘉绠楁硶
+ private static final String SIGNATURE_ALGORITHM = "MD5withRSA";
+ //鍒嗘鍔犲瘑澶у皬
+ public static int MAX_ENCRYPT_BLOCK = 117;
+ //鍒嗘瑙ｅ瘑澶у皬
+ public static int MAX_DECRYPT_BLOCK = 128;
+ //瀵嗛挜澶у皬
+ public static int KEY_SIZE = 1024;
+
+ /**
+ * 鍒濆鍖朢SA瀵嗛挜瀵�
+ */
+ @SuppressWarnings("unused")
+ private static Map<String, String> initKey(String str) throws Exception {
+ KeyPairGenerator keygen = KeyPairGenerator.getInstance(RSA_KEY_ALGORITHM);
+ SecureRandom secrand = new SecureRandom();
+ secrand.setSeed(str.getBytes());// 鍒濆鍖栭殢鏈轰骇鐢熷櫒
+ keygen.initialize(KEY_SIZE, secrand); // 鍒濆鍖栧瘑閽ョ敓鎴愬櫒
+ KeyPair keys = keygen.genKeyPair();
+ String pub_key = new String(Base64.encodeBase64(keys.getPublic().getEncoded()),"utf-8");
+ String pri_key = new String(Base64.encodeBase64(keys.getPrivate().getEncoded()),"utf-8");
+ Map<String, String> keyMap = new HashMap<String, String>();
+ System.out.println("鍏挜锛�" + pub_key);
+ System.out.println("绉侀挜锛�" + pri_key);
+ return keyMap;
+ }
+
+ /**
+ * 鏁板瓧绛惧悕
+ */
+ public static String sign(String text, String pri_key) throws Exception {
+ byte[] data = text.getBytes();
+ // 鍙栧緱绉侀挜
+ byte[] pri_key_bytes = Base64.decodeBase64(pri_key.getBytes());
+ PKCS8EncodedKeySpec pkcs8KeySpec = new PKCS8EncodedKeySpec(pri_key_bytes);
+ KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+ // 鐢熸垚绉侀挜
+ PrivateKey priKey = keyFactory.generatePrivate(pkcs8KeySpec);
+ // 瀹炰緥鍖朣ignature
+ Signature signature = Signature.getInstance(SIGNATURE_ALGORITHM);
+ // 鍒濆鍖朣ignature
+ signature.initSign(priKey);
+ // 鏇存柊
+ signature.update(data);
+ return new String(Base64.encodeBase64(signature.sign()),"utf-8");
+ }
+
+
+
+ /**
+ * 鍏挜鍔犲瘑
+ * @param data 寰呭姞瀵嗘暟鎹�
+ * @param pub_key 鍏挜
+ * @return 瀵嗘枃
+ * @throws Exception 鎶涘嚭寮傚父
+ */
+ private static byte[] encryptByPubKey(byte[] data, byte[] pub_key) throws Exception {
+ // 鍙栧緱鍏挜
+ X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(pub_key);
+ KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+ PublicKey publicKey = keyFactory.generatePublic(x509KeySpec);
+ // 瀵规暟鎹姞瀵�
+ Cipher cipher = Cipher.getInstance(keyFactory.getAlgorithm());
+ cipher.init(Cipher.ENCRYPT_MODE, publicKey);
+// return cipher.doFinal(data);
+
+ int inputLen = data.length;
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ int offSet = 0;
+ byte[] cache;
+ int i = 0;
+ // 瀵规暟鎹垎娈靛姞瀵�
+ while (inputLen - offSet > 0) {
+ if (inputLen - offSet > MAX_ENCRYPT_BLOCK) {
+ cache = cipher.doFinal(data, offSet, MAX_ENCRYPT_BLOCK);
+ } else {
+ cache = cipher.doFinal(data, offSet, inputLen - offSet);
+ }
+ out.write(cache, 0, cache.length);
+ i++;
+ offSet = i * MAX_ENCRYPT_BLOCK;
+ }
+ byte[] encryptedData = out.toByteArray();
+ out.close();
+ return encryptedData;
+ }
+ /**
+ * RSA鏍￠獙鏁板瓧绛惧悕
+ */
+ public static boolean verify(byte[] data, byte[] sign, String pub_key) throws Exception {
+ // 杞崲鍏挜鏉愭枡
+ // 瀹炰緥鍖栧瘑閽ュ伐鍘�
+ byte[] pub_key_bytes = Base64.decodeBase64(pub_key.getBytes());
+ KeyFactory keyFactory = KeyFactory.getInstance(RSA_KEY_ALGORITHM);
+ // 鍒濆鍖栧叕閽�
+ // 瀵嗛挜鏉愭枡杞崲
+ X509EncodedKeySpec x509KeySpec = new X509EncodedKeySpec(pub_key_bytes);
+ // 浜х敓鍏挜
+ PublicKey pubKey = keyFactory.generatePublic(x509KeySpec);
+ // 瀹炰緥鍖朣ignature
+ Signature signature = Signature.getInstance(SIGNATURE_ALGORITHM);
+ // 鍒濆鍖朣ignature
+ signature.initVerify(pubKey);
+ // 鏇存柊
+ signature.update(data);
+ // 楠岃瘉
+ return signature.verify(sign);
+ }
+ public static boolean InspecdataSign(String data,String accessToken,String pubkey){
+ String sign = data;
+ try {
+ if(ShRSAUtils.verify(sign.getBytes(), Base64.decodeBase64(accessToken.getBytes()), pubkey)){
+ return true;
+ }else{
+ return false;
+ }
+ } catch (Exception e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return false;
+ }
+ }
+ /**
+ * 鍏挜鍔犲瘑
+ * @param data 寰呭姞瀵嗘暟鎹�
+ * @param pub_key 鍏挜
+ * @return 瀵嗘枃
+ * @throws Exception 鎶涘嚭寮傚父
+ */
+ public static String encryptByPubKey(String data, String pub_key) throws Exception {
+
+ byte[] pub_key_bytes = Base64.decodeBase64(pub_key.getBytes("utf-8"));
+ byte[] enSign = encryptByPubKey(data.getBytes("utf-8"), pub_key_bytes);
+ return new String(Base64.encodeBase64(enSign),"utf-8");
+ }
+
+
+
+ public static void main(String[] args) throws Exception{
+// initKey("鍢夊畾鍖烘櫤鎱х伯搴撴帴鍙�2023");
+ String signStr = "310114_2022-09-18";
+ String pri_key = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=";
+ String pub_key = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB";
+ String access_token = ShRSAUtils.sign(signStr, pri_key);
+ System.out.println(access_token);
+ System.out.println(InspecdataSign(signStr,access_token,pub_key));
+ }
+
+}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1101PR.java b/src/main/java/com/fzzy/api/view/pr/Api1101PR.java
index bb2579a..c39f94a 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1101PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1101PR.java
@@ -174,7 +174,7 @@
for (Api1101 data : items) {
if (Constant.CZBZ_I.equals(data.getCzbz())) {
//鏇存柊鐘舵��
- api1101Rep.updateStatus(data.getKqdm(), Constant.CZBZ_U);
+ api1101Rep.updateStatus(data.getDwdm(), Constant.CZBZ_U);
}
}
}
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1103PR.java b/src/main/java/com/fzzy/api/view/pr/Api1103PR.java
index 53c942b..a760323 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1103PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1103PR.java
@@ -160,7 +160,7 @@
private String pushDataList(List<Api1103> items, ApiRemoteService apiRemoteService, ApiConfs apiConf) {
//灏佽鍙傛暟
- ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1102);
+ ApiParam param = new ApiParam(apiConf, Constant.API_CATEGORY_11, Constant.API_CODE_1103);
//鎺ㄩ�侊紝鏁版嵁涓洪泦鍚堝舰寮�
ResponseDto responseDto = apiRemoteService.pushData(param, apiConf, items);
diff --git a/src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1109.java b/src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1109.java
index 623c33c..f39dc17 100644
--- a/src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy30/impl/Fzzy30Sync1109.java
@@ -4,7 +4,7 @@
import com.fzzy.api.entity.Api1109;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.utils.FileUtil;
+import com.fzzy.api.utils.FileUtils;
import com.fzzy.api.view.repository.Api1109Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.async.fzzy30.entity.FileInfo;
@@ -39,7 +39,7 @@
@Autowired
private ApiLogRep apiLogRep;
@Autowired
- private FileUtil fileUtil;
+ private FileUtils fileUtil;
/**
* 鍚屾鏂囦欢鎺ュ彛
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
index bef4291..90c59db 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1109.java
@@ -6,7 +6,7 @@
import com.fzzy.api.entity.Api1205;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.utils.FileUtil;
+import com.fzzy.api.utils.FileUtils;
import com.fzzy.api.view.repository.Api1109Rep;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.Api1205Rep;
@@ -57,7 +57,7 @@
@Autowired
private ApiLogRep apiLogRep;
@Autowired
- private FileUtil fileUtil;
+ private FileUtils fileUtil;
/**
* 鍚屾鏂囦欢鎺ュ彛
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
index 243c1e7..61c3e9b 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1109.java
@@ -6,7 +6,7 @@
import com.fzzy.api.entity.Api1205;
import com.fzzy.api.entity.ApiLog;
import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.utils.FileUtil;
+import com.fzzy.api.utils.FileUtils;
import com.fzzy.api.view.repository.Api1109Rep;
import com.fzzy.api.view.repository.Api1202Rep;
import com.fzzy.api.view.repository.Api1205Rep;
@@ -58,7 +58,7 @@
@Autowired
private ApiLogRep apiLogRep;
@Autowired
- private FileUtil fileUtil;
+ private FileUtils fileUtil;
/**
* 鍚屾鏂囦欢鎺ュ彛
diff --git a/src/main/java/com/fzzy/push/gb2022/GBPushService11.java b/src/main/java/com/fzzy/push/gb2022/GBPushService11.java
index d01107e..d958ddb 100644
--- a/src/main/java/com/fzzy/push/gb2022/GBPushService11.java
+++ b/src/main/java/com/fzzy/push/gb2022/GBPushService11.java
@@ -6,13 +6,12 @@
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.Api1109;
import com.fzzy.api.service.PushService11;
-import com.fzzy.api.utils.FileUtil;
+import com.fzzy.api.utils.FileUtils;
import com.fzzy.api.view.repository.Api1109Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-
import java.util.List;
/**
@@ -26,8 +25,6 @@
private Api1109Rep api1109Rep;
@Autowired
private GBApiRemoteService apiRemoteService;
- @Autowired
- private FileUtil fileUtil;
@Override
@@ -68,7 +65,7 @@
apiData = new Api1109();
BeanUtils.copyProperties(data, apiData);
//鑾峰彇浜岃繘鍒舵枃浠舵祦
- apiData.setWjl(fileUtil.imgToIo(apiData.getWjdz()));
+ apiData.setWjl(FileUtils.fileToByteString(apiData.getWjdz()));
param.setBizId(data.getBizId());
diff --git a/src/main/java/com/fzzy/push/gd2020/GDPushService11.java b/src/main/java/com/fzzy/push/gd2020/GDPushService11.java
index a193b5a..b60e685 100644
--- a/src/main/java/com/fzzy/push/gd2020/GDPushService11.java
+++ b/src/main/java/com/fzzy/push/gd2020/GDPushService11.java
@@ -6,7 +6,7 @@
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.Api1109;
import com.fzzy.api.service.PushService11;
-import com.fzzy.api.utils.FileUtil;
+import com.fzzy.api.utils.FileUtils;
import com.fzzy.api.view.repository.Api1109Rep;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -27,7 +27,7 @@
@Autowired
private Api1109Rep api1109Rep;
@Autowired
- private FileUtil fileUtil;
+ private FileUtils fileUtil;
@Autowired
private GDApiRemoteService apiRemoteService;
@@ -69,7 +69,7 @@
apiData = new Api1109();
BeanUtils.copyProperties(data, apiData);
//鑾峰彇浜岃繘鍒舵枃浠舵祦
- apiData.setWjl(fileUtil.imgToIo(apiData.getWjdz()));
+ apiData.setWjl(FileUtils.fileToByteString(apiData.getWjdz()));
param.setBizId(data.getBizId());
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);
}
/**
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
index 42fcb22..ff92803 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
@@ -29,8 +29,6 @@
private String dwlx;
@PropertyDef(label = "娉ㄥ唽鏃ユ湡")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@JSONField(format = "yyyy-MM-dd")
private Date zcrq;
@@ -59,13 +57,16 @@
private String zcdz;
@PropertyDef(label = "鐢靛瓙閭")
- private String dzyx;
+ @JSONField(serialize = true)
+ private String dzyx = "鏃�";
@PropertyDef(label = "浼佷笟瀹樻柟缃戠珯鍦板潃")
- private String qygfwzdz;
+ @JSONField(serialize = true)
+ private String qygfwzdz = "鏃�";
@PropertyDef(label = "浼犵湡鍙风爜")
- private String czhm;
+ @JSONField(serialize = true)
+ private String czhm = "鏃�";
@PropertyDef(label = "閭斂缂栫爜")
private String yzbm;
@@ -73,15 +74,13 @@
@PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
private String xzqhdm;
- @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞")
- @JSONField(serialize = false)
- private String xzqhmc;
-
@PropertyDef(label = "涓婄骇鍗曚綅鍚嶇О")
- private String sjdwmc;
+ @JSONField(serialize = true)
+ private String sjdwmc = "鏃�";
@PropertyDef(label = "涓婄骇鍗曚綅浠ｇ爜")
- private String sjdwdm;
+ @JSONField(serialize = true)
+ private String sjdwdm = "鏃�";
@PropertyDef(label = "搴撳尯鏁�")
private Integer kqs;
@@ -104,11 +103,10 @@
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
- @PropertyDef(label = "鏍囪浣�")
- private String bjw;
-
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj;
+ @PropertyDef(label = "鏍囪浣�")
+ private String bjw;
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
index 12e7202..3c42fb4 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
@@ -17,16 +17,12 @@
* 鎺ュ彛琛�-搴撳尯淇℃伅
*/
@Data
-@EqualsAndHashCode(callSuper = false)
public class SH2023Api1102 implements Serializable {
private static final long serialVersionUID = 6597930270077627879L;
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
-
- @PropertyDef(label = "涓氬姟id")
- private String bizId;
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
@@ -40,18 +36,14 @@
@PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜")
private String xzqhdm;
- @PropertyDef(label = "琛屾斂鍖哄垝鍚嶇О", description = "闈炲浗鏍囧瓧娈碉紝鍚庢湡澧炲姞")
- @JSONField(serialize = false)
- private String xzqhmc;
-
@PropertyDef(label = "搴撳尯浜ф潈", description = "1锛� 鑷湁 2锛氱璧� 3锛氬叡鏈� 4锛氭贩鍚� 9锛氬叾浠�")
private String kqcq;
- @PropertyDef(label = "鏈夋晥浠撳")
- private double yxcr;
-
@PropertyDef(label = "鍌ㄥ浠撳")
private double cbcr;
+
+ @PropertyDef(label = "鏈夋晥浠撳")
+ private double yxcr;
@PropertyDef(label = "鏈夋晥缃愬")
private double yxgr;
@@ -62,6 +54,9 @@
@PropertyDef(label = "浠撴埧鏁�")
private Integer cfs;
+ @PropertyDef(label = "寤掗棿鏁�")
+ private Integer ajs;
+
@PropertyDef(label = "娌圭綈鏁�")
private Integer ygs;
@@ -71,15 +66,6 @@
@PropertyDef(label = "搴撳尯绾害")
private double wd;
- @PropertyDef(label = "搴撳尯鐘舵��", description = "1:姝ｅ父锛堥粯璁わ級 2:閫�鍑哄偍澶囩伯鎵垮偍")
- private String kqzt;
-
- @PropertyDef(label = "娴峰悍鍖哄煙ID", description = "瀵瑰簲娴峰悍瑙嗛骞冲彴regionIndexCode瀛楁")
- private String hkRegionId;
-
- @PropertyDef(label = "浜ф潈鏂瑰簱鍖轰唬鐮�", description = "鑷湁浜ф潈鏃跺簱鍖轰唬鐮佸繀椤荤瓑浜庝骇鏉冩柟搴撳尯浠ｇ爜,闈炶嚜鏈変骇鏉冩椂搴撳尯浠ｇ爜涓嶈兘绛変簬浜ф潈鏂瑰簱鍖轰唬鐮�")
- private String cqfkqdm;
-
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
@@ -88,14 +74,8 @@
private Date zhgxsj;
@PropertyDef(label = "搴撳尯灞炴��", description = "1:甯傜骇鐩村睘锛�2:鍖虹骇鐩村睘锛�3:绀句細浠撳锛�4:鍏朵粬")
- @JSONField(serialize = false)
private String kqsx;
-
- @PropertyDef(label = "寤掗棿鏁�")
- private Integer ajs;
@PropertyDef(label = "鏍囪浣�")
private String bjw;
-
-
}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java
index d6f4acc..5303e5d 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java
@@ -3,12 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -16,22 +10,12 @@
* 鎺ュ彛琛�-浠撴埧淇℃伅
*/
@Data
-@EqualsAndHashCode(callSuper = false)
public class SH2023Api1103 implements Serializable {
/**
*
*/
private static final long serialVersionUID = 8095346227076335949L;
-
- @JSONField(serialize = false)
- @PropertyDef(label = "涓氬姟id")
- private String bizId;
-
-
- @JSONField(serialize = false)
- @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
- private Date syncTime;
@PropertyDef(label = "浠撴埧浠ｇ爜")
private String cfdm;
@@ -209,5 +193,4 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
-
-}
+}
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
index ecd26f4..4af04e0 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
@@ -2,25 +2,17 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
-import com.fzzy.api.entity.ApiParent;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
/**
* 鎺ュ彛琛�-寤掗棿淇℃伅
*
- * @author chen
+ * @author czt
* @date 2022-09-02 14:18
*/
@Data
-@EqualsAndHashCode(callSuper = false)
public class SH2023Api1104 implements Serializable {
/**
@@ -56,6 +48,9 @@
@PropertyDef(label = "寤掗棿鍚敤鏃ユ湡")
private Date ajqyrq;
+ @PropertyDef(label = "浣跨敤搴撳尯浠ｇ爜")
+ private String sykqdm;
+
@PropertyDef(label = "寤掗棿鐘舵��")
private String ajzt;
@@ -66,11 +61,7 @@
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
private Date zhgxsj;
- @PropertyDef(label = "浣跨敤搴撳尯浠ｇ爜")
- private String sykqdm;
-
@PropertyDef(label = "鏍囪浣�")
private String bjw;
-
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
index f788b6c..5ca6fe6 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
@@ -2,10 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
-import com.fzzy.api.entity.ApiParent;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-
import java.io.Serializable;
import java.util.Date;
@@ -13,7 +10,6 @@
* 鎺ュ彛琛�-璐т綅淇℃伅
*/
@Data
-@EqualsAndHashCode(callSuper = false)
public class SH2023Api1105 implements Serializable {
/**
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java
index 0eefb92..3e039d5 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java
@@ -3,11 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -22,9 +17,6 @@
*/
private static final long serialVersionUID = -9096483549679877168L;
- @JSONField(serialize = false)
- @PropertyDef(label = "涓氬姟id")
- private String bizId;
@PropertyDef(label = "娌圭綈浠ｇ爜")
private String ygdm;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1107.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1107.java
index 6eb656e..105c6bb 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1107.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1107.java
@@ -2,13 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
-import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -23,13 +17,11 @@
*/
private static final long serialVersionUID = 4932872139553449835L;
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
@PropertyDef(label = "璁惧缂栧彿")
private String sbbh;
-
-
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- private String kqdm;
@PropertyDef(label = "璁惧浠櫒鍚嶇О")
private String sbyqmc;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java
index 378d94f..c686df1 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java
@@ -24,14 +24,15 @@
*/
private static final long serialVersionUID = -7131774374918644731L;
+ @PropertyDef(label = "鑽墏缂栧彿")
+ private String yjbh;
@PropertyDef(label = "搴撳尯浠ｇ爜")
- @Column(name = "kqdm", length = 21)
private String kqdm;
- @PropertyDef(label = "鑽墏缂栧彿")
- @Column(name = "yjbh", length = 50)
- private String yjbh;
+ @PropertyDef(label = "閲囪喘鏃ユ湡")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date cgrq;
@PropertyDef(label = "鑽墏鍚嶇О")
private String yjmc;
@@ -66,10 +67,6 @@
@PropertyDef(label = "淇濊川鏈�")
@JSONField(format = "yyyy-MM-dd")
private Date bzq;
-
- @PropertyDef(label = "閲囪喘鏃ユ湡")
- @JSONField(format = "yyyy-MM-dd")
- private Date cgrq;
@PropertyDef(label = "搴撳瓨鏁伴噺")
private Double kcsl;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1109.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1109.java
index e10e882..4986870 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1109.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1109.java
@@ -3,11 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -32,6 +27,9 @@
@PropertyDef(label = "鏂囦欢绫诲瀷", description = "1锛氬簱鍖洪笩鐬板浘 2锛氬叆搴撳浘鐗� 3锛氬嚭搴撳浘鐗� 4锛氬叆搴撴鏂よ棰戯紙鎴彇妫�鏂ゆ椂闂村墠鍚庡悇 5绉掗挓瑙嗛锛�5锛氬嚭搴撴鏂よ棰戯紙鎴彇妫�鏂ゆ椂闂村墠鍚庡悇 5 绉掗挓瑙嗛锛�104锛氱啅钂稿妗堟帴鍙ｉ檮浠�")
private String wjlx;
+ @PropertyDef(label = "涓氬姟鍗曞彿", description = "褰撴枃浠剁被鍨嬩负1锛屼负绌猴紱褰撴枃浠剁被鍨嬩负2銆�3銆�4銆�5浼犲嚭鍏ュ簱涓氬姟鍗曞彿锛涘綋鏂囦欢绫诲瀷涓�6锛屼紶鍚堝悓鍙凤紱褰撴枃浠剁被鍨嬩负10.銆�11锛屼紶椋庨櫓鐐圭紪鐮�")
+ private String ywdh;
+
@PropertyDef(label = "鏂囦欢娴�")
private String wjl;
@@ -42,6 +40,6 @@
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj;
- @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
+ @PropertyDef(label = "鏍囪浣�")
private String bjw;
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java
index ff2a0e4..b2078a2 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java
@@ -3,11 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -22,11 +17,11 @@
*/
private static final long serialVersionUID = 2592349036859314053L;
- @PropertyDef(label = "寤掗棿浠ｇ爜")
- private String ajdm;
-
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String ajdm;
@PropertyDef(label = "寤掗棿鐩稿浣嶇疆")
private String ajxdwz;
@@ -46,6 +41,5 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
-
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java
index ad59a1e..e3c765e 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java
@@ -3,11 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -22,14 +17,14 @@
*/
private static final long serialVersionUID = -2000199652473542869L;
- @PropertyDef(label = "瑙嗛鐩戞帶璁惧id")
- private String spjksbid;
-
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
@PropertyDef(label = "瑙嗛鐩戞帶璁惧鍚嶇О")
private String spjksbmc;
+
+ @PropertyDef(label = "瑙嗛鐩戞帶璁惧id")
+ private String spjksbid;
@PropertyDef(label = "瑙嗛鐩戞帶璁惧鐩稿浣嶇疆")
private String spjksbxdwz;
@@ -37,11 +32,11 @@
@PropertyDef(label = "瑙嗛鐩戞帶璁惧浣嶇疆鏍峰紡")
private String spjksbwzys;
+ @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷", description = "1:浠撳唴锛�2:涓氬姟锛�3:瀹夐槻")
+ private String spjklx;
+
@PropertyDef(label = "澶囨敞")
private String bz;
-
- @PropertyDef(label = "瑙嗛鐩戞帶绫诲瀷", description = "锛�1:浠撳唴锛�2:涓氬姟锛�3:瀹夐槻锛�")
- private String spjklx;
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java
index d20afe9..2450b24 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java
@@ -3,11 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
@@ -21,13 +16,8 @@
*
*/
private static final long serialVersionUID = -6628887714024258654L;
-
- @PropertyDef(label = "韬唤璇佸彿鐮�")
- private String sfzhm;
-
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
-
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
@@ -46,6 +36,9 @@
@PropertyDef(label = "鎬у埆")
private String xb;
+
+ @PropertyDef(label = "韬唤璇佸彿鐮�")
+ private String sfzhm;
@PropertyDef(label = "鍏ヨ亴鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
@@ -82,6 +75,9 @@
@PropertyDef(label = "涓撲笟")
private String zy;
+ @PropertyDef(label = "鏈�楂樿亴绉�")
+ private String zgzc;
+
@PropertyDef(label = "鍙栧緱鏈�楂樿亴绉版垨鑱屼笟璧勬牸鏃堕棿")
@JSONField(format = "yyyy-MM-dd")
private Date qdzgzchzyzgsj;
@@ -92,6 +88,13 @@
@PropertyDef(label = "鑱屽姟")
private String zw;
+ @PropertyDef(label = "鑽ｈ獕绉板彿")
+ private String rych;
+
+ @PropertyDef(label = "鍙栧緱鑽ｈ獕绉板彿鏃堕棿")
+ @JSONField(format = "yyyy-MM-dd")
+ private Date hdrychsj;
+
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
@@ -101,6 +104,5 @@
@PropertyDef(label = "鏍囪浣�")
private String bjw;
-
}
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1113.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1113.java
index a5a1252..5a78eef 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1113.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1113.java
@@ -3,11 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.util.Date;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1114.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1114.java
index 6c9ca18..b5305f9 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1114.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1114.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
index a99e9e6..43e6355 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
@@ -4,12 +4,7 @@
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.conf.NumberSerializer;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-
import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -18,7 +13,6 @@
* 鎺ュ彛琛�-鍚堝悓淇℃伅
*/
@Data
-@EqualsAndHashCode(callSuper = false)
public class SH2023Api1201 implements Serializable {
/**
@@ -156,17 +150,6 @@
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏇存柊鏃堕棿")
private Date zhgxsj;
-
- @JSONField(serialize = false)
- @PropertyDef(label = "涓氬姟id")
- private String bizId;
-
- @PropertyDef(label = "搴撳尯浠ｇ爜")
- private String kqdm;
-
- @JSONField(serialize = false)
- @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
- private Date syncTime;
@PropertyDef(label = "鍚堝悓鏄惁涓")
private String htsfzz;
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index ac0cb17..40ca9c7 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -6,7 +6,7 @@
#涓绘暟鎹簮
primary:
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #澶ф咕鍖�
-# url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼搴�
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_1?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-娓彛鏂颁粨
@@ -22,7 +22,7 @@
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5317_10?useUnicode=true&useSSL=false&characterEncoding=utf-8 #娼槼-鍜屽钩绮墍
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢鍙板北
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8 #骞夸笢闊跺叧
- url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
+# url: jdbc:mysql://127.0.0.1:3306/igds_api_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
# url: jdbc:mysql://127.0.0.1:3306/igds_api_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
username: root
password: Abc123..
@@ -30,12 +30,12 @@
#娆℃暟鎹簮
secondary:
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5016?useUnicode=true&useSSL=false&characterEncoding=utf-8 #澶ф咕鍖�
-# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
+ url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5303?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5311?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5317?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5320?useUnicode=true&useSSL=false&characterEncoding=utf-8
# url: jdbc:mysql://127.0.0.1:3306/igds_3.5_5321?useUnicode=true&useSSL=false&characterEncoding=utf-8
- url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
+# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5326?useUnicode=true&useSSL=false&characterEncoding=utf-8 #鎯犲窞鎯犳柊
# url: jdbc:mysql://127.0.0.1:3306/igds_4.0_5327?useUnicode=true&useSSL=false&characterEncoding=utf-8 #姝︽眽榛勯檪鍐涚伯
username: root
password: Abc123..
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index e784d0e..9730153 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -53,4 +53,9 @@
default:
companyId: 5303
file-path: D:/IGDS-API/FILE/
- img-path: D:/IGDS/FILE/
\ No newline at end of file
+ img-path: D:/IGDS/FILE/
+ # 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
+ # 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB
+ #绉侀挜锛歁IICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=
\ No newline at end of file
diff --git a/src/main/resources/application-pro5303.yml b/src/main/resources/application-pro5303.yml
index 73f20e5..1546be1 100644
--- a/src/main/resources/application-pro5303.yml
+++ b/src/main/resources/application-pro5303.yml
@@ -57,5 +57,5 @@
# 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
#鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
# 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
- #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5tOvvBfAbNstnTjQU6VpcgE1Agy3ifXZovHEEnWEMSW5Z5H21VxHTQo2Jl6qi+NH03gKBR0pjOUuqnTMiv5oyZnNo8KKNmF4p+0dFTcEjQ72hsYrNDXjTIn1xzlzuABzGTeOP5W31VO7YsUlQQLj26bWRiwsojaXh7xiUdIUGywIDAQAB
- #绉侀挜锛歁IICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALm06+8F8Bs2y2dONBTpWlyATUCDLeJ9dmi8cQSdYQxJblnkfbVXEdNCjYmXqqL40fTeAoFHSmM5S6qdMyK/mjJmc2jwoo2YXin7R0VNwSNDvaGxis0NeNMifXHOXO4AHMZN44/lbfVU7tixSVBAuPbptZGLCyiNpeHvGJR0hQbLAgMBAAECgYAuispqwFk56NS3kmD5MLbF4h36YiYY0orfmwLUPkE5XBn9C4f579V21gI1Dr7kU2oDbbTBA8X/8jcljnpnZg/VzlVaY1TlnBFN7UQxNrMtIZbt3Tk2TyAKl+kGy/RvMu8y0y8/vVE2hyfXsdbwmGRXLw4o02fziOznwgDHBmU4sQJBAOhyMdIQfPrKCocVJ2fqqEyVqW05klVPxRqHeltXjTe2Nr8/dSxDS4TUH1VK63ZBTWcBNiMS7u7OhpaygYwLFQMCQQDMhkb9qgGDZT2CqGA3yGylRDBfw1d8YfK1qDZuvzEhc+v16aZ5X7hxQgDLgGvArjBGyV5rxq2ZCVCbpNqT3yiZAkEAnq4OKqwM1ZuFck/TldIQUC+++IxbxBdvo7umoKJ1Cfo/B3HHiI7sB+JS/YPml9TehRnDnk/3gljEci2r2DFchwJAIsPgZVX0k+Uto3wDfvfun9kLb/vAb0AnBYHmXsTZERqnTVG+HnuK2pWhlPXrWwFA64dnKWLIN29B6HMJRIF2YQJAC8cUhkAX80EVIAz/9JK+4X8yJk0lUFpi+6meE0hhaABtTXNq4kxv7+2gu5Bs64k9R2ZFdJUKTtbcdH++DNKL9Q==
\ No newline at end of file
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCRsamMiP5Op2JJtp3+IIJADFYhL256ZW0KsOkMHruJ3hVwgvoimPHKuUWRI/CS365v4BwUzzfBRdbECMFsLA1e1FHPPA0uSsAIuSVwRzHXG4drX7ZCDa9GFZ+qyIFAU25j2e2PC9olvKbGLBfZ8cL1FLXGxSVyDCX4t/UMZdDULwIDAQAB
+ #绉侀挜锛歁IICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJGxqYyI/k6nYkm2nf4ggkAMViEvbnplbQqw6Qweu4neFXCC+iKY8cq5RZEj8JLfrm/gHBTPN8FF1sQIwWwsDV7UUc88DS5KwAi5JXBHMdcbh2tftkINr0YVn6rIgUBTbmPZ7Y8L2iW8psYsF9nxwvUUtcbFJXIMJfi39Qxl0NQvAgMBAAECgYBKWLHfoCy9sFbMrN7UxnwQ+PqetpiW5tkNApf58ljbErQ4FO5V51xDieXBGejy2igmuOM7jz6xZtUgdiNV8uji/RtiNRqsBekVBPMeYAnPwA4GQ0HNwyHJ3ebJNQqT9bwrk8QpRUuCnrx/U1l7P1QNR5o52H1HpEKPlS0ga0fuQQJBAMdiSFYKt8/PwsYclvU/GqXrPy4cxMBhtE/ZssH9KourxnJcyfRz7EPgfSZykxlGHn8j/r8C2XxtAIYW6mRckqECQQC7EIZCZ3eV8abSIB33oKmw2jZlPQrHXMt8DWz8FYbNIA/9bvk9e9O42iQwMUtHfOMcNMWbcvKR/J+83bcE08TPAkA1ErdYl+/H1HDvVUrlq0+HnPArcSL6ZsedfcB0nNRHa4kehg6IEJdylf4aTuNTFfQmOcmkxLhpw4YhK1ZnMrEhAkEAuiMLNXA3MmCumk+TAiBAOdYoYjyHSTEw2VOSqpPQ+rN4tbmDEIbyefG2KK4kNhIy+pIYP0H11QYG/KuxvX/rSQJBALs0TqUgcGOp9+IkOq4jCXiVkP5/r7JWinQ4d6bYhJ4wspQYloYFCHljKKXtst1m8I3PC+vJY8R6va/3xtQKT8U=
--
Gitblit v1.9.3