Merge branch 'test'

pom.xml

@@ -135,13 +135,13 @@
     <dependency>
       <groupId>cn.dev33</groupId>
       <artifactId>sa-token-spring-boot-starter</artifactId>
-      <version>1.30.0</version>
+      <version>1.34.0</version>
     </dependency>
     <!-- Sa-Token 整合 jwt -->
     <dependency>
       <groupId>cn.dev33</groupId>
       <artifactId>sa-token-jwt</artifactId>
-      <version>1.30.0</version>
+      <version>1.34.0</version>
     </dependency>
 
     <dependency>

src/main/java/com/fdkankan/manage/aop/VisitLogInterceptor.java

@@ -109,6 +109,9 @@ public class VisitLogInterceptor {
 				nickName = sysUser.getNickName();
 			}
 		}
+		if("GET".equals(method)){
+			return result;
+		}
 		//写入mongodb
 		OperLog operLog = new OperLog();
 		operLog.setUserId(userId);

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

@@ -8,6 +8,7 @@ public class RedisKeyUtil {
     public static final String loginNum= "manage:login:userName:%s:ip:%s";
 
     public static final String loginToken= "manage:login:token:%s";
+    public static final String SCENE_COOPERATION_NUM_USERID = "scene:cooperation:num:userId";
 
 
 }

src/main/java/com/fdkankan/manage/controller/SceneDelLogController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.manage.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-15
+ */
+@RestController
+@RequestMapping("/manage/sceneDelLog")
+public class SceneDelLogController {
+
+}
+

src/main/java/com/fdkankan/manage/entity/SceneDelLog.java

@@ -0,0 +1,64 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-15
+ */
+@Getter
+@Setter
+@TableName("t_scene_del_log")
+public class SceneDelLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 场景删除日志
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 文件夹Id
+     */
+    @TableField("folder_id")
+    private Integer folderId;
+
+    /**
+     * 场景码
+     */
+    @TableField("num")
+    private String num;
+
+    /**
+     * 操作人Id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 操作人Id
+     */
+    @TableField("sys_user_id")
+    private Long sysUserId;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+
+}

src/main/java/com/fdkankan/manage/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"manage", getTables(new String[]{
-                "t_scene_move_log",
+                "t_scene_del_log",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/manage/mapper/ISceneDelLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.SceneDelLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-15
+ */
+@Mapper
+public interface ISceneDelLogMapper extends BaseMapper<SceneDelLog> {
+
+}

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

@@ -40,5 +40,5 @@ public interface ICameraService extends IService<Camera> {
 
     Integer updateCompany(List<CameraInOutParam> companyParams);
 
-    void initAllCameraSpace();
+    void initAllCameraSpace(Long userId);
 }

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

@@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ISceneCooperationService extends IService<SceneCooperation> {
 
     void deleteCooperation(Long cameraId);
+
+    void delByNum(String num);
 }

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

@@ -0,0 +1,17 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.SceneDelLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-15
+ */
+public interface ISceneDelLogService extends IService<SceneDelLog> {
+
+    void saveLog(String num, Object loginId);
+}

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

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.service;
 
+import com.fdkankan.manage.entity.CameraDetail;
 import com.fdkankan.manage.entity.SceneResourceCamera;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -14,4 +15,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface ISceneResourceCameraService extends IService<SceneResourceCamera> {
 
     void unbindCamera(Long cameraId);
+
+    void setCooperationUser(CameraDetail cameraDetail, String num);
 }

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

@@ -477,10 +477,20 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     }
 
     @Override
-    public void initAllCameraSpace() {
-        List<Camera> list = this.list();
-        List<Long> cameraIds = list.stream().map(Camera::getId).collect(Collectors.toList());
-        List<CameraDetail> cameraDetails = cameraDetailService.getByCameraIds(cameraIds);
+    public void initAllCameraSpace(Long userId) {
+        List<Long> cameraIds ;
+        List<CameraDetail> cameraDetails;
+        if(userId != null){
+            cameraDetails = cameraDetailService.getByUserId(userId);
+        }else {
+            List<Camera> list = this.list();
+            cameraIds = list.stream().map(Camera::getId).collect(Collectors.toList());
+            cameraDetails = cameraDetailService.getByCameraIds(cameraIds);
+        }
+        if(cameraDetails == null || cameraDetails.size() <=0){
+            return;
+        }
+
         HashMap<Long, Long> map = sceneProService.getSpaceGroupByCameraId();
         for (CameraDetail cameraDetail : cameraDetails) {
             Long space = map.get(cameraDetail.getCameraId());

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

@@ -42,9 +42,21 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
             List<SceneCooperation> list = this.list(wrapper);
             List<Long> ids = list.stream().map(SceneCooperation::getId).collect(Collectors.toList());
             if(ids.size() >0){
-                sceneResourceCooperationService.removeByIds(ids);
+                this.removeByIds(ids);
                 sceneResourceCooperationService.deleteBatchByCooperationIds(ids);
             }
         }
     }
+
+    @Override
+    public void delByNum(String num) {
+        LambdaQueryWrapper<SceneCooperation> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SceneCooperation::getSceneNum,num);
+        List<SceneCooperation> list = this.list(wrapper);
+        List<Long> ids = list.stream().map(SceneCooperation::getId).collect(Collectors.toList());
+        if(ids.size() >0){
+            this.removeByIds(ids);
+            sceneResourceCooperationService.deleteBatchByCooperationIds(ids);
+        }
+    }
 }

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

@@ -0,0 +1,33 @@
+package com.fdkankan.manage.service.impl;
+import java.util.Date;
+
+import com.fdkankan.manage.entity.SceneDelLog;
+import com.fdkankan.manage.mapper.ISceneDelLogMapper;
+import com.fdkankan.manage.service.ISceneDelLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-03-15
+ */
+@Service
+public class SceneDelLogServiceImpl extends ServiceImpl<ISceneDelLogMapper, SceneDelLog> implements ISceneDelLogService {
+
+    @Override
+    public void saveLog(String num, Object loginId) {
+        try {
+            SceneDelLog sceneDelLog = new SceneDelLog();
+            sceneDelLog.setNum(num);
+            sceneDelLog.setSysUserId(Long.valueOf( (String)loginId));
+            this.save(sceneDelLog);
+        }catch (Exception e){
+
+        }
+
+    }
+}

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

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.service.impl;
 
+import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -83,6 +84,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     ISceneBuildProcessLogService sceneBuildProcessLogService;
     @Autowired
     ISceneMoveLogService sceneMoveLogService;
+    @Autowired
+    ISceneResourceCameraService sceneResourceCameraService;
+    @Autowired
+    ISceneDelLogService sceneDelLogService;
 
 
     @Override
@@ -426,8 +431,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         cameraDetail.setUsedSpace(newUseSpace);
         cameraDetailService.updateById(cameraDetail);
 
-
-
         if(scenePro!=null){
             LambdaUpdateWrapper<ScenePro> wrapper = new LambdaUpdateWrapper<>();
             wrapper.eq(ScenePro::getId,scenePro.getId());
@@ -449,6 +452,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             this.updateOssStatus(String.format(OssPath.v4_statusPath,scenePlus.getNum()),0,"status");
             folderSceneService.delBySceneId(scenePlus.getId());
         }
+        //协作相机
+        sceneResourceCameraService.setCooperationUser(cameraDetail,param.getNum());
         if(cameraDetail.getType() == 10){       //深时场景
             laserService.move(param.getNum(),oldCamera.getSnCode(),camera.getSnCode(),cameraDetail.getUserId());
         }
@@ -612,6 +617,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(cameraId != null){
             cameraDetailService.addUsedSpace(cameraId,space);
         }
+        sceneDelLogService.saveLog(num, StpUtil.getLoginId());
     }
 
     @Override
@@ -714,11 +720,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         List<GroupByCount> proSum = this.getBaseMapper().getProSpaceGroupByCameraId();
         HashMap<Long,Long > map = new HashMap<>();
         for (GroupByCount groupByCount : proSum) {
-            map.merge(groupByCount.getId(), groupByCount.getCount(), Long::sum);
+            map.merge(groupByCount.getId(), groupByCount.getCount()==null?0:groupByCount.getCount(), Long::sum);
         }
         List<GroupByCount > plusSum = this.getBaseMapper().getPlusSpaceGroupByCameraId();
         for (GroupByCount groupByCount : plusSum) {
-            map.merge(groupByCount.getId(), groupByCount.getCount(), Long::sum);
+            map.merge(groupByCount.getId(), groupByCount.getCount()==null?0:groupByCount.getCount(), Long::sum);
         }
         return map;
     }

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

@@ -1,12 +1,28 @@
 package com.fdkankan.manage.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.manage.common.RedisKeyUtil;
+import com.fdkankan.manage.entity.CameraDetail;
+import com.fdkankan.manage.entity.SceneCooperation;
 import com.fdkankan.manage.entity.SceneResourceCamera;
+import com.fdkankan.manage.entity.SceneResourceCooperation;
+import com.fdkankan.manage.httpClient.service.LaserService;
 import com.fdkankan.manage.mapper.ISceneResourceCameraMapper;
+import com.fdkankan.manage.service.ISceneCooperationService;
 import com.fdkankan.manage.service.ISceneResourceCameraService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.service.ISceneResourceCooperationService;
+import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.redis.util.RedisUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.WeakHashMap;
+import java.util.stream.Collectors;
+
 /**
  * <p>
  * 场景资源和相机关联表 服务实现类
@@ -18,10 +34,63 @@ import org.springframework.stereotype.Service;
 @Service
 public class SceneResourceCameraServiceImpl extends ServiceImpl<ISceneResourceCameraMapper, SceneResourceCamera> implements ISceneResourceCameraService {
 
+    @Autowired
+    ISceneCooperationService sceneCooperationService;
+    @Autowired
+    ISceneResourceCooperationService sceneResourceCooperationService;
+    @Autowired
+    RedisUtil redisUtil;
+    @Autowired
+    LaserService laserService;
+
     @Override
     public void unbindCamera(Long cameraId) {
         LambdaQueryWrapper<SceneResourceCamera> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(SceneResourceCamera::getCameraId,cameraId);
         this.remove(wrapper);
     }
+
+    @Override
+    public void setCooperationUser(CameraDetail cameraDetail, String num) {
+        if(cameraDetail.getCooperationUser() == null){
+            sceneCooperationService.delByNum(num);
+            return;
+        }
+        List<SceneResourceCamera> list = this.getByCameraId(cameraDetail.getCameraId());
+        if(list.size() >0){
+            List<Long> resourceIdList = list.stream().map(SceneResourceCamera::getSceneResourceId).collect(Collectors.toList());
+            if(resourceIdList.size() >0){
+                SceneCooperation sceneCooperationEntity = new SceneCooperation();
+                sceneCooperationEntity.setUserId(cameraDetail.getCooperationUser());
+                sceneCooperationEntity.setSceneNum(num);
+                sceneCooperationEntity.setRecStatus("A");
+                sceneCooperationEntity.setCreateTime(Dateutils.getDate(new Date()));
+                sceneCooperationEntity.setUpdateTime(Dateutils.getDate(new Date()));
+                sceneCooperationService.save(sceneCooperationEntity);
+                redisUtil.hset(RedisKeyUtil.SCENE_COOPERATION_NUM_USERID, sceneCooperationEntity.getSceneNum(), sceneCooperationEntity.getUserId() + "");
+
+
+                List<SceneResourceCooperation> resourceCooperationList = new ArrayList<>();
+                for (Long resourceId : resourceIdList) {
+                    SceneResourceCooperation sceneResourceCooperation = new SceneResourceCooperation();
+                    sceneResourceCooperation.setSceneResourceId(resourceId);
+                    sceneResourceCooperation.setSceneCooperationId(sceneCooperationEntity.getId());
+                    sceneResourceCooperation.setRecStatus("A");
+                    sceneResourceCooperation.setCreateTime(Dateutils.getDate(new Date()));
+                    sceneResourceCooperation.setUpdateTime(Dateutils.getDate(new Date()));
+                    resourceCooperationList.add(sceneResourceCooperation);
+                }
+                if(resourceCooperationList.size() >0){
+                    sceneResourceCooperationService.saveBatch(resourceCooperationList,10000);
+                }
+            }
+        }
+
+    }
+
+    private List<SceneResourceCamera> getByCameraId(Long cameraId) {
+        LambdaQueryWrapper<SceneResourceCamera> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(SceneResourceCamera::getCameraId,cameraId);
+        return this.list(wrapper);
+    }
 }

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

@@ -22,8 +22,10 @@ public class SceneResourceCooperationServiceImpl extends ServiceImpl<ISceneResou
 
     @Override
     public void deleteBatchByCooperationIds(List<Long> cooperationIds) {
-        LambdaQueryWrapper<SceneResourceCooperation> wrapper = new LambdaQueryWrapper<>();
-        wrapper.in(SceneResourceCooperation::getSceneCooperationId,cooperationIds);
-        this.remove(wrapper);
+        if(cooperationIds != null && cooperationIds.size() >0){
+            LambdaQueryWrapper<SceneResourceCooperation> wrapper = new LambdaQueryWrapper<>();
+            wrapper.in(SceneResourceCooperation::getSceneCooperationId,cooperationIds);
+            this.remove(wrapper);
+        }
     }
 }

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

@@ -48,9 +48,12 @@ public class TestController {
         return ResultData.ok();
     }
 
+    /**
+     * 重置相机容量
+     */
     @RequestMapping("/testCameraSpace")
-    public ResultData test(){
-        cameraService.initAllCameraSpace();
+    public ResultData testCameraSpace(@RequestParam(required = false) Long userId){
+        cameraService.initAllCameraSpace(userId);
         return ResultData.ok();
     }
 

src/main/resources/bootstrap-dev.yml

@@ -6,22 +6,21 @@ spring:
       config:
         server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-test
+        namespace: 4dkankan-v4-dev
         extension-configs:
           - data-id: 4dkankan-center-manage.yaml
             group: DEFAULT_GROUP
             refresh: true
         shared-configs:
-
-          - data-id: common-redis-config-52.yaml
+          - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: other-config.yaml
+          - data-id: common-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-upload-config.yaml
+          - data-id: common-fyun-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
@@ -33,13 +32,16 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
+          - data-id: common-rabbitmq-config.yaml
+            group: DEFAULT_GROUP
+            refresh: true
+
+          - data-id: sa-token-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

@@ -32,6 +32,9 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
+          - data-id: sa-token-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

@@ -32,6 +32,9 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
+          - data-id: sa-token-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

@@ -32,6 +32,9 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
+          - data-id: sa-token-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.yml

@@ -36,6 +36,9 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
+          - data-id: sa-token-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.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: dev
 logging:
   config: classpath:logback-spring.xml
 mybatis-plus:

src/main/resources/mapper/manage/SceneDelLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage.mapper.ISceneDelLogMapper">
+
+</mapper>