提交 b789aafa authored 作者: zhoushaopan's avatar zhoushaopan

fix(装备阅知模块): 当入库时候修改装备序列号,前后修改的序列号一致,发送阅知

当入库时候修改装备序列号,前后修改的序列号一致,发送阅知
上级 aed9431b
......@@ -1115,12 +1115,6 @@ public class DeviceLibraryController {
return setOrderNumber(sortNum, allListAndParent);
}
@ApiOperation("测试婴喜爱")
@PostMapping("test")
public ResponseEntity test(@RequestBody List<Integer> deviceIds){
deviceLibraryService.updatePartParentId(deviceIds);
return ResponseEntity.ok("更新成功");
}
public List<DeviceLibrary> getAllListAndParent(){
DeviceLibrarySelectVo deviceLibrarySelectVo = new DeviceLibrarySelectVo();
......
......@@ -1115,18 +1115,20 @@ public class DeviceLibraryServiceImpl implements DeviceLibraryService {
}else {
//进行更新装备
deviceForApplyVos.forEach(deviceForApplyVo -> {
//如果前后修改的序列号一样 则不发送阅知
Integer deviceId = deviceForApplyVo.getDeviceId();
String seqNumber = deviceForApplyVo.getSeqNumber();
DeviceLibrary one = getOne(deviceId);
one.setSeqNumber(seqNumber);
if(!one.getSeqNumber().equals(seqNumber)){
//添加装备日志
DeviceLogDto deviceLogDto = new DeviceLogDto();
deviceLogDto.setDeviceId(deviceId);
deviceLogDto.setRemark("将原来的序列号"+one.getSeqNumber()+"修改为"+seqNumber);
deviceLogDto.setCreateUserId(userId);
one.setSeqNumber(seqNumber);
update(one);
deviceLogDtos.add(deviceLogDto);
}
});
}
executor.execute(()->{
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论