From 1aac0b24b4b7f0e15bb4f7001ae8d1e313336caf Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期二, 07 一月 2025 15:46:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1311.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
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 50c6e33..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,13 +59,10 @@
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.setTdmc(sysData.getChanNum() + "鍙烽�氶亾");
- sh2023Api1311.setJksbbm(sysData.getId());
sh2023Api1311.setJksbmc(sysData.getName());
sh2023Api1311.setKqdm(kqdm);
@@ -73,13 +70,15 @@
sh2023Api1311.setJkcs(getBrandId(sysData.getBrand()));
sh2023Api1311.setJkxh(sysData.getSn());
- sh2023Api1311.setJkxlh(sysData.getSn());
sh2023Api1311.setSpjklx(StringUtils.isEmpty(sysData.getSpjklx()) ? "3" : sysData.getSpjklx());
sh2023Api1311.setSblxbm("1");
sh2023Api1311.setAzwz(sysData.getName());
sh2023Api1311.setAzwzlx(StringUtils.isEmpty(sysData.getSpdwlx()) ? "7" : sysData.getSpdwlx());
+ if(sh2023Api1311.getAzwzlx().length() == 1){
+ sh2023Api1311.setAzwzlx("0" + sh2023Api1311.getAzwzlx());
+ }
if ("12".equals(sh2023Api1311.getAzwzlx()) || "13".equals(sh2023Api1311.getAzwzlx())
|| "14".equals(sh2023Api1311.getAzwzlx()) || "15".equals(sh2023Api1311.getAzwzlx())) {
sh2023Api1311.setAzwzlx("99");
@@ -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);
}
--
Gitblit v1.9.3