1

pom.xml

@@ -19,6 +19,18 @@
     <dependencies>
 
         <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+            <version>2.2.7.RELEASE</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
+            <version>2.2.7.RELEASE</version>
+        </dependency>
+
+        <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-redis</artifactId>
             <version>3.0.0-SNAPSHOT</version>
@@ -76,6 +88,11 @@
             <artifactId>spring-boot-starter-aop</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-amqp</artifactId>
+            <version>2.3.12.RELEASE</version>
+        </dependency>
 
         <dependency>
             <groupId>com.alibaba</groupId>

src/main/java/com/fdkankan/fusion/FusionApplication.java

@@ -6,6 +6,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -16,6 +17,7 @@ import org.springframework.web.socket.config.annotation.EnableWebSocket;
 @EnableScheduling
 @ComponentScan(basePackages = {"com.fdkankan.*"})
 @MapperScan("com.fdkankan.**.mapper")
+@EnableDiscoveryClient
 public class FusionApplication  implements CommandLineRunner {
 
     @Value("${upload.type}")

src/main/java/com/fdkankan/fusion/common/ResultCode.java

@@ -9,6 +9,8 @@ public enum ResultCode {
     PASSWORD_ERROR(3014,"账号或密码不正确"),
 
     MISSING_REQUIRED_PARAMETERS(4001,"参数缺少"),
+    USERNAME_ERROR(4006, "该账号已停止使用"),
+
     USER_NOT_LOGIN(4008,"用户未登录"),
     NOT_ROLE(4009,"没有角色"),
     NOT_PERMISSION(4010,"没有权限"),
@@ -75,6 +77,7 @@ public enum ResultCode {
     CAMERA_VERSION_NOTEXIT(8026, "相机版本号不存在"),
     CAMERA_VERSION_STATUS_ERROR(8027, "相机版本状态错误"),
 
+    MEDIO_NOT_EXIT(8028, "媒体库文件不存在"),
 
     ;
 

src/main/java/com/fdkankan/fusion/common/util/DateUtils.java

@@ -66,6 +66,27 @@ public class DateUtils {
         return dateList;
     }
 
+    public static String getCnDateStr(String time){
+        StringBuilder result = new StringBuilder();
+        char[] charArray = time.toCharArray();
+        for (char c : charArray) {
+            String s = String.valueOf(c);
+            switch (s){
+                case "0": s = "〇";break;
+                case "1": s = "一";break;
+                case "2": s = "二";break;
+                case "3": s = "三";break;
+                case "4": s = "四";break;
+                case "5": s = "五";break;
+                case "6": s = "六";break;
+                case "7": s = "七";break;
+                case "8": s = "八";break;
+                case "9": s = "九";break;
+            }
+            result.append(s);
+        }
+        return result.toString();
+    }
 
 
     public static void main(String[] args) {

src/main/java/com/fdkankan/fusion/common/util/OBJToGLBUtil.java

@@ -206,4 +206,12 @@ public class OBJToGLBUtil {
         ShellUtil.execCmd(cmd);
         return sourcePath;
     }
+
+    public static String OsgbToB3dm(String  targetPath,String sourcePath) {
+        String cmd = ShellCmd.osgbTob3dmCmd.replaceAll("@path",FilePath.MNT_BASE_PATH);
+        cmd =cmd.replaceAll("@inputFile",targetPath);
+        cmd =cmd.replaceAll("@outputFile",sourcePath);
+        ShellUtil.execCmd(cmd);
+        return sourcePath;
+    }
 }

src/main/java/com/fdkankan/fusion/common/util/RedisKeyUtil.java

@@ -20,4 +20,7 @@ public class RedisKeyUtil {
     public static String loginAuthCode = "fusion:login:auth:%s";
 
     public static final String SCENE_VERSION = "scenejson:num:%s";
+
+    public static final String loginToken= "manage:login:token:%s";
+    public static final String loginUserName= "manage:login:userName:%s";
 }

src/main/java/com/fdkankan/fusion/common/util/ShellCmd.java

@@ -10,6 +10,6 @@ public class ShellCmd {
 	public static final String FYUN_UPLOAD = "bash /opt/ossutil/fyun-upload.sh %s %s /%s %s %s";
 	public static final String FYUN_DOWN = "bash /opt/ossutil/fyun-download.sh %s /%s %s %s %s";
 
-	public static final String osgbTob3dmCmd = "sudo docker run --rm -v /mnt/fusion:/mnt/fusion 3dtile:v2 /mnt/fusion/3dtile.sh -f osgb -i " +
+	public static final String osgbTob3dmCmd = "bash /mnt/fusion/3dtile.sh -f osgb -i " +
 			"@inputFile -o @outputFile";
 }

src/main/java/com/fdkankan/fusion/common/util/XwpTemplateUtils.java

@@ -0,0 +1,13 @@
+package com.fdkankan.fusion.common.util;
+
+public class XwpTemplateUtils {
+
+    public static String getSexStr(Integer type){
+        switch (type){
+            case 0 :return "男";
+            case 1 :return "女";
+            default:return "";
+        }
+    }
+
+}

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

@@ -19,6 +19,7 @@ import com.fdkankan.fusion.controller.LoginController;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.httpClient.FdService;
 import com.fdkankan.fusion.httpClient.response.FdkkLoginVo;
+import com.fdkankan.fusion.response.ManageLoginResponse;
 import com.fdkankan.fusion.service.ITmPermissionService;
 import com.fdkankan.fusion.service.ITmUserService;
 import com.fdkankan.redis.constant.RedisKey;
@@ -120,26 +121,21 @@ public class SaTokenConfigure {
     }
 
     private void checkLogin(){
-        if(!redisUtil.hasKey(String.format(RedisKeyUtil.fusionLoginToken,StpUtil.getTokenValue()))){
+        String redisKey = String.format(RedisKeyUtil.loginToken,StpUtil.getTokenValue());
+        if(!redisUtil.hasKey(redisKey)){
             throw new BusinessException(ResultCode.USER_NOT_LOGIN);
         }
-        redisUtil.expire(String.format(RedisKeyUtil.fusionLoginToken,StpUtil.getTokenValue()),21600);
-        if(!redisUtil.hasKey(String.format(RedisKeyUtil.fusionLoginUser,StpUtil.getLoginId()))){
-            throw new BusinessException(ResultCode.USER_NOT_LOGIN);
-        }
-        String value = redisUtil.get(String.format(RedisKeyUtil.fusionLoginUser,StpUtil.getLoginId()));
-        FdkkLoginVo fdkkLoginVo = JSONObject.parseObject(value, FdkkLoginVo.class);
-        if(fdkkLoginVo.getTmUser().getStatus() == 0){
-            throw new BusinessException(ResultCode.USER_NOT_LOGIN_PERM);
+        String userStr = redisUtil.get(redisKey);
+        ManageLoginResponse result = JSONObject.parseObject(userStr,ManageLoginResponse.class);
+        Long userId = result.getUserId();
+        if(userId == null || result.getStatus() == 0){
+            String redisKey2 = String.format(RedisKeyUtil.loginUserName,result.getUserName());
+            redisUtil.del(redisKey);
+            redisUtil.del(redisKey2);
+            throw new BusinessException(ResultCode.USERNAME_ERROR);
         }
-        redisUtil.expire(String.format(RedisKeyUtil.fusionLoginUser,StpUtil.getLoginId()),21600);
 
-        //校验fdtoken
-        if(!redisUtil.hasKey(String.format(RedisKeyUtil.fdToken,fdService.getFdToken()))){
-            throw new BusinessException(ResultCode.USER_NOT_LOGIN);
-        }
-        redisUtil.expire(String.format(RedisKeyUtil.fdToken,fdService.getFdToken()),21600);
-        StpUtil.checkLogin();
+        redisUtil.expire(redisKey,2 * 60 * 60);
     }
 
 

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

@@ -1,6 +1,8 @@
 package com.fdkankan.fusion.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.jwt.JWT;
+import cn.hutool.jwt.JWTUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.fusion.httpClient.response.FdkkUserVo;
 import com.fdkankan.redis.constant.RedisKey;
@@ -31,16 +33,25 @@ public class BaseController {
     private RedisUtil redisUtil;
 
     protected String getUserName(){
-       return (String)StpUtil.getExtra("userName");
+        JWT jwt = JWTUtil.parseToken(getToken());
+        Object userName = jwt.getPayload("userName");
+       return userName.toString();
     }
     protected String getNickName(){
-        return (String)StpUtil.getExtra("nickName");
+        JWT jwt = JWTUtil.parseToken(getToken());
+        Object userName = jwt.getPayload("nickName");
+        return userName.toString();
     }
     protected String getDeptId(){
-        return (String)StpUtil.getExtra("deptId");
+        return "";
     }
 
     protected String getShare(){
         return request.getHeader("share");
     }
+
+    protected String getToken(){
+        return request.getHeader("token");
+    }
+
 }

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

@@ -34,7 +34,7 @@ public class CaseController extends BaseController{
 
     @PostMapping("/list")
     public ResultData list(@RequestBody CaseParam param ){
-        return ResultData.ok(caseService.pageList(param,getUserName()));
+        return ResultData.ok(caseService.pageList(param));
     }
 
     /**
@@ -48,8 +48,8 @@ public class CaseController extends BaseController{
     }
 
     @PostMapping("/addOrUpdate")
-    public ResultData addOrUpdate(@RequestBody CaseParam param){
-        caseService.addOrUpdate(param,getUserName());
+    public ResultData addOrUpdate(@RequestBody CaseEntity param){
+        caseService.addOrUpdate(param);
         return ResultData.ok();
     }
 

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

@@ -5,11 +5,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.entity.CommonUpload;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.entity.CaseFiles;
+import com.fdkankan.fusion.request.AddByMediaLibraryParam;
 import com.fdkankan.fusion.service.ICaseFilesService;
 import com.fdkankan.fusion.service.ICaseService;
+import com.fdkankan.fusion.service.ICommonUploadService;
 import com.fdkankan.fusion.service.impl.UploadService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -39,6 +42,9 @@ public class CaseFilesController extends BaseController{
     ICaseService caseService;
     @Autowired
     UploadService uploadService;
+    @Autowired
+    ICommonUploadService commonUploadService;
+
     @Value("${spring.profiles.active}")
     private String environment;
 
@@ -53,6 +59,38 @@ public class CaseFilesController extends BaseController{
         return ResultData.ok(caseFilesService.getById(filesId));
     }
 
+    @PostMapping("/addByMediaLibrary")
+    public ResultData addByMediaLibrary(@RequestBody AddByMediaLibraryParam param)  {
+        if(param.getCaseId() == null || param.getUploadId() == null || param.getFilesTypeId() == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        CommonUpload commonUpload = commonUploadService.getById(param.getUploadId());
+        if(commonUpload == null || StringUtils.isBlank(commonUpload.getFileUrl())){
+            throw new BusinessException(ResultCode.MEDIO_NOT_EXIT);
+        }
+        CaseFiles caseFiles = new CaseFiles();
+        caseFiles.setCaseId(param.getCaseId());
+        caseFiles.setFilesTypeId(param.getFilesTypeId());
+        caseFiles.setFilesTitle(commonUpload.getFileName());
+        caseFiles.setFilesUrl(commonUpload.getFileUrl());
+        caseFilesService.save(caseFiles);
+        return ResultData.ok();
+    }
+
+    @PostMapping("/updateFileType")
+    public ResultData updateFileType(@RequestBody AddByMediaLibraryParam param){
+        if( param.getFilesId() == null || param.getFilesTypeId() == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        LambdaUpdateWrapper<CaseFiles> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CaseFiles::getFilesId,param.getFilesId());
+        wrapper.set(CaseFiles::getFilesTypeId,param.getFilesTypeId());
+        caseFilesService.update(wrapper);
+        return ResultData.ok();
+    }
+
+
+
     @PostMapping("/add")
     public ResultData add(@RequestParam(required = false) MultipartFile file,
                           @RequestParam(required = false) Integer caseId ,

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

@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -28,5 +29,16 @@ public class CaseFilesTypeController {
     public ResultData allList(){
         return ResultData.ok(caseFilesTypeService.list());
     }
+
+    @GetMapping("/getByParentId")
+    public ResultData getByParentId(@RequestParam(required = false) Integer parentId){
+        return ResultData.ok(caseFilesTypeService.getByParentId(parentId));
+    }
+
+
+    @GetMapping("/getByTree")
+    public ResultData getByTree(@RequestParam(required = false) Integer caseId){
+        return ResultData.ok(caseFilesTypeService.getByTree(caseId));
+    }
 }
 

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

@@ -0,0 +1,80 @@
+package com.fdkankan.fusion.controller;
+
+
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.util.PoitlIOUtils;
+import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.entity.CaseInquest;
+import com.fdkankan.fusion.entity.CaseInquestCriminal;
+import com.fdkankan.fusion.exception.BusinessException;
+import com.fdkankan.fusion.service.ICaseInquestCriminalService;
+import com.fdkankan.fusion.service.ICaseInquestService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2024-07-04
+ */
+@RestController
+@RequestMapping("/caseInquestCriminal")
+public class CaseInquestCriminalController {
+
+    @Autowired
+    ICaseInquestCriminalService caseInquestCriminalService;
+
+    @GetMapping("/info")
+    public ResultData info(@RequestParam(required = false) Integer inquestFileId){
+        return ResultData.ok(caseInquestCriminalService.getByInquestFileId(inquestFileId));
+    }
+
+    @PostMapping("/saveOrUpdate")
+    public ResultData saveOrUpdate(@RequestBody CaseInquestCriminal caseInquestCriminal){
+        caseInquestCriminalService.saveByParam(caseInquestCriminal);
+        return ResultData.ok();
+    }
+
+    @GetMapping("/downDocx")
+    public void downDocx(@RequestParam(required = false) Integer inquestFileId,
+                         HttpServletResponse res, HttpServletRequest req) throws IOException {
+
+        if(inquestFileId == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        CaseInquestCriminal caseInquest = caseInquestCriminalService.getByInquestFileId(inquestFileId);
+        if(caseInquest == null){
+            throw new BusinessException(ResultCode.INQUEST_ERROR2);
+        }
+        XWPFTemplate template = caseInquestCriminalService.getWordByTemplate(caseInquest);
+
+        // 设置响应头，指定文件类型和内容长度
+        res.setContentType("application/octet-stream");
+        res.setHeader("Content-Disposition", "attachment; filename=output.docx");
+
+        try {
+            // 返回网络流
+            OutputStream out = res.getOutputStream();
+            BufferedOutputStream bos = new BufferedOutputStream(out);
+            template.write(bos);
+            bos.flush();
+            out.flush();
+            // 关闭流
+            PoitlIOUtils.closeQuietlyMulti(template, bos, out);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+
+    }
+}
+

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

@@ -0,0 +1,37 @@
+package com.fdkankan.fusion.controller;
+
+
+import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.entity.CaseInquestCriminal;
+import com.fdkankan.fusion.entity.CaseInquestInfo;
+import com.fdkankan.fusion.service.ICaseInquestInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2024-12-10
+ */
+@RestController
+@RequestMapping("/caseInquestInfo")
+public class CaseInquestInfoController {
+
+    @Autowired
+    ICaseInquestInfoService caseInquestInfoService;
+
+    @GetMapping("/info")
+    public ResultData info(@RequestParam(required = false) Integer caseId){
+        return ResultData.ok(caseInquestInfoService.getByCaseId(caseId));
+    }
+
+    @PostMapping("/saveOrUpdate")
+    public ResultData saveOrUpdate(@RequestBody CaseInquestInfo caseInquestInfo){
+        caseInquestInfoService.saveByParam(caseInquestInfo);
+        return ResultData.ok();
+    }
+}
+

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

@@ -0,0 +1,50 @@
+package com.fdkankan.fusion.controller;
+
+
+import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.entity.CasePath;
+import com.fdkankan.fusion.entity.CaseScript;
+import com.fdkankan.fusion.exception.BusinessException;
+import com.fdkankan.fusion.service.ICasePathService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2024-12-10
+ */
+@RestController
+@RequestMapping("/casePath")
+public class CasePathController {
+
+    @Autowired
+    ICasePathService casePathService;
+
+
+    @GetMapping("/info")
+    public ResultData info(@RequestParam(required = false) Integer caseId){
+        if(caseId == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        return ResultData.ok(casePathService.getByCaseId(caseId));
+    }
+
+    @PostMapping("/saveOrUpdate")
+    public ResultData saveOrUpdate(@RequestBody CasePath casePath){
+        casePathService.saveOrUpdate(casePath);
+        return ResultData.ok(casePath);
+    }
+
+    @PostMapping("/del")
+    public ResultData del(@RequestBody CasePath casePath){
+        casePathService.removeById(casePath.getId());
+        return ResultData.ok();
+    }
+
+}
+

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

@@ -58,5 +58,14 @@ public class CaseTagPointController {
         caseTagPointService.removeById(caseTagPoint.getTagPointId());
         return ResultData.ok();
     }
+
+    @PostMapping("/update")
+    public ResultData update(@RequestBody CaseTagPoint caseTagPoint){
+        if(caseTagPoint.getTagPointId() == null ){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        caseTagPointService.updateById(caseTagPoint);
+        return ResultData.ok();
+    }
 }
 

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

@@ -68,12 +68,12 @@ public class HotIconController extends BaseController{
         hotIcon.setIconTitle(iconTitle);
         hotIcon.setIconUrl(iconUrl);
         hotIcon.setCaseId(caseId);
-        hotIcon.setUserName(username);
+        //hotIcon.setUserName(username);
         if(StringUtils.isEmpty(hotIcon.getIconUrl())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         //取消用户之前新增标记
-        hotIconService.cancelIsNew(username);
+        //hotIconService.cancelIsNew(username);
         if(StringUtils.isEmpty(hotIcon.getIconTitle())){
             String fileName = file.getOriginalFilename();
             assert fileName != null;

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

@@ -2,17 +2,19 @@ package com.fdkankan.fusion.controller;
 
 
 import cn.hutool.core.io.FileUtil;
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.ResultCode;
-import com.fdkankan.fusion.common.util.MD5Checksum;
-import com.fdkankan.fusion.common.util.UploadToOssUtil;
+import com.fdkankan.fusion.common.util.*;
+import com.fdkankan.fusion.entity.CaseFiles;
+import com.fdkankan.fusion.entity.CommonUpload;
 import com.fdkankan.fusion.entity.Model;
+import com.fdkankan.fusion.entity.ScenePlus;
 import com.fdkankan.fusion.exception.BusinessException;
-import com.fdkankan.fusion.request.ModelPram;
-import com.fdkankan.fusion.request.ScenePram;
+import com.fdkankan.fusion.request.*;
 import com.fdkankan.fusion.response.FileInfoVo;
 import com.fdkankan.fusion.service.*;
 import org.apache.commons.io.FileUtils;
@@ -28,6 +30,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -45,6 +50,12 @@ public class ModelController extends BaseController{
     IModelService modelService;
     @Autowired
     IFusionNumService fusionNumService;
+    @Autowired
+    ICommonUploadService commonUploadService;
+    @Autowired
+    ICaseService caseService;
+    @Autowired
+    ICaseNumService caseNumService;
 
 
     @PostMapping("/uploadObj")
@@ -52,6 +63,29 @@ public class ModelController extends BaseController{
         return ResultData.ok(modelService.uploadObj(file,getUserName()));
     }
 
+    @PostMapping("/addByMediaLibrary")
+    public ResultData addByMediaLibrary(@RequestBody AddByMediaLibraryParam param)  {
+        if(param.getCaseId() == null || param.getUploadId() == null ){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        CommonUpload commonUpload = commonUploadService.getById(param.getUploadId());
+        if(commonUpload == null || StringUtils.isBlank(commonUpload.getFileUrl())){
+            throw new BusinessException(ResultCode.MEDIO_NOT_EXIT);
+        }
+        Model model = new Model();
+        model.setModelTitle(commonUpload.getFileName());
+        model.setModelSize(FileWriterUtil.setFileSize(Long.valueOf(commonUpload.getFileSize())));
+        model.setModelDateType(commonUpload.getFileFormat());
+        model.setModelType(commonUpload.getResultFileFormat());
+        JSONArray jsonArray = new JSONArray();
+        jsonArray.add(commonUpload.getFileUrl());
+        model.setModelGlbUrl(jsonArray.toJSONString());
+        modelService.save(model);
+
+        caseNumService.addModeByCaseId(param.getCaseId(),model.getModelId());
+        return ResultData.ok(model);
+    }
+
     @GetMapping("/uploadObjProgress")
     public ResultData uploadAddVideoProgress(@RequestParam(required = false) Integer modelId) throws Exception {
         String code = modelService.uploadObjProgress(modelId);

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

@@ -4,6 +4,8 @@ package com.fdkankan.fusion.controller;
 import cn.dev33.satoken.stp.StpInterface;
 import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.jwt.JWT;
+import cn.hutool.jwt.JWTUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
@@ -31,7 +33,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/web/user")
-public class TmUserController {
+public class TmUserController extends BaseController{
 
     @Autowired
     ITmUserService tmUserService;
@@ -55,8 +57,9 @@ public class TmUserController {
      */
     @GetMapping("/getUserInfo")
     public ResultData getUserInfo() {
-        TmUser tmUser = tmUserService.getById(StpUtil.getLoginId().toString());
-        tmUserService.setRoleAndPermToRedis(tmUser);
+        TmUser tmUser = new TmUser();
+        tmUser.setUserName(getUserName());
+        tmUser.setNickName(getNickName());
         return ResultData.ok(tmUser);
     }
 

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

@@ -431,6 +431,12 @@ public class CaseDownService {
             downResource(caseId,res);
         }
     }
+    public void downResources(Integer caseId,JSONArray urls) {
+        for (Object object : urls) {
+            String res = (String) object;
+            downResource(caseId,res);
+        }
+    }
 
     public void downResource(Integer caseId,String url) {
         if(StringUtils.isBlank(url) ){

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

@@ -1,9 +1,12 @@
 package com.fdkankan.fusion.entity;
 
+import com.alibaba.fastjson.JSONArray;
 import com.baomidou.mybatisplus.annotation.*;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.fdkankan.fusion.typehandle.JsonArrayTypeHandler;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,7 +20,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-@TableName("t_case")
+@TableName(value = "t_case",autoResultMap = true)
 public class CaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -65,9 +68,53 @@ public class CaseEntity implements Serializable {
     @TableField("map_url")
     private String mapUrl;
 
+    /**
+     * 经纬度
+     */
     @TableField("lat_and_long")
     private String latAndLong;
 
+    /**
+     * 案件编号
+     */
+    @TableField("case_num")
+    private String caseNum;
+    /**
+     * 案件类别
+     */
+    @TableField("case_category")
+    private String caseCategory;
+
+    /**
+     * 案发区域
+     */
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray caseRegion;
+
+
+    /**
+     * 案发地址
+     */
+    @TableField("case_address")
+    private String caseAddress;
+
+    /**
+     * 是否命案，0否，1是
+     */
+    @TableField("homicide_case")
+    private Integer homicideCase;
+    /**
+     * 是否刑案，0否，1是
+     */
+    @TableField("criminal_case")
+    private Integer criminalCase;
+
+    /**
+     * 案发时间
+     */
+    @TableField("crime_time")
+    private String crimeTime;
+
     @TableField(exist = false)
     private String deptName;
 }

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

@@ -47,5 +47,12 @@ public class CaseFilesType implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("parent_id")
+    private Integer parentId;
 
+    @TableField("modal_show")
+    private Integer modalShow;
+
+    @TableField("flat_show")
+    private Integer flatShow;
 }

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

@@ -0,0 +1,255 @@
+package com.fdkankan.fusion.entity;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+import com.fdkankan.fusion.common.util.DateUtils;
+import com.fdkankan.fusion.typehandle.JsonArrayTypeHandler;
+import com.fdkankan.fusion.typehandle.JsonObjTypeHandler;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2024-10-18
+ */
+@Getter
+@Setter
+@TableName(value = "t_case_inquest_criminal",autoResultMap = true)
+public class CaseInquestCriminal implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("inquest_file_id")
+    private Integer inquestFileId;
+
+    /**
+     * 现场勘验号
+     */
+    @TableField("inquest_num")
+    private String inquestNum;
+
+    /**
+     * 单位名称
+     */
+    @TableField("dept_name")
+    private String deptName;
+
+    /**
+     * 标题
+     */
+    @TableField("title")
+    private String title;
+
+    /**
+     * 发送单位
+     */
+    @TableField("send_dept")
+    private String sendDept;
+
+    /**
+     * 笔录人
+     */
+    @TableField("recorder")
+    private String recorder;
+
+    /**
+     * 绘图人
+     */
+    @TableField("painter")
+    private String painter;
+
+    /**
+     * 照相人
+     */
+    @TableField("photographer")
+    private String photographer;
+
+    /**
+     * 份数
+     */
+    @TableField("issuance_count")
+    private Integer issuanceCount;
+
+    /**
+     * 制作时间
+     */
+    @TableField("make_time")
+    private Date makeTime;
+
+    /**
+     * 签发意见
+     */
+    @TableField("issuance_opinion")
+    private String issuanceOpinion;
+
+    /**
+     * 签名
+     */
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray signature;
+
+    /**
+     * 签名时间
+     */
+    @TableField("signature_time")
+    private Date signatureTime;
+
+    /**
+     * 报告单位
+     */
+    @TableField("report_dept")
+    private String reportDept;
+
+    /**
+     * 时间
+     */
+    @TableField("inquest_time")
+    private Date inquestTime;
+
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray times;
+
+    /**
+     * 勘验地址
+     */
+    @TableField("address")
+    private String address;
+
+    /**
+     * 现场保护情况
+     */
+    @TableField("protection_situation")
+    private String protectionSituation;
+
+    /**
+     * 现场保护人
+     * {"unit":"天地","name":"李","job":"天才"}
+     */
+    @TableField(typeHandler = JsonObjTypeHandler.class)
+    private JSONObject protector;
+
+    /**
+     * 现场保护措施
+     */
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray protectionMeasures;
+
+    /**
+     * 现场情况
+     */
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray situation;
+
+    /**
+     * 变动原因
+     */
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray changeReason;
+
+    @TableField("change_reason_other_value")
+    private String changeReasonOtherValue;
+    /**
+     * 天气情况
+     * {"temperature":"10","humidity":"20","windDirection":"南","type":[0,1,2,3]}
+     */
+    @TableField(typeHandler = JsonObjTypeHandler.class)
+    private JSONObject weatherInfo;
+
+    /**
+     * 光线
+     */
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray light;
+
+    /**
+     * 勘验指挥人
+     * {"unit":"第三方","name":"张","job":"植物"}
+     */
+    @TableField(typeHandler = JsonObjTypeHandler.class)
+    private JSONObject inquestCommander;
+
+    /**
+     * 勘验情况
+     */
+    @TableField("inquest_situation")
+    private String inquestSituation;
+
+    /**
+     * 现场勘验制图数量
+     */
+    @TableField("image_num")
+    private Integer imageNum;
+
+    /**
+     * 照相数量
+     */
+    @TableField("photograph_num")
+    private Integer photographNum;
+
+    /**
+     * 摄影分钟
+     */
+    @TableField("photography_min_num")
+    private Integer photographyMinNum;
+    /**
+     * 摄影秒钟
+     */
+    @TableField("photography_sec_num")
+    private Integer photographySecNum;
+
+    /**
+     * 现场勘验纪录人员数组
+     */
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray recorderInfo;
+
+    /**
+     * 现场勘验人员签名数组
+     */
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray signatureInfo;
+
+    /**
+     * 现场勘验见证人数组
+     */
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray witnessInfo;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+    @TableField("tb_status")
+    @TableLogic
+    private Integer tbStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("num")
+    private String num;
+
+}

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

@@ -0,0 +1,96 @@
+package com.fdkankan.fusion.entity;
+
+import com.alibaba.fastjson.JSONArray;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fdkankan.fusion.typehandle.JsonArrayTypeHandler;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2024-12-10
+ */
+@Getter
+@Setter
+@TableName(value = "t_case_inquest_info",autoResultMap = true)
+public class CaseInquestInfo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("case_id")
+    private Integer caseId;
+
+    /**
+     * 指挥中心电话时间
+     */
+    @TableField("command_time")
+    private Date commandTime;
+
+    /**
+     * 接警时间
+     */
+    @TableField("alarm_time")
+    private Date alarmTime;
+
+    /**
+     * 接警人
+     */
+    @TableField("alarm_name")
+    private String alarmName;
+
+    /**
+     * 现场勘验单位
+     */
+    @TableField("inquest_dept")
+    private String inquestDept;
+
+    /**
+     * 指派/报告单位
+     */
+    @TableField("assign_dept")
+    private String assignDept;
+
+    /**
+     * 指派方式
+     */
+    @TableField("assign_type")
+    private String assignType;
+
+    /**
+     * 勘验时间数组
+     */
+    @TableField(typeHandler = JsonArrayTypeHandler.class)
+    private JSONArray times;
+
+    /**
+     * 勘验地点
+     */
+    @TableField("inquest_address")
+    private String inquestAddress;
+
+    @TableField("tb_status")
+    @TableLogic
+    private Integer tbStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

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

@@ -0,0 +1,48 @@
+package com.fdkankan.fusion.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2024-12-10
+ */
+@Getter
+@Setter
+@TableName("t_case_path")
+public class CasePath implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("case_id")
+    private Integer caseId;
+
+    @TableField("path")
+    private String path;
+
+    @TableField("tb_status")
+    @TableLogic
+    private Integer tbStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

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

@@ -119,5 +119,9 @@ public class CaseTag implements Serializable {
     @TableField("update_time")
     private String updateTime;
 
+    @TableField("show3d_title")
+    private Integer show3dTitle;
 
+    @TableField("audio")
+    private String audio;
 }

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

@@ -67,4 +67,23 @@ public class CaseTagPoint implements Serializable {
 
     @TableField("bind_hide")
     private String bindHide;
+
+
+    @TableField("global_visibility")
+    private Integer globalVisibility;
+
+    @TableField("type")
+    private String type;
+
+    @TableField("mat")
+    private String mat;
+
+    @TableField("font_size")
+    private Integer fontSize;
+
+    @TableField("line_height")
+    private Integer lineHeight;
+
+    @TableField("visibility_range")
+    private Integer visibilityRange;
 }

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

@@ -0,0 +1,66 @@
+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-12-06
+ */
+@Getter
+@Setter
+@TableName("t_common_upload")
+public class CommonUpload implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("file_name")
+    private String fileName;
+
+    @TableField("file_url")
+    private String fileUrl;
+
+    @TableField("file_size")
+    private String fileSize;
+
+    @TableField("new_file_name")
+    private String newFileName;
+
+    @TableField("file_type")
+    private Integer fileType;
+
+    @TableField("file_format")
+    private String fileFormat;
+
+    @TableField("result_file_format")
+    private String resultFileFormat;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("status")
+    private Integer status;
+
+    @TableField("unzip_path")
+    private String unzipPath;
+
+
+}

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

@@ -0,0 +1,51 @@
+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-12-06
+ */
+@Getter
+@Setter
+@TableName("t_dict")
+public class Dict implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("dict_name")
+    private String dictName;
+
+    @TableField("dict_key")
+    private String dictKey;
+
+    @TableField("sort")
+    private Integer sort;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("sys_user_id")
+    private Integer sysUserId;
+
+
+}

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

@@ -0,0 +1,54 @@
+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-12-06
+ */
+@Getter
+@Setter
+@TableName("t_dict_file")
+public class DictFile implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @TableField("name")
+    private String name;
+
+    @TableField("type_key")
+    private String typeKey;
+
+    @TableField("dict_id")
+    private Integer dictId;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("sys_user_id")
+    private Integer sysUserId;
+
+    @TableField("upload_id")
+    private Integer uploadId;
+
+
+}

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[]{
-               "mq_send_log"
+               "t_case_inquest_file"
         }));
 
 //        generate(path,"goods", getTables(new String[]{
@@ -48,8 +48,8 @@ public class AutoGenerate {
     public static void  generate(String path,String moduleName,  List<String> tables){
 //        FastAutoGenerator.create("jdbc:mysql://192.168.0.25:3306/fd_fusion_xj",
 //                "root","mysql123!ROOT.")
-        FastAutoGenerator.create("jdbc:mysql://120.24.144.164:3306/4dkankan_v4",
-                "root","4Dage@4Dage#@168")
+        FastAutoGenerator.create("jdbc:mysql://192.168.0.25:3306/fd_fusion",
+                "root","4dkk2023cuikuan%")
                 .globalConfig(builder -> {
                     builder.author("")               //作者
                             .outputDir(path+"\\src\\main\\java")    //输出路径(写到java目录)

src/main/java/com/fdkankan/fusion/httpClient/client/FdKKClient.java

@@ -26,86 +26,86 @@ public interface FdKKClient {
     /**
      * 登录
      */
-    @Post("/api/sso/user/login")
+    @Post("/ucenter/sso/user/login")
     FdkkResponse<FdkkLoginVo> fdkkLogin(@JSONBody FdkkLoginRequest fdkkLoginRequest);
     /**
      * 退出登录
      */
-    @Post("/api/sso/user/logout")
+    @Post("/ucenter/sso/user/logout")
     FdkkResponse<FdkkLoginVo> fdkkLogout(@Header("token") String token);
     /**
      * 注册账号
      */
-    @Post("/api/sso/user/register")
+    @Post("/ucenter/sso/user/register")
     FdkkResponse fdkkRegister(@JSONBody FdkkLoginRequest fdkkLoginRequest);
     /**
      * 修改密码
      */
-    @Post("/api/sso/user/changePassword")
+    @Post("/ucenter/sso/user/changePassword")
     FdkkResponse fdkkChangePassword(@JSONBody FdkkLoginRequest fdkkLoginRequest);
     /**
      * 修改密码
      */
-    @Post("/api/sso/user/getMsgAuthCode")
+    @Post("/ucenter/sso/user/getMsgAuthCode")
     FdkkResponse fdkkGetMsgAuthCode(@JSONBody FdkkLoginRequest fdkkLoginRequest);
 
     /**
      * 校验token
      */
-    @Post("/api/user/checkToken")
+    @Post("/ucenter/user/checkToken")
     FdkkResponse checkToken(@Header("token")  String token);
 
     /**
      * 获取v4场景数据
      */
-    @Post("/api/fusion/scene/list")
+    @Post("/ucenter/fusion/scene/list")
     FdkkResponse sceneList(@JSONBody ScenePram param, @Header("token") String token);
     /**
      * 获取v4场景数据
      */
-    @Post("/api/fusion/scene/list")
+    @Post("/ucenter/fusion/scene/list")
     FdkkResponse sceneList(@JSONBody ScenePram param);
 
     /**
      * 获取dataSource
      */
-    @Get("/api/scene/querySceneDataSource")
+    @Get("/ucenter/scene/querySceneDataSource")
     String querySceneDataSource(@Query("num") String num);
 
     /**
      * 绑定相机
      */
-    @Post("/fd/api/user/camera/add")
+    @Post("/fd/ucenter/user/camera/add")
     FdkkResponse fdkKBind(@JSONBody FdkkCameraParam param,@Header("token")  String token);
 
     /**
      * 解绑相机
      */
-    @Post("/api/user/camera/unbind")
+    @Post("/ucenter/user/camera/unbind")
     FdkkResponse fdkkUnbind(@JSONBody FdkkCameraParam param,@Header("token")  String token);
 
     /**
      * 获取相机详情
      */
-    @Post("/api/user/camera/detail")
+    @Post("/ucenter/user/camera/detail")
     FdkkResponse<CameraVo> fdkkCameraDetail(@JSONBody FdkkCameraParam param, @Header("token")  String token);
 
     /**
      * 获取相机详情
      */
-    @Post("/fd/api/user/camera/details")
+    @Post("/fd/ucenter/user/camera/details")
     FdkkResponse<List<CameraVo>> fdkkCameraDetails(@JSONBody FdkkCameraParam param, @Header("token")  String token);
 
     /**
      * 获取dataSource
      */
-    @Get("/fd/api/user/scene/getTokenByNum")
+    @Get("/fd/ucenter/user/scene/getTokenByNum")
     String getFdTokenByNum(@Query("num") String num, @Header("token")  String token);
 
     /**
      * 删除场景码
      */
-    @Post("/api/user/scene/delete")
+    @Post("/ucenter/user/scene/delete")
     void deleteNum(@JSONBody FdkkDelNumParam param, @Header("token")  String fdToken);
 
     @Get("/service/manage/inner/copyScene")

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,76 @@
+package com.fdkankan.fusion.mq.consumer;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.fusion.common.FilePath;
+import com.fdkankan.fusion.common.util.FileWriterUtil;
+import com.fdkankan.fusion.common.util.OBJToGLBUtil;
+import com.fdkankan.fusion.common.util.ShellUtil;
+import com.fdkankan.fusion.common.util.UploadToOssUtil;
+import com.fdkankan.fusion.exception.BusinessException;
+import com.fdkankan.fusion.service.ICommonUploadService;
+import com.fdkankan.redis.util.RedisUtil;
+import com.rabbitmq.client.Channel;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.Queue;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.nio.charset.StandardCharsets;
+import java.util.HashMap;
+import java.util.UUID;
+
+/**
+ * 场景封存解封 mq
+ */
+@Slf4j
+@Component
+public class OsgbToB3dmConsumer {
+
+    @Autowired
+    ICommonUploadService commonUploadService;
+    @Value("${upload.query-path}")
+    private String ossUrlPrefix;
+    @RabbitListener(
+            queuesToDeclare = @Queue("${queue.model.osgbToB3dm:queue-model-osgbToB3dm}")
+            ,concurrency = "1"
+    )
+    public void consumerQueue(Channel channel, Message message)  {
+        try {
+            String messageId = message.getMessageProperties().getMessageId();
+            String msg = new String(message.getBody(), StandardCharsets.UTF_8);
+            log.info("osgbToB3dm-mq--messageId:{},msg:{}",messageId,msg);
+
+            channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+            JSONObject jsonObject = JSONObject.parseObject(msg);
+            String localPath = jsonObject.getString("path");
+
+            File file = new File(localPath);
+            if(!file.exists()){
+                log.info("osgbToB3dm-mq--messageId:{},msg:{},文件不存在",messageId,localPath);
+                return;
+            }
+            ///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;
+            }
+            String ossPath = sourcePath.replace("/mnt/","");
+            ShellUtil.yunUpload(sourcePath,ossPath);
+            String url = ossUrlPrefix + b3dmJsonPath.replace("/mnt/","");
+            commonUploadService.updateByPath(localPath,url);
+        }catch (Exception e){
+            log.info("osgbToB3dm-status----消费失败",e);
+        }finally {
+
+        }
+
+    }
+
+}

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

@@ -0,0 +1,12 @@
+package com.fdkankan.fusion.request;
+
+import lombok.Data;
+
+@Data
+public class AddByMediaLibraryParam {
+    private Integer caseId;
+    private Integer uploadId;
+    private Integer filesTypeId;
+
+    private Integer filesId;
+}

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

@@ -0,0 +1,15 @@
+package com.fdkankan.fusion.response;
+
+import com.fdkankan.fusion.entity.CaseFiles;
+import com.fdkankan.fusion.entity.CaseFilesType;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CaseFilesTypeTreeVo extends CaseFilesType {
+
+    private List<CaseFiles> caseFilesList;
+
+    private List<CaseFilesTypeTreeVo> childrenList;
+}

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

@@ -0,0 +1,70 @@
+package com.fdkankan.fusion.response;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.deepoove.poi.data.TextRenderData;
+import com.fdkankan.fusion.common.util.DateUtils;
+import com.fdkankan.fusion.entity.CaseInquestCriminal;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CaseInquestCriminalVo extends CaseInquestCriminal {
+
+    private String makeTimeStr;
+    private String startTime;
+    private String endTime;
+
+    private String inquestTimeStr1;
+    private String inquestTimeStr;
+
+    //数组
+    private TextRenderData recorderInfoText;
+    private TextRenderData signatureInfoText;
+    private TextRenderData witnessInfoText;
+
+
+    public String getInquestTimeStr1() {
+        if(super.getInquestTime() == null){
+            return "";
+        }
+        return DateUtil.format(super.getInquestTime(),DatePattern.CHINESE_DATE_TIME_FORMAT);
+    }
+
+    public String getMakeTimeStr() {
+        if(super.getMakeTime() == null){
+            return "";
+        }
+        return DateUtil.format(super.getMakeTime(),DatePattern.CHINESE_DATE_TIME_FORMAT);
+    }
+
+    //
+    public String getStartTime() {
+        if(super.getTimes().isEmpty()){
+            return "";
+        }
+        Date date = super.getTimes().getDate(0);
+        return DateUtil.format(date,DatePattern.CHINESE_DATE_TIME_FORMAT);
+    }
+
+    public String getEndTime() {
+        if(super.getTimes().isEmpty()){
+            return "";
+        }
+        Date date = super.getTimes().getDate(1);
+        return DateUtil.format(date,DatePattern.CHINESE_DATE_TIME_FORMAT);
+    }
+
+    public String getInquestTimeStr() {
+        if(super.getInquestTime() == null){
+            return "";
+        }
+        return DateUtils.getCnDateStr(DateUtil.format(super.getInquestTime(), DatePattern.CHINESE_DATE_FORMAT));
+    }
+
+}

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

@@ -0,0 +1,20 @@
+package com.fdkankan.fusion.response;
+
+import lombok.Data;
+
+@Data
+public class ManageLoginResponse {
+    private Long id;
+    private String userName;
+    private String nickName;
+    private String token;
+    private Long roleId;
+    private String roleName;
+    /**
+     * 是否禁用 0禁用，1启用
+     */
+    private Integer status;
+    private Long userId;
+    private String platformName;
+
+}

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

@@ -3,6 +3,8 @@ package com.fdkankan.fusion.service;
 import com.fdkankan.fusion.entity.CaseFilesType;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.List;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +15,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICaseFilesTypeService extends IService<CaseFilesType> {
 
+    List<CaseFilesType> getByParentId(Integer parentId);
+
+    Object getByTree(Integer caseId);
 }

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

@@ -0,0 +1,24 @@
+package com.fdkankan.fusion.service;
+
+import com.deepoove.poi.XWPFTemplate;
+import com.fdkankan.fusion.entity.CaseInquest;
+import com.fdkankan.fusion.entity.CaseInquestCriminal;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-10-18
+ */
+public interface ICaseInquestCriminalService extends IService<CaseInquestCriminal> {
+
+    CaseInquestCriminal getByInquestFileId(Integer caseId);
+
+    void saveByParam(CaseInquestCriminal caseInquestCriminal);
+
+    XWPFTemplate getWordByTemplate(CaseInquestCriminal caseInquestCriminal);
+
+}

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

@@ -0,0 +1,19 @@
+package com.fdkankan.fusion.service;
+
+import com.fdkankan.fusion.entity.CaseInquestInfo;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-12-10
+ */
+public interface ICaseInquestInfoService extends IService<CaseInquestInfo> {
+
+    Object getByCaseId(Integer caseId);
+
+    void saveByParam(CaseInquestInfo caseInquestInfo);
+}

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

@@ -29,4 +29,8 @@ public interface ICaseNumService extends IService<CaseNumEntity> {
     List<CaseNumEntity> getByNum(String num);
 
     void deleteByNum(Integer caseId,List<String> num,Integer type);
+
+    void addModeByCaseId(Integer caseId, Integer modelId);
+
+    void deleteByModel(Integer modelId);
 }

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

@@ -0,0 +1,17 @@
+package com.fdkankan.fusion.service;
+
+import com.fdkankan.fusion.entity.CasePath;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-12-10
+ */
+public interface ICasePathService extends IService<CasePath> {
+
+    Object getByCaseId(Integer caseId);
+}

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

@@ -21,9 +21,9 @@ import java.util.List;
 public interface ICaseService extends IService<CaseEntity> {
 
 
-    PageInfo pageList(CaseParam param,String token);
+    PageInfo pageList(CaseParam param);
 
-    void addOrUpdate(CaseParam param, String token);
+    void addOrUpdate(CaseEntity param);
 
     void addScene(CaseParam param);
 

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

@@ -0,0 +1,21 @@
+package com.fdkankan.fusion.service;
+
+import com.fdkankan.fusion.entity.CommonUpload;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-12-06
+ */
+public interface ICommonUploadService extends IService<CommonUpload> {
+
+    List<CommonUpload> getByStatus(Integer status);
+
+    void updateByPath(String msg, String url);
+}

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

@@ -0,0 +1,16 @@
+package com.fdkankan.fusion.service;
+
+import com.fdkankan.fusion.entity.DictFile;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-12-06
+ */
+public interface IDictFileService extends IService<DictFile> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.fdkankan.fusion.service;
+
+import com.fdkankan.fusion.entity.Dict;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-12-06
+ */
+public interface IDictService extends IService<Dict> {
+
+}

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

@@ -1,11 +1,22 @@
 package com.fdkankan.fusion.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.fusion.entity.CaseFiles;
 import com.fdkankan.fusion.entity.CaseFilesType;
 import com.fdkankan.fusion.mapper.ICaseFilesTypeMapper;
+import com.fdkankan.fusion.response.CaseFilesTypeTreeVo;
+import com.fdkankan.fusion.service.ICaseFilesService;
 import com.fdkankan.fusion.service.ICaseFilesTypeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +28,44 @@ import org.springframework.stereotype.Service;
 @Service
 public class CaseFilesTypeServiceImpl extends ServiceImpl<ICaseFilesTypeMapper, CaseFilesType> implements ICaseFilesTypeService {
 
+    @Autowired
+    ICaseFilesService caseFilesService;
+    @Override
+    public List<CaseFilesType> getByParentId(Integer parentId) {
+        LambdaQueryWrapper<CaseFilesType> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CaseFilesType::getParentId,parentId);
+        return this.list(wrapper);
+    }
+
+    @Override
+    public Object getByTree(Integer caseId) {
+        List<CaseFilesType> list = this.list();
+        List<CaseFiles> caseFilesList = caseFilesService.getByCaseId(caseId);
+        HashMap<Integer,List<CaseFiles>> map = new HashMap<>();
+
+        for (CaseFiles caseFiles : caseFilesList) {
+            if(caseFiles.getFilesTypeId() == null){
+                continue;
+            }
+            List<CaseFiles> files = map.computeIfAbsent(caseFiles.getFilesTypeId(), k -> new ArrayList<>());
+            files.add(caseFiles);
+        }
+
+        List<CaseFilesType> oneList = list.stream().filter(e -> e.getParentId() == null).collect(Collectors.toList());
+        return getVoList(oneList,list,map);
+    }
+
+    private List<CaseFilesTypeTreeVo> getVoList (List<CaseFilesType> oneList,List<CaseFilesType> allList, HashMap<Integer,List<CaseFiles>> map){
+        List<CaseFilesTypeTreeVo> voList = new ArrayList<>();
+        for (CaseFilesType caseFilesType : oneList) {
+            CaseFilesTypeTreeVo vo = new CaseFilesTypeTreeVo();
+            BeanUtils.copyProperties(caseFilesType,vo);
+            List<CaseFiles> files = map.get(caseFilesType.getFilesTypeId());
+            vo.setCaseFilesList(files);
+            List<CaseFilesType> twoList = allList.stream().filter(e -> e.getParentId() !=null && e.getParentId().equals(caseFilesType.getFilesTypeId())).collect(Collectors.toList());
+            vo.setChildrenList(getVoList(twoList,allList,map));
+            voList.add(vo);
+        }
+        return voList;
+    }
 }

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

@@ -0,0 +1,173 @@
+package com.fdkankan.fusion.service.impl;
+
+import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
+import com.deepoove.poi.config.ConfigureBuilder;
+import com.deepoove.poi.data.TextRenderData;
+import com.deepoove.poi.data.style.Style;
+import com.deepoove.poi.xwpf.NiceXWPFDocument;
+import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.common.util.DateUtils;
+import com.fdkankan.fusion.common.util.XwpTemplateUtils;
+import com.fdkankan.fusion.entity.*;
+import com.fdkankan.fusion.exception.BusinessException;
+import com.fdkankan.fusion.mapper.ICaseInquestCriminalMapper;
+import com.fdkankan.fusion.response.CaseInquestCriminalVo;
+import com.fdkankan.fusion.response.CaseInquestVo;
+import com.fdkankan.fusion.response.WitnessVo;
+import com.fdkankan.fusion.service.*;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.xwpf.usermodel.UnderlinePatterns;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.io.InputStream;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-10-18
+ */
+@Service
+@Slf4j
+public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCriminalMapper, CaseInquestCriminal> implements ICaseInquestCriminalService {
+
+    @Autowired
+    ITmUserService tmUserService;
+    @Autowired
+    ICaseService caseService;
+    @Autowired
+    ITmDepartmentService tmDepartmentService;
+    @Autowired
+    ICaseNumService caseNumService;
+    @Autowired
+    IScenePlusService scenePlusService;
+
+    @Override
+    public CaseInquestCriminal getByInquestFileId(Integer caseId) {
+
+        LambdaQueryWrapper<CaseInquestCriminal> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CaseInquestCriminal::getInquestFileId,caseId);
+        CaseInquestCriminal caseInquestCriminal = this.getOne(wrapper);
+        /**
+         * 1.标题                     //案件名称
+         * 2.笔录人  绘图人  照相人   //登录人
+         * 3.制作时间                //当前时间
+         * 4.现场勘验单位  指派/报告单位 //部门名称
+         * 5.勘验时间       //第一个场景的拍摄时间
+         * 6.现场地点       //案件地理位置
+         * 7.现场勘验情况   //讯飞ai图片说明
+         * 8.单位             //部门名称
+         */
+        if(caseInquestCriminal == null){
+            if(StpUtil.isLogin()){
+                TmUser tmUser = tmUserService.getById(StpUtil.getLoginId().toString());
+                CaseEntity caseEntity = caseService.getById(caseId);
+                TmDepartment tmDepartment = tmDepartmentService.getById(caseEntity.getDeptId());
+
+                caseInquestCriminal = new CaseInquestCriminal();
+                caseInquestCriminal.setInquestFileId(caseId);
+                caseInquestCriminal.setDeptName(tmDepartment.getName());
+                caseInquestCriminal.setTitle(caseEntity.getCaseTitle());
+                caseInquestCriminal.setSendDept(tmDepartment.getName());
+                caseInquestCriminal.setRecorder(tmUser.getNickName());
+                caseInquestCriminal.setPainter(tmUser.getNickName());
+                caseInquestCriminal.setPhotographer(tmUser.getNickName());
+                caseInquestCriminal.setMakeTime(new Date());
+                caseInquestCriminal.setReportDept(tmDepartment.getName());
+                caseInquestCriminal.setAddress(caseEntity.getMapUrl());
+                this.save(caseInquestCriminal);
+            }
+        }
+        return caseInquestCriminal;
+    }
+
+
+    @Override
+    public void saveByParam(CaseInquestCriminal caseInquestCriminal) {
+        if(caseInquestCriminal.getInquestFileId() == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        CaseInquestCriminal dbCaseInquest = this.getById(caseInquestCriminal.getInquestFileId());
+        if(dbCaseInquest != null){
+            caseInquestCriminal.setId(dbCaseInquest.getId());
+        }
+        this.saveOrUpdate(caseInquestCriminal);
+
+    }
+
+    @Override
+    public XWPFTemplate getWordByTemplate(CaseInquestCriminal caseInquest) {
+
+        InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("template/inquest_criminal-template.docx");
+        // 渲染模板
+
+        CaseInquestCriminalVo vo = new CaseInquestCriminalVo();
+        BeanUtils.copyProperties(caseInquest,vo);
+
+        //[{"unit":"四维","name":"张三","typeLabel":"笔录人","type":0,"job":"植物一"}]
+        String recorderInfo = "%s：姓名 %s 单位 %s 职务 %s\n";
+        StringBuilder recorderInfoMsg = new StringBuilder();
+        for (Object object : vo.getRecorderInfo()) {
+            JSONObject obj = (JSONObject) object;
+            String format = String.format(recorderInfo,obj.getString("typeLabel"), obj.getString("name"), obj.getString("unit"), obj.getString("job"));
+            recorderInfoMsg.append(format);
+        }
+        TextRenderData text = new TextRenderData("000000",recorderInfoMsg.toString());
+        Style style = text.getStyle();
+        style.setUnderlinePatterns(UnderlinePatterns.SINGLE);
+        vo.setRecorderInfoText(text);
+
+        //[{"unit":"四维","job":"植物一"}]
+        String signatureInfo = "本人签名：        单位 %s 职务 %s\n";
+        StringBuilder signatureInfoMsg = new StringBuilder();
+        for (Object object : vo.getSignatureInfo()) {
+            JSONObject obj = (JSONObject) object;
+            String format = String.format(signatureInfo, obj.getString("unit"), obj.getString("job"));
+            signatureInfoMsg.append(format);
+        }
+        TextRenderData text2 = new TextRenderData("000000",signatureInfoMsg.toString());
+        Style style2 = text2.getStyle();
+        style2.setUnderlinePatterns(UnderlinePatterns.SINGLE);
+        vo.setSignatureInfoText(text2);
+
+        //[{"birthday":"2024-10-15T16:00:00.000Z","address":"dfsdfdsdsdsdsds","sex":0}]
+        //[{"sex":0,"birthday":"","address":""},{"sex":0,"birthday":"","address":""}]
+        String witnessInfo = "本人签名：       性别 %s 出生日期 %s 住址 %s\n";
+        StringBuilder witnessInfoMsg = new StringBuilder();
+        for (Object object : vo.getWitnessInfo()) {
+            JSONObject obj = (JSONObject) object;
+            String birthday = DateUtil.format(obj.getDate("birthday"), DatePattern.CHINESE_DATE_FORMAT) == null?"":DateUtil.format(obj.getDate("birthday"), DatePattern.CHINESE_DATE_FORMAT);
+            String format = String.format(witnessInfo, XwpTemplateUtils.getSexStr(obj.getInteger("sex")), birthday,obj.getString("address"));
+            witnessInfoMsg.append(format);
+        }
+        TextRenderData text3 = new TextRenderData("000000",witnessInfoMsg.toString());
+        Style style3 = text3.getStyle();
+        style3.setUnderlinePatterns(UnderlinePatterns.SINGLE);
+        vo.setWitnessInfoText(text3);
+
+        ConfigureBuilder builder = Configure.builder();
+        builder.useSpringEL(false);
+        //builder.setValidErrorHandler(new Configure.DiscardHandler());
+        XWPFTemplate compile = XWPFTemplate.compile(inputStream, builder.build());
+        compile.render(vo);
+        return compile;
+    }
+
+
+}

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

@@ -0,0 +1,44 @@
+package com.fdkankan.fusion.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.entity.CaseInquest;
+import com.fdkankan.fusion.entity.CaseInquestInfo;
+import com.fdkankan.fusion.exception.BusinessException;
+import com.fdkankan.fusion.mapper.ICaseInquestInfoMapper;
+import com.fdkankan.fusion.service.ICaseInquestInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-12-10
+ */
+@Service
+public class CaseInquestInfoServiceImpl extends ServiceImpl<ICaseInquestInfoMapper, CaseInquestInfo> implements ICaseInquestInfoService {
+
+
+    @Override
+    public CaseInquestInfo getByCaseId(Integer caseId) {
+        LambdaQueryWrapper<CaseInquestInfo> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CaseInquestInfo::getCaseId,caseId);
+        return this.getOne(wrapper);
+    }
+
+    @Override
+    public void saveByParam(CaseInquestInfo caseInquestInfo) {
+        if(caseInquestInfo.getCaseId() == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        CaseInquestInfo dbCaseInquestInfo = this.getByCaseId(caseInquestInfo.getCaseId());
+        if(dbCaseInquestInfo != null){
+            caseInquestInfo.setId(dbCaseInquestInfo.getId());
+        }
+        this.saveOrUpdate(caseInquestInfo);
+
+    }
+}

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

@@ -141,9 +141,6 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
     private String getGlbUrl(Integer type, String num,Model model) {
         if(type == 0 || type == 1 || type == 4 || type == 6){ //看看，看见
             String objPath = String.format(FilePath.OBJ_LOCAL_PATH ,environment,num);
-//            if(uploadToOssUtil.existKey(glbOssPath)){
-//                return queryPath + "/"+glbOssPath;
-//            }
             ShellUtil.yunDownload(String.format(FilePath.OBJ_OSS_PATH, num)+"/data/mesh" ,objPath);
             List<String> localGlbPaths = new ArrayList<>();
             List<String> ossGlbPaths = new ArrayList<>();
@@ -266,4 +263,27 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
         return this.list(wrapper);
     }
 
+    @Override
+    public void addModeByCaseId(Integer caseId, Integer modelId) {
+        LambdaQueryWrapper<CaseNumEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CaseNumEntity::getCaseId,caseId);
+        wrapper.eq(CaseNumEntity::getNum,modelId);
+        List<CaseNumEntity> list = this.list(wrapper);
+        if(list.isEmpty()){
+            CaseNumEntity caseNumEntity = new CaseNumEntity();
+            caseNumEntity.setCaseId(caseId);
+            caseNumEntity.setNumType(3);
+            caseNumEntity.setNum(modelId.toString());
+            this.save(caseNumEntity);
+        }
+    }
+
+    @Override
+    public void deleteByModel(Integer modelId) {
+        LambdaQueryWrapper<CaseNumEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CaseNumEntity::getNum,modelId.toString());
+        this.remove(wrapper);
+        modelService.removeById(modelId);
+
+    }
 }

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

@@ -0,0 +1,27 @@
+package com.fdkankan.fusion.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.fusion.entity.CasePath;
+import com.fdkankan.fusion.mapper.ICasePathMapper;
+import com.fdkankan.fusion.service.ICasePathService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-12-10
+ */
+@Service
+public class CasePathServiceImpl extends ServiceImpl<ICasePathMapper, CasePath> implements ICasePathService {
+
+    @Override
+    public Object getByCaseId(Integer caseId) {
+        LambdaQueryWrapper<CasePath> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CasePath::getCaseId,caseId);
+        return this.list(wrapper);
+    }
+}

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

@@ -57,7 +57,7 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
     ITmCameraService tmCameraService;
 
     @Override
-    public PageInfo pageList(CaseParam param,String userName) {
+    public PageInfo pageList(CaseParam param) {
         LambdaQueryWrapper<CaseEntity> wrapper = new LambdaQueryWrapper<>();
         if(StringUtils.isNotBlank(param.getCaseTitle())){
             wrapper.like(CaseEntity::getCaseTitle,param.getCaseTitle());
@@ -218,24 +218,8 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
     }
 
     @Override
-    public void addOrUpdate(CaseParam param, String userName) {
-        if(StringUtils.isEmpty(param.getCaseTitle())){
-            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
-        }
-        CaseEntity caseEntity ;
-        if(param.getCaseId() == null){
-            caseEntity = new CaseEntity();
-            TmUser tmUser = tmUserService.getByUserName(userName);
-            caseEntity.setDeptId(tmUser.getDeptId());
-            caseEntity.setUserName(userName);
-        }else {
-            caseEntity = this.getById(param.getCaseId());
-        }
-        caseEntity.setCaseTitle(param.getCaseTitle());
-        caseEntity.setLatAndLong(param.getLatAndLong());
-        caseEntity.setMapUrl(param.getMapUrl());
-        caseEntity.setUpdateTime(null);
-        this.saveOrUpdate(caseEntity);
+    public void addOrUpdate(CaseEntity param) {
+        this.saveOrUpdate(param);
     }
 
     @Override

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

@@ -0,0 +1,42 @@
+package com.fdkankan.fusion.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.fdkankan.fusion.entity.CommonUpload;
+import com.fdkankan.fusion.mapper.ICommonUploadMapper;
+import com.fdkankan.fusion.service.ICommonUploadService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-12-06
+ */
+@Service
+@DS("db2")
+public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, CommonUpload> implements ICommonUploadService {
+
+    @Override
+    public List<CommonUpload> getByStatus(Integer status) {
+        LambdaQueryWrapper<CommonUpload> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CommonUpload::getStatus,status);
+        return this.list(wrapper);
+    }
+
+    @Override
+    public void updateByPath(String msg, String url) {
+        LambdaUpdateWrapper<CommonUpload> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CommonUpload::getUnzipPath,msg);
+        wrapper.set(CommonUpload::getStatus,1);
+        wrapper.set(CommonUpload::getFileUrl,url);
+        this.update(wrapper);
+    }
+}

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

@@ -0,0 +1,20 @@
+package com.fdkankan.fusion.service.impl;
+
+import com.fdkankan.fusion.entity.DictFile;
+import com.fdkankan.fusion.mapper.IDictFileMapper;
+import com.fdkankan.fusion.service.IDictFileService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-12-06
+ */
+@Service
+public class DictFileServiceImpl extends ServiceImpl<IDictFileMapper, DictFile> implements IDictFileService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.fdkankan.fusion.service.impl;
+
+import com.fdkankan.fusion.entity.Dict;
+import com.fdkankan.fusion.mapper.IDictMapper;
+import com.fdkankan.fusion.service.IDictService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-12-06
+ */
+@Service
+public class DictServiceImpl extends ServiceImpl<IDictMapper, Dict> implements IDictService {
+
+}

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

@@ -47,6 +47,8 @@ public class FusionNumServiceImpl extends ServiceImpl<IFusionNumMapper, FusionNu
     ICaseTagPointService caseTagPointService;
     @Autowired
     ICaseViewService caseViewService;
+    @Autowired
+    ICaseNumService caseNumService;
 
     @Override
     public List<FusionNum> getByNum(String num) {
@@ -265,6 +267,7 @@ 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());
         }
     }
 

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

@@ -2,7 +2,9 @@ package com.fdkankan.fusion.task;
 
 import com.fdkankan.fusion.common.util.DateUtils;
 import com.fdkankan.fusion.entity.CaseLive;
+import com.fdkankan.fusion.entity.CommonUpload;
 import com.fdkankan.fusion.service.ICaseLiveService;
+import com.fdkankan.fusion.service.ICommonUploadService;
 import com.fdkankan.redis.util.RedisUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -22,16 +24,6 @@ public class TaskService {
     @Autowired
     ICaseLiveService caseLiveService;
 
-    @Scheduled(initialDelay = 2000, fixedDelay = 1000 * 60)
-    public void run() {
-        List<CaseLive> list = caseLiveService.list();
-        for (CaseLive caseLive : list) {
-            Date hoursTime = DateUtils.getHoursTime(caseLive.getCreateTime());
-            if(hoursTime.getTime() <= new Date().getTime()){
-                caseLiveService.removeById(caseLive);
-            }
-        }
-    }
 
     @Autowired
     RedisUtil redisUtil;

src/main/resources/application-dev.yaml

@@ -1,54 +0,0 @@
-spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource          # 数据源类型：HikariCP
-    driver-class-name: com.mysql.jdbc.Driver          # mysql驱动
-    url: jdbc:mysql://127.0.0.1:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-    username: root
-    password: 4dkk2020cuikuan%
-    hikari:
-      connection-timeout: 30000         # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没可用的连接则发生SQLException， 默认:30秒
-      minimum-idle: 5                   # 最小连接数
-      maximum-pool-size: 20             # 最大连接数
-      auto-commit: true                 # 事务自动提交
-      idle-timeout: 600000              # 连接超时的最大时长（毫秒），超时则被释放（retired），默认:10分钟
-      pool-name: DateSourceHikariCP     # 连接池名字
-      max-lifetime: 1800000             # 连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认:30分钟 1800000ms
-      connection-test-query: SELECT 1   # 连接测试语句
-  redis:
-    host: 120.25.146.52
-    port: 6379
-    timeout: 6000ms
-    password:
-    jedis:
-      pool:
-        max-active: 10  #连接池最大连接数（使用负值表示没有限制）
-        max-idle: 10 # 连接池中的最大空闲连接
-        min-idle: 5 # 连接池中的最小空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-    lettuce:
-      shutdown-timeout: 0ms
-
-4dkk:
-  laserService:
-    #深时（激光）地址 生产环境：https://laser.4dkankan.com/
-    basePath: http://uat-laser.4dkankan.com
-    port: 80
-    #basePath: http://192.168.0.152:8080
-    #port: 8080
-  fdService:
-    #官网生产环境：https://www.4dkankan.com      http://test.4dkankan.com
-    basePath: http://test.4dkankan.com
-    port: 80
-    #basePath: http://192.168.0.38/4dkankan_v2
-    #port: 8080
-  newFdService:
-    #官网生产环境：https://www.4dkankan.com
-    basePath: http://v4-test.4dkankan.com
-    port: 80
-  overallService:
-    #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
-    basePath: http://test.4dkankan.com/qjkankan
-    port: 80
-  takeLookService:
-    basePath: https://v4-test.4dkankan.com
-    port: 80

src/main/resources/application-local.yaml

@@ -1,56 +0,0 @@
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    #120.25.146.52
-    dynamic:
-      primary: db1
-      strict: false
-      datasource:
-        db1:
-          driver-class-name: com.mysql.jdbc.Driver
-          url: jdbc:mysql://120.25.146.52:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-          username: root
-          password: JK123456%JIK
-        db2:
-          driver-class-name: com.mysql.jdbc.Driver
-          url: jdbc:mysql://120.24.144.164:3306/4dkankan_v4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-          username: root
-          password: 4Dage@4Dage#@168
-
-  redis:
-    host: 120.24.144.164
-    port: 6379
-    timeout: 6000ms
-    password: bgh0cae240
-    jedis:
-      pool:
-        max-active: 10  #连接池最大连接数（使用负值表示没有限制）
-        max-idle: 10 # 连接池中的最大空闲连接
-        min-idle: 5 # 连接池中的最小空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-    lettuce:
-      shutdown-timeout: 0ms
-
-4dkk:
-  laserService:
-    #深时（激光）地址 生产环境：https://laser.4dkankan.com/
-    basePath: http://uat-laser.4dkankan.com
-    port: 80
-    #basePath: http://192.168.0.152:8080
-    #port: 8080
-  fdService:
-    #官网生产环境：https://www.4dkankan.com      http://test.4dkankan.com
-    basePath: http://test.4dkankan.com
-    port: 80
-    #basePath: http://192.168.0.38/4dkankan_v2
-    #port: 8080
-  newFdService:
-    #官网生产环境：https://www.4dkankan.com
-    basePath: http://v4-test.4dkankan.com
-    port: 80
-  overallService:
-    #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
-    basePath: http://test.4dkankan.com/qjkankan
-  takeLookService:
-    basePath: https://v4-test.4dkankan.com
-    port: 80

src/main/resources/application-prod.yaml

@@ -1,57 +0,0 @@
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    #120.25.146.52
-    dynamic:
-      primary: db1
-      strict: false
-      datasource:
-        db1:
-          driver-class-name: com.mysql.jdbc.Driver
-          url: jdbc:mysql://172.20.0.5:3306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-          username: fusion
-          password: 3oo19bgh0cae2406
-        db2:
-          driver-class-name: com.mysql.jdbc.Driver
-          url: jdbc:mysql://rm-wz90w10465iiwwv09.mysql.rds.aliyuncs.com:3306/4dkankan_v4_prod?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-          username: root
-          password: D2719bd0cae1a005
-  redis:
-    host: r-wz9owsphxqwi4ztqlf.redis.rds.aliyuncs.com   #官网正式环境
-    port: 6379
-    timeout: 6000ms
-    password: 3oo19bgh0cae2406&
-    jedis:
-      pool:
-        max-active: 10  #连接池最大连接数（使用负值表示没有限制）
-        max-idle: 10 # 连接池中的最大空闲连接
-        min-idle: 5 # 连接池中的最小空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-    lettuce:
-      shutdown-timeout: 0ms
-
-
-4dkk:
-  laserService:
-    #深时（激光）地址 生产环境：https://laser.4dkankan.com/
-    basePath: http://laser.4dkankan.com/backend
-    port: 80
-    #basePath: http://192.168.0.152:8080
-    #port: 8080
-  fdService:
-    #官网生产环境：https://www.4dkankan.com      http://test.4dkankan.com
-    basePath: http://www.4dkankan.com
-    port: 80
-    #basePath: http://192.168.0.38/4dkankan_v2
-    #port: 8080
-  newFdService:
-    #官网生产环境：https://www.4dkankan.com
-    basePath: http://www.4dkankan.com
-    port: 80
-  overallService:
-    #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
-    basePath: http://test.4dkankan.com/qjkankan
-    port: 80
-  takeLookService:
-    basePath: https://www.4dkankan.com
-    port: 80

src/main/resources/application-test.yaml

@@ -1,57 +0,0 @@
-spring:
-  datasource:
-    type: com.alibaba.druid.pool.DruidDataSource
-    #120.25.146.52
-    dynamic:
-      primary: db1
-      strict: false
-      datasource:
-        db1:
-          driver-class-name: com.mysql.jdbc.Driver
-          #url: jdbc:mysql://120.25.146.52:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-          url: jdbc:mysql://127.0.0.1:13306/fd_fusion?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-          username: root
-          password: JK123456%JIK
-        db2:
-          driver-class-name: com.mysql.jdbc.Driver
-          url: jdbc:mysql://172.18.156.39:3306/4dkankan_v4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
-          username: root
-          password: 4Dage@4Dage#@168
-
-  redis:
-    host: 172.18.156.39
-    port: 6379
-    timeout: 6000ms
-    password: bgh0cae240
-    jedis:
-      pool:
-        max-active: 10  #连接池最大连接数（使用负值表示没有限制）
-        max-idle: 10 # 连接池中的最大空闲连接
-        min-idle: 5 # 连接池中的最小空闲连接
-        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
-    lettuce:
-      shutdown-timeout: 0ms
-
-4dkk:
-  laserService:
-    #深时（激光）地址 生产环境：https://laser.4dkankan.com/
-    basePath: http://uat-laser.4dkankan.com
-    port: 80
-    #basePath: http://192.168.0.152:8080
-    #port: 8080
-  fdService:
-    #官网生产环境：https://www.4dkankan.com      http://test.4dkankan.com
-    basePath: http://test.4dkankan.com
-    port: 80
-    #basePath: http://192.168.0.38/4dkankan_v2
-    #port: 8080
-  newFdService:
-    #官网生产环境：https://www.4dkankan.com
-    basePath: http://v4-test.4dkankan.com
-    port: 80
-  overallService:
-    #全景看看生产环境 host: https://www.4dkankan.com/qjkankan
-    basePath: http://test.4dkankan.com/qjkankan
-  takeLookService:
-    basePath: https://v4-test.4dkankan.com
-    port: 80

src/main/resources/application.yaml

@@ -1,74 +0,0 @@
-spring:
-  profiles:
-    active: ${activeProfile:local}
-  servlet:
-    multipart:
-      max-file-size: 1000MB
-      maxRequestSize: 1000MB
-
-server:
-  port: 8808
-  servlet:
-    context-path: /fusion
-  tomcat:
-    max-http-form-post-size: -1
-
-
-
-logging:
-  config: classpath:logback-spring.xml
-  path: /home/backend/4dkankan_v4
-
-mybatis-plus:
-  configuration:
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志
-
-
-
-forest:
-  ## 日志总开关，打开/关闭Forest请求/响应日志（默认为 true）
-  log-enabled: true
-  ## 打开/关闭Forest请求日志（默认为 true）
-  log-request: true
-  ## 打开/关闭Forest响应状态日志（默认为 true）
-  log-response-status: true
-  ## 打开/关闭Forest响应内容日志（默认为 false）
-  log-response-content: true
-  ## 请求超时时间，单位为毫秒, 默认值为3000
-  timeout: 10000
-  ## 连接超时时间，单位为毫秒, 默认值为2000
-  connect-timeout: 10000
-
-upload:
-  type: oss
-  query-path: https://4dkk.4dage.com/
-oss:
-  #point: http://oss-cn-shenzhen-internal.aliyuncs.com
-  point: http://oss-cn-shenzhen-internal.aliyuncs.com
-  key: LTAI5tJwboCj3r4vUNkSmbyX
-  secrey: meDy7VYAWbg8kZCKsoUZcIYQxigWOy
-  bucket: 4dkankan
-  small: ?x-oss-process=image/resize,m_fill,h_%s,w_%s
-
-
-# Sa-Token配置
-sa-token:
-  # token名称 (同时也是cookie名称)
-  token-name: token
-  # token有效期，单位s 默认30天, -1代表永不过期
-  timeout: -1
-  # token临时有效期 (指定时间内无操作就视为token过期) 单位: 秒
-  activity-timeout: -1
-  # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)
-  is-concurrent: true
-  # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token)
-  is-share: false
-  # token风格
-  token-style: uuid
-  jwt-secret-key: XX#$%()(#*!()!KL<><MQLMNQNQJQK&sdfkjsdrow32234545fdf>?N<:{LWPW
-  # 是否输出操作日志
-  is-log: false
-
-fdkk:
-  register:
-    validCode: 2a22bac40f44af4d3b5fdc20ea706fc5

src/main/resources/bootstrap-dev.yml

@@ -0,0 +1,20 @@
+spring:
+  application:
+    name: 4dkankan-fusion
+  cloud:
+    nacos:
+      config:
+        server-addr: 192.168.0.25:8848
+        file-extension: yaml
+        namespace: dev
+        extension-configs:
+          - data-id: 4dkankan-fusion.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+      discovery:
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: ${spring.cloud.nacos.config.namespace}
+
+
+

src/main/resources/bootstrap-test.yml

@@ -0,0 +1,20 @@
+spring:
+  application:
+    name: 4dkankan-fusion
+  cloud:
+    nacos:
+      config:
+        server-addr: 127.0.0.1:8848
+        file-extension: yaml
+        namespace: test
+        extension-configs:
+          - data-id: 4dkankan-fusion.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+      discovery:
+        server-addr: ${spring.cloud.nacos.config.server-addr}
+        namespace: ${spring.cloud.nacos.config.namespace}
+
+
+

src/main/resources/bootstrap.yml

@@ -0,0 +1,8 @@
+spring:
+  profiles:
+    active: dev
+logging:
+  config: classpath:logback-spring.xml
+mybatis-plus:
+  configuration:
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志

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

@@ -1,5 +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.ICameraVersionMapper">
+<mapper namespace="com.fdkankan.fusion.mapper.ICameraVersionAppMapper">
 
 </mapper>

src/main/resources/mapper/fusion/CaseInquestCriminalMapper.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.ICaseInquestCriminalMapper">
+
+</mapper>

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

@@ -1,5 +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.ICameraVersionAppMapper">
+<mapper namespace="com.fdkankan.fusion.mapper.ICaseInquestInfoMapper">
 
 </mapper>

src/main/resources/mapper/fusion/CasePathMapper.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.ICasePathMapper">
+
+</mapper>

src/main/resources/mapper/fusion/CommonUploadMapper.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.ICommonUploadMapper">
+
+</mapper>

src/main/resources/mapper/fusion/DictFileMapper.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.IDictFileMapper">
+
+</mapper>

src/main/resources/mapper/fusion/DictMapper.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.IDictMapper">
+
+</mapper>