1

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

@@ -0,0 +1,109 @@
+package com.fdkankan.fusion.common.util;
+
+import cn.hutool.core.io.FileUtil;
+import com.fdkankan.fusion.response.FileInfoVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.io.File;
+import java.nio.charset.Charset;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Component
+@Slf4j
+public class LocalToOssUtil {
+
+    @Value("${oss.bucket:4dkankan}")
+    private String bucket;
+
+    @Value("${oss.basePath:/oss/}")
+    private String basePath;
+
+    private String getOssPath(String bucket, String filePath) {
+        return basePath.concat(bucket).concat(File.separator).concat(filePath);
+
+    }
+
+    public boolean existKey(String objectName) {
+        return FileUtil.exist(getOssPath(bucket, objectName));
+    }
+
+
+    public boolean downFormAli(String objectName, String localPath) {
+        try {
+            FileUtil.copy(getOssPath(bucket, objectName), localPath, true);
+        }catch (Exception e){
+            log.info("下载文件失败,remoteFilePath：{}，localPath:{}", objectName, localPath);
+            log.info("下载文件失败", e);
+            return false;
+        }
+        return true;
+    }
+
+    public String uploadFile(String bucket, String filePath, String remoteFilePath, Map<String, String> headers) {
+        try {
+            if (!new File(filePath).exists()) {
+                log.warn("文件不存在：{}", filePath);
+                return null;
+            }
+            FileUtil.copy(filePath, getOssPath(bucket, remoteFilePath), true);
+            //FileUtils.contentEqualsIgnoreEOL(new File(filePath),new File(getOssPath(bucket, remoteFilePath)), "UTF-8");
+        }catch (Exception e){
+            log.error("上传文件失败，filePath:{},remoteFilePath:{}", filePath, remoteFilePath);
+            log.error("上传文件失败", e);
+        }
+
+        return null;
+    }
+    public void uploadOss(String filePath, String key1) {
+        uploadFile(bucket, filePath, key1, null);
+    }
+
+    public void delete(String objectName) {
+        FileUtil.del(getOssPath(bucket, objectName));
+
+    }
+
+    public void uploadFileOss(File file) {
+        if(file.isFile()){
+            String ossPath = file.getPath();
+            ossPath = ossPath.replace("/mnt/","");
+            ossPath =  ossPath.replace("\\","/");
+            this.uploadOss(file.getPath(),ossPath);
+        }else {
+            File[] files = file.listFiles();
+            for (File file1 : files) {
+                uploadFileOss(file1);
+            }
+        }
+
+    }
+
+    public List<String> listKeysFromAli(String sourcePath) {
+        return FileUtil.loopFiles(getOssPath(bucket, sourcePath)).stream()
+                .map(f -> f.getAbsolutePath().replace(basePath.concat(bucket).concat(File.separator), ""))
+                .collect(Collectors.toList());
+    }
+
+    public void copyFile(String sourcePath, String targetPath) {
+        try {
+            FileUtil.copyContent(new File(getOssPath(bucket, sourcePath)), new File(getOssPath(bucket, targetPath)), true);
+        }catch (Exception e){
+            log.error("复制文件失败，sourcePath:{},targetPath:{}",sourcePath,targetPath);
+            log.error("复制文件失败", e);
+        }
+    }
+
+    public FileInfoVo getFileInfo(String filePath) {
+        return MD5Checksum.getFileInfo(getOssPath(bucket, filePath));
+    }
+
+    public Long getSize(String filePath) {
+        String ossPath = getOssPath(bucket, filePath);
+        return new File(ossPath).length();
+    }
+}

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

@@ -9,6 +9,7 @@ import com.fdkankan.fusion.response.FileInfoVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
@@ -25,21 +26,28 @@ import java.util.stream.Collectors;
 public class UploadToOssUtil {
 
 
-	@Value("${oss.point:http://oss-cn-shenzhen-internal.aliyuncs.com}")
+	@Value("${oss.point}")
 	private String point;
 
-	@Value("${oss.key:LTAIUrvuHqj8pvry}")
+	@Value("${oss.key}")
 	private String key;
 
-	@Value("${oss.secrey:JLOVl0k8Ke0aaM8nLMMiUAZ3EiiqI4}")
+	@Value("${oss.secrey}")
 	private String secrey;
 
 	@Value("${oss.bucket:4dkankan}")
 	private String bucket;
 
+	@Value("${upload.type:oss}")
+	private String type;
+
 	@Value("${upload.query-path}")
 	private String queryPath;
 
+	@Autowired
+	LocalToOssUtil localToOssUtil;
+
+
 	/**
 	 * 获取文件内容-阿里云
 	 * @param objectName
@@ -47,6 +55,9 @@ public class UploadToOssUtil {
 	 */
 	public boolean existKey(String objectName){
 		//创建oss客户端
+		if("local".equals(type)){
+			return localToOssUtil.existKey(objectName);
+		}
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		// ossObject包含文件所在的存储空间名称、文件名称、文件元信息以及一个输入流。
 		try{
@@ -69,6 +80,9 @@ public class UploadToOssUtil {
 	 * @return
 	 */
 	public boolean downFormAli(String objectName, String localPath){
+		if("local".equals(type)){
+			return localToOssUtil.downFormAli(objectName,localPath);
+		}
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		try {
 			com.aliyun.oss.model.GetObjectRequest request  = new com.aliyun.oss.model.GetObjectRequest(bucket,objectName);
@@ -91,6 +105,10 @@ public class UploadToOssUtil {
 
 
 	public  void uploadOss(String filePath, String key1){
+		if("local".equals(type)){
+			localToOssUtil.uploadOss(filePath,key1);
+			return ;
+		}
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		try {
 			log.info("upload-to-oss:file-path:{},oss-path:{}",filePath,key1);
@@ -108,6 +126,10 @@ public class UploadToOssUtil {
 		}
 	}
 	public void delete(String objectName){
+		if("local".equals(type)){
+			localToOssUtil.delete(objectName);
+			return ;
+		}
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		try {
 			ossClient.deleteObject(bucket, objectName);
@@ -125,6 +147,9 @@ public class UploadToOssUtil {
 	 * @return
 	 */
 	public List<String> listKeysFromAli(String sourcePath) {
+		if("local".equals(type)){
+			return localToOssUtil.listKeysFromAli(sourcePath);
+		}
 		List<String> keyList = new ArrayList<>();
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		try {
@@ -201,6 +226,10 @@ public class UploadToOssUtil {
 	}
 
 	public  void uploadFileOss(File file) {
+		if("local".equals(type)){
+			localToOssUtil.uploadFileOss(file);
+			return ;
+		}
 		if(file.isFile()){
 			String ossPath = file.getPath();
 			ossPath = ossPath.replace("/mnt/","");
@@ -215,6 +244,11 @@ public class UploadToOssUtil {
 	}
 
 	public void copyFile( String sourcePath, String targetPath) {
+		if("local".equals(type)){
+			 localToOssUtil.copyFile(sourcePath,targetPath);
+			return;
+		}
+
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 
 		try {
@@ -287,6 +321,9 @@ public class UploadToOssUtil {
 	}
 
 	public FileInfoVo getFileInfo(String filePath){
+		if("local".equals(type)){
+			return localToOssUtil.getFileInfo(filePath);
+		}
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		try {
 			GetObjectRequest getObjectMetadataRequest = new GetObjectRequest(bucket, filePath);
@@ -308,6 +345,9 @@ public class UploadToOssUtil {
 	}
 
 	public Long getSize(String filePath){
+		if("local".equals(type)){
+			return localToOssUtil.getSize(filePath);
+		}
 		OSSClient ossClient = new OSSClient(point, key, secrey);
 		Long total = 0L;
 		try {

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

@@ -1,20 +1,28 @@
 package com.fdkankan.fusion.controller;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.entity.CameraVersion;
 import com.fdkankan.fusion.entity.CameraVersionApp;
+import com.fdkankan.fusion.entity.TmUser;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.request.CameraVersionParam;
+import com.fdkankan.fusion.response.CameraVersionVo;
 import com.fdkankan.fusion.service.ICameraVersionAppService;
 import com.fdkankan.fusion.service.ICameraVersionService;
+import com.fdkankan.fusion.service.ITmUserService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -30,6 +38,8 @@ public class CameraVersionAppController {
 
     @Autowired
     ICameraVersionAppService cameraVersionAppService;
+    @Autowired
+    ITmUserService tmUserService;
 
     /**
      * 上传文件
@@ -65,7 +75,23 @@ public class CameraVersionAppController {
 
     @PostMapping("/list")
     public ResultData list(@RequestBody CameraVersionParam param){
-        return ResultData.ok(cameraVersionAppService.pageList(param));
+        Page<CameraVersionApp> page = cameraVersionAppService.pageList(param);
+        List<CameraVersionVo> voList = new ArrayList<>();
+        for (CameraVersionApp record : page.getRecords()) {
+            CameraVersionVo vo = new CameraVersionVo();
+            BeanUtils.copyProperties(record,vo);
+            if(record.getSysUserId() !=null){
+                TmUser user = tmUserService.getById(record.getSysUserId());
+                if(user != null){
+                    vo.setCreateName(user.getNickName());
+                }
+            }
+            voList.add(vo);
+        }
+        Page<CameraVersionVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
+        voPage.setRecords(voList);
+        voPage.setTotal(page.getTotal());
+        return ResultData.ok(PageInfo.PageInfo(voPage));
     }
 }
 

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

@@ -1,18 +1,27 @@
 package com.fdkankan.fusion.controller;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.entity.CameraVersion;
+import com.fdkankan.fusion.entity.CameraVersionApp;
+import com.fdkankan.fusion.entity.TmUser;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.request.CameraVersionParam;
+import com.fdkankan.fusion.response.CameraVersionVo;
 import com.fdkankan.fusion.service.ICameraVersionService;
+import com.fdkankan.fusion.service.ITmUserService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -28,6 +37,8 @@ public class CameraVersionController {
 
     @Autowired
     ICameraVersionService cameraVersionService;
+    @Autowired
+    ITmUserService tmUserService;
 
     /**
      * 上传文件
@@ -63,7 +74,23 @@ public class CameraVersionController {
 
     @PostMapping("/list")
     public ResultData list(@RequestBody CameraVersionParam param){
-        return ResultData.ok(cameraVersionService.pageList(param));
+        Page<CameraVersion> page = cameraVersionService.pageList(param);
+        List<CameraVersionVo> voList = new ArrayList<>();
+        for (CameraVersion record : page.getRecords()) {
+            CameraVersionVo vo = new CameraVersionVo();
+            BeanUtils.copyProperties(record,vo);
+            if(record.getSysUserId() !=null){
+                TmUser user = tmUserService.getById(record.getSysUserId());
+                if(user != null){
+                    vo.setCreateName(user.getNickName());
+                }
+            }
+            voList.add(vo);
+        }
+        Page<CameraVersionVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
+        voPage.setRecords(voList);
+        voPage.setTotal(page.getTotal());
+        return ResultData.ok(PageInfo.PageInfo(voPage));
     }
 }
 

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

@@ -69,21 +69,8 @@ public class CaseController extends BaseController{
 
     @GetMapping("/getInfo")
     public ResultData getInfo(@RequestParam(required = false)Integer caseId){
-        CaseEntity caseEntity = caseService.getById(caseId);
-        if(caseEntity == null){
-            return ResultData.ok();
-        }
-        CaseVo caseVo = new CaseVo();
-        BeanUtil.copyProperties(caseEntity,caseVo);
-        if(caseEntity.getTmProjectId() != null){
-            TmProject tmProject = tmProjectService.getById(caseEntity.getTmProjectId());
-            if(tmProject!= null && tmProject.getIsDelete()!=0){
-                throw  new BusinessException(ResultCode.CASE_NOT_EXITS);
-            }
-            caseVo.setTmProject(tmProject);
-            caseVo.setCaseTitle(tmProject.getProjectName());
-        }
-        return ResultData.ok(caseVo);
+
+        return ResultData.ok(caseService.getInfo(caseId));
     }
 
     @PostMapping("/copyCase")

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

@@ -0,0 +1,156 @@
+package com.fdkankan.fusion.down;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.controller.*;
+import com.fdkankan.fusion.entity.CaseFusion;
+import com.fdkankan.fusion.entity.CaseTag;
+import com.fdkankan.fusion.entity.CaseVideoFolder;
+import com.fdkankan.fusion.entity.FusionGuide;
+import com.fdkankan.fusion.request.CaseParam;
+import com.fdkankan.fusion.response.FusionNumVo;
+import com.fdkankan.fusion.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class CaseDownService {
+
+    @Value("${server.servlet.context-path}")
+    String basePath;
+
+    public static String jsonDataName = "data.json";
+    public static String caseInfo =     "/case/getInfo?caseId=";
+    public static String caseSettingsInfo =     "/caseSettings/info?caseId=";
+    public static String hostIcon =     "/edit/hotIcon/list?caseId=";
+    public static String caseView =     "/caseView/allList?caseId=";
+    public static String caseFiles =      "/caseFiles/allList?caseId=";
+    public static String caseFilesType =      "/caseFilesType/allList?caseId=";
+    public static String caseScene =      "/case/sceneList?caseId=";
+    public static String caseFusion =      "/caseFusion/list?caseId=";
+    public static String caseVideoFolder =      "/caseVideoFolder/allList?caseId=";
+    public static String caseVideo =      "/caseVideo/allList?folderId=";
+    public static String caseTag =      "/caseTag/allList?caseId=";
+    public static String caseTagPoint =      "/caseTagPoint/allList?tagId=";
+    public static String caseInquest =      "/caseInquest/info?caseId=";
+    public static String caseExtractDetail =      "/caseExtractDetail/info?caseId=";
+    public static String fusionGuide =      "/fusionGuide/allList?caseId=";
+    public static String fusionGuidePath =     "/fusionGuidePath/allList?guideId=";
+    public static String fusionMeter =      "/fusionMeter/allList?fusionId=";
+
+    public static String model =      "/model/getInfo?modelId=";
+
+
+    @Autowired
+    ICaseService caseService;
+    @Autowired
+    ICaseSettingsService caseSettingsService;
+    @Autowired
+    IFusionNumService fusionNumService;
+    @Autowired
+    ICaseViewService caseViewService;
+    @Autowired
+    ICaseVideoFolderService caseVideoFolderService;
+    @Autowired
+    ICaseVideoService caseVideoService;
+    @Autowired
+    ICaseFilesService caseFilesService;
+    @Autowired
+    ICaseFilesTypeService caseFilesTypeService;
+    @Autowired
+    IHotIconService hotIconService;
+    @Autowired
+    ICaseTagService caseTagService;
+    @Autowired
+    ICaseTagPointService caseTagPointService;
+    @Autowired
+    IFusionGuideService fusionGuideService;
+    @Autowired
+    IFusionGuidePathService fusionGuidePathService;
+    @Autowired
+    ICaseInquestService caseInquestService;
+    @Autowired
+    ICaseExtractDetailService caseExtractDetailService;
+    @Autowired
+    IFusionMeterService fusionMeterService;
+    @Autowired
+    IModelService modelService;
+
+    public void createDataJson(Integer caseId){
+        JSONObject jsonObject = new JSONObject();
+        CaseParam param = new CaseParam();
+        param.setCaseId(caseId);
+
+        jsonObject.put(basePath+caseInfo+caseId,
+                ResultData.ok(caseService.getInfo(caseId)));
+
+        jsonObject.put(basePath+caseSettingsInfo+caseId,
+                ResultData.ok(caseSettingsService.getByCaseId(caseId)));
+
+        List<FusionNumVo> listByCaseId = fusionNumService.getListByCaseId(caseId,null);
+        jsonObject.put(basePath+caseFusion+caseId,
+                ResultData.ok(listByCaseId));
+        for (FusionNumVo fusion : listByCaseId) {
+            jsonObject.put(basePath+fusionMeter+fusion.getFusionId(),
+                    ResultData.ok(fusionMeterService.getListByFusionId(fusion.getFusionId(),null)));
+
+            jsonObject.put(basePath+model+fusion.getModelId(),
+                    ResultData.ok(modelService.getInfo(fusion.getModelId())));
+        }
+
+        jsonObject.put(basePath+caseScene+caseId,
+                ResultData.ok(caseService.sceneList(param)));
+
+        jsonObject.put(basePath+caseView+caseId,
+                ResultData.ok(caseViewService.allList(caseId,null,null,null,null)));
+
+        List<CaseVideoFolder> videoFolders = caseVideoFolderService.getAllList(caseId);
+        jsonObject.put(basePath+caseVideoFolder+caseId,
+                ResultData.ok(videoFolders));
+        for (CaseVideoFolder videoFolder : videoFolders) {
+            jsonObject.put(basePath+caseVideo+videoFolder.getVideoFolderId(),
+                    ResultData.ok(caseVideoService.getAllList(videoFolder.getVideoFolderId())));
+        }
+
+
+        jsonObject.put(basePath+caseFiles+caseId,
+                ResultData.ok(caseFilesService.allList(caseId,null)));
+
+        jsonObject.put(basePath+caseFilesType+caseId,
+                ResultData.ok(caseFilesTypeService.list()));
+
+        jsonObject.put(basePath+hostIcon+caseId,
+                ResultData.ok(hotIconService.getListByCaseId(caseId)));
+
+        List<CaseTag> caseTagList = caseTagService.allList(caseId, null);
+        jsonObject.put(basePath+caseTag+caseId,
+                ResultData.ok(caseTagList));
+        for (CaseTag tag : caseTagList) {
+            jsonObject.put(basePath+caseTagPoint+tag.getTagId(),
+                    ResultData.ok(caseTagPointService.allList(tag.getTagId())));
+        }
+
+
+        List<FusionGuide> fusionGuides = fusionGuideService.getAllList(caseId);
+        jsonObject.put(basePath+fusionGuide+caseId,
+                ResultData.ok(fusionGuides));
+
+        for (FusionGuide guide : fusionGuides) {
+            jsonObject.put(basePath+fusionGuidePath+guide.getFusionGuideId(),
+                    ResultData.ok(fusionGuidePathService.getListByGuideId(guide.getFusionGuideId())));
+        }
+
+        jsonObject.put(basePath+caseInquest+caseId,
+                ResultData.ok(caseInquestService.getByCaseId(caseId)));
+
+        jsonObject.put(basePath+caseExtractDetail+caseId,
+                ResultData.ok(caseExtractDetailService.getByCaseId(caseId)));
+
+
+
+
+    }
+}

src/main/java/com/fdkankan/fusion/httpClient/address/NewFdkkAddressSource.java

@@ -1,20 +0,0 @@
-package com.fdkankan.fusion.httpClient.address;
-
-import com.dtflys.forest.callback.AddressSource;
-import com.dtflys.forest.http.ForestAddress;
-import com.dtflys.forest.http.ForestRequest;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-public class NewFdkkAddressSource implements AddressSource {
-
-    @Value("${4dkk.newFdService.basePath}")
-    private String basePath;
-
-
-    @Override
-    public ForestAddress getAddress(ForestRequest forestRequest) {
-        return new ForestAddress("","",null,basePath);
-    }
-}

src/main/java/com/fdkankan/fusion/httpClient/address/OverallAddressSource.java

@@ -1,20 +0,0 @@
-package com.fdkankan.fusion.httpClient.address;
-
-import com.dtflys.forest.callback.AddressSource;
-import com.dtflys.forest.http.ForestAddress;
-import com.dtflys.forest.http.ForestRequest;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-public class OverallAddressSource implements AddressSource {
-
-    @Value("${4dkk.overallService.basePath}")
-    private String basePath;
-
-
-    @Override
-    public ForestAddress getAddress(ForestRequest forestRequest) {
-        return new ForestAddress("","",null,basePath);
-    }
-}

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

@@ -1,11 +1,15 @@
 package com.fdkankan.fusion.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.entity.CameraVersion;
 import com.fdkankan.fusion.entity.CameraVersionApp;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.fusion.request.CameraVersionParam;
+import com.fdkankan.fusion.response.CameraVersionVo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  * <p>
  * 相机版本表 服务类
@@ -20,5 +24,5 @@ public interface ICameraVersionAppService extends IService<CameraVersionApp> {
 
     void updateByParam(CameraVersionApp param);
 
-    Object pageList(CameraVersionParam param);
+    Page<CameraVersionApp> pageList(CameraVersionParam param);
 }

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

@@ -1,5 +1,6 @@
 package com.fdkankan.fusion.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.entity.CameraVersion;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.fusion.request.CameraVersionParam;
@@ -19,5 +20,5 @@ public interface ICameraVersionService extends IService<CameraVersion> {
 
     void updateByParam(CameraVersion param);
 
-    Object pageList(CameraVersionParam param);
+    Page<CameraVersion> pageList(CameraVersionParam param);
 }

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

@@ -4,6 +4,7 @@ import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.entity.CaseEntity;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.fusion.request.CaseParam;
+import com.fdkankan.fusion.response.CaseVo;
 import com.fdkankan.fusion.response.HotVo;
 import com.fdkankan.fusion.response.SceneVo;
 
@@ -38,4 +39,5 @@ public interface ICaseService extends IService<CaseEntity> {
 
     String getDeptId(Integer caseId);
 
+    CaseVo getInfo(Integer caseId);
 }

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

@@ -50,8 +50,6 @@ public class CameraVersionAppServiceImpl extends ServiceImpl<ICameraVersionAppMa
 
     @Value("${upload.query-path}")
     private String ossUrlPrefix;
-    @Autowired
-    ITmUserService tmUserService;
 
     @Override
     public void addAndUpload(MultipartFile file, String version, String description, String minVersion, Integer type)  {
@@ -126,7 +124,7 @@ public class CameraVersionAppServiceImpl extends ServiceImpl<ICameraVersionAppMa
     }
 
     @Override
-    public PageInfo pageList(CameraVersionParam param) {
+    public Page<CameraVersionApp> pageList(CameraVersionParam param) {
         Integer type = param.getType();
 //        switch (type){
 //            case 1: type = 1;break;     //看看
@@ -142,24 +140,10 @@ public class CameraVersionAppServiceImpl extends ServiceImpl<ICameraVersionAppMa
         queryWrapper.orderByDesc(CameraVersionApp::getCreateTime);
         Page<CameraVersionApp> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), queryWrapper);
 
-        List<CameraVersionVo> voList = new ArrayList<>();
-        for (CameraVersionApp record : page.getRecords()) {
-            CameraVersionVo vo = new CameraVersionVo();
-            BeanUtils.copyProperties(record,vo);
-            if(record.getSysUserId() !=null){
-                TmUser user = tmUserService.getById(record.getSysUserId());
-                if(user != null){
-                    vo.setCreateName(user.getNickName());
-                }
-            }
-            voList.add(vo);
-        }
 
-        Page<CameraVersionVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
-        voPage.setRecords(voList);
-        voPage.setTotal(page.getTotal());
 
-        return PageInfo.PageInfo(voPage);
+
+        return page;
     }
 
     @Override

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

@@ -52,8 +52,6 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
 
     @Value("${upload.query-path}")
     private String ossUrlPrefix;
-    @Autowired
-    ITmUserService  tmUserService;
 
     @Override
     public void addAndUpload(MultipartFile file, String version, String description, String minVersion, Integer type)  {
@@ -128,7 +126,7 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
     }
 
     @Override
-    public PageInfo pageList(CameraVersionParam param) {
+    public Page<CameraVersion> pageList(CameraVersionParam param) {
         Integer type = param.getType();
 //        switch (type){
 //            case 1: type = 1;break;     //看看
@@ -144,24 +142,7 @@ public class CameraVersionServiceImpl extends ServiceImpl<ICameraVersionMapper,
         queryWrapper.orderByDesc(CameraVersion::getCreateTime);
         Page<CameraVersion> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()), queryWrapper);
 
-        List<CameraVersionVo> voList = new ArrayList<>();
-        for (CameraVersion record : page.getRecords()) {
-            CameraVersionVo vo = new CameraVersionVo();
-            BeanUtils.copyProperties(record,vo);
-            if(record.getSysUserId() !=null){
-                TmUser user = tmUserService.getById(record.getSysUserId());
-                if(user != null){
-                    vo.setCreateName(user.getNickName());
-                }
-            }
-            voList.add(vo);
-        }
-
-        Page<CameraVersionVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
-        voPage.setRecords(voList);
-        voPage.setTotal(page.getTotal());
-
-        return PageInfo.PageInfo(voPage);
+        return page;
     }
 
     @Override

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

@@ -1,15 +1,18 @@
 package com.fdkankan.fusion.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.entity.*;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.mapper.ICaseMapper;
 import com.fdkankan.fusion.request.CaseParam;
 import com.fdkankan.fusion.request.ScenePram;
+import com.fdkankan.fusion.response.CaseVo;
 import com.fdkankan.fusion.response.HotVo;
 import com.fdkankan.fusion.response.SceneVo;
 import com.fdkankan.fusion.service.*;
@@ -290,4 +293,22 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
         return deptId;
     }
 
+    @Override
+    public CaseVo getInfo(Integer caseId) {
+        CaseEntity caseEntity = this.getById(caseId);
+        if(caseEntity == null){
+            return null;
+        }
+        CaseVo caseVo = new CaseVo();
+        BeanUtil.copyProperties(caseEntity,caseVo);
+        if(caseEntity.getTmProjectId() != null){
+            TmProject tmProject = tmProjectService.getById(caseEntity.getTmProjectId());
+            if(tmProject!= null && tmProject.getIsDelete()!=0){
+                throw  new BusinessException(ResultCode.CASE_NOT_EXITS);
+            }
+            caseVo.setTmProject(tmProject);
+            caseVo.setCaseTitle(tmProject.getProjectName());
+        }
+        return caseVo;
+    }
 }

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,55 +0,0 @@
-spring:
-  datasource:
-    type: com.zaxxer.hikari.HikariDataSource          # 数据源类型：HikariCP
-    driver-class-name: com.mysql.jdbc.Driver          # mysql驱动
-    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
-    hikari:
-      connection-timeout: 30000         # 等待连接池分配连接的最大时长（毫秒），超过这个时长还没可用的连接则发生SQLException， 默认:30秒
-      minimum-idle: 5                   # 最小连接数
-      maximum-pool-size: 60             # 最大连接数
-      auto-commit: true                 # 事务自动提交
-      idle-timeout: 600000              # 连接超时的最大时长（毫秒），超时则被释放（retired），默认:10分钟
-      pool-name: DateSourceHikariCP     # 连接池名字
-      max-lifetime: 1800000             # 连接的生命时长（毫秒），超时而且没被使用则被释放（retired），默认:30分钟 1800000ms
-      connection-test-query: SELECT 1   # 连接测试语句
-  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_xj?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-xj.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_xj?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,3 +1,11 @@
+server:
+  port: 8808
+  servlet:
+    context-path: /fusion-xj
+  tomcat:
+    max-http-form-post-size: -1
+
+
 spring:
   profiles:
     active: ${activeProfile:local}
@@ -5,18 +13,54 @@ spring:
     multipart:
       max-file-size: 1000MB
       maxRequestSize: 1000MB
+  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:3306/fd_fusion_xj?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+          username: root
+          password: mysql123!ROOT.
+        db2:
+          driver-class-name: com.mysql.jdbc.Driver
+          url: jdbc:mysql://127.0.0.1:3306/4dkankan_v4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true
+          username: root
+          password: mysql123!ROOT.
 
-server:
-  port: 8809
-  servlet:
-    context-path: /fusion-xj
-  tomcat:
-    max-http-form-post-size: -1
+
+  redis:
+    host: 127.0.0.1
+    port: 6379
+    timeout: 6000ms
+    password: redis123!ROOT.
+    jedis:
+      pool:
+        max-active: 10  #连接池最大连接数（使用负值表示没有限制）
+        max-idle: 10 # 连接池中的最大空闲连接
+        min-idle: 5 # 连接池中的最小空闲连接
+        max-wait: -1 # 连接池最大阻塞等待时间（使用负值表示没有限制）
+    lettuce:
+      shutdown-timeout: 0ms
+
+4dkk:
+  laserService:
+    basePath: http://127.0.0.1:9795
+  fdService:
+    basePath: http://127.0.0.1:8081
+  takeLookService:
+    basePath: http://127.0.0.1:8081
 
 
 
 logging:
   config: classpath:logback-spring.xml
+  path: /home/backend/4dkankan_v4
+
 mybatis-plus:
   configuration:
     log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #开启sql日志
@@ -33,21 +77,21 @@ forest:
   ## 打开/关闭Forest响应内容日志（默认为 false）
   log-response-content: true
   ## 请求超时时间，单位为毫秒, 默认值为3000
-  timeout: 3000
+  timeout: 10000
   ## 连接超时时间，单位为毫秒, 默认值为2000
-  connect-timeout: 3000
+  connect-timeout: 10000
 
 upload:
-  type: oss
-  query-path: https://4dkk.4dage.com/
+  type: local
+  query-path: /oss/
 oss:
   #point: http://oss-cn-shenzhen-internal.aliyuncs.com
-  point: http://oss-cn-shenzhen-internal.aliyuncs.com
-  key: LTAI5tJwboCj3r4vUNkSmbyX
-  secrey: meDy7VYAWbg8kZCKsoUZcIYQxigWOy
+  point:
+  key:
+  secrey:
   bucket: 4dkankan
-  small: ?x-oss-process=image/resize,m_fill,h_%s,w_%s
-
+  small:
+  basePath: /oss/
 
 # Sa-Token配置
 sa-token:

src/main/resources/logback-spring.xml

@@ -4,10 +4,11 @@
 <!-- scanPeriod:设置监测配置文件是否有修改的时间间隔，如果没有给出时间单位，默认单位是毫秒。当scan为true时，此属性生效。默认的时间间隔为1分钟。 -->
 <!-- debug:当此属性设置为true时，将打印出logback内部日志信息，实时查看logback运行状态。默认值为false。 -->
 <configuration scan="true" scanPeriod="10 seconds">
+	<springProperty scope="context" name="LOG_PATH" source="logging.path"/>
 
 	<contextName>logback</contextName>
 	<!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-	<property name="log.path" value="/home/tomcat/jar-fusion-8809-xj/logs" />
+	<property name="log.path" value="${LOG_PATH}/fusion/logs" />
 
 	<!-- 彩色日志 -->
 	<!-- 彩色日志依赖的渲染类 -->