From cb33d686a5e7893a01d7b96a38cc746bf7736720 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 15 十二月 2023 15:13:41 +0800
Subject: [PATCH] 更新数据处理
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java | 9 ++++++++-
src/main/java/com/fzzy/api/view/Api1209.view.xml | 4 ++--
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java | 6 ++----
src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotConf.java | 4 ++++
src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java | 2 +-
5 files changed, 17 insertions(+), 8 deletions(-)
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 73cc2fb..f821bff 100644
--- a/src/main/java/com/fzzy/api/view/Api1209.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1209.view.xml
@@ -142,11 +142,11 @@
<Property name="value">1:鎹熻��</Property>
</Entity>
<Entity>
- <Property name="key">1</Property>
+ <Property name="key">2</Property>
<Property name="value">2:鎹熷け</Property>
</Entity>
<Entity>
- <Property name="key">1</Property>
+ <Property name="key">3</Property>
<Property name="value">3:鍏朵粬</Property>
</Entity>
</Collection>
diff --git a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotConf.java b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotConf.java
index a04e791..78a37fd 100644
--- a/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotConf.java
+++ b/src/main/java/com/fzzy/async/fzzy40/entity/Fz40DepotConf.java
@@ -85,6 +85,10 @@
@PropertyDef(label = "鐢电紗寮�濮嬬偣浣�", description = "榛樿椤堕儴(椤堕儴銆佸簳閮�)")
private String startPoint;
+ @Column(name = "START_CONVERT_", length = 20)
+ @PropertyDef(label = "灞傝杞崲", description = "榛樿涓嶈浆鎹�(榛樿銆侀『鏃堕拡銆侀�嗘椂閽�)")
+ private String startConvert;
+
@Column(name = "TEMP_MAX_")
@PropertyDef(label = "娓╁害涓婇檺")
private Double tempMax;
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
index 9dfc223..4809125 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java
@@ -59,10 +59,9 @@
SH2023Api1311 sh2023Api1311;
SH2023Api1311 sh1311;
List<ApiInfoData> apiInfoDataList;
- Integer num = 1000001;
for (Fz40SecCamera sysData : list) {
sh2023Api1311 = new SH2023Api1311();
- sh2023Api1311.setSpjksbid(api1102.getXzqhdm() + "00401327" + String.valueOf(num).substring(1));
+ sh2023Api1311.setSpjksbid(sysData.getId());
sh2023Api1311.setTdbh(sysData.getChanNum());
sh2023Api1311.setJksbmc(sysData.getName());
sh2023Api1311.setKqdm(kqdm);
@@ -123,7 +122,7 @@
} else {
sh2023Api1311.setCzbz(apiInfoDataList.get(0).getCzbz());
infoData.setCzbz(apiInfoDataList.get(0).getCzbz());
- sh1311 = JSONObject.parseObject(infoData.getData(), SH2023Api1311.class);
+ sh1311 = JSONObject.parseObject(apiInfoDataList.get(0).getData(), SH2023Api1311.class);
if(null != sh1311 && StringUtils.isNotEmpty(sh1311.getAjdm())){
sh2023Api1311.setAjdm(sh1311.getAjdm());
}
@@ -134,7 +133,6 @@
infoData.setData(JSON.toJSONString(sh2023Api1311));
apiInfoDataRep.save(infoData);
- num++;
log.info("1311---瑙嗛鐩戞帶-鍚屾鏁版嵁锛歿}", sh2023Api1311);
}
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
index 4fdfc0f..a792031 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync2103.java
@@ -111,6 +111,13 @@
sh2023Api2103.setDlcs(strs[0]);
sh2023Api2103.setDlhs(strs[1]);
sh2023Api2103.setDlls(strs[2]);
+
+ //鍒ゆ柇鏄惁鏈夊眰琛岃浆鎹�
+ if(null != depotConf.getStartConvert() && !"default".equals(depotConf.getStartConvert())){
+ sh2023Api2103.setDlcs(strs[1]);
+ sh2023Api2103.setDlhs(strs[0]);
+ }
+
// 1-3-5
// 8-8-8
//绛掍粨瑙勫垯
@@ -156,7 +163,7 @@
sh2023Api2103.setXczd(Integer.valueOf(strs[1]) * Integer.valueOf(strs[2]) + "");
sh2023Api2103.setYxfwqsc("1");
- sh2023Api2103.setYxfwjsc(strs[0]);
+ sh2023Api2103.setYxfwjsc(sh2023Api2103.getDlcs());
sh2023Api2103.setBjw(bjw);
sh2023Api2103.setZhgxsj(new Date());
diff --git a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
index 1499170..eb1dd66 100644
--- a/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
+++ b/src/main/java/com/fzzy/push/sh2023/SH2023ApiRemoteService.java
@@ -945,7 +945,7 @@
map.put(ceng, new ArrayList<>());
}
map.get(ceng).add(Double.valueOf(grain[0]));
- lwmx += grain[3] + ":" + grain[2] + ":" + grain[1] + "$" + grain[0];
+ lwmx += grain[2] + ":" + grain[3] +":" + grain[1] + "$" + grain[0];
if (Double.valueOf(grain[0]) <= -100) {
lwmx += "$" + "1" + "#";
errorNum++;
--
Gitblit v1.9.3