|
@@ -31,27 +31,14 @@ public class ProduceReportTask {
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public void generate() {
|
|
|
log.info("开始-计算生产报表");
|
|
|
- produceReportService.generate(LocalDate.now().plusDays(-1));
|
|
|
+ LocalDate now = LocalDate.now().plusDays(-1);
|
|
|
+ // 报表
|
|
|
+ produceReportService.generate(now);
|
|
|
+ // 液位
|
|
|
+ produceReportService.generateYeweiAll(now);
|
|
|
log.info("结束-计算生产报表");
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- /**
|
|
|
- * 生成前一天的液位数据,每天晚上:2点开始
|
|
|
- */
|
|
|
- @Transactional(rollbackFor = Exception.class)
|
|
|
- public void generateYeweiReport() {
|
|
|
- try {
|
|
|
- log.info("开始-计算液位");
|
|
|
- LocalDate now = LocalDate.now().plusDays(-1);
|
|
|
- produceReportService.generateYeweiAll(now);
|
|
|
- log.info("结束-计算液位");
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- log.error("液位定时任务出错");
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
public static void main(String[] args) throws InterruptedException {
|
|
|
/*String[] nos = new String[]{"600032", "100087", "100074", "100083", "100003", "100026", "100075", "100010", "100120", "100065", "100160", "100086", "电", "天然气", "蒸汽"};
|
|
|
String[] names = new String[]{"GS-902", "GS-903", "GS-904", "GS-905", "GS-907", "F-160C", "氢氧化钠", "CM47B", "硫酰氯", "氢氟酸", "液碱", "盐酸", "电", "天然气", "蒸汽"};
|