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/fzzy35/impl/Fzzy35Sync1111.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 e929717..76472db 100644
--- a/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java
+++ b/src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1111.java
@@ -7,7 +7,7 @@
import com.fzzy.api.view.repository.Api1102Rep;
import com.fzzy.api.view.repository.Api1111Rep;
import com.fzzy.api.view.repository.ApiLogRep;
-import com.fzzy.async.fzzy35.entity.SecCamera;
+import com.fzzy.async.fzzy35.entity.Fz35SecCamera;
import com.fzzy.async.fzzy35.repository.Fzzy35Sync1111Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -53,7 +53,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<SecCamera> list = fzzy35Sync1111Rep.listCamera(deptId);
+ List<Fz35SecCamera> list = fzzy35Sync1111Rep.listCamera(deptId);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮洃鎺т俊鎭�------------------");
@@ -66,8 +66,7 @@
Api1111 apiData;
List<Api1111> listApi1111;
Integer num = 1000001;
- String spjksbwzys = "left: {X}px ; top : {Y}px ; width : 10px ; height: 10px";
- for (SecCamera sysData : list) {
+ for (Fz35SecCamera sysData : list) {
apiData = new Api1111();
apiData.setDwmc(api1101.getDwmc());
@@ -76,10 +75,10 @@
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) + ""));
+
apiData.setBz(sysData.getRemark());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
apiData.setZhgxsj(new Date());
@@ -93,6 +92,21 @@
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());
+ }
+ 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