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

Merge branch 'main' of ssh://192.168.1.205:9922/cf_devdept2/cf_imes_server

Browse Source
This commit is contained in:
lym
2024-08-19 17:52:12 +08:00
parent 889aa87456 907fbead3a
commit 6dd785455b
2 changed files with 6 additions and 12 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/convert/machine/MachineConvert.java
+1 -7
View File
@@ -4,9 +4,6 @@ import com.alibaba.fastjson.JSON;
import com.cf.imes.module.system.controller.admin.machine.vo.CuttingRespVO; import com.cf.imes.module.system.controller.admin.machine.vo.CuttingRespVO;
import com.cf.imes.module.system.controller.admin.machine.vo.CuttingSaveReqVO; import com.cf.imes.module.system.controller.admin.machine.vo.CuttingSaveReqVO;
import com.cf.imes.module.system.dal.dataobject.machine.MachineDO; import com.cf.imes.module.system.dal.dataobject.machine.MachineDO;
import com.cf.imes.module.system.dal.dataobject.machine.MachineLimitDO;
import java.util.Objects;
/** /**
* @author Beal * @author Beal
@@ -26,7 +23,7 @@ public class MachineConvert {
} }
public static CuttingRespVO convert(MachineDO machineDO, MachineLimitDO machineLimitDO) { public static CuttingRespVO convert(MachineDO machineDO) {
return CuttingRespVO.builder() return CuttingRespVO.builder()
.id(machineDO.getId()) .id(machineDO.getId())
.machineSettingDO(JSON.parseObject(machineDO.getSetting())) .machineSettingDO(JSON.parseObject(machineDO.getSetting()))
@@ -36,9 +33,6 @@ public class MachineConvert {
.name(machineDO.getName()) .name(machineDO.getName())
.machineType(machineDO.getMachineType()) .machineType(machineDO.getMachineType())
.labelId(machineDO.getLabelId()) .labelId(machineDO.getLabelId())
.showAutoNotePrinter(Objects.isNull(machineLimitDO)? Boolean.FALSE: machineLimitDO.getShowAutoNotePrinter())
.showDualWorkstation(Objects.isNull(machineLimitDO)? Boolean.FALSE: machineLimitDO.getShowDualWorkstation())
.showPriorFacing(Objects.isNull(machineLimitDO)? Boolean.FALSE: machineLimitDO.getShowPriorFacing())
.build(); .build();
} }
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/machine/MachineServiceImpl.java
+5 -5
View File
@@ -259,11 +259,11 @@ public class MachineServiceImpl implements MachineService {
LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); LoginUser loginUser = SecurityFrameworkUtils.getLoginUser();
assert loginUser != null; assert loginUser != null;
MachineLimitDO machineLimitDO = machineLimitMapper.selectOne(new LambdaQueryWrapperX<MachineLimitDO>() // MachineLimitDO machineLimitDO = machineLimitMapper.selectOne(new LambdaQueryWrapperX<MachineLimitDO>()
.eq(MachineLimitDO::getMachineId, id) // .eq(MachineLimitDO::getMachineId, id)
.eq(MachineLimitDO::getOrganId, loginUser.getOrganId()) // .eq(MachineLimitDO::getOrganId, loginUser.getOrganId())
); // );
CuttingRespVO respVO = MachineConvert.convert(machineDO, machineLimitDO); CuttingRespVO respVO = MachineConvert.convert(machineDO);
return respVO; return respVO;
} }