Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 f84d9e69907cb678150eaa6393fd74cf042fcca4

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentServiceImpl.java

@@ -18,6 +18,7 @@
import org.jeecg.modules.mdc.mapper.XYZAliasesMapper;
import org.jeecg.modules.mdc.model.MdcEquipmentTree;
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.util.FindsEquipmentDepartUtil;
import org.jeecg.modules.mdc.util.FindsEquipmentProductionUtil;
import org.jeecg.modules.mdc.vo.MdcEquipmentDepVo;
@@ -379,76 +380,82 @@
                        String englishName = mdcDriveTypeParamConfig.getEnglishName();
                        JSONObject jsonObject = (JSONObject) JSONObject.toJSON(dto);
                        Object result = jsonObject.get(englishName);
                        String value = result == null ? null : result.toString();
                        String value = "";
                        if ("CollectTime".equals(englishName)) {
                            Date date = result == null ? null : (Date) result;
                            value = DateUtils.format(date, DateUtils.STR_DATE_TIME_SMALL);
                        } else {
                            value = result == null ? null : result.toString();
                        }
                        mdcDriveTypeParamConfig.setValue(value);
                    }
                    mdcEquipmentDto.setMdcDriveTypeParamConfigList(mdcDriveTypeParamList);
                }
            }
            // 设备坐标数 获取设备需要采集的坐标信息
            List<XYZAliases> equipmentCoordinateList = xyzAliasesMapper.getCoordinateByEquipmentId(mdcEquipment.getEquipmentId());
            // 设备采集的坐标信息
            EquipmentXYZ equipmentXYZ = equipmentXYZService.getByEquipmentId(mdcEquipment.getEquipmentId());
            JSONObject jsonEquipmentXYZ = (JSONObject) JSONObject.toJSON(equipmentXYZ);
            if (equipmentCoordinateList != null && !equipmentCoordinateList.isEmpty()) {
                for (XYZAliases xyzAliases : equipmentCoordinateList) {
                    String englishName = xyzAliases.getXYZFieldName().toLowerCase();
                    englishName = englishName.substring(0, 1) + "_" + englishName.substring(1, englishName.length());
                    englishName = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, englishName);
                    Object orgValue = jsonEquipmentXYZ.get(englishName);
                    String value = orgValue != null ? orgValue.toString() : null;
                    //  坐标数据的title 来自 xyzAliases 表, 根据 是否包含 absolute 和  machine  判断是绝对坐标还是机床坐标
                    String title = englishName.substring(0, 1).toUpperCase();
                    title = englishName.contains("absolute") ? "绝对坐标" + title : "机床坐标" + title;
                    xyzAliases.setTitle(title);
                    xyzAliases.setValue(value);
                }
                mdcEquipmentDto.setXyzAliasesList(equipmentCoordinateList);
            }
//            // 设备坐标数 获取设备需要采集的坐标信息
//            List<XYZAliases> equipmentCoordinateList = xyzAliasesMapper.getCoordinateByEquipmentId(mdcEquipment.getEquipmentId());
//            // 设备采集的坐标信息
//            EquipmentXYZ equipmentXYZ = equipmentXYZService.getByEquipmentId(mdcEquipment.getEquipmentId());
//            JSONObject jsonEquipmentXYZ = (JSONObject) JSONObject.toJSON(equipmentXYZ);
//            if (equipmentCoordinateList != null && !equipmentCoordinateList.isEmpty()) {
//                for (XYZAliases xyzAliases : equipmentCoordinateList) {
//                    String englishName = xyzAliases.getXYZFieldName().toLowerCase();
//                    englishName = englishName.substring(0, 1) + "_" + englishName.substring(1, englishName.length());
//                    englishName = CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, englishName);
//                    Object orgValue = jsonEquipmentXYZ.get(englishName);
//                    String value = orgValue != null ? orgValue.toString() : null;
//                    //  坐标数据的title 来自 xyzAliases 表, 根据 是否包含 absolute 和  machine  判断是绝对坐标还是机床坐标
//                    String title = englishName.substring(0, 1).toUpperCase();
//                    title = englishName.contains("absolute") ? "绝对坐标" + title : "机床坐标" + title;
//                    xyzAliases.setTitle(title);
//                    xyzAliases.setValue(value);
//                }
//                mdcEquipmentDto.setXyzAliasesList(equipmentCoordinateList);
//            }

            if (equipmentXYZ != null) {
                mdcEquipmentDto.setXmachine(equipmentXYZ.getXMachine());
                mdcEquipmentDto.setYmachine(equipmentXYZ.getYMachine());
                mdcEquipmentDto.setZmachine(equipmentXYZ.getZMachine());
                mdcEquipmentDto.setAmachine(equipmentXYZ.getAMachine());
                mdcEquipmentDto.setBmachine(equipmentXYZ.getBMachine());
                mdcEquipmentDto.setXabsolute(equipmentXYZ.getXAbsolute());
                mdcEquipmentDto.setYabsolute(equipmentXYZ.getYAbsolute());
                mdcEquipmentDto.setZabsolute(equipmentXYZ.getZAbsolute());
                mdcEquipmentDto.setAabsolute(equipmentXYZ.getAAbsolute());
                mdcEquipmentDto.setBabsolute(equipmentXYZ.getBAbsolute());
            }
            EquipmentBaseInfo equipmentBaseInfo = equipmentBaseInfoService.getByEquipmentId(mdcEquipment.getEquipmentId());
            if (equipmentBaseInfo != null) {
                mdcEquipmentDto.setMaxAxis(equipmentBaseInfo.getMaxAxis());
                mdcEquipmentDto.setValidAxis(equipmentBaseInfo.getValidAxis());
            }
            if (controlSystem.getDriveType().equals("SIEMENS840DSL")) {
                EquipmentTemperatureDto equipmentTemperature = equipmentTemperatureService.getEquipmentTemperature(mdcEquipment.getEquipmentId());
                if (equipmentTemperature != null) {
                    mdcEquipmentDto.setTemperatureX(equipmentTemperature.getX());
                    mdcEquipmentDto.setTemperatureY(equipmentTemperature.getY());
                    mdcEquipmentDto.setTemperatureZ(equipmentTemperature.getZ());
                    mdcEquipmentDto.setTemperatureA(equipmentTemperature.getA());
                    mdcEquipmentDto.setTemperatureB(equipmentTemperature.getB());
                }
                EquipmentTemperatureDto equipmentLagError = equipmentTemperatureService.getEquipmentLagError(mdcEquipment.getEquipmentId());
                if (equipmentLagError != null) {
                    mdcEquipmentDto.setEquipmentLagErrorX(equipmentLagError.getX());
                    mdcEquipmentDto.setEquipmentLagErrorY(equipmentLagError.getY());
                    mdcEquipmentDto.setEquipmentLagErrorZ(equipmentLagError.getZ());
                    mdcEquipmentDto.setEquipmentLagErrorA(equipmentLagError.getA());
                    mdcEquipmentDto.setEquipmentLagErrorB(equipmentLagError.getB());
                }
            }
            EquipmentTemperatureDto equipmentCurrent = equipmentTemperatureService.getEquipmentCurrent(mdcEquipment.getEquipmentId());
            if (equipmentCurrent != null) {
                mdcEquipmentDto.setEquipmentCurrentX(equipmentCurrent.getX());
                mdcEquipmentDto.setEquipmentCurrentY(equipmentCurrent.getY());
                mdcEquipmentDto.setEquipmentCurrentZ(equipmentCurrent.getZ());
                mdcEquipmentDto.setEquipmentCurrentA(equipmentCurrent.getA());
                mdcEquipmentDto.setEquipmentCurrentB(equipmentCurrent.getB());
            }
//            if (equipmentXYZ != null) {
//                mdcEquipmentDto.setXmachine(equipmentXYZ.getXMachine());
//                mdcEquipmentDto.setYmachine(equipmentXYZ.getYMachine());
//                mdcEquipmentDto.setZmachine(equipmentXYZ.getZMachine());
//                mdcEquipmentDto.setAmachine(equipmentXYZ.getAMachine());
//                mdcEquipmentDto.setBmachine(equipmentXYZ.getBMachine());
//                mdcEquipmentDto.setXabsolute(equipmentXYZ.getXAbsolute());
//                mdcEquipmentDto.setYabsolute(equipmentXYZ.getYAbsolute());
//                mdcEquipmentDto.setZabsolute(equipmentXYZ.getZAbsolute());
//                mdcEquipmentDto.setAabsolute(equipmentXYZ.getAAbsolute());
//                mdcEquipmentDto.setBabsolute(equipmentXYZ.getBAbsolute());
//            }
//            EquipmentBaseInfo equipmentBaseInfo = equipmentBaseInfoService.getByEquipmentId(mdcEquipment.getEquipmentId());
//            if (equipmentBaseInfo != null) {
//                mdcEquipmentDto.setMaxAxis(equipmentBaseInfo.getMaxAxis());
//                mdcEquipmentDto.setValidAxis(equipmentBaseInfo.getValidAxis());
//            }
//            if (controlSystem.getDriveType().equals("SIEMENS840DSL")) {
//                EquipmentTemperatureDto equipmentTemperature = equipmentTemperatureService.getEquipmentTemperature(mdcEquipment.getEquipmentId());
//                if (equipmentTemperature != null) {
//                    mdcEquipmentDto.setTemperatureX(equipmentTemperature.getX());
//                    mdcEquipmentDto.setTemperatureY(equipmentTemperature.getY());
//                    mdcEquipmentDto.setTemperatureZ(equipmentTemperature.getZ());
//                    mdcEquipmentDto.setTemperatureA(equipmentTemperature.getA());
//                    mdcEquipmentDto.setTemperatureB(equipmentTemperature.getB());
//                }
//                EquipmentTemperatureDto equipmentLagError = equipmentTemperatureService.getEquipmentLagError(mdcEquipment.getEquipmentId());
//                if (equipmentLagError != null) {
//                    mdcEquipmentDto.setEquipmentLagErrorX(equipmentLagError.getX());
//                    mdcEquipmentDto.setEquipmentLagErrorY(equipmentLagError.getY());
//                    mdcEquipmentDto.setEquipmentLagErrorZ(equipmentLagError.getZ());
//                    mdcEquipmentDto.setEquipmentLagErrorA(equipmentLagError.getA());
//                    mdcEquipmentDto.setEquipmentLagErrorB(equipmentLagError.getB());
//                }
//            }
//            EquipmentTemperatureDto equipmentCurrent = equipmentTemperatureService.getEquipmentCurrent(mdcEquipment.getEquipmentId());
//            if (equipmentCurrent != null) {
//                mdcEquipmentDto.setEquipmentCurrentX(equipmentCurrent.getX());
//                mdcEquipmentDto.setEquipmentCurrentY(equipmentCurrent.getY());
//                mdcEquipmentDto.setEquipmentCurrentZ(equipmentCurrent.getZ());
//                mdcEquipmentDto.setEquipmentCurrentA(equipmentCurrent.getA());
//                mdcEquipmentDto.setEquipmentCurrentB(equipmentCurrent.getB());
//            }
        }
        return mdcEquipmentDto;
    }