xj

pom.xml

@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-redis</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

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

@@ -80,7 +80,7 @@ public class CaseFilesController extends BaseController{
             caseFiles.setFilesUrl(url);
             caseFilesService.saveOrUpdate(caseFiles);
             //上传认定书，修改案例状态
-            if(filesTypeId == 4){
+            if(filesTypeId == 5){
                 caseService.updateIdenTityStatus(caseId,1);
             }
         }

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

@@ -87,8 +87,16 @@ public class ModelController extends BaseController{
         if(param.getModelId() == null){
             throw  new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
+        if(StringUtils.isBlank(param.getModelTitle()) && StringUtils.isBlank(param.getRenderType())){
+            throw  new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+
         LambdaUpdateWrapper<Model> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(Model::getModelId,param.getModelId());
+
+        if(StringUtils.isNotBlank(param.getRenderType())){
+            wrapper.set(Model::getRenderType,param.getRenderType());
+        }
         if(StringUtils.isNotBlank(param.getModelTitle())){
             wrapper.set(Model::getModelTitle,param.getModelTitle());
         }

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

@@ -0,0 +1,21 @@
+package com.fdkankan.fusion.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2024-08-07
+ */
+@RestController
+@RequestMapping("/fusion/mqSendLog")
+public class MqSendLogController {
+
+}
+

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

@@ -2,10 +2,12 @@ package com.fdkankan.fusion.controller;
 
 import cn.hutool.captcha.CaptchaUtil;
 import cn.hutool.captcha.LineCaptcha;
+import cn.hutool.crypto.digest.MD5;
 import cn.hutool.http.ContentType;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.common.util.MD5Checksum;
 import com.fdkankan.fusion.common.util.RedisKeyUtil;
 import com.fdkankan.fusion.common.util.StringUtils;
 import com.fdkankan.fusion.exception.BusinessException;
@@ -21,6 +23,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
+import java.security.Security;
 
 @RestController
 @RequestMapping("/notAuth")
@@ -59,4 +62,9 @@ public class NoLoginController {
         return ResultData.ok( tmUserService.getMsgAuthCode(phoneNum));
     }
 
+    public static void main(String[] args) {
+        String md5Hex = MD5.create().digestHex("Aa123456");
+
+        System.out.println(MD5.create().digestHex(md5Hex));
+    }
 }

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

@@ -60,6 +60,7 @@ public class CaseDownService {
     public static String fusionMeter =      "/fusionMeter/allList?fusionId=";
 
     public static String model =      "/model/getInfo?modelId=";
+    public static String caseImg =      "/caseImg/getFfmpegImage?caseId=";
 
     public static String laserData = "/laser/dataset/%s/getDataSet";
 
@@ -101,19 +102,23 @@ public class CaseDownService {
     LaserService laserService;
     @Autowired
     ICaseOfflineService caseOfflineService;
+    @Autowired
+    ICaseImgService caseImgService;
 
     @Autowired
     RedisUtil redisUtil;
 
+    @Value("${spring.profiles.active}")
+    private String environment;
     public static String downProcessKey = "fusion:down:offline:process:caseId:%s";
 
     public DownVo checkDown(Integer caseId) {
         DownVo downVo = new DownVo();
-        CaseOffline byCaseId = caseOfflineService.getByCaseId(caseId);
-        if(byCaseId != null){
-            downVo.setDownloadStatus(3);
-            downVo.setDownloadUrl(byCaseId.getOfflineUrl());
-        }
+//        CaseOffline byCaseId = caseOfflineService.getByCaseId(caseId);
+//        if(byCaseId != null){
+//            downVo.setDownloadStatus(3);
+//            downVo.setDownloadUrl(byCaseId.getOfflineUrl());
+//        }
         return downVo;
     }
     @Async
@@ -146,6 +151,7 @@ public class CaseDownService {
             ShellUtil.yunUpload(zipName,ossUrl);
             Thread.sleep(2000L);
             FileUtil.del(zipName);
+            ossUrl = queryPath + ossUrl;
             caseOfflineService.saveByCase(caseId,ossUrl);
             setRedisProcess(caseId,100,ossUrl);
         }catch (Exception e){
@@ -169,7 +175,7 @@ public class CaseDownService {
         DownloadProcessVo processVo = new DownloadProcessVo();
         processVo.setStatus(status);
         processVo.setPercent(num);
-        processVo.setUrl(queryPath + url);
+        processVo.setUrl( url);
         redisUtil.set(redisKey,JSONObject.toJSONString(processVo));
     }
 
@@ -202,10 +208,11 @@ public class CaseDownService {
         jsonObject.put(basePath+caseFusion+caseId, ResultData.ok(listByCaseId));
         for (FusionNumVo fusion : listByCaseId) {
             jsonObject.put(basePath+fusionMeter+fusion.getFusionId(), ResultData.ok(fusionMeterService.getListByFusionId(fusion.getFusionId(),null)));
-            jsonObject.put(basePath+model+fusion.getModelId(), ResultData.ok(modelService.getInfo(fusion.getModelId())));
+        }
 
+        List<SceneVo> sceneVos = caseService.sceneList(param);
+        for (SceneVo sceneData : sceneVos) {
             //下载模型
-            SceneVo sceneData = fusion.getSceneData();
             if(StringUtils.isNotBlank(sceneData.getModelGlbUrl())){
                 downModel(caseId,sceneData.getModelGlbUrl());
             }
@@ -213,7 +220,7 @@ public class CaseDownService {
                 //下载场景离线包
                 downSwkk(caseId,sceneData.getNum(),sceneData.getType());
             }
-            if(sceneData.getType() == 5){
+            if(sceneData.getType() == 2 || sceneData.getType() == 5){
                 FdkkResponse sceneInfo = laserService.getSceneInfo(sceneData.getNum());
                 if(sceneInfo != null){
                     JSONArray jsonArray = JSONArray.parseArray(JSONArray.toJSONString(sceneInfo.getData()));
@@ -231,9 +238,11 @@ public class CaseDownService {
                 }
 
             }
+            if(sceneData.getModelId() != null){
+                jsonObject.put(basePath+model+sceneData.getModelId(), ResultData.ok(modelService.getInfo(sceneData.getModelId())));
+            }
         }
-
-        jsonObject.put(basePath+caseScene+caseId, ResultData.ok(caseService.sceneList(param)));
+        jsonObject.put(basePath+caseScene+caseId, ResultData.ok(sceneVos));
 
         List<CaseView> caseViews = caseViewService.allList(caseId, null, null, null, null);
         jsonObject.put(basePath+caseView+caseId, ResultData.ok(caseViews));
@@ -258,7 +267,8 @@ public class CaseDownService {
 
         List<CaseFiles> caseFilesList = caseFilesService.allList(caseId, null);
         for (CaseFiles files : caseFilesList) {
-            downResource(caseId,files.getFilesUrl());
+            String fileUrl = String.format(FilePath.File_OSS_PATH,environment,files.getFilesId());
+            downResource(caseId,queryPath +fileUrl);
         }
         jsonObject.put(basePath+caseFiles+caseId, ResultData.ok(caseFilesList));
 
@@ -304,6 +314,9 @@ public class CaseDownService {
         }
         jsonObject.put(basePath+caseExtractDetail+caseId, ResultData.ok(caseExtractDetail1));
 
+        jsonObject.put(basePath+caseImg+caseId, ResultData.ok(caseImgService.getByCaseId(caseId,1)));
+
+
         FileUtil.writeString(JSON.toJSONString(jsonObject), FilePath.OFFLINE_PACKAGE_PATH+caseId+"/www/package/"+jsonDataName,"UTF-8");
 
     }

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

@@ -41,7 +41,7 @@ public class CaseInquest implements Serializable {
      * 勘验次数
      */
     @TableField("count")
-    private Integer count;
+    private String count;
 
     /**
      * 勘验开始时间

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

@@ -92,4 +92,7 @@ public class Model implements Serializable {
 
     @TableField("file_new_name")
     private String fileNewName;
+
+    @TableField("render_type")
+    private String renderType;
 }

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

@@ -0,0 +1,63 @@
+package com.fdkankan.fusion.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2024-08-07
+ */
+@Getter
+@Setter
+@TableName("mq_send_log")
+public class MqSendLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("num")
+    private String num;
+
+    /**
+     * 发送的队列
+     */
+    @TableField("queue")
+    private String queue;
+
+    /**
+     * 发送的mq消息
+     */
+    @TableField("content")
+    private String content;
+
+    /**
+     * 0未发送，1已发送
+     */
+    @TableField("status")
+    private Integer status;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("sort")
+    private Integer sort;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+
+}

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

@@ -130,8 +130,7 @@ public class TmProject implements Serializable {
      * 创建时间
      */
     @TableField("create_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date createTime;
+    private String createTime;
 
     /**
      * 编辑者ID
@@ -149,14 +148,13 @@ public class TmProject implements Serializable {
      * 编辑时间
      */
     @TableField(exist = false)
-    private Date editTime;
+    private String editTime;
 
     /**
      * 最新更新时间
      */
     @TableField("update_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date updateTime;
+    private String updateTime;
 
     /**
      * 是否删除: 0->未删除;1->已删除
@@ -244,8 +242,7 @@ public class TmProject implements Serializable {
         return statusDesc;
     }
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    public Date getEditTime() {
+    public String getEditTime() {
         return updateTime;
     }
 }

src/main/java/com/fdkankan/fusion/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir") ;
 
         generate(path,"fusion", getTables(new String[]{
-               "t_user"
+               "mq_send_log"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/fusion/mapper/IMqSendLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.fusion.mapper;
+
+import com.fdkankan.fusion.entity.MqSendLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-08-07
+ */
+@Mapper
+public interface IMqSendLogMapper extends BaseMapper<MqSendLog> {
+
+}

src/main/java/com/fdkankan/fusion/request/ModelPram.java

@@ -12,4 +12,5 @@ public class ModelPram extends RequestBase {
     private Integer modelId;
     private Integer caseId;
     private String deptId;
+    private String renderType;
 }

src/main/java/com/fdkankan/fusion/response/CaseInquestVo.java

@@ -24,7 +24,7 @@ public class CaseInquestVo {
     /**
      * 勘验次数
      */
-    private Integer count;
+    private String count;
 
     /**
      * 勘验开始时间
@@ -113,4 +113,6 @@ public class CaseInquestVo {
     private Date updateTime;
 
     private TextRenderData text;
+
+    private String page = " ";
 }

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

@@ -0,0 +1,20 @@
+package com.fdkankan.fusion.service;
+
+import com.fdkankan.fusion.entity.MqSendLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-08-07
+ */
+public interface IMqSendLogService extends IService<MqSendLog> {
+
+    HashMap<String, Boolean> getMapByNumList(List<String> numList);
+}

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

@@ -19,6 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -70,9 +71,11 @@ public class CaseImgServiceImpl extends ServiceImpl<ICaseImgMapper, CaseImg> imp
         }
         String filePath = FilePath.FFMPEG_IMG_PATH +"/"+ caseId+"/";
         try {
-            StringBuilder ffmpegCmd = new StringBuilder("ffmpeg ");
+            List<String> localList = new ArrayList<>();
             String outFileName = UUID.randomUUID().toString().replace("-","") ;
             String outSuffixName = ".jpg";
+            String outLocalPath = filePath + outFileName +outSuffixName;
+
             for (MultipartFile file : files) {
                 String suffixName = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
                 //重新生成文件名
@@ -83,23 +86,37 @@ public class CaseImgServiceImpl extends ServiceImpl<ICaseImgMapper, CaseImg> imp
                     file1.getParentFile().mkdirs();
                 }
                 file.transferTo(file1);
-                ffmpegCmd.append(" -i ").append(localFilePath);
+                localList.add(localFilePath);
             }
-            String outLocalPath = filePath + outFileName +outSuffixName;
-            ffmpegCmd.append(" -filter_complex hstack=inputs="+ files.length);
-            ffmpegCmd.append(" " +outLocalPath);
-            ShellUtil.execCmd(ffmpegCmd.toString());
+            StringBuilder ffmpegCmd = new StringBuilder("ffmpeg ");
+            if(files.length >1){
+                for (String localPath : localList) {
+                    ffmpegCmd.append(" -i ").append(localPath);
+                }
+                ffmpegCmd.append(" -filter_complex hstack=inputs="+ files.length);
+                ffmpegCmd.append(" " +outLocalPath);
+                ShellUtil.execCmd(ffmpegCmd.toString());
+            }else {
+                outLocalPath = localList.get(0);
+            }
+
             if(!FileUtil.exist(outLocalPath)){
                 throw new BusinessException(ResultCode.UPLOAD_FILE_TYPE_ERROR);
             }
             ShellUtil.yunUpload(outLocalPath,outLocalPath.replace("/mnt/",""));
 
-            CaseImg caseImg = new CaseImg();
+            List<CaseImg> caseImgList = this.getByCaseId(caseId, 1);
+            CaseImg caseImg = null;
+            if(caseImgList ==null || caseImgList.isEmpty()){
+                caseImg = new CaseImg();
+            }else {
+                caseImg = caseImgList.get(0);
+            }
             caseImg.setCaseId(caseId);
             caseImg.setImgUrl(queryPath + outLocalPath.replace("/mnt/",""));
             caseImg.setImgInfo("照片卷");
             caseImg.setType(1);
-            this.save(caseImg);
+            this.saveOrUpdate(caseImg);
             return caseImg;
         }catch (Exception e){
             log.info("ffmpeg错误：{}",caseId,e);

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

@@ -59,7 +59,6 @@ public class CaseInquestServiceImpl extends ServiceImpl<ICaseInquestMapper, Case
 
         CaseInquestVo vo = new CaseInquestVo();
         BeanUtils.copyProperties(caseInquest,vo);
-
         String info = "证人或当事人（签名）：%s  %s年 %s月 %s日 身份证件号码：%s\n"
                 +"   单位或住址：%s\n";
         StringBuilder msg = new StringBuilder();

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

@@ -20,14 +20,10 @@ public class CaseOfflineServiceImpl extends ServiceImpl<ICaseOfflineMapper, Case
 
     @Override
     public void saveByCase(Integer caseId, String ossUrl) {
-        CaseOffline caseOffline = this.getByCaseId(caseId);
-        if(caseOffline == null){
-            caseOffline = new CaseOffline();
-        }
-        caseOffline.setId(null);
+        CaseOffline caseOffline = new CaseOffline();
         caseOffline.setCaseId(caseId);
         caseOffline.setOfflineUrl(ossUrl);
-        caseOffline.setVersion(caseOffline.getVersion() == null ? 0: caseOffline.getVersion() + 1);
+        caseOffline.setVersion(0);
         this.save(caseOffline);
     }
 

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

@@ -75,7 +75,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
     private String environment;
 
     @Override
-    public Model uploadObj(MultipartFile file, String username) throws Exception {
+    public Model uploadObj(MultipartFile file,String username) throws Exception {
         if(file.isEmpty()){
             throw new BusinessException(ResultCode.UPLOAD_FILE_NO_EXIST);
         }

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

@@ -0,0 +1,41 @@
+package com.fdkankan.fusion.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.fusion.entity.MqSendLog;
+import com.fdkankan.fusion.mapper.IMqSendLogMapper;
+import com.fdkankan.fusion.service.IMqSendLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-08-07
+ */
+@Service
+@DS("db2")
+public class MqSendLogServiceImpl extends ServiceImpl<IMqSendLogMapper, MqSendLog> implements IMqSendLogService {
+
+
+    @Override
+    public HashMap<String, Boolean> getMapByNumList(List<String> numList) {
+        HashMap<String, Boolean> map = new HashMap<>();
+        if(numList == null || numList.isEmpty()){
+            return map;
+        }
+        LambdaQueryWrapper<MqSendLog> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(MqSendLog::getNum,numList);
+        List<MqSendLog> list = this.list(wrapper);
+        for (MqSendLog mqSendLog : list) {
+            map.put(mqSendLog.getNum(), mqSendLog.getStatus() == 1);
+        }
+        return map;
+    }
+}

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

@@ -58,6 +58,8 @@ public class SceneService implements ISceneService {
     ITmProjectService tmProjectService;
     @Autowired
     ICaseNumService caseNumService;
+    @Autowired
+    IMqSendLogService mqSendLogService;
 
     @Override
     public List<SceneVo> getSceneListAndModel(ScenePram param) {
@@ -193,6 +195,10 @@ public class SceneService implements ISceneService {
             }
         }
         Set<String> snCodes = sceneVoList.stream().map(SceneVo::getSnCode).collect(Collectors.toSet());
+        List<SceneVo> modelingScene = sceneVoList.stream().filter(e -> e.getStatus() == 0).collect(Collectors.toList());
+        List<String> numList = modelingScene.stream().map(SceneVo::getNum).collect(Collectors.toList());
+        HashMap<String,Boolean> modelingMap =  mqSendLogService.getMapByNumList(numList);
+
         HashMap<String, TmDepartment> map = tmCameraService.getMapBySnCodes(snCodes);
         for (SceneVo sceneVo : sceneVoList) {
             TmDepartment tmDepartment = map.get(sceneVo.getSnCode().toUpperCase());
@@ -200,6 +206,9 @@ public class SceneService implements ISceneService {
                 sceneVo.setDeptId(tmDepartment.getId());
                 sceneVo.setDeptName(tmDepartment.getName());
             }
+            if(modelingMap.get(sceneVo.getNum()) != null && !modelingMap.get(sceneVo.getNum())){
+                sceneVo.setStatus(5);
+            }
         }
         Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
         voPage.setRecords(sceneVoList);

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

@@ -3,12 +3,18 @@ package com.fdkankan.fusion.task;
 import com.fdkankan.fusion.common.util.DateUtils;
 import com.fdkankan.fusion.entity.CaseLive;
 import com.fdkankan.fusion.service.ICaseLiveService;
+import com.fdkankan.redis.util.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PostMapping;
 
+import javax.annotation.PostConstruct;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
+
+import static com.fdkankan.fusion.down.CaseDownService.downProcessKey;
 
 @Service
 public class TaskService {
@@ -26,4 +32,17 @@ public class TaskService {
             }
         }
     }
+
+    @Autowired
+    RedisUtil redisUtil;
+    @PostConstruct
+    public void cleanRedisKey(){
+        String redisKey = String.format(downProcessKey, "*");
+        Set<String>  keys = redisUtil.keys(redisKey);
+        if(keys != null && !keys.isEmpty()){
+            for (String key : keys) {
+                redisUtil.del(key);
+            }
+        }
+    }
 }

src/main/resources/mapper/fusion/MqSendLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.fusion.mapper.IMqSendLogMapper">
+
+</mapper>