fix:模型同步修改

inspect-main/inspect-main-client/src/main/java/com/inspect/client/controller/ClientController.java

@@ -10,9 +10,12 @@ import com.inspect.task.controller.PatrolTaskController;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import javax.annotation.Resource;
+
+import com.inspect.taskstatus.client.FeignTaskClient;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -30,6 +33,9 @@ public class ClientController {
    @Resource
    PatrolTaskController patrolTaskController;
 
+   @Autowired
+   private FeignTaskClient feignTaskClient;
+
    @PostMapping({"/upData"})
    public AjaxResult upData(String type, String msg) {
       try {
@@ -106,6 +112,31 @@ public class ClientController {
 
    @PostMapping({"/syncModel"})
    public AjaxResult syncModel(@RequestBody String msg) {
+      try {
+         // 和许继，无人机同步点位
+         JSONObject jsonObjectParm = JSONObject.parseObject(msg);
+         logger.info("========syncModel param: {}", jsonObjectParm);
+         if (StringUtils.isEmpty(jsonObjectParm.getString("deviceCode"))) {
+            logger.info("[=>TCPSERVER] 巡视主机下发同步模型命令: 设备编码为空");
+            return AjaxResult.fail(500, "设备编码为空");
+         }
+         JSONObject jsonObject = new JSONObject();
+         jsonObject.put("Type", "61");
+         jsonObject.put("ReceiveCode", jsonObjectParm.getString("deviceCode"));
+         String msgs = jsonObject.toJSONString();
+         AjaxResult ajaxResult = feignTaskClient.sendCommand(msgs);
+         logger.info("[=>TCPSERVER] 巡视主机下发同步模型命令: {}, 结果: {}", msgs, jsonObject);
+         return ajaxResult;
+      } catch (ServiceException e) {
+         logger.error("[=>TCPSERVER] 巡视主机下发同步模型命令服务异常: {}", e.getMessage());
+         throw new ServiceException(e.getMessage());
+      } catch (Exception e) {
+         logger.error("[=>TCPSERVER] 巡视主机下发同步模型命令: {}", e.getMessage());
+         throw new ServiceException("下发数据失败，msg格式不正确");
+      }
+   }
+
+   public AjaxResult syncModelDeprecated(@RequestBody String msg) {
       try {
          JSONObject.parseObject(msg);
          JSONObject jsonObject = clientService.callDeviceCommand(msg);

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

@@ -703,10 +703,10 @@ public class PatrolResultController extends BaseController {
     public String callRemoteAlgorithm(List<PatrolResult> patrolResultList) {
         String result = "";
         PatrolTaskFtp ftp = patrolTaskFtpService.selectPatrolTaskFtpByLineId(2L);
-        String ANALYSIS_URL = patrolTaskService.selectConfigByKey("ANALYSIS_URL");
-        String BIG_ANALYSIS_URL = patrolTaskService.selectConfigByKey("BIG_ANALYSIS_URL");
-        String MAJOR_URL = patrolTaskService.selectConfigByKey("MAJOR_URL");//requestHostIp 分析结果反馈ip地址
-        String TASK_PORT = patrolTaskService.selectConfigByKey("TASK_PORT");//requestHostPort 分析结果反馈端口
+        String ANALYSIS_URL = patrolTaskService.selectConfigByKey("ANALYSIS_URL");// 小模型分析路径
+        String BIG_ANALYSIS_URL = patrolTaskService.selectConfigByKey("BIG_ANALYSIS_URL"); // 初筛分析路径
+        String MAJOR_URL = patrolTaskService.selectConfigByKey("MAJOR_URL");//requestHostIp 分析结果反馈ip地址 巡视主机路径
+        String TASK_PORT = patrolTaskService.selectConfigByKey("TASK_PORT");//requestHostPort 分析结果反馈端口  巡视主机任务端口
 
         logger.info("callRemoteAlgorithm ftpInfo: {}, ANALYSIS_URL: {}, BIG_ANALYSIS_URL: {}, MAJOR_URL: {}, TASK_PORT: {}",
                 ftp, ANALYSIS_URL, BIG_ANALYSIS_URL, MAJOR_URL, TASK_PORT);
@@ -749,6 +749,7 @@ public class PatrolResultController extends BaseController {
             if (patrolResultTemp.getAlgId() != null && !patrolResultTemp.getAlgId().isEmpty()) {
                 algInfoList = patrolResultService.selectAlgInfo(patrolResultTemp);
             }
+            // 点位配置的算法
             logger.info("callRemoteAlgorithm algInfoList: {}", algInfoList);
 
             analyseReqItem.setImageUrlList(image.split(StringUtils.COMMA));
@@ -812,7 +813,7 @@ public class PatrolResultController extends BaseController {
                 List<AlgInfo> judgeList = algInfoList.stream().filter(
                         (item) -> item.getAlgName().contains("判别")
                 ).collect(Collectors.toList());
-
+                // 判别算法
                 if (!judgeList.isEmpty()) {
                     analyseReqItem.setTypeList(judgeList.stream().map(AlgInfo::getAlgSubtypeCode).toArray(String[]::new));
                     String[] images;
@@ -843,6 +844,7 @@ public class PatrolResultController extends BaseController {
                 }
 
                 algInfoList.removeAll(meterList);//将已经加入filterList中的记录删除(算法编码为meter的记录)
+                // 缺陷识别算法
                 List<AlgInfo> defectList = algInfoList.stream().filter((item) -> "缺陷识别".equals(item.getAlgName())).collect(Collectors.toList());
                 if (!defectList.isEmpty()) {
                     analyseReqItem.setTypeList(defectList.stream().map(AlgInfo::getAlgSubtypeCode).toArray(String[]::new));

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

@@ -287,6 +287,8 @@ public class PatrolTaskController extends BaseController {
                     }
                 }
             }
+            item.setFilterDesc(item.getDesc());
+            item.setDesc("");
         }
         newList.addAll(filterList);
         if (StringUtils.isNotEmpty(resultAnalysis.getAlgName())) {

inspect-metadata/src/main/java/com/inspect/metadata/area/mapper/BaseDataAreaMapper.java

@@ -38,4 +38,6 @@ public interface BaseDataAreaMapper {
     BaseDataArea selectBasedataAreaByPatrolPointId(String pointId);
 
     String selectAreaIdByName(@Param("areaName") String areaName, @Param("parentId") String parentId);
+
+    int deleteAreaBySendCode(@Param("sendCode") String sendCode);
 }

inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatrolPointConsumerHandle.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.inspect.base.core.constant.Color;
 import com.inspect.metadata.alg.mapper.BasedataAlgSubtypeMapper;
+import com.inspect.metadata.area.mapper.BaseDataAreaMapper;
 import com.inspect.metadata.bdconfig.domain.BasedataBdConfigMainSystem;
 import com.inspect.metadata.bdconfig.mapper.BasedataBdConfigAlgConvertMapper;
 import com.inspect.metadata.bdconfig.mapper.BasedataBdConfigDeviceConvertMapper;
@@ -12,6 +13,7 @@ import com.inspect.metadata.eqpbook.mapper.BasedataEqpBookMapper;
 import com.inspect.metadata.montdatamqhandle.service.IBasedataMontDataHandleService;
 import com.inspect.metadata.montdatamqhandle.service.component.BasedataMontPatrolPointHandleComponent;
 import com.inspect.metadata.montdatamqhandle.vo.ModelFileItem;
+import com.inspect.metadata.patrolpointmnt.mapper.BasedataPatrolPointMapper;
 import com.inspect.metadata.patrolpointmnt.mapper.BasedataPatrolPointPresetMapper;
 import com.inspect.metadata.patrolpointmnt.mapper.BasedataStdPatrolPointMapper;
 import com.inspect.metadata.patrolpointmnt.service.IBasedataPatrolPointService;
@@ -60,12 +62,21 @@ public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataH
     BasedataMontPatrolPointHandleComponent basedataMontPatrolPointHandleComponent;
     @Autowired
     private SftpClient sftpClient;
+    @Autowired
+    private BaseDataAreaMapper baseDataAreaMapper;
+    @Autowired
+    private BasedataPatrolPointPresetMapper basedataPatrolPointPresetMapper;
+    @Resource
+    private BasedataPatrolPointMapper basedataPatrolpointMapper;
 
     public void handMontData(JSONObject jsonObject) {
         log.info(Color.BLUE + "[METADATA] 模型同步basedataMont-modelup-1024-----------jsonObject-----: {}" + Color.END, jsonObject);
         String Type = jsonObject.getString("Type");
         String convertFlag = "0";
         String SendCode = jsonObject.getString("SendCode");
+        log.info(Color.BLUE + "[METADATA] 模型同步SendCode：{}，旧数据清除Start..." + Color.END, SendCode);
+        this.deletePatrolPointPresetBySendCode(SendCode);
+        log.info(Color.BLUE + "[METADATA] 模型同步SendCode：{}，旧数据清除End..." + Color.END, SendCode);
         BasedataBdConfigMainSystem mainSystem = basedataBdconfigMainsystemMapper.selectBasedataBdConfigMainSystemByMainSystemCode(SendCode);
         if (null != mainSystem) {
             String flag = mainSystem.getConvertFlag();
@@ -111,4 +122,16 @@ public class BasedataMontPatrolPointConsumerHandle implements IBasedataMontDataH
             System.out.println("model file:" + jsonObject.toJSONString());
         }
     }
+
+    private void deletePatrolPointPresetBySendCode(String sendCode) {
+        // basedata_area 区域删除
+        int areaNum = baseDataAreaMapper.deleteAreaBySendCode(sendCode);
+        // basedata_device 删除
+        int deviceNum = basedataDeviceMapper.deleteBySendCode(sendCode);
+        // basedata_patrolpoint_preset  删除
+        int patrolPointPresetNum = basedataPatrolPointPresetMapper.deleteBySendCode(sendCode);
+        // basedata_patrolpoint 删除
+        int patrolPointNum = basedataPatrolpointMapper.deleteBySendCode(sendCode);
+        log.info(Color.BLUE + "[METADATA] 模型同步删除数据：区域{}条，设备{}条，巡检点预设{}条，巡检点{}条" + Color.END, areaNum, deviceNum, patrolPointPresetNum, patrolPointNum);
+    }
 }

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/mapper/BasedataPatrolPointMapper.java

@@ -4,6 +4,7 @@ import com.inspect.metadata.patrolpointmnt.domain.BasedataPatrolPoint;
 import com.inspect.metadata.patrolpointmnt.domain.vo.PointLatestResultVo;
 import com.inspect.metadata.patrolpointmnt.domain.vo.PointStatsVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -32,4 +33,6 @@ public interface BasedataPatrolPointMapper {
     PointStatsVo getInspectPointStats(PointStatsVo pointStatsVo);
 
     List<PointLatestResultVo> pointLatestResult(PointLatestResultVo pointLatestResultVo);
+
+    int deleteBySendCode(@Param("sendCode") String sendCode);
 }

inspect-metadata/src/main/java/com/inspect/metadata/patrolpointmnt/mapper/BasedataPatrolPointPresetMapper.java

@@ -2,6 +2,7 @@ package com.inspect.metadata.patrolpointmnt.mapper;
 
 import com.inspect.metadata.patrolpointmnt.domain.BasedataPatrolPointPreset;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,4 +21,6 @@ public interface BasedataPatrolPointPresetMapper {
     int deleteBasedataPatrolPointPresetByPatrolPointPresetIds(Long[] presetIds);
 
     BasedataPatrolPointPreset selectBasedataPatrolPointPresetByPatrolPointId(Long patrolPointId);
+
+    int deleteBySendCode(@Param("sendCode") String sendCode);
 }

inspect-metadata/src/main/java/com/inspect/metadata/prodevmnt/mapper/BasedataDeviceMapper.java

@@ -42,4 +42,6 @@ public interface BasedataDeviceMapper {
     List checkDeviceNameIsExist(@Param("deviceName") String deviceName, @Param("deviceId") String deviceId);
 
     List<BasedataDevice> selectPatrolPointList(Long[] ids);
+
+    int deleteBySendCode(@Param("sendCode") String sendCode);
 }

inspect-metadata/src/main/resources/mapper/area/BaseDataAreaMapper.xml

@@ -186,7 +186,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		update basedata_area set del_flag = '2' where area_id = #{areaId}
 	</delete>
 
-	<select id="selectBasedataAreaByPatrolPointId" parameterType="String" resultMap="BaseDataAreaResult">
+    <delete id="deleteAreaBySendCode" parameterType="String">
+		delete from basedata_area where area_code = #{sendCode} or old_area_id like concat(#{sendCode}, '%')
+	</delete>
+
+    <select id="selectBasedataAreaByPatrolPointId" parameterType="String" resultMap="BaseDataAreaResult">
 		SELECT
 			c.*
 		FROM

inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointMapper.xml

@@ -316,6 +316,10 @@
         </foreach>
     </delete>
 
+    <delete id="deleteBySendCode">
+        delete from basedata_patrolpoint where patrol_point_code like concat(#{sendCode},'%')
+    </delete>
+
 
     <resultMap type="PointStatsVo" id="PointStatsResult">
         <result property="inspectionPointTotal" column="inspect_point_total"/>

inspect-metadata/src/main/resources/mapper/patrolpointmnt/BasedataPatrolPointPresetMapper.xml

@@ -137,6 +137,10 @@
         </foreach>
     </delete>
 
+    <delete id="deleteBySendCode">
+        delete from basedata_patrolpoint_preset where patrol_point_id in (select patrol_point_id from basedata_patrolpoint where patrol_point_code like concat(#{sendCode}, '%'));
+    </delete>
+
     <select id="selectBasedataPatrolPointPresetByPatrolPointId" parameterType="Long"
             resultMap="BasedataPatrolPointPresetResult">
         <include refid="selectBasedataPatrolPointPresetVo"/>

inspect-metadata/src/main/resources/mapper/prodevmnt/BasedataDeviceMapper.xml

@@ -346,6 +346,10 @@
         </foreach>
     </delete>
 
+    <delete id="deleteBySendCode">
+        delete from basedata_device where old_device_id like concat(#{sendCode},'%')
+    </delete>
+
     <select id="selectBasedataDeviceByPatrolPointId" parameterType="String" resultMap="BasedataDeviceResult">
         SELECT b.*
         FROM basedata_patrolpoint a,