feat:缺陷汇总接口，相机通道接口

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageInfo;
 import com.inspect.analysis.domain.*;
 import com.inspect.analysis.service.IResultAnalysisService;
+import com.inspect.analysis.service.DefectListAggregator;
 import com.inspect.base.core.constant.AlgConstants;
 import com.inspect.base.core.domain.Response;
 import com.inspect.base.core.enums.PointStatusEnum;
@@ -884,6 +885,30 @@ public class ResultAnalysisController extends BaseController {
         return rspData;
     }
 
+    /**
+     * 缺陷列表查询：同一任务、点位对象和算法聚合为一条记录。
+     */
+    @GetMapping({"/defect/summary"})
+    public TableDataInfo defectSummary(DefectListQuery query) {
+        logger.info("LIST_DEFECT_SUMMARY param: {}", query);
+
+        List<PatrolData> candidates = patrolResultService.selectDefectList(query);
+        logger.info("缺陷汇总原始数据 candidates size：{}",candidates == null ? 0 : candidates.size());
+        List<AlgInfo> algInfos = patrolResultService.selectAlgInfo(new PatrolResult());
+        List<PatrolData> resultList = DefectListAggregator.aggregate(candidates, algInfos);
+        logger.info("缺陷汇总 resultList size：{}",resultList.size());
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        List<PatrolData> pageList = DefectListAggregator.page(
+                resultList, pageDomain.getPageNum(), pageDomain.getPageSize());
+
+        TableDataInfo response = new TableDataInfo();
+        response.setCode(200);
+        response.setRows(pageList);
+        response.setTotal(resultList.size());
+        response.setMsg("查询成功");
+        return response;
+    }
+
     private static class GroupKey {
         private final String objectId;
         private final String algType;

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/DefectListQuery.java

@@ -0,0 +1,52 @@
+package com.inspect.analysis.domain;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.util.List;
+
+/**
+ * 缺陷列表查询条件。
+ */
+@Getter
+@Setter
+@ToString
+public class DefectListQuery {
+    /** 巡视任务执行 ID。 */
+    private String taskPatrolledId;
+    /** 服务层根据主任务展开后的任务执行 ID。 */
+    private List<String> taskPatrolIds;
+    /** 结果来源：0-大模型，1-初筛。 */
+    private String filter;
+    /** 算法类型。 */
+    private String algType;
+    /** 区域 ID。 */
+    private String areaId;
+    /** 主设备 ID。 */
+    private String deviceId;
+    /** 点位 ID。 */
+    private String pointId;
+    /** 任务编码。 */
+    private String taskCode;
+    /** 点位名称。 */
+    private String pointName;
+    /** 任务名称。 */
+    private String taskName;
+    /** 主设备名称。 */
+    private String deviceName;
+    /** 相机/巡检设备名称。 */
+    private String channelName;
+    /** 系统/设备来源。 */
+    private String deviceSource;
+    /** 点位状态。 */
+    private String pointStatus;
+    /** 缺陷描述关键字。 */
+    private String desc;
+    /** 开始日期，格式 yyyy-MM-dd。 */
+    private String beginTime;
+    /** 结束日期，格式 yyyy-MM-dd。 */
+    private String endTime;
+    /** 预置位类型：0-视频，其他-机器人/无人机；未传时按视频处理。 */
+    private String posType = "0";
+}

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/DefectListAggregator.java

@@ -0,0 +1,205 @@
+package com.inspect.analysis.service;
+
+import com.inspect.analysis.domain.AlgValue;
+import com.inspect.base.core.constant.AlgConstants;
+import com.inspect.base.core.utils.StringUtils;
+import com.inspect.partrolresult.domain.AlgInfo;
+import com.inspect.task.domain.PatrolData;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * 将缺陷分析明细按任务、对象和算法聚合为列表展示记录。
+ */
+public final class DefectListAggregator {
+
+    private DefectListAggregator() {
+    }
+
+    public static List<PatrolData> aggregate(List<PatrolData> source, List<AlgInfo> algInfos) {
+        if (source == null || source.isEmpty()) {
+            return new ArrayList<>();
+        }
+
+        Map<String, String> algNameMap = algInfos == null ? Collections.emptyMap() : algInfos.stream()
+                .filter(Objects::nonNull)
+                .filter(item -> StringUtils.isNotEmpty(item.getAlgSubtypeCode()))
+                .collect(Collectors.toMap(AlgInfo::getAlgSubtypeCode, AlgInfo::getAlgSubtypeName,
+                        (first, ignored) -> first));
+
+        Map<GroupKey, List<PatrolData>> groups = new LinkedHashMap<>();
+        for (PatrolData item : source) {
+            if (item == null || !"0".equals(item.getWarnStatus())
+                    || AlgConstants.CORRECTION.equals(item.getAlgType())) {
+                continue;
+            }
+            item.setAlgName(algNameMap.getOrDefault(item.getAlgType(), ""));
+            prepareItem(item);
+            GroupKey key = new GroupKey(item.getTaskPatrolId(), item.getObjectId(), item.getAlgType());
+            groups.computeIfAbsent(key, ignored -> new ArrayList<>()).add(item);
+        }
+
+        List<PatrolData> result = new ArrayList<>();
+        for (Map.Entry<GroupKey, List<PatrolData>> entry : groups.entrySet()) {
+            result.add(merge(entry.getKey(), entry.getValue()));
+        }
+        result.sort(Comparator.comparingInt(item -> statusRank(item.getResStatus())));
+        return result;
+    }
+
+    public static List<PatrolData> page(List<PatrolData> source, Integer pageNum, Integer pageSize) {
+        if (source == null || source.isEmpty()) {
+            return new ArrayList<>();
+        }
+        int safePageNum = pageNum == null || pageNum < 1 ? 1 : pageNum;
+        int safePageSize = pageSize == null || pageSize < 1 ? 10 : pageSize;
+        long from = (long) (safePageNum - 1) * safePageSize;
+        if (from >= source.size()) {
+            return new ArrayList<>();
+        }
+        int fromIndex = (int) from;
+        long to = Math.min((long) source.size(), from + safePageSize);
+        int toIndex = (int) to;
+        return source.subList(fromIndex, toIndex);
+    }
+
+    private static void prepareItem(PatrolData item) {
+        if ("1".equals(item.getFilter()) && StringUtils.isNotEmpty(item.getImageNormalUrlPath())) {
+            item.setImg(item.getImageNormalUrlPath());
+        }
+        if (item.getResValue() != null && "meter".equals(item.getAlgType())) {
+            String value = new AlgValue().formatValue(item.getResValue());
+            if ("-1".equals(value)) {
+                item.setResValue("空值");
+            }
+        }
+    }
+
+    private static PatrolData merge(GroupKey key, List<PatrolData> values) {
+        PatrolData result = new PatrolData();
+        result.setTaskPatrolId(key.taskPatrolId);
+        result.setObjectId(key.objectId);
+        result.setAlgType(key.algType);
+        result.setDesc(joinDistinct(values, PatrolData::getDesc));
+
+        for (PatrolData item : values) {
+            if ("1".equals(item.getFilter())) {
+//                if (StringUtils.isEmpty(result.getImgAnalyse())) {
+//                    result.setImgAnalyse(item.getImgAnalyse());
+//                }
+                if (StringUtils.isEmpty(result.getImg())) {
+                    result.setImg(item.getImg());
+                }
+            }
+            if ("0".equals(item.getFilter())) {
+                if (StringUtils.isNotEmpty(item.getImgAnalyse())) {
+                    result.setImgAnalyse(item.getImgAnalyse());
+                }
+//                if (StringUtils.isNotEmpty(item.getImg())) {
+//                    result.setImg(item.getImg());
+//                }
+            }
+//            if (StringUtils.isEmpty(result.getImg())) {
+//                if (StringUtils.isNotEmpty(item.getImgAnalyse())) {
+//                    result.setImgAnalyse(item.getImgAnalyse());
+//                }
+//                if (StringUtils.isNotEmpty(item.getImg())) {
+//                    result.setImg(item.getImg());
+//                }
+//            }
+        }
+
+        result.setImageNormalUrlPath(firstNonEmpty(values, PatrolData::getImageNormalUrlPath));
+        result.setFilePath(firstNonEmpty(values, PatrolData::getFilePath));
+        result.setAlgName(firstNonEmpty(values, PatrolData::getAlgName));
+        result.setAreaName(firstNonEmpty(values, PatrolData::getAreaName));
+//        result.setBrightDesc(firstNonEmpty(values, PatrolData::getBrightDesc));
+//        result.setBrightImgAnalyse(firstNonEmpty(values, PatrolData::getBrightImgAnalyse));
+//        result.setBrightResStatus(firstNonEmpty(values, PatrolData::getBrightResStatus));
+        result.setChannelName(firstNonEmpty(values, PatrolData::getChannelName));
+        result.setDataType(firstNonEmpty(values, PatrolData::getDataType));
+        result.setDeviceName(firstNonEmpty(values, PatrolData::getDeviceName));
+        result.setDeviceSource(firstNonEmpty(values, PatrolData::getDeviceSource));
+        result.setImgType(firstNonEmpty(values, PatrolData::getImgType));
+        result.setLineId(joinDistinct(values, PatrolData::getLineId));
+        result.setPatrolTime(firstNonEmpty(values, PatrolData::getPatrolTime));
+        result.setPointId(firstNonEmpty(values, PatrolData::getPointId));
+        result.setPointName(firstNonEmpty(values, PatrolData::getPointName));
+        result.setPointStatus(firstNonEmpty(values, PatrolData::getPointStatus));
+        result.setRequestId(firstNonEmpty(values, PatrolData::getRequestId));
+        result.setResValue(firstNonEmpty(values, PatrolData::getResValue));
+        result.setResStatus(firstNonEmpty(values, PatrolData::getResStatus));
+        result.setSuggestion(firstNonEmpty(values, PatrolData::getSuggestion));
+        result.setWarnStatus("0");
+        return result;
+    }
+
+    private static String firstNonEmpty(List<PatrolData> values, Function<PatrolData, String> getter) {
+        return values.stream().map(getter).filter(StringUtils::isNotEmpty).findFirst().orElse("");
+    }
+
+    private static String joinDistinct(List<PatrolData> values, Function<PatrolData, String> getter) {
+        Set<String> distinct = new LinkedHashSet<>();
+        for (PatrolData value : values) {
+            String item = getter.apply(value);
+            if (StringUtils.isNotEmpty(item)) {
+                distinct.add(item);
+            }
+        }
+        return String.join(",", distinct);
+    }
+
+    private static int statusRank(String status) {
+        if ("1".equals(status)) {
+            return 1;
+        }
+        if ("3".equals(status)) {
+            return 2;
+        }
+        if ("2".equals(status)) {
+            return 3;
+        }
+        return 10;
+    }
+
+    private static final class GroupKey {
+        private final String taskPatrolId;
+        private final String objectId;
+        private final String algType;
+
+        private GroupKey(String taskPatrolId, String objectId, String algType) {
+            this.taskPatrolId = taskPatrolId;
+            this.objectId = objectId;
+            this.algType = algType;
+        }
+
+        @Override
+        public boolean equals(Object other) {
+            if (this == other) {
+                return true;
+            }
+            if (!(other instanceof GroupKey)) {
+                return false;
+            }
+            GroupKey that = (GroupKey) other;
+            return Objects.equals(taskPatrolId, that.taskPatrolId)
+                    && Objects.equals(objectId, that.objectId)
+                    && Objects.equals(algType, that.algType);
+        }
+
+        @Override
+        public int hashCode() {
+            return Objects.hash(taskPatrolId, objectId, algType);
+        }
+    }
+}

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java

@@ -1,6 +1,7 @@
 package com.inspect.partrolresult.mapper;
 
 import com.inspect.analysis.domain.ResultAnalysis;
+import com.inspect.analysis.domain.DefectListQuery;
 import com.inspect.partrolresult.domain.*;
 import com.inspect.statistics.domain.TaskStatisticsConfig;
 import com.inspect.system.base.openDomain.BasedataEqpBookMoMain;
@@ -34,6 +35,8 @@ public interface PatrolResultMapper {
 
     List<PatrolData> selectPatrolDataResultByTaskCodeV2(ResultAnalysis resultAnalysis);
 
+    List<PatrolData> selectDefectList(DefectListQuery query);
+
     List<PatrolData> selectPatrolDataResultByTaskCodeList(PatrolTaskStatus patrolTaskStatus);
 
     List<BasedataEqpBookMoMain> selectBasedataEqpBookList(BasedataEqpBookMoMain basedataEqpBookMoMain);

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java

@@ -1,6 +1,7 @@
 package com.inspect.partrolresult.service;
 
 import com.inspect.analysis.domain.ResultAnalysis;
+import com.inspect.analysis.domain.DefectListQuery;
 import com.inspect.insreport.domain.InspectionReport;
 import com.inspect.partrolresult.domain.*;
 import com.inspect.resultmain.domain.PatrolTaskResultMain;
@@ -30,6 +31,8 @@ public interface IPatrolResultService {
 
     List<PatrolData> selectPatrolDataResultByTaskCodeV2(ResultAnalysis resultAnalysis);
 
+    List<PatrolData> selectDefectList(DefectListQuery query);
+
     List<PatrolData> selectPatrolDataResultByTaskCodeList(PatrolTaskStatus patrolTaskStatus);
 
     List<BasedataEqpBookMoMain> selectBasedataEqpBookList(BasedataEqpBookMoMain basedataEqpbookMomain);

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.inspect.analysis.domain.AlgValue;
 import com.inspect.analysis.domain.AnalyseResPoint;
+import com.inspect.analysis.domain.DefectListQuery;
 import com.inspect.analysis.domain.ResultAnalysis;
 import com.inspect.analysis.mapper.ResultAnalysisMapper;
 import com.inspect.analysis.utils.ResultAnalysisUtils;
@@ -147,6 +148,11 @@ public class PatrolResultServiceImpl implements IPatrolResultService {
         return this.patrolResultMapper.selectPatrolDataResultByTaskCodeV3(resultAnalysis);
     }
 
+    @Override
+    public List<PatrolData> selectDefectList(DefectListQuery query) {
+        return patrolResultMapper.selectDefectList(query);
+    }
+
     public List<PatrolData> selectPatrolDataResultByTaskCodeList(PatrolTaskStatus patrolTaskStatus) {
         return patrolResultMapper.selectPatrolDataResultByTaskCodeList(patrolTaskStatus);
     }

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

@@ -346,6 +346,116 @@
         </where>
         ORDER BY line_id desc
     </select>
+
+    <select id="selectDefectList" parameterType="com.inspect.analysis.domain.DefectListQuery"
+            resultMap="PatrolDataResult">
+        select
+        b.line_id,
+        a.device_name as point_name,
+        a.device_id as point_id,
+        a.create_time as patrol_time,
+        b.point_status,
+        b.result_type as warn_status,
+        b.description as 'desc',
+        case when b.filter = '0' then a.file_path else b.res_img_url end as img,
+        b.image_normal_url_path,
+        a.file_path,
+        a.file_type as img_type,
+        a.data_type,
+        b.filter,
+        b.request_id,
+        b.res_img_url as img_analysis,
+        b.original_value,
+        b.res_status,
+        d.device_name,
+        e.area_name,
+        d.area_id,
+        b.alg_type,
+        b.objectId,
+        b.suggestion,
+        b.res_value,
+        b.task_patrol_id
+        <choose>
+            <when test="posType != null and posType != '' and posType == '0'.toString">
+                ,g.channel_name,
+                g.device_source
+            </when>
+            <when test="posType != null and posType != '' and posType != '0'.toString">
+                ,h.patrol_device_name as channel_name,
+                h.device_source
+            </when>
+        </choose>
+        from patrol_result a
+        inner join result_analysis b
+            on a.line_id = b.business_id
+            and a.task_patrolled_id = b.task_patrol_id
+            and a.device_id = b.objectId
+        left join basedata_patrolpoint c on a.device_id = c.patrol_point_id
+        left join basedata_device d on c.device_id = d.device_id
+        left join basedata_area e on e.area_id = d.area_id
+        <choose>
+            <when test="posType != null and posType != '' and posType != '0'.toString">
+                left join basedata_patrolpoint_preset f on c.patrol_point_id = f.patrol_point_id
+                left join basedata_eqpbook h on f.eqp_book_id = h.eqp_book_id
+            </when>
+            <otherwise>
+                left join patrol_preset_pos f on c.patrol_point_id = f.patrol_point_id
+                left join basedata_eqpbook_channel g on f.channel_id = g.channel_id
+                left join basedata_eqpbook h on 1 = 0
+            </otherwise>
+        </choose>
+        <where>
+            <choose>
+                <when test="taskPatrolIds != null and !taskPatrolIds.isEmpty()">
+                    and a.task_patrolled_id in
+                    <foreach collection="taskPatrolIds" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                    and b.task_patrol_id in
+                    <foreach collection="taskPatrolIds" item="id" open="(" separator="," close=")">
+                        #{id}
+                    </foreach>
+                </when>
+            </choose>
+            and b.result_type = '0'
+            <if test="filter != null and filter != ''">and b.filter = #{filter}</if>
+            <if test="algType != null and algType != ''">and b.alg_type = #{algType}</if>
+            <if test="areaId != null and areaId != ''">and d.area_id = #{areaId}</if>
+            <if test="deviceId != null and deviceId != ''">and d.device_id = #{deviceId}</if>
+            <if test="pointId != null and pointId != ''">and a.device_id = #{pointId}</if>
+            <if test="taskCode != null and taskCode != ''">and a.task_code = #{taskCode}</if>
+            <if test="pointName != null and pointName != ''">and a.device_name like concat('%', #{pointName}, '%')</if>
+            <if test="taskName != null and taskName != ''">and a.task_name like concat('%', #{taskName}, '%')</if>
+            <if test="deviceName != null and deviceName != ''">and d.device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="channelName != null and channelName != ''">
+                <choose>
+                    <when test="posType != null and posType != '' and posType == '0'.toString">
+                        and g.channel_name like concat('%', #{channelName}, '%')
+                    </when>
+                    <when test="posType != null and posType != '' and posType != '0'.toString">
+                        and h.patrol_device_name like concat('%', #{channelName}, '%')
+                    </when>
+                </choose>
+            </if>
+            <if test="deviceSource != null and deviceSource != ''">
+                <choose>
+                    <when test="posType != null and posType != '' and posType == '0'.toString">
+                        and g.device_source like concat('%', #{deviceSource}, '%')
+                    </when>
+                    <when test="posType != null and posType != '' and posType != '0'.toString">
+                        and h.device_source like concat('%', #{deviceSource}, '%')
+                    </when>
+                </choose>
+            </if>
+            <if test="pointStatus != null and pointStatus != ''">and b.point_status = #{pointStatus}</if>
+            <if test="desc != null and desc != ''">and b.description like concat('%', #{desc}, '%')</if>
+            <if test="beginTime != null and beginTime != ''">and a.create_time &gt;= concat(#{beginTime}, ' 00:00:00')</if>
+            <if test="endTime != null and endTime != ''">and a.create_time &lt;= concat(#{endTime}, ' 23:59:59')</if>
+        </where>
+        order by b.task_patrol_id, b.objectId, b.alg_type,
+        case b.filter when '1' then 1 when '0' then 2 else 3 end,
+        a.create_time, b.line_id
+    </select>
     <resultMap type="com.inspect.system.base.openDomain.BasedataEqpBookMoMain" id="BasedataEqpBookResult">
         <result property="eqpBookId" column="eqp_book_id"/>
         <result property="stationName" column="station_name"/>

inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/domain/BasedataEqpBookChannel.java

@@ -93,6 +93,8 @@ public class BasedataEqpBookChannel extends BaseEntity {
 
     private String areaName;
 
+    private Long areaId;
+
     public String toString() {
         return (new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)).append("channelId", this.getChannelId()).append("channelCode", this.getChannelCode()).append("channelName", this.getChannelName()).append("parentChannelId", this.getParentChannelId()).append("eqpbookId", this.getEqpBookId()).append("channelType", this.getChannelType()).append("onlineState", this.getOnlineState()).append("channelContent", this.getChannelContent()).append("provider", this.getProvider()).append("address", this.getAddress()).append("host", this.getHost()).append("port", this.getPort()).append("createBy", this.getCreateBy()).append("createTime", this.getCreateTime()).append("updateBy", this.getUpdateBy()).append("updateTime", this.getUpdateTime()).append("deleteFlag", this.getDeleteFlag()).append("patroldeviceCode", this.getPatrolDeviceCode()).append("username", this.getUsername()).append("password", this.getPassword()).toString();
     }

inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookChannelMapper.xml

@@ -5,6 +5,10 @@
 <mapper namespace="com.inspect.metadata.eqpbook.mapper.BasedataEqpBookChannelMapper">
 
     <resultMap type="BasedataEqpBookChannel" id="BasedataEqpBookChannelResult">
+        <result property="areaId" column="area_id"/>
+        <result property="areaName" column="area_name"/>
+        <result property="stationName" column="station_name"/>
+        <result property="stationCode" column="station_code"/>
         <result property="channelId" column="channel_id"/>
         <result property="channelCode" column="channel_code"/>
         <result property="upSystemDeviceCode" column="up_system_device_code"/>
@@ -58,6 +62,10 @@
     <select id="selectBasedataEqpBookChannelList" parameterType="BasedataEqpBookChannel"
             resultMap="BasedataEqpBookChannelResult">
         select
+        be.area_id,
+        be.area_name,
+        be.station_name,
+        be.station_code,
         bec.channel_id,
         bec.channel_code,
         bec.up_system_device_code,
@@ -88,12 +96,6 @@
             <if test="channelName != null  and channelName != ''">and bec.channel_name like concat('%', #{channelName},
                 '%')
             </if>
-            <if test="deviceCode != null  and deviceCode != ''">and bec.patrol_device_code like concat('%', #{deviceCode},
-                '%')
-            </if>
-            <if test="deviceName != null  and deviceName != ''">and bec.channel_name like concat('%', #{deviceName},
-                '%')
-            </if>
             <if test="parentChannelId != null  and parentChannelId != ''">and bec.parent_channel_id = #{parentChannelId}
             </if>
             <if test="eqpBookId != null">and bec.eqp_book_id = #{eqpBookId}</if>