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

fix(admin): 优化设备添加和工单处理逻辑 

- 修改设备添加逻辑，判断设备编号是否存在时增加设备状态和数据有效性判断- 优化工单处理中审计状态判断逻辑，提高代码可读性和安全性
This commit is contained in:
曹鹏飞 2025-04-29 17:03:11 +08:00
parent d0d5da71b1
commit 3da5a3beed
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -167,8 +167,11 @@ public class DeviceController extends ControllerBase {
@MethodInfoMark(value = "新增", menuName = "设备管理") @MethodInfoMark(value = "新增", menuName = "设备管理")
@ApiMark(moduleName = "设备管理", apiName = "新增") @ApiMark(moduleName = "设备管理", apiName = "新增")
public ApiResult<Boolean> add(@Valid @RequestBody DeviceDTO deviceDTO) { public ApiResult<Boolean> add(@Valid @RequestBody DeviceDTO deviceDTO) {
Device one = deviceService.lambdaQuery().eq(Device::getDeviceNo, deviceDTO.getDeviceNo()).one(); VUtils.trueThrow(deviceService.lambdaQuery()
VUtils.trueThrow(Objects.nonNull(one)).throwMessage(STATE.ParamErr,deviceDTO.getDeviceNo()+"设备编号已存在"); .eq(Device::getDeviceNo, deviceDTO.getDeviceNo())
.eq(Device::getDeviceState,deviceDTO.getDeviceState())
.eq(Device::getDataValidState,true)
.exists()).throwMessage(STATE.ParamErr,deviceDTO.getDeviceNo()+"设备编号已存在");
adminDeviceService.add(deviceDTO); adminDeviceService.add(deviceDTO);
return ApiResult.success(true); return ApiResult.success(true);

2
nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java
View File

@ -782,7 +782,7 @@ public class TicketController extends ControllerBase {
Ticket ticket = ticketSolutionService.saveSolutionMeasures(request); Ticket ticket = ticketSolutionService.saveSolutionMeasures(request);
List<SolutionReviewDepartmentVO> audits = ticketSolutionAuditService.getByTicket(request.getTicketId()); List<SolutionReviewDepartmentVO> audits = ticketSolutionAuditService.getByTicket(request.getTicketId());
audits.forEach(audit -> { audits.forEach(audit -> {
if (audit.getState() == 0) { if (Objects.equals(audit.getState(),0)) {
adminMessageService.add( adminMessageService.add(
new AdminMessage() new AdminMessage()
.setNo(ticket.getNo()) .setNo(ticket.getNo())