Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

机台缺少参数增加

Browse Source
This commit is contained in:
liuzhaotian
2024-09-11 16:18:23 +08:00
parent 3dda26469f
commit 406105ea0f
2 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/MachineAuthController.java
+12 -3
View File
@@ -27,11 +27,20 @@ public class MachineAuthController {
@Resource @Resource
private MachineService machineService; private MachineService machineService;
@PostMapping("insert-organ-auth")
@PutMapping("insert-organ-auth")
@Operation(summary = "组织机台授权信息更新") @Operation(summary = "组织机台授权信息更新")
@PreAuthorize("@ss.hasPermission('machine-auth::update')") @PreAuthorize("@ss.hasPermission('machine-auth::update')")
public CommonResult<Boolean> auth(@RequestBody MachineOrgAuthReq vo) { public CommonResult<Boolean> authInsert(@RequestBody MachineOrgAuthReq vo) {
return success(machineService.auth(vo)); return success(machineService.authInsert(vo));
}
@PostMapping("update-organ-auth")
@Operation(summary = "组织机台授权信息更新")
@PreAuthorize("@ss.hasPermission('machine-auth::update')")
public CommonResult<Boolean> authUpdate(@RequestBody MachineOrgAuthReq vo) {
return success(machineService.authUpdate(vo));
} }
@GetMapping("organ-page") @GetMapping("organ-page")
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+27 -23
View File
@@ -432,35 +432,39 @@ public class MachineServiceImpl implements MachineService {
return machineVOS.stream().collect(Collectors.groupingBy(MachineVO::getMachineType)); return machineVOS.stream().collect(Collectors.groupingBy(MachineVO::getMachineType));
} }
@Override @Override
public Boolean auth(MachineOrgAuthReq vo) { public Boolean authInsert(MachineOrgAuthReq vo) {
OrganizationDO tenant = organMapper.selectById(vo.getOrganId());
if (tenant != null) {
throw exception(ORGAN_ALREADY_EXISTS);
}
MachineLimitDO machineLimitDO = MachineLimitDO.builder()
.organId(vo.getOrganId())
.cutLimit(vo.getCutLimit())
.drillLimit(vo.getDrillLimit())
.labelLimit(vo.getLabelLimit())
.sawLimit(vo.getSawLimit())
.sealedgeLimit(vo.getSealedgeLimit())
.setting(vo.getMachineAuthIds().toString())
.build();
machineLimitMapper.insert(machineLimitDO);
return Boolean.TRUE;
}
@Override
public Boolean authUpdate(MachineOrgAuthReq vo) {
OrganizationDO tenant = organMapper.selectById(vo.getOrganId()); OrganizationDO tenant = organMapper.selectById(vo.getOrganId());
if (tenant == null) { if (tenant == null) {
throw exception(ORGAN_NOT_EXISTS); throw exception(ORGAN_NOT_EXISTS);
} }
// machineLimitMapper.delete(new LambdaQueryWrapperX<MachineLimitDO>().eq(MachineLimitDO::getOrganId, vo.getOrganId()));
// List<MachineAuth> machineAuthList = vo.getMachineAuthList();
// if(CollectionUtil.isNotEmpty(machineAuthList)) {
// List<MachineLimitDO> organMachineDOS = new ArrayList<>();
// LocalDateTime now = LocalDateTime.now();
// for (MachineAuth machineAuth : machineAuthList) {
// organMachineDOS.add(
// MachineLimitDO.builder()
// .createTime(now)
// .organId(vo.getOrganId())
//// .machineId(machineAuth.getMachineId())
//// .showDualWorkstation(machineAuth.getShowDualWorkstation())
//// .showAutoNotePrinter(machineAuth.getShowAutoNotePrinter())
//// .showPriorFacing(machineAuth.getShowPriorFacing())
// .build()
// );
//
// }
// machineLimitMapper.insertBatch(organMachineDOS);
// }
MachineLimitDO machineLimitDO = MachineLimitDO.builder() MachineLimitDO machineLimitDO = MachineLimitDO.builder()
.organId(vo.getOrganId()) .organId(vo.getOrganId())