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-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gaoqr
2024-06-19 11:52:45 +08:00
parent fbd71fd03a 208bd42db7
commit 1e50e1a382
3 changed files with 6 additions and 5 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
@@ -127,8 +127,8 @@ public class MachineController {
@GetMapping("getMachineTree")
@Operation(summary = "获得机台树")
//@PreAuthorize("@ss.hasPermission('machine::query')")
public CommonResult<Map<Integer, List<MachineVO>>> getMachineTree(@RequestParam(required = false) Long organId ,@RequestParam(required = false) Long type) {
return success(machineService.getMachineTree(organId,type));
public CommonResult<Map<Integer, List<MachineVO>>> getMachineTree(@RequestParam(required = false) Long type) {
return success(machineService.getMachineTree(type));
}
@GetMapping(value = {"/list-all-simple", "/simple-list"})
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java
+1 -1
View File
@@ -71,7 +71,7 @@ public interface MachineService {
List<MachineDO> list(Collection<Long> ids);
Map<Integer, List<MachineVO>> getMachineTree(Long organId,Long type);
Map<Integer, List<MachineVO>> getMachineTree(Long type);
Boolean auth(MachineOrgAuthReq vo);
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+3 -2
View File
@@ -44,6 +44,7 @@ import javax.annotation.Resource;
import static com.cf.imes.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR;
import static com.cf.imes.framework.common.exception.util.ServiceExceptionUtil.exception;
import static com.cf.imes.framework.security.core.util.SecurityFrameworkUtils.getUserOrganId;
import static com.cf.imes.module.system.enums.ErrorCodeConstants.*;
/**
@@ -236,9 +237,9 @@ public class MachineServiceImpl implements MachineService {
}
@Override
public Map<Integer, List<MachineVO>> getMachineTree(Long organId,Long type) {
public Map<Integer, List<MachineVO>> getMachineTree(Long type) {
List<MachineDO> machineDOS = machineMapper.selectList(new LambdaQueryWrapperX<MachineDO>()
.eqIfPresent(MachineDO::getOrganId, organId)
.eqIfPresent(MachineDO::getOrganId, getUserOrganId())
.eqIfPresent(MachineDO::getMachineType, type)
.select(MachineDO::getName, MachineDO::getMachineType, MachineDO::getId, MachineDO::getLabelId, MachineDO::getCreateTime)
);