From 95dc97a5b3378f9da80aeec71be0fe02c6b7e057 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期一, 06 十一月 2023 20:22:23 +0800
Subject: [PATCH] 调整广东省轮换计划上报
---
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java | 94 ++++++++++
src/main/java/com/fzzy/api/entity/Api1403.java | 27 +++
src/main/java/com/fzzy/api/entity/Api1401.java | 15 -
src/main/java/com/fzzy/api/view/pr/Api1401PR.java | 3
src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java | 71 ++++++-
src/main/java/com/fzzy/api/view/Api1403.view.xml | 260 +++++++++++++++++++++-------
src/main/java/com/fzzy/api/view/repository/Api1401Rep.java | 2
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1404.java | 58 ++++++
src/main/java/com/fzzy/api/view/Api1401.view.xml | 1
src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java | 2
src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1308.java | 2
11 files changed, 439 insertions(+), 96 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1401.java b/src/main/java/com/fzzy/api/entity/Api1401.java
index 0ea6484..7b96282 100644
--- a/src/main/java/com/fzzy/api/entity/Api1401.java
+++ b/src/main/java/com/fzzy/api/entity/Api1401.java
@@ -32,11 +32,8 @@
@Id
@JSONField(serialize = false)
- @GenericGenerator(name = "generator", strategy = "increment")
- @GeneratedValue(generator = "generator")
- @PropertyDef(label = "涓婚敭id", description = "鎺ュ彛杩斿洖涓嶆秹鍙婃瀛楁")
@Column(name = "ID_")
- private Integer id;
+ private String id;
@JSONField(serialize = false)
@PropertyDef(label = "涓氬姟id")
@@ -48,15 +45,15 @@
private String kqdm;
@PropertyDef(label = "骞翠唤" )
- @Column(name = "nf", length = 4, nullable = false)
+ @Column(name = "nf", length = 4)
private String nf;
@PropertyDef(label = "琛屾斂鍖哄垝浠ｇ爜" )
- @Column(name = "xzqhdm", length = 6, nullable = false)
+ @Column(name = "xzqhdm", length = 6)
private String xzqhdm;
@PropertyDef(label = "鎵垮偍浼佷笟" )
- @Column(name = "ccqy", length = 18, nullable = false)
+ @Column(name = "ccqy", length = 18)
private String ccqy;
@PropertyDef(label = "绮鍝佺" )
@@ -80,12 +77,12 @@
private String remarks;
@PropertyDef(label = "鎿嶄綔鏍囧織" )
- @Column(name = "czbz", length = 1, nullable = false)
+ @Column(name = "czbz", length = 1)
private String czbz;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
@PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
- @Column(name = "zhgxsj", nullable = false)
+ @Column(name = "zhgxsj")
private Date zhgxsj;
}
diff --git a/src/main/java/com/fzzy/api/entity/Api1403.java b/src/main/java/com/fzzy/api/entity/Api1403.java
index 137abd3..bbc2033 100644
--- a/src/main/java/com/fzzy/api/entity/Api1403.java
+++ b/src/main/java/com/fzzy/api/entity/Api1403.java
@@ -28,6 +28,7 @@
*/
private static final long serialVersionUID = 1L;
+ /*----------鍥芥爣瀛楁----------*/
@Id
@PropertyDef(label = "杞崲璁″垝鍗曞彿", description = "鍗曚綅缂栫爜 + 4浣嶅勾浠� + 3浣嶉『搴忓彿")
@Column(name = "lhjhdh", length = 25)
@@ -90,4 +91,30 @@
@PropertyDef(label = "鍚屾鏃堕棿", description = "浠庣伯搴撶郴缁熷悓姝ュ埌鎺ュ彛绠＄悊涓績鐨勬椂闂�")
@Column(name = "syncTime")
private Date syncTime;
+
+
+ /*----------骞夸笢鐪佸钩鍙拌鑼冨瓧娈�----------*/
+ @PropertyDef(label = "绠＄悊鏂瑰紡" )
+ @Column(name = "manageWay")
+ private String manageWay;
+
+ @PropertyDef(label = "杞崲绫诲瀷" )
+ @Column(name = "rotationType")
+ private String rotationType;
+
+ @PropertyDef(label = "鏂囦欢瀛樺偍ID" )
+ @Column(name = "fileStorageId")
+ private String fileStorageId;
+
+ @PropertyDef(label = "鏂囦欢鍚嶇О" )
+ @Column(name = "fileName")
+ private String fileName;
+
+ @PropertyDef(label = "杞叆鏁伴噺" )
+ @Column(name = "rotationInQty")
+ private Double rotationInQty;
+
+ @PropertyDef(label = "杞嚭鏁伴噺" )
+ @Column(name = "rotationOutQty")
+ private Double rotationOutQty;
}
diff --git a/src/main/java/com/fzzy/api/view/Api1401.view.xml b/src/main/java/com/fzzy/api/view/Api1401.view.xml
index c0b9675..08f526f 100644
--- a/src/main/java/com/fzzy/api/view/Api1401.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1401.view.xml
@@ -8,7 +8,6 @@
<PropertyDef name="id">
<Property></Property>
<Property name="label">涓婚敭id</Property>
- <Property name="dataType">Integer</Property>
</PropertyDef>
<PropertyDef name="nf">
<Property></Property>
diff --git a/src/main/java/com/fzzy/api/view/Api1403.view.xml b/src/main/java/com/fzzy/api/view/Api1403.view.xml
index 21f2c8a..dc0c06e 100644
--- a/src/main/java/com/fzzy/api/view/Api1403.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1403.view.xml
@@ -31,6 +31,9 @@
<PropertyDef name="jhxddw">
<Property name="label">璁″垝涓嬭揪鍗曚綅</Property>
</PropertyDef>
+ <PropertyDef name="jhxddwmc">
+ <Property name="label">璁″垝涓嬭揪鍗曚綅鍚嶇О</Property>
+ </PropertyDef>
<PropertyDef name="jhxdsj">
<Property name="label">璁″垝涓嬭揪鏃堕棿</Property>
<Property name="dataType">Date</Property>
@@ -60,6 +63,72 @@
<PropertyDef name="syncTime">
<Property name="dataType">Date</Property>
<Property name="label">鍚屾鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="manageWay">
+ <Property></Property>
+ <Property name="label">绠＄悊鏂瑰紡</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1-鐩村偍</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2-浠ｅ偍</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">3</Property>
+ <Property name="value">3-绉熶粨</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">4</Property>
+ <Property name="value">4-濮旀墭</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="rotationType">
+ <Property></Property>
+ <Property name="label">杞崲绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">1</Property>
+ <Property name="value">1-闈欐�佽疆鎹�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">2</Property>
+ <Property name="value">2-鍔ㄦ�佽疆鎹�</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="fileStorageId">
+ <Property></Property>
+ <Property name="label">鏂囦欢瀛樺偍ID</Property>
+ </PropertyDef>
+ <PropertyDef name="fileName">
+ <Property></Property>
+ <Property name="label">鏂囦欢鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="rotationInQty">
+ <Property></Property>
+ <Property name="dataType">Double</Property>
+ <Property name="label">杞叆鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="rotationOutQty">
+ <Property></Property>
+ <Property name="dataType">Double</Property>
+ <Property name="label">杞嚭鏁伴噺</Property>
</PropertyDef>
</DataType>
<DataType name="dtParam">
@@ -291,74 +360,129 @@
</Button>
</Buttons>
<Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelWidth">100</Property>
- <Property name="labelAlign">left</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelPosition">top</Property>
- <AutoFormElement>
- <Property name="name">lhjhdh</Property>
- <Property name="property">lhjhdh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jhwh</Property>
- <Property name="property">jhwh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jhmc</Property>
- <Property name="property">jhmc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jhnd</Property>
- <Property name="property">jhnd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kszxrq</Property>
- <Property name="property">kszxrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jzzxrq</Property>
- <Property name="property">jzzxrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jhxddw</Property>
- <Property name="property">jhxddw</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jhxdsj</Property>
- <Property name="property">jhxdsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zhgxsj</Property>
- <Property name="property">zhgxsj</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bizId</Property>
- <Property name="property">bizId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kqdm</Property>
- <Property name="property">kqdm</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
+ <GroupBox>
+ <Property name="caption">鍩虹淇℃伅</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">lhjhdh</Property>
+ <Property name="property">lhjhdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhwh</Property>
+ <Property name="property">jhwh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhmc</Property>
+ <Property name="property">jhmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhnd</Property>
+ <Property name="property">jhnd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kszxrq</Property>
+ <Property name="property">kszxrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jzzxrq</Property>
+ <Property name="property">jzzxrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhxddw</Property>
+ <Property name="property">jhxddw</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhxddwmc</Property>
+ <Property name="property">jhxddwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jhxdsj</Property>
+ <Property name="property">jhxdsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czbz</Property>
+ <Property name="property">czbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zhgxsj</Property>
+ <Property name="property">zhgxsj</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bizId</Property>
+ <Property name="property">bizId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqdm</Property>
+ <Property name="property">kqdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
+ <GroupBox>
+ <Property name="caption">骞夸笢鐪佸钩鍙�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelWidth">100</Property>
+ <Property name="labelAlign">left</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelPosition">top</Property>
+ <AutoFormElement>
+ <Property name="name">manageWay</Property>
+ <Property name="property">manageWay</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rotationType</Property>
+ <Property name="property">rotationType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fileStorageId</Property>
+ <Property name="property">fileStorageId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fileName</Property>
+ <Property name="property">fileName</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rotationInQty</Property>
+ <Property name="property">rotationInQty</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">rotationOutQty</Property>
+ <Property name="property">rotationOutQty</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </GroupBox>
</Children>
<Tools/>
</Dialog>
diff --git a/src/main/java/com/fzzy/api/view/pr/Api1401PR.java b/src/main/java/com/fzzy/api/view/pr/Api1401PR.java
index b15dabd..3f05a9f 100644
--- a/src/main/java/com/fzzy/api/view/pr/Api1401PR.java
+++ b/src/main/java/com/fzzy/api/view/pr/Api1401PR.java
@@ -116,6 +116,9 @@
Api1401 data = new Api1401();
BeanUtils.copyProperties(entity, data);
+ if(StringUtils.isEmpty(data.getId())){
+ data.setId(ContextUtil.getUUID());
+ }
api1401Rep.save(data);
}
diff --git a/src/main/java/com/fzzy/api/view/repository/Api1401Rep.java b/src/main/java/com/fzzy/api/view/repository/Api1401Rep.java
index 36899a0..0e896d3 100644
--- a/src/main/java/com/fzzy/api/view/repository/Api1401Rep.java
+++ b/src/main/java/com/fzzy/api/view/repository/Api1401Rep.java
@@ -10,7 +10,7 @@
import java.util.List;
-public interface Api1401Rep extends JpaRepository<Api1401, Integer>, JpaSpecificationExecutor<Api1401> {
+public interface Api1401Rep extends JpaRepository<Api1401, String>, JpaSpecificationExecutor<Api1401> {
@Query("from Api1401 where kqdm=:kqdm and zhgxsj >=:start and zhgxsj <:end order by zhgxsj ")
List<Api1401> findPushDataByTime(@Param("kqdm") String kqdm, @Param("start") Date start, @Param("end") Date end);
diff --git a/src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java b/src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java
index 347eaff..10656c8 100644
--- a/src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java
+++ b/src/main/java/com/fzzy/push/gd2022/ApiCodeConstant.java
@@ -111,7 +111,7 @@
/**
* 鎺ュ彛缂栫爜-1026 杞崲璁″垝淇℃伅鎺ュ彛
*/
- public static String API_CODE_LHJHXX = "lhjhxx";
+ public static String API_CODE_LHJH = "lhjh";
/**
* 鎺ュ彛缂栫爜-1027 杞崲璁″垝鏄庣粏淇℃伅鎺ュ彛
*/
diff --git a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
index 8bfb601..77d1b80 100644
--- a/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
+++ b/src/main/java/com/fzzy/push/gd2022/GD2022ApiRemoteService2022.java
@@ -9,6 +9,7 @@
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.*;
+import com.fzzy.api.view.repository.Api1404Rep;
import com.fzzy.api.view.repository.ApiLogRep;
import com.fzzy.push.gd2022.dto.*;
import com.fzzy.push.gd2022.dto.Gd2022Api1101;
@@ -46,6 +47,8 @@
@Autowired
private ApiCommonService apiCommonService;
+ @Autowired
+ private Api1404Rep api1404Rep;
@Autowired
private ApiLogRep apiLogRep;
@@ -131,6 +134,7 @@
/**
* 鎺ㄩ�佽储鍔℃暟鎹帴鍙�
+ *
* @param param
* @param conf
* @param data
@@ -301,25 +305,30 @@
Gd2022Api1101 api1101 = new Gd2022Api1101();
BeanUtils.copyProperties(data, api1101);
return JSON.toJSONString(api1101);
- } else if (Constant.API_CODE_1102.equals(inteId)) {
+ }
+ if (Constant.API_CODE_1102.equals(inteId)) {
Gd2022Api1102 api1102 = new Gd2022Api1102();
BeanUtils.copyProperties(data, api1102);
return JSON.toJSONString(api1102);
- } else if (Constant.API_CODE_1103.equals(inteId)) {
+ }
+ if (Constant.API_CODE_1103.equals(inteId)) {
Gd2022Api1103 api1103 = new Gd2022Api1103();
BeanUtils.copyProperties(data, api1103);
changeObject(api1103);
return JSON.toJSONString(api1103);
- } else if (Constant.API_CODE_1104.equals(inteId)) {
+ }
+ if (Constant.API_CODE_1104.equals(inteId)) {
Gd2022Api1104 api1104 = new Gd2022Api1104();
BeanUtils.copyProperties(data, api1104);
changeObject(api1104);
return JSON.toJSONString(api1104);
- } else if (Constant.API_CODE_1105.equals(inteId)) {
+ }
+ if (Constant.API_CODE_1105.equals(inteId)) {
Gd2022Api1105 api1105 = new Gd2022Api1105();
BeanUtils.copyProperties(data, api1105);
return JSON.toJSONString(api1105);
- }else if (Constant.API_CODE_1109.equals(inteId)) {
+ }
+ if (Constant.API_CODE_1109.equals(inteId)) {
//灏佽鏁版嵁
Gd2022Api1109 api1109 = new Gd2022Api1109();
BeanUtils.copyProperties(data, api1109);
@@ -333,15 +342,18 @@
//璁剧疆涓婁紶鏂囦欢id
api1109.setFileStorageId((String) responseDto.getData());
return JSON.toJSONString(api1109);
- }else if (Constant.API_CODE_1111.equals(inteId)) {
+ }
+ if (Constant.API_CODE_1111.equals(inteId)) {
Gd2022Api1111 api1111 = new Gd2022Api1111();
BeanUtils.copyProperties(data, api1111);
return JSON.toJSONString(api1111);
- } else if (Constant.API_CODE_1208.equals(inteId)) {
+ }
+ if (Constant.API_CODE_1208.equals(inteId)) {
Gd2022Api1208 api1208 = new Gd2022Api1208();
BeanUtils.copyProperties(data, api1208);
return JSON.toJSONString(api1208);
- } else if (Constant.API_CODE_1307.equals(inteId)) {
+ }
+ if (Constant.API_CODE_1307.equals(inteId)) {
//灏佽鏁版嵁
Gd2022Api1307 api1307 = new Gd2022Api1307();
BeanUtils.copyProperties(data, api1307);
@@ -354,7 +366,8 @@
//璁剧疆涓婁紶鏂囦欢id
api1307.setFileStorageId((String) responseDto.getData());
return JSON.toJSONString(api1307);
- } else if (Constant.API_CODE_1308.equals(inteId)) {
+ }
+ if (Constant.API_CODE_1308.equals(inteId)) {
//灏佽鏁版嵁
Gd2022Api1308 api1308 = new Gd2022Api1308();
BeanUtils.copyProperties(data, api1308);
@@ -367,10 +380,40 @@
//璁剧疆涓婁紶鏂囦欢id
api1308.setFileStorageId((String) responseDto.getData());
return JSON.toJSONString(api1308);
- } else {
-// changeObject(data);
- return JSON.toJSONString(data);
}
+ if (Constant.API_CODE_1403.equals(inteId)) {
+ //杞崲璁″垝锛屽崟鐙煡璇㈣疆鎹㈣鍒掓槑缁嗕俊鎭紝缁熶竴灏佽鍚庝笂浼�
+ Gd2022Api1403 api1403 = new Gd2022Api1403();
+ BeanUtils.copyProperties(data, api1403);
+ List<Api1404> list = api1404Rep.getDataByLhjhdh(api1403.getLhjhdh());
+ Gd2022Api1404 gd2022Api1404;
+ List<Gd2022Api1404> dtls = new ArrayList<>();
+ Double lrsl = 0.0, lcsl = 0.0; //鐢ㄤ簬缁熻杞叆鏁伴噺鍜岃疆鍑烘暟閲�
+ if(null != list && list.size() > 0){
+ for (Api1404 api1404 : list) {
+ gd2022Api1404 = new Gd2022Api1404();
+ BeanUtils.copyProperties(api1404, gd2022Api1404);
+ if(null!= gd2022Api1404.getLhlx() && "2".equals(gd2022Api1404.getLhlx())){
+ lrsl += gd2022Api1404.getLhsl();
+ }
+ if(null!= gd2022Api1404.getLhlx() && "1".equals(gd2022Api1404.getLhlx())){
+ lcsl += gd2022Api1404.getLhsl();
+ }
+ dtls.add(gd2022Api1404);
+ }
+ }
+ api1403.setRotationInQty(lrsl);
+ api1403.setRotationOutQty(lcsl);
+ api1403.setDtls(dtls);
+ return JSON.toJSONString(api1403);
+ }
+ if (Constant.API_CODE_1404.equals(inteId)) {
+ //杞崲璁″垝鏄庣粏锛屼笉鍗曠嫭涓婁紶锛屽湪杞崲璁″垝涓粺涓�涓婁紶
+ return null;
+ }
+
+// changeObject(data);
+ return JSON.toJSONString(data);
}
@@ -662,9 +705,9 @@
case "1402":
return ApiCodeConstant.API_CODE_CBJHXX;
case "1403":
- return ApiCodeConstant.API_CODE_LHJHXX;
+ return ApiCodeConstant.API_CODE_LHJH;
case "1404":
- return ApiCodeConstant.API_CODE_LHJHMXXX;
+ return null;
case "1405":
return "";
case "1501":
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1308.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1308.java
index 5f83f13..ca4f49f 100644
--- a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1308.java
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1308.java
@@ -4,7 +4,6 @@
import com.bstek.dorado.annotation.PropertyDef;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import javax.persistence.Id;
import java.io.Serializable;
import java.util.Date;
@@ -22,7 +21,6 @@
*/
private static final long serialVersionUID = 1L;
- @Id
@JSONField(serialize = false)
private String id;
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java
new file mode 100644
index 0000000..a228142
--- /dev/null
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1403.java
@@ -0,0 +1,94 @@
+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 javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 鎺ュ彛琛�-杞崲璁″垝淇℃伅鏁版嵁琛�
+ *
+ * @author czt
+ * @date 2022-11-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class Gd2022Api1403 implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 1L;
+
+ @PropertyDef(label = "杞崲璁″垝鍗曞彿", description = "鍗曚綅缂栫爜 + 4浣嶅勾浠� + 3浣嶉『搴忓彿")
+ private String lhjhdh;
+
+ @PropertyDef(label = "璁″垝鏂囧彿" )
+ private String jhwh;
+
+ @PropertyDef(label = "璁″垝鍚嶇О" )
+ private String jhmc;
+
+ @PropertyDef(label = "璁″垝骞村害" )
+ private String jhnd;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "寮�濮嬫墽琛屾棩鏈�" )
+ private Date kszxrq;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鎴鎵ц鏃ユ湡" )
+ private Date jzzxrq;
+
+ @PropertyDef(label = "璁″垝涓嬭揪鍗曚綅" )
+ private String jhxddw;
+
+ @PropertyDef(label = "璁″垝涓嬭揪鍗曚綅鍚嶇О" )
+ private String jhxddwmc;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "璁″垝涓嬭揪鏃堕棿" )
+ private Date jhxdsj;
+
+ @PropertyDef(label = "绠＄悊鏂瑰紡" )
+ private String manageWay;
+
+ @PropertyDef(label = "杞崲绫诲瀷" )
+ private String rotationType;
+
+ @PropertyDef(label = "鏂囦欢瀛樺偍ID" )
+ private String fileStorageId;
+
+ @PropertyDef(label = "鏂囦欢鍚嶇О" )
+ private String fileName;
+
+ @PropertyDef(label = "杞叆鏁伴噺" )
+ private Double rotationInQty;
+
+ @PropertyDef(label = "杞嚭鏁伴噺" )
+ private Double rotationOutQty;
+
+ @PropertyDef(label = "杞崲璁″垝鏄庣粏鍒楄〃" )
+ private List<Gd2022Api1404> dtls;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ private Date zhgxsj;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ @Column(name = "kqdm", length = 21)
+ private String kqdm;
+
+}
diff --git a/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1404.java b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1404.java
new file mode 100644
index 0000000..cbfc299
--- /dev/null
+++ b/src/main/java/com/fzzy/push/gd2022/dto/Gd2022Api1404.java
@@ -0,0 +1,58 @@
+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
+ * @date 2022-11-06
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+public class Gd2022Api1404 implements Serializable {
+
+ @PropertyDef(label = "璁″垝鏄庣粏鍗曞彿" )
+ private String jhmxdh;
+
+ @PropertyDef(label = "杞崲璁″垝鍗曞彿" )
+ private String lhjhdh;
+
+ @PropertyDef(label = "绮鍝佺浠ｇ爜" )
+ private String lspzdm;
+
+ @PropertyDef(label = "绮绛夌骇浠ｇ爜" )
+ private String lsdjdm;
+
+ @PropertyDef(label = "绮鎬ц川浠ｇ爜" )
+ private String lsxzdm;
+
+ @PropertyDef(label = "鏀惰幏骞村害" )
+ private String shnd;
+
+ @PropertyDef(label = "杞崲璐т綅浠ｇ爜" )
+ private String lhhwdm;
+
+ @PropertyDef(label = "杞崲鏁伴噺" )
+ private double lhsl;
+
+ @PropertyDef(label = "杞崲绫诲瀷" )
+ private String lhlx;
+
+ @PropertyDef(label = "鎿嶄綔鏍囧織" )
+ private String czbz;
+
+ @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+ @PropertyDef(label = "鏈�鍚庢洿鏂版椂闂�" )
+ private Date zhgxsj;
+
+ @JSONField(serialize = false)
+ @PropertyDef(label = "搴撳尯浠ｇ爜")
+ private String kqdm;
+
+}
--
Gitblit v1.9.3