From 534bcf6ad03a8abc99373a8a6f811bebf7910df6 Mon Sep 17 00:00:00 2001 From: wangguangyuan Date: Thu, 16 Apr 2026 10:29:24 +0800 Subject: [PATCH] =?UTF-8?q?feat:1.=E8=81=94=E5=90=88=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=EF=BC=8C2.=E6=96=B0=E5=A2=9E=E7=82=B9?= =?UTF-8?q?=E4=BD=8D=E7=9B=91=E6=8E=A7=E7=BC=96=E5=8F=B7=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E5=A4=84=E7=90=86=EF=BC=8C3.=E9=98=88=E5=80=BC=E7=AE=A1?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PatrolResultServiceImpl.java | 3 +-- .../controller/BasedataEqpBookController.java | 16 +++++++++++----- .../BasedataPatrolPointController.java | 8 +++++++- .../domain/BasedataThresholdModification.java | 4 ++++ .../mapper/eqpbook/BasedataEqpBookMapper.xml | 2 +- .../BasedataThresholdModificationMapper.xml | 15 +++++++-------- 6 files changed, 31 insertions(+), 17 deletions(-) diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java index b4f495b..165084e 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java @@ -544,8 +544,7 @@ public class PatrolResultServiceImpl implements IPatrolResultService { List taskNames = resultList.stream().map(PatrolResult::getTaskName).distinct().collect(Collectors.toList()); String taskName = StringUtils.join(taskNames, ","); - boolean isMultipleTasks = CollectionUtils.isNotEmpty(taskPatrolledIds) && taskPatrolledIds.size() > 1; - // todo 多任务判断有问题 + boolean isMultipleTasks = CollectionUtils.isNotEmpty(lineIds) && lineIds.size() > 1; if (isMultipleTasks) { // 说明多个任务合并，任务名称修改为巡视日期-巡视报告 例如：2026年3月23日-巡视报告 Date date = CollectionUtils.isNotEmpty(startTimes) ? startTimes.get(0) : new Date(); diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java index 99e53c0..0a779b6 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java @@ -52,11 +52,7 @@ import java.io.BufferedReader; import java.io.FileReader; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; @@ -921,6 +917,16 @@ public class BasedataEqpBookController extends BaseController { @GetMapping({"/subtypeUpdateRecord"}) public TableDataInfo subtypeUpdateRecord(BasedataThresholdModification btd) { this.startPage(); + logger.info("查询巡检点位报警阈值修改记录,{}",btd.getAlgSubtypeId()); + if (btd.getAlgSubtypeId() != null) { + String[] subs; + if (btd.getAlgSubtypeId().contains(StringUtils.COMMA)) { + subs = btd.getAlgSubtypeId().split(StringUtils.COMMA); + } else { + subs = new String[]{btd.getAlgSubtypeId()}; + } + btd.setAlgSubtypeIds(Arrays.asList(subs)); + } List list = this.basedataThresholdModificationService.selectBasedataThresholdModificationList(btd); return this.getDataTable(list); } diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java index 5f9dcee..37a16e1 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/controller/BasedataPatrolPointController.java @@ -1,5 +1,6 @@ package com.inspect.metadata.patrolpointmnt.controller; +import cn.hutool.core.util.RandomUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.inspect.base.core.constant.Color; @@ -216,7 +217,12 @@ public class BasedataPatrolPointController extends BaseController { basedataPatrolpoint.setRelationMainDeviceId(basedataPatrolpoint.getMainDeviceId()); basedataPatrolPointService.insertBasedataPatrolPoint(basedataPatrolpoint); - return null != basedataPatrolpoint.getPatrolPointId() ? AjaxResult.success(basedataPatrolpoint.getPatrolPointId()) : AjaxResult.error("新增异常"); + if (basedataPatrolpoint.getPatrolPointId() == null) { + return AjaxResult.error("新增异常"); + } + basedataPatrolpoint.setPatrolPointCode(String.valueOf(basedataPatrolpoint.getPatrolPointId())); + basedataPatrolPointService.updateBasedataPatrolPoint(basedataPatrolpoint); + return AjaxResult.success(basedataPatrolpoint.getPatrolPointId()); } private void combinePatrolPointByStd(BasedataPatrolPoint basedataPatrolpoint) { diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/threshold/domain/BasedataThresholdModification.java b/inspect-metadata/src/main/java/com/inspect/metadata/threshold/domain/BasedataThresholdModification.java index dc19b89..5ab087a 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/threshold/domain/BasedataThresholdModification.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/threshold/domain/BasedataThresholdModification.java @@ -5,6 +5,8 @@ import com.inspect.base.core.web.domain.BaseEntity; import lombok.Getter; import lombok.Setter; +import java.util.List; + @Setter @Getter public class BasedataThresholdModification extends BaseEntity { @@ -26,6 +28,8 @@ public class BasedataThresholdModification extends BaseEntity { name = "算法子类型id" ) private String algSubtypeId; + + private List algSubtypeIds; @Excel( name = "算法子类型名称" ) diff --git a/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml b/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml index 4dc90b2..28be318 100644 --- a/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml +++ b/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml @@ -731,7 +731,7 @@ - + diff --git a/inspect-metadata/src/main/resources/mapper/threshold/BasedataThresholdModificationMapper.xml b/inspect-metadata/src/main/resources/mapper/threshold/BasedataThresholdModificationMapper.xml index abc4732..deae61d 100644 --- a/inspect-metadata/src/main/resources/mapper/threshold/BasedataThresholdModificationMapper.xml +++ b/inspect-metadata/src/main/resources/mapper/threshold/BasedataThresholdModificationMapper.xml @@ -42,21 +42,20 @@ and patrol_point_id = #{patrolPointId} and alg_id = #{algId} and alg_name like concat('%', #{algName}, '%') - - - and alg_subtype_id in - - #{item} - - + + + and alg_subtype_id in + + #{item} + and alg_subtype_name like concat('%', #{algSubtypeName}, '%') and lower_value = #{lowerValue} and upper_value = #{upperValue} - ORDER BY alg_subtype_name,create_time DESC + ORDER BY alg_subtype_name,create_time DESC