From 54b61daf58037385cb8d46404b12a95786c7c8f3 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期五, 28 六月 2024 19:55:06 +0800
Subject: [PATCH] 上海省平台协议-增加数据相符性接口
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
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 2037d60..4e2a138 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
@@ -57,7 +57,7 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40SecCamera> list = fzzy40Sync1111Rep.listCamera(deptId);
+ List<Fz40SecCamera> list = fzzy40Sync1111Rep.listCamera(deptId, start, end);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮洃鎺т俊鎭�------------------");
@@ -80,8 +80,11 @@
apiData.setSpjksbmc(api1102.getKqmc() + "-" + sysData.getName());
apiData.setSpjksbid(api1102.getXzqhdm() + "00401327" + String.valueOf(num).substring(1));
+ if(sysData.getId().contains(api1102.getXzqhdm())){
+ apiData.setSpjksbid(sysData.getId());
+ }
- apiData.setSpjksbxdwz("(" + Math.round(sysData.getPosX()*100) + "," + Math.round(sysData.getPosY()*100) + ")");
+ apiData.setSpjksbxdwz("(" + Math.round(sysData.getPosX()*1000) + "," + Math.round(sysData.getPosY()*1000) + ")");
apiData.setBz(sysData.getRemark());
//瑙嗛鐩戞帶绫诲瀷鍜岀偣浣嶇被鍨�
apiData.setSpjklx(StringUtils.isEmpty(sysData.getSpjklx())?"3":sysData.getSpjklx());
@@ -110,6 +113,12 @@
if(StringUtils.isNotEmpty(listApi1111.get(0).getAjdm())){
apiData.setAjdm(listApi1111.get(0).getAjdm());
}
+ if(StringUtils.isNotEmpty(listApi1111.get(0).getSpjksbwzys())){
+ apiData.setSpjksbwzys(listApi1111.get(0).getSpjksbwzys());
+ }
+ if(StringUtils.isNotEmpty(listApi1111.get(0).getBz())){
+ apiData.setBz(listApi1111.get(0).getBz());
+ }
apiData.setCzbz(listApi1111.get(0).getCzbz());
}else {
apiData.setCzbz(Constant.CZBZ_I);
--
Gitblit v1.9.3