1

src/main/java/com/fdkankan/fusion/controller/CaseFilesTypeController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.service.ICaseFilesTypeService;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -286,8 +286,7 @@ public class CaseDownService {
 
         List<CaseFiles> caseFilesList = caseFilesService.allList(caseId, null);
         for (CaseFiles files : caseFilesList) {
-            String fileUrl = String.format(FilePath.File_OSS_PATH,environment,files.getFilesId());
-            downResource(caseId,queryPath +fileUrl);
+            downResource(caseId,files.getFilesUrl());
         }
         jsonObject.put(basePath+caseFiles+caseId, ResultData.ok(caseFilesList));
 

src/main/java/com/fdkankan/fusion/mq/consumer/OsgbToB3dmConsumer.java

@@ -3,6 +3,7 @@ package com.fdkankan.fusion.mq.consumer;
 import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.fusion.common.FilePath;
+import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.util.*;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.service.ICommonUploadService;
@@ -43,6 +44,7 @@ public class OsgbToB3dmConsumer {
             ,concurrency = "1"
     )
     public void consumerQueue(Channel channel, Message message)  {
+        String localPath = null;
         try {
             String messageId = message.getMessageProperties().getMessageId();
             String msg = new String(message.getBody(), StandardCharsets.UTF_8);
@@ -50,21 +52,22 @@ public class OsgbToB3dmConsumer {
 
             channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
             JSONObject jsonObject = JSONObject.parseObject(msg);
-            String localPath = jsonObject.getString("path");
+            localPath = jsonObject.getString("path");
 
             File file = new File(localPath);
             if(!file.exists()){
                 log.info("osgbToB3dm-mq--messageId:{},msg:{},文件不存在",messageId,localPath);
                 return;
             }
+            commonUploadService.updateStatus(localPath,0);
             ///mnt/manage/media-library/result/ea041f3237df46568f4e83e723e743d4
             String sourcePath = file.getParentFile().getPath() +"/"+UUID.randomUUID().toString().replace("-","");
 
             OBJToGLBUtil.OsgbToB3dm(localPath,sourcePath);
             String b3dmJsonPath =  FileWriterUtil.checkB3dmTileset(new File(sourcePath));
             if(b3dmJsonPath == null){
-                log.info("osgbToB3dm-mq--messageId:{},msg:{},转化失败tileset.json文件",messageId,localPath);
-                return;
+                log.info("osgbToB3dm-mq--messageId:{},msg:{},转化失败tileset.json不存在",messageId,localPath);
+                throw new BusinessException(-1,"转化失败tileset.json不存在");
             }
             String ossPath = sourcePath.replace("/mnt/","");
             ShellUtil.yunUpload(sourcePath,ossPath);
@@ -79,6 +82,9 @@ public class OsgbToB3dmConsumer {
             FileUtil.del(sourcePath);
         }catch (Exception e){
             log.info("osgbToB3dm-status----消费失败",e);
+            if(localPath != null){
+                commonUploadService.updateStatus(localPath,-1);
+            }
         }finally {
 
         }

src/main/java/com/fdkankan/fusion/service/ICommonUploadService.java

@@ -19,4 +19,6 @@ public interface ICommonUploadService extends IService<CommonUpload> {
 
     void updateByPath(String msg, String url);
     void updateByPath(String msg, String url,String wgs84 ,String gcj02);
+
+    void updateStatus(String localPath,Integer status);
 }

src/main/java/com/fdkankan/fusion/service/impl/CaseFilesServiceImpl.java

@@ -43,6 +43,7 @@ public class CaseFilesServiceImpl extends ServiceImpl<ICaseFilesMapper, CaseFile
         if(caseFilesTypeId!=null){
             wrapper.eq(CaseFiles::getFilesTypeId,caseFilesTypeId);
         }
+        wrapper.orderByDesc(CaseFiles::getFilesId);
         return this.list(wrapper);
     }
 
@@ -50,6 +51,7 @@ public class CaseFilesServiceImpl extends ServiceImpl<ICaseFilesMapper, CaseFile
     public List<CaseFiles> getByCaseId(Integer caseId) {
         LambdaQueryWrapper<CaseFiles> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CaseFiles::getCaseId,caseId);
+        wrapper.orderByDesc(CaseFiles::getFilesId);
         return this.list(wrapper);
     }
 
@@ -69,13 +71,22 @@ public class CaseFilesServiceImpl extends ServiceImpl<ICaseFilesMapper, CaseFile
 
     @Override
     public CaseFiles addByInquest(CaseInquestCriminal caseInquestCriminal) {
+        Long count = this.getCountByCase(caseInquestCriminal.getCaseId(),40,"online");
         CaseFiles caseFiles = new CaseFiles();
         caseFiles.setCaseId(caseInquestCriminal.getCaseId());
         caseFiles.setFilesTypeId(40);
-        caseFiles.setFilesTitle("现场勘验笔录");
+        caseFiles.setFilesTitle("现场勘验笔录"+count +1);
         caseFiles.setCreateType("online");
         caseFiles.setCaseId(caseInquestCriminal.getCaseId());
         this.save(caseFiles);
         return caseFiles;
     }
+
+    private Long getCountByCase(Integer caseId, Integer filesTypeId, String online) {
+        LambdaQueryWrapper<CaseFiles> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CaseFiles::getCaseId,caseId);
+        wrapper.eq(CaseFiles::getFilesTypeId,filesTypeId);
+        wrapper.eq(CaseFiles::getCreateType,online);
+        return this.count(wrapper);
+    }
 }

src/main/java/com/fdkankan/fusion/service/impl/CommonUploadServiceImpl.java

@@ -39,6 +39,15 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
         wrapper.set(CommonUpload::getFileUrl,url);
         this.update(wrapper);
     }
+
+    @Override
+    public void updateStatus(String localPath,Integer status) {
+        LambdaUpdateWrapper<CommonUpload> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CommonUpload::getUnzipPath,localPath);
+        wrapper.set(CommonUpload::getStatus,status);
+        this.update(wrapper);
+    }
+
     @Override
     public void updateByPath(String msg, String url,String wgs84 ,String gcj02) {
         LambdaUpdateWrapper<CommonUpload> wrapper = new LambdaUpdateWrapper<>();

src/main/java/com/fdkankan/fusion/service/impl/FusionNumServiceImpl.java

@@ -267,7 +267,6 @@ public class FusionNumServiceImpl extends ServiceImpl<IFusionNumMapper, FusionNu
             fusionMeterService.deleteByFusionNumIds(Arrays.asList(fusionNum.getFusionNumId()));
             caseTagPointService.deleteByFusionNumIds(Arrays.asList(fusionNum.getFusionNumId()));
             this.removeById(fusionNumId);
-            caseNumService.deleteByModel(fusionNum.getModelId());
         }
     }