代码优化

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/TaskController.java

@@ -3,6 +3,8 @@ package com.usky.fire.controller.web;
 
 import com.usky.fire.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -13,7 +15,7 @@ import org.springframework.stereotype.Component;
  */
 @EnableScheduling
 @Component
-public class TaskController {
+public class TaskController implements ApplicationRunner {
     @Autowired
     private MhPostInspectService mhPostInspectService;
 
@@ -42,15 +44,18 @@ public class TaskController {
     private PatrolInspectionPlanService patrolInspectionPlanService;
 
     //    @Scheduled(cron = "0/5 * *  * * ?") // 间隔5秒执行
-//    @Scheduled(cron = "0 0/5 * * * ? ") // 间隔5分钟执行
-//    public void task() {
-//        System.out.println(Thread.currentThread().getName() + "定时任务执行中");
-//        mhPostInspectService.postInspectAnswerRequest();
-//    }
+    //    @Scheduled(cron = "0 0/5 * * * ? ") // 间隔5分钟执行
+    @Override
+    public void run(ApplicationArguments args) throws Exception {
+        // System.out.println(Thread.currentThread().getName() + " 消防报告生成定时任务执行中");
+        // reportIndexResultService.reportIndexResult();
+        //System.out.println(Thread.currentThread().getName() + "大屏定时任务执行中");
+        // bscEnterpriseScreenService.dataSynchro();
+    }
 
     //    @Scheduled(cron = "0 0 * * * ? ")//每小时
-    @Scheduled(cron = "0 0/5 * * * ? ")
-    //@Scheduled(cron = "0 0 1 * * ? ")//每天凌晨1点
+    //@Scheduled(initialDelay = 0, fixedRate = 5 * 60 * 1000)
+    @Scheduled(cron = "0 0 1 * * ? ")// 每天凌晨1点
     public void task1() {
         System.out.println(Thread.currentThread().getName() + "大屏定时任务执行中");
         bscEnterpriseScreenService.dataSynchro();
@@ -70,8 +75,8 @@ public class TaskController {
 //         demInspectListService.demInspectAutoTask();
 //     }
 //
-    //@Scheduled(cron = "0 0 1 1 * ?")//每月1号凌晨1点
-    @Scheduled(cron = "0 0/3 * * * ? ") // 间隔5分钟执行
+    @Scheduled(cron = "0 0 1 1 * ?")// 每月1号凌晨1点
+    //@Scheduled(cron = "0 0/5 * * * ? ") // 间隔5分钟执行
     public void task4() {
         System.out.println(Thread.currentThread().getName() + "消防报告生成定时任务执行中");
         reportIndexResultService.reportIndexResult();

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/PatrolInspectionPlanSiteSonMapper.java

@@ -5,6 +5,9 @@ import com.usky.fire.domain.PatrolInspectionPlanSiteSon;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
+import java.time.LocalDateTime;
+import java.util.Date;
+
 /**
  * <p>
  * Mapper 接口

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BscEnterpriseScreenServiceImpl.java

@@ -23,8 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
+import java.time.*;
 import java.util.*;
 
 /**
@@ -646,7 +647,7 @@ public class BscEnterpriseScreenServiceImpl extends AbstractCrudService<BscEnter
                 long timeStamp = OnlineMethod.getLastPeroid(1, new Date());
                 startTime = format.format(timeStamp);
                 endTime = sameDay;
-            } else if (i == 2) {
+            } else {
                 long timeStamp = OnlineMethod.getLastPeroid(2, new Date());
                 startTime = format.format(timeStamp);
                 endTime = sameDay;
@@ -659,7 +660,7 @@ public class BscEnterpriseScreenServiceImpl extends AbstractCrudService<BscEnter
             } else if (i == 1) {
                 seriesDataList2.add(qualifiedCount);
                 seriesDataList2.add(undetectedCount);
-            } else if (i == 2) {
+            } else {
                 seriesDataList3.add(qualifiedCount);
                 seriesDataList3.add(undetectedCount);
             }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemReportDataServiceImpl.java

@@ -417,9 +417,9 @@ public class DemReportDataServiceImpl extends AbstractCrudService<DemReportDataM
         paragraph24.setSpacingBefore(5f); // 设置段落上空白
         paragraph24.setSpacingAfter(10f); // 设置段落下空白
 
-        Paragraph paragraph25 = new Paragraph("五、具体问题清单", headfont);
-        paragraph25.setAlignment(0); // 设置文字居中 0靠左 1，居中 2，靠右
-        paragraph25.setFirstLineIndent(24); // 设置首行缩进
+        // Paragraph paragraph25 = new Paragraph("五、具体问题清单", headfont);
+        // paragraph25.setAlignment(0); // 设置文字居中 0靠左 1，居中 2，靠右
+        // paragraph25.setFirstLineIndent(24); // 设置首行缩进
 
 // 直线
 //        Paragraph p1 = new Paragraph();
@@ -438,35 +438,35 @@ public class DemReportDataServiceImpl extends AbstractCrudService<DemReportDataM
 //        gotoP.setReference("#top");
 
 // 添加图片
-        Image image = Image.getInstance("https://img-blog.csdn.net/20180801174617455?watermark/2/text/aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl8zNzg0ODcxMA==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70");
-        image.setAlignment(Image.ALIGN_CENTER);
-        image.scalePercent(40); //依照比例缩放
+//         Image image = Image.getInstance("https://img-blog.csdn.net/20180801174617455?watermark/2/text/aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl8zNzg0ODcxMA==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70");
+//         image.setAlignment(Image.ALIGN_CENTER);
+//         image.scalePercent(40); //依照比例缩放
 
 // 表格
-        PdfPTable table = createTable(new float[] { 40, 120, 120, 120, 80, 80 });
-        table.addCell(createCell("美好的一天", headfont, Element.ALIGN_LEFT, 6, false));
-        table.addCell(createCell("早上9:00", keyfont, Element.ALIGN_CENTER));
-        table.addCell(createCell("中午11:00", keyfont, Element.ALIGN_CENTER));
-        table.addCell(createCell("中午13:00", keyfont, Element.ALIGN_CENTER));
-        table.addCell(createCell("下午15:00", keyfont, Element.ALIGN_CENTER));
-        table.addCell(createCell("下午17:00", keyfont, Element.ALIGN_CENTER));
-        table.addCell(createCell("晚上19:00", keyfont, Element.ALIGN_CENTER));
-        Integer totalQuantity = 0;
-        for (int i = 0; i < 5; i++) {
-            table.addCell(createCell("起床", textfont));
-            table.addCell(createCell("吃午饭", textfont));
-            table.addCell(createCell("午休", textfont));
-            table.addCell(createCell("下午茶", textfont));
-            table.addCell(createCell("回家", textfont));
-            table.addCell(createCell("吃晚饭", textfont));
-            totalQuantity++;
-        }
-        table.addCell(createCell("总计", keyfont));
-        table.addCell(createCell("", textfont));
-        table.addCell(createCell("", textfont));
-        table.addCell(createCell("", textfont));
-        table.addCell(createCell(String.valueOf(totalQuantity) + "件事", textfont));
-        table.addCell(createCell("", textfont));
+//         PdfPTable table = createTable(new float[] { 40, 120, 120, 120, 80, 80 });
+//         table.addCell(createCell("美好的一天", headfont, Element.ALIGN_LEFT, 6, false));
+//         table.addCell(createCell("早上9:00", keyfont, Element.ALIGN_CENTER));
+//         table.addCell(createCell("中午11:00", keyfont, Element.ALIGN_CENTER));
+//         table.addCell(createCell("中午13:00", keyfont, Element.ALIGN_CENTER));
+//         table.addCell(createCell("下午15:00", keyfont, Element.ALIGN_CENTER));
+//         table.addCell(createCell("下午17:00", keyfont, Element.ALIGN_CENTER));
+//         table.addCell(createCell("晚上19:00", keyfont, Element.ALIGN_CENTER));
+//         Integer totalQuantity = 0;
+//         for (int i = 0; i < 5; i++) {
+//             table.addCell(createCell("起床", textfont));
+//             table.addCell(createCell("吃午饭", textfont));
+//             table.addCell(createCell("午休", textfont));
+//             table.addCell(createCell("下午茶", textfont));
+//             table.addCell(createCell("回家", textfont));
+//             table.addCell(createCell("吃晚饭", textfont));
+//             totalQuantity++;
+//         }
+//         table.addCell(createCell("总计", keyfont));
+//         table.addCell(createCell("", textfont));
+//         table.addCell(createCell("", textfont));
+//         table.addCell(createCell("", textfont));
+//         table.addCell(createCell(String.valueOf(totalQuantity) + "件事", textfont));
+//         table.addCell(createCell("", textfont));
 
         document.add(paragraph);
         document.add(paragraph1);
@@ -493,7 +493,7 @@ public class DemReportDataServiceImpl extends AbstractCrudService<DemReportDataM
         document.add(paragraph22);
         document.add(paragraph23);
         document.add(paragraph24);
-        document.add(paragraph25);
+        // document.add(paragraph25);
 //        document.add(anchor);
 //        document.add(p2);
 //        document.add(gotoP);

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/ReportIndexResultServiceImpl.java

@@ -1304,9 +1304,9 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
         paragraph24.setSpacingBefore(5f); // 设置段落上空白
         paragraph24.setSpacingAfter(10f); // 设置段落下空白
 
-        Paragraph paragraph25 = new Paragraph("五、具体问题清单", headfont);
-        paragraph25.setAlignment(0); // 设置文字居中 0靠左 1，居中 2，靠右
-        paragraph25.setFirstLineIndent(24); // 设置首行缩进
+        // Paragraph paragraph25 = new Paragraph("五、具体问题清单", headfont);
+        // paragraph25.setAlignment(0); // 设置文字居中 0靠左 1，居中 2，靠右
+        // paragraph25.setFirstLineIndent(24); // 设置首行缩进
 
 // 直线
 //        Paragraph p1 = new Paragraph();
@@ -1325,35 +1325,35 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
 //        gotoP.setReference("#top");
 
 // 添加图片
-        Image image = Image.getInstance("https://img-blog.csdn.net/20180801174617455?watermark/2/text/aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl8zNzg0ODcxMA==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70");
-        image.setAlignment(Image.ALIGN_CENTER);
-        image.scalePercent(40); // 依照比例缩放
+//         Image image = Image.getInstance("https://img-blog.csdn.net/20180801174617455?watermark/2/text/aHR0cHM6Ly9ibG9nLmNzZG4ubmV0L3dlaXhpbl8zNzg0ODcxMA==/font/5a6L5L2T/fontsize/400/fill/I0JBQkFCMA==/dissolve/70");
+//         image.setAlignment(Image.ALIGN_CENTER);
+//         image.scalePercent(40); // 依照比例缩放
 
 // 表格
-        PdfPTable table = createTable(new float[]{40, 120, 120, 120, 80, 80});
-        table.addCell(createCell("美好的一天", headfont, Element.ALIGN_LEFT, 6, false));
-        table.addCell(createCell("早上9:00", keyfont, Element.ALIGN_CENTER));
-        table.addCell(createCell("中午11:00", keyfont, Element.ALIGN_CENTER));
-        table.addCell(createCell("中午13:00", keyfont, Element.ALIGN_CENTER));
-        table.addCell(createCell("下午15:00", keyfont, Element.ALIGN_CENTER));
-        table.addCell(createCell("下午17:00", keyfont, Element.ALIGN_CENTER));
-        table.addCell(createCell("晚上19:00", keyfont, Element.ALIGN_CENTER));
-        Integer totalQuantity = 0;
-        for (int i = 0; i < 5; i++) {
-            table.addCell(createCell("起床", textfont));
-            table.addCell(createCell("吃午饭", textfont));
-            table.addCell(createCell("午休", textfont));
-            table.addCell(createCell("下午茶", textfont));
-            table.addCell(createCell("回家", textfont));
-            table.addCell(createCell("吃晚饭", textfont));
-            totalQuantity++;
-        }
-        table.addCell(createCell("总计", keyfont));
-        table.addCell(createCell("", textfont));
-        table.addCell(createCell("", textfont));
-        table.addCell(createCell("", textfont));
-        table.addCell(createCell(String.valueOf(totalQuantity) + "件事", textfont));
-        table.addCell(createCell("", textfont));
+//         PdfPTable table = createTable(new float[]{40, 120, 120, 120, 80, 80});
+//         table.addCell(createCell("美好的一天", headfont, Element.ALIGN_LEFT, 6, false));
+//         table.addCell(createCell("早上9:00", keyfont, Element.ALIGN_CENTER));
+//         table.addCell(createCell("中午11:00", keyfont, Element.ALIGN_CENTER));
+//         table.addCell(createCell("中午13:00", keyfont, Element.ALIGN_CENTER));
+//         table.addCell(createCell("下午15:00", keyfont, Element.ALIGN_CENTER));
+//         table.addCell(createCell("下午17:00", keyfont, Element.ALIGN_CENTER));
+//         table.addCell(createCell("晚上19:00", keyfont, Element.ALIGN_CENTER));
+//         Integer totalQuantity = 0;
+//         for (int i = 0; i < 5; i++) {
+//             table.addCell(createCell("起床", textfont));
+//             table.addCell(createCell("吃午饭", textfont));
+//             table.addCell(createCell("午休", textfont));
+//             table.addCell(createCell("下午茶", textfont));
+//             table.addCell(createCell("回家", textfont));
+//             table.addCell(createCell("吃晚饭", textfont));
+//             totalQuantity++;
+//         }
+//         table.addCell(createCell("总计", keyfont));
+//         table.addCell(createCell("", textfont));
+//         table.addCell(createCell("", textfont));
+//         table.addCell(createCell("", textfont));
+//         table.addCell(createCell(String.valueOf(totalQuantity) + "件事", textfont));
+//         table.addCell(createCell("", textfont));
 
         document.add(paragraph);
         document.add(paragraph1);
@@ -1381,12 +1381,12 @@ public class ReportIndexResultServiceImpl extends AbstractCrudService<ReportInde
         document.add(paragraph22);
         document.add(paragraph23);
         document.add(paragraph24);
-        document.add(paragraph25);
+        // document.add(paragraph25);
 //        document.add(anchor);
 //        document.add(p2);
 //        document.add(gotoP);
 //        document.add(p1);
-        document.add(table);
+//         document.add(table);
 //        document.add(image);
     }
 

service-fire/service-fire-biz/src/main/resources/mapper/fire/PatrolInspectionPlanSiteSonMapper.xml

@@ -21,7 +21,8 @@
         <where>
             -- pia.company_id = 1
             pia. ENABLE = 1
-            AND pips.interval_time BETWEEN #{startTime}
+--             AND pips.interval_time BETWEEN #{startTime}
+            AND pips.inspection_date BETWEEN #{startTime}
             AND #{endTime}
             <if test="inspectionStatus != null and inspectionStatus!=0">
                 AND pipss.inspection_status = #{inspectionStatus}