:sparkles: 上港/集装箱计算逻辑调整并添加日志

src/main/java/com/shcd/entity/SpStatementSg.java

@@ -70,110 +70,36 @@ public class SpStatementSg implements Serializable {
     @TableField(value = "CREATE_TIME")
     private Date createTime;
 
-    /**
-     * 本月对应的用电次数合计合计值
-     */
-    @TableField(value = "SUM_SHIP_USAGE_NUM")
-    private BigDecimal sumShipUsageNum;
-
-    /**
-     * 当月对应用电次数的同比
-     */
-    @TableField(value = "SUM_SHIP_USAGE_TON")
-    private BigDecimal sumShipUsageTon;
-
-    /**
-     * 本月对应的合计值
-     */
-    @TableField(value = "SUM_CHARGE_TIME")
-    private BigDecimal sumChargeTime;
-
-    /**
-     * 本月对应的用电量合计
-     */
-    @TableField(value = "SUM_ELECT_USE")
-    private BigDecimal sumElectUse;
-
-    /**
-     * 本月对应的用电量合计同比
-     */
-    @TableField(value = "SUM_ELECT_USE_TON")
-    private BigDecimal sumElectUseTon;
+//    /**
+//     * 本月对应的用电次数合计合计值
+//     */
+//    @TableField(value = "SUM_SHIP_USAGE_NUM")
+//    private BigDecimal sumShipUsageNum;
+//
+//    /**
+//     * 当月对应用电次数的同比
+//     */
+//    @TableField(value = "SUM_SHIP_USAGE_TON")
+//    private BigDecimal sumShipUsageTon;
+//
+//    /**
+//     * 本月对应的合计值
+//     */
+//    @TableField(value = "SUM_CHARGE_TIME")
+//    private BigDecimal sumChargeTime;
+//
+//    /**
+//     * 本月对应的用电量合计
+//     */
+//    @TableField(value = "SUM_ELECT_USE")
+//    private BigDecimal sumElectUse;
+//
+//    /**
+//     * 本月对应的用电量合计同比
+//     */
+//    @TableField(value = "SUM_ELECT_USE_TON")
+//    private BigDecimal sumElectUseTon;
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        SpStatementSg other = (SpStatementSg) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getReportDate() == null ? other.getReportDate() == null : this.getReportDate().equals(other.getReportDate()))
-            && (this.getShipUsage() == null ? other.getShipUsage() == null : this.getShipUsage().equals(other.getShipUsage()))
-            && (this.getShipUsageTon() == null ? other.getShipUsageTon() == null : this.getShipUsageTon().equals(other.getShipUsageTon()))
-            && (this.getChargeTime() == null ? other.getChargeTime() == null : this.getChargeTime().equals(other.getChargeTime()))
-            && (this.getChargeTimeTon() == null ? other.getChargeTimeTon() == null : this.getChargeTimeTon().equals(other.getChargeTimeTon()))
-            && (this.getElectUsage() == null ? other.getElectUsage() == null : this.getElectUsage().equals(other.getElectUsage()))
-            && (this.getElectUsageTon() == null ? other.getElectUsageTon() == null : this.getElectUsageTon().equals(other.getElectUsageTon()))
-            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
-            && (this.getSumShipUsageNum() == null ? other.getSumShipUsageNum() == null : this.getSumShipUsageNum().equals(other.getSumShipUsageNum()))
-            && (this.getSumShipUsageTon() == null ? other.getSumShipUsageTon() == null : this.getSumShipUsageTon().equals(other.getSumShipUsageTon()))
-            && (this.getSumChargeTime() == null ? other.getSumChargeTime() == null : this.getSumChargeTime().equals(other.getSumChargeTime()))
-            && (this.getSumElectUse() == null ? other.getSumElectUse() == null : this.getSumElectUse().equals(other.getSumElectUse()))
-            && (this.getSumElectUseTon() == null ? other.getSumElectUseTon() == null : this.getSumElectUseTon().equals(other.getSumElectUseTon()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getReportDate() == null) ? 0 : getReportDate().hashCode());
-        result = prime * result + ((getShipUsage() == null) ? 0 : getShipUsage().hashCode());
-        result = prime * result + ((getShipUsageTon() == null) ? 0 : getShipUsageTon().hashCode());
-        result = prime * result + ((getChargeTime() == null) ? 0 : getChargeTime().hashCode());
-        result = prime * result + ((getChargeTimeTon() == null) ? 0 : getChargeTimeTon().hashCode());
-        result = prime * result + ((getElectUsage() == null) ? 0 : getElectUsage().hashCode());
-        result = prime * result + ((getElectUsageTon() == null) ? 0 : getElectUsageTon().hashCode());
-        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
-        result = prime * result + ((getSumShipUsageNum() == null) ? 0 : getSumShipUsageNum().hashCode());
-        result = prime * result + ((getSumShipUsageTon() == null) ? 0 : getSumShipUsageTon().hashCode());
-        result = prime * result + ((getSumChargeTime() == null) ? 0 : getSumChargeTime().hashCode());
-        result = prime * result + ((getSumElectUse() == null) ? 0 : getSumElectUse().hashCode());
-        result = prime * result + ((getSumElectUseTon() == null) ? 0 : getSumElectUseTon().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", reportDate=").append(reportDate);
-        sb.append(", shipUsage=").append(shipUsage);
-        sb.append(", shipUsageTon=").append(shipUsageTon);
-        sb.append(", chargeTime=").append(chargeTime);
-        sb.append(", chargeTimeTon=").append(chargeTimeTon);
-        sb.append(", electUsage=").append(electUsage);
-        sb.append(", electUsageTon=").append(electUsageTon);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", sumShipUsageNum=").append(sumShipUsageNum);
-        sb.append(", sumShipUsageTon=").append(sumShipUsageTon);
-        sb.append(", sumChargeTime=").append(sumChargeTime);
-        sb.append(", sumElectUse=").append(sumElectUse);
-        sb.append(", sumElectUseTon=").append(sumElectUseTon);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
 }

src/main/java/com/shcd/service/impl/SpStatementShipUsageMonthServiceImpl.java

@@ -17,6 +17,7 @@ import com.shcd.mapper.SpStatementShipUsageMonthMapper;
 import com.shcd.service.SpStatementSgService;
 import com.shcd.service.SpStatementShipUsageMonthService;
 import com.shcd.service.SpStatementYearAnalysisService;
+import com.shcd.utils.PrintLogUtils;
 import com.shcd.vo.ShorePowerDataVo;
 import com.shcd.vo.SpQuarterReportBlVo;
 import com.shcd.vo.SpQuarterReportOriginVo;
@@ -626,101 +627,127 @@ public class SpStatementShipUsageMonthServiceImpl extends
       spStatementSgService.remove(Wrappers.<SpStatementSg>lambdaQuery()
           .eq(SpStatementSg::getReportDate,
               thisYear + "-" + (thisMonth < 10 ? "0" + thisMonth : thisMonth)));
-      SpStatementShipUsageMonthVo underLineSg = spStatementShipUsageMonthMapper.getUnderLineMonthDataSg(
-          toDate);
-      if (underLineSg == null) {
-        underLineSg = new SpStatementShipUsageMonthVo();
-      }
-      //查询去年同期数据
-      SpStatementSg sameTimeLastYear = spStatementSgService.getOne(
-          Wrappers.<SpStatementSg>lambdaQuery().eq(SpStatementSg::getReportDate,
-              thisYear - 1 + "-" + (thisMonth < 10 ? "0" + thisMonth : thisMonth)));
-      //获取去年最后一个月
-      SpStatementSg last = spStatementSgService.getOne(
-          Wrappers.<SpStatementSg>lambdaQuery()
-              .eq(SpStatementSg::getReportDate, thisYear - 1 + "-12"));
-      SpStatementSg spStatementSg = new SpStatementSg();
-      spStatementSg.setId(snowflakeGenerator.next().toString());
-      spStatementSg.setReportDate(DateUtils.dateToString(toDate, "yyyy-MM"));
-      spStatementSg.setShipUsage(underLineSg.getShipUsage().setScale(2, RoundingMode.HALF_UP));
-      spStatementSg.setChargeTime(
-          underLineSg.getShorePowerTime().setScale(2, RoundingMode.HALF_UP));
-      spStatementSg.setElectUsage(
-          underLineSg.getShorePowerCount().setScale(2, RoundingMode.HALF_UP));
-      spStatementSg.setShipUsageTon(
-          underLineSg.getShipUsage().subtract(sameTimeLastYear.getShipUsage())
-              .multiply(BigDecimal.valueOf(100))
-              .divide(sameTimeLastYear.getShipUsage(), 2, RoundingMode.HALF_UP));
-      spStatementSg.setElectUsageTon(
-          underLineSg.getShorePowerCount().subtract(sameTimeLastYear.getElectUsage())
-              .multiply(BigDecimal.valueOf(100))
-              .divide(sameTimeLastYear.getElectUsage(), 2, RoundingMode.HALF_UP));
-      //如果当前是第一月
-      if (toDate.getMonth() + 1 == 1) {
-        //不用查往期合计
-        spStatementSg.setSumChargeTime(
-            underLineSg.getShorePowerTime().setScale(2, RoundingMode.HALF_UP));
-        spStatementSg.setSumShipUsageNum(
-            underLineSg.getShipUsage().setScale(2, RoundingMode.HALF_UP));
-        spStatementSg.setSumElectUse(
-            underLineSg.getShorePowerCount().setScale(2, RoundingMode.HALF_UP));
-        spStatementSg.setSumShipUsageTon(
-            spStatementSg.getSumShipUsageNum().subtract(last.getSumShipUsageNum())
-                .multiply(BigDecimal.valueOf(100))
-                .divide(last.getSumShipUsageNum(), 2, RoundingMode.HALF_UP));
-        spStatementSg.setSumElectUseTon(
-            spStatementSg.getSumElectUse().subtract(last.getSumElectUse())
-                .multiply(BigDecimal.valueOf(100))
-                .divide(last.getSumElectUse(), 2, RoundingMode.HALF_UP));
-      } else {
-        //查询往期合计，计算本月合计
-        SpStatementSg lastMonthSg = spStatementSgService.getOne(
-            Wrappers.<SpStatementSg>lambdaQuery()
-                .eq(SpStatementSg::getReportDate,
-                    thisYear + "-" + (lastMonth < 10 ? "0" + lastMonth : lastMonth)));
-        spStatementSg.setSumChargeTime(
-            underLineSg.getShorePowerTime().add(lastMonthSg.getSumChargeTime())
-                .setScale(2, RoundingMode.HALF_UP));
-        spStatementSg.setSumShipUsageNum(
-            underLineSg.getShipUsage().add(lastMonthSg.getSumShipUsageNum())
-                .setScale(2, RoundingMode.HALF_UP));
-        spStatementSg.setSumElectUse(
-            underLineSg.getShorePowerCount().add(lastMonthSg.getSumElectUse())
-                .setScale(2, RoundingMode.HALF_UP));
-        spStatementSg.setSumShipUsageTon(
-            spStatementSg.getSumShipUsageNum().subtract(last.getSumShipUsageNum())
-                .multiply(BigDecimal.valueOf(100))
-                .divide(last.getSumShipUsageNum(), 2, RoundingMode.HALF_UP));
-        spStatementSg.setSumElectUseTon(
-            spStatementSg.getSumElectUse().subtract(last.getSumElectUse())
-                .multiply(BigDecimal.valueOf(100))
-                .divide(last.getSumElectUse(), 2, RoundingMode.HALF_UP));
+      log.info("开始计算靠泊上港集团码头的集装箱船舶部分报表 ===========");
+      try {
+        executeSg(toDate, thisYear, thisMonth, snowflakeGenerator, lastMonth);
+      } catch (Exception e) {
+        PrintLogUtils.printErrorLogInfo(e);
+        log.info("计算靠泊上港集团码头的集装箱船舶部分报表出错  ==========  原因:{}",
+            e.getMessage());
       }
-      spStatementSgService.save(spStatementSg);
       // 计算靠泊集装箱码头船舶数据
-      List<SpQuarterReportOriginVo> spQuarterReportOriginVos = spStatementShipUsageMonthMapper.selectQuarterOrigin(
-          lastDate, thisDate, lastCycleStart, lastCycleEnd);
-      List<SpQuarterReportBlVo> spQuarterReportBlVos = spStatementShipUsageMonthMapper.selectQuarterBlBerth(
-          lastDate, thisDate);
-      List<SpQuarterReportOriginVo> container = spQuarterReportOriginVos.stream()
-          .filter(i -> i.getBerthType().equals(1)).collect(Collectors.toList());
-      List<SpQuarterReportBlVo> containerBl = spQuarterReportBlVos.stream()
-          .filter(i -> i.getBerthType().equals(1)).collect(Collectors.toList());
-      SpStatementQuarterReport spStatementQuarterReport = new SpStatementQuarterReport();
-      spStatementQuarterReport.setDataType(ShorePowerQuarterDataType.CONTAINER_BERTH.getDataType());
-      spStatementQuarterReport.setId(snowflakeConfig.snowflakeStringId());
-      spStatementQuarterReport.setYear(thisYear);
-      spStatementQuarterReport.setQuarter(
-          (thisMonth % 3 == 0) ? (thisMonth / 3) : (thisMonth / 3 + 1));
-      calculateQuarterReportDetailOriginMonth(spStatementQuarterReport, container);
-      calculateQuarterReportDetailBlMonth(spStatementQuarterReport, containerBl);
-      saveCurrentMonthContainerDataToDB(spStatementQuarterReport,currentDate);
+      log.info("开始计算靠泊集装箱码头船舶数据部分报表 ===========");
+      try {
+        executeContainer(currentDate, lastDate, thisDate, lastCycleStart, lastCycleEnd, thisYear,
+            thisMonth);
+      } catch (Exception e) {
+        PrintLogUtils.printErrorLogInfo(e);
+        log.info("计算靠泊集装箱码头船舶数据部分报表出错  ==========  原因:{}",
+            e.getMessage());
+      }
     } catch (Exception e) {
       e.printStackTrace();
       log.error(e.getMessage());
     }
   }
 
+  private void executeContainer(String currentDate, Date lastDate, Date thisDate,
+      Date lastCycleStart,
+      Date lastCycleEnd, int thisYear, int thisMonth) {
+    List<SpQuarterReportOriginVo> spQuarterReportOriginVos = spStatementShipUsageMonthMapper.selectQuarterOrigin(
+        lastDate, thisDate, lastCycleStart, lastCycleEnd);
+    List<SpQuarterReportBlVo> spQuarterReportBlVos = spStatementShipUsageMonthMapper.selectQuarterBlBerth(
+        lastDate, thisDate);
+    List<SpQuarterReportOriginVo> container = spQuarterReportOriginVos.stream()
+        .filter(i -> i.getBerthType().equals(1)).collect(Collectors.toList());
+    List<SpQuarterReportBlVo> containerBl = spQuarterReportBlVos.stream()
+        .filter(i -> i.getBerthType().equals(1)).collect(Collectors.toList());
+    SpStatementQuarterReport spStatementQuarterReport = new SpStatementQuarterReport();
+    spStatementQuarterReport.setDataType(ShorePowerQuarterDataType.CONTAINER_BERTH.getDataType());
+    spStatementQuarterReport.setId(snowflakeConfig.snowflakeStringId());
+    spStatementQuarterReport.setYear(thisYear);
+    spStatementQuarterReport.setQuarter(
+        (thisMonth % 3 == 0) ? (thisMonth / 3) : (thisMonth / 3 + 1));
+    calculateQuarterReportDetailOriginMonth(spStatementQuarterReport, container);
+    calculateQuarterReportDetailBlMonth(spStatementQuarterReport, containerBl);
+    saveCurrentMonthContainerDataToDB(spStatementQuarterReport, currentDate);
+  }
+
+  private void executeSg(Date toDate, int thisYear, int thisMonth,
+      SnowflakeGenerator snowflakeGenerator, int lastMonth) {
+    SpStatementShipUsageMonthVo underLineSg = spStatementShipUsageMonthMapper.getUnderLineMonthDataSg(
+        toDate);
+    if (underLineSg == null) {
+      underLineSg = new SpStatementShipUsageMonthVo();
+    }
+    //查询去年同期数据
+    SpStatementSg sameTimeLastYear = spStatementSgService.getOne(
+        Wrappers.<SpStatementSg>lambdaQuery().eq(SpStatementSg::getReportDate,
+            thisYear - 1 + "-" + (thisMonth < 10 ? "0" + thisMonth : thisMonth)));
+    //获取去年最后一个月
+    SpStatementSg last = spStatementSgService.getOne(
+        Wrappers.<SpStatementSg>lambdaQuery()
+            .eq(SpStatementSg::getReportDate, thisYear - 1 + "-12"));
+    SpStatementSg spStatementSg = new SpStatementSg();
+    spStatementSg.setId(snowflakeGenerator.next().toString());
+    spStatementSg.setReportDate(DateUtils.dateToString(toDate, "yyyy-MM"));
+    spStatementSg.setShipUsage(underLineSg.getShipUsage().setScale(2, RoundingMode.HALF_UP));
+    spStatementSg.setChargeTime(
+        underLineSg.getShorePowerTime().setScale(2, RoundingMode.HALF_UP));
+    spStatementSg.setElectUsage(
+        underLineSg.getShorePowerCount().setScale(2, RoundingMode.HALF_UP));
+    spStatementSg.setShipUsageTon(
+        underLineSg.getShipUsage().subtract(sameTimeLastYear.getShipUsage())
+            .multiply(BigDecimal.valueOf(100))
+            .divide(sameTimeLastYear.getShipUsage(), 2, RoundingMode.HALF_UP));
+    spStatementSg.setElectUsageTon(
+        underLineSg.getShorePowerCount().subtract(sameTimeLastYear.getElectUsage())
+            .multiply(BigDecimal.valueOf(100))
+            .divide(sameTimeLastYear.getElectUsage(), 2, RoundingMode.HALF_UP));
+    //如果当前是第一月
+    if (toDate.getMonth() + 1 == 1) {
+      //不用查往期合计
+//      spStatementSg.setSumChargeTime(
+//          underLineSg.getShorePowerTime().setScale(2, RoundingMode.HALF_UP));
+//      spStatementSg.setSumShipUsageNum(
+//          underLineSg.getShipUsage().setScale(2, RoundingMode.HALF_UP));
+//      spStatementSg.setSumElectUse(
+//          underLineSg.getShorePowerCount().setScale(2, RoundingMode.HALF_UP));
+//      spStatementSg.setSumShipUsageTon(
+//          spStatementSg.getSumShipUsageNum().subtract(last.getSumShipUsageNum())
+//              .multiply(BigDecimal.valueOf(100))
+//              .divide(last.getSumShipUsageNum(), 2, RoundingMode.HALF_UP));
+//      spStatementSg.setSumElectUseTon(
+//          spStatementSg.getSumElectUse().subtract(last.getSumElectUse())
+//              .multiply(BigDecimal.valueOf(100))
+//              .divide(last.getSumElectUse(), 2, RoundingMode.HALF_UP));
+    } else {
+      //查询往期合计，计算本月合计
+      SpStatementSg lastMonthSg = spStatementSgService.getOne(
+          Wrappers.<SpStatementSg>lambdaQuery()
+              .eq(SpStatementSg::getReportDate,
+                  thisYear + "-" + (lastMonth < 10 ? "0" + lastMonth : lastMonth)));
+//      spStatementSg.setSumChargeTime(
+//          underLineSg.getShorePowerTime().add(lastMonthSg.getSumChargeTime())
+//              .setScale(2, RoundingMode.HALF_UP));
+//      spStatementSg.setSumShipUsageNum(
+//          underLineSg.getShipUsage().add(lastMonthSg.getSumShipUsageNum())
+//              .setScale(2, RoundingMode.HALF_UP));
+//      spStatementSg.setSumElectUse(
+//          underLineSg.getShorePowerCount().add(lastMonthSg.getSumElectUse())
+//              .setScale(2, RoundingMode.HALF_UP));
+//      spStatementSg.setSumShipUsageTon(
+//          spStatementSg.getSumShipUsageNum().subtract(last.getSumShipUsageNum())
+//              .multiply(BigDecimal.valueOf(100))
+//              .divide(last.getSumShipUsageNum(), 2, RoundingMode.HALF_UP));
+//      spStatementSg.setSumElectUseTon(
+//          spStatementSg.getSumElectUse().subtract(last.getSumElectUse())
+//              .multiply(BigDecimal.valueOf(100))
+//              .divide(last.getSumElectUse(), 2, RoundingMode.HALF_UP));
+    }
+    spStatementSgService.save(spStatementSg);
+  }
+
 
   private void saveCurrentMonthContainerDataToDB(SpStatementQuarterReport spStatementQuarterReport,
       String currentDate) {

src/main/java/com/shcd/utils/PrintLogUtils.java

@@ -0,0 +1,50 @@
+package com.shcd.utils;
+
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @ClassName: PrintLogUtils
+ * @description: TODO
+ * @author: sbj
+ * @time: 2023/3/8 14:41
+ * @Version: 1.0
+ */
+@Slf4j
+public class PrintLogUtils {
+
+    /**
+     * @methodName: printErrorLogInfo
+     * @description: TODO 将e.printStackTrace异常添加到创建的StringWriter对象中，并打印到日志文件中
+     * @author: sbj
+     * @createTime: 2023/3/8 15:06
+     * @parames:
+     * @return:
+     */
+    public static void printErrorLogInfo(Exception e){
+        StringWriter stringWriter = new StringWriter();
+        PrintWriter printWriter = new PrintWriter(stringWriter);
+        e.printStackTrace(printWriter);
+        log.error(e.getMessage());
+        log.error(stringWriter.toString());
+    }
+
+    /**
+     * @methodName: printErrorLogInfo
+     * @description: TODO 将e.printStackTrace异常添加到创建的StringWriter对象中，并打印到日志文件中
+     *               支持传一个preMsg，用于拼接到e.getMessage()前
+     * @author: sbj
+     * @createTime: 2023/3/8 15:08
+     * @parames:
+     * @return:
+     */
+    public static void printErrorLogInfo(Exception e, String preMsg){
+        StringWriter stringWriter = new StringWriter();
+        PrintWriter printWriter = new PrintWriter(stringWriter);
+        e.printStackTrace(printWriter);
+        log.error(preMsg + e.getMessage());
+        log.error(stringWriter.toString());
+    }
+
+}