1

src/main/java/com/fdkankan/manage/common/EvidenceEnum.java

@@ -6,20 +6,20 @@ import java.util.List;
 import java.util.Map;
 
 public enum EvidenceEnum {
-    sy(1,"手印痕迹", Arrays.asList("zhiwen.png","hand_l.png","hand_r.png","handprint.png")),
-    zj(2,"足迹痕迹", Arrays.asList("zuozuji.png","youzuji.png","xieyin.png","footprint.png")),
-    gj(3,"工具痕迹", Arrays.asList("wrenchAndScrewdriver.png")),
-    stwt(11,"视听物证", Arrays.asList("video.png")),
-    sw(6,"生物物证", Arrays.asList("xuepo.png","xueji.png","virus.png")),
-    qd(4,"枪弹痕迹", Arrays.asList("cartridge.png")),
-    dh(7,"毒化物证", Arrays.asList("poison.png")),
-    lh(8,"理化物证", Arrays.asList("physics_and_chemistry.png")),
-    wj(9,"文检物证", Arrays.asList("folder_close.png")),
-    ts(5,"特殊物证", Arrays.asList("check.png")),
-    qt(12,"其它物证（痕迹物证）", Arrays.asList("case_other.png","dot.png")),
-    dz(10,"电子物证", Arrays.asList("electronic.png")),
-    tq(17,"提取物品", Arrays.asList("cube.png")),
-    st(18,"尸体", Arrays.asList("shitiz.png","shitib.png","shitifuhao.png","corpse.png")),
+    sy(1,"手印痕迹", Arrays.asList("zhiwen.svg","hand_l.svg","hand_r.svg","handprint.svg")),
+    zj(2,"足迹痕迹", Arrays.asList("zuozuji.svg","youzuji.svg","xieyin.svg","footprint.svg")),
+    gj(3,"工具痕迹", Arrays.asList("wrenchAndScrewdriver.svg")),
+    stwt(11,"视听物证", Arrays.asList("video.svg")),
+    sw(6,"生物物证", Arrays.asList("xuepo.svg","xueji.svg","virus.svg")),
+    qd(4,"枪弹痕迹", Arrays.asList("cartridge.svg")),
+    dh(7,"毒化物证", Arrays.asList("poison.svg")),
+    lh(8,"理化物证", Arrays.asList("physics_and_chemistry.svg")),
+    wj(9,"文检物证", Arrays.asList("folder_close.svg")),
+    ts(5,"特殊物证", Arrays.asList("check.svg")),
+    qt(12,"其它物证（痕迹物证）", Arrays.asList("case_other.svg","dot.svg")),
+    dz(10,"电子物证", Arrays.asList("electronic.svg")),
+    tq(17,"提取物品", Arrays.asList("cube.svg")),
+    st(18,"尸体", Arrays.asList("shitiz.svg","shitib.svg","shitifuhao.svg","corpse.svg")),
     ;
 
 

src/main/java/com/fdkankan/manage/controller/inner/InnerAPIController.java

@@ -28,16 +28,19 @@ import com.fdkankan.manage.vo.response.ManageLoginResponse;
 import com.fdkankan.manage.vo.response.UserAuthSceneVo;
 import com.fdkankan.manage.vo.response.UserShareSceneVo;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/service/manage/inner")
+@Slf4j
 public class InnerAPIController extends BaseController {
 
     @Autowired
@@ -632,43 +635,19 @@ public class InnerAPIController extends BaseController {
 
     @PostMapping("/addMediaLibrary")
     public ResultData addMediaLibrary(@RequestBody addMediaLibraryParam param){
-        if(StringUtils.isBlank(param.getFilePath())){
-            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
-        }
+        dictFileService.addMediaLibrary(param);
 
-        String uuid = UUID.randomUUID().toString().replace("-","");
-        String extName = param.getFilePath().substring(param.getFilePath().lastIndexOf(".")).toLowerCase();
+        return ResultData.ok();
+    }
 
-        FileTypeEnum fileTypeEnum = FileTypeEnum.getByType(extName.replace(".", ""));
-        if(fileTypeEnum == null){
-            throw new BusinessException(ResultCode.FILE_TYPE_ERROR2);
+    @PostMapping("/addMediaLibrarys")
+    public ResultData addMediaLibrarys(@RequestBody addMediaLibraryParams param){
+        for (addMediaLibraryParam paramParam : param.getParams()) {
+            dictFileService.checkMediaLibrary(paramParam);
+        }
+        for (addMediaLibraryParam paramParam : param.getParams()) {
+            dictFileService.addMediaLibrary(paramParam);
         }
-
-        String ossPath = String.format(OssPath.MANAGE_MODEL_FILE_PATH, uuid+ extName);
-        fYunFileServiceInterface.copyFileInBucket(param.getFilePath(),ossPath);
-
-        CommonUpload  commonUpload = new CommonUpload();
-        commonUpload.setFileName(param.getFileName());
-        commonUpload.setFileUrl(manageConfig.getQueryPath() + ossPath);
-        commonUpload.setFileSize(param.getFileSize());
-        commonUpload.setFileType(fileTypeEnum.getCode());
-        commonUpload.setFileTypeStr(fileTypeEnum.getMsg());
-        commonUpload.setFileFormat(extName);
-        commonUpload.setResultFileFormat(extName);
-        commonUpload.setStatus(1);
-        commonUpload.setUseType("trace_evidence");
-        commonUploadService.saveOrUpdate(commonUpload);
-
-        DictFile dictFile  = new DictFile();
-        dictFile.setName(param.getFileName());
-        dictFile.setTypeKey("media-library");
-        dictFile.setSysUserId(Long.valueOf(StpUtil.getLoginId().toString()));
-        dictFile.setUseType("trace_evidence");
-        dictFile.setUploadId(commonUpload.getId());
-        dictFile.setKno(param.getKno());
-        dictFile.setContent(param.getContent());
-        dictFileService.saveOrUpdate(dictFile);
-
         return ResultData.ok();
     }
 }

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

@@ -3,6 +3,7 @@ package com.fdkankan.manage.service;
 import com.fdkankan.manage.entity.DictFile;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.vo.request.DictFileParam;
+import com.fdkankan.manage.vo.request.addMediaLibraryParam;
 
 /**
  * <p>
@@ -24,4 +25,8 @@ public interface IDictFileService extends IService<DictFile> {
     void updateDictId(Integer dictId, Integer UpDictId);
 
     DictFile getByEvidenceNo(String evidenceNo);
+
+    void addMediaLibrary(addMediaLibraryParam param);
+
+    void checkMediaLibrary(addMediaLibraryParam param);
 }

src/main/java/com/fdkankan/manage/service/impl/CommonServiceImpl.java

@@ -274,4 +274,5 @@ public class CommonServiceImpl implements ICommonService {
         FileUtil.del(unzipPath);
         return ossUrlPrefix +  ossPath + "/webcloud";
     }
+
 }

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

@@ -4,8 +4,11 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
+import com.fdkankan.manage.common.OssPath;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
+import com.fdkankan.manage.config.ManageConfig;
 import com.fdkankan.manage.constant.FileTypeEnum;
 import com.fdkankan.manage.entity.CommonUpload;
 import com.fdkankan.manage.entity.Dict;
@@ -17,15 +20,19 @@ import com.fdkankan.manage.service.IDictFileService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.manage.service.IDictService;
 import com.fdkankan.manage.vo.request.DictFileParam;
+import com.fdkankan.manage.vo.request.addMediaLibraryParam;
 import com.fdkankan.manage.vo.response.DictFileVo;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -37,6 +44,7 @@ import java.util.stream.Collectors;
  * @since 2024-12-02
  */
 @Service
+@Slf4j
 public class DictFileServiceImpl extends ServiceImpl<IDictFileMapper, DictFile> implements IDictFileService {
 
     @Autowired
@@ -97,4 +105,71 @@ public class DictFileServiceImpl extends ServiceImpl<IDictFileMapper, DictFile>
         }
         return list.get(0);
     }
+
+    @Autowired
+    private FYunFileServiceInterface fYunFileServiceInterface;
+    @Autowired
+    ManageConfig manageConfig;
+
+    @Override
+    public void checkMediaLibrary(addMediaLibraryParam param) {
+        if(StringUtils.isBlank(param.getFilePath())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+
+        String extName = param.getFilePath().substring(param.getFilePath().lastIndexOf(".")).toLowerCase();
+
+        FileTypeEnum fileTypeEnum = FileTypeEnum.getByType(extName.replace(".", ""));
+        if(fileTypeEnum == null){
+            throw new BusinessException(ResultCode.FILE_TYPE_ERROR2);
+        }
+    }
+
+    @Override
+    public void addMediaLibrary(addMediaLibraryParam param) {
+
+        if(StringUtils.isBlank(param.getFilePath())){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+
+        String uuid = UUID.randomUUID().toString().replace("-","");
+        String extName = param.getFilePath().substring(param.getFilePath().lastIndexOf(".")).toLowerCase();
+
+        FileTypeEnum fileTypeEnum = FileTypeEnum.getByType(extName.replace(".", ""));
+        if(fileTypeEnum == null){
+            throw new BusinessException(ResultCode.FILE_TYPE_ERROR2);
+        }
+
+        String ossPath = String.format(OssPath.MANAGE_MODEL_FILE_PATH, uuid+ extName);
+        fYunFileServiceInterface.copyFileInBucket(param.getFilePath(),ossPath);
+        try {
+            if(param.getDelSource() == 1){
+                fYunFileServiceInterface.deleteFile(param.getFilePath());
+            }
+        } catch (IOException e) {
+            log.info("删除原文件失败");
+        }
+
+        CommonUpload  commonUpload = new CommonUpload();
+        commonUpload.setFileName(param.getFileName());
+        commonUpload.setFileUrl(manageConfig.getQueryPath() + ossPath);
+        commonUpload.setFileSize(param.getFileSize());
+        commonUpload.setFileType(fileTypeEnum.getCode());
+        commonUpload.setFileTypeStr(fileTypeEnum.getMsg());
+        commonUpload.setFileFormat(extName);
+        commonUpload.setResultFileFormat(extName);
+        commonUpload.setStatus(1);
+        commonUpload.setUseType("trace_evidence");
+        commonUploadService.saveOrUpdate(commonUpload);
+
+        DictFile dictFile  = new DictFile();
+        dictFile.setName(param.getFileName());
+        dictFile.setTypeKey("media-library");
+        dictFile.setSysUserId(Long.valueOf(StpUtil.getLoginId().toString()));
+        dictFile.setUseType("trace_evidence");
+        dictFile.setUploadId(commonUpload.getId());
+        dictFile.setKno(param.getKno());
+        dictFile.setContent(param.getContent());
+        this.saveOrUpdate(dictFile);
+    }
 }

src/main/java/com/fdkankan/manage/service/impl/ScenePlusServiceImpl.java

@@ -171,7 +171,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
             excelService.commonExport(listBuildLog,BuildLog.class,buildLogPath +"/build.xlsx");
         }
 
-        String modelingLogPath = "www/VR/4dkankan/modeling-control/logs";
+        String modelingLogPath = "/www/VR/4dkankan/modeling-control/logs";
         File modelingLogFile = new File(buildLogPath + "/logs");
         FileUtil.copyContent(new File(modelingLogPath),modelingLogFile,true);
 

src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -173,19 +173,6 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         if( StringUtils.isBlank(param.getRyId()) || StringUtils.isBlank(param.getRyNo())){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
-        if(StringUtils.isNotBlank(param.getPassword())){
-            try {
-                String  password = AesUtil.desEncrypt(param.getPassword());
-                if(StringUtils.isBlank(password)){
-                    throw new BusinessException(ResultCode.PASSWORD_ERROR_G);
-                }
-                String passwordMd52 = SecurityUtil.MD52(password);
-                param.setPassword(passwordMd52);
-            }catch (Exception e){
-                log.info("解密失败：{}",param.getPassword());
-            }
-
-        }
 
         JyUser jyUser = jyUserService.getByRyId(param.getRyId());
 

src/main/java/com/fdkankan/manage/vo/request/addMediaLibraryParam.java

@@ -9,4 +9,6 @@ public class addMediaLibraryParam {
     private String filePath;
     private String content;
     private String fileSize;
+    private Integer delSource = 0;
+    private Integer toHaixin = 0;
 }

src/main/java/com/fdkankan/manage/vo/request/addMediaLibraryParams.java

@@ -0,0 +1,10 @@
+package com.fdkankan.manage.vo.request;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class addMediaLibraryParams {
+    private List<addMediaLibraryParam> params;
+}

src/main/resources/evidence-icon/dot.svg

@@ -0,0 +1,3 @@
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M213.331 127.997C213.331 175.126 175.126 213.331 127.997 213.331C80.8691 213.331 42.6641 175.126 42.6641 127.997C42.6641 80.8691 80.8691 42.6641 127.997 42.6641C175.126 42.6641 213.331 80.8691 213.331 127.997Z" fill="#007BFF"/>
+</svg>

src/main/resources/evidence-icon/folder_close.svg

@@ -0,0 +1,3 @@
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M232 47.92H128.072V40C128.072 26.744 117.328 16 104.072 16H24C10.744 16 0 26.744 0 40V216C0 229.256 10.744 240 24 240H232C245.256 240 256 229.256 256 216V71.92C256 58.664 245.256 47.92 232 47.92ZM240 212C240 218.624 234.624 224 228 224H28C21.376 224 16 218.624 16 212V112H240V212ZM240 96H16V44C16 37.376 21.376 32 28 32H100.072C106.696 32 112.072 37.376 112.072 44V63.92H228C234.624 63.92 240 69.296 240 75.92V96Z" fill="white"/>
+</svg>

src/main/resources/evidence-icon/xieyin.svg

@@ -0,0 +1,4 @@
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M77.3178 59.0129C70.9267 79.4137 77.17 100.795 84.524 120.882L94.939 149.331H160.322L172.336 117.005C178.473 100.493 183.988 83.117 179.951 65.9971C173.802 39.9219 155.393 10.6641 127.632 10.6641C102.008 10.6641 84.801 35.1258 77.3178 59.0129Z" fill="white"/>
+<path d="M93.9409 170.664H162.091C162.908 175.407 164.386 180.339 165.887 185.35C169.636 197.865 173.53 210.866 167.647 222.611C161.297 235.411 150.071 245.331 128.299 245.331H127.619C105.847 245.331 94.6212 235.517 88.2712 222.611C82.3778 210.599 86.5273 196.731 90.4259 183.702C91.7669 179.22 93.0782 174.838 93.9409 170.664Z" fill="white"/>
+</svg>

src/main/resources/evidence-icon/xuepo.svg

@@ -0,0 +1,3 @@
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M76.1614 210.64C82.0934 223.999 132.025 223.862 144.116 223.999C156.206 224.136 202.72 209.295 201.639 192.458C200.557 175.622 181.362 181.925 184.017 161.357C186.672 140.79 245.342 122.299 245.331 97.0077C245.303 34.6841 101.335 15.3122 68.5189 47.0026C35.7027 78.6929 81.5901 72.4956 80.3828 83.3664C77.4482 109.802 5.63736 107.772 10.9442 136.477C16.2511 165.181 91.3993 159.155 101.335 177.775C109.17 192.458 70.2295 197.281 76.1614 210.64Z" fill="white"/>
+</svg>

src/main/resources/evidence-icon/youzuji.svg

@@ -0,0 +1,8 @@
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M105.213 27.9901C106.028 17.9723 100.754 10.9095 92.22 10.6693C83.7098 10.429 75.4871 18.5489 74.72 27.942C74.0008 36.9507 80.3056 44.9265 88.4324 45.3109C97.2783 45.6952 104.35 38.4162 105.213 27.9901Z" fill="white"/>
+<path d="M154.618 53.0778C161.114 50.7956 165.214 41.7388 162.936 34.724C160.683 27.8294 153.779 24.1538 147.21 26.412C140.21 28.8143 136.495 36.9582 138.916 44.5255C141.073 51.3001 148.361 55.264 154.618 53.0778Z" fill="white"/>
+<path d="M137.647 26.2484C139.037 33.8398 133.524 42.6803 126.452 44.1217C119.643 45.5391 112.667 40.3981 111.373 33.047C109.911 24.8791 114.897 16.9514 122.496 15.4619C129.592 14.0205 136.281 18.8012 137.647 26.2724V26.2484Z" fill="white"/>
+<path d="M168.907 68.2036C174.78 68.4198 180.821 62.5341 181.181 56.264C181.54 50.0901 177.177 45.0211 171.304 44.7569C164.999 44.4926 159.51 49.7778 159.102 56.5283C158.719 62.5822 163.273 67.9874 168.907 68.2036Z" fill="white"/>
+<path d="M180.728 89.3464C173.417 89.0581 171.499 84.0132 171.715 78.2476C172.841 72.6742 175.79 67.6774 183.509 68.35C190.749 68.9746 192.523 74.1396 191.876 79.665C191.18 85.3105 187.656 89.6587 180.728 89.3704V89.3464Z" fill="white"/>
+<path d="M126.642 53.4484C163.775 65.6042 193.166 104.33 169.768 138.371V138.395C152.807 166.775 152.998 181.013 153.18 194.608C153.307 204.109 153.429 213.296 147.69 226.776C133.666 255.701 85.2648 249.575 80.5662 217.167C80.2105 204.157 84.6324 197.815 89.0286 191.509C94.1139 184.215 99.1649 176.97 96.7477 159.511C98.7104 144.07 92.5019 129.803 86.2784 115.501C81.7837 105.173 77.2812 94.8259 75.8436 84.006C73.6381 55.13 99.9361 42.3016 126.642 53.4484Z" fill="white"/>
+</svg>

src/main/resources/evidence-icon/zuozuji.svg

@@ -0,0 +1,8 @@
+<svg width="256" height="256" viewBox="0 0 256 256" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M161.45 27.9901C160.635 17.9723 165.909 10.9095 174.443 10.6693C182.953 10.429 191.176 18.5489 191.943 27.942C192.662 36.9507 186.357 44.9265 178.231 45.3109C169.385 45.6952 162.313 38.4162 161.45 27.9901Z" fill="white"/>
+<path d="M112.045 53.0778C105.549 50.7956 101.449 41.7388 103.727 34.724C105.98 27.8294 112.884 24.1538 119.453 26.412C126.453 28.8143 130.169 36.9582 127.747 44.5255C125.59 51.3001 118.302 55.264 112.045 53.0778Z" fill="white"/>
+<path d="M129.016 26.2484C127.626 33.8398 133.139 42.6803 140.211 44.1217C147.02 45.5391 153.996 40.3981 155.29 33.047C156.752 24.8791 151.766 16.9514 144.167 15.4619C137.071 14.0205 130.383 18.8012 129.016 26.2724V26.2484Z" fill="white"/>
+<path d="M97.7561 68.2036C91.8828 68.4198 85.8417 62.5341 85.4821 56.264C85.1225 50.0901 89.4855 45.0211 95.3588 44.7569C101.664 44.4926 107.153 49.7778 107.561 56.5283C107.944 62.5822 103.39 67.9874 97.7561 68.2036Z" fill="white"/>
+<path d="M85.9346 89.3464C93.2463 89.0581 95.1641 84.0132 94.9484 78.2476C93.8216 72.6742 90.873 67.6774 83.1538 68.35C75.9141 68.9746 74.1401 74.1396 74.7874 79.665C75.4826 85.3105 79.0065 89.6587 85.9346 89.3704V89.3464Z" fill="white"/>
+<path d="M140.021 53.4484C102.888 65.6042 73.4972 104.33 96.8946 138.371V138.395C113.856 166.775 113.665 181.013 113.483 194.608C113.356 204.109 113.234 213.296 118.973 226.776C132.997 255.701 181.398 249.575 186.097 217.167C186.452 204.157 182.031 197.815 177.634 191.509C172.549 184.215 167.498 176.97 169.915 159.511C167.953 144.07 174.161 129.803 180.385 115.501C184.879 105.173 189.382 94.8259 190.819 84.006C193.025 55.13 166.727 42.3016 140.021 53.4484Z" fill="white"/>
+</svg>