Merge branch 'feature/bug-1286' into develop

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/DeviceController.java

@@ -785,25 +785,35 @@ public class DeviceController extends ControllerBase {
     @Transactional
     @PostMapping("changeServiceAgentCode")
     public ApiResult<Void> changeServiceAgentCode(@RequestBody ChangeServiceAgentCodeQuery query) {
+        List<Device> devices = deviceService.lambdaQuery()
+                .in(Device::getId, query.getDeviceIds())
+                .list();
+        if (CollectionUtil.isEmpty(devices)){
+            return ApiResult.error("没有需要修改的设备");
+        }
         TBaseCustomer customer = customerService.lambdaQuery()
                 .eq(TBaseCustomer::getDelIs, 0)
                 .eq(TBaseCustomer::getEnableState, 1)
                 .eq(TBaseCustomer::getAgencyCompanyCode, query.getServiceAgentCode())
                 .one();
         VUtils.trueThrowBusinessError(Objects.isNull(customer)).throwMessage("代理商公司不存在");
-        deviceService.lambdaUpdate()
+        devices.forEach(device -> {
-                .set(Device::getServiceAgentCode, query.getServiceAgentCode())
+            if (!StrUtil.equals(device.getServiceAgentCode(), query.getServiceAgentCode())){
-                .set(Device::getServiceAgentName, customer.getAgencyCompanyName())
+                deviceService.lambdaUpdate()
-                .eq(Device::getId, query.getDeviceId())
+                        .set(Device::getServiceAgentCode, query.getServiceAgentCode())
-                .update();
+                        .set(Device::getServiceAgentName, customer.getAgencyCompanyName())
-        deviceAgentRecordService.save(new DeviceAgentRecord()
+                        .eq(Device::getId, device.getId())
-                .setDeviceId(query.getDeviceId())
+                        .update();
-                .setAgentCode(query.getServiceAgentCode())
+                deviceAgentRecordService.save(new DeviceAgentRecord()
-                .setAgentName(customer.getAgencyCompanyName())
+                        .setDeviceId(device.getId())
-                .setCreateById(AdminUserUtil.getUserId())
+                        .setAgentCode(query.getServiceAgentCode())
-                .setCreateBy(AdminUserUtil.getUserName())
+                        .setAgentName(customer.getAgencyCompanyName())
-                .setCreateTime(LocalDateTime.now())
+                        .setCreateById(AdminUserUtil.getUserId())
-        );
+                        .setCreateBy(AdminUserUtil.getUserName())
+                        .setCreateTime(LocalDateTime.now())
+                );
+            }
+        });
         return ApiResult.success();
     }
 

nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/pojo/query/ChangeServiceAgentCodeQuery.java

@@ -3,16 +3,18 @@ package com.nflg.mobilebroken.admin.pojo.query;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Data
 public class ChangeServiceAgentCodeQuery {
 
     /**
-     * 设备ID
+     * 设备ID列表
      */
-    @NotNull
+    @NotEmpty
-    private Integer deviceId;
+    private List<Long> deviceIds;
 
     /**
      * 服务代理商编码

nflg-mobilebroken-gongfu/src/main/java/com/nflg/mobilebroken/gongfu/pojo/query/ChangeServiceAgentCodeQuery.java

@@ -3,6 +3,7 @@ package com.nflg.mobilebroken.gongfu.pojo.query;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -10,9 +11,9 @@ import java.util.List;
 public class ChangeServiceAgentCodeQuery {
 
     /**
-     * 设备ID
+     * 设备ID列表
      */
-    @NotNull
+    @NotEmpty
     private List<Long> deviceIds;
 
     /**