设备程序优化

This commit is contained in:
itzhang 2025-08-30 17:49:19 +08:00
parent dc4a36370c
commit 19fb248ab5

View File

@ -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", "更新失败");
}
//开始回写