From 87851e3feaa0a0288099f547dea89098a3e89aae Mon Sep 17 00:00:00 2001 From: yinhuaiwei Date: Tue, 3 Mar 2026 15:00:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9EtotalPoints=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E7=94=A8=E4=BA=8E=E7=BB=9F=E8=AE=A1=E5=B7=A1=E8=A7=86?= =?UTF-8?q?=E6=96=B9=E6=A1=88=E7=9A=84=E7=82=B9=E4=BD=8D=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/controller/PatrolTaskController.java | 22 +++++++++---------- .../taskinfo/mapper/PatrolTaskInfoMapper.java | 2 ++ .../service/IPatrolTaskInfoService.java | 2 ++ .../impl/PatrolTaskInfoServiceImpl.java | 5 +++++ .../mapper/task/PatrolTaskInfoMapper.xml | 3 +++ 5 files changed, 22 insertions(+), 12 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index a88c89f..dd9d3d4 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/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 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> list = new ArrayList<>(); Map> 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 patrolTaskInfoListDb = new ArrayList<>(); Map patrolTaskInfoMap = new HashMap<>(); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java index 4a49588..281682e 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java @@ -51,4 +51,6 @@ public interface PatrolTaskInfoMapper { List> selectPatrolTaskInfoCount(@Param("list") List taskInfoIds); int deletePatrolTaskInfoByMajorId(Long taskMajorId); + + int countPatrolTaskInfoByMajorId(String taskMajorId); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java index 0983b39..72be276 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java @@ -43,4 +43,6 @@ public interface IPatrolTaskInfoService { List> selectPatrolTaskInfoCount(List taskInfoIds); int deletePatrolTaskInfoByMajorId(Long majorId); + + int countPatrolTaskInfoByMajorId(String taskMajorId); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java index 485e488..392d40f 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java +++ b/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); + } } diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml index e90382b..d23bcdb 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskInfoMapper.xml @@ -195,6 +195,9 @@ + insert into patrol_task_info