火调接口

src/main/java/com/fdkankan/ucenter/controller/fire/FdRequestSceneParam.java

@@ -0,0 +1,12 @@
+package com.fdkankan.ucenter.controller.fire;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class FdRequestSceneParam implements Serializable {
+    private String sceneNum;
+    private List<String> sceneNumList;
+}

src/main/java/com/fdkankan/ucenter/controller/fire/FdResponseScene.java

@@ -0,0 +1,46 @@
+package com.fdkankan.ucenter.controller.fire;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+@Data
+public class FdResponseScene implements Serializable {
+    /**"场景id,唯一主键*/
+    private Long id;
+
+    /**"所属用户的ID*/
+    private Long userId;
+
+    /**"所属相机ID*/
+    private Long cameraId;
+
+    /**"所属相机SN*/
+    private String snCode;
+
+    /**"拍摄日期*/
+    private LocalDate shootTime;
+
+    /**"拍摄点位数量*/
+    private Integer shootCount;
+
+    /**"场景封面照片(缩略图)*/
+    private String thumb;
+
+    /**"场景链接*/
+    private String webSite;
+
+    /**"浏览量*/
+    private Integer viewCount;
+
+    /**"场景码*/
+    private String num;
+
+    /**"场景标题*/
+    private String sceneName;
+
+    /**"创建日期*/
+    private String createTime;
+
+}

src/main/java/com/fdkankan/ucenter/controller/fire/FdUserCameraController.java

@@ -0,0 +1,94 @@
+package com.fdkankan.ucenter.controller.fire;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.constant.AppConstant;
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.ucenter.common.BaseController;
+import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.constant.CameraConstant;
+import com.fdkankan.ucenter.constant.LoginConstant;
+import com.fdkankan.ucenter.entity.Camera;
+import com.fdkankan.ucenter.entity.CameraDetail;
+import com.fdkankan.ucenter.entity.User;
+import com.fdkankan.ucenter.service.ICameraDetailService;
+import com.fdkankan.ucenter.service.ICameraService;
+import com.fdkankan.ucenter.service.IUserService;
+import com.fdkankan.ucenter.vo.request.CameraDetailParam;
+import com.fdkankan.ucenter.vo.response.CameraVo;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+@Log4j2
+/**火调-绑定相机*/
+@RestController
+@RequestMapping("/fd/api/user/camera")
+public class FdUserCameraController extends BaseController {
+
+    @Autowired
+    private IUserService userService;
+
+    @Autowired
+    private ICameraService cameraService;
+
+    @Autowired
+    private ICameraDetailService cameraDetailService;
+
+    /**
+     * 用户添加设备
+     */
+    @RequestMapping(value = "/add", method = RequestMethod.POST)
+    public Result addCamera(@RequestBody JSONObject param) throws Exception {
+        if(ObjectUtils.isEmpty(param.getString("snCode"))){
+            throw new BusinessException(-1,"缺少必要参数");
+        }
+        String snCode = param.getString("snCode");
+        Camera cameraEntity = cameraService.getBySnCode(snCode);
+        if(ObjectUtils.isEmpty(cameraEntity)){
+            throw new BusinessException(CameraConstant.FAILURE_CODE_6020,CameraConstant.FAILURE_MSG_6020);
+        }
+        CameraDetail cameraDetailEntity = cameraDetailService.getByCameraId(cameraEntity.getId());
+        if(ObjectUtils.isEmpty(cameraDetailEntity)){
+            throw new BusinessException(CameraConstant.FAILURE_CODE_6020,CameraConstant.FAILURE_MSG_6020);
+        }
+        if (ObjectUtils.isEmpty(cameraDetailEntity.getCompanyId())) {
+            throw new BusinessException(CameraConstant.FAILURE_CODE_6005, CameraConstant.FAILURE_MSG_6005);
+        }
+
+        if(cameraDetailEntity.getUserId() != null){
+            throw new BusinessException(AppConstant.FAILURE_CODE_4011, AppConstant.FAILURE_MSG_4011);
+        }
+
+        // 绑定相机
+        cameraService.bind(cameraDetailEntity.getType(),cameraEntity.getSnCode(), JwtUtil.getUsername(getToken()));
+
+        return Result.success();
+    }
+
+    /**
+     * 获取用户设备
+     * @return
+     */
+    @PostMapping(value = "/details")
+    public Result detail(@RequestBody CameraDetailParam param) {
+        if(StringUtils.isEmpty(param.getChildName()) && param.getChildNames().size() <=0){
+            return Result.success(new ArrayList<>());
+        }
+        if(param.getChildNames().size() <=0){
+            param.setChildNames(Arrays.asList(param.getChildName()));
+        }
+        List<CameraVo> list = new ArrayList<>();
+        for (String childName : param.getChildNames()) {
+            CameraVo vo = userService.findCameraDetailByChildName(getToken(), childName);
+            list.add(vo);
+        }
+        return Result.success(list);
+    }
+}

src/main/java/com/fdkankan/ucenter/controller/fire/FdUserSceneController.java

@@ -0,0 +1,51 @@
+package com.fdkankan.ucenter.controller.fire;
+
+import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.common.util.JwtUtil;
+import com.fdkankan.ucenter.common.BaseController;
+import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.service.ISceneProService;
+import com.fdkankan.ucenter.service.ISceneService;
+import com.fdkankan.ucenter.service.IUserService;
+import com.fdkankan.ucenter.vo.ResponseScene;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Log4j2
+/**火调-绑定场景*/
+@RestController
+@RequestMapping("/fd/api/user/scene")
+public class FdUserSceneController extends BaseController {
+
+    @Autowired
+    private ISceneProService sceneProService;
+
+    /**
+     * 获取场景详情
+     */
+    @RequestMapping(value = "/detailList", method = RequestMethod.POST)
+    public Result getSceneDetailList(@RequestBody FdRequestSceneParam param) throws Exception {
+        String username = JwtUtil.getUsername(getToken());
+        if(StringUtils.isEmpty(username)){
+            throw new BusinessException(-1,"用户未登录，或token不合法！");
+        }
+        List<ResponseScene> sceneDetailList = new ArrayList<>();
+        for (String scene : param.getSceneNumList()) {
+            ResponseScene sceneDetail = sceneProService.getSceneDetail(scene);
+            if(sceneDetail != null){
+                sceneDetailList.add(sceneDetail);
+            }
+        }
+        log.info("火调返回数据:{}",sceneDetailList);
+        return Result.success(sceneDetailList);
+    }
+}

src/main/java/com/fdkankan/ucenter/service/ISceneService.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.ucenter.entity.Scene;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.ucenter.vo.ResponseScene;
 import com.fdkankan.ucenter.vo.request.RequestScene;
 import com.fdkankan.ucenter.vo.request.SceneParam;
 import com.fdkankan.ucenter.vo.response.SceneVo;

src/main/java/com/fdkankan/ucenter/service/IUserService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.vo.request.RegisterParam;
 import com.fdkankan.ucenter.vo.request.ShipAddressParam;
 import com.fdkankan.ucenter.vo.request.UserParam;
+import com.fdkankan.ucenter.vo.response.CameraVo;
 import com.fdkankan.ucenter.vo.response.UserVo;
 
 import java.util.HashMap;
@@ -55,7 +56,7 @@ public interface IUserService extends IService<User> {
 
     User getByToken(String token);
 
-    Object findCameraDetailByChildName(String token, String childName);
+    CameraVo findCameraDetailByChildName(String token, String childName);
 
     void updateDownloadNum(long userId, int num);
 }

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

@@ -1129,6 +1129,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
     @Override
     public ResponseScene getSceneDetail(String sceneNum) {
+        if(StringUtils.isBlank(sceneNum)){
+            return null;
+        }
         ResponseScene vo = new ResponseScene();
         Scene sceneEntity = sceneService.getByNum(sceneNum);
         if(sceneEntity != null){

src/main/java/com/fdkankan/ucenter/service/impl/SceneServiceImpl.java

@@ -7,11 +7,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.Camera;
 import com.fdkankan.ucenter.entity.Scene;
+import com.fdkankan.ucenter.entity.ScenePlus;
+import com.fdkankan.ucenter.entity.ScenePro;
 import com.fdkankan.ucenter.mapper.ISceneMapper;
-import com.fdkankan.ucenter.service.ICameraService;
-import com.fdkankan.ucenter.service.ISceneService;
+import com.fdkankan.ucenter.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.ucenter.service.IUserService;
+import com.fdkankan.ucenter.vo.ResponseScene;
 import com.fdkankan.ucenter.vo.request.RequestScene;
 import com.fdkankan.ucenter.vo.request.SceneParam;
 import com.fdkankan.ucenter.vo.response.SceneVo;
@@ -19,6 +20,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -41,6 +43,10 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
     IUserService userService;
     @Autowired
     ICameraService cameraService;
+    @Autowired
+    ISceneProService sceneProService;
+    @Autowired
+    IScenePlusService scenePlusService;
 
     @Override
     public Integer getCountByUserId(Long userId) {

src/main/java/com/fdkankan/ucenter/service/impl/UserServiceImpl.java

@@ -292,7 +292,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     }
 
     @Override
-    public Object findCameraDetailByChildName(String token, String childName) {
+    public CameraVo findCameraDetailByChildName(String token, String childName) {
         User userVo = this.getByToken(token);
         CameraVo cameraVo = cameraService.getVoByChildName(childName);
         if(userVo != null && userVo.getId()!= null){

src/main/java/com/fdkankan/ucenter/vo/request/CameraDetailParam.java

@@ -0,0 +1,12 @@
+package com.fdkankan.ucenter.vo.request;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+public class CameraDetailParam {
+    private String childName;
+    private List<String> childNames = new ArrayList<>();
+}