From 2dd54d3f031a3e0326bddc4b9cdddabb9ae08a98 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 23 五月 2024 19:45:02 +0800
Subject: [PATCH] 宁夏省平台调整-根据配置支持新旧两套接口并行
---
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1105.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java | 3
src/main/java/com/fzzy/api/entity/ApiConfs.java | 5
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1202.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1302.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1310.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1208.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1110.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1210.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1308.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1113.java | 8
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1305.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1405.java | 5
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1211.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1206.java | 3
src/main/resources/application-pro5306-gb.yml | 61 ++++++
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1106.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1306.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1309.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1209.java | 3
src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java | 222 +++++++++++++++++++++++
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1303.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1403.java | 9
src/main/java/com/fzzy/api/view/ApiConfs.view.xml | 49 +++-
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java | 9 +
src/main/java/com/fzzy/push/nx2023/package-info.java | 8
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1204.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1304.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1404.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1107.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java | 12 +
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1212.java | 6
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java | 3
src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1301.java | 6
43 files changed, 463 insertions(+), 36 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/ApiConfs.java b/src/main/java/com/fzzy/api/entity/ApiConfs.java
index 2349685..139ecb1 100644
--- a/src/main/java/com/fzzy/api/entity/ApiConfs.java
+++ b/src/main/java/com/fzzy/api/entity/ApiConfs.java
@@ -157,7 +157,10 @@
@PropertyDef(label = "鏄惁涓婄嚎")
@Column(name = "exe_tag", length = 2)
private String exeTag = Constant.YN_Y;
-
+
+ @PropertyDef(label = "缁熶竴缂栫爜涓婁紶")
+ @Column(name = "GB_CODING_TAG_", length = 200)
+ private String gbCodingTag;
@Transient
@PropertyDef(label = "妯℃嫙寰楀垎")
diff --git a/src/main/java/com/fzzy/api/view/ApiConfs.view.xml b/src/main/java/com/fzzy/api/view/ApiConfs.view.xml
index e641034..d09870e 100644
--- a/src/main/java/com/fzzy/api/view/ApiConfs.view.xml
+++ b/src/main/java/com/fzzy/api/view/ApiConfs.view.xml
@@ -200,6 +200,15 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
+ <PropertyDef name="gbCodingTag">
+ <Property></Property>
+ <Property name="label">缁熶竴缂栫爜涓婁紶</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("apiTriggerService#trigger").getResult("YN")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
<PropertyDef name="pushProtocol">
<Property></Property>
<Property name="label">鐪佸钩鍙板崗璁�</Property>
@@ -367,7 +376,7 @@
<Property name="caption">鎺ュ彛閰嶇疆淇℃伅</Property>
<Property name="iconClass">fa fa-sliders</Property>
<Property name="closeable">false</Property>
- <Property name="height">680</Property>
+ <Property name="height">720</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var cur = view.get("#dgMain").getCurrentItem();
@@ -419,26 +428,22 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">password</Property>
- <Property name="property">password</Property>
- <Property name="editorType">PasswordEditor</Property>
+ <Property name="name">appCode</Property>
+ <Property name="property">appCode</Property>
<Editor/>
</AutoFormElement>
+
<AutoFormElement>
<Property name="name">deptId</Property>
<Property name="property">deptId</Property>
<Property name="labelWidth">120</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <Property name="name">publicKey</Property>
- <Property name="property">publicKey</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">password</Property>
+ <Property name="property">password</Property>
+ <Property name="editorType">PasswordEditor</Property>
<Property name="labelWidth">125</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">appCode</Property>
- <Property name="property">appCode</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -448,8 +453,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">apiUrl</Property>
- <Property name="property">apiUrl</Property>
+ <Property name="name">publicKey</Property>
+ <Property name="property">publicKey</Property>
<Property name="labelWidth">125</Property>
<Editor/>
</AutoFormElement>
@@ -460,8 +465,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">imgUrl</Property>
- <Property name="property">imgUrl</Property>
+ <Property name="name">apiUrl</Property>
+ <Property name="property">apiUrl</Property>
<Property name="labelWidth">125</Property>
<Editor/>
</AutoFormElement>
@@ -471,6 +476,18 @@
<Property name="labelWidth">125</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">imgUrl</Property>
+ <Property name="property">imgUrl</Property>
+ <Property name="labelWidth">125</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">gbCodingTag</Property>
+ <Property name="property">gbCodingTag</Property>
+ <Property name="labelWidth">125</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</FieldSet>
diff --git a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
index 5aa686b..643acbe 100644
--- a/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/nx2023/NX2023ApiRemoteService.java
@@ -11,7 +11,6 @@
import com.fzzy.api.service.ApiTriggerService;
import com.fzzy.api.utils.*;
import com.fzzy.api.view.repository.*;
-import com.fzzy.order.common.data.OrderCommonData;
import com.fzzy.push.nx2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -99,7 +98,7 @@
return responseDto;
}
- String jsonData = getJsonData(param.getInteId(), data);
+ String jsonData = getJsonData(param.getInteId(), data, conf);
log.info("鎺ュ彛鏁版嵁淇℃伅=" + jsonData);
apiLog.setData(jsonData);
apiLog.setKqdm(kqdm);
@@ -158,7 +157,7 @@
* @param data
* @return
*/
- private String getJsonData(String inteId, Object data) {
+ private String getJsonData(String inteId, Object data, ApiConfs conf) {
//鑻ヤ负璐㈠姟1501銆�1502銆�1503鎺ュ彛锛屽垯鎺ュ彛缂栫爜濉啓1114
if (NX2023Constant.NX_2023_API_CODE_1114_1501.equals(inteId)
|| NX2023Constant.NX_2023_API_CODE_1114_1502.equals(inteId)
@@ -167,7 +166,7 @@
return JSON.toJSONString(object);
} else {
List<Object> list = new ArrayList<>();
- Object object = getJsonApiData(inteId, data);
+ Object object = getJsonApiData(inteId, data, conf);
//闄ゅ簱瀛樻帴鍙ｅ锛屽叾浠栨帴鍙ｄ笂浼犲墠鏇存柊鏈�鍚庢洿鏂版椂闂�
if(!NX2023Constant.NX_2023_API_CODE_1208.equals(inteId)){
@@ -187,52 +186,86 @@
* @param data
* @return
*/
- private Object getJsonApiData(String inteId, Object data) {
+ private Object getJsonApiData(String inteId, Object data, ApiConfs conf) {
if (NX2023Constant.NX_2023_API_CODE_1101.equals(inteId)) {
Nx2023Api1101 api1101 = new Nx2023Api1101();
BeanUtils.copyProperties(data, api1101);
+ //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱
+ if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
+ api1101.setTydwbm(null);
+ }
return api1101;
}
if (NX2023Constant.NX_2023_API_CODE_1102.equals(inteId)) {
Nx2023Api1102 api1102 = new Nx2023Api1102();
BeanUtils.copyProperties(data, api1102);
api1102.setLkxz("1");
+ //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱
+ if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
+ api1102.setTykqbm(null);
+ }
return api1102;
}
if (NX2023Constant.NX_2023_API_CODE_1103.equals(inteId)) {
Nx2023Api1103 api1103 = new Nx2023Api1103();
BeanUtils.copyProperties(data, api1103);
+ //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱
+ if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
+ api1103.setTycfbm(null);
+ }
return api1103;
}
if (NX2023Constant.NX_2023_API_CODE_1104.equals(inteId)) {
Nx2023Api1104 api1104 = new Nx2023Api1104();
BeanUtils.copyProperties(data, api1104);
+ //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱
+ if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
+ api1104.setTyajbm(null);
+ }
return api1104;
}
if (NX2023Constant.NX_2023_API_CODE_1105.equals(inteId)) {
Nx2023Api1105 api1105 = new Nx2023Api1105();
BeanUtils.copyProperties(data, api1105);
+ //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱
+ if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
+ api1105.setTyhwbm(null);
+ }
return api1105;
}
if (NX2023Constant.NX_2023_API_CODE_1106.equals(inteId)) {
Nx2023Api1106 api1106 = new Nx2023Api1106();
BeanUtils.copyProperties(data, api1106);
+ //鑻ョ粺涓�缂栫爜涓嶄笂浼狅紝鍒欑粺涓�缂栫爜璁句负绌哄�硷紱
+ if(StringUtils.isEmpty(conf.getGbCodingTag()) || "N".equals(conf.getGbCodingTag())){
+ api1106.setTyygbm(null);
+ }
return api1106;
}
if (NX2023Constant.NX_2023_API_CODE_1107.equals(inteId)) {
Nx2023Api1107 api1107 = new Nx2023Api1107();
BeanUtils.copyProperties(data, api1107);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
+ api1107.setTykqbm(tykqbm);
+ }
return api1107;
}
if (NX2023Constant.NX_2023_API_CODE_1108.equals(inteId)) {
Nx2023Api1108 api1108 = new Nx2023Api1108();
BeanUtils.copyProperties(data, api1108);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
+ api1108.setTykqbm(tykqbm);
+ }
return api1108;
}
if (NX2023Constant.NX_2023_API_CODE_1109.equals(inteId)) {
@@ -242,117 +275,251 @@
Map<String, String> map = new HashMap<>();
map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
api1109.setWjl(JSON.toJSONString(map));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
+ api1109.setTykqbm(tykqbm);
+ }
return api1109;
}
if (NX2023Constant.NX_2023_API_CODE_1110.equals(inteId)) {
Nx2023Api1110 api1110 = new Nx2023Api1110();
BeanUtils.copyProperties(data, api1110);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1110.getHwdm());
+ api1110.setTyhwbm(tyhwbm);
+ }
return api1110;
}
if (NX2023Constant.NX_2023_API_CODE_1111.equals(inteId)) {
Nx2023Api1111 api1111 = new Nx2023Api1111();
BeanUtils.copyProperties(data, api1111);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ Api1102 api1102List = api1102Rep.findDataByKqdm(api1111.getKqdm());
+ api1111.setTykqbm(api1102List.getTykqbm());
+ }
return api1111;
}
if (NX2023Constant.NX_2023_API_CODE_1112.equals(inteId)) {
+ Api1112 apiData = (Api1112) data;
Nx2023Api1112 api1112 = new Nx2023Api1112();
- BeanUtils.copyProperties(data, api1112);
+ BeanUtils.copyProperties(apiData, api1112);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ api1112.setTydwbm(tydwbm);
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ api1112.setTykqbm(tykqbm);
+ }
return api1112;
}
if (NX2023Constant.NX_2023_API_CODE_1113.equals(inteId)) {
Nx2023Api1113 api1113 = new Nx2023Api1113();
BeanUtils.copyProperties(data, api1113);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
+ api1113.setTydwbm(tydwbm);
+ }
return api1113;
}
if (NX2023Constant.NX_2023_API_CODE_1201.equals(inteId)) {
+ Api1201 apiData = (Api1201) data;
Nx2023Api1201 api1201 = new Nx2023Api1201();
- BeanUtils.copyProperties(data, api1201);
+ BeanUtils.copyProperties(apiData, api1201);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tydwbm = apiCommonService.getTydwbm(apiData.getDwdm());
+ api1201.setTydwbm(tydwbm);
+ }
return api1201;
}
if (NX2023Constant.NX_2023_API_CODE_1202.equals(inteId)) {
Nx2023Api1202 api1202 = new Nx2023Api1202();
BeanUtils.copyProperties(data, api1202);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1202.getHwdm());
+ api1202.setTyhwbm(tyhwbm);
+ }
return api1202;
}
if (NX2023Constant.NX_2023_API_CODE_1203.equals(inteId)) {
Nx2023Api1203 api1203 = new Nx2023Api1203();
BeanUtils.copyProperties(data, api1203);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1203.getHwdm());
+ api1203.setTyhwbm(tyhwbm);
+ }
return api1203;
}
if (NX2023Constant.NX_2023_API_CODE_1204.equals(inteId)) {
Nx2023Api1204 api1204 = new Nx2023Api1204();
BeanUtils.copyProperties(data, api1204);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1204.getHwdm());
+ api1204.setTyhwbm(tyhwbm);
+ }
return api1204;
}
if (NX2023Constant.NX_2023_API_CODE_1205.equals(inteId)) {
Nx2023Api1205 api1205 = new Nx2023Api1205();
BeanUtils.copyProperties(data, api1205);
api1205.setSzlx("09");
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1205.getHwdm());
+ api1205.setTyhwbm(tyhwbm);
+ }
return api1205;
}
if (NX2023Constant.NX_2023_API_CODE_1206.equals(inteId)) {
+ Api1206 apiData = (Api1206) data;
Nx2023Api1206 api1206 = new Nx2023Api1206();
- BeanUtils.copyProperties(data, api1206);
+ BeanUtils.copyProperties(apiData, api1206);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tydwbm = apiCommonService.getTydwbm(apiData.getKqdm().substring(0, 18));
+ api1206.setTydwbm(tydwbm);
+ }
return api1206;
}
if (NX2023Constant.NX_2023_API_CODE_1207.equals(inteId)) {
Nx2023Api1207 api1207 = new Nx2023Api1207();
BeanUtils.copyProperties(data, api1207);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String dckqtybm = apiCommonService.getTykqbm(api1207.getDcdw());
+ api1207.setDckqtybm(dckqtybm);
+ String drkqtybm = apiCommonService.getTykqbm(api1207.getDrdw());
+ api1207.setDrkqtybm(drkqtybm);
+ String dchwtybm = apiCommonService.getTyhwbm(api1207.getDchwdm());
+ api1207.setDchwtybm(dchwtybm);
+ String drhwtybm = apiCommonService.getTyhwbm(api1207.getDrhwdm());
+ api1207.setDrhwtybm(drhwtybm);
+ }
return api1207;
}
if (NX2023Constant.NX_2023_API_CODE_1208.equals(inteId)) {
Nx2023Api1208 api1208 = new Nx2023Api1208();
BeanUtils.copyProperties(data, api1208);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
+ api1208.setTyhwbm(tyhwbm);
+ if(StringUtils.isEmpty(api1208.getTyhwbm())){
+ String lqgstydwbm = apiCommonService.getTydwbm(api1208.getLqgsdwdm());
+ api1208.setLqgstydwbm(lqgstydwbm);
+ }
+ }
return api1208;
}
if (NX2023Constant.NX_2023_API_CODE_1209.equals(inteId)) {
Nx2023Api1209 api1209 = new Nx2023Api1209();
BeanUtils.copyProperties(data, api1209);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1209.getHwdm());
+ api1209.setTyhwbm(tyhwbm);
+ }
return api1209;
}
if (NX2023Constant.NX_2023_API_CODE_1210.equals(inteId)) {
Nx2023Api1210 api1210 = new Nx2023Api1210();
BeanUtils.copyProperties(data, api1210);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
+ api1210.setTyhwbm(tyhwbm);
+ }
return api1210;
}
if (NX2023Constant.NX_2023_API_CODE_1211.equals(inteId)) {
Nx2023Api1211 api1211 = new Nx2023Api1211();
BeanUtils.copyProperties(data, api1211);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tykqbm = apiCommonService.getTykqbm(api1211.getKqdm());
+ api1211.setTykqbm(tykqbm);
+ }
return api1211;
}
if (NX2023Constant.NX_2023_API_CODE_1212.equals(inteId)) {
Nx2023Api1212 api1212 = new Nx2023Api1212();
BeanUtils.copyProperties(data, api1212);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tydwbm = apiCommonService.getTydwbm(api1212.getDwdm());
+ api1212.setTydwbm(tydwbm);
+ String tykqbm = apiCommonService.getTykqbm(api1212.getKqdm());
+ api1212.setTykqbm(tykqbm);
+ }
return api1212;
}
if (NX2023Constant.NX_2023_API_CODE_1301.equals(inteId)) {
Nx2023Api1301 api1301 = new Nx2023Api1301();
BeanUtils.copyProperties(data, api1301);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tydwbm = apiCommonService.getTydwbm(api1301.getDwdm());
+ api1301.setTydwbm(tydwbm);
+ String tykqbm = apiCommonService.getTykqbm(api1301.getKqdm());
+ api1301.setTykqbm(tykqbm);
+ }
return api1301;
}
if (NX2023Constant.NX_2023_API_CODE_1302.equals(inteId)) {
Nx2023Api1302 api1302 = new Nx2023Api1302();
BeanUtils.copyProperties(data, api1302);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1302.getHwdm());
+ api1302.setTyhwbm(tyhwbm);
+ }
return api1302;
}
if (NX2023Constant.NX_2023_API_CODE_1303.equals(inteId)) {
Nx2023Api1303 api1303 = new Nx2023Api1303();
BeanUtils.copyProperties(data, api1303);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1303.getHwdm());
+ api1303.setTyhwbm(tyhwbm);
+ }
return api1303;
}
if (NX2023Constant.NX_2023_API_CODE_1304.equals(inteId)) {
Nx2023Api1304 api1304 = new Nx2023Api1304();
BeanUtils.copyProperties(data, api1304);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1304.getHwdm());
+ api1304.setTyhwbm(tyhwbm);
+ }
return api1304;
}
if (NX2023Constant.NX_2023_API_CODE_1305.equals(inteId)) {
Nx2023Api1305 api1305 = new Nx2023Api1305();
BeanUtils.copyProperties(data, api1305);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tycfbm = apiCommonService.getTycfbm(api1305.getCfdm());
+ api1305.setTycfbm(tycfbm);
+ }
return api1305;
}
if (NX2023Constant.NX_2023_API_CODE_1306.equals(inteId)) {
Nx2023Api1306 api1306 = new Nx2023Api1306();
BeanUtils.copyProperties(data, api1306);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tycfbm = apiCommonService.getTycfbm(api1306.getCfdm());
+ api1306.setTycfbm(tycfbm);
+ }
return api1306;
}
if (NX2023Constant.NX_2023_API_CODE_1307.equals(inteId)) {
@@ -363,21 +530,45 @@
Map<String, String> map = new HashMap<>();
map.put(apiData.getId() + "." + apiData.getTxwjhzm(), FileUtils.fileToByteString(apiData.getWjdz()));
api1307.setCntxwjl(JSON.toJSONString(map));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
+ api1307.setTykqbm(tykqbm);
+ String tycfbm = apiCommonService.getTycfbm(api1307.getCfdm());
+ api1307.setTycfbm(tycfbm);
+ String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
+ api1307.setTyhwbm(tyhwbm);
+ }
return api1307;
}
if (NX2023Constant.NX_2023_API_CODE_1308.equals(inteId)) {
Nx2023Api1308 api1308 = new Nx2023Api1308();
BeanUtils.copyProperties(data, api1308);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
+ api1308.setTykqbm(tykqbm);
+ }
return api1308;
}
if (NX2023Constant.NX_2023_API_CODE_1309.equals(inteId)) {
Nx2023Api1309 api1309 = new Nx2023Api1309();
BeanUtils.copyProperties(data, api1309);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tydwbm = apiCommonService.getTydwbm(api1309.getQydm());
+ api1309.setWgdwtybm(tydwbm);
+ }
return api1309;
}
if (NX2023Constant.NX_2023_API_CODE_1310.equals(inteId)) {
Nx2023Api1310 api1310 = new Nx2023Api1310();
BeanUtils.copyProperties(data, api1310);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
+ api1310.setTyhwbm(tyhwbm);
+ }
return api1310;
}
if (NX2023Constant.NX_2023_API_CODE_1401.equals(inteId)) {
@@ -393,16 +584,31 @@
if (NX2023Constant.NX_2023_API_CODE_1403.equals(inteId)) {
Nx2023Api1403 api1403 = new Nx2023Api1403();
BeanUtils.copyProperties(data, api1403);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tydwbm = apiCommonService.getTydwbm(api1403.getJhxddw());
+ api1403.setJhxddwtybm(tydwbm);
+ }
return api1403;
}
if (NX2023Constant.NX_2023_API_CODE_1404.equals(inteId)) {
Nx2023Api1404 api1404 = new Nx2023Api1404();
BeanUtils.copyProperties(data, api1404);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1404.getLhhwdm());
+ api1404.setLhhwtybm(tyhwbm);
+ }
return api1404;
}
if (NX2023Constant.NX_2023_API_CODE_1405.equals(inteId)) {
Nx2023Api1405 api1405 = new Nx2023Api1405();
BeanUtils.copyProperties(data, api1405);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isNotEmpty(conf.getGbCodingTag()) && "Y".equals(conf.getGbCodingTag())){
+ String tydwbm = apiCommonService.getTydwbm(api1405.getXmdm());
+ api1405.setTydwbm(tydwbm);
+ }
return api1405;
}
return data;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java
index cebe49e..6613d72 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1101.java
@@ -21,6 +21,9 @@
@PropertyDef(label = "鍗曚綅鍚嶇О")
private String dwmc;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "鍗曚綅绫诲瀷")
private String dwlx;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java
index e942a45..bd76d8a 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1102.java
@@ -15,6 +15,9 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java
index b13c472..5021733 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1103.java
@@ -18,6 +18,9 @@
@PropertyDef(label = "浠撴埧浠ｇ爜" )
private String cfdm;
+ @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
+ private String tycfbm;
+
@PropertyDef(label = "浠撴埧鍚嶇О" )
private String cfmc;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java
index a5dc4d4..ccc5b7d 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1104.java
@@ -17,6 +17,9 @@
@PropertyDef(label = "寤掗棿浠ｇ爜")
private String ajdh;
+ @PropertyDef(label = "缁熶竴寤掗棿缂栫爜")
+ private String tyajbm;
+
@PropertyDef(label = "寤掗棿鍚嶇О")
private String ajmc;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1105.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1105.java
index dd0a20c..612910c 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1105.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1105.java
@@ -17,6 +17,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "璐т綅鍚嶇О" )
private String hwmc;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1106.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1106.java
index d915377..0d9aaff 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1106.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1106.java
@@ -17,6 +17,9 @@
@PropertyDef(label = "娌圭綈浠ｇ爜" )
private String ygdm;
+ @PropertyDef(label = "缁熶竴娌圭綈缂栫爜" )
+ private String tyygbm;
+
@PropertyDef(label = "娌圭綈鍚嶇О" )
private String ygmc;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1107.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1107.java
index 210058b..f87311a 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1107.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1107.java
@@ -20,6 +20,9 @@
@PropertyDef(label = "搴撳尯浠ｇ爜" )
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
private String dwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java
index 6cdedb9..fb5c994 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1108.java
@@ -15,6 +15,9 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java
index 8b18f4d..b1cf941 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1109.java
@@ -24,6 +24,9 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
@PropertyDef(label = "鏂囦欢绫诲瀷", description = "1锛氬簱鍖洪笩鐬板浘 2锛氬叆搴撳浘鐗� 3锛氬嚭搴撳浘鐗� 4锛氬叆搴撴鏂よ棰戯紙鎴彇妫�鏂ゆ椂闂村墠鍚庡悇 5绉掗挓瑙嗛锛�5锛氬嚭搴撴鏂よ棰戯紙鎴彇妫�鏂ゆ椂闂村墠鍚庡悇 5 绉掗挓瑙嗛锛�104锛氱啅钂稿妗堟帴鍙ｉ檮浠�")
private String wjlx;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1110.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1110.java
index 55d854d..1914f5f 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1110.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1110.java
@@ -17,6 +17,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
private String dwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java
index bbcc7a8..c1b4311 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1111.java
@@ -24,6 +24,9 @@
@PropertyDef(label = "搴撳尯浠ｇ爜" )
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "瑙嗛鐩戞帶璁惧鍚嶇О" )
private String spjksbmc;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java
index 109a140..83817d6 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1112.java
@@ -12,6 +12,12 @@
@Data
public class Nx2023Api1112 implements Serializable {
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
private String dwdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1113.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1113.java
index 186e28d..61e036a 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1113.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1113.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,6 +16,9 @@
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
private String dwdm;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "淇＄敤绛夌骇" )
private String xydj;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java
index 0d1d694..3a4bbd5 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1201.java
@@ -23,6 +23,9 @@
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "涓氬姟绫诲埆")
private String ywlx;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1202.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1202.java
index d4b4ff4..ccc866a 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1202.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1202.java
@@ -20,6 +20,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "涓氬姟绫诲瀷", description = "2锛氬叆搴擄紙榛樿锛�")
private String ywlx = "2";
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java
index 0acfc06..eb9f8b0 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1203.java
@@ -18,6 +18,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "鍏ュ簱涓氬姟鍗曞彿")
private String rkywdh;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1204.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1204.java
index a2ef649..ce64587 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1204.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1204.java
@@ -20,6 +20,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "鍚堝悓鍙�")
private String hth;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java
index 1c3d724..a9b3f9c 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1205.java
@@ -31,6 +31,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "鍑哄簱閫氱煡鍗曞彿")
private String cktzdh;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1206.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1206.java
index b760299..457cdd1 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1206.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1206.java
@@ -14,6 +14,9 @@
@Data
public class Nx2023Api1206 implements Serializable {
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿" )
private String ckjsdh;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java
index 655dac4..fe86190 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1207.java
@@ -32,6 +32,12 @@
@PropertyDef(label = "鍊掑叆鍗曚綅" )
private String drdw;
+ @PropertyDef(label = "鍊掑嚭搴撳尯缁熶竴缂栫爜")
+ private String dckqtybm;
+
+ @PropertyDef(label = "鍊掑叆搴撳尯缁熶竴缂栫爜")
+ private String drkqtybm;
+
@PropertyDef(label = "绮鍝佺浠ｇ爜" )
private String lspzdm;
@@ -41,6 +47,12 @@
@PropertyDef(label = "鍊掑叆璐т綅浠ｇ爜" )
private String drhwdm;
+ @PropertyDef(label = "鍊掑嚭璐т綅缁熶竴缂栫爜" )
+ private String dchwtybm;
+
+ @PropertyDef(label = "鍊掑叆璐т綅缁熶竴缂栫爜" )
+ private String drhwtybm;
+
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鍊掍粨鏃ユ湡" )
private Date dcrq;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1208.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1208.java
index 2f21d38..13a6430 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1208.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1208.java
@@ -20,6 +20,12 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
+ @PropertyDef(label = "绮潈褰掑睘鍗曚綅缁熶竴缂栫爜")
+ private String lqgstydwbm;
+
@PropertyDef(label = "绮鍝佺浠ｇ爜")
private String lspzdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1209.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1209.java
index 8c388ec..c74b6f1 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1209.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1209.java
@@ -20,6 +20,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "涓氬姟鏃ユ湡" )
private Date ywrq;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1210.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1210.java
index 0d58568..cdaad54 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1210.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1210.java
@@ -21,6 +21,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "绮鏁伴噺(鍏枻)")
private double lssl;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1211.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1211.java
index c9653a3..0477e4f 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1211.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1211.java
@@ -16,6 +16,9 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "绮鍝佺浠ｇ爜")
private String lspzdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1212.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1212.java
index d48c850..e085c67 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1212.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1212.java
@@ -17,6 +17,12 @@
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "鍗曚綅鍚嶇О")
private String dwmc;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1301.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1301.java
index 27e9b53..a799052 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1301.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1301.java
@@ -23,6 +23,12 @@
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
private String dwdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "搴撳尯鍚嶇О" )
private String kqmc;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1302.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1302.java
index d64bd5d..e521660 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1302.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1302.java
@@ -24,6 +24,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "浠撴埧澶栨俯" )
private double cfww;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1303.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1303.java
index c9f536f..4eec1bb 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1303.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1303.java
@@ -24,6 +24,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "妫�鏌ュ铏柟娉�" )
private String jchcff;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1304.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1304.java
index 81b94f1..829c1bb 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1304.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1304.java
@@ -24,6 +24,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "姘ф皵鍚噺鍊奸泦鍚�" )
private String yqhlzjh;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1305.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1305.java
index dcbd8bc..f96d1a2 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1305.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1305.java
@@ -42,6 +42,9 @@
@Column(name = "cfdm", length = 25)
private String cfdm;
+ @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
+ private String tycfbm;
+
@PropertyDef(label = "閫氶鐩殑" )
@Column(name = "tfmd", length = 128)
private String tfmd;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1306.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1306.java
index c1af926..b1a24ff 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1306.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1306.java
@@ -24,6 +24,9 @@
@PropertyDef(label = "浠撴埧浠ｇ爜" )
private String cfdm;
+ @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
+ private String tycfbm;
+
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "鐔忚捀寮�濮嬫椂闂�" )
private Date xzkssj;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java
index 067ecc2..3b8e5e3 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1307.java
@@ -27,6 +27,15 @@
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
+ @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
+ private String tycfbm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "浠撳唴鍥惧儚鏂囦欢娴�" )
private String cntxwjl;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1308.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1308.java
index 317ea5b..b66c7e9 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1308.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1308.java
@@ -25,6 +25,9 @@
@PropertyDef(label = "搴撳尯浠ｇ爜" )
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "搴撳尯鍦板潃" )
private String kqdz;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1309.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1309.java
index 344dcd2..1f3fe31 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1309.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1309.java
@@ -14,6 +14,9 @@
@Data
public class Nx2023Api1309 implements Serializable {
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String wgdwtybm;
+
@PropertyDef(label = "棰勮淇℃伅浠ｇ爜" )
private String yjxxdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1310.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1310.java
index 12721ff..3c8d8c8 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1310.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1310.java
@@ -20,6 +20,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜" )
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "绮鍝佺浠ｇ爜" )
private String lspzdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1403.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1403.java
index 0e7f435..2ca2fe0 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1403.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1403.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;
@@ -44,6 +38,9 @@
@PropertyDef(label = "璁″垝涓嬭揪鍗曚綅" )
private String jhxddw;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String jhxddwtybm;
+
@PropertyDef(label = "璁″垝涓嬭揪鍗曚綅鍚嶇О" )
private String jhxddwmc;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1404.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1404.java
index c8b405b..b40d38a 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1404.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1404.java
@@ -35,6 +35,9 @@
@PropertyDef(label = "杞崲璐т綅浠ｇ爜" )
private String lhhwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String lhhwtybm;
+
@PropertyDef(label = "杞崲鏁伴噺" )
private double lhsl;
diff --git a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1405.java b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1405.java
index db73087..a225e13 100644
--- a/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1405.java
+++ b/src/main/java/com/fzzy/push/nx2023/dto/Nx2023Api1405.java
@@ -3,6 +3,8 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
+
+import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -14,6 +16,9 @@
@Data
public class Nx2023Api1405 implements Serializable {
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "椤圭洰浠ｇ爜" )
private String xmdm;
diff --git a/src/main/java/com/fzzy/push/nx2023/package-info.java b/src/main/java/com/fzzy/push/nx2023/package-info.java
new file mode 100644
index 0000000..bad48ab
--- /dev/null
+++ b/src/main/java/com/fzzy/push/nx2023/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * @Desc: 瀹佸2023鐗堟帴鍙�-涓嶅甫缁熶竴缂栫爜
+ *
+ * @author: czt
+ * @update-time: 2023/08/17
+ *
+ */
+package com.fzzy.push.nx2023;
\ No newline at end of file
diff --git a/src/main/resources/application-pro5306-gb.yml b/src/main/resources/application-pro5306-gb.yml
new file mode 100644
index 0000000..ebc7a03
--- /dev/null
+++ b/src/main/resources/application-pro5306-gb.yml
@@ -0,0 +1,61 @@
+########################## 瀹佸鐭冲槾灞辩孩鏋滃瓙绮簱 ##########################
+server:
+ port: 8091
+ jetty:
+ max-http-post-size: 209715200
+ tomcat:
+ max-http-post-size: 209715200
+spring:
+ datasource:
+ #涓绘暟鎹簮
+ primary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_api_gb?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: Abc123..
+ #娆℃暟鎹簮
+ secondary:
+ url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8
+ driver-class-name: com.mysql.jdbc.Driver
+ username: root
+ password: Abc123..
+ jpa:
+ #涓籮pa閰嶇疆
+ primary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: update
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ #娆pa閰嶇疆
+ secondary:
+ show-sql: true
+ properties:
+ hibernate:
+ hbm2ddl:
+ auto: none
+ dialect: org.hibernate.dialect.MySQL5InnoDBDialect
+ # Redis鐩稿叧閰嶇疆
+ redis:
+ database: 1
+ host: 127.0.0.1
+ port: 6379
+ password: Abc123..
+ # 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
+ pool:
+ max-active: 200
+ max-wait: -1
+ max-idle: 10
+ min-idle: 0
+ timeout: 6000
+igds:
+ default:
+ companyId: 5306
+ file-path: D:/IGDS-API/FILE-GB/
+ img-path: D:/IGDS/FILE/
+ # 鐪佸钩鍙癛SA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCsoiS5Q5CKAT9w5EbZXCxJO/5J2iV3i2HrTW/YcGs2EGeQsQc97EWPdFE1SPXGH5p9TO8nCFRJScj4WeeKUVcuRpzR7czQQ+c6kf6cR9LLQrAiGEMQSk13j/5UsJho23IQDGKWoH18f5aPdX8tJn/o4aR6mMxUY9jdaSKEBck1TQIDAQAB
+ # 鍖虹骇骞冲彴RSA瀵嗛挜瀵逛俊鎭�
+ #鍏挜锛歁IGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCMsCJyl6EkjUEfB9Otl0bNmFD0Gr3g/v8DYnoq66EIviDNKT+bo5Aj6BRFngns1aCy1uyWgC5/+PIQ3sxs25nWXxFBYXy7cTiGwCCPfnmmI3rkXRGqRo6uh9K3BsucSE0kyhB8Eq76bQ6BPa5XpMyyq8V2oN2i0LLYpDhV97j3BwIDAQAB
+ #绉侀挜锛歁IICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAIywInKXoSSNQR8H062XRs2YUPQaveD+/wNieirroQi+IM0pP5ujkCPoFEWeCezVoLLW7JaALn/48hDezGzbmdZfEUFhfLtxOIbAII9+eaYjeuRdEapGjq6H0rcGy5xITSTKEHwSrvptDoE9rlekzLKrxXag3aLQstikOFX3uPcHAgMBAAECgYAOZvWPz4/ygvdYqt9zlNntsBsRci9f+hq3CPzCqg55K6WF+yQE1dCqrFZu7gfME+54gGIF4idgeGanbXd16WEtFslEJlFKGk3cF62gaX5Y/nZ4zS65CLTjQ650j6SJ7OC2QYjIejTWhJD0k1tSazXdzV70nP+X3DbGyyO3Rm+juQJBANMCi+9RnzcGvltN/AdWD0DgshRBNrqrHtDkmzRFSkFwIqVSL5J7qRvntjhSstQIBB5KCosCmwRYKxGWQ9Ou420CQQCqrz2byBz3w2pkEfPY3rv7T4zE/2CHC74XtW9sEUTieYaxqIKlnwJacactzx4ZOAg21dGCoqOG9Y9RIpH2mMfDAkEAlAucXIt61qOfmPXtFsSVrSI5LybWHEAFPfC2yAS5ZZIkbLNt9ytV6eM3oOq81zDMmue93+wzEOg/R3aTHgj9PQJALNGxUsu8V473y+ku596s6/PamgwZE70QoHcjF/R86x9QMCx4ifb0Dj3T0WKWm7ar6YJB7pS4bgLjLEHwpBlAMwJAUUG2NhfGXFxfyFOC+5BzFTEr7EdSeHPXJl7dIWmRHncHsv8Nl2yvWsIOfDOYKS3ynptMgeSZaJPnXhvFdX0TnQ==
--
Gitblit v1.9.3