rakor
/
mobilebroken
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'feature/bug-1286' into develop

This commit is contained in:
曹鹏飞 2026-02-02 20:35:46 +08:00
parent 9dca96b3cf 3f063a29cd
commit 57d850e17f
3 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

@ -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;
/**