From 4603da77459b23291191b52a35c5c8ccb9ac60e3 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 28 六月 2024 15:04:49 +0800
Subject: [PATCH] 上海省平台协议-添加统一编码
---
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java | 6
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java | 7
src/main/java/com/fzzy/api/view/Api1104.view.xml | 17 -
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1113.java | 3
src/main/resources/application-pro.yml | 21
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1206.java | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1306.java | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1212.java | 6
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 270 +++++++++++++++++++++-
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java | 5
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1204.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java | 7
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java | 6
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java | 5
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java | 6
src/main/java/com/fzzy/api/view/Api1105.view.xml | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java | 4
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java | 5
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java | 10
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java | 7
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1308.java | 6
src/main/java/com/fzzy/push/gd2020/v2/GranaryWebService.java | 1
src/main/java/com/fzzy/api/entity/Api1105.java | 4
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java | 6
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java | 4
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java | 8
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1109.java | 3
src/main/java/com/fzzy/api/entity/Api1104.java | 8
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1309.java | 5
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java | 6
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java | 5
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java | 6
src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java | 9
src/main/java/com/fzzy/api/entity/Api1110.java | 12
src/main/java/com/fzzy/api/entity/Api1206.java | 20 +
/dev/null | 48 ----
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1304.java | 9
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1107.java | 3
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java | 5
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java | 6
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java | 8
src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2204.java | 3
55 files changed, 475 insertions(+), 194 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1104.java b/src/main/java/com/fzzy/api/entity/Api1104.java
index b3c1ce0..ba7a6eb 100644
--- a/src/main/java/com/fzzy/api/entity/Api1104.java
+++ b/src/main/java/com/fzzy/api/entity/Api1104.java
@@ -76,14 +76,6 @@
/*----------涓婃捣甯傚钩鍙拌鑼冨瓧娈�----------*/
- @PropertyDef(label = "浣跨敤搴撳尯浠ｇ爜")
- @Column(name = "sykqdm", length = 21)
- private String sykqdm;
-
- @PropertyDef(label = "寤掗棿鑱旂郴鐢佃瘽")
- @Column(name = "ajlxdh", length = 20)
- private String ajlxdh;
-
@PropertyDef(label = "鏍囪浣�")
@Column(name = "bjw", length = 40)
private String bjw;
diff --git a/src/main/java/com/fzzy/api/entity/Api1105.java b/src/main/java/com/fzzy/api/entity/Api1105.java
index 6a7e6c2..817ccb1 100644
--- a/src/main/java/com/fzzy/api/entity/Api1105.java
+++ b/src/main/java/com/fzzy/api/entity/Api1105.java
@@ -72,6 +72,10 @@
@Column(name = "bjw", length = 40)
private String bjw;
+ @PropertyDef(label = "璐т綅鐘舵��")
+ @Column(name = "hwzt", length = 40)
+ private String hwzt;
+
/*----------鎺ュ彛绯荤粺鑷畾涔夊瓧娈�----------*/
@JSONField(serialize = false)
diff --git a/src/main/java/com/fzzy/api/entity/Api1110.java b/src/main/java/com/fzzy/api/entity/Api1110.java
index 2fed10a..9be660d 100644
--- a/src/main/java/com/fzzy/api/entity/Api1110.java
+++ b/src/main/java/com/fzzy/api/entity/Api1110.java
@@ -2,9 +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.*;
import java.io.Serializable;
import java.util.Date;
@@ -30,11 +28,6 @@
@PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
@Column(name = "tyhwbm", length = 28)
private String tyhwbm;
-
- @JSONField(serialize = false)
- @PropertyDef(label = "涓氬姟id")
- @Column(name = "bizId", length = 40)
- private String bizId;
@PropertyDef(label = "鍗曚綅浠ｇ爜" )
@Column(name = "dwdm", length = 18)
@@ -77,5 +70,10 @@
@Column(name = "zhgxsj", nullable = false)
private Date zhgxsj;
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ @Column(name = "bizId", length = 40)
+ private String bizId;
+
}
diff --git a/src/main/java/com/fzzy/api/entity/Api1206.java b/src/main/java/com/fzzy/api/entity/Api1206.java
index ca85e61..e69e220 100644
--- a/src/main/java/com/fzzy/api/entity/Api1206.java
+++ b/src/main/java/com/fzzy/api/entity/Api1206.java
@@ -2,15 +2,12 @@
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;
@@ -21,7 +18,7 @@
@Entity
@Table(name = "API_1206")
@EqualsAndHashCode(callSuper = false)
-public class Api1206 extends ApiParent implements Serializable {
+public class Api1206 implements Serializable {
public static String SORT_PROP = "ckjsdh";
@@ -105,4 +102,19 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
@Column(name = "hwdm", length = 30)
private String hwdm;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "涓氬姟id")
+ @Column(name = "bizId", length = 40)
+ private String bizId;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ @Column(name = "kqdm", length = 21)
+ private String kqdm;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
+ @Column(name = "syncTime")
+ private Date syncTime;
}
diff --git a/src/main/java/com/fzzy/api/view/Api1104.view.xml b/src/main/java/com/fzzy/api/view/Api1104.view.xml
index c08dd12..0e4ef1d 100644
--- a/src/main/java/com/fzzy/api/view/Api1104.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1104.view.xml
@@ -77,13 +77,6 @@
<Property name="dataType">Date</Property>
<Property name="label">鍚屾鏃堕棿</Property>
</PropertyDef>
- <PropertyDef name="sykqdm">
- <Property></Property>
- <Property name="label">浣跨敤搴撳尯浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="ajlxdh">
- <Property name="label">寤掗棿鑱旂郴鐢佃瘽</Property>
- </PropertyDef>
<PropertyDef name="bjw">
<Property name="label">鏍囪浣�</Property>
</PropertyDef>
@@ -378,16 +371,6 @@
<Property name="labelAlign">left</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelPosition">top</Property>
- <AutoFormElement>
- <Property name="name">sykqdm</Property>
- <Property name="property">sykqdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">ajlxdh</Property>
- <Property name="property">ajlxdh</Property>
- <Editor/>
- </AutoFormElement>
<AutoFormElement>
<Property name="name">bjw</Property>
<Property name="property">bjw</Property>
diff --git a/src/main/java/com/fzzy/api/view/Api1105.view.xml b/src/main/java/com/fzzy/api/view/Api1105.view.xml
index d0d7214..37e019f 100644
--- a/src/main/java/com/fzzy/api/view/Api1105.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1105.view.xml
@@ -64,6 +64,10 @@
<Property></Property>
<Property name="label">鏍囪浣�</Property>
</PropertyDef>
+ <PropertyDef name="hwzt">
+ <Property></Property>
+ <Property name="label">璐т綅鐘舵��</Property>
+ </PropertyDef>
</DataType>
</Model>
<View layout="regionPadding:10">
@@ -340,6 +344,11 @@
<Property name="property">bjw</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">hwzt</Property>
+ <Property name="property">hwzt</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
diff --git a/src/main/java/com/fzzy/push/gd2020/v2/GranaryWebService.java b/src/main/java/com/fzzy/push/gd2020/v2/GranaryWebService.java
index e131710..03e3c54 100644
--- a/src/main/java/com/fzzy/push/gd2020/v2/GranaryWebService.java
+++ b/src/main/java/com/fzzy/push/gd2020/v2/GranaryWebService.java
@@ -88,7 +88,6 @@
xmlStr = xmlStr.replace("{ajwd}", GDUtils.formatNum(api1103.getWd()));//寤掗棿绾害
xmlStr = xmlStr.replace("{ajqyrq}", GDUtils.formatDate(data.getAjqyrq(),"yyyy-MM-dd"));//寤掗棿鍚敤鏃ユ湡
- xmlStr = xmlStr.replace("{ajlxdh}", GDUtils.formatStr(data.getAjlxdh()));//寤掗棿鑱旂郴鐢佃瘽
xmlStr = xmlStr.replace("{ajcd}", GDUtils.formatNum(data.getAjcd()));//寤掗棿闀垮害
xmlStr = xmlStr.replace("{ajkd}", GDUtils.formatNum(data.getAjkd()));//寤掗棿瀹藉害
xmlStr = xmlStr.replace("{ajgd}", GDUtils.formatNum(data.getAjgd()));//寤掗棿楂樺害
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1114.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1114.java
deleted file mode 100644
index 345a665..0000000
--- a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1114.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.fzzy.push.gd2022.dto;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.bstek.dorado.annotation.PropertyDef;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 鎺ュ彛琛�-璐㈠姟鎶ヨ〃淇℃伅
- *
- * @author czt
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-public class Gd2022Api1114 implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = 1L;
-
- @PropertyDef(label = "鍗曚綅浠ｇ爜" )
- private String dwdm;
-
- @JSONField(format = "yyyyMMdd")
- @PropertyDef(label = "鎶ヨ〃鏈熷彿")
- private Date bbsj;
-
- @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
- private String tydwbm;
-
- @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
- private String tykqbm;
-
- //01-璧勪骇璐熷�猴紱02-鐜伴噾娴侀噺琛紱03-鍒╂鼎琛�
- @PropertyDef(label = "鎶ヨ〃鍚�")
- private String bbm;
-
- @PropertyDef(label = "鎸囨爣搴忓彿" )
- private int zbxh;
-
- @PropertyDef(label = "鎸囨爣鍚嶇О" )
- private String zbmc;
-
- @PropertyDef(label = "鎸囨爣鍊�1" )
- private String zbz1;
-
- @PropertyDef(label = "鎸囨爣鍊�2" )
- private String zbz2;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織" )
- private String czbz;
-
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
- private Date zhgxsj;
-}
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 91622ed..3e28f38 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.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.sh2023.dto.*;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -21,7 +20,6 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import java.lang.reflect.Field;
import java.util.*;
@@ -338,6 +336,11 @@
SH2023Api1107 api1107 = new SH2023Api1107();
BeanUtils.copyProperties(data, api1107);
api1107.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1107.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1107.getKqdm());
+ api1107.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1107);
@@ -347,6 +350,11 @@
SH2023Api1108 api1108 = new SH2023Api1108();
BeanUtils.copyProperties(data, api1108);
api1108.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1108.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1108.getKqdm());
+ api1108.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1108);
@@ -357,6 +365,11 @@
Api1109 apiData = (Api1109) data;
BeanUtils.copyProperties(apiData, api1109);
api1109.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ搴撳尯淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1109.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1109.getKqdm());
+ api1109.setTykqbm(tykqbm);
+ }
Map<String, String> map = new HashMap<>();
map.put(apiData.getWjmc(), FileUtils.fileToByteString(apiData.getWjdz()));
@@ -374,6 +387,12 @@
Api1110 apiData = (Api1110) data;
BeanUtils.copyProperties(apiData, api1110);
api1110.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1110.getTyajbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1110.getAjdm());
+ api1110.setTyajbm(tyhwbm);
+ }
+
api1110.setAjdm(apiData.getHwdm().substring(0, 28));
api1110.setAjxdwz(apiData.getHwxdwz());
api1110.setAjwzys(apiData.getHwwzys());
@@ -386,6 +405,11 @@
SH2023Api1111 api1111 = new SH2023Api1111();
BeanUtils.copyProperties(data, api1111);
api1111.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1111.getTykqbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1111.getKqdm());
+ api1111.setTykqbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1111);
@@ -397,6 +421,16 @@
api1112.setHdrychsj(api1112.getQdzgzchzyzgsj());
api1112.setBjw(ShAreaBjw.getBjw(code));
api1112.setZy("01");
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1112.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1112.getDwdm());
+ api1112.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1112.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1112.getKqdm());
+ api1112.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1112);
@@ -406,7 +440,11 @@
SH2023Api1113 api1113 = new SH2023Api1113();
BeanUtils.copyProperties(data, api1113);
api1113.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1113.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1113.getDwdm());
+ api1113.setTydwbm(tydwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1113);
return api1113;
@@ -415,6 +453,11 @@
SH2023Api1201 api1201 = new SH2023Api1201();
BeanUtils.copyProperties(data, api1201);
api1201.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1201.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1201.getDwdm());
+ api1201.setTydwbm(tydwbm);
+ }
api1201.setHtsfzz("0");
//鍚堝悓绛捐鍦扮偣涓嶈兘涓虹┖鎴栧～鏃�
if (StringUtils.isEmpty(api1201.getQddd())) {
@@ -438,6 +481,11 @@
Api1202 apiData = (Api1202) data;
BeanUtils.copyProperties(apiData, api1202);
api1202.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1202.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1202.getHwdm());
+ api1202.setTyhwbm(tyhwbm);
+ }
api1202.setJzrq(apiData.getCmsj());
if (StringUtils.isEmpty(api1202.getCddm())) {
api1202.setCddm(api1202.getHwdm().substring(2, 8));
@@ -480,6 +528,11 @@
Api1203 apiData = (Api1203) data;
BeanUtils.copyProperties(apiData, api1203);
api1203.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1203.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1203.getHwdm());
+ api1203.setTyhwbm(tyhwbm);
+ }
if (StringUtils.isEmpty(api1203.getJyxm())) {
api1203.setJyxm("0");
}
@@ -514,7 +567,11 @@
Api1204 apiData = (Api1204) data;
BeanUtils.copyProperties(apiData, api1204);
api1204.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1204.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1204.getHwdm());
+ api1204.setTyhwbm(tyhwbm);
+ }
//璁剧疆鎵规鍙�
if (StringUtils.isNotEmpty(api1204.getHth())) {
List<Api1202> api1202List = api1202Rep.getDataByRkjsdh(api1204.getRkjsdh());
@@ -542,7 +599,11 @@
Api1205 apiData = (Api1205) data;
BeanUtils.copyProperties(apiData, api1205);
api1205.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1205.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1205.getHwdm());
+ api1205.setTyhwbm(tyhwbm);
+ }
api1205.setJzrq(apiData.getCmsj());
if (StringUtils.isEmpty(api1205.getCddm())) {
api1205.setCddm(api1205.getHwdm().substring(2, 8));
@@ -580,6 +641,11 @@
Api1206 apiData = (Api1206) data;
BeanUtils.copyProperties(apiData, api1206);
api1206.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1206.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(apiData.getKqdm());
+ api1206.setTykqbm(tykqbm);
+ }
//鎵规鍙�
if (StringUtils.isNotEmpty(api1206.getHth())) {
List<Api1205> api1205List = api1205Rep.getDataByCkjsdh(api1206.getCkjsdh());
@@ -608,6 +674,16 @@
api1207.setDcrq(apiData.getDcrq());
api1207.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1207.getDcdwtybm())){
+ String dckqtybm = apiCommonService.getTykqbm(api1207.getDcdw());
+ api1207.setDcdwtybm(dckqtybm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1207.getDchwtybm())){
+ String dchwtybm = apiCommonService.getTyhwbm(api1207.getDchwdm());
+ api1207.setDchwtybm(dchwtybm);
+ }
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1207.getDchwdm());
if (null != api1208List && api1208List.size() > 0) {
@@ -625,6 +701,16 @@
api1208.setZglkdm(api1208.getHwdm().substring(0, 21));
api1208.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1208.getZglktybm())){
+ String lqgstydwbm = apiCommonService.getTykqbm(api1208.getZglkdm());
+ api1208.setZglktybm(lqgstydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1208.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1208.getHwdm());
+ api1208.setTyhwbm(tyhwbm);
+ }
//璁剧疆鎵规鍙�
api1208.setPch(apiData.getHwdm() + apiData.getShnd());
if (StringUtils.isEmpty(api1208.getCd())) {
@@ -656,7 +742,11 @@
if (null != api1208List && api1208List.size() > 0) {
api1209.setPch(api1209.getHwdm() + api1208List.get(0).getShnd());
}
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1209.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1209.getHwdm());
+ api1209.setTyhwbm(tyhwbm);
+ }
//绮鎬ц川,鏆傛椂榛樿鍖虹骇鍌ㄥ
api1209.setLsxzdm("122");
@@ -670,6 +760,11 @@
BeanUtils.copyProperties(apiData, api1210);
api1210.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1210.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1210.getHwdm());
+ api1210.setTyhwbm(tyhwbm);
+ }
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1210.getHwdm());
if (null != api1208List && api1208List.size() > 0) {
api1210.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
@@ -704,6 +799,11 @@
BeanUtils.copyProperties(apiData, api1211);
api1211.setZglkdm(api1211.getKqdm());
api1211.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1211.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1211.getHwdm());
+ api1211.setTyhwbm(tyhwbm);
+ }
api1211.setPch(apiData.getHwdm() + DateFormatUtils.format(apiData.getYwrq(), "yyyyMM"));
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1211.getHwdm());
if (null != api1208List && api1208List.size() > 0) {
@@ -711,6 +811,11 @@
}
//涓荤绮簱浠ｇ爜
api1211.setZglkdm(apiData.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1211.getZglktybm())){
+ String zglktybm = apiCommonService.getTykqbm(api1211.getZglkdm());
+ api1211.setZglktybm(zglktybm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1211);
return api1211;
@@ -719,7 +824,16 @@
SH2023Api1212 api1212 = new SH2023Api1212();
BeanUtils.copyProperties(data, api1212);
api1212.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1212.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1212.getDwdm());
+ api1212.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1212.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1212.getKqdm());
+ api1212.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1212);
return api1212;
@@ -728,7 +842,11 @@
SH2023Api1301 api1301 = new SH2023Api1301();
BeanUtils.copyProperties(data, api1301);
api1301.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1301.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1301.getDwdm());
+ api1301.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1301);
return api1301;
@@ -738,6 +856,11 @@
Api1302 apiData = (Api1302) data;
BeanUtils.copyProperties(apiData, api1302);
api1302.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1302.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1302.getHwdm());
+ api1302.setTyhwbm(tyhwbm);
+ }
api1302.setLqjs("1");
//鎵规鍙�
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1302.getHwdm());
@@ -756,6 +879,11 @@
Api1303 apiData = (Api1303) data;
BeanUtils.copyProperties(apiData, api1303);
api1303.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1303.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1303.getHwdm());
+ api1303.setTyhwbm(tyhwbm);
+ }
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1303.getHwdm());
if (null != api1208List && api1208List.size() > 0) {
api1303.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
@@ -769,6 +897,11 @@
Api1304 apiData = (Api1304) data;
BeanUtils.copyProperties(apiData, api1304);
api1304.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1304.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1304.getHwdm());
+ api1304.setTyhwbm(tyhwbm);
+ }
List<Api1208> api1208List = api1208Rep.findDataByHwdm(api1304.getHwdm());
if (null != api1208List && api1208List.size() > 0) {
api1304.setPch(apiData.getHwdm() + api1208List.get(0).getShnd());
@@ -784,6 +917,11 @@
BeanUtils.copyProperties(apiData, api1305);
api1305.setBjw(ShAreaBjw.getBjw(code));
api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1305.getTyajbm())){
+ String tyajbm = apiCommonService.getTyajbm(api1305.getAjdm());
+ api1305.setTyajbm(tyajbm);
+ }
//涓婃捣閫氶浣滀笟鍗曞彿锛氬粧闂翠唬鐮�+yyyyMMdd+3浣嶉『搴忓彿
api1305.setAjdm(apiData.getTfzydh().substring(0, 28));
api1305.setTfzydh(apiData.getTfzydh().substring(0, 28) + apiData.getTfzydh().substring(30));
@@ -800,6 +938,11 @@
BeanUtils.copyProperties(apiData, api1306);
api1306.setBjw(ShAreaBjw.getBjw(code));
api1306.setAjdm(apiData.getHwdm().substring(0, 28));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1306.getTyajbm())){
+ String tyajbm = apiCommonService.getTyajbm(api1306.getAjdm());
+ api1306.setTyajbm(tyajbm);
+ }
//涓婃捣鐔忚捀浣滀笟鍗曞彿锛氳揣浣嶄唬鐮�+yyyyMMdd + 3浣嶉『搴忓彿
api1306.setXzzydh(apiData.getHwdm() + apiData.getBizId());
//璁剧疆鎵规鍙�
@@ -820,7 +963,21 @@
BeanUtils.copyProperties(apiData, api1307);
api1307.setBjw(ShAreaBjw.getBjw(code));
api1307.setAjdm(apiData.getHwdm().substring(0, 28));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1307.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1307.getKqdm());
+ api1307.setTykqbm(tykqbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1307.getTyajbm())){
+ String tyajbm = apiCommonService.getTyajbm(api1307.getAjdm());
+ api1307.setTyajbm(tyajbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1307.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1307.getHwdm());
+ api1307.setTyhwbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1307);
return api1307;
@@ -831,7 +988,16 @@
BeanUtils.copyProperties(apiData, api1308);
api1308.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1308.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1308.getKqdm());
+ api1308.setTykqbm(tykqbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1308.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1308.getHwdm());
+ api1308.setTyhwbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1308);
return api1308;
@@ -840,6 +1006,11 @@
SH2023Api1309 api1309 = new SH2023Api1309();
BeanUtils.copyProperties(data, api1309);
api1309.setBjw(ShAreaBjw.getBjw(code));
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1309.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1309.getQydm());
+ api1309.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1309);
return api1309;
@@ -850,7 +1021,11 @@
BeanUtils.copyProperties(apiData, api1310);
api1310.setBjw(ShAreaBjw.getBjw(code));
api1310.setJyrq(apiData.getJysj());
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1310.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1310.getHwdm());
+ api1310.setTyhwbm(tyhwbm);
+ }
if (StringUtils.isEmpty(api1310.getJyxm())) {
api1310.setJyxm("0");
}
@@ -893,7 +1068,11 @@
SH2023Api1311 api1311 = new SH2023Api1311();
BeanUtils.copyProperties(data, api1311);
api1311.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1311.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(api1311.getKqdm());
+ api1311.setTykqbm(tykqbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1311);
return api1311;
@@ -902,7 +1081,11 @@
SH2023Api1401 api1401 = new SH2023Api1401();
BeanUtils.copyProperties(data, api1401);
api1401.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1401.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1401.getCcqy());
+ api1401.setTydwbm(tydwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1401);
return api1401;
@@ -925,7 +1108,11 @@
api1403.setJhzxdw(api1101List.get(0).getDwdm());
api1403.setJhzxdwmc(api1101List.get(0).getDwmc());
api1403.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1403.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(api1403.getJhzxdw());
+ api1403.setTydwbm(tydwbm);
+ }
//鏌ヨ杞崲璁″垝鐨勮疆鍏ユ暟閲忓拰杞嚭鏁伴噺
List<Api1404> list = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh());
Double lrsl = 0.0, lcsl = 0.0; //鐢ㄤ簬缁熻杞叆鏁伴噺鍜岃疆鍑烘暟閲�
@@ -951,7 +1138,11 @@
BeanUtils.copyProperties(data, api1404);
api1404.setMxzt("1");
api1404.setBjw(ShAreaBjw.getBjw(code));
-
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(api1404.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(api1404.getLhhwdm());
+ api1404.setTyhwbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(api1404);
return api1404;
@@ -968,6 +1159,17 @@
if (null != api1208List && api1208List.size() > 0) {
apiData.setPch(apiData.getDrhwdm() + api1208List.get(0).getShnd());
}
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getDrdwtybm())){
+ String drkqtybm = apiCommonService.getTykqbm(apiData.getDrdw());
+ apiData.setDrdwtybm(drkqtybm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getDrhwtybm())){
+ String drhwtybm = apiCommonService.getTyhwbm(apiData.getDrhwdm());
+ apiData.setDrhwtybm(drhwtybm);
+ }
+
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(apiData);
return apiData;
@@ -975,6 +1177,11 @@
if (SH2023Constant.SH_2023_API_CODE_2103.equals(inteId)) {
SH2023Api2103 apiData = new SH2023Api2103();
BeanUtils.copyProperties(data, apiData);
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(apiData.getTyhwbm())){
+ String tyhwbm = apiCommonService.getTyhwbm(apiData.getHwdm());
+ apiData.setTyhwbm(tyhwbm);
+ }
//璁剧疆绌哄睘鎬т负榛樿鍊�
changeObject(apiData);
return apiData;
@@ -1159,6 +1366,17 @@
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1503.getDwdm());
+ shFinanceDto.setKqdm(api1503.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
+ shFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
+ shFinanceDto.setTykqbm(tykqbm);
+ }
shFinanceDto.setBbsj(DateFormatUtils.format(api1503.getBbsj(), "yyyyMMdd"));
shFinanceDto.setBbm("03");
shFinanceDto.setCzbz(api1503.getCzbz());
@@ -1209,6 +1427,17 @@
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1502.getDwdm());
+ shFinanceDto.setKqdm(api1502.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
+ shFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
+ shFinanceDto.setTykqbm(tykqbm);
+ }
shFinanceDto.setBbsj(DateFormatUtils.format(api1502.getBbsj(), "yyyyMMdd"));
shFinanceDto.setBbm("02");
shFinanceDto.setCzbz(api1502.getCzbz());
@@ -1261,6 +1490,17 @@
List<SHFinanceDto> list = new ArrayList<>();
SHFinanceDto shFinanceDto = new SHFinanceDto();
shFinanceDto.setDwdm(api1501.getDwdm());
+ shFinanceDto.setKqdm(api1501.getKqdm());
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTydwbm())){
+ String tydwbm = apiCommonService.getTydwbm(shFinanceDto.getDwdm());
+ shFinanceDto.setTydwbm(tydwbm);
+ }
+ //鏍￠獙缁熶竴缂栫爜鏄惁涓虹┖锛屼负绌哄垯鏌ヨ淇℃伅杩涜璧嬪��
+ if(StringUtils.isEmpty(shFinanceDto.getTykqbm())){
+ String tykqbm = apiCommonService.getTykqbm(shFinanceDto.getKqdm());
+ shFinanceDto.setTykqbm(tykqbm);
+ }
shFinanceDto.setBbsj(DateFormatUtils.format(api1501.getBbsj(), "yyyyMMdd"));
shFinanceDto.setBbm("01");
shFinanceDto.setCzbz(api1501.getCzbz());
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 21dd4b1..ccb4bb9 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1101.java
@@ -2,9 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
-import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@@ -25,6 +23,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/sh2023/dto/SH2023Api1102.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
index 579887d..a8cd1c2 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1102.java
@@ -2,14 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
-import com.fasterxml.jackson.annotation.JsonIgnore;
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;
@@ -24,6 +17,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/sh2023/dto/SH2023Api1103.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java
index 88133d0..d86be87 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1103.java
@@ -23,6 +23,9 @@
@PropertyDef(label = "浠撴埧鍚嶇О")
private String cfmc;
+ @PropertyDef(label = "缁熶竴浠撴埧缂栫爜")
+ private String tycfbm;
+
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
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 2c57f4c..a249cdd 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1104.java
@@ -26,6 +26,9 @@
@PropertyDef(label = "寤掗棿鍚嶇О")
private String ajmc;
+ @PropertyDef(label = "缁熶竴寤掗棿缂栫爜")
+ private String tyajbm;
+
@PropertyDef(label = "浠撴埧(鎴栨补缃�)缂栫爜")
private String cfdm;
@@ -183,6 +186,9 @@
@PropertyDef(label = "浠撴埧绾害")
private Double wd;
+ @PropertyDef(label = "寤掗棿鐘舵��")
+ private String ajzt;
+
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
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 04aa037..955de45 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1105.java
@@ -23,6 +23,9 @@
@PropertyDef(label = "璐т綅鍚嶇О")
private String hwmc;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "寤掗棿浠ｇ爜")
private String ajdm;
@@ -42,6 +45,9 @@
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
+ @PropertyDef(label = "璐т綅鐘舵��")
+ private String hwzt;
+
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private Date zhgxsj;
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 3e039d5..bd4c306 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1106.java
@@ -24,6 +24,9 @@
@PropertyDef(label = "娌圭綈鍚嶇О")
private String ygmc;
+ @PropertyDef(label = "缁熶竴娌圭綈缂栫爜" )
+ private String tyygbm;
+
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
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 105c6bb..b129735 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1107.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1107.java
@@ -20,6 +20,9 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "璁惧缂栧彿")
private String sbbh;
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 0a51a7e..eaff34e 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1108.java
@@ -30,6 +30,9 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "閲囪喘鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
private Date cgrq;
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 4986870..4b190ae 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1109.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1109.java
@@ -23,6 +23,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/sh2023/dto/SH2023Api1110.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java
index b2078a2..853e929 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1110.java
@@ -23,6 +23,9 @@
@PropertyDef(label = "寤掗棿浠ｇ爜")
private String ajdm;
+ @PropertyDef(label = "寤掗棿浠ｇ爜")
+ private String tyajbm;
+
@PropertyDef(label = "寤掗棿鐩稿浣嶇疆")
private String ajxdwz;
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 e3c765e..2b8b748 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1111.java
@@ -20,6 +20,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/sh2023/dto/SH2023Api1112.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java
index 89da6c2..4fb6a98 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1112.java
@@ -22,6 +22,12 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "鍗曚綅鍚嶇О")
private String dwmc;
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 5a78eef..b66d261 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1113.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1113.java
@@ -20,6 +20,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/sh2023/dto/SH2023Api1114.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1114.java
deleted file mode 100644
index b5305f9..0000000
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1114.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.fzzy.push.sh2023.dto;
-
-import com.alibaba.fastjson.annotation.JSONField;
-import com.bstek.dorado.annotation.PropertyDef;
-import lombok.Data;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 璐㈠姟鎶ヨ〃淇℃伅鎺ュ彛
- */
-@Data
-public class SH2023Api1114 implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = 4416097604510905407L;
-
-
- @PropertyDef(label = "鍗曚綅浠ｇ爜")
- private String dwdm;
-
- @PropertyDef(label = "鎶ヨ〃鏃堕棿")
- @JSONField(format = "yyyyMMdd")
- private Date bbsj;
-
- @PropertyDef(label = "鎶ヨ〃鍚�")
- private String bbm;
-
- @PropertyDef(label = "鎸囨爣鍚嶇О")
- private String zbmc;
-
- @PropertyDef(label = "鎸囨爣鍊�1")
- private String zbz1;
-
- @PropertyDef(label = "鎸囨爣鍊�2")
- private String zbz2;
-
- @PropertyDef(label = "鎿嶄綔鏍囧織")
- private String czbz;
-
- @JSONField(format = "yyyy-MM-dd HH:mm:ss")
- @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�")
- private Date zhgxsj;
-
-
-}
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 97988ad..9252212 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1201.java
@@ -4,7 +4,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import com.fzzy.conf.NumberSerializer;
import lombok.Data;
-import javax.persistence.Column;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
@@ -24,12 +23,14 @@
private String hth;
@PropertyDef(label = "鍚堝悓鍚嶇О")
- @Column(name = "htmc", length = 128)
private String htmc;
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "涓氬姟绫诲埆")
private String ywlx;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
index 00817d1..1e6dc9a 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1202.java
@@ -4,7 +4,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -27,6 +26,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
@PropertyDef(label = "涓氬姟绫诲瀷", description = "2锛氬叆搴擄紙榛樿锛�")
private String ywlx = "2";
@@ -171,7 +173,6 @@
private String klyy;
@PropertyDef(label = "鐜板満鎵ｉ噺(鍏枻)")
- @Column(name = "xckl")
private Double xckl;
@PropertyDef(label = "澧炴墸浠�(鍏枻)")
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java
index 3fb872f..6c7e336 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1203.java
@@ -2,14 +2,9 @@
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;
@@ -35,6 +30,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/sh2023/dto/SH2023Api1204.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1204.java
index 2c4da07..5fff2b0 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1204.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1204.java
@@ -31,6 +31,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/sh2023/dto/SH2023Api1205.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
index 34dd6ff..06a2f24 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1205.java
@@ -33,6 +33,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/sh2023/dto/SH2023Api1206.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1206.java
index 418857a..74dd7eb 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1206.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1206.java
@@ -2,14 +2,8 @@
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;
@@ -27,6 +21,9 @@
@PropertyDef(label = "鍑哄簱缁撶畻鍗曞彿")
private String ckjsdh;
+ @PropertyDef(label = "缁熶竴搴撳尯浠ｇ爜")
+ private String tykqbm;
+
@PropertyDef(label = "鍚堝悓鍙�")
private String hth;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java
index f1f1c74..680b815 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1207.java
@@ -4,7 +4,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
import java.io.Serializable;
import java.util.Date;
@@ -34,6 +33,12 @@
@PropertyDef(label = "鍊掑嚭鍗曚綅")
private String dcdw;
+ @PropertyDef(label = "鍊掑嚭鍗曚綅缁熶竴缂栫爜")
+ private String dcdwtybm;
+
+ @PropertyDef(label = "鍊掑嚭璐т綅缁熶竴缂栫爜" )
+ private String dchwtybm;
+
@PropertyDef(label = "绮鍝佺浠ｇ爜")
private String lspzdm;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java
index 371eeab..f62567b 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1208.java
@@ -4,7 +4,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
import java.io.Serializable;
import java.util.Date;
@@ -21,6 +20,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
@PropertyDef(label = "绮鍝佺浠ｇ爜")
private String lspzdm;
@@ -46,6 +48,9 @@
@PropertyDef(label = "涓荤绮簱浠ｇ爜")
private String zglkdm;
+ @PropertyDef(label = "涓荤绮簱缁熶竴浠ｇ爜")
+ private String zglktybm;
+
@PropertyDef(label = "绠＄悊鏂瑰紡")
private String glfs;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
index 1f63806..aa51358 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1209.java
@@ -25,6 +25,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "璁拌处鏃ユ湡")
private Date jzrq;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java
index 9e4e9a1..4caa2c4 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1210.java
@@ -25,6 +25,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/sh2023/dto/SH2023Api1211.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
index 3694117..a9a5164 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1211.java
@@ -28,9 +28,15 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "涓荤绮簱浠ｇ爜")
private String zglkdm;
+ @PropertyDef(label = "涓荤绮簱缁熶竴缂栫爜")
+ private String zglktybm;
+
@PropertyDef(label = "骞村害")
private String nd;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1212.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1212.java
index cbbfc90..581d295 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1212.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1212.java
@@ -22,12 +22,18 @@
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "鍗曚綅鍚嶇О")
private String dwmc;
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "搴撳尯鍚嶇О")
private String kqmc;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java
index ccff16f..87eedc2 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1301.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;
@@ -28,6 +23,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/sh2023/dto/SH2023Api1302.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java
index 1d750d4..e4eeff8 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1302.java
@@ -2,14 +2,8 @@
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;
@@ -39,6 +33,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/sh2023/dto/SH2023Api1303.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java
index 5218221..7b0758a 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1303.java
@@ -2,14 +2,8 @@
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;
@@ -38,6 +32,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/sh2023/dto/SH2023Api1304.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1304.java
index 1680a0b..00b3c69 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1304.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1304.java
@@ -2,14 +2,8 @@
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;
@@ -38,6 +32,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/sh2023/dto/SH2023Api1305.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java
index 73c8082..e235335 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1305.java
@@ -2,14 +2,8 @@
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;
@@ -186,6 +180,9 @@
@PropertyDef(label = "寤掗棿浠ｇ爜")
private String ajdm;
+ @PropertyDef(label = "缁熶竴寤掗棿缂栫爜")
+ private String tyajbm;
+
@PropertyDef(label = "鏍囪浣�")
private String bjw;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1306.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1306.java
index 24e3afb..03e55d0 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1306.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1306.java
@@ -2,14 +2,8 @@
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;
@@ -231,6 +225,9 @@
@PropertyDef(label = "寤掗棿浠ｇ爜")
private String ajdm;
+ @PropertyDef(label = "缁熶竴寤掗棿缂栫爜")
+ private String tyajbm;
+
@PropertyDef(label = "鎵规鍙�")
private String pch;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java
index 3bdeb3b..c833651 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1307.java
@@ -25,15 +25,24 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "瑙嗛鐩戞帶璁惧id")
private String spjksbid;
@PropertyDef(label = "寤掗棿浠ｇ爜")
private String ajdm;
+ @PropertyDef(label = "缁熶竴寤掗棿缂栫爜")
+ private String tyajbm;
+
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鎶撴媿鏃堕棿")
private Date zpsj;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1308.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1308.java
index d16ea80..4c55bce 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1308.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1308.java
@@ -32,9 +32,15 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "搴撳尯鍦板潃")
private String kqdz;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1309.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1309.java
index 579b0e0..cefab57 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1309.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1309.java
@@ -33,9 +33,12 @@
@PropertyDef(label = "杩濊涓讳綋绫诲瀷")
private String wgztlx;
- @PropertyDef(label = "杩濊鍗曚綅浠ｇ爜")
+ @PropertyDef(label = "杩濊搴撳尯浠ｇ爜")
private String qydm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "杩濊琛屼负浜�")
private String wgxwr;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
index 1ad29fb..69ea5d9 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1310.java
@@ -2,14 +2,8 @@
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;
@@ -34,6 +28,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/sh2023/dto/SH2023Api1311.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java
index 529b88c..847ce9e 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1311.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
-import com.fzzy.api.entity.ApiParent;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -35,6 +34,9 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
/**
* 1 娴峰悍, 2 澶у崕, 3 瀹囪
* 4 澶╁湴浼熶笟,5 鍗庝负,9 鍏朵粬
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java
index 2233ef5..9ebaad0 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1401.java
@@ -4,9 +4,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import org.hibernate.annotations.GenericGenerator;
-
-import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
@@ -34,6 +31,9 @@
@PropertyDef(label = "鎵垮偍浼佷笟")
private String ccqy;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "绮鍝佺")
private String ylpz;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
index 5e5b772..ba8e2fe 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1403.java
@@ -4,8 +4,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -48,6 +46,9 @@
@PropertyDef(label = "璁″垝鎵ц鍗曚綅")
private String jhzxdw;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
@PropertyDef(label = "璁″垝鎵ц鍗曚綅鍚嶇О")
private String jhzxdwmc;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java
index 90a9fd9..14ae7cb 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api1404.java
@@ -4,8 +4,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import javax.persistence.Column;
import java.io.Serializable;
import java.util.Date;
@@ -46,6 +44,9 @@
@PropertyDef(label = "杞崲璐т綅浠ｇ爜")
private String lhhwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "杞崲鏁伴噺")
private double lhsl;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java
index be0b8a6..2d88791 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2101.java
@@ -2,11 +2,8 @@
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 java.io.Serializable;
import java.util.Date;
@@ -30,6 +27,9 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@JSONField(format = "yyyy-MM-dd")
@PropertyDef(label = "妫�鏂ゆ棩鏈�")
private Date jjrq;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java
index d41a7ac..d1cc1bf 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2102.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
-import com.fzzy.api.entity.ApiParent;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -32,6 +31,12 @@
@PropertyDef(label = "鍊掑叆璐т綅浠ｇ爜")
private String drhwdm;
+ @PropertyDef(label = "鍊掑叆鍗曚綅缁熶竴缂栫爜")
+ private String drdwtybm;
+
+ @PropertyDef(label = "鍊掑叆璐т綅缁熶竴缂栫爜" )
+ private String drhwtybm;
+
@PropertyDef(label = "鎿嶄綔鏍囧織")
private String czbz;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
index 868743d..7fcb8a0 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2103.java
@@ -2,10 +2,7 @@
import com.alibaba.fastjson.annotation.JSONField;
import com.bstek.dorado.annotation.PropertyDef;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fzzy.api.entity.ApiParent;
import lombok.Data;
-
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Date;
@@ -25,6 +22,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "鐢电紗琛屾暟")
private String dlhs;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java
index 19c7f52..9a402ea 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2104.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;
@@ -23,6 +22,9 @@
@PropertyDef(label = "搴撳尯浠ｇ爜")
private String kqdm;
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "璁拌处鏃ユ湡")
@JSONField(format = "yyyy-MM-dd")
private Date jzrq;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2204.java b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2204.java
index 3550c86..fb7c824 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2204.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SH2023Api2204.java
@@ -26,6 +26,9 @@
@PropertyDef(label = "璐т綅浠ｇ爜")
private String hwdm;
+ @PropertyDef(label = "缁熶竴璐т綅缂栫爜" )
+ private String tyhwbm;
+
@PropertyDef(label = "绮鎬ц川浠ｇ爜")
private String lsxzdm;
diff --git a/src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java b/src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java
index 36c1920..fbec549 100644
--- a/src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java
+++ b/src/main/java/com/fzzy/push/sh2023/dto/SHFinanceDto.java
@@ -10,6 +10,15 @@
@PropertyDef(label = "鍗曚綅浠ｇ爜")
private String dwdm;
+ @PropertyDef(label = "缁熶竴鍗曚綅缂栫爜")
+ private String tydwbm;
+
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+ @PropertyDef(label = "缁熶竴搴撳尯缂栫爜")
+ private String tykqbm;
+
@PropertyDef(label = "鎶ヨ〃鏈熷彿")
private String bbsj;
diff --git a/src/main/resources/application-pro.yml b/src/main/resources/application-pro.yml
index 8c771ea..97fc489 100644
--- a/src/main/resources/application-pro.yml
+++ b/src/main/resources/application-pro.yml
@@ -1,4 +1,4 @@
-########################## 骞夸笢姹曞ご娼崡 ##########################
+########################## 骞夸笢娼槼 ##########################
server:
port: 8090
jetty:
@@ -9,16 +9,16 @@
datasource:
#涓绘暟鎹簮
primary:
- url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8&useSSL=false
- driver-class-name: com.mysql.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/igds_api?useUnicode=true&characterEncoding=utf-8
username: root
- password: Fzzy@#$%5432..K
+ password: Abc123..
+ driver-class-name: com.mysql.jdbc.Driver
#娆℃暟鎹簮
secondary:
- url: jdbc:mysql://127.0.0.1:3306/igds_master?useUnicode=true&characterEncoding=utf-8&useSSL=false
- driver-class-name: com.mysql.jdbc.Driver
+ url: jdbc:mysql://127.0.0.1:3306/igds_master_v40?useUnicode=true&characterEncoding=utf-8
username: root
- password: Fzzy@#$%5432..K
+ password: Abc123..
+ driver-class-name: com.mysql.jdbc.Driver
jpa:
#涓籮pa閰嶇疆
primary:
@@ -38,10 +38,10 @@
dialect: org.hibernate.dialect.MySQL5InnoDBDialect
# Redis鐩稿叧閰嶇疆
redis:
- database: 1
+ database: 0
host: 127.0.0.1
port: 6379
- password: Redispwd..
+ password: Abc123..
# 杩炴帴姹犳渶澶ц繛鎺ユ暟锛堜娇鐢ㄨ礋鍊艰〃绀烘病鏈夐檺鍒讹級
pool:
max-active: 200
@@ -51,6 +51,7 @@
timeout: 6000
igds:
default:
- companyId: 5348
+ companyId: 5317
+
file-path: D:/IGDS-API/FILE/
img-path: D:/IGDS/FILE/
\ No newline at end of file
--
Gitblit v1.9.3