Parcourir la source

王子文 月报SCTU Utility Consumption

wangggziwen il y a 2 ans
Parent
commit
74e5a9b25d

+ 112 - 11
master/src/main/java/com/ruoyi/project/production/domain/TMonthlyProductionReport.java

@@ -18,17 +18,6 @@ public class TMonthlyProductionReport extends BaseEntity
     /** 主键id */
     private Long id;
 
-    @Excel(name = "Cost Fr Ethylene")
-    private String costFrEthylene;
-
-    public String getCostFrEthylene() {
-        return costFrEthylene;
-    }
-
-    public void setCostFrEthylene(String costFrEthylene) {
-        this.costFrEthylene = costFrEthylene;
-    }
-
     /** 所属月份 */
     @Excel(name = "所属月份")
     private Long reportMonth;
@@ -681,6 +670,38 @@ public class TMonthlyProductionReport extends BaseEntity
     @Excel(name = "Chemical Consume PT-3000")
     private String chemicalConsumePt30002;
 
+    /** Cost Fr Ethylene */
+    @Excel(name = "Cost Fr Ethylene")
+    private String costFrEthylene;
+
+    /** SCTU Utility Consumption FG (NG+Offage) */
+    @Excel(name = "SCTU Utility Consumption FG (NG+Offage)")
+    private String sctuConsumptionFg;
+
+    /** SCTU Utility Consumption MP */
+    @Excel(name = "SCTU Utility Consumption MP")
+    private String sctuConsumptionMp;
+
+    /** SCTU Utility Consumption LP */
+    @Excel(name = "SCTU Utility Consumption LP")
+    private String sctuConsumptionLp;
+
+    /** SCTU Utility Consumption Electric */
+    @Excel(name = "SCTU Utility Consumption Electric")
+    private String sctuConsumptionElectirc;
+
+    /** SCTU Utility Consumption CW */
+    @Excel(name = "SCTU Utility Consumption CW")
+    private String sctuConsumptionCw;
+
+    /** SCTU Utility Consumption PA&IA */
+    @Excel(name = "SCTU Utility Consumption PA&IA")
+    private String sctuConsumptionPaIa;
+
+    /** SCTU Utility Consumption SUB */
+    @Excel(name = "SCTU Utility Consumption SUB")
+    private String sctuConsumptionSub;
+
     public void setId(Long id)
     {
         this.id = id;
@@ -2157,6 +2178,78 @@ public class TMonthlyProductionReport extends BaseEntity
     {
         return chemicalConsumePt30002;
     }
+    public void setCostFrEthylene(String costFrEthylene)
+    {
+        this.costFrEthylene = costFrEthylene;
+    }
+
+    public String getCostFrEthylene()
+    {
+        return costFrEthylene;
+    }
+    public void setSctuConsumptionFg(String sctuConsumptionFg)
+    {
+        this.sctuConsumptionFg = sctuConsumptionFg;
+    }
+
+    public String getSctuConsumptionFg()
+    {
+        return sctuConsumptionFg;
+    }
+    public void setSctuConsumptionMp(String sctuConsumptionMp)
+    {
+        this.sctuConsumptionMp = sctuConsumptionMp;
+    }
+
+    public String getSctuConsumptionMp()
+    {
+        return sctuConsumptionMp;
+    }
+    public void setSctuConsumptionLp(String sctuConsumptionLp)
+    {
+        this.sctuConsumptionLp = sctuConsumptionLp;
+    }
+
+    public String getSctuConsumptionLp()
+    {
+        return sctuConsumptionLp;
+    }
+    public void setSctuConsumptionElectirc(String sctuConsumptionElectirc)
+    {
+        this.sctuConsumptionElectirc = sctuConsumptionElectirc;
+    }
+
+    public String getSctuConsumptionElectirc()
+    {
+        return sctuConsumptionElectirc;
+    }
+    public void setSctuConsumptionCw(String sctuConsumptionCw)
+    {
+        this.sctuConsumptionCw = sctuConsumptionCw;
+    }
+
+    public String getSctuConsumptionCw()
+    {
+        return sctuConsumptionCw;
+    }
+    public void setSctuConsumptionPaIa(String sctuConsumptionPaIa)
+    {
+        this.sctuConsumptionPaIa = sctuConsumptionPaIa;
+    }
+
+    public String getSctuConsumptionPaIa()
+    {
+        return sctuConsumptionPaIa;
+    }
+    public void setSctuConsumptionSub(String sctuConsumptionSub)
+    {
+        this.sctuConsumptionSub = sctuConsumptionSub;
+    }
+
+    public String getSctuConsumptionSub()
+    {
+        return sctuConsumptionSub;
+    }
 
     @Override
     public String toString() {
@@ -2325,6 +2418,14 @@ public class TMonthlyProductionReport extends BaseEntity
             .append("chemicalConsumeNaoh2", getChemicalConsumeNaoh2())
             .append("chemicalConsumeCh3oh", getChemicalConsumeCh3oh())
             .append("chemicalConsumePt30002", getChemicalConsumePt30002())
+            .append("costFrEthylene", getCostFrEthylene())
+            .append("sctuConsumptionFg", getSctuConsumptionFg())
+            .append("sctuConsumptionMp", getSctuConsumptionMp())
+            .append("sctuConsumptionLp", getSctuConsumptionLp())
+            .append("sctuConsumptionElectirc", getSctuConsumptionElectirc())
+            .append("sctuConsumptionCw", getSctuConsumptionCw())
+            .append("sctuConsumptionPaIa", getSctuConsumptionPaIa())
+            .append("sctuConsumptionSub", getSctuConsumptionSub())
             .toString();
     }
 }

+ 56 - 1
master/src/main/java/com/ruoyi/project/production/service/impl/TMonthlyProductionReportServiceImpl.java

@@ -1607,7 +1607,62 @@ public class TMonthlyProductionReportServiceImpl implements ITMonthlyProductionR
      */
     @Override
     public List<MonthlyProductionReportVO> selectSCTUUtilityConsumptionByYear(Long year) {
-        return  null;
+        // 当前日期
+        Date currentDate = new Date();
+        // 当前年份
+        Long currentYear = Long.parseLong(currentDate.getYear() + 1900 + "");
+        // 当前月份
+        Long currentMonth = Long.parseLong(currentDate.getMonth() + 1 + "");
+        // 从数据库中查出的当前year的月报数据集合,每个元素对应当前year某个月的数据
+        List<TMonthlyProductionReport> tMonthlyProductionReports = tMonthlyProductionReportMapper.selectSCTUUtilityConsumptionByYear(year);
+        // 前端月报数据集合,每个元素对应当前某个指标的title、unit、1~12月的数据以及年度汇总数据
+        List<MonthlyProductionReportVO> monthlyProductionReportVOs = new ArrayList<>();
+        monthlyProductionReportVOs.add(new MonthlyProductionReportVO("sctu_consumption_fg","FG (NG+Offage)","Ton"));
+        monthlyProductionReportVOs.add(new MonthlyProductionReportVO("sctu_consumption_mp","MP","Ton"));
+        monthlyProductionReportVOs.add(new MonthlyProductionReportVO("sctu_consumption_lp","LP","Ton"));
+        monthlyProductionReportVOs.add(new MonthlyProductionReportVO("sctu_consumption_electirc","Electric","MWh"));
+        monthlyProductionReportVOs.add(new MonthlyProductionReportVO("sctu_consumption_cw","CW","KT"));
+        monthlyProductionReportVOs.add(new MonthlyProductionReportVO("sctu_consumption_pa_ia","PA&IA","Km3"));
+        // 遍历从数据库中查出的月报数据集合,结果为0~12条数据不等
+        for (int i = 0; i < tMonthlyProductionReports.size(); i++) {
+            TMonthlyProductionReport tMonthlyProductionReport = tMonthlyProductionReports.get(i);
+            String sctuConsumptionFg = tMonthlyProductionReport.getSctuConsumptionFg();
+            String sctuConsumptionMp = tMonthlyProductionReport.getSctuConsumptionMp();
+            String sctuConsumptionLp = tMonthlyProductionReport.getSctuConsumptionLp();
+            String sctuConsumptionElectirc = tMonthlyProductionReport.getSctuConsumptionElectirc();
+            String sctuConsumptionCw = tMonthlyProductionReport.getSctuConsumptionCw();
+            String sctuConsumptionPaIa = tMonthlyProductionReport.getSctuConsumptionPaIa();
+            Long reportMonth = tMonthlyProductionReport.getReportMonth();   // 当前元素的所属月份
+            Long reportYear = tMonthlyProductionReport.getReportYear();     // 当前元素的所属年份
+            // 前端数据集合的class
+            Class clazz = null;
+            // 当前元素调用的set方法
+            Method method = null;
+            try {
+                clazz = Class.forName("com.ruoyi.project.production.service.impl.vo.MonthlyProductionReportVO");
+                method = this.getSetMethod(reportMonth, clazz);
+                // 按照当前元素的所属月份调取相应set方法
+                method.invoke(monthlyProductionReportVOs.get(0), sctuConsumptionFg);
+                method.invoke(monthlyProductionReportVOs.get(1), sctuConsumptionMp);
+                method.invoke(monthlyProductionReportVOs.get(2), sctuConsumptionLp);
+                method.invoke(monthlyProductionReportVOs.get(3), sctuConsumptionElectirc);
+                method.invoke(monthlyProductionReportVOs.get(4), sctuConsumptionCw);
+                method.invoke(monthlyProductionReportVOs.get(5), sctuConsumptionPaIa);
+                // 当前年份=所属年份,当前月份=所属月份
+                if (currentMonth.equals(reportMonth) && currentYear.equals(reportYear)) {
+                    monthlyProductionReportVOs.get(0).setCurrently(sctuConsumptionFg);
+                    monthlyProductionReportVOs.get(1).setCurrently(sctuConsumptionMp);
+                    monthlyProductionReportVOs.get(2).setCurrently(sctuConsumptionLp);
+                    monthlyProductionReportVOs.get(3).setCurrently(sctuConsumptionElectirc);
+                    monthlyProductionReportVOs.get(4).setCurrently(sctuConsumptionCw);
+                    monthlyProductionReportVOs.get(5).setCurrently(sctuConsumptionPaIa);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        this.calcTotal(monthlyProductionReportVOs);
+        return monthlyProductionReportVOs;
     }
 
     /**

+ 19 - 0
master/src/main/java/com/ruoyi/project/production/service/impl/thread/SyncAfterDailyUpdateThread.java

@@ -436,6 +436,25 @@ public class SyncAfterDailyUpdateThread extends Thread {
         monthly.setAromaticsEnergyEeKgeot(aromaticsEnergyEeKgeot.toString());
         monthly.setAromaticsEnergyEeKgect(aromaticsEnergyEeKgect.toString());
 
+        String sctuConsumptionFgStr = daily.getFuelGasOffgasSctuFlare();
+        String sctuConsumptionMpStr = daily.getMpSctuFlare();
+        String sctuConsumptionLpStr = daily.getLpSctuFlare();
+        String sctuConsumptionElectircStr = daily.getElectricitySctuFlare();
+        String sctuConsumptionCwStr = daily.getCoolingWaterSctuFlare();
+        String sctuConsumptionPaIaStr = daily.getPaIaSctuFlare();
+        BigDecimal sctuConsumptionFg = new BigDecimal( sctuConsumptionFgStr == null ? "0" : sctuConsumptionFgStr);
+        BigDecimal sctuConsumptionMp = new BigDecimal( sctuConsumptionMpStr == null ? "0" : sctuConsumptionMpStr);
+        BigDecimal sctuConsumptionLp = new BigDecimal( sctuConsumptionLpStr == null ? "0" : sctuConsumptionLpStr);
+        BigDecimal sctuConsumptionElectirc = new BigDecimal( sctuConsumptionElectircStr == null ? "0" : sctuConsumptionElectircStr);
+        BigDecimal sctuConsumptionCw = new BigDecimal( sctuConsumptionCwStr == null ? "0" : sctuConsumptionCwStr);
+        BigDecimal sctuConsumptionPaIa = new BigDecimal( sctuConsumptionPaIaStr == null ? "0" : sctuConsumptionPaIaStr);
+        monthly.setSctuConsumptionFg(sctuConsumptionFg.toString());
+        monthly.setSctuConsumptionMp(sctuConsumptionMp.toString());
+        monthly.setSctuConsumptionLp(sctuConsumptionLp.toString());
+        monthly.setSctuConsumptionElectirc(sctuConsumptionElectirc.toString());
+        monthly.setSctuConsumptionCw(sctuConsumptionCw.toString());
+        monthly.setSctuConsumptionPaIa(sctuConsumptionPaIa.toString());
+
         // 查询年份=reportYear,月份=reportMonth的月报数据
         int count = tMonthlyProductionReportMapper.selectTMonthlyProductionReportCountByDate(reportYear, reportMonth);
         if (count == 0) {   // 新增月报数据

+ 7 - 1
master/src/main/resources/mybatis/production/TDailyProductionReportMapper.xml

@@ -693,7 +693,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sum(d.hp_bfw_pgu_aeu) as hpBfwPguAeu,
         sum(d.n2_pgu_aeu) as n2PguAeu,
         sum(d.pa_ia_pgu_aeu) as paIaPguAeu,
-        sum(d.turbine_con_pgu_aeu) as turbineConPguAeu
+        sum(d.turbine_con_pgu_aeu) as turbineConPguAeu,
+        sum(d.fuel_gas_offgas_sctu_flare)as fuelGasOffgasSctuFlare,
+        sum(d.mp_sctu_flare)as mpSctuFlare,
+        sum(d.lp_sctu_flare)as lpSctuFlare,
+        sum(d.electricity_sctu_flare)as electricitySctuFlare,
+        sum(d.cooling_water_sctu_flare)as coolingWaterSctuFlare,
+        sum(d.pa_ia_sctu_flare)as paIaSctuFlare
         from T_DAILY_PRODUCTION_REPORT d
         where extract(year from d.REPORT_DATE) = #{reportYear}
         and extract(month from d.REPORT_DATE) = #{reportMonth}

+ 33 - 1
master/src/main/resources/mybatis/production/TMonthlyProductionReportMapper.xml

@@ -170,6 +170,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="chemicalConsumeCh3oh"     column="chemical_consume_ch3oh"    />
         <result property="chemicalConsumePt30002"   column="chemical_consume_pt30002"    />
         <result property="costFrEthylene"           column="cost_fr_ethylene"    />
+        <result property="sctuConsumptionFg"        column="sctu_consumption_fg"    />
+        <result property="sctuConsumptionMp"        column="sctu_consumption_mp"    />
+        <result property="sctuConsumptionLp"        column="sctu_consumption_lp"    />
+        <result property="sctuConsumptionElectirc"  column="sctu_consumption_electirc"    />
+        <result property="sctuConsumptionCw"        column="sctu_consumption_cw"    />
+        <result property="sctuConsumptionPaIa"      column="sctu_consumption_pa_ia"    />
     </resultMap>
 
     <select id="selectCrackerRawMaterialByYear" parameterType="Long" resultMap="TMonthlyProductionReportResult">
@@ -333,7 +339,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where d.report_year = #{year}
     </select>
 
-    <select id="selectSCTUUtilityConsumptionByYear" parameterType="Long" resultMap="TMonthlyProductionReportResult"></select>
+    <select id="selectSCTUUtilityConsumptionByYear" parameterType="Long" resultMap="TMonthlyProductionReportResult">
+        select
+               d.id, d.report_month, d.report_year,
+               d.sctu_consumption_fg, d.sctu_consumption_mp, d.sctu_consumption_lp, d.sctu_consumption_electirc,
+               d.sctu_consumption_cw, d.sctu_consumption_pa_ia
+        from
+             t_monthly_production_report d
+        where d.report_year = #{year}
+    </select>
 
     <select id="selectSUBUtilityConsumptionByYear" parameterType="Long" resultMap="TMonthlyProductionReportResult"></select>
 
@@ -526,6 +540,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chemicalConsumeCh3oh != null">chemical_consume_ch3oh,</if>
             <if test="chemicalConsumePt30002 != null">chemical_consume_pt30002,</if>
             <if test="costFrEthylene != null">cost_fr_ethylene,</if>
+            <if test="sctuConsumptionFg != null">sctu_consumption_fg,</if>
+            <if test="sctuConsumptionMp != null">sctu_consumption_mp,</if>
+            <if test="sctuConsumptionLp != null">sctu_consumption_lp,</if>
+            <if test="sctuConsumptionElectirc != null">sctu_consumption_electirc,</if>
+            <if test="sctuConsumptionCw != null">sctu_consumption_cw,</if>
+            <if test="sctuConsumptionPaIa != null">sctu_consumption_pa_ia,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -693,6 +713,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chemicalConsumeCh3oh != null">#{chemicalConsumeCh3oh},</if>
             <if test="chemicalConsumePt30002 != null">#{chemicalConsumePt30002},</if>
             <if test="costFrEthylene != null">#{costFrEthylene},</if>
+            <if test="sctuConsumptionFg != null">#{sctuConsumptionFg},</if>
+            <if test="sctuConsumptionMp != null">#{sctuConsumptionMp},</if>
+            <if test="sctuConsumptionLp != null">#{sctuConsumptionLp},</if>
+            <if test="sctuConsumptionElectirc != null">#{sctuConsumptionElectirc},</if>
+            <if test="sctuConsumptionCw != null">#{sctuConsumptionCw},</if>
+            <if test="sctuConsumptionPaIa != null">#{sctuConsumptionPaIa},</if>
         </trim>
     </insert>
 
@@ -861,6 +887,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="chemicalConsumeCh3oh != null">chemical_consume_ch3oh = #{chemicalConsumeCh3oh},</if>
             <if test="chemicalConsumePt30002 != null">chemical_consume_pt30002 = #{chemicalConsumePt30002},</if>
             <if test="costFrEthylene != null">cost_fr_ethylene = #{costFrEthylene},</if>
+            <if test="sctuConsumptionFg != null">sctu_consumption_fg = #{sctuConsumptionFg},</if>
+            <if test="sctuConsumptionMp != null">sctu_consumption_mp = #{sctuConsumptionMp},</if>
+            <if test="sctuConsumptionLp != null">sctu_consumption_lp = #{sctuConsumptionLp},</if>
+            <if test="sctuConsumptionElectirc != null">sctu_consumption_electirc = #{sctuConsumptionElectirc},</if>
+            <if test="sctuConsumptionCw != null">sctu_consumption_cw = #{sctuConsumptionCw},</if>
+            <if test="sctuConsumptionPaIa != null">sctu_consumption_pa_ia = #{sctuConsumptionPaIa},</if>
         </trim>
         where report_month = #{reportMonth} and report_year = #{reportYear}
     </update>

+ 8 - 112
ui/src/views/production/monthly/index.vue

@@ -2018,115 +2018,11 @@ export default {
       tableShoudownHour: [],
       tableOtherside: [],
       tableChemicalConsume: [],
-      tableSCTUUtilityConsumption: [
-        {title: "FG ( NG+Offage)"},
-        {title: "MP"},
-        {title: "LP"},
-        {title: "Electric"},
-        {title: "CW"},
-        {title: "PA&IA"},
-        {title: "SUB"},
-      ],
-      tableSUBUtilityConsumption: [
-        {title: "Electric"},
-        {title: "NG"},
-        {title: "FG fr EU"},
-        {title: "LPG"},
-        {title: "HHP Steam"},
-        {title: "MP Steam"},
-        {title: "LP Steam"},
-        {title: "P. Condensate"},
-        {title: "CW"},
-        {title: "N2"},
-        {title: "IA&PA"},
-        {title: "HPPA"},
-        {title: "Production Water"},
-        {title: "HP Steam fr SuB-net"},
-        {title: "BFW"},
-        {title: "EO/EG purge gas"},
-        {title: "H2 fr Syngas as fule"},
-        {title: "HP product"},
-        {title: "SUB1# FG FIC1302"},
-        {title: "SUB2#FG  FIC2302"},
-        {title: "total NG FC3702"},
-        {title: "COST(output)"},
-        {title: "总费用"},
-        {title: "锅炉净产量"},
-        {title: "产汽"},
-        {title: "输出"},
-      ],
-      tableSCTFUtilityConsumption: [
-        {title: "Electric"},
-        {title: "NG"},
-        {title: "FG fr EU"},
-        {title: "LPG"},
-        {title: "HHP Steam"},
-        {title: "MP Steam"},
-        {title: "LP Steam"},
-        {title: "P. Condensate"},
-        {title: "CW"},
-        {title: "N2"},
-        {title: "IA&PA"},
-        {title: "HPPA"},
-        {title: "Production Water"},
-        {title: "HP Steam fr SuB-net"},
-        {title: "BFW"},
-        {title: "Contaminated WW"},
-        {title: "Production WW"},
-      ],
-      tableKBI: [
-        {kbi: "Plant capacity utilization rate"},
-        {kbi: "Energy Consumption"},
-        {kbi: "Product of Ethylene and Propylene and C4's base FEED"},
-        {kbi: "C2+C3 Production"},
-        {kbi: "C2+C3 target"},
-        {kbi: "C2+C3 target"},
-        {kbi: "C2 target"},
-        {kbi: "C2 target"},
-        {kbi: "LTI"},
-        {kbi: "Yields of Ethylene and propylene base on furnace feeds"},
-        {kbi: "Yields of Ethylene  base on furnace feeds"},
-        {kbi: "AEU Energy Consumption"},
-        {kbi: "BTX Production"},
-        {kbi: "BTX target"},
-        {kbi: "BTX target"},
-      ],
-      tableSummary: [
-        {item: "乙丙产量"},
-        {item: "石脑油"},
-        {item: "C5 raff"},
-        {item: "乙烷"},
-        {item: "加氢碳九"},
-        {item: "乙烯焦油"},
-        {item: "混合C4"},
-        {item: "三苯"},
-        {item: "裂解碳五"},
-        {item: "裂解碳九"},
-        {item: "重整石脑油"},
-        {item: "蒸汽综合"},
-        {item: "冷却水"},
-        {item: "电"},
-        {item: "燃料气"},
-        {item: "精制水"},
-        {item: "透平凝液"},
-        {item: "乙丙收率"},
-        {item: "石脑油"},
-        {item: "C5 raff"},
-        {item: "乙烷"},
-        {item: "加氢碳九"},
-        {item: "乙烯焦油"},
-        {item: "混合C4"},
-        {item: "三苯"},
-        {item: "裂解碳五"},
-        {item: "裂解碳九"},
-        {item: "非芳"},
-        {item: "蒸汽综合"},
-        {item: "冷却水"},
-        {item: "电"},
-        {item: "燃料气"},
-        {item: "精制水"},
-        {item: "透平凝液"},
-      ],
+      tableSCTUUtilityConsumption: [],
+      tableSUBUtilityConsumption: [],
+      tableSCTFUtilityConsumption: [],
+      tableKBI: [],
+      tableSummary: [],
     }
   },
   created() {
@@ -2538,9 +2434,9 @@ export default {
       getChemicalConsume(year).then(response => {
         this.tableChemicalConsume = response.data;
       });
-      // getSCTUUtilityConsumption(year).then(response => {
-      //   this.tableSCTUUtilityConsumption = response.data;
-      // });
+      getSCTUUtilityConsumption(year).then(response => {
+        this.tableSCTUUtilityConsumption = response.data;
+      });
       // getSUBUtilityConsumption(year).then(response => {
       //   this.tableSUBUtilityConsumption = response.data;
       // });