feat: 新增totalPoints字段用于统计巡视方案的点位数量

inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

@@ -54,18 +54,13 @@ import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.streaming.SXSSFSheet;
 import org.apache.poi.xssf.streaming.SXSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -193,6 +188,9 @@ public class PatrolTaskController extends BaseController {
             patrolTaskStatus.setTaskCode(task.getTaskCode());
             patrolTaskStatus.setTaskState(TaskStatus.RUNNING.getCode());
             List<PatrolTaskStatus> statusList = patrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus);
+            String taskMajorId = task.getTaskCode();
+            int totalPoints = patrolTaskInfoService.countPatrolTaskInfoByMajorId(taskMajorId);
+            task.setTotalPoints(totalPoints);
             if (!statusList.isEmpty()) {
                 task.setFileStatus("1");
             } else {
@@ -424,25 +422,25 @@ public class PatrolTaskController extends BaseController {
         // 生产设备 模糊匹配
         if (StringUtils.isNotEmpty(patrolTaskStatus.getDeviceName())) {
             newList = newList.stream().filter((element) ->
-                element.getDeviceName().contains(patrolTaskStatus.getDeviceName())
+                    element.getDeviceName().contains(patrolTaskStatus.getDeviceName())
             ).collect(Collectors.toList());
         }
         // 点位名称 模糊匹配
         if (StringUtils.isNotEmpty(patrolTaskStatus.getPointName())) {
             newList = newList.stream().filter((element) ->
-                element.getPointName().contains(patrolTaskStatus.getPointName())
+                    element.getPointName().contains(patrolTaskStatus.getPointName())
             ).collect(Collectors.toList());
         }
         // 相机名称 模糊匹配
         if (StringUtils.isNotEmpty(patrolTaskStatus.getChannelName())) {
             newList = newList.stream().filter((element) ->
-                element.getChannelName().contains(patrolTaskStatus.getChannelName())
+                    element.getChannelName().contains(patrolTaskStatus.getChannelName())
             ).collect(Collectors.toList());
         }
         // 来源系统 模糊匹配
         if (StringUtils.isNotEmpty(patrolTaskStatus.getDeviceSource())) {
             newList = newList.stream().filter((element) ->
-                element.getDeviceSource().contains(patrolTaskStatus.getDeviceSource())
+                    element.getDeviceSource().contains(patrolTaskStatus.getDeviceSource())
             ).collect(Collectors.toList());
         }
 
@@ -763,8 +761,8 @@ public class PatrolTaskController extends BaseController {
                     List<Map<String, String>> list = new ArrayList<>();
                     Map<String, Map<String, String>> eqpBooksMap = new HashMap<>();
                     if (eqpBookIds.size() > 0) {
-                         list = patrolTaskInfoService.selectVideoPosByPointIdByEqpbookIds(eqpBookIds);
-                         eqpBooksMap = list.stream().collect(Collectors.toMap(e -> String.valueOf(e.get("eqp_book_id")), e -> e, (e1, e2) -> e2));
+                        list = patrolTaskInfoService.selectVideoPosByPointIdByEqpbookIds(eqpBookIds);
+                        eqpBooksMap = list.stream().collect(Collectors.toMap(e -> String.valueOf(e.get("eqp_book_id")), e -> e, (e1, e2) -> e2));
                     }
                     List<PatrolTaskInfo> patrolTaskInfoListDb = new ArrayList<>();
                     Map<String, PatrolTaskInfo> patrolTaskInfoMap = new HashMap<>();

inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java

@@ -51,4 +51,6 @@ public interface PatrolTaskInfoMapper {
     List<Map<String, Object>> selectPatrolTaskInfoCount(@Param("list") List<String> taskInfoIds);
 
     int deletePatrolTaskInfoByMajorId(Long taskMajorId);
+
+    int countPatrolTaskInfoByMajorId(String taskMajorId);
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java

@@ -43,4 +43,6 @@ public interface IPatrolTaskInfoService {
     List<Map<String, Object>> selectPatrolTaskInfoCount(List<String> taskInfoIds);
 
     int deletePatrolTaskInfoByMajorId(Long majorId);
+
+    int countPatrolTaskInfoByMajorId(String taskMajorId);
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java

@@ -111,4 +111,9 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService {
     public int deletePatrolTaskInfoByMajorId(Long taskMajorId) {
         return this.patrolTaskInfoMapper.deletePatrolTaskInfoByMajorId(taskMajorId);
     }
+
+    @Override
+    public int countPatrolTaskInfoByMajorId(String taskMajorId) {
+        return this.patrolTaskInfoMapper.countPatrolTaskInfoByMajorId(taskMajorId);
+    }
 }

inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml

@@ -195,6 +195,9 @@
         </foreach>
     </select>
 
+    <select id="countPatrolTaskInfoByMajorId" resultType="java.lang.Integer">
+        select count(1) from patrol_task_info where task_major_id = #{taskMajorId}
+    </select>
 
     <insert id="insertPatrolTaskInfo" parameterType="PatrolTaskInfo" useGeneratedKeys="true" keyProperty="lineId">
         insert into patrol_task_info