lyhzzz 1 年之前
父節點
當前提交
0da96e4d34

+ 1 - 1
src/main/java/com/fdkankan/fusion/common/FilePath.java

@@ -18,5 +18,5 @@ public class FilePath {
    public final static String OBJ_LOCAL_PATH = LOCAL_BASE_PATH + "%s/model/%s";
    public final static String SCENE_LOCAL_PATH = LOCAL_BASE_PATH + "%s/scene/%s";
 
-
+    public final static String OFFLINE_PACKAGE_PATH = "/mnt/fusion/offline_package/%s";
 }

+ 31 - 0
src/main/java/com/fdkankan/fusion/controller/DownOfflinePackageController.java

@@ -0,0 +1,31 @@
+package com.fdkankan.fusion.controller;
+
+
+import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.down.CaseDownService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+
+/**
+ * <p>
+ * 相机版本表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2024-07-23
+ */
+@RestController
+@RequestMapping("/offlinePackage")
+public class DownOfflinePackageController {
+
+    @Autowired
+    CaseDownService caseDownService;
+
+    @GetMapping("/down")
+    public ResultData down(@RequestParam(required = false) Integer caseId){
+        caseDownService.createDataJson(caseId);
+        return ResultData.ok();
+    }
+}
+

+ 0 - 21
src/main/java/com/fdkankan/fusion/controller/TmSceneController.java

@@ -1,21 +0,0 @@
-package com.fdkankan.fusion.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 场景关联关系表 前端控制器
- * </p>
- *
- * @author 
- * @since 2023-07-28
- */
-@RestController
-@RequestMapping("/fusion/tmScene")
-public class TmSceneController {
-
-}
-

+ 6 - 1
src/main/java/com/fdkankan/fusion/down/CaseDownService.java

@@ -1,7 +1,11 @@
 package com.fdkankan.fusion.down;
 
+import cn.hutool.core.io.FileUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.fusion.common.FilePath;
 import com.fdkankan.fusion.common.ResultData;
+import com.fdkankan.fusion.common.util.StringUtils;
 import com.fdkankan.fusion.controller.*;
 import com.fdkankan.fusion.entity.CaseFusion;
 import com.fdkankan.fusion.entity.CaseTag;
@@ -14,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
+import java.io.File;
 import java.util.List;
 
 @Service
@@ -150,7 +155,7 @@ public class CaseDownService {
                 ResultData.ok(caseExtractDetailService.getByCaseId(caseId)));
 
 
-
+        FileUtil.writeString(JSON.toJSONString(jsonObject), String.format(FilePath.OFFLINE_PACKAGE_PATH,caseId)+ File.separator+jsonDataName,"utf-8");
 
     }
 }

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

@@ -135,7 +135,7 @@ public class SceneService implements ISceneService {
         }
 
         if(CollectionUtil.isEmpty(param.getSnCodes()) && CollectionUtil.isEmpty(param.getNumList())){
-            if(StpUtil.hasRole("admin-super")&& StringUtils.isBlank(param.getSnCode())){
+            if(StpUtil.hasRole("admin-super") && StringUtils.isBlank(param.getSnCode())){
                 List<TmCamera> tmCameras = tmCameraService.list();
                 Set<String> snCodeSet = tmCameras.parallelStream().map(TmCamera::getCameraSn).collect(Collectors.toSet());
                 param.setSnCodes(new ArrayList<>(snCodeSet));

+ 4 - 4
src/main/java/com/fdkankan/fusion/service/impl/TmCameraServiceImpl.java

@@ -83,15 +83,15 @@ public class TmCameraServiceImpl extends ServiceImpl<ITmCameraMapper, TmCamera>
         if(tmCamera != null){
             throw new BusinessException(ResultCode.CAMERA_EXITS);
         }
-        FdkkResponse<CameraVo> fdkkResponse = fdService.getCameraDetail(param.getCameraSn());
-        if(fdkkResponse.getCode() !=0 || fdkkResponse.getData() == null){
-            throw new BusinessException(ResultCode.CAMERA_NOT_EXITS);
-        }
 
         FdkkResponse fdkkResponse2 =  fdService.fdkKBind(param.getCameraSn(),tmUser.getUserName(),param.getCameraType());
         if(fdkkResponse2.getCode() != 0){
             throw new BusinessException(fdkkResponse2.getCode(),fdkkResponse2.getMsg());
         }
+        FdkkResponse<CameraVo> fdkkResponse = fdService.getCameraDetail(param.getCameraSn());
+        if(fdkkResponse.getCode() !=0 || fdkkResponse.getData() == null){
+            throw new BusinessException(ResultCode.CAMERA_NOT_EXITS);
+        }
         tmCamera = new TmCamera();
         tmCamera.setId(IdUtils.genId(IdPreEnum.CAMERA_PRE.getPre()));
         tmCamera.setCameraSn(param.getCameraSn());