Merge branch 'test'

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

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.inner.controller;
 
+import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.controller.BaseController;

src/main/java/com/fdkankan/manage/mq/consumer/SceneRestStoreConsumer.java

@@ -48,7 +48,8 @@ public class SceneRestStoreConsumer {
 
     @RabbitListener(
             queuesToDeclare = @Queue("${queue.scene.rest-store:scene-rest-store}"),
-            concurrency = "1"
+            concurrency = "1",
+            ackMode = "MANUAL"
     )
     public void consumerQueue(Channel channel, Message message) throws IOException {
         try {

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

@@ -24,7 +24,7 @@ public interface ISceneProService extends IService<ScenePro> {
 
     void unbindCamera(Long cameraId);
 
-    void lockOrUnLockBySpace(CameraDetail cameraDetail,Long cameraId,Integer payStatus);
+    void lockOrUnLockBySpace(CameraDetail cameraDetail);
     void lockOrUnLockBySpace(Long cameraId);
     void lockOrUnLockBySpace(ScenePro scenePro, ScenePlus scenePlus,Integer payStatus);
 

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

@@ -82,8 +82,8 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         //恢复10G基本容量
         this.update(wrapper);
 
-        if(!"local".equals(CacheUtil.uploadType) && cameraDetail.getType() !=10){
-            sceneProService.lockOrUnLockBySpace(cameraDetail,cameraId,-2);     //封存场景
+        if(!"local".equals(CacheUtil.uploadType) && cameraDetail.getType() !=10 && cameraDetail.getType() !=11){
+            sceneProService.lockOrUnLockBySpace(cameraDetail);     //封存场景
         }
         //解绑删除相机。文件夹与场景绑定关系
         folderSceneService.delByCameraId(cameraId);
@@ -228,8 +228,8 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         long usedSpace = cameraDetail.getUsedSpace() - space ;
         cameraDetail.setUsedSpace(usedSpace < 0 ? 0L :usedSpace);
         //解封封存场景
-        if(cameraDetail.getType() != 10){
-            sceneProService.lockOrUnLockBySpace(cameraDetail,cameraDetail.getCameraId(),1);
+        if(cameraDetail.getType() != 10 && cameraDetail.getType() !=11){
+            sceneProService.lockOrUnLockBySpace(cameraDetail);
         }
         this.updateById(cameraDetail);
     }

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

@@ -157,8 +157,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
      * @param payStatus -2 封存，为 1 解封
      */
     @Override
-    public void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, Integer payStatus) {
-
+    public void lockOrUnLockBySpace(CameraDetail cameraDetail) {
+        if(cameraDetail == null || cameraDetail.getType() ==10 || cameraDetail.getType() == 11){
+            return;
+        }
         ScenePayStatusVo scenePayStatusVo = new ScenePayStatusVo(cameraDetail.getCameraId());
         Map<String, Object> map = BeanUtil.beanToMap(scenePayStatusVo);
         rabbitMqProducer.sendByWorkQueue(MqQueueUtil.ucenterScenePayStatusQueue, map);
@@ -166,9 +168,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public void lockOrUnLockBySpace(Long cameraId) {
-        ScenePayStatusVo scenePayStatusVo = new ScenePayStatusVo(cameraId);
-        Map<String, Object> map = BeanUtil.beanToMap(scenePayStatusVo);
-        rabbitMqProducer.sendByWorkQueue(MqQueueUtil.ucenterScenePayStatusQueue, map);
+        CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
+        this.lockOrUnLockBySpace(cameraDetail);
     }
 
     @Override
@@ -371,6 +372,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(cameraDetail.getType() != 11 && cameraDetail.getType() != 10){           //有剩余容量解封容量内场景
             this.lockOrUnLockBySpace(cameraDetail.getCameraId());
         }
+        sceneMoveLogService.saveLog(scenePro,scenePlus,camera.getSnCode(),oldCamera.getSnCode(),dataSource,dataSource, null);
     }
 
 

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

@@ -171,7 +171,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
 
         agentNewLogService.addByUserIncrement(userIncrement);
         if(userIncrement.getCameraId() != null){
-            sceneProService.lockOrUnLockBySpace(null,userIncrement.getCameraId(),1);
+            sceneProService.lockOrUnLockBySpace(userIncrement.getCameraId());
         }
     }
 

src/main/java/com/fdkankan/manage/test/TestController.java

@@ -40,12 +40,6 @@ public class TestController {
     @Autowired
     ICameraDetailService cameraDetailService;
     @Autowired
-    IndexService indexService;
-    @Autowired
-    QueryDataService queryDataService;
-    @Autowired
-    DocumentService documentService;
-    @Autowired
     IFolderSceneService folderSceneService;
     @Autowired
     IFolderService folderService;
@@ -55,23 +49,8 @@ public class TestController {
                            @RequestParam(required = false)String newSnCode,
                            @RequestParam(required = false)String dataSource) throws Exception {
 
-//        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));
+        return ResultData.ok();
     }
 
     /**

src/main/resources/bootstrap-dev.yml

@@ -47,6 +47,10 @@ spring:
           - data-id: common-rabbitmq-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}

src/main/resources/bootstrap-prod-eur.yml

@@ -43,6 +43,10 @@ spring:
           - data-id: common-rabbitmq-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}

src/main/resources/bootstrap-prod.yml

@@ -43,6 +43,10 @@ spring:
           - data-id: common-rabbitmq-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}

src/main/resources/bootstrap-test-eur.yml

@@ -43,6 +43,10 @@ spring:
           - data-id: common-rabbitmq-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}