jar包

platform-rest/src/main/java/com/platform/rest/controller/produce/ProduceReportController.java

@@ -58,6 +58,8 @@ public class ProduceReportController {
     @PreAuthorize("@pms.hasPermission('produce-reports-export')")
     public R generate(@RequestBody ProduceReportDTO produceReportDTO) {
         produceReportService.generate(produceReportDTO.getDate());
+        // 液位也重新生成
+        produceReportService.generateYeweiAll(produceReportDTO.getDate());
         return new R("生成中，请稍后查看");
     }
 

platform-rest/src/main/java/com/platform/rest/task/ProduceReportTask.java

@@ -44,21 +44,7 @@ public class ProduceReportTask {
         try {
             log.info("开始-计算液位");
             LocalDate now = LocalDate.now().plusDays(-1);
-            produceReportService.generateYeweiReport(now, "GS-907", SysConfigEnum.PRODUCE_YEWEI_GS907.name());
-            produceReportService.generateYeweiReport(now, "GS-905", SysConfigEnum.PRODUCE_YEWEI_GS905.name());
-            produceReportService.generateYeweiReport(now, "GS-904", SysConfigEnum.PRODUCE_YEWEI_GS904.name());
-            produceReportService.generateYeweiReport(now, "F-160C", SysConfigEnum.PRODUCE_YEWEI_F160C.name());
-            BigDecimal a1 = produceReportService.generateYeweiReport(now, "a1", SysConfigEnum.PRODUCE_YEWEI_A1.name());
-            BigDecimal a2 = produceReportService.generateYeweiReport(now, "a2", SysConfigEnum.PRODUCE_YEWEI_A2.name());
-            BigDecimal a3 = produceReportService.generateYeweiReport(now, "a3", SysConfigEnum.PRODUCE_YEWEI_A3.name());
-            produceReportService.generateYeweiReport(now, "b", SysConfigEnum.PRODUCE_YEWEI_B.name());
-
-            // 计算total总数据((a1+a2)*0.58+a3)/2
-            Map<String, Double> param = new HashMap<>();
-            param.put("a1", a1.doubleValue());
-            param.put("a2", a2.doubleValue());
-            param.put("a3", a3.doubleValue());
-            produceReportService.generateYeweiTotalReport(now, param);
+            produceReportService.generateYeweiAll(now);
             log.info("结束-计算液位");
         } catch (Exception e) {
             e.printStackTrace();

platform-service/src/main/java/com/platform/service/produce/ProduceReportService.java

@@ -56,6 +56,14 @@ public interface ProduceReportService extends IBaseService<ProduceReport, Produc
     void generate(LocalDate date);
 
     void generateDian(LocalDate date, String value);
+
+    /**
+     * 生成全部液位
+     *
+     * @param date 生成日期
+     * @return
+     */
+    void generateYeweiAll(LocalDate date);
     BigDecimal generateYeweiReport(LocalDate date, String no, String configName);
     void generateYeweiTotalReport(LocalDate date, Map<String, Double> param);
     /**

platform-service/src/main/java/com/platform/service/produce/impl/ProduceReportServiceImpl.java

@@ -15,6 +15,7 @@ import com.platform.dao.entity.produce.ProduceData;
 import com.platform.dao.entity.produce.ProduceRecord;
 import com.platform.dao.entity.produce.ProduceReport;
 import com.platform.dao.enums.ProduceRecordTypeEnum;
+import com.platform.dao.enums.SysConfigEnum;
 import com.platform.dao.enums.YesNoEnum;
 import com.platform.dao.mapper.produce.ProduceReportMapper;
 import com.platform.dao.vo.query.produce.ProduceRecordVO;
@@ -520,6 +521,25 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
         this.saveModel(report);
     }
 
+    @Override
+    public void generateYeweiAll(LocalDate date) {
+        generateYeweiReport(date, "GS-907", SysConfigEnum.PRODUCE_YEWEI_GS907.name());
+        generateYeweiReport(date, "GS-905", SysConfigEnum.PRODUCE_YEWEI_GS905.name());
+        generateYeweiReport(date, "GS-904", SysConfigEnum.PRODUCE_YEWEI_GS904.name());
+        generateYeweiReport(date, "F-160C", SysConfigEnum.PRODUCE_YEWEI_F160C.name());
+        BigDecimal a1 = generateYeweiReport(date, "a1", SysConfigEnum.PRODUCE_YEWEI_A1.name());
+        BigDecimal a2 = generateYeweiReport(date, "a2", SysConfigEnum.PRODUCE_YEWEI_A2.name());
+        BigDecimal a3 = generateYeweiReport(date, "a3", SysConfigEnum.PRODUCE_YEWEI_A3.name());
+        generateYeweiReport(date, "b", SysConfigEnum.PRODUCE_YEWEI_B.name());
+
+        // 计算total总数据((a1+a2)*0.58+a3)/2
+        Map<String, Double> param = new HashMap<>();
+        param.put("a1", a1.doubleValue());
+        param.put("a2", a2.doubleValue());
+        param.put("a3", a3.doubleValue());
+        generateYeweiTotalReport(date, param);
+    }
+
     /**
      * 液位：
      * 液位号1,公式1,折算类型1,折算比例1;