From 6277d8d6623a1ab8c38a255b57d62bc62ef8a408 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期六, 29 六月 2024 14:28:42 +0800
Subject: [PATCH] 广东省平台v5.1-相关接口字段调整
---
src/main/java/com/fzzy/api/view/Api1209.view.xml | 29 ++++++++++++++
src/main/java/com/fzzy/api/entity/Api1207.java | 10 +++++
src/main/java/com/fzzy/api/entity/Api1202.java | 2
src/main/java/com/fzzy/api/entity/Api1304.java | 4 ++
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java | 26 ++++++++++---
src/main/java/com/fzzy/api/entity/Api1205.java | 4 ++
src/main/java/com/fzzy/api/entity/Api1209.java | 4 ++
src/main/java/com/fzzy/api/view/Api1207.view.xml | 18 +++++++++
src/main/java/com/fzzy/api/view/Api1205.view.xml | 8 ++++
9 files changed, 98 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1202.java b/src/main/java/com/fzzy/api/entity/Api1202.java
index 0f237ac..ad0053c 100644
--- a/src/main/java/com/fzzy/api/entity/Api1202.java
+++ b/src/main/java/com/fzzy/api/entity/Api1202.java
@@ -40,7 +40,7 @@
@Column(name = "tyhwbm", length = 28)
private String tyhwbm;
- @PropertyDef(label = "涓氬姟绫诲瀷", description = "2锛氬叆搴擄紙榛樿锛�")
+ @PropertyDef(label = "涓氬姟绫诲瀷", description = "2锛氬叆搴擄紙榛樿锛�;3:绉诲簱鍌ㄥ瓨鍏ュ簱")
@Column(name = "ywlx", length = 1)
private String ywlx = "2";
diff --git a/src/main/java/com/fzzy/api/entity/Api1205.java b/src/main/java/com/fzzy/api/entity/Api1205.java
index 0807637..a97399c 100644
--- a/src/main/java/com/fzzy/api/entity/Api1205.java
+++ b/src/main/java/com/fzzy/api/entity/Api1205.java
@@ -182,6 +182,10 @@
@Column(name = "kzl", precision = 20, scale = 6)
private double kzl;
+ @PropertyDef(label = "鎵ｏ紙澧烇級閲忓師鍥�", description = "鎵ｏ紙澧烇級閲忎笉涓�0鏃讹紝闇�娉ㄦ槑鍘熷洜")
+ @Column(name = "kzlyy", length = 512)
+ private String kzlyy;
+
@PropertyDef(label = "鍊间粨淇濈鍛樺鍚�")
@Column(name = "zcbgyxm", length = 256)
private String zcbgyxm;
diff --git a/src/main/java/com/fzzy/api/entity/Api1207.java b/src/main/java/com/fzzy/api/entity/Api1207.java
index 75febde..2e9304f 100644
--- a/src/main/java/com/fzzy/api/entity/Api1207.java
+++ b/src/main/java/com/fzzy/api/entity/Api1207.java
@@ -88,6 +88,16 @@
@Column(name = "dcrq", length = 10)
private Date dcrq;
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍊掍粨寮�濮嬫棩鏈�" )
+ @Column(name = "dcksrq", length = 10)
+ private Date dcksrq;
+
+ @JSONField(format = "yyyy-MM-dd")
+ @PropertyDef(label = "鍊掍粨缁撴潫鏃ユ湡" )
+ @Column(name = "dcjsrq", length = 10)
+ private Date dcjsrq;
+
@PropertyDef(label = "鍊掍粨鏁伴噺(鍏枻)" )
@Column(name = "dcsl", precision = 20, scale = 6)
private double dcsl;
diff --git a/src/main/java/com/fzzy/api/entity/Api1209.java b/src/main/java/com/fzzy/api/entity/Api1209.java
index 158b8d2..7583de5 100644
--- a/src/main/java/com/fzzy/api/entity/Api1209.java
+++ b/src/main/java/com/fzzy/api/entity/Api1209.java
@@ -112,6 +112,10 @@
@Column(name = "sylx",length = 1)
private String sylx;
+ @PropertyDef(label = "鎹熸孩鐜妭",description = "1:鍏ュ簱鎹熸孩锛�2锛氬嚭搴撴崯婧紝3.鍏朵粬")
+ @Column(name = "syhj",length = 1)
+ private String syhj;
+
@PropertyDef(label = "鎹熸孩鍘熷洜" )
@Column(name = "syyy", length = 400)
private String syyy;
diff --git a/src/main/java/com/fzzy/api/entity/Api1304.java b/src/main/java/com/fzzy/api/entity/Api1304.java
index 9917958..4b5c3dc 100644
--- a/src/main/java/com/fzzy/api/entity/Api1304.java
+++ b/src/main/java/com/fzzy/api/entity/Api1304.java
@@ -70,6 +70,10 @@
@Column(name = "yyhthlzjh", length = 8000, columnDefinition = "text")
private String yyhthlzjh;
+ @PropertyDef(label = "姘皵鍚噺鍊奸泦鍚�" )
+ @Column(name = "dqndzjh", length = 8000, columnDefinition = "text")
+ private String dqndzjh;
+
@PropertyDef(label = "鎿嶄綔鏍囧織" )
@Column(name = "czbz", length = 1)
private String czbz;
diff --git a/src/main/java/com/fzzy/api/view/Api1205.view.xml b/src/main/java/com/fzzy/api/view/Api1205.view.xml
index 74fa1cf..8e43360 100644
--- a/src/main/java/com/fzzy/api/view/Api1205.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1205.view.xml
@@ -173,6 +173,9 @@
<Property name="dataType">double</Property>
<Property name="label">鎵�/澧為噺(鍏枻)</Property>
</PropertyDef>
+ <PropertyDef name="kzlyy">
+ <Property name="label">鎵ｏ紙澧烇級閲忓師鍥�</Property>
+ </PropertyDef>
<PropertyDef name="zcbgyxm">
<Property></Property>
<Property name="label">鍊间粨淇濈鍛樺鍚�</Property>
@@ -625,6 +628,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">kzlyy</Property>
+ <Property name="property">kzlyy</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">zcbgyxm</Property>
<Property name="property">zcbgyxm</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/api/view/Api1207.view.xml b/src/main/java/com/fzzy/api/view/Api1207.view.xml
index 93581e8..c240448 100644
--- a/src/main/java/com/fzzy/api/view/Api1207.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1207.view.xml
@@ -92,6 +92,14 @@
<Property name="dataType">Date</Property>
<Property name="label">鍊掍粨鏃ユ湡</Property>
</PropertyDef>
+ <PropertyDef name="dcksrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍊掍粨寮�濮嬫棩鏈�</Property>
+ </PropertyDef>
+ <PropertyDef name="dcjsrq">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍊掍粨缁撴潫鏃ユ湡</Property>
+ </PropertyDef>
<PropertyDef name="dcsl">
<Property name="dataType">double</Property>
<Property name="label">鍊掍粨鏁伴噺(鍏枻)</Property>
@@ -423,6 +431,16 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">dcksrq</Property>
+ <Property name="property">dcksrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dcjsrq</Property>
+ <Property name="property">dcjsrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">dcsl</Property>
<Property name="property">dcsl</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/api/view/Api1209.view.xml b/src/main/java/com/fzzy/api/view/Api1209.view.xml
index 8f54d70..54a2485 100644
--- a/src/main/java/com/fzzy/api/view/Api1209.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1209.view.xml
@@ -157,6 +157,30 @@
</Property>
</Property>
</PropertyDef>
+ <PropertyDef name="syhj">
+ <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>
+ </Collection>
+ </Property>
+ </Property>
+ </PropertyDef>
</DataType>
<DataType name="dtParam">
<Property name="creationType">com.fzzy.api.data.ApiParam</Property>
@@ -562,6 +586,11 @@
<Property name="property">sylx</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">syhj</Property>
+ <Property name="property">syhj</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</GroupBox>
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java
index c52527c..f7272fb 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1304.java
@@ -60,7 +60,6 @@
return;
}
- Date syncTime = new Date();
Api1304 api1304;
Api1105 api1105;
List<Api1304> api1304List;
@@ -72,7 +71,6 @@
}
api1304 = new Api1304();
- // api1304.setQtndjcdh(api1105.getHwdm() + DateFormatUtils.format(gas.getReceiveDate(), "yyyyMMdd") + String.valueOf(index).substring(1));
api1304.setQtndjcdh(api1105.getHwdm() + fz40Gas.getBatchId());
api1304.setJcsj(fz40Gas.getReceiveDate());
api1304.setHwdm(api1105.getHwdm());
@@ -110,17 +108,33 @@
String[] attr = points.split(";");
String[] arrt2;
- String o2 = "", co2 = "", ph3 = "";
+ String o2 = "", co2 = "", ph3 = "", n2 = "";
for (String temp : attr) {
arrt2 = temp.split(",");
- o2 += arrt2[2] + ",";
- co2 += arrt2[1] + ",";
- ph3 += arrt2[3] + ",";
+ o2 += "," + arrt2[2];
+ co2 += "," + arrt2[1];
+ ph3 += "," + arrt2[3];
+ n2 += "," + arrt2[4];
}
+ if(o2.length() > 0){
+ o2 = o2.substring(1);
+ }
+ if(co2.length() > 0){
+ co2 = co2.substring(1);
+ }
+ if(ph3.length() > 0){
+ ph3 = ph3.substring(1);
+ }
+ if(n2.length() > 0){
+ n2 = n2.substring(1);
+ }
+ co2 += "|ppm";
+ ph3 += "|ppm";
api1304.setYqhlzjh(o2);
api1304.setEyhthlzjh(co2);
api1304.setLhqndzjh(ph3);
+ api1304.setDqndzjh(n2);
return api1304;
}
--
Gitblit v1.9.3