From a0e5b14a6b8cf2a6e746828576d9591b74ced94b Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 17 十一月 2023 12:14:39 +0800
Subject: [PATCH] 调整视频监控点位标注信息接口同步

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java |    9 +++++++++
 src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java |   12 ++++++++++--
 2 files changed, 19 insertions(+), 2 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 176097b..76472db 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java
@@ -66,7 +66,6 @@
             Api1111 apiData;
             List<Api1111> listApi1111;
             Integer num = 1000001;
-//            String spjksbwzys = "left: {X}px ; top : {Y}px ; width : 10px ; height: 10px";
             for (Fz35SecCamera sysData : list) {
 
                 apiData = new Api1111();
@@ -79,7 +78,7 @@
                 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) + ""));
+
                 apiData.setBz(sysData.getRemark());
                 //鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
                 apiData.setZhgxsj(new Date());
@@ -99,6 +98,15 @@
                     if(StringUtils.isNotEmpty(listApi1111.get(0).getHkCameraIndexCode())){
                         apiData.setHkCameraIndexCode(listApi1111.get(0).getHkCameraIndexCode());
                     }
+                    if(StringUtils.isNotEmpty(listApi1111.get(0).getCfdm())){
+                        apiData.setCfdm(listApi1111.get(0).getCfdm());
+                    }
+                    if(StringUtils.isNotEmpty(listApi1111.get(0).getAjdm())){
+                        apiData.setAjdm(listApi1111.get(0).getAjdm());
+                    }
+                    apiData.setCzbz(listApi1111.get(0).getCzbz());
+                }else {
+                    apiData.setCzbz(Constant.CZBZ_I);
                 }
                 apiData.setBizId(sysData.getId());
 
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
index e9bb91f..2037d60 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
@@ -104,6 +104,15 @@
                     if(StringUtils.isNotEmpty(listApi1111.get(0).getHkCameraIndexCode())){
                         apiData.setHkCameraIndexCode(listApi1111.get(0).getHkCameraIndexCode());
                     }
+                    if(StringUtils.isNotEmpty(listApi1111.get(0).getCfdm())){
+                        apiData.setCfdm(listApi1111.get(0).getCfdm());
+                    }
+                    if(StringUtils.isNotEmpty(listApi1111.get(0).getAjdm())){
+                        apiData.setAjdm(listApi1111.get(0).getAjdm());
+                    }
+                    apiData.setCzbz(listApi1111.get(0).getCzbz());
+                }else {
+                    apiData.setCzbz(Constant.CZBZ_I);
                 }
                 apiData.setBizId(sysData.getId());
 

--
Gitblit v1.9.3