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

@@ -14,6 +14,7 @@ import com.platform.dao.enums.SysConfigEnum;
 import com.platform.dao.vo.query.remote.RemoteOpcVO;
 import com.platform.dao.vo.remote.RemotePositionVO;
 import com.platform.service.big.BigScreenSbInfoService;
+import com.platform.service.produce.ProduceReportService;
 import com.platform.service.remote.RemoteOpcService;
 import com.platform.service.remote.RemotePositionService;
 import lombok.AllArgsConstructor;
@@ -22,6 +23,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 import tk.mybatis.mapper.util.StringUtil;
 
+import javax.annotation.Resource;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.time.LocalDate;
@@ -39,8 +41,8 @@ import java.util.*;
 public class DegreeTask {
 
     private final BigScreenSbInfoService bigScreenSbInfoService;
-
     private final RemoteOpcService remoteOpcService;
+    private final ProduceReportService produceReportService;
 
     /**
      * 每天凌晨1点发送前天的数据
@@ -123,4 +125,18 @@ public class DegreeTask {
     public void generateYe() {
         remoteOpcService.sendToPurchase();
     }
+
+
+    /**
+     * 生成前一天的数据
+     */
+    public void generateReport() {
+        log.info("开始-计算生产报表");
+        LocalDate now = LocalDate.now().plusDays(-1);
+        // 报表
+        produceReportService.generate(now);
+        // 液位
+        produceReportService.generateYeweiAll(now);
+        log.info("结束-计算生产报表");
+    }
 }

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

@@ -28,7 +28,6 @@ public class ProduceReportTask {
     /**
      * 生成前一天的数据
      */
-    @Transactional(rollbackFor = Exception.class)
     public void generate() {
         log.info("开始-计算生产报表");
         LocalDate now = LocalDate.now().plusDays(-1);

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

@@ -245,6 +245,38 @@ public class ProduceReportServiceImpl extends BaseServiceImpl<ProduceReportMappe
             this.modModelByDTOWithNotLogin(model);
         } else if (model.getNo().equals("dl_天然气") || model.getNo().equals("dl_蒸汽")) {
             throw new BusinessException("无需填写");
+        } else if (model.getNo().equals("xiaoshou_0300083") || model.getNo().equals("xiaoshou_lhn")) {
+            LocalDate date = model.getDate();
+            model.setYear(date.getYear());
+            model.setMonth(date.getMonthValue());
+            model.setDay(date.getDayOfMonth());
+            this.modModelByDTOWithNotLogin(model);
+
+            // 月累积销售
+            ProduceReport monthReport = new ProduceReport();
+            monthReport.setNo(model.getNo() + "_month");
+            monthReport.setDate(model.getDate());
+            monthReport.setYear(model.getYear());
+            monthReport.setMonth(model.getMonth());
+            monthReport = super.getModelListByModel(monthReport).get(0);
+            ProduceReportDTO month = new ProduceReportDTO();
+            month.setDataId(model.getDataId());
+            month.setYear(date.getYear());
+            month.setMonth(date.getMonthValue());
+            ProduceReportVO monthVO = this.sumMonthYear(month);
+            monthReport.setValue(monthVO.getTotalValue());
+            this.modModelByDTOWithNotLogin(BeanConverterUtil.copyObjectProperties(monthReport, ProduceReportDTO.class));
+            // 年累积销售
+            ProduceReport yearReport = new ProduceReport();
+            yearReport.setNo(model.getNo() + "_month");
+            yearReport.setDate(model.getDate());
+            yearReport.setYear(model.getYear());
+            yearReport.setMonth(model.getMonth());
+            yearReport = super.getModelListByModel(yearReport).get(0);
+            month.setMonth(null);
+            ProduceReportVO yearVO = this.sumMonthYear(month);
+            yearReport.setValue(yearVO.getTotalValue());
+            this.modModelByDTOWithNotLogin(BeanConverterUtil.copyObjectProperties(yearReport, ProduceReportDTO.class));
         } else {
             LocalDate date = model.getDate();
             model.setYear(date.getYear());