王子文 月报SUB Utility Consumption, SCTF Utility Consumption, KBI, BCC装置主要原材料及公用工程消耗 日报导入/修改时更新月报数据

master/src/main/java/com/ruoyi/project/production/mapper/TMonthlyProductionReportMapper.java

@@ -168,7 +168,7 @@ public interface TMonthlyProductionReportMapper
     /**
      * 按年份查询Summary
      */
-    public List<TMonthlyProductionReport> selectSummarByYear(Long year);
+    public List<TMonthlyProductionReport> selectSummaryByYear(Long year);
 
     /**
      * 查询趋势分析数据

master/src/main/java/com/ruoyi/project/production/service/impl/TMonthlyProductionReportServiceImpl.java

@@ -2026,7 +2026,7 @@ public class TMonthlyProductionReportServiceImpl implements ITMonthlyProductionR
         // 当前月份
         Long currentMonth = Long.parseLong(currentDate.getMonth() + 1 + "");
         // 从数据库中查出的当前year的月报数据集合，每个元素对应当前year某个月的数据
-        List<TMonthlyProductionReport> tMonthlyProductionReports = tMonthlyProductionReportMapper.selectSummarByYear(year);
+        List<TMonthlyProductionReport> tMonthlyProductionReports = tMonthlyProductionReportMapper.selectSummaryByYear(year);
         // 前端月报数据集合，每个元素对应当前某个指标的title、unit、1~12月的数据以及年度汇总数据
         List<MonthlyProductionReportVO> monthlyProductionReportVOs = new ArrayList<>();
         monthlyProductionReportVOs.add(new MonthlyProductionReportVO("summary_cl_yb","乙丙产量","t"));

master/src/main/java/com/ruoyi/project/production/service/impl/thread/SyncAfterDailyUpdateThread.java

@@ -4,6 +4,7 @@ import com.ruoyi.project.production.domain.TDailyProductionReport;
 import com.ruoyi.project.production.domain.TMonthlyProductionReport;
 import com.ruoyi.project.production.mapper.TDailyProductionReportMapper;
 import com.ruoyi.project.production.mapper.TMonthlyProductionReportMapper;
+import org.apache.commons.math3.analysis.function.Subtract;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
@@ -455,285 +456,148 @@ public class SyncAfterDailyUpdateThread extends Thread {
         monthly.setSctuConsumptionCw(sctuConsumptionCw.toString());
         monthly.setSctuConsumptionPaIa(sctuConsumptionPaIa.toString());
 
-//        String subConElectricStr = daily.get();
-//        String subConNgStr = daily.get();
-//        String subConFgFrEuStr = daily.get();
-//        String subConLpgStr = daily.get();
-//        String subConHhpSteamStr = daily.get();
-//        String subConMpSteamStr = daily.get();
-//        String subConLpSteamStr = daily.get();
-//        String subConPCondensateStr = daily.get();
-//        String subConCwStr = daily.get();
-//        String subConN2Str = daily.get();
-//        String subConIaPaStr = daily.get();
-//        String subConHppaStr = daily.get();
-//        String subConProductionWaterStr = daily.get();
-//        String subConHpSteamFrSubNetStr = daily.get();
-//        String subConBfwStr = daily.get();
-//        String subConEoEgPurgeGasStr = daily.get();
-//        String subConH2FrSyngasAsFuleStr = daily.get();
-//        String subConHpProductStr = daily.get();
-//        String subConSub1FgFic1302Str = daily.get();
-//        String subConSub2FgFic2302Str = daily.get();
-//        String subConTotalNgFc3702Str = daily.get();
-//        String subConCostOutputStr = daily.get();
-//        String subConZfyStr = daily.get();
-//        String subConGljclStr = daily.get();
-//        String subConCcStr = daily.get();
-//        String subConScStr = daily.get();
-//        BigDecimal subConElectric = new BigDecimal( subConElectricStr == null ? "0" : subConElectricStr);
-//        BigDecimal subConNg = new BigDecimal( subConNgStr == null ? "0" : subConNgStr);
-//        BigDecimal subConFgFrEu = new BigDecimal( subConFgFrEuStr == null ? "0" : subConFgFrEuStr);
-//        BigDecimal subConLpg = new BigDecimal( subConLpgStr == null ? "0" : subConLpgStr);
-//        BigDecimal subConHhpSteam = new BigDecimal( subConHhpSteamStr == null ? "0" : subConHhpSteamStr);
-//        BigDecimal subConMpSteam = new BigDecimal( subConMpSteamStr == null ? "0" : subConMpSteamStr);
-//        BigDecimal subConLpSteam = new BigDecimal( subConLpSteamStr == null ? "0" : subConLpSteamStr);
-//        BigDecimal subConPCondensate = new BigDecimal( subConPCondensateStr == null ? "0" : subConPCondensateStr);
-//        BigDecimal subConCw = new BigDecimal( subConCwStr == null ? "0" : subConCwStr);
-//        BigDecimal subConN2 = new BigDecimal( subConN2Str == null ? "0" : subConN2Str);
-//        BigDecimal subConIaPa = new BigDecimal( subConIaPaStr == null ? "0" : subConIaPaStr);
-//        BigDecimal subConHppa = new BigDecimal( subConHppaStr == null ? "0" : subConHppaStr);
-//        BigDecimal subConProductionWater = new BigDecimal( subConProductionWaterStr == null ? "0" : subConProductionWaterStr);
-//        BigDecimal subConHpSteamFrSubNet = new BigDecimal( subConHpSteamFrSubNetStr == null ? "0" : subConHpSteamFrSubNetStr);
-//        BigDecimal subConBfw = new BigDecimal( subConBfwStr == null ? "0" : subConBfwStr);
-//        BigDecimal subConEoEgPurgeGas = new BigDecimal( subConEoEgPurgeGasStr == null ? "0" : subConEoEgPurgeGasStr);
-//        BigDecimal subConH2FrSyngasAsFule = new BigDecimal( subConH2FrSyngasAsFuleStr == null ? "0" : subConH2FrSyngasAsFuleStr);
-//        BigDecimal subConHpProduct = new BigDecimal( subConHpProductStr == null ? "0" : subConHpProductStr);
-//        BigDecimal subConSub1FgFic1302 = new BigDecimal( subConSub1FgFic1302Str == null ? "0" : subConSub1FgFic1302Str);
-//        BigDecimal subConSub2FgFic2302 = new BigDecimal( subConSub2FgFic2302Str == null ? "0" : subConSub2FgFic2302Str);
-//        BigDecimal subConTotalNgFc3702 = new BigDecimal( subConTotalNgFc3702Str == null ? "0" : subConTotalNgFc3702Str);
-//        BigDecimal subConCostOutput = new BigDecimal( subConCostOutputStr == null ? "0" : subConCostOutputStr);
-//        BigDecimal subConZfy = new BigDecimal( subConZfyStr == null ? "0" : subConZfyStr);
-//        BigDecimal subConGljcl = new BigDecimal( subConGljclStr == null ? "0" : subConGljclStr);
-//        BigDecimal subConCc = new BigDecimal( subConCcStr == null ? "0" : subConCcStr);
-//        BigDecimal subConSc = new BigDecimal( subConScStr == null ? "0" : subConScStr);
-//        monthly.setSubConElectric(subConElectric.toString());
-//        monthly.setSubConNg(subConNg.toString());
-//        monthly.setSubConFgFrEu(subConFgFrEu.toString());
-//        monthly.setSubConLpg(subConLpg.toString());
-//        monthly.setSubConHhpSteam(subConHhpSteam.toString());
-//        monthly.setSubConMpSteam(subConMpSteam.toString());
-//        monthly.setSubConLpSteam(subConLpSteam.toString());
-//        monthly.setSubConPCondensate(subConPCondensate.toString());
-//        monthly.setSubConCw(subConCw.toString());
-//        monthly.setSubConN2(subConN2.toString());
-//        monthly.setSubConIaPa(subConIaPa.toString());
-//        monthly.setSubConHppa(subConHppa.toString());
-//        monthly.setSubConProductionWater(subConProductionWater.toString());
-//        monthly.setSubConHpSteamFrSubNet(subConHpSteamFrSubNet.toString());
-//        monthly.setSubConBfw(subConBfw.toString());
-//        monthly.setSubConEoEgPurgeGas(subConEoEgPurgeGas.toString());
-//        monthly.setSubConH2FrSyngasAsFule(subConH2FrSyngasAsFule.toString());
-//        monthly.setSubConHpProduct(subConHpProduct.toString());
-//        monthly.setSubConSub1FgFic1302(subConSub1FgFic1302.toString());
-//        monthly.setSubConSub2FgFic2302(subConSub2FgFic2302.toString());
-//        monthly.setSubConTotalNgFc3702(subConTotalNgFc3702.toString());
-//        monthly.setSubConCostOutput(subConCostOutput.toString());
-//        monthly.setSubConZfy(subConZfy.toString());
-//        monthly.setSubConGljcl(subConGljcl.toString());
-//        monthly.setSubConCc(subConCc.toString());
-//        monthly.setSubConSc(subConSc.toString());
+        String subConElectricStr = daily.getElectricitySub();
+        String subConNgStr = daily.getNgSub();
+        String subConFgFrEuStr = daily.getFuelGasOffgasSub();
+        String subConHhpSteamStr = daily.getHhpSub();
+        String subConMpSteamStr = daily.getMpSub();
+        String subConLpSteamStr = daily.getLpSub();
+        String subConPCondensateStr = daily.getPolishedConSub();
+        String subConCwStr = daily.getCoolingWaterSub();
+        String subConN2Str = daily.getN2Sub();
+        String subConIaPaStr = daily.getPaIaSub();
+        String subConProductionWaterStr = daily.getProdWaterSub();
+        String subConBfwStr = daily.getHpBfwSub();
+        String subConTotalNgFc3702Str = daily.getNgSub();
+        BigDecimal subConElectric = new BigDecimal( subConElectricStr == null ? "0" : subConElectricStr);
+        BigDecimal subConNg = new BigDecimal( subConNgStr == null ? "0" : subConNgStr);
+        BigDecimal subConFgFrEu = new BigDecimal( subConFgFrEuStr == null ? "0" : subConFgFrEuStr);
+        BigDecimal subConHhpSteam = new BigDecimal( subConHhpSteamStr == null ? "0" : subConHhpSteamStr);
+        BigDecimal subConMpSteam = new BigDecimal( subConMpSteamStr == null ? "0" : subConMpSteamStr);
+        BigDecimal subConLpSteam = new BigDecimal( subConLpSteamStr == null ? "0" : subConLpSteamStr);
+        BigDecimal subConPCondensate = new BigDecimal( subConPCondensateStr == null ? "0" : subConPCondensateStr);
+        BigDecimal subConCw = new BigDecimal( subConCwStr == null ? "0" : subConCwStr);
+        BigDecimal subConN2 = new BigDecimal( subConN2Str == null ? "0" : subConN2Str);
+        BigDecimal subConIaPa = new BigDecimal( subConIaPaStr == null ? "0" : subConIaPaStr);
+        BigDecimal subConProductionWater = new BigDecimal( subConProductionWaterStr == null ? "0" : subConProductionWaterStr);
+        BigDecimal subConBfw = new BigDecimal( subConBfwStr == null ? "0" : subConBfwStr);
+        BigDecimal subConTotalNgFc3702 = new BigDecimal( subConTotalNgFc3702Str == null ? "0" : subConTotalNgFc3702Str);
+        monthly.setSubConElectric(subConElectric.toString());
+        monthly.setSubConNg(subConNg.toString());
+        monthly.setSubConFgFrEu(subConFgFrEu.toString());
+        monthly.setSubConHhpSteam(subConHhpSteam.toString());
+        monthly.setSubConMpSteam(subConMpSteam.toString());
+        monthly.setSubConLpSteam(subConLpSteam.toString());
+        monthly.setSubConPCondensate(subConPCondensate.toString());
+        monthly.setSubConCw(subConCw.toString());
+        monthly.setSubConN2(subConN2.toString());
+        monthly.setSubConIaPa(subConIaPa.toString());
+        monthly.setSubConProductionWater(subConProductionWater.toString());
+        monthly.setSubConBfw(subConBfw.toString());
+        monthly.setSubConTotalNgFc3702(subConTotalNgFc3702.toString());
 
-//        String sctfConElectricStr = daily.get();
-//        String sctfConNgStr = daily.get();
-//        String sctfConFgFrEuStr = daily.get();
-//        String sctfConLpgStr = daily.get();
-//        String sctfConHhpSteamStr = daily.get();
-//        String sctfConMpSteamStr = daily.get();
-//        String sctfConLpSteamStr = daily.get();
-//        String sctfConPCondensateStr = daily.get();
-//        String sctfConCwStr = daily.get();
-//        String sctfConN2Str = daily.get();
-//        String sctfConIaPaStr = daily.get();
-//        String sctfConHppaStr = daily.get();
-//        String sctfConProductionWaterStr = daily.get();
-//        String sctfConHpSteamFrSubNetStr = daily.get();
-//        String sctfConBfwStr = daily.get();
-//        String sctfConContaminatedWwStr = daily.get();
-//        String sctfConProductionWwStr = daily.get();
-//        BigDecimal sctfConElectric = new BigDecimal( sctfConElectricStr == null ? "0" : sctfConElectricStr);
-//        BigDecimal sctfConNg = new BigDecimal( sctfConNgStr == null ? "0" : sctfConNgStr);
-//        BigDecimal sctfConFgFrEu = new BigDecimal( sctfConFgFrEuStr == null ? "0" : sctfConFgFrEuStr);
-//        BigDecimal sctfConLpg = new BigDecimal( sctfConLpgStr == null ? "0" : sctfConLpgStr);
-//        BigDecimal sctfConHhpSteam = new BigDecimal( sctfConHhpSteamStr == null ? "0" : sctfConHhpSteamStr);
-//        BigDecimal sctfConMpSteam = new BigDecimal( sctfConMpSteamStr == null ? "0" : sctfConMpSteamStr);
-//        BigDecimal sctfConLpSteam = new BigDecimal( sctfConLpSteamStr == null ? "0" : sctfConLpSteamStr);
-//        BigDecimal sctfConPCondensate = new BigDecimal( sctfConPCondensateStr == null ? "0" : sctfConPCondensateStr);
-//        BigDecimal sctfConCw = new BigDecimal( sctfConCwStr == null ? "0" : sctfConCwStr);
-//        BigDecimal sctfConN2 = new BigDecimal( sctfConN2Str == null ? "0" : sctfConN2Str);
-//        BigDecimal sctfConIaPa = new BigDecimal( sctfConIaPaStr == null ? "0" : sctfConIaPaStr);
-//        BigDecimal sctfConHppa = new BigDecimal( sctfConHppaStr == null ? "0" : sctfConHppaStr);
-//        BigDecimal sctfConProductionWater = new BigDecimal( sctfConProductionWaterStr == null ? "0" : sctfConProductionWaterStr);
-//        BigDecimal sctfConHpSteamFrSubNet = new BigDecimal( sctfConHpSteamFrSubNetStr == null ? "0" : sctfConHpSteamFrSubNetStr);
-//        BigDecimal sctfConBfw = new BigDecimal( sctfConBfwStr == null ? "0" : sctfConBfwStr);
-//        BigDecimal sctfConContaminatedWw = new BigDecimal( sctfConContaminatedWwStr == null ? "0" : sctfConContaminatedWwStr);
-//        BigDecimal sctfConProductionWw = new BigDecimal( sctfConProductionWwStr == null ? "0" : sctfConProductionWwStr);
-//        monthly.setSubConSc(sctfConElectric.toString());
-//        monthly.setSctfConElectric(sctfConNg.toString());
-//        monthly.setSctfConNg(sctfConFgFrEu.toString());
-//        monthly.setSctfConFgFrEu(sctfConLpg.toString());
-//        monthly.setSctfConLpg(sctfConHhpSteam.toString());
-//        monthly.setSctfConHhpSteam(sctfConMpSteam.toString());
-//        monthly.setSctfConMpSteam(sctfConLpSteam.toString());
-//        monthly.setSctfConLpSteam(sctfConPCondensate.toString());
-//        monthly.setSctfConPCondensate(sctfConCw.toString());
-//        monthly.setSctfConCw(sctfConN2.toString());
-//        monthly.setSctfConN2(sctfConIaPa.toString());
-//        monthly.setSctfConIaPa(sctfConHppa.toString());
-//        monthly.setSctfConHppa(sctfConProductionWater.toString());
-//        monthly.setSctfConProductionWater(sctfConHpSteamFrSubNet.toString());
-//        monthly.setSctfConHpSteamFrSubNet(sctfConBfw.toString());
-//        monthly.setSctfConBfw(sctfConContaminatedWw.toString());
-//        monthly.setSctfConContaminatedWw(sctfConProductionWw.toString());
-//
-//        String kbiPcurStr = daily.get();
-//        String kbiEnergyConsumptionStr = daily.get();
-//        String kbiPepcStr = daily.get();
-//        String kbiC2C3ProductionStr = daily.get();
-//        String kbiC2C3TargetStr = daily.get();
-//        String kbiC2C3Target2Str = daily.get();
-//        String kbiC2TargetStr = daily.get();
-//        String kbiC2Target2Str = daily.get();
-//        String kbiLtiStr = daily.get();
-//        String kbiYepbfStr = daily.get();
-//        String kbiYebfStr = daily.get();
-//        String kbiAeuEnergyConsumptionStr = daily.get();
-//        String kbiBtxProductionStr = daily.get();
-//        String kbiBtxTargetStr = daily.get();
-//        String kbiBtxTarget2Str = daily.get();
-//        BigDecimal kbiPcur = new BigDecimal( kbiPcurStr == null ? "0" : kbiPcurStr);
-//        BigDecimal kbiEnergyConsumption = new BigDecimal( kbiEnergyConsumptionStr == null ? "0" : kbiEnergyConsumptionStr);
-//        BigDecimal kbiPepc = new BigDecimal( kbiPepcStr == null ? "0" : kbiPepcStr);
-//        BigDecimal kbiC2C3Production = new BigDecimal( kbiC2C3ProductionStr == null ? "0" : kbiC2C3ProductionStr);
-//        BigDecimal kbiC2C3Target = new BigDecimal( kbiC2C3TargetStr == null ? "0" : kbiC2C3TargetStr);
-//        BigDecimal kbiC2C3Target2 = new BigDecimal( kbiC2C3Target2Str == null ? "0" : kbiC2C3Target2Str);
-//        BigDecimal kbiC2Target = new BigDecimal( kbiC2TargetStr == null ? "0" : kbiC2TargetStr);
-//        BigDecimal kbiC2Target2 = new BigDecimal( kbiC2Target2Str == null ? "0" : kbiC2Target2Str);
-//        BigDecimal kbiLti = new BigDecimal( kbiLtiStr == null ? "0" : kbiLtiStr);
-//        BigDecimal kbiYepbf = new BigDecimal( kbiYepbfStr == null ? "0" : kbiYepbfStr);
-//        BigDecimal kbiYebf = new BigDecimal( kbiYebfStr == null ? "0" : kbiYebfStr);
-//        BigDecimal kbiAeuEnergyConsumption = new BigDecimal( kbiAeuEnergyConsumptionStr == null ? "0" : kbiAeuEnergyConsumptionStr);
-//        BigDecimal kbiBtxProduction = new BigDecimal( kbiBtxProductionStr == null ? "0" : kbiBtxProductionStr);
-//        BigDecimal kbiBtxTarget = new BigDecimal( kbiBtxTargetStr == null ? "0" : kbiBtxTargetStr);
-//        BigDecimal kbiBtxTarget2 = new BigDecimal( kbiBtxTarget2Str == null ? "0" : kbiBtxTarget2Str);
-//        monthly.setKbiPcur(kbiPcur.toString());
-//        monthly.setKbiEnergyConsumption(kbiEnergyConsumption.toString());
-//        monthly.setKbiPepc(kbiPepc.toString());
-//        monthly.setKbiC2C3Production(kbiC2C3Production.toString());
-//        monthly.setKbiC2C3Target(kbiC2C3Target.toString());
-//        monthly.setKbiC2C3Target2(kbiC2C3Target2.toString());
-//        monthly.setKbiC2Target(kbiC2Target.toString());
-//        monthly.setKbiC2Target2(kbiC2Target2.toString());
-//        monthly.setKbiLti(kbiLti.toString());
-//        monthly.setKbiYepbf(kbiYepbf.toString());
-//        monthly.setKbiYebf(kbiYebf.toString());
-//        monthly.setKbiAeuEnergyConsumption(kbiAeuEnergyConsumption.toString());
-//        monthly.setKbiBtxProduction(kbiBtxProduction.toString());
-//        monthly.setKbiBtxTarget(kbiBtxTarget.toString());
-//        monthly.setKbiBtxTarget2(kbiBtxTarget2.toString());
-//
-//        String summaryClYbStr = daily.get();
-//        String summaryClSnyStr = daily.get();
-//        String summaryClC5RaffStr = daily.get();
-//        String summaryClYwStr = daily.get();
-//        String summaryClJqtjStr = daily.get();
-//        String summaryClYxjyStr = daily.get();
-//        String summaryClHhc4Str = daily.get();
-//        String summaryClSbStr = daily.get();
-//        String summaryClLjtwStr = daily.get();
-//        String summaryClLjtjStr = daily.get();
-//        String summaryClCcsnyStr = daily.get();
-//        String summaryClZqzhStr = daily.get();
-//        String summaryClLqsStr = daily.get();
-//        String summaryClDStr = daily.get();
-//        String summaryClRlqStr = daily.get();
-//        String summaryClJzsStr = daily.get();
-//        String summaryClTpnyStr = daily.get();
-//        String summarySlYbStr = daily.get();
-//        String summarySlSnyStr = daily.get();
-//        String summarySlC5RaffStr = daily.get();
-//        String summarySlYwStr = daily.get();
-//        String summarySlJqtjStr = daily.get();
-//        String summarySlYxjyStr = daily.get();
-//        String summarySlHhc4Str = daily.get();
-//        String summarySlSbStr = daily.get();
-//        String summarySlLjtwStr = daily.get();
-//        String summarySlLjtjStr = daily.get();
-//        String summarySlCcsnyStr = daily.get();
-//        String summarySlZqzhStr = daily.get();
-//        String summarySlLqsStr = daily.get();
-//        String summarySlDStr = daily.get();
-//        String summarySlRlqStr = daily.get();
-//        String summarySlJzsStr = daily.get();
-//        String summarySlTpnyStr = daily.get();
-//        BigDecimal summaryClYb = new BigDecimal( summaryClYbStr == null ? "0" : summaryClYbStr);
-//        BigDecimal summaryClSny = new BigDecimal( summaryClSnyStr == null ? "0" : summaryClSnyStr);
-//        BigDecimal summaryClC5Raff = new BigDecimal( summaryClC5RaffStr == null ? "0" : summaryClC5RaffStr);
-//        BigDecimal summaryClYw = new BigDecimal( summaryClYwStr == null ? "0" : summaryClYwStr);
-//        BigDecimal summaryClJqtj = new BigDecimal( summaryClJqtjStr == null ? "0" : summaryClJqtjStr);
-//        BigDecimal summaryClYxjy = new BigDecimal( summaryClYxjyStr == null ? "0" : summaryClYxjyStr);
-//        BigDecimal summaryClHhc4 = new BigDecimal( summaryClHhc4Str == null ? "0" : summaryClHhc4Str);
-//        BigDecimal summaryClSb = new BigDecimal( summaryClSbStr == null ? "0" : summaryClSbStr);
-//        BigDecimal summaryClLjtw = new BigDecimal( summaryClLjtwStr == null ? "0" : summaryClLjtwStr);
-//        BigDecimal summaryClLjtj = new BigDecimal( summaryClLjtjStr == null ? "0" : summaryClLjtjStr);
-//        BigDecimal summaryClCcsny = new BigDecimal( summaryClCcsnyStr == null ? "0" : summaryClCcsnyStr);
-//        BigDecimal summaryClZqzh = new BigDecimal( summaryClZqzhStr == null ? "0" : summaryClZqzhStr);
-//        BigDecimal summaryClLqs = new BigDecimal( summaryClLqsStr == null ? "0" : summaryClLqsStr);
-//        BigDecimal summaryClD = new BigDecimal( summaryClDStr == null ? "0" : summaryClDStr);
-//        BigDecimal summaryClRlq = new BigDecimal( summaryClRlqStr == null ? "0" : summaryClRlqStr);
-//        BigDecimal summaryClJzs = new BigDecimal( summaryClJzsStr == null ? "0" : summaryClJzsStr);
-//        BigDecimal summaryClTpny = new BigDecimal( summaryClTpnyStr == null ? "0" : summaryClTpnyStr);
-//        BigDecimal summarySlYb = new BigDecimal( summarySlYbStr == null ? "0" : summarySlYbStr);
-//        BigDecimal summarySlSny = new BigDecimal( summarySlSnyStr == null ? "0" : summarySlSnyStr);
-//        BigDecimal summarySlC5Raff = new BigDecimal( summarySlC5RaffStr == null ? "0" : summarySlC5RaffStr);
-//        BigDecimal summarySlYw = new BigDecimal( summarySlYwStr == null ? "0" : summarySlYwStr);
-//        BigDecimal summarySlJqtj = new BigDecimal( summarySlJqtjStr == null ? "0" : summarySlJqtjStr);
-//        BigDecimal summarySlYxjy = new BigDecimal( summarySlYxjyStr == null ? "0" : summarySlYxjyStr);
-//        BigDecimal summarySlHhc4 = new BigDecimal( summarySlHhc4Str == null ? "0" : summarySlHhc4Str);
-//        BigDecimal summarySlSb = new BigDecimal( summarySlSbStr == null ? "0" : summarySlSbStr);
-//        BigDecimal summarySlLjtw = new BigDecimal( summarySlLjtwStr == null ? "0" : summarySlLjtwStr);
-//        BigDecimal summarySlLjtj = new BigDecimal( summarySlLjtjStr == null ? "0" : summarySlLjtjStr);
-//        BigDecimal summarySlCcsny = new BigDecimal( summarySlCcsnyStr == null ? "0" : summarySlCcsnyStr);
-//        BigDecimal summarySlZqzh = new BigDecimal( summarySlZqzhStr == null ? "0" : summarySlZqzhStr);
-//        BigDecimal summarySlLqs = new BigDecimal( summarySlLqsStr == null ? "0" : summarySlLqsStr);
-//        BigDecimal summarySlD = new BigDecimal( summarySlDStr == null ? "0" : summarySlDStr);
-//        BigDecimal summarySlRlq = new BigDecimal( summarySlRlqStr == null ? "0" : summarySlRlqStr);
-//        BigDecimal summarySlJzs = new BigDecimal( summarySlJzsStr == null ? "0" : summarySlJzsStr);
-//        BigDecimal summarySlTpny = new BigDecimal( summarySlTpnyStr == null ? "0" : summarySlTpnyStr);
-//        monthly.setSummaryClYb(summaryClYb.toString());
-//        monthly.setSummaryClSny(summaryClSny.toString());
-//        monthly.setSummaryClC5Raff(summaryClC5Raff.toString());
-//        monthly.setSummaryClYw(summaryClYw.toString());
-//        monthly.setSummaryClJqtj(summaryClJqtj.toString());
-//        monthly.setSummaryClYxjy(summaryClYxjy.toString());
-//        monthly.setSummaryClHhc4(summaryClHhc4.toString());
-//        monthly.setSummaryClSb(summaryClSb.toString());
-//        monthly.setSummaryClLjtw(summaryClLjtw.toString());
-//        monthly.setSummaryClLjtj(summaryClLjtj.toString());
-//        monthly.setSummaryClCcsny(summaryClCcsny.toString());
-//        monthly.setSummaryClZqzh(summaryClZqzh.toString());
-//        monthly.setSummaryClLqs(summaryClLqs.toString());
-//        monthly.setSummaryClD(summaryClD.toString());
-//        monthly.setSummaryClRlq(summaryClRlq.toString());
-//        monthly.setSummaryClJzs(summaryClJzs.toString());
-//        monthly.setSummaryClTpny(summaryClTpny.toString());
-//        monthly.setSummarySlYb(summarySlYb.toString());
-//        monthly.setSummarySlSny(summarySlSny.toString());
-//        monthly.setSummarySlC5Raff(summarySlC5Raff.toString());
-//        monthly.setSummarySlYw(summarySlYw.toString());
-//        monthly.setSummarySlJqtj(summarySlJqtj.toString());
-//        monthly.setSummarySlYxjy(summarySlYxjy.toString());
-//        monthly.setSummarySlHhc4(summarySlHhc4.toString());
-//        monthly.setSummarySlSb(summarySlSb.toString());
-//        monthly.setSummarySlLjtw(summarySlLjtw.toString());
-//        monthly.setSummarySlLjtj(summarySlLjtj.toString());
-//        monthly.setSummarySlCcsny(summarySlCcsny.toString());
-//        monthly.setSummarySlZqzh(summarySlZqzh.toString());
-//        monthly.setSummarySlLqs(summarySlLqs.toString());
-//        monthly.setSummarySlD(summarySlD.toString());
-//        monthly.setSummarySlRlq(summarySlRlq.toString());
-//        monthly.setSummarySlJzs(summarySlJzs.toString());
-//        monthly.setSummarySlTpny(summarySlTpny.toString());
+        BigDecimal kbiPepc = (ethylenProduced.add(propyleneProduced).add(c4LpgProduced)).multiply(crackerRawFeed);
+        BigDecimal kbiC2C3Production = ethylenProduced.add(propyleneProduced);
+        BigDecimal kbiYepbf = new BigDecimal("0");
+        if (crackerRawFeed.compareTo(BigDecimal.ZERO) != 0) {
+            kbiYepbf = (ethylenProduced
+                    .subtract(c2FrLdpe.multiply(new BigDecimal("0.9")))
+                    .add(propyleneProduced)
+                    .subtract(c3FrOxo.multiply(new BigDecimal("0.68"))))
+                    .multiply(hundred).divide(crackerRawFeed, 2, RoundingMode.HALF_UP);
+        }
+        BigDecimal kbiYebf = new BigDecimal("0");
+        if (crackerRawFeed.compareTo(BigDecimal.ZERO) != 0) {
+            kbiYebf = (ethylenProduced
+                    .subtract(c2FrLdpe.multiply(new BigDecimal("0.9"))))
+                    .multiply(hundred).divide(crackerRawFeed, 2, RoundingMode.HALF_UP);
+        }
+        monthly.setKbiPepc(kbiPepc.toString());
+        monthly.setKbiC2C3Production(kbiC2C3Production.toString());
+        monthly.setKbiYepbf(kbiYepbf.toString());
+        monthly.setKbiYebf(kbiYebf.toString());
+        monthly.setKbiBtxProduction(pguBtxProduced.toString());
+
+        BigDecimal summaryClYb = ethylenProduced.add(propyleneProduced);
+        BigDecimal summaryClYxjy = new BigDecimal("0").subtract(eboProduced);
+        BigDecimal summaryClHhc4 = new BigDecimal("0").subtract(c4LpgProduced);
+        BigDecimal summaryClSb = toluene.subtract(aeuBenzeneProduced).subtract(aeuTolueneProduced).subtract(aeuXyleneProduced);
+        BigDecimal summaryClZqzh = shpCracker.add(hpCracker).add(mpCracker).add(lpCracker)
+                .add(shpPguAeu).add(hpPguAeu).add(mpPguAeu).add(lpPguAeu)
+                .add(sctuConsumptionMp).add(sctuConsumptionLp);
+        BigDecimal summaryClLqs = (coolingWaterCracker.add(coolingWaterPguAeu).add(sctuConsumptionCw))
+                .multiply(new BigDecimal("1000"));
+        BigDecimal summaryClD = (electricityCracker.add(electricityPguAeu).add(sctuConsumptionElectirc))
+                .multiply(new BigDecimal("1000"));
+        monthly.setSummaryClYb(summaryClYb.toString());
+        monthly.setSummaryClSny(nap.toString());
+        monthly.setSummaryClC5Raff(c5.toString());
+        monthly.setSummaryClYw(wisonEthane.toString());
+        monthly.setSummaryClJqtj(hyC9.toString());
+        monthly.setSummaryClYxjy(summaryClYxjy.toString());
+        monthly.setSummaryClHhc4(summaryClHhc4.toString());
+        monthly.setSummaryClSb(summaryClSb.toString());
+        monthly.setSummaryClLjtw(pguC5Produced.toString());
+        monthly.setSummaryClLjtj(pguC9Produced.toString());
+        monthly.setSummaryClCcsny(aeuC6C8NaProduced.toString());
+        monthly.setSummaryClZqzh(summaryClZqzh.toString());
+        monthly.setSummaryClLqs(summaryClLqs.toString());
+        monthly.setSummaryClD(summaryClD.toString());
+        monthly.setSummaryClRlq(fuelGasOffgasCracker.toString());
+        monthly.setSummaryClJzs(polishedConCracker.toString());
+        monthly.setSummaryClTpny(turbineConCracker.toString());
+        BigDecimal summarySlYb = ethyleneYield.add(propyleneProduced);
+        BigDecimal summarySlSny = new BigDecimal("0");
+        BigDecimal summarySlC5Raff = new BigDecimal("0");
+        BigDecimal summarySlYw = new BigDecimal("0");
+        BigDecimal summarySlJqtj = new BigDecimal("0");
+        BigDecimal summarySlYxjy = new BigDecimal("0");
+        BigDecimal summarySlHhc4 = new BigDecimal("0");
+        BigDecimal summarySlSb = new BigDecimal("0");
+        BigDecimal summarySlLjtw = new BigDecimal("0");
+        BigDecimal summarySlLjtj = new BigDecimal("0");
+        BigDecimal summarySlCcsny = new BigDecimal("0");
+        BigDecimal summarySlZqzh = new BigDecimal("0");
+        BigDecimal summarySlLqs = new BigDecimal("0");
+        BigDecimal summarySlD = new BigDecimal("0");
+        BigDecimal summarySlRlq = new BigDecimal("0");
+        BigDecimal summarySlJzs = new BigDecimal("0");
+        BigDecimal summarySlTpny = new BigDecimal("0");
+        if (summaryClYb.compareTo(BigDecimal.ZERO) != 0) {
+            summarySlSny = nap.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlC5Raff = c5.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlYw = wisonEthane.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlJqtj = hyC9.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlYxjy = summaryClYxjy.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlHhc4 = summaryClHhc4.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlSb = summaryClSb.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlLjtw = pguC5Produced.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlLjtj = pguC9Produced.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlCcsny = aeuC6C8NaProduced.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlZqzh = summaryClZqzh.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlLqs = summaryClLqs.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlD = summaryClD.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlRlq = fuelGasOffgasCracker.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlJzs = polishedConCracker.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+            summarySlTpny = turbineConCracker.multiply(hundred).divide(summaryClYb, 2, RoundingMode.HALF_UP);
+        }
+        monthly.setSummarySlYb(summarySlYb.toString());
+        monthly.setSummarySlSny(summarySlSny.toString());
+        monthly.setSummarySlC5Raff(summarySlC5Raff.toString());
+        monthly.setSummarySlYw(summarySlYw.toString());
+        monthly.setSummarySlJqtj(summarySlJqtj.toString());
+        monthly.setSummarySlYxjy(summarySlYxjy.toString());
+        monthly.setSummarySlHhc4(summarySlHhc4.toString());
+        monthly.setSummarySlSb(summarySlSb.toString());
+        monthly.setSummarySlLjtw(summarySlLjtw.toString());
+        monthly.setSummarySlLjtj(summarySlLjtj.toString());
+        monthly.setSummarySlCcsny(summarySlCcsny.toString());
+        monthly.setSummarySlZqzh(summarySlZqzh.toString());
+        monthly.setSummarySlLqs(summarySlLqs.toString());
+        monthly.setSummarySlD(summarySlD.toString());
+        monthly.setSummarySlRlq(summarySlRlq.toString());
+        monthly.setSummarySlJzs(summarySlJzs.toString());
+        monthly.setSummarySlTpny(summarySlTpny.toString());
 
         // 查询年份=reportYear，月份=reportMonth的月报数据
         int count = tMonthlyProductionReportMapper.selectTMonthlyProductionReportCountByDate(reportYear, reportMonth);

master/src/main/java/com/ruoyi/project/production/service/impl/thread/SyncAfterMonthlyUpdateThread.java

@@ -192,6 +192,10 @@ public class SyncAfterMonthlyUpdateThread extends Thread {
         report.setAeuLoad(aeuLoad.toString());
         report.setBtxCapacity(btxCapacity.toString());
 
+        report.setKbiPcur(crackerLoad.toString());
+        report.setKbiEnergyConsumption(crackerEnergyTeTeo.toString());
+        report.setKbiAeuEnergyConsumption(crackerEnergyEeKgect.toString());
+
         tMonthlyProductionReportMapper.updateTMonthlyProductionReport(report);
 
     }

ui/src/views/production/monthly/index.vue

@@ -1853,8 +1853,7 @@
     </el-table>
     <!-- KBI -->
     <el-table border :data="tableKBI" style="width: 100%;">
-      <el-table-column prop="kbi" label="KBI" width="150"></el-table-column>
-      <el-table-column prop="target" label="target"></el-table-column>
+      <el-table-column prop="title" label="KBI" width="150"></el-table-column>
       <el-table-column prop="currently" label="currently"></el-table-column>
       <el-table-column prop="jan" :label="this.monthList[0]"></el-table-column>
       <el-table-column prop="feb" :label="this.monthList[1]"></el-table-column>
@@ -1873,8 +1872,7 @@
     <!-- Summary -->
     <el-table border :data="tableSummary" style="width: 100%;">
       <el-table-column label="BCC装置主要原材料及公用工程消耗">
-        <el-table-column prop="item" label="项目" width="150"></el-table-column>
-        <el-table-column prop="usage" label="年耗量"></el-table-column>
+        <el-table-column prop="title" label="项目" width="150"></el-table-column>
         <el-table-column prop="currently" label="currently"></el-table-column>
         <el-table-column prop="jan" :label="this.monthList[0]"></el-table-column>
         <el-table-column prop="feb" :label="this.monthList[1]"></el-table-column>
@@ -2437,18 +2435,18 @@ export default {
       getSCTUUtilityConsumption(year).then(response => {
         this.tableSCTUUtilityConsumption = response.data;
       });
-      // getSUBUtilityConsumption(year).then(response => {
-      //   this.tableSUBUtilityConsumption = response.data;
-      // });
-      // getSCTFUtilityConsumption(year).then(response => {
-      //   this.tableSCTFUtilityConsumption = response.data;
-      // });
-      // getKbi(year).then(response => {
-      //   this.tableKBI = response.data;
-      // });
-      // getSummary(year).then(response => {
-      //   this.tableSummary = response.data;
-      // });
+      getSUBUtilityConsumption(year).then(response => {
+        this.tableSUBUtilityConsumption = response.data;
+      });
+      getSCTFUtilityConsumption(year).then(response => {
+        this.tableSCTFUtilityConsumption = response.data;
+      });
+      getKbi(year).then(response => {
+        this.tableKBI = response.data;
+      });
+      getSummary(year).then(response => {
+        this.tableSummary = response.data;
+      });
     },
   }
 }