From 2d036d97788c6a489d573386da4a1534e20bed99 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 03 十一月 2023 09:35:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java
index 8d4363f..176097b 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java
@@ -76,7 +76,7 @@
apiData.setKqmc(api1102.getKqmc());
apiData.setSpjksbmc(api1102.getKqmc() + "-" + sysData.getName());
- apiData.setSpjksbid(api1102.getKqdm().substring(2,8) + "00401327" + String.valueOf(num).substring(1));
+ apiData.setSpjksbid(api1102.getXzqhdm() + "00401327" + String.valueOf(num).substring(1));
apiData.setSpjksbxdwz("(" + Math.round(sysData.getPosX()*100) + "," + Math.round(sysData.getPosY()*100) + ")");
// apiData.setSpjksbwzys(spjksbwzys.replace("{X}",Math.round(sysData.getPosX()*100) + "").replace("{Y}",Math.round(sysData.getPosY()*100) + ""));
@@ -93,6 +93,12 @@
if(StringUtils.isNotEmpty(listApi1111.get(0).getSpjklx())){
apiData.setSpjklx(listApi1111.get(0).getSpjklx());
}
+ if(StringUtils.isNotEmpty(listApi1111.get(0).getSpdwlx())){
+ apiData.setSpdwlx(listApi1111.get(0).getSpdwlx());
+ }
+ if(StringUtils.isNotEmpty(listApi1111.get(0).getHkCameraIndexCode())){
+ apiData.setHkCameraIndexCode(listApi1111.get(0).getHkCameraIndexCode());
+ }
}
apiData.setBizId(sysData.getId());
--
Gitblit v1.9.3