1

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

@@ -48,13 +48,14 @@ public class SaTokenConfigure {
                 .addInclude("/**").addExclude("/**/test/**","/**/inner/**","/**/notAuth/**","/**/systemSetting/**","/**/downMD5/**","/**/downDocx/**","/**ws/**")
                 // 认证函数: 每次请求执行
                 .setAuth(obj -> {
+                    SaRouter.match("/**", "/fdLogin", r ->checkLogin() );
                     String pageType = SaHolder.getRequest().getHeader("page-type");
                     String caseId = SaHolder.getRequest().getHeader("caseId");
-                    checkCaseAuth(caseId,pageType);
+                    SaRouter.match("/**", "/case/addScene", r ->checkCaseAuth(caseId,pageType));
+
                     SaRouter.match("/sceneDownLog/list", r -> StpUtil.checkRoleOr("admin-super","admin-system","admin") );
 
                     // 登录认证 -- 拦截所有路由，并排除/user/doLogin 用于开放登录
-                    SaRouter.match("/**", "/fdLogin", r ->checkLogin() );
                     String menu = redisUtil.get(RedisKey.MANAGE_MENU);
                     if(StringUtils.isBlank(menu)){
                         SaRouter.match("/**", r -> StpUtil.checkRole("admin-super"));

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

@@ -69,12 +69,17 @@ public class CaseFilesController extends BaseController{
             throw new BusinessException(ResultCode.MEDIO_NOT_EXIT);
         }
         CaseFiles caseFiles = new CaseFiles();
+        if(param.getFilesId() != null){
+             caseFiles = caseFilesService.getById(param.getFilesId());
+        }
         caseFiles.setCaseId(param.getCaseId());
         caseFiles.setFilesTypeId(param.getFilesTypeId());
         caseFiles.setFilesTitle(commonUpload.getFileName());
         caseFiles.setFilesUrl(commonUpload.getFileUrl());
-        caseFilesService.save(caseFiles);
-        return ResultData.ok();
+        caseFiles.setContent(param.getContent());
+        caseFiles.setImgType(param.getImgType());
+        caseFilesService.saveOrUpdate(caseFiles);
+        return ResultData.ok(caseFiles);
     }
 
     @PostMapping("/updateFileType")

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

@@ -54,12 +54,6 @@ public class HotIconController extends BaseController{
         if(file==null || StringUtils.isEmpty(iconTitle)){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        if(caseId != null){
-            List<HotIcon> hotIconList = hotIconService.getListByCaseId(caseId);
-            if(!hotIconList.isEmpty() && hotIconList.size() >=19){
-                throw new BusinessException(ResultCode.HOST_ICON_LIMIT);
-            }
-        }
 
         String iconUrl = uploadService.uploadFile(file, true, String.format(FilePath.ICON_OSS_PATH,environment,""));
 
@@ -91,6 +85,13 @@ public class HotIconController extends BaseController{
         if(hotIcon.getIconId() == 1){
             return ResultData.ok();
         }
+        HotIcon byId = hotIconService.getById(hotIcon.getIconId());
+        if(byId == null){
+            return ResultData.ok();
+        }
+        if(byId .getIsSystem() == 1){
+            throw new BusinessException(ResultCode.SYSTEM_HOT_ICON_NOT_DELETE);
+        }
         caseTagService.updateDFHotIcon(hotIcon.getIconId());
         hotIconService.removeById(hotIcon.getIconId());
         return ResultData.ok();

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

@@ -124,4 +124,7 @@ public class CaseTag implements Serializable {
 
     @TableField("audio")
     private String audio;
+
+    @TableField("file_name")
+    private String fileName;
 }

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

@@ -57,6 +57,8 @@ public class HotIcon implements Serializable {
     private Integer isNew;
     @TableField("case_id")
     private Integer caseId;
+    @TableField("sort")
+    private Integer sort;
 
     @TableField("tb_status")
     @TableLogic

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

@@ -116,5 +116,6 @@ public class ScenePlus implements Serializable {
     @TableLogic(value = "A",delval = "I")
     private String recStatus;
 
-
+    @TableField("has_ai")
+    private Integer hasAi;
 }

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

@@ -1,6 +1,7 @@
 package com.fdkankan.fusion.request;
 
 import lombok.Data;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Data
 public class AddByMediaLibraryParam {
@@ -9,4 +10,7 @@ public class AddByMediaLibraryParam {
     private Integer filesTypeId;
 
     private Integer filesId;
+
+    private Integer imgType ;
+    private String content;
 }

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

@@ -18,7 +18,7 @@ public interface IHotIconService extends IService<HotIcon> {
 
     List<HotIcon> getListByUserName(String username);
 
-    HotIcon getDefaultIcon();
+    List<HotIcon> getDefaultIcon();
 
     void addUseNum(Integer hotIconId);
 

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

@@ -31,6 +31,7 @@ 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.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.io.InputStream;
@@ -71,7 +72,8 @@ public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCrim
         return caseInquestCriminal;
     }
 
-
+    @Value("${upload.query-path}")
+    private String queryPath;
     @Override
     public void saveByParam(CaseInquestCriminal caseInquestCriminal) {
         if(caseInquestCriminal.getInquestFileId() == null){
@@ -90,6 +92,8 @@ public class CaseInquestCriminalServiceImpl extends ServiceImpl<ICaseInquestCrim
             String localPath = String.format(FilePath.MNTPATH+FilePath.DOC_OSS_PATH,caseFiles.getFilesId(),caseFiles.getFilesTitle()+".docx");
             template.writeToFile(localPath );
             ShellUtil.yunUpload(localPath,localPath.replace(FilePath.MNTPATH,""));
+            caseFiles.setFilesUrl( queryPath +localPath.replace(FilePath.MNTPATH,""));
+            caseFilesService.updateById(caseFiles);
         }catch (Exception e){
             log.info("caseInquestCriminal-保存生成doc文档出错：error",e);
         }

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

@@ -108,7 +108,7 @@ public class CaseNumServiceImpl extends ServiceImpl<ICaseNumMapper, CaseNumEntit
                 model.setType(param.getType());
                 model.setModelType("pointcloud");    //深时点云类型
                 model.setCreateStatus(1);
-                if(param.getType() == 0 || param.getType() == 1 || param.getType() == 4 || param.getType() == 6){           //看看，看见
+                if(param.getType() == 0 || param.getType() == 1 || param.getType() == 4 || param.getType() == 6 || param.getType() == 7){           //看看，看见
                     String mesh3DtilesPath  = String.format(FilePath.OBJ_OSS_PATH,num) + "/images/3dtiles/tileset.json";
                     String sizePath = String.format(FilePath.OBJ_OSS_PATH,num) + "/images/3dtiles";
                     if(uploadToOssUtil.existKey(mesh3DtilesPath)){

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

@@ -56,7 +56,7 @@ public class CaseTagServiceImpl extends ServiceImpl<ICaseTagMapper, CaseTag> imp
 
     @Override
     public void updateDFHotIcon(Integer iconId) {
-        HotIcon defaultIcon = hotIconService.getDefaultIcon();
+        HotIcon defaultIcon = hotIconService.getById(18);
         LambdaUpdateWrapper<CaseTag> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(CaseTag::getHotIconId,iconId)
                 .set(CaseTag::getHotIconId,defaultIcon.getIconId())

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

@@ -43,20 +43,18 @@ public class HotIconServiceImpl extends ServiceImpl<IHotIconMapper, HotIcon> imp
                 .orderByDesc(HotIcon::getIsNew)           // 新增
                 .orderByDesc(HotIcon::getLastUse)         // 上次使用
                 .orderByDesc(HotIcon::getUseNum)          // 使用次数
+                .orderByDesc(HotIcon::getSort)
                 .orderByDesc(HotIcon::getCreateTime);
         return this.list(wrapper);
     }
 
     @Override
-    public HotIcon getDefaultIcon() {
+    public List<HotIcon> getDefaultIcon() {
         LambdaQueryWrapper<HotIcon> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(HotIcon::getIsSystem,1);
         wrapper.orderByDesc(HotIcon::getCreateTime);
         List<HotIcon> list = this.list(wrapper);
-        if(list!= null && list.size() >0){
-            return list.get(0);
-        }
-        return null;
+        return list;
     }
 
     @Override
@@ -96,7 +94,7 @@ public class HotIconServiceImpl extends ServiceImpl<IHotIconMapper, HotIcon> imp
                 hotIconIds.addAll(ids);
             }
         }
-        hotIconIds.add(getDefaultIcon().getIconId());
+        hotIconIds.addAll(getDefaultIcon().stream().map(HotIcon::getIconId).collect(Collectors.toList()));
         LambdaQueryWrapper<HotIcon> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(HotIcon::getCaseId,caseId);
         List<HotIcon> list1 = this.list(wrapper);
@@ -115,10 +113,8 @@ public class HotIconServiceImpl extends ServiceImpl<IHotIconMapper, HotIcon> imp
         LambdaQueryWrapper<HotIcon> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(HotIcon::getIconId,hotIconIds);
         wrapper.orderByDesc(HotIcon::getIsSystem)           // 官方默认
-                .orderByDesc(HotIcon::getIsNew)           // 新增
-                .orderByDesc(HotIcon::getLastUse)         // 上次使用
-                .orderByDesc(HotIcon::getUseNum)          // 使用次数
-                .orderByDesc(HotIcon::getCreateTime);
+                .orderByAsc(HotIcon::getIconTitle)
+                .orderByAsc(HotIcon::getSort);
         return this.list(wrapper);
     }
 }

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

@@ -148,7 +148,7 @@ public class SceneService implements ISceneService {
         }
         List<SceneVo> sceneVoList = new ArrayList<>();
         long total = 0;
-        if(param.getType() == 0 || param.getType() == 1 || param.getType() == 4 || param.getType() == 6){      //看看，看见 ,深时obj
+        if(param.getType() == 0 || param.getType() == 1 || param.getType() == 4 || param.getType() == 6 || param.getType() == 7){      //看看，看见 ,深时obj
             //获取四维(看看，看见)场景数据
             FdkkResponse fdkkResponse = fdKKClient.sceneList(param);
             if(fdkkResponse.getCode() !=0){