修改生产环境配置，利用率列表三级分层顺序

lius

2023-09-13 2ace0260c38082770c02b909f66584fc0d49a31c

修改生产环境配置，利用率列表三级分层顺序

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/dto/MdcEquipmentDto.java

@@ -1,5 +1,6 @@
package org.jeecg.modules.mdc.dto;

import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import org.jeecg.modules.mdc.entity.MdcDriveTypeParamConfig;
import org.jeecg.modules.mdc.entity.XYZAliases;
@@ -17,6 +18,7 @@
    private String equipmentModel;

    //采集时间
    @JSONField(name = "CollectTime")
    private Date CollectTime;
    //设备编号
    private String equipmentID;
@@ -39,8 +41,10 @@
    //实际进给速度
    private String actualfeedrate;
    //程序执行行数
    @JSONField(name = "Programnumber")
    private String Programnumber;
    //序列号
    @JSONField(name = "Sequencenumber")
    private String Sequencenumber;
    //执行代码
    private String executingcode;
@@ -53,36 +57,55 @@
    //工作状态
    private String workstate;
    //报警状态
    @JSONField(name = "ALRMstate")
    private String ALRMstate;
    //工件名称
    @JSONField(name = "ProductName")
    private String ProductName;
    //工件数量
    @JSONField(name = "ProductCount")
    private String ProductCount;
    //机床X轴坐标
    @JSONField(name = "Xmachine")
    private String Xmachine;
    //机床Y轴坐标
    @JSONField(name = "Ymachine")
    private String Ymachine;
    //机床Y轴坐标
    @JSONField(name = "Zmachine")
    private String Zmachine;
    //机床Z轴坐标
    @JSONField(name = "Amachine")
    private String Amachine;
    //机床A轴坐标
    @JSONField(name = "Bmachine")
    private String Bmachine;
    //X轴坐标绝对坐标
    @JSONField(name = "Xabsolute")
    private String Xabsolute;
    //X轴坐标绝对坐标
    @JSONField(name = "Yabsolute")
    private String Yabsolute;
    //X轴坐标绝对坐标
    @JSONField(name = "Zabsolute")
    private String Zabsolute;
    //X轴坐标绝对坐标
    @JSONField(name = "Aabsolute")
    private String Aabsolute;
    //X轴坐标绝对坐标
    @JSONField(name = "Babsolute")
    private String Babsolute;
    //系统版本号
    @JSONField(name = "SystemVersion")
    private String SystemVersion;
    //数控系统型号
    @JSONField(name = "SystemType")
    private String SystemType;
    //最大轴数
    @JSONField(name = "MaxAxis")
    private String MaxAxis;
    //有效轴数
    @JSONField(name = "ValidAxis")
    private String ValidAxis;

    //设备功率
@@ -176,43 +199,62 @@
    private String equipmentNormalTime;

    //    设备ID
    @JSONField(name = "EquipmentID")
    private String EquipmentID;
    //    KI1状态
    @JSONField(name = "P1001")
    private String P1001;
    //    KI2状态
    @JSONField(name = "P1002")
    private String P1002;
    //            KI3状态
    @JSONField(name = "P1003")
    private String P1003;
    //    KI4状态
    @JSONField(name = "P1004")
    private String P1004;
    //            AI1数据
    @JSONField(name = "P1005")
    private String P1005;
    //    AI2数据
    @JSONField(name = "P1006")
    private String P1006;
    //            KI1计数
    @JSONField(name = "P1007")
    private String P1007;
    //    KI2计数
    @JSONField(name = "P1008")
    private String P1008;
    //            KI3计数
    @JSONField(name = "P1009")
    private String P1009;
    //    KI4计数
    @JSONField(name = "P1010")
    private String P1010;
    //            KO1输出
    @JSONField(name = "P1011")
    private String P1011;
    //    KO2输出
    @JSONField(name = "P1012")
    private String P1012;

    //设备运行时间
    @JSONField(name = "EquipmentTime")
    private String EquipmentTime;
    //当前刀具号
    @JSONField(name = "ToolNum")
    private String ToolNum;
    //NC版本
    @JSONField(name = "NCVersion")
    private String NCVersion;
    //TNC版本
    @JSONField(name = "TNCVersion")
    private String TNCVersion;
    //OPT版本
    @JSONField(name = "OPTVersion")
    private String OPTVersion;
    //PLC版本
    @JSONField(name = "PLCVersion")
    private String PLCVersion;

    //备注

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

@@ -64,7 +64,7 @@
            ei.setFeedrate(map.get("feedrate") == null ? null : map.get("feedrate").toString());
            ei.setFeedbeilv(map.get("feedbeilv") == null ? null : map.get("feedbeilv").toString());
            ei.setProgramnumber(map.get("Programnumber") == null ? null : map.get("Programnumber").toString());
            ei.setSequencenumber(map.get("SEQUENCENUMBER") == null ? null : map.get("SEQUENCENUMBER").toString());
            ei.setSequencenumber(map.get("Sequencenumber") == null ? null : map.get("Sequencenumber").toString());
            ei.setExecutingcode(map.get("executingcode") == null ? null : map.get("executingcode").toString());
            ei.setProductName(map.get("ProductName") == null ? null : map.get("ProductName").toString());
            dto.add(ei);

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

@@ -110,7 +110,7 @@
                // 部门层级
                List<MdcEquDepDto> equipmentList = mdcEquipmentService.findEquDepList(vo.getEquipmentIdList());
                // 查询所有部门信息
                List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()));
                List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).orderByAsc(SysDepart::getDepartName));

                for (MdcEquDepDto mdcEquDepDto : equipmentList) {
                    MdcEfficiencyListDto mdcEfficiencyListDto = new MdcEfficiencyListDto();
@@ -290,7 +290,7 @@
                // 部门层级
                List<MdcEquDepDto> equipmentList = mdcEquipmentService.findEquDepList(vo.getEquipmentIdList());
                // 查询所有部门信息
                List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()));
                List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).orderByAsc(SysDepart::getDepartName));

                for (MdcEquDepDto mdcEquDepDto : equipmentList) {
                    MdcEfficiencyListDto mdcEfficiencyListDto = new MdcEfficiencyListDto();
@@ -470,7 +470,7 @@
                // 部门层级
                List<MdcEquDepDto> equipmentList = mdcEquipmentService.findEquDepList(vo.getEquipmentIdList());
                // 查询所有部门信息
                List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()));
                List<SysDepart> departList = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().ne(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_1.toString()).orderByAsc(SysDepart::getDepartName));
                // 班次名称显示处理
                String shiftSubName = "";
                if (StringUtils.isBlank(vo.getShiftId())) {

 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;
    }

 lxzn-module-system/lxzn-system-start/src/main/resources/application-prod.yml

@@ -1,5 +1,5 @@
server:
  port: 8080
  port: 9999
  tomcat:
    max-swallow-size: -1
  error:
@@ -132,11 +132,21 @@
        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
      datasource:
        master:
          url: jdbc:sqlserver://192.168.0.29:1433;databasename=LXZN_TEST_430
          url: jdbc:sqlserver://166.0.1.10:1433;databasename=LXZN_TEST_430
          username: sa
          password: LXZN@1688
          password: 123
          #password: 123
          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
          #url: jdbc:mysql://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
          #username: root
          #password: root
          #driver-class-name: com.mysql.cj.jdbc.Driver
        # 多数据源配置
        #multi-datasource1:
        #  url: jdbc:sqlserver://192.168.0.118:1433;databasename=lxzn_test
        #  username: sa
        #  password: 123
        #  driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
  #redis 配置
  redis:
    database: 0
@@ -169,7 +179,7 @@
  signatureSecret: dd05f1c54d63749eda95f9fa6d49v442a
  # 签名拦截接口
  signUrls: /sys/dict/getDictItems/*,/sys/dict/loadDict/*,/sys/dict/loadDictOrderByValue/*,/sys/dict/loadDictItem/*,/sys/dict/loadTreeData,/sys/api/queryTableDictItemsByCode,/sys/api/queryFilterTableDictInfo,/sys/api/queryTableDictByKeys,/sys/api/translateDictFromTable,/sys/api/translateDictFromTableByKeys
  #local\minio\alioss
  #local、minio、alioss
  uploadType: local
  # 前端访问地址
  domainUrl:
@@ -177,9 +187,9 @@
    app: http://localhost:8051
  path:
    #文件上传根目录 设置
    upload: /opt/jeecg-boot/upload
    upload: /opt/upFiles
    #webapp文件路径
    webapp: /opt/jeecg-boot/webapp
    webapp: /opt/webapp
  shiro:
    excludeUrls: /test/jeecgDemo/demo3,/test/jeecgDemo/redisDemo/**,/category/**,/visual/**,/map/**,/jmreport/bigscreen2/**,/api/getUserInfo
  #阿里云oss存储和大鱼短信秘钥配置