From 0f98a8acd28aa42b91179bed38cd98230835574a Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 19 十二月 2023 20:06:12 +0800
Subject: [PATCH] 优化数据同步

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java |    3 ++-
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java |    5 ++++-
 2 files changed, 6 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 30e4269..1f760c0 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1111.java
@@ -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());
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java
index 81f8f2c..5f08fc9 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1112.java
@@ -7,6 +7,7 @@
 import com.fzzy.async.fzzy40.entity.Fz40OAStaff;
 import com.fzzy.async.fzzy40.repository.Fzzy40Sync1112Rep;
 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;
@@ -87,7 +88,7 @@
                 apiData.setZzmm(sysData.getZzmm());
                 apiData.setRylb(sysData.getZy());
                 apiData.setQdzgzchzyzgsj(sysData.getQdzgzchzyzgsj());
-                apiData.setXl(sysData.getXl());
+                apiData.setXl(StringUtils.isEmpty(sysData.getXl())?"3":sysData.getXl());
                 apiData.setZw(sysData.getZw());
 
                 apiData.setZhgxsj(sysData.getUpdateTime());

--
Gitblit v1.9.3