1

src/main/java/com/fdkankan/fusion/config/FusionConfig.java

@@ -16,9 +16,6 @@ public class FusionConfig {
     @Value("${fusion.push-jm.url}")
     private String pushJmUrl;
 
-    /**
-     * 推送绘图平面图地址  http://1.119.159.10:58080/ecs/api/panoramicImageService/submitDrawing
-     */
     @Value("${haixin.basePath}")
     private String pushDrawUrl;
 

src/main/java/com/fdkankan/fusion/down/FusionDownService.java

@@ -224,9 +224,11 @@ public class FusionDownService {
         for (FusionNumVo fusionNumVo : fusionNumVos) {
             SceneVo sceneData = fusionNumVo.getSceneData();
             //下载模型
-            repMap.put(sceneData.getCutModelPath(),sceneData.getCutModelPath().replace("/oss/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
-            repMap.put(sceneData.getSceneJsonPath(),sceneData.getSceneJsonPath().replace("/oss/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
-            repMap.put(sceneData.getSurveillancePath(),sceneData.getSurveillancePath().replace("/oss/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
+            if(sceneData.getType() != 3 && StringUtils.isNotBlank(sceneData.getNum())){
+                repMap.put(sceneData.getCutModelPath(),sceneData.getCutModelPath().replace("/oss/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
+                repMap.put(sceneData.getSceneJsonPath(),sceneData.getSceneJsonPath().replace("/oss/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
+                repMap.put(sceneData.getSurveillancePath(),sceneData.getSurveillancePath().replace("/oss/","/swkk/"+sceneData.getNum() +"/wwwroot/"));
+            }
 
             if(StringUtils.isNotBlank(sceneData.getModelGlbUrl())){
                 downModel(sceneData.getModelGlbUrl(),caseOffPath);

src/main/java/com/fdkankan/fusion/entity/CaseEntity.java

@@ -133,6 +133,9 @@ public class CaseEntity implements Serializable {
     @TableField("k_number")
     private String kNumber;
 
+    @TableField("jq_number")
+    private String jqNumber;
+
     @TableField("sys_user_id")
     private Long sysUserId;
 

src/main/java/com/fdkankan/fusion/httpClient/HaixinService.java

@@ -2,9 +2,12 @@ package com.fdkankan.fusion.httpClient;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.config.FusionConfig;
 import com.fdkankan.fusion.httpClient.client.HaixinClient;
 import com.fdkankan.fusion.httpClient.response.HaixinCaseInfo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,10 +18,15 @@ import java.util.HashMap;
 @Slf4j
 public class HaixinService {
     @Autowired
+    FusionConfig fusionConfig;
+    @Autowired
     HaixinClient haixinClient;
 
     public HaixinCaseInfo queryScene(String kno){
         try {
+            if(StringUtils.isBlank(fusionConfig.getPushDrawUrl())){
+                return null;
+            }
             HashMap<String,Object> map = new HashMap<>();
             map.put("investigationNo",kno);
             JSONObject jsonObject = haixinClient.queryScene(map);

src/main/java/com/fdkankan/fusion/httpClient/response/HaixinCaseInfo.java

@@ -10,6 +10,8 @@ public class HaixinCaseInfo {
      * 制图单位：orgName
      * 制图人：investigatorName
      * 案件类别：caseTypeName
+     * caseNo 案件编号
+     * alarmNo 警情编号
      */
     private String orgName;
     private String caseTypeName;
@@ -19,4 +21,6 @@ public class HaixinCaseInfo {
     private String investigatorName;
     private String investigationNo;
     private String caseType;
+    private String caseNo;
+    private String alarmNo;
 }

src/main/java/com/fdkankan/fusion/task/TaskService.java

@@ -5,11 +5,15 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.fusion.common.util.DateUtils;
 import com.fdkankan.fusion.common.util.UploadToOssUtil;
+import com.fdkankan.fusion.config.FusionConfig;
 import com.fdkankan.fusion.entity.*;
+import com.fdkankan.fusion.httpClient.HaixinService;
+import com.fdkankan.fusion.httpClient.response.HaixinCaseInfo;
 import com.fdkankan.fusion.service.*;
 import com.fdkankan.redis.util.RedisUtil;
 import io.netty.util.internal.UnstableApi;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -35,13 +39,15 @@ public class TaskService {
     ICaseSettingsService caseSettingsService;
     @Autowired
     ICaseFusionService caseFusionService;
-
-
+    @Autowired
+    ICaseService caseService;
     @Autowired
     RedisUtil redisUtil;
+
+
     @PostConstruct
     public void cleanRedisKey(){
-        String redisKey = String.format(downProcessKey, "*");
+        String redisKey = String.format("fusion:down:offline:process", "*");
         Set<String>  keys = redisUtil.keys(redisKey);
         if(keys != null && !keys.isEmpty()){
             for (String key : keys) {
@@ -242,4 +248,35 @@ public class TaskService {
             caseFilesTypeIconService.save(caseFilesTypeIcon);
         }
     }
+
+    /**
+     * 定时获取警情编号
+     */
+    @Autowired
+    HaixinService haixinService;
+    @Autowired
+    FusionConfig fusionConfig;
+    @Scheduled(initialDelay = 2000,fixedDelay = 1000 * 60 * 60 *24)
+    public void getJqNumber() {
+        if(StringUtils.isBlank(fusionConfig.getPushDrawUrl())){
+            return;
+        }
+        log.info("调用海鑫接口获取警情编号");
+        LambdaQueryWrapper<CaseEntity> wrapper= new LambdaQueryWrapper<>();
+        wrapper.isNotNull(CaseEntity::getKNumber);
+        wrapper.isNull(CaseEntity::getJqNumber);
+        List<CaseEntity> list = caseService.list(wrapper);
+        if(list == null || list.isEmpty()){
+            return;
+        }
+        for (CaseEntity caseEntity : list) {
+            HaixinCaseInfo haixinCaseInfo = haixinService.queryScene(caseEntity.getKNumber());
+            if(haixinCaseInfo != null && StringUtils.isNotBlank(haixinCaseInfo.getAlarmNo())){
+                LambdaUpdateWrapper<CaseEntity> updateWrapper= new LambdaUpdateWrapper<>();
+                updateWrapper.eq(CaseEntity::getCaseId,caseEntity.getCaseId());
+                updateWrapper.set(CaseEntity::getJqNumber,haixinCaseInfo.getAlarmNo());
+                caseService.update(updateWrapper);
+            }
+        }
+    }
 }