Merge branch 'master' of http://git.ht-atia.cn/qinyanlei/inspect

 Conflicts:

	inspect-metadata/src/main/resources/mapper/threshold/BasedataThresholdModificationMapper.xml

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<String> 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();

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<BasedataThresholdModification> list = this.basedataThresholdModificationService.selectBasedataThresholdModificationList(btd);
         return this.getDataTable(list);
     }

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) {

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<String> algSubtypeIds;
     @Excel(
             name = "算法子类型名称"
     )

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

@@ -731,7 +731,7 @@
     </select>
     <resultMap type="BasedataPatrolPoint" id="BasedataPatrolPointResult">
         <result property="patrolPointId" column="patrol_point_id"/>
-        <result property="patrolPointName" column="patrolpoint_name"/>
+        <result property="patrolPointName" column="patrol_point_name"/>
         <result property="parentName" column="parent_name"/>
         <result property="alarmThreshold" column="alarm_threshold"/>
         <result property="algSubtypeIds" column="alg_subtype_ids"/>

inspect-metadata/src/main/resources/mapper/threshold/BasedataThresholdModificationMapper.xml

@@ -42,13 +42,12 @@
             <if test="patrolPointId != null ">and patrol_point_id = #{patrolPointId}</if>
             <if test="algId != null ">and alg_id = #{algId}</if>
             <if test="algName != null  and algName != ''">and alg_name like concat('%', #{algName}, '%')</if>
-            <if test="params != null">
-                <if test="params.algSubtypeId != null and params.algSubtypeId != ''">
-                    and alg_subtype_id in
-                    <foreach item="item" collection="params.algSubtypeId" open="(" separator="," close=")">
-                        #{item}
-                    </foreach>
-                </if>
+
+            <if test="algSubtypeIds != null and algSubtypeIds != ''">
+                and alg_subtype_id in
+                <foreach item="item" collection="algSubtypeIds" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
             </if>
             <if test="algSubtypeName != null  and algSubtypeName != ''">and alg_subtype_name like concat('%',
                 #{algSubtypeName}, '%')