From f2cc6329ad768b2daa08876d2cfd7a84cbe42735 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 16 十一月 2023 09:55:20 +0800
Subject: [PATCH] 设备同步-添加生产厂家
---
src/main/java/com/fzzy/api/entity/Api1109.java | 2 +-
src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/fzzy/api/entity/Api1109.java b/src/main/java/com/fzzy/api/entity/Api1109.java
index 1aaba64..2b12d44 100644
--- a/src/main/java/com/fzzy/api/entity/Api1109.java
+++ b/src/main/java/com/fzzy/api/entity/Api1109.java
@@ -17,7 +17,7 @@
public class Api1109 implements Serializable {
- public static String SORT_PROP = "id";
+ public static String SORT_PROP = "syncTime";
/**
*
*/
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java
index 6b21b93..379c302 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1107.java
@@ -9,6 +9,7 @@
import com.fzzy.async.fzzy40.entity.Fz40DeptDevice;
import com.fzzy.async.fzzy40.repository.Fzzy40Sync1107Rep;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -71,7 +72,11 @@
apiData.setSbyqmc(sysData.getSbyqmc());
apiData.setSbyqdm(sysData.getSbyqdm());
apiData.setSbggxh(sysData.getSbggxh());
- apiData.setSccj(sysData.getSccj());
+ if (StringUtils.isEmpty(sysData.getSccj())) {
+ apiData.setSccj("鐢熶骇鍘傚");
+ } else {
+ apiData.setSccj(sysData.getSccj());
+ }
apiData.setScrq(sysData.getScrq());
apiData.setSbms(sysData.getSbms());
apiData.setSbzt(sysData.getSbzt());
--
Gitblit v1.9.3