From 069c3ea2792899256f46c44ff2bd497d91f91a4d Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期五, 08 三月 2024 16:03:30 +0800
Subject: [PATCH] 优化出入库数据同步的必填项
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java | 22 ++++++++++++++++++++--
1 files changed, 20 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 e9bb91f..0159564 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()*100) + "," + Math.round(sysData.getPosY()*1000) + ")");
apiData.setBz(sysData.getRemark());
//瑙嗛鐩戞帶绫诲瀷鍜岀偣浣嶇被鍨�
apiData.setSpjklx(StringUtils.isEmpty(sysData.getSpjklx())?"3":sysData.getSpjklx());
@@ -104,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