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 | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 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 baee878..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("-------------娌℃湁鑾峰彇鍒扮洃鎺т俊鎭�------------------");
@@ -70,7 +70,6 @@
Api1111 apiData;
List<Api1111> listApi1111;
Integer num = 1000001;
-// String spjksbwzys = "left: {X}px ; top : {Y}px ; width : 10px ; height: 10px";
for (Fz40SecCamera sysData : list) {
apiData = new Api1111();
@@ -80,17 +79,22 @@
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));
+ if(sysData.getId().contains(api1102.getXzqhdm())){
+ apiData.setSpjksbid(sysData.getId());
+ }
- 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.setSpjksbxdwz("(" + Math.round(sysData.getPosX()*1000) + "," + Math.round(sysData.getPosY()*1000) + ")");
apiData.setBz(sysData.getRemark());
+ //瑙嗛鐩戞帶绫诲瀷鍜岀偣浣嶇被鍨�
+ apiData.setSpjklx(StringUtils.isEmpty(sysData.getSpjklx())?"3":sysData.getSpjklx());
+ apiData.setSpdwlx(StringUtils.isEmpty(sysData.getSpdwlx())?"7":sysData.getSpdwlx());
//鎿嶄綔鏍囧織鍙婃渶鍚庢洿鏂版椂闂�
apiData.setZhgxsj(new Date());
//涓氬姟id銆佸簱鍖虹紪鐮併�佸悓姝ユ椂闂�
apiData.setSyncTime(new Date());
apiData.setCzbz(Constant.CZBZ_I);
- apiData.setSpjklx("1");
+
listApi1111 = api1111Rep.getApi1111ById(apiData.getSpjksbid());
if(null != listApi1111 && listApi1111.size() > 0){
apiData.setCzbz(listApi1111.get(0).getCzbz());
@@ -103,6 +107,21 @@
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());
+ }
+ 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);
}
apiData.setBizId(sysData.getId());
--
Gitblit v1.9.3