From 00384fda4cd7a604f6218d22c0ae483f866f0499 Mon Sep 17 00:00:00 2001 From: luolm <470431449@qq.com> Date: Mon, 24 Mar 2025 11:36:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nflg/mobilebroken/admin/pojo/dto/SyncFromCrmDTO.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/SyncFromCrmDTO.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/SyncFromCrmDTO.java index ecac9f4a..4dee6a70 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/SyncFromCrmDTO.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/dto/SyncFromCrmDTO.java @@ -3,9 +3,11 @@ package com.nflg.mobilebroken.admin.pojo.dto; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; @Data @AllArgsConstructor +@NoArgsConstructor public class SyncFromCrmDTO { /** From a0f4b92bd1ed18408bda046fd1894b242024aa15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= Date: Mon, 24 Mar 2025 14:57:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=90=8C=E6=AD=A5=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=97=B6=EF=BC=8C=E8=BF=87=E6=BB=A4=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=BC=96=E5=8F=B7=E4=B8=BA=E7=A9=BA=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/service/AdminDeviceService.java | 58 +++++++++---------- 1 file changed, 27 insertions(+), 31 deletions(-) diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java index 6b4638c6..8a50a5f4 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/service/AdminDeviceService.java @@ -3,7 +3,6 @@ package com.nflg.mobilebroken.admin.service; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.google.common.collect.ImmutableList; import com.nflg.mobilebroken.admin.constant.DeviceSourceFromEnum; @@ -15,17 +14,12 @@ import com.nflg.mobilebroken.common.constant.STATE; import com.nflg.mobilebroken.common.util.AdminUserUtil; import com.nflg.mobilebroken.common.util.VUtils; import com.nflg.mobilebroken.repository.entity.Device; -import com.nflg.mobilebroken.repository.entity.TBaseCustomer; import com.nflg.mobilebroken.repository.service.IDeviceService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; import javax.annotation.Resource; -import java.nio.file.LinkOption; -import java.time.LocalDate; import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; @@ -134,33 +128,35 @@ public class AdminDeviceService { Map deviceMap = deviceList.stream().collect(Collectors.toMap(Device::getDeviceNo, device -> device)); crmDeviceList.forEach(u -> { - Device ent = deviceMap.get(u.getMachine_Number__c()); - if (Objects.nonNull(ent)) { - ent = deviceMap.get(u.getMachine_Number__c()); - ent.setUpdateBy("crm"); - ent.setUpdateTime(LocalDateTime.now()); + if (StrUtil.isNotBlank(u.getMachine_Number__c())) { + Device ent = deviceMap.get(u.getMachine_Number__c()); + if (Objects.nonNull(ent)) { + ent = deviceMap.get(u.getMachine_Number__c()); + ent.setUpdateBy("crm"); + ent.setUpdateTime(LocalDateTime.now()); - } else { - ent = new Device(); - ent.setUpdateBy("crm"); - ent.setUpdateTime(LocalDateTime.now()); - ent.setCreateBy("crm"); - ent.setCreateTime(LocalDateTime.now()); - } - ent.setDeviceNo(u.getMachine_Number__c()); - ent.setDeviceType(u.getAssetProductLine3__c()); - ent.setDeviceTypeSub(u.getAssetProductLine4__c()); - ent.setModelNo(u.getProductLine5__c()); - if (StrUtil.isNotBlank(u.getAccount())) { - JSONObject jsonObject = JSONObject.parseObject(u.getAccount()); - String cname = jsonObject.getString("Name"); - ent.setCustomerName(cname); - } + } else { + ent = new Device(); + ent.setUpdateBy("crm"); + ent.setUpdateTime(LocalDateTime.now()); + ent.setCreateBy("crm"); + ent.setCreateTime(LocalDateTime.now()); + } + ent.setDeviceNo(u.getMachine_Number__c()); + ent.setDeviceType(u.getAssetProductLine3__c()); + ent.setDeviceTypeSub(u.getAssetProductLine4__c()); + ent.setModelNo(u.getProductLine5__c()); + if (StrUtil.isNotBlank(u.getAccount())) { + JSONObject jsonObject = JSONObject.parseObject(u.getAccount()); + String cname = jsonObject.getString("Name"); + ent.setCustomerName(cname); + } - ent.setSourceFrom(DeviceSourceFromEnum.FROM_CRM.getSourceKey()); - ent.setCustomerId(0); - ent.setDeviceState(0); - result.add(ent); + ent.setSourceFrom(DeviceSourceFromEnum.FROM_CRM.getSourceKey()); + ent.setCustomerId(0); + ent.setDeviceState(0); + result.add(ent); + } }); if (CollUtil.isNotEmpty(result)) {