update

Lius

2024-07-08 45ce8d6fdcd1f8025b11e9e3719b856caa883414

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

@@ -52,25 +52,25 @@
        List<WsEquipmentStatus> equipmentStatusList =  this.baseMapper.selectEquipmentStatus();
        if (equipmentStatusList != null && !equipmentStatusList.isEmpty()) {
            for (WsEquipmentStatus wsEquipmentStatus : equipmentStatusList) {
                // 1-加工   3-待机   9-关机   10-报警
                // 1-加工   2-待机   3-关机   4-报警
                if (wsEquipmentStatus.getEquipmentStatus() != null) {
                    switch (wsEquipmentStatus.getEquipmentStatus()) {
                        case "1":
                        case "2":
                            wsEquipmentStatus.setEquipmentStatus("3");
                            wsEquipmentStatus.setEquipmentStatus("2");
                            break;
                        case "3":
                            wsEquipmentStatus.setEquipmentStatus("1");
                            break;
                        case "22":
                            wsEquipmentStatus.setEquipmentStatus("10");
                            wsEquipmentStatus.setEquipmentStatus("4");
                            break;
                        default:
                            wsEquipmentStatus.setEquipmentStatus("9");
                            wsEquipmentStatus.setEquipmentStatus("3");
                            break;
                    }
                } else {
                    wsEquipmentStatus.setEquipmentStatus("9");
                    wsEquipmentStatus.setEquipmentStatus("3");
                }
            }
        }
@@ -90,7 +90,7 @@
                String equipmentRunTime = wsEquipmentUtilizationRate.getEquipmentRunTime();
                wsEquipmentUtilizationRate.setStatisType("D");
                wsEquipmentUtilizationRate.setEquipmentRunTime(new BigDecimal(equipmentRunTime).divide(new BigDecimal("60"), 0, RoundingMode.HALF_UP).toString());
                wsEquipmentUtilizationRate.setEquipmentRate(new BigDecimal(equipmentRunTime).divide(new BigDecimal("86400"), 2, RoundingMode.HALF_UP) + "%");
                wsEquipmentUtilizationRate.setEquipmentRate(new BigDecimal(equipmentRunTime).divide(new BigDecimal("86400"), 2, RoundingMode.HALF_UP).toString());
                wsEquipmentUtilizationRate.setEquipmentCalendar(date);
            }
        }