设备添加安装位置，调整设备利用率中开始时间加关机时间不等于24的问题

hyingbo

2025-05-28 d88b7402ecf5f6b3dd14636db5bcde3b847d8f0a

设备添加安装位置，调整设备利用率中开始时间加关机时间不等于24的问题

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java

@@ -104,7 +104,8 @@
            MdcEquipment mdcEquipment = new MdcEquipment();
            mdcEquipment.setEquipmentId(entity.getEquipmentCode());
            mdcEquipment.setEquipmentType(entity.getDeviceType());
            mdcEquipment.setEquipmentName(entity.getEquipmentName());
            mdcEquipment.setEquipmentName(entity.getInstallationPosition());
            mdcEquipment.setEquipmentAddress(entity.getEquipmentName());
            mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
        }
        return Result.OK("添加成功！");
@@ -275,7 +276,8 @@
                        MdcEquipment mdcEquipment = new MdcEquipment();
                        mdcEquipment.setEquipmentId(eamEquipment.getEquipmentCode());
                        mdcEquipment.setEquipmentType(eamEquipment.getDeviceType());
                        mdcEquipment.setEquipmentName(eamEquipment.getEquipmentName());
                        mdcEquipment.setEquipmentName(eamEquipment.getInstallationPosition());
                        mdcEquipment.setEquipmentAddress(eamEquipment.getEquipmentName());
                        mdcEquipmentService.addNewEquipmentFromEam(mdcEquipment, eamEquipment.getOrgId());
                    }
                }

 lxzn-module-mdc-common/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java

@@ -33,11 +33,17 @@
    @ApiModelProperty(value = "设备编码")
    private String equipmentId;
    /**
     * 安装位置
     */
    @Excel(name = "安装位置", width = 15)
    @ApiModelProperty(value = "安装位置")
    private String equipmentName;
    /**
     * 设备名称
     */
    @Excel(name = "设备名称", width = 15)
    @ApiModelProperty(value = "设备名称")
    private String equipmentName;
    private String equipmentAddress;
    /**
     * 设备型号
     */

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

@@ -287,6 +287,18 @@
                        errorLong += du;
                    }
                }

                //如待机时间+加工时间+关机时间不等于86400，需将多余时间进行补充
                long remainingDate = 86400 - waitingLong - processingLong - closedLong;
                if (remainingDate != 0L) {
                    //如果关机时间大于待机时间+加工时间，将多余时间加至关机时间，否则，加入待机时间
                    if (waitingLong + processingLong < closedLong) {
                        closedLong += remainingDate;
                    }else {
                        waitingLong += remainingDate;
                    }
                }

                equipmentStatisticalInfo.setWaitLong(new BigDecimal(waitingLong));
                equipmentStatisticalInfo.setProcessLong(new BigDecimal(processingLong));
                equipmentStatisticalInfo.setCloseLong(new BigDecimal(closedLong));