场景同步接口

4dkankan-center-api/4dkankan-center-platform-api/pom.xml

@@ -12,42 +12,5 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>4dkankan-center-platform-api</artifactId>
-    <dependencies>
-        <dependency>
-            <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
 
 </project>

4dkankan-center-api/4dkankan-center-scene-api/src/main/java/com/fdkankan/scene/api/feign/SceneUserSceneClient.java

@@ -0,0 +1,20 @@
+package com.fdkankan.scene.api.feign;
+
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.common.user.SSOUser;
+import com.fdkankan.scene.api.vo.SceneCnt;
+import java.util.List;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(value = "4dkankan-center-scene",contextId = "sceneUserSceneClient")
+@RequestMapping("/scene/feign/user/scene")
+public interface SceneUserSceneClient {
+
+
+    @PostMapping("/getSceneCnt")
+    ResultData<SceneCnt> getSceneCnt(@RequestParam(value = "userId") Long userId, @RequestParam(value = "cameraId") Long cameraId) ;
+
+}

4dkankan-center-api/4dkankan-center-scene-api/src/main/java/com/fdkankan/scene/api/vo/SceneCnt.java

@@ -0,0 +1,38 @@
+package com.fdkankan.scene.api.vo;
+
+import java.io.Serializable;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/3/3
+ **/
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SceneCnt implements Serializable {
+
+    /**
+     * 双目场景数量
+     */
+    private Long sceneCnt;
+
+    /**
+     * 八目场景数量
+     */
+    private Long sceneProCnt;
+
+    /**
+     * 协作场景数量
+     */
+    private Long CooperSceneCnt;
+
+}

4dkankan-center-api/pom.xml

@@ -15,4 +15,42 @@
         <module>4dkankan-center-scene-api</module>
         <module>4dkankan-center-platform-api</module>
     </modules>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
+        </dependency>
+
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>

4dkankan-center-platform/pom.xml

@@ -17,6 +17,12 @@
 
       <dependency>
           <groupId>com.fdkankan</groupId>
+          <artifactId>4dkankan-center-scene-api</artifactId>
+          <version>2.0.0-SNAPSHOT</version>
+      </dependency>
+
+      <dependency>
+          <groupId>com.fdkankan</groupId>
           <artifactId>4dkankan-center-platform-api</artifactId>
           <version>2.0.0-SNAPSHOT</version>
       </dependency>

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/controller/api/UserSceneController.java

@@ -0,0 +1,45 @@
+package com.fdkankan.platform.user.controller.api;
+
+import com.fdkankan.common.controller.BaseController;
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.platform.user.service.IUserSceneService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 个人中心-我的场景
+ */
+@Log4j2
+@RestController
+@RequestMapping("/api/platform/user/scene")
+public class UserSceneController extends BaseController {
+
+    @Autowired
+    private IUserSceneService userSceneService;
+//    /**
+//     * 获取用户场景记录
+//     * pageNum          分页
+//     * searchKey        搜索条件
+//     * pageSize         每页大小
+//     */
+//    @RequestMapping(value = "/list", method = RequestMethod.POST)
+//    public Page<SceneVO> getScenes(@RequestBody SceneParamVO param) throws Exception {
+//        return userSceneService.getScenes(getToken(), param);
+//
+//    }
+
+    /**
+     * 获取我的场景和协作场景数量
+     * @return
+     */
+    @PostMapping(value = "/findSceneNumber")
+    public ResultData findSceneNumber(String snCode) throws Exception{
+        Long userId = this.getUserId();
+        return userSceneService.findSceneNumber(userId, snCode);
+    }
+
+}

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/controller/manager/ManagerUserController.java

@@ -36,7 +36,7 @@ public class ManagerUserController extends BaseController {
     @Autowired
     private IUserService userService;
     @Autowired
-    private UserSceneService userSceneService;
+    private IUserSceneService userSceneService;
 
     @Autowired
     private IUserIncrementService userIncrementService;

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/IUserSceneService.java

@@ -0,0 +1,29 @@
+package com.fdkankan.platform.user.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.platform.user.request.RequestUser;
+import java.util.Map;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/3/3
+ **/
+public interface IUserSceneService {
+
+    Map<String, Object> checkDownload(RequestUser param);
+
+    Map<String, Object> downloadSceneAdmin(RequestUser param, String token);
+
+    JSONObject getSceneDownloadProcessAdmin(String sceneNum) throws Exception;
+
+//    Page<SceneVO> getScenes(String token, SceneParamVO param);
+
+    ResultData findSceneNumber(long userId, String snCode);
+
+}

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/UserSceneService.java

@@ -1,25 +1,40 @@
-package com.fdkankan.platform.user.service;
+package com.fdkankan.platform.user.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.response.ResultData;
 import com.fdkankan.platform.common.DownloadStatusEnum;
+import com.fdkankan.platform.goods.entity.Camera;
+import com.fdkankan.platform.goods.service.ICameraService;
 import com.fdkankan.platform.user.request.RequestUser;
+import com.fdkankan.platform.user.service.IUserSceneService;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
+import com.fdkankan.scene.api.feign.SceneUserSceneClient;
+import com.fdkankan.scene.api.vo.SceneCnt;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-import java.util.Map;
+import org.springframework.util.ObjectUtils;
 
 @Service
-public class UserSceneService {
+public class UserSceneServiceImpl implements IUserSceneService {
 
     @Autowired
     private RedisUtil redisUtil;
+    @Autowired
+    ICameraService cameraService;
+    @Autowired
+    SceneUserSceneClient sceneUserSceneClient;
+
 
+    @Override
     public Map<String, Object> checkDownload(RequestUser param) {
         if(StringUtils.isEmpty(param.getSceneNum())){
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
@@ -29,6 +44,7 @@ public class UserSceneService {
         return result;
     }
 
+    @Override
     public Map<String, Object> downloadSceneAdmin(RequestUser param, String token) {
         if(StringUtils.isEmpty(param.getSceneNum())){
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
@@ -56,6 +72,7 @@ public class UserSceneService {
         return result;
     }
 
+    @Override
     public JSONObject getSceneDownloadProcessAdmin(String sceneNum) throws Exception {
         if (StringUtils.isEmpty(sceneNum)) {
             throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
@@ -84,6 +101,27 @@ public class UserSceneService {
         return process;
     }
 
+    @Override
+    public ResultData findSceneNumber(long userId, String snCode) {
+        Map<String, Object> map = new HashMap<>();
+        Camera camera = null;
+        if (!ObjectUtils.isEmpty(snCode)) {
+            camera = cameraService.getBySnCode(snCode);
+            if(ObjectUtils.isEmpty(camera)){
+                map.put("sceneNum", 0);
+                map.put("cooperatimeNum", 0);
+                return ResultData.ok(map);
+            }
+        }
+
+        //双目场景数量
+        ResultData<SceneCnt> resultData = sceneUserSceneClient.getSceneCnt(userId, Objects.isNull(camera) ? null : camera.getId());
+        SceneCnt sceneCnt = resultData.getData();
+        map.put("sceneNum", sceneCnt.getSceneCnt() + sceneCnt.getSceneProCnt());
+        map.put("cooperatimeNum", sceneCnt.getCooperSceneCnt());
+
+        return ResultData.ok(map);
+    }
 
 
 }

4dkankan-center-platform/src/main/resources/bootstrap.yml

@@ -38,4 +38,8 @@ spring:
 
       discovery:
         server-addr: 192.168.0.47:8848
-        namespace: 4dkankan-dev
+        namespace: 4dkankan-dev
+
+feign:
+  httpclient:
+    connection-timeout: 200000

4dkankan-center-scene/pom.xml

@@ -19,6 +19,12 @@
 
         <dependency>
             <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-center-scene-api</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-center-platform-api</artifactId>
             <version>2.0.0-SNAPSHOT</version>
         </dependency>

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/UserSceneController.java

@@ -35,4 +35,6 @@ public class UserSceneController extends BaseController {
 
     }
 
+
+
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/feign/UserSceenFeign.java

@@ -0,0 +1,30 @@
+package com.fdkankan.scene.feign;
+
+import com.fdkankan.common.response.ResultData;
+import com.fdkankan.scene.api.vo.SceneCnt;
+import com.fdkankan.scene.service.IUserSceneService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 提供计算调用
+ */
+@RestController
+@RequestMapping("/feign/user/scene")
+@Slf4j
+public class UserSceenFeign {
+
+    @Autowired
+    IUserSceneService userSceneService;
+
+    @PostMapping("/getSceneCnt")
+    ResultData<SceneCnt> getSceneCnt(@RequestParam(value = "userId") Long userId, Long cameraId){
+        SceneCnt sceneCnt = userSceneService.getSceneCnt(userId, cameraId);
+        return ResultData.ok(sceneCnt);
+    }
+}
+

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/IBuildScenePreProService.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.service;
+
+import com.alibaba.fastjson.JSONObject;
+import java.util.Map;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/3/1
+ **/
+public interface IBuildScenePreProService {
+
+    Map<String, String> getTypeString(String cameraType, String algorithm, String resolution, JSONObject dataJson);
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/IUserSceneService.java

@@ -1,8 +1,10 @@
 package com.fdkankan.scene.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.scene.api.vo.SceneCnt;
 import com.fdkankan.scene.vo.SceneParamVO;
 import com.fdkankan.scene.vo.SceneVO;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * <p>
@@ -15,4 +17,8 @@ import com.fdkankan.scene.vo.SceneVO;
 public interface IUserSceneService {
 
     Page<SceneVO> getScenes(String token, SceneParamVO param);
+
+    SceneCnt getSceneCnt(Long userId, Long cameraId);
+
+
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/BuildScenePreProServiceImpl.java

@@ -0,0 +1,25 @@
+package com.fdkankan.scene.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.scene.service.IBuildScenePreProService;
+import java.util.Map;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * TODO
+ * </p>
+ *
+ * @author dengsixing
+ * @since 2022/3/1
+ **/
+@Service
+public class BuildScenePreProServiceImpl implements IBuildScenePreProService {
+
+
+    @Override
+    public Map<String, String> getTypeString(String cameraType, String algorithm, String resolution,
+        JSONObject dataJson) {
+        return null;
+    }
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -2264,6 +2264,21 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         return ResultData.ok(tags);
     }
 
+    /**
+     * <p>
+            保证热点数据安全性，当redis宕机导致热点数据丢失时，可以从文件中读取，恢复到redis
+     * </p>
+     * @author dengsixing
+     * @date 2022/3/3
+     **/
+    private void syncHotFromFileToRedis(){
+
+//        String lockKey = String.format(RedisLockKey.
+//            )
+
+
+    }
+
 
     private void addOrUpdateHotData(String num, Map<String, String> addOrUpdateMap){
         if(CollUtil.isEmpty(addOrUpdateMap))

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/UserSceneService.java

@@ -1,7 +1,10 @@
 package com.fdkankan.scene.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.SceneSource;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.user.SSOLoginHelper;
 import com.fdkankan.common.user.SSOUser;
@@ -9,13 +12,21 @@ import com.fdkankan.platform.api.feign.PlatformGoodsClient;
 import com.fdkankan.platform.api.feign.PlatformUserClient;
 import com.fdkankan.platform.api.vo.Camera;
 import com.fdkankan.platform.api.vo.User;
+import com.fdkankan.scene.api.vo.SceneCnt;
+import com.fdkankan.scene.entity.Scene;
 import com.fdkankan.scene.entity.SceneCooperation;
+import com.fdkankan.scene.entity.ScenePro;
+import com.fdkankan.scene.entity.SceneProExt;
 import com.fdkankan.scene.entity.SceneProPO;
 import com.fdkankan.scene.service.ISceneCooperationService;
+import com.fdkankan.scene.service.ISceneProExtService;
+import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.service.ISceneService;
 import com.fdkankan.scene.service.IUserSceneService;
 import com.fdkankan.scene.vo.SceneParamVO;
 import com.fdkankan.scene.vo.SceneVO;
+import java.util.Objects;
+import java.util.concurrent.locks.Condition;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -24,6 +35,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.stream.Collectors;
+import org.springframework.util.ObjectUtils;
 
 @Service
 @Slf4j
@@ -39,6 +51,10 @@ public class UserSceneService implements IUserSceneService {
     private ISceneCooperationService sceneCooperationService;
     @Autowired
     private ISceneService sceneService;
+    @Autowired
+    private ISceneProService sceneProService;
+    @Autowired
+    private ISceneProExtService sceneProExtService;
 
     @Override
     public Page<SceneVO> getScenes(String token, SceneParamVO param) {
@@ -99,4 +115,43 @@ public class UserSceneService implements IUserSceneService {
         });
         return pageInfo;
     }
+
+    @Override
+    public SceneCnt getSceneCnt(Long userId, Long cameraId) {
+
+        //双目场景数量
+        LambdaQueryWrapper<Scene> sceneWrapper =
+            new LambdaQueryWrapper<Scene>()
+                .eq(Scene::getUserId, userId);
+        if(Objects.nonNull(cameraId)){
+            sceneWrapper.eq(Scene::getCameraId, cameraId);
+        }
+        long sceneCount = sceneService.count(sceneWrapper);
+
+        //八目场景数量
+        LambdaQueryWrapper<ScenePro> sceneProWrapper =
+            new LambdaQueryWrapper<ScenePro>()
+                .select(ScenePro::getId)
+                .eq(ScenePro::getUserId, userId);
+        if(Objects.nonNull(cameraId)){
+            sceneWrapper.eq(Scene::getCameraId, cameraId);
+        }
+        List<ScenePro> SceneProList = sceneProService.list(sceneProWrapper);
+        long sceneProCount = 0;
+        if(CollUtil.isNotEmpty(SceneProList)){
+            List<Long> proIdList = SceneProList.stream().map(pro -> {
+                return pro.getId();
+            }).collect(Collectors.toList());
+            sceneProCount = sceneProExtService.count(
+                new LambdaQueryWrapper<SceneProExt>()
+                    .eq(SceneProExt::getSceneSource,SceneSource.YJHZ.code())
+                    .in(SceneProExt::getSceneProId, proIdList));
+        }
+
+        //协作场景数量
+        long cooperaCount = sceneCooperationService.count(
+            new LambdaQueryWrapper<SceneCooperation>().eq(SceneCooperation::getUserId, userId));
+
+        return SceneCnt.builder().sceneCnt(sceneCount).sceneProCnt(sceneProCount).CooperSceneCnt(cooperaCount).build();
+    }
 }

4dkankan-center-scene/src/main/resources/bootstrap.yml

@@ -82,5 +82,9 @@ spring:
 #  sentinel:
 #    enabled: true
 
+feign:
+  httpclient:
+    connection-timeout: 200000
+
 
 

4dkankan-common/src/main/java/com/fdkankan/common/controller/BaseController.java

@@ -1,6 +1,9 @@
 package com.fdkankan.common.controller;
 
+import com.fdkankan.common.user.SSOLoginHelper;
+import com.fdkankan.common.user.SSOUser;
 import com.fdkankan.common.util.DateEditor;
+import java.util.Objects;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.propertyeditors.StringTrimmerEditor;
 import org.springframework.web.bind.WebDataBinder;
@@ -17,6 +20,9 @@ public class BaseController {
     @Autowired
     protected HttpServletResponse response;
 
+    @Autowired
+    SSOLoginHelper ssoLoginHelper;
+
     @InitBinder
     protected void initBinder(WebDataBinder webDataBinder) {
         webDataBinder.registerCustomEditor(String.class, new StringTrimmerEditor(true));
@@ -26,4 +32,12 @@ public class BaseController {
     protected String getToken(){
         return request.getHeader("token");
     }
+
+    protected Long getUserId(){
+        SSOUser ssoUser = ssoLoginHelper.loginCheck(request.getHeader("token"));
+        if(Objects.nonNull(ssoUser)){
+            return ssoUser.getId();
+        }
+        return null;
+    }
 }