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

@@ -785,35 +785,25 @@ 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("代理商公司不存在");
-        devices.forEach(device -> {
+        deviceService.lambdaUpdate()
-            if (!StrUtil.equals(device.getServiceAgentCode(), query.getServiceAgentCode())){
+                .set(Device::getServiceAgentCode, query.getServiceAgentCode())
-                deviceService.lambdaUpdate()
+                .set(Device::getServiceAgentName, customer.getAgencyCompanyName())
-                        .set(Device::getServiceAgentCode, query.getServiceAgentCode())
+                .eq(Device::getId, query.getDeviceId())
-                        .set(Device::getServiceAgentName, customer.getAgencyCompanyName())
+                .update();
-                        .eq(Device::getId, device.getId())
+        deviceAgentRecordService.save(new DeviceAgentRecord()
-                        .update();
+                .setDeviceId(query.getDeviceId())
-                deviceAgentRecordService.save(new DeviceAgentRecord()
+                .setAgentCode(query.getServiceAgentCode())
-                        .setDeviceId(device.getId())
+                .setAgentName(customer.getAgencyCompanyName())
-                        .setAgentCode(query.getServiceAgentCode())
+                .setCreateById(AdminUserUtil.getUserId())
-                        .setAgentName(customer.getAgencyCompanyName())
+                .setCreateBy(AdminUserUtil.getUserName())
-                        .setCreateById(AdminUserUtil.getUserId())
+                .setCreateTime(LocalDateTime.now())
-                        .setCreateBy(AdminUserUtil.getUserName())
+        );
-                        .setCreateTime(LocalDateTime.now())
-                );
-            }
-        });
         return ApiResult.success();
     }
 

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

@@ -3,18 +3,16 @@ 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
      */
-    @NotEmpty
+    @NotNull
-    private List<Long> deviceIds;
+    private Integer deviceId;
 
     /**
      * 服务代理商编码

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

@@ -3,7 +3,6 @@ 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;
 
@@ -11,9 +10,9 @@ import java.util.List;
 public class ChangeServiceAgentCodeQuery {
 
     /**
-     * 设备ID列表
+     * 设备ID
      */
-    @NotEmpty
+    @NotNull
     private List<Long> deviceIds;
 
     /**