lyhzzz 2 年之前
父節點
當前提交
5e1eee9c12

+ 6 - 0
pom.xml

@@ -156,6 +156,12 @@
       <version>3.0.0-SNAPSHOT</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.fdkankan</groupId>
+      <artifactId>4dkankan-utils-elasticsearch</artifactId>
+      <version>3.0.0-SNAPSHOT</version>
+    </dependency>
+
   </dependencies>
 
   <build>

+ 2 - 0
src/main/java/com/fdkankan/manage/common/ResultCode.java

@@ -69,6 +69,8 @@ public enum ResultCode  {
     MOVE_SCENE_ERROR(50052, "迁移失败!"),
     SS_GET_ERROR(50053, "访问深时失败!"),
     SCENE_IS_BUILDING(50054, "场景计算中,不能复制!"),
+    MOVE_ERROR(50055, "原始资源不存在,不能迁移!"),
+    MOVE_ERROR_COPY(50055, "复制场景,不能迁移!"),
 
     ;
 

+ 10 - 0
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -414,6 +414,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(!oldCameraDetail.getType().equals(cameraDetail.getType())){
             throw new BusinessException(ResultCode.CAMERA_TYPE_NOT_ERROR);
         }
+        String home = dataSource.replace("/mnt/data", "home");
+        if(!fYunFileServiceInterface.fileExist(home)){
+            throw new BusinessException(ResultCode.MOVE_ERROR);
+        }
+
+        HashMap<String, SceneCopyLog> byNewNumList = copyLogService.getByNewNumList(Arrays.asList(param.getNum()));
+        if(byNewNumList.size() >0){
+            throw new BusinessException(ResultCode.MOVE_ERROR_COPY);
+        }
+
 
         Long oldUseSpace = oldCameraDetail.getUsedSpace() - space < 0 ? 0 : oldCameraDetail.getUsedSpace() - space;
         oldCameraDetail.setUsedSpace(oldUseSpace);

+ 28 - 2
src/main/java/com/fdkankan/manage/test/TestController.java

@@ -4,6 +4,9 @@ import cn.hutool.core.io.FileUtil;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.util.FileUtils;
+import com.fdkankan.elasticsearch.service.DocumentService;
+import com.fdkankan.elasticsearch.service.IndexService;
+import com.fdkankan.elasticsearch.service.QueryDataService;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.manage.common.OssPath;
 import com.fdkankan.manage.common.ResultCode;
@@ -18,6 +21,7 @@ import com.fdkankan.manage.service.ISceneProService;
 import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.util.ExcelUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.elasticsearch.rest.RestStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,13 +43,35 @@ public class TestController {
     FYunFileServiceInterface fYunFileServiceInterface;
     @Autowired
     ICameraService cameraService;
+    @Autowired
+    IndexService indexService;
+    @Autowired
+    QueryDataService queryDataService;
+    @Autowired
+    DocumentService documentService;
 
     @RequestMapping("/test")
     public ResultData test(@RequestParam(required = false) String oldSnCode,
                            @RequestParam(required = false)String newSnCode,
-                           @RequestParam(required = false)String dataSource){
+                           @RequestParam(required = false)String dataSource) throws Exception {
 
-        return ResultData.ok();
+//        RestStatus restStatus = documentService.addDocument("abc-test1", null, "1", "{\n" +
+//                "    \"appId\": \"7b5958d5-1ae6-4ad5-8a87-5fc8a4b92999\",\n" +
+//                "    \"module\": \"module\",\n" +
+//                "    \"userId\": null,\n" +
+//                "    \"time\": 1662519289298,\n" +
+//                "    \"url\": \"/#/roam\",\n" +
+//                "    \"urlParam\": null,\n" +
+//                "    \"requestData\": {\n" +
+//                "      \"screen\": \"1920x1080\",\n" +
+//                "      \"click\": \"filter\",\n" +
+//                "      \"user\": \"\",\n" +
+//                "      \"version\": \"1\"\n" +
+//                "    }}");
+//        log.info("{}",restStatus);
+        List<String> strings = queryDataService.boolQuery("abc-test1", String.class);
+
+        return ResultData.ok(JSONObject.toJSONString(strings));
     }
 
     /**

+ 6 - 0
src/main/java/com/fdkankan/manage/util/ElasticSearchUtils.java

@@ -0,0 +1,6 @@
+package com.fdkankan.manage.util;
+
+public class ElasticSearchUtils {
+
+
+}

+ 4 - 0
src/main/resources/bootstrap-dev.yml

@@ -39,6 +39,10 @@ spring:
           - data-id: sa-token-config.yaml
             group: DEFAULT_GROUP
             refresh: true
+
+          - data-id: elasticsearch-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
       discovery:
         server-addr: ${spring.cloud.nacos.config.server-addr}
         namespace: ${spring.cloud.nacos.config.namespace}