From 221685c6ce46a87f9820eb074a61cedbbf25351c Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 14 三月 2025 08:57:09 +0800
Subject: [PATCH] 合同与入库代码同步修改
---
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 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..547ba0c 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
@@ -1,21 +1,16 @@
package com.fzzy.async.fzzy40.impl;
import com.fzzy.api.Constant;
-import com.fzzy.api.entity.Api1101;
-import com.fzzy.api.entity.Api1102;
-import com.fzzy.api.entity.Api1111;
-import com.fzzy.api.entity.ApiLog;
+import com.fzzy.api.entity.*;
import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.api.view.repository.Api1101Rep;
-import com.fzzy.api.view.repository.Api1102Rep;
-import com.fzzy.api.view.repository.Api1111Rep;
-import com.fzzy.api.view.repository.ApiLogRep;
+import com.fzzy.api.view.repository.*;
import com.fzzy.async.fzzy40.entity.Fz40SecCamera;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1111Rep;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
import java.util.Date;
import java.util.List;
@@ -36,6 +31,8 @@
private Api1111Rep api1111Rep;
@Autowired
private ApiLogRep apiLogRep;
+ @Autowired
+ private ApiConfsRep apiConfsRep;
/**
* 鍚屾鐩戞帶鎺ュ彛
@@ -57,7 +54,8 @@
apiLog.setStatus(99);
apiLog.setId(ContextUtil.getUUID());
try {
- List<Fz40SecCamera> list = fzzy40Sync1111Rep.listCamera(deptId);
+ List<Fz40SecCamera> list = fzzy40Sync1111Rep.listCamera(deptId, start, end);
+ List<ApiConfs> apiConfs = apiConfsRep.getDataByKqdm(kqdm);
if (null == list || list.isEmpty()) {
log.info("-------------娌℃湁鑾峰彇鍒扮洃鎺т俊鎭�------------------");
@@ -70,7 +68,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,35 +77,55 @@
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() * apiConfs.get(0).getPosX()) + "," + Math.round(sysData.getPosY() * apiConfs.get(0).getPosY()) + ")");
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){
+ if (null != listApi1111 && listApi1111.size() > 0) {
apiData.setCzbz(listApi1111.get(0).getCzbz());
- if(StringUtils.isNotEmpty(listApi1111.get(0).getSpjklx())){
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getSpjklx())) {
apiData.setSpjklx(listApi1111.get(0).getSpjklx());
}
- if(StringUtils.isNotEmpty(listApi1111.get(0).getSpdwlx())){
+ if (StringUtils.isNotEmpty(listApi1111.get(0).getSpdwlx())) {
apiData.setSpdwlx(listApi1111.get(0).getSpdwlx());
}
- if(StringUtils.isNotEmpty(listApi1111.get(0).getHkCameraIndexCode())){
+ 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());
//淇濆瓨鏁版嵁
api1111Rep.save(apiData);
- num ++;
+ num++;
log.info("1111---鍚屾鏁版嵁锛歿}", apiData.toString());
}
} catch (Exception e) {
--
Gitblit v1.9.3