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

排单接口 - bug和参数修改

Browse Source
This commit is contained in:
liuzhaotian
2024-05-29 14:09:34 +08:00
parent ee18dd963e
commit 62ec2c105a
9 changed files with 40 additions and 36 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
+4 -4
View File
@@ -127,15 +127,15 @@ public class MachineController {
@GetMapping("getMachineTree")
@Operation(summary = "获得机台树")
//@PreAuthorize("@ss.hasPermission('machine::query')")
public CommonResult<Map<Integer, List<MachineVO>>> getMachineTree(@RequestParam(required = false) Long organId) {
return success(machineService.getMachineTree(organId));
public CommonResult<Map<Integer, List<MachineVO>>> getMachineTree(@RequestParam(required = false) Long organId ,@RequestParam(required = false) Long type) {
return success(machineService.getMachineTree(organId,type));
}
@GetMapping(value = {"/list-all-simple", "/simple-list"})
@Operation(summary = "获取机台精简信息列表", description = "主要用于前端的下拉选项")
public CommonResult<List<MachineSimpleRespVO>> getSimpleDeptList(@RequestParam(required = false) Long organId) {
public CommonResult<List<MachineSimpleRespVO>> getSimpleDeptList(@RequestParam(required = false) Long organId,@RequestParam(required = false) Long type) {
organId = organId == null ? OrganContextHolder.getOrganId() : organId;
List<MachineSimpleRespVO> list = machineService.simpleList(organId);
List<MachineSimpleRespVO> list = machineService.simpleList(organId,type);
return success(list);
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/machine/vo/MachineSimpleRespVO.java
+4
View File
@@ -13,4 +13,8 @@ public class MachineSimpleRespVO {
@Schema(description = "机台名称")
private String name;
@Schema(description = "1机台设备 2CNC设备", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
private Integer machineType;
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineService.java
+2 -2
View File
@@ -71,7 +71,7 @@ public interface MachineService {
List<MachineDO> list(Collection<Long> ids);
Map<Integer, List<MachineVO>> getMachineTree(Long organId);
Map<Integer, List<MachineVO>> getMachineTree(Long organId,Long type);
Boolean auth(MachineOrgAuthReq vo);
@@ -81,5 +81,5 @@ public interface MachineService {
PageResult<MachineDO> page(MachinePageReqVO pageParam);
List<MachineSimpleRespVO> simpleList(Long organId);
List<MachineSimpleRespVO> simpleList(Long organId,Long type);
}
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+6 -4
View File
@@ -236,9 +236,10 @@ public class MachineServiceImpl implements MachineService {
}
@Override
public Map<Integer, List<MachineVO>> getMachineTree(Long organId) {
public Map<Integer, List<MachineVO>> getMachineTree(Long organId,Long type) {
List<MachineDO> machineDOS = machineMapper.selectList(new LambdaQueryWrapperX<MachineDO>()
.eqIfPresent(MachineDO::getOrganId, organId)
.eqIfPresent(MachineDO::getMachineType, type)
.select(MachineDO::getName, MachineDO::getMachineType, MachineDO::getId, MachineDO::getLabelId, MachineDO::getCreateTime)
);
List<MachineVO> machineVOS = BeanUtils.toBean(machineDOS, MachineVO.class);
@@ -293,10 +294,11 @@ public class MachineServiceImpl implements MachineService {
@Override
@OrganIgnore
public List<MachineSimpleRespVO> simpleList(Long organId) {
public List<MachineSimpleRespVO> simpleList(Long organId,Long type) {
List<MachineDO> machineDOS = machineMapper.selectList(new LambdaQueryWrapperX<MachineDO>()
.select(MachineDO::getId, MachineDO::getName)
.eq(MachineDO::getOrganId, organId)
.eqIfPresent(MachineDO::getOrganId, organId)
.eqIfPresent(MachineDO::getMachineType, type)
.select(MachineDO::getId, MachineDO::getName, MachineDO::getMachineType)
);
return BeanUtils.toBean(machineDOS, MachineSimpleRespVO.class);
}