mdc_430后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
qushaowei
2024-03-28 1a2258c4eca2e7514b6096004fa1c3e0036b402b 
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java


@@ -121,6 +121,7 @@


                MdcCommonVo mdcCommonVo = new MdcCommonVo();


                mdcCommonVo.setName(mdcProduction.getProductionName());


                mdcCommonVo.setProductionCode(mdcProduction.getProductionCode());


                mdcCommonVo.setProductionId(mdcProduction.getId());


                //获取此层级下设备


                List<String> equipmentIdList = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcProduction.getId());


                if (equipmentIdList == null || equipmentIdList.isEmpty()) {


@@ -131,7 +132,7 @@


                    if (processCount == null || processCount.compareTo(BigDecimal.ZERO) == 0) {


                        mdcCommonVo.setValue("0");


                    } else {


                        mdcCommonVo.setValue(processCount.divide(new BigDecimal(86400).multiply(new BigDecimal(equipmentIdList.size())), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP).toString());


                        mdcCommonVo.setValue(processCount.divide(new BigDecimal("86400").multiply(new BigDecimal(equipmentIdList.size())), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP).toString());


                    }


                }


                result.add(mdcCommonVo);


@@ -206,7 +207,7 @@


                    if (processLong.compareTo(BigDecimal.ZERO) == 0) {


                        mdcCommonUtilizationVo.setValue("0");


                    } else {


                        mdcCommonUtilizationVo.setValue(processLong.divide(processDay, 4, RoundingMode.HALF_UP).divide(new BigDecimal("86400").multiply(new BigDecimal(equipmentIdList.size())), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP).toString());


                        mdcCommonUtilizationVo.setValue(processLong.divide(processDay.multiply(new BigDecimal("86400")), 4, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(2, RoundingMode.HALF_UP).toString());


                    }


                } else {


                    mdcCommonUtilizationVo.setValue("0");