我的相机接口

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

@@ -1,9 +1,8 @@
 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 com.fdkankan.scene.api.vo.SceneProDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -13,8 +12,13 @@ import org.springframework.web.bind.annotation.RequestParam;
 @RequestMapping("/scene/feign/user/scene")
 public interface SceneUserSceneClient {
 
-
     @PostMapping("/getSceneCnt")
     ResultData<SceneCnt> getSceneCnt(@RequestParam(value = "userId") Long userId, @RequestParam(value = "cameraId") Long cameraId) ;
 
+    @PostMapping("/getSceneNumByCameraId")
+    ResultData<Integer> getSceneNumByCameraId(@RequestParam(value = "cameraId") Long cameraId) ;
+
+    @PostMapping("/getLastSceneByCameraId")
+    ResultData<SceneProDTO> getLastSceneByCameraId(@RequestParam(value = "cameraId") Long cameraId) ;
+
 }

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

@@ -0,0 +1,141 @@
+package com.fdkankan.scene.api.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * pro场景表
+ * </p>
+ *
+ * @author 
+ * @since 2022-01-20
+ */
+@Getter
+@Setter
+@TableName("t_scene_pro")
+public class SceneProDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 场景名称
+     */
+    @TableField("scene_name")
+    private String sceneName;
+
+    /**
+     * 场景描述
+     */
+    @TableField("scene_dec")
+    private String sceneDec;
+
+    /**
+     * 场景的链接地址
+     */
+    @TableField("web_site")
+    private String webSite;
+
+    /**
+     * 场景缩略图
+     */
+    @TableField("thumb")
+    private String thumb;
+
+    /**
+     * 用户表t_user的id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 相机主表t_camera的id
+     */
+    @TableField("camera_id")
+    private Long cameraId;
+
+    /**
+     * 场景logo
+     */
+    @TableField("scene_logo")
+    private String sceneLogo;
+
+    /**
+     * 大场景序号
+     */
+    @TableField("num")
+    private String num;
+
+    /**
+     * 0-其他，1-文博，2-地产，3-电商，4-餐饮，5-家居,99-一件换装虚拟房源
+     */
+    @TableField("scene_type")
+    private Integer sceneType;
+
+    /**
+     * 点位视频
+     */
+    @TableField("videos")
+    private String videos;
+
+    /**
+     * 要gps定位
+     */
+    @TableField("gps")
+    private String gps;
+
+    /**
+     * 方案：1-双目，2-转台，3-六目,4-八目,10-获取4k图，11-获取2k，12-获取1k
+     */
+    @TableField("scene_scheme")
+    private Integer sceneScheme;
+
+    /**
+     * 0表示未付款，1表示付款了，-1表示欠费，-2表示容量不足
+     */
+    @TableField("pay_status")
+    private Integer payStatus;
+
+    /**
+     * 0表示未建好，1表示建好，-1表示出错，-2表示不要在官网上显示
+     */
+    @TableField("scene_status")
+    private Integer sceneStatus;
+
+    /**
+     * 算法类型（V2,V3）
+     */
+    @TableField("build_type")
+    private String buildType;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 0-有效，1-删除
+     */
+    @TableField("tb_status")
+    @TableLogic
+    private Integer tbStatus;
+
+
+}

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/ICameraDetailService.java

@@ -62,4 +62,5 @@ public interface ICameraDetailService extends IService<CameraDetail> {
     Page<ResponseCamera> cameraList(RequestCamera param);
 
     void updateCompanyId(Long companyId);
+
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/ICameraService.java

@@ -3,6 +3,7 @@ package com.fdkankan.platform.goods.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.platform.goods.entity.Camera;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.platform.goods.entity.CameraDetail;
 import com.fdkankan.platform.user.request.RequestCamera;
 import com.fdkankan.platform.user.vo.ResponseCamera;
 import com.fdkankan.platform.user.vo.ResponseCameraSpace;
@@ -23,7 +24,7 @@ public interface ICameraService extends IService<Camera> {
 
     Camera saveByAgent(String childName, String wifiName, String agentId, String balance);
 
-    Page<ResponseCamera> getPageByUser(RequestCamera param, Long id);
+    Page<ResponseCamera> getPageByUser(RequestCamera param, Long id) throws Exception;
 
     Camera getByChildName(String childName);
 
@@ -53,4 +54,6 @@ public interface ICameraService extends IService<Camera> {
 
     String deleteCameraNew(RequestCamera param);
 
+    List<ResponseCamera>  convert(List<CameraDetail> list);
+
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/impl/CameraDetailServiceImpl.java

@@ -132,11 +132,7 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         page.setSize(param.getPageSize());
         Page<CameraDetail> pageEntity = this.page(page, queryWrapper);
 
-        List<ResponseCamera> voList = pageEntity.getRecords().parallelStream().map(cameraDetail -> {
-            ResponseCamera responseCamera = new ResponseCamera();
-            BeanUtils.copyProperties(cameraDetail, responseCamera);
-            return responseCamera;
-        }).collect(Collectors.toList());
+        List<ResponseCamera> voList = cameraService.convert(pageEntity.getRecords());
 
         Page<ResponseCamera> voPage = new Page<>(param.getPageNum(), param.getPageSize());
         voPage.setTotal(pageEntity.getTotal());
@@ -463,4 +459,5 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         updateWrapper.lambda().eq(CameraDetail::getCompanyId,companyId);
         this.update(updateWrapper);
     }
+
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/impl/CameraServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.*;
+import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.NumberUtils;
 import com.fdkankan.platform.agent.constant.AgentConstant;
 import com.fdkankan.common.user.SSOUser;
@@ -26,6 +27,9 @@ import com.fdkankan.platform.user.service.IUserService;
 import com.fdkankan.platform.user.vo.ResponseCamera;
 import com.fdkankan.platform.user.vo.ResponseCameraSpace;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.scene.api.feign.SceneUserSceneClient;
+import com.fdkankan.scene.api.vo.SceneCnt;
+import com.fdkankan.scene.api.vo.SceneProDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -67,6 +71,8 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     private IGoodsService goodsService;
     @Value("${upload.type}")
     private String type;
+    @Autowired
+    private SceneUserSceneClient sceneUserSceneClient;
 
 
     @Override
@@ -106,7 +112,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     }
 
     @Override
-    public Page<ResponseCamera> getPageByUser(RequestCamera param, Long userId) {
+    public Page<ResponseCamera> getPageByUser(RequestCamera param, Long userId)  throws Exception{
         Page<ResponseCamera> pageVo = cameraDetailService.getPageByUserAndType(param, userId);
         if (param.getCameraType() == 4 || param.getCameraType() == 9 || param.getCameraType() == 10){
             coverList(pageVo.getRecords());
@@ -114,7 +120,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         return pageVo;
     }
 
-    private void coverList(List<ResponseCamera> list){
+    private void coverList(List<ResponseCamera> list) throws Exception{
         UserIncrement userIncrement = null;
 
         for (ResponseCamera responseCamera : list) {
@@ -150,12 +156,20 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
                     responseCamera.setCooperationUserName(userEntity.getUserName());
                 }
             }
-// todo
-//                responseCamera.setSceneNum(sceneService.findSceneNumByCameraId(responseCamera.getId()));
-//                sceneProEntity = sceneService.findLastSceneByCameraId(responseCamera.getId());
-//                if(sceneProEntity != null){
-//                    responseCamera.setLastTime(sceneProEntity.getCreateTime());
-//                }
+            ResultData<Integer> sceneNumResult = sceneUserSceneClient
+                .getSceneNumByCameraId(responseCamera.getId());
+            if(!sceneNumResult.getSuccess())
+                throw new Exception(ServerCode.FEIGN_REQUEST_FAILD.message());
+            responseCamera.setSceneNum(sceneNumResult.getData());
+
+            ResultData<SceneProDTO> SceneProResult = sceneUserSceneClient
+                .getLastSceneByCameraId(responseCamera.getId());
+            if(!SceneProResult.getSuccess())
+                throw new Exception(ServerCode.FEIGN_REQUEST_FAILD.message());
+            SceneProDTO sceneProDTO = SceneProResult.getData();
+            if(sceneProDTO != null){
+                responseCamera.setLastTime(sceneProDTO.getCreateTime());
+            }
 
         }
     }
@@ -176,6 +190,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         return convert(list);
     }
 
+    @Override
     public List<ResponseCamera>  convert(List<CameraDetail> list) {
         List<ResponseCamera> vos = new ArrayList<>();
         if (list != null && list.size() > 0){

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

@@ -60,7 +60,7 @@ public interface IUserService extends IService<User> {
 
     String updateUserDetail(RequestUser user, String token);
 
-    Page<ResponseCamera> getCameraPage(RequestCamera param, String token);
+    Page<ResponseCamera> getCameraPage(RequestCamera param, String token)  throws Exception;
 
     List<CameraDetailNumEntity> getCameraTypeNum(Integer type, String token);
 

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

@@ -342,7 +342,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     }
 
     @Override
-    public Page<ResponseCamera> getCameraPage(RequestCamera param, String token) {
+    public Page<ResponseCamera> getCameraPage(RequestCamera param, String token)  throws Exception{
         SSOUser ssoUser = this.getSSOUserByToken(token);
         return cameraService.getPageByUser(param,ssoUser.getId());
     }

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

@@ -2,6 +2,8 @@ package com.fdkankan.scene.feign;
 
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.api.vo.SceneCnt;
+import com.fdkankan.scene.api.vo.SceneProDTO;
+import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.service.IUserSceneService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,5 +28,17 @@ public class UserSceenFeign {
         SceneCnt sceneCnt = userSceneService.getSceneCnt(userId, cameraId);
         return ResultData.ok(sceneCnt);
     }
+
+    @PostMapping("/getSceneNumByCameraId")
+    ResultData<Integer> getSceneNumByCameraId(@RequestParam(value = "cameraId") Long cameraId){
+        return ResultData.ok(userSceneService.getSceneNumByCameraId(cameraId));
+    }
+
+    @PostMapping("/getLastSceneByCameraId")
+    ResultData<SceneProDTO> getLastSceneByCameraId(@RequestParam(value = "cameraId") Long cameraId){
+        return ResultData.ok(userSceneService.getLastSceneByCameraId(cameraId));
+    }
+
+
 }
 

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

@@ -3,6 +3,7 @@ package com.fdkankan.scene.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.api.vo.SceneCnt;
+import com.fdkankan.scene.api.vo.SceneProDTO;
 import com.fdkankan.scene.vo.SceneParamVO;
 import com.fdkankan.scene.vo.SceneVO;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -25,5 +26,9 @@ public interface IUserSceneService {
 
     ResultData getNewScenes(SceneParamVO param) throws Exception;
 
+    Integer getSceneNumByCameraId(Long cameraId);
+
+    SceneProDTO getLastSceneByCameraId( Long cameraId);
+
 
 }

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

@@ -4371,7 +4371,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public Long findSceneNumByCameraId(Long cameraId) {
-        return this.count(new LambdaQueryWrapper<ScenePro>().eq(ScenePro::getTbStatus, TbStatus.VALID.code()).eq(ScenePro::getCameraId, cameraId));
+        return this.count(new LambdaQueryWrapper<ScenePro>()
+            .eq(ScenePro::getCameraId, cameraId));
     }
 
     @Override

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

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -18,6 +19,7 @@ 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.api.vo.SceneProDTO;
 import com.fdkankan.scene.entity.Folder;
 import com.fdkankan.scene.entity.FolderScene;
 import com.fdkankan.scene.entity.Scene;
@@ -277,6 +279,18 @@ public class UserSceneServiceImpl implements IUserSceneService {
         return ResultData.ok(map);
     }
 
+    @Override
+    public Integer getSceneNumByCameraId(Long cameraId) {
+        Long cnt = sceneProService.findSceneNumByCameraId(cameraId);
+        return Integer.parseInt(String.valueOf(cnt));
+    }
+
+    @Override
+    public SceneProDTO getLastSceneByCameraId(Long cameraId) {
+        SceneProPO sceneProPO = sceneProService.findLastSceneByCameraId(cameraId);
+        return BeanUtil.copyProperties(sceneProPO, SceneProDTO.class);
+    }
+
     public Map<String, Object> getNewScenesPagerByUserId(Long userId, SceneParamVO param) throws Exception {
 
         List<SceneProPO> sceneList = new ArrayList<>();