|
|
|
@ -75,43 +75,43 @@ public class MoldOperateController {
|
|
|
|
@Operation(summary = "创建模具上下模")
|
|
|
|
@Operation(summary = "创建模具上下模")
|
|
|
|
@PreAuthorize("@ss.hasPermission('mes:mold-operate:create')")
|
|
|
|
@PreAuthorize("@ss.hasPermission('mes:mold-operate:create')")
|
|
|
|
public CommonResult<Long> createMoldOperate(@Valid @RequestBody MoldOperateSaveReqVO createReqVO) {
|
|
|
|
public CommonResult<Long> createMoldOperate(@Valid @RequestBody MoldOperateSaveReqVO createReqVO) {
|
|
|
|
createReqVO.setUserId(getLoginUserId());
|
|
|
|
// createReqVO.setUserId(getLoginUserId());
|
|
|
|
if (createReqVO.getOperateTime() == null) {
|
|
|
|
// if (createReqVO.getOperateTime() == null) {
|
|
|
|
createReqVO.setOperateTime(LocalDateTime.now());
|
|
|
|
// createReqVO.setOperateTime(LocalDateTime.now());
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
//
|
|
|
|
if (Objects.equals(createReqVO.getOperateType(), "1")) {
|
|
|
|
// if (Objects.equals(createReqVO.getOperateType(), "1")) {
|
|
|
|
DeviceLedgerDO deviceLedger = deviceLedgerService.getDeviceLedger(createReqVO.getDeviceId());
|
|
|
|
// DeviceLedgerDO deviceLedger = deviceLedgerService.getDeviceLedger(createReqVO.getDeviceId());
|
|
|
|
List<Long> idList = Arrays.stream(createReqVO.getMoldId().split(","))
|
|
|
|
// List<Long> idList = Arrays.stream(createReqVO.getMoldId().split(","))
|
|
|
|
.map(String::trim)
|
|
|
|
// .map(String::trim)
|
|
|
|
.map(Long::valueOf)
|
|
|
|
// .map(Long::valueOf)
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
// .collect(Collectors.toList());
|
|
|
|
for (Long id : idList) {
|
|
|
|
// for (Long id : idList) {
|
|
|
|
MoldDO moldDO = moldService.getMold(id);
|
|
|
|
// MoldDO moldDO = moldService.getMold(id);
|
|
|
|
moldDO.setMachineId(createReqVO.getDeviceId());
|
|
|
|
// moldDO.setMachineId(createReqVO.getDeviceId());
|
|
|
|
moldDO.setMachineName(deviceLedger.getDeviceName());
|
|
|
|
// moldDO.setMachineName(deviceLedger.getDeviceName());
|
|
|
|
moldDO.setStatus(0);
|
|
|
|
// moldDO.setStatus(0);
|
|
|
|
moldService.updateMold(BeanUtils.toBean(moldDO, MoldSaveReqVO.class));
|
|
|
|
// moldService.updateMold(BeanUtils.toBean(moldDO, MoldSaveReqVO.class));
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
deviceLedger.setMoldId(createReqVO.getMoldId());
|
|
|
|
// deviceLedger.setMoldId(createReqVO.getMoldId());
|
|
|
|
deviceLedgerService.updateDeviceLedger(BeanUtils.toBean(deviceLedger, DeviceLedgerSaveReqVO.class));
|
|
|
|
// deviceLedgerService.updateDeviceLedger(BeanUtils.toBean(deviceLedger, DeviceLedgerSaveReqVO.class));
|
|
|
|
} else {
|
|
|
|
// } else {
|
|
|
|
List<Long> lowerMoldId = Arrays.stream(createReqVO.getLowerMoldId().split(","))
|
|
|
|
// List<Long> lowerMoldId = Arrays.stream(createReqVO.getLowerMoldId().split(","))
|
|
|
|
.map(String::trim)
|
|
|
|
// .map(String::trim)
|
|
|
|
.map(Long::valueOf)
|
|
|
|
// .map(Long::valueOf)
|
|
|
|
.collect(Collectors.toList());
|
|
|
|
// .collect(Collectors.toList());
|
|
|
|
for (Long id : lowerMoldId) {
|
|
|
|
// for (Long id : lowerMoldId) {
|
|
|
|
MoldDO moldDO = moldService.getMold(id);
|
|
|
|
// MoldDO moldDO = moldService.getMold(id);
|
|
|
|
moldDO.setMachineId(0L);
|
|
|
|
// moldDO.setMachineId(0L);
|
|
|
|
moldDO.setMachineName("");
|
|
|
|
// moldDO.setMachineName("");
|
|
|
|
moldDO.setStatus(3);
|
|
|
|
// moldDO.setStatus(3);
|
|
|
|
moldService.updateMold(BeanUtils.toBean(moldDO, MoldSaveReqVO.class));
|
|
|
|
// moldService.updateMold(BeanUtils.toBean(moldDO, MoldSaveReqVO.class));
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
|
|
|
|
//
|
|
|
|
DeviceLedgerDO deviceLedger = deviceLedgerService.getDeviceLedger(createReqVO.getDeviceId());
|
|
|
|
// DeviceLedgerDO deviceLedger = deviceLedgerService.getDeviceLedger(createReqVO.getDeviceId());
|
|
|
|
deviceLedger.setMoldId(createReqVO.getMoldId());
|
|
|
|
// deviceLedger.setMoldId(createReqVO.getMoldId());
|
|
|
|
deviceLedgerService.updateDeviceLedger(BeanUtils.toBean(deviceLedger, DeviceLedgerSaveReqVO.class));
|
|
|
|
// deviceLedgerService.updateDeviceLedger(BeanUtils.toBean(deviceLedger, DeviceLedgerSaveReqVO.class));
|
|
|
|
}
|
|
|
|
// }
|
|
|
|
return success(moldOperateService.createMoldOperate(createReqVO));
|
|
|
|
return success(moldOperateService.createMoldOperate(createReqVO));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -119,10 +119,7 @@ public class MoldOperateController {
|
|
|
|
@Operation(summary = "更新模具上下模")
|
|
|
|
@Operation(summary = "更新模具上下模")
|
|
|
|
@PreAuthorize("@ss.hasPermission('mes:mold-operate:update')")
|
|
|
|
@PreAuthorize("@ss.hasPermission('mes:mold-operate:update')")
|
|
|
|
public CommonResult<Boolean> updateMoldOperate(@Valid @RequestBody MoldOperateSaveReqVO updateReqVO) {
|
|
|
|
public CommonResult<Boolean> updateMoldOperate(@Valid @RequestBody MoldOperateSaveReqVO updateReqVO) {
|
|
|
|
updateReqVO.setUserId(getLoginUserId());
|
|
|
|
//
|
|
|
|
if (updateReqVO.getOperateTime() == null) {
|
|
|
|
|
|
|
|
updateReqVO.setOperateTime(LocalDateTime.now());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
moldOperateService.updateMoldOperate(updateReqVO);
|
|
|
|
moldOperateService.updateMoldOperate(updateReqVO);
|
|
|
|
return success(true);
|
|
|
|
return success(true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -156,8 +153,8 @@ public class MoldOperateController {
|
|
|
|
Set<Long> creatorIds = new HashSet<>();
|
|
|
|
Set<Long> creatorIds = new HashSet<>();
|
|
|
|
Set<Long> operateUserIds = new HashSet<>();
|
|
|
|
Set<Long> operateUserIds = new HashSet<>();
|
|
|
|
for (MoldOperateDO item : pageResult.getList()) {
|
|
|
|
for (MoldOperateDO item : pageResult.getList()) {
|
|
|
|
if (item.getUserId() != null) {
|
|
|
|
if (item.getOperatorId() != null) {
|
|
|
|
operateUserIds.add(item.getUserId());
|
|
|
|
operateUserIds.add(item.getOperatorId());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (StringUtils.hasText(item.getCreator())) {
|
|
|
|
if (StringUtils.hasText(item.getCreator())) {
|
|
|
|
creatorIds.add(Long.valueOf(item.getCreator()));
|
|
|
|
creatorIds.add(Long.valueOf(item.getCreator()));
|
|
|
|
@ -170,7 +167,7 @@ public class MoldOperateController {
|
|
|
|
if (StringUtils.hasText(item.getCreator())) {
|
|
|
|
if (StringUtils.hasText(item.getCreator())) {
|
|
|
|
MapUtils.findAndThen(creatorMap, Long.valueOf(item.getCreator()), user -> item.setCreatorName(user.getNickname()));
|
|
|
|
MapUtils.findAndThen(creatorMap, Long.valueOf(item.getCreator()), user -> item.setCreatorName(user.getNickname()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
MapUtils.findAndThen(operateUserMap, item.getUserId(), user -> item.setUserName(user.getNickname()));
|
|
|
|
MapUtils.findAndThen(operateUserMap, item.getOperatorId(), user -> item.setOperatorName(user.getNickname()));
|
|
|
|
}));
|
|
|
|
}));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
@ -185,13 +182,13 @@ public class MoldOperateController {
|
|
|
|
|
|
|
|
|
|
|
|
Set<Long> operateUserIds = new HashSet<>();
|
|
|
|
Set<Long> operateUserIds = new HashSet<>();
|
|
|
|
for (MoldOperateDO item : list) {
|
|
|
|
for (MoldOperateDO item : list) {
|
|
|
|
if (item.getUserId() != null) {
|
|
|
|
if (item.getOperatorId() != null) {
|
|
|
|
operateUserIds.add(item.getUserId());
|
|
|
|
operateUserIds.add(item.getOperatorId());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Map<Long, AdminUserRespDTO> operateUserMap = adminUserApi.getUserMap(operateUserIds);
|
|
|
|
Map<Long, AdminUserRespDTO> operateUserMap = adminUserApi.getUserMap(operateUserIds);
|
|
|
|
List<MoldOperateRespVO> respVOList = BeanUtils.toBean(list, MoldOperateRespVO.class,
|
|
|
|
List<MoldOperateRespVO> respVOList = BeanUtils.toBean(list, MoldOperateRespVO.class,
|
|
|
|
item -> MapUtils.findAndThen(operateUserMap, item.getUserId(), user -> item.setUserName(user.getNickname())));
|
|
|
|
item -> MapUtils.findAndThen(operateUserMap, item.getOperatorId(), user -> item.setOperatorName(user.getNickname())));
|
|
|
|
|
|
|
|
|
|
|
|
ExcelUtils.write(response, "模具上下模.xls", "数据", MoldOperateRespVO.class, respVOList);
|
|
|
|
ExcelUtils.write(response, "模具上下模.xls", "数据", MoldOperateRespVO.class, respVOList);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -221,9 +218,9 @@ public class MoldOperateController {
|
|
|
|
if (respVO == null) {
|
|
|
|
if (respVO == null) {
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (respVO.getUserId() != null) {
|
|
|
|
if (respVO.getOperatorId() != null) {
|
|
|
|
MapUtils.findAndThen(adminUserApi.getUserMap(Collections.singleton(respVO.getUserId())),
|
|
|
|
MapUtils.findAndThen(adminUserApi.getUserMap(Collections.singleton(respVO.getOperatorId())),
|
|
|
|
respVO.getUserId(), user -> respVO.setUserName(user.getNickname()));
|
|
|
|
respVO.getOperatorId(), user -> respVO.setOperatorName(user.getNickname()));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (StringUtils.hasText(respVO.getCreator())) {
|
|
|
|
if (StringUtils.hasText(respVO.getCreator())) {
|
|
|
|
Long creatorId = Long.valueOf(respVO.getCreator());
|
|
|
|
Long creatorId = Long.valueOf(respVO.getCreator());
|
|
|
|
|
HuangHuiKang
2 weeks ago