From 19fb248ab52dd1ebee94348b9ff55933c1d07ea1 Mon Sep 17 00:00:00 2001
From: itzhang <2019326567@qq.com>
Date: Sat, 30 Aug 2025 17:49:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=A8=8B=E5=BA=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tzcontroller/DeviceInstallController.java | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/management/tzcontroller/DeviceInstallController.java b/src/main/java/com/management/tzcontroller/DeviceInstallController.java
index 5534a55..e464c48 100644
--- a/src/main/java/com/management/tzcontroller/DeviceInstallController.java
+++ b/src/main/java/com/management/tzcontroller/DeviceInstallController.java
@@ -16,6 +16,7 @@ import org.springframework.web.client.RestTemplate;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
@@ -303,10 +304,17 @@ public class DeviceInstallController {
     public void upDeviceInstall() {
         CrmRequestUtil crmRequestUtil = new CrmRequestUtil();
 
+        long twoDaysAgo = LocalDateTime.now()
+                .minusDays(2)
+                .atZone(ZoneId.systemDefault())
+                .toInstant()
+                .toEpochMilli();
+
         JSONObject getDeviceInstall = crmRequestUtil.getCRMList(Arrays.asList(
                 //new Filter("EQ", "name", Arrays.asList("DEV202505260012"))
-                new Filter("GT", "last_modified_time", Arrays.asList("1748923200000")),
-                new Filter("IN", "ledger_sync_status__c", Arrays.asList("option_resync__c")),
+                new Filter("GT", "last_modified_time", Arrays.asList(String.valueOf(twoDaysAgo))),
+                new Filter("EQ", "device_installation_status__c", Arrays.asList("option_installation__c")),
+                new Filter("EQ", "ledger_sync_status__c", Arrays.asList("option_sync_success__c")),
                 new Filter("EQ", "life_status", Arrays.asList("normal"))
         ), "DeviceObj");
 
@@ -390,6 +398,12 @@ public class DeviceInstallController {
                 }
             }
 
+            //判断更新者是否存在
+            if ("".equals(updaterStr)) {
+                log.info("更新者不存在，将使用默认值");
+                continue;
+            }
+
             deviceInstallMap.put("updateUser", updaterStr);//更新者
 
             //开始获取token
@@ -445,13 +459,13 @@ public class DeviceInstallController {
                 logMap.put("log_status", "0");
                 logMap.put("res_body", "同步成功");
                 backReqMap.put("ledger_sync_status__c", "option_sync_success__c");
-                backReqMap.put("ledger_response_status__c", "更新成功" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                backReqMap.put("ledger_response_status__c", "更新成功");
             } else {
                 //同步失败
                 logMap.put("log_status", "1");
                 logMap.put("res_body", "同步失败：" + deviceResult.getString("msg"));
                 backReqMap.put("ledger_sync_status__c", "option_sync_failure__c");
-                backReqMap.put("ledger_response_status__c", "更新失败" + LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+                backReqMap.put("ledger_response_status__c", "更新失败");
             }
 
             //开始回写