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 13:42:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

机台树添加组织id参数

Browse Source
This commit is contained in:
yangsb
2024-04-10 14:26:24 +08:00
parent 3cf092a7b6
commit 262b2d1e81
3 changed files with 5 additions and 4 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/MachineController.java
+2 -2
View File
@@ -120,8 +120,8 @@ public class MachineController {
@GetMapping("getMachineTree") @GetMapping("getMachineTree")
@Operation(summary = "获得机台树") @Operation(summary = "获得机台树")
@PreAuthorize("@ss.hasPermission('machine::query')") @PreAuthorize("@ss.hasPermission('machine::query')")
public CommonResult<Map<Integer, List<MachineVO>>> getMachineTree() { public CommonResult<Map<Integer, List<MachineVO>>> getMachineTree(@RequestParam(required = false) Long organId) {
return success(machineService.getMachineTree()); return success(machineService.getMachineTree(organId));
} }
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java
+1 -1
View File
@@ -71,5 +71,5 @@ public interface MachineService {
List<MachineDO> list(Collection<Long> ids); List<MachineDO> list(Collection<Long> ids);
Map<Integer, List<MachineVO>> getMachineTree(); Map<Integer, List<MachineVO>> getMachineTree(Long organId);
} }
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+2 -1
View File
@@ -196,8 +196,9 @@ public class MachineServiceImpl implements MachineService {
} }
@Override @Override
public Map<Integer, List<MachineVO>> getMachineTree() { public Map<Integer, List<MachineVO>> getMachineTree(Long organId) {
List<MachineDO> machineDOS = machineMapper.selectList(new LambdaQueryWrapperX<MachineDO>() List<MachineDO> machineDOS = machineMapper.selectList(new LambdaQueryWrapperX<MachineDO>()
.eqIfPresent(MachineDO::getOrganId, organId)
.select(MachineDO::getName, MachineDO::getMachineType, MachineDO::getId, MachineDO::getLabelId, MachineDO::getCreateTime) .select(MachineDO::getName, MachineDO::getMachineType, MachineDO::getId, MachineDO::getLabelId, MachineDO::getCreateTime)
); );
List<MachineVO> machineVOS = BeanUtils.toBean(machineDOS, MachineVO.class); List<MachineVO> machineVOS = BeanUtils.toBean(machineDOS, MachineVO.class);