1

src/main/java/com/fdkankan/ucenter/controller/CameraController.java

@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.common.ResultData;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.entity.Camera;
 import com.fdkankan.ucenter.entity.CameraDetail;
@@ -23,7 +25,7 @@ import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/user/camera")
-public class CameraController {
+public class CameraController extends BaseController {
 
     @Autowired
     ICameraDetailService cameraDetailService;
@@ -146,4 +148,15 @@ public class CameraController {
         List<Camera> cameraEntities = cameraService.list(condition2);
         return Result.success(cameraEntities.stream().map(Camera::getSnCode).collect(Collectors.toList()));
     }
+
+    /**
+     * 相机登录之后使用 获取用户设备
+     */
+    @PostMapping(value = "/detail")
+    public ResultData detail(@RequestBody  JSONObject jsonObject) {
+        if(jsonObject.get("childName") == null){
+            throw new BusinessException(LoginConstant.FAILURE_CODE_3001, LoginConstant.FAILURE_MSG_3001);
+        }
+        return ResultData.ok(userService.findCameraDetailByChildName(getToken(), jsonObject.getString("childName")));
+    }
 }

src/main/java/com/fdkankan/ucenter/entity/Camera.java

@@ -38,7 +38,7 @@ public class Camera implements Serializable {
      * 激活时间
      */
     @TableField("activated_time")
-    private Date activatedTime;
+    private String activatedTime;
 
     /**
      * 相机密码

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

@@ -5,6 +5,7 @@ import com.fdkankan.ucenter.entity.Camera;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.ucenter.vo.request.CameraParam;
 import com.fdkankan.ucenter.vo.response.CameraAppVo;
+import com.fdkankan.ucenter.vo.response.CameraVo;
 
 import java.util.HashMap;
 import java.util.List;
@@ -41,6 +42,8 @@ public interface ICameraService extends IService<Camera> {
 
     Camera getByChildName(String childName);
 
+    CameraVo getVoByChildName(String childName);
+
     List<CameraAppVo> getCameraInfo(String childName, String childPassword);
 
     List<Camera> getAllList(String childName,String token);

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

@@ -54,4 +54,6 @@ public interface IUserService extends IService<User> {
     List<Long> getLikeUserName(String userName);
 
     User getByToken(String token);
+
+    Object findCameraDetailByChildName(String token, String childName);
 }

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

@@ -311,6 +311,33 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     }
 
     @Override
+    public CameraVo getVoByChildName(String childName) {
+        CameraVo vo = new CameraVo();
+        Camera cameraEntity = this.getByChildName(childName);
+        if (cameraEntity != null){
+            CameraDetail detailEntity = cameraDetailService.getByCameraId(cameraEntity.getId());
+            if (detailEntity != null){
+                vo.setId(cameraEntity.getId());
+                vo.setUserId(detailEntity.getUserId());
+                vo.setActivatedTime(cameraEntity.getActivatedTime());
+                vo.setBalance(Integer.valueOf(detailEntity.getBalance()));
+                vo.setChildName(cameraEntity.getChildName());
+                vo.setSnCode(cameraEntity.getSnCode());
+                if (detailEntity.getType() != 0){
+                    vo.setUsedSpace(String.valueOf(FileSizeUtil.formetFileSize(detailEntity.getUsedSpace().longValue(), FileSizeUtil.SIZETYPE_GB)));
+                    vo.setTotalSpace(String.valueOf(FileSizeUtil.formetFileSize(detailEntity.getTotalSpace().longValue(), FileSizeUtil.SIZETYPE_GB)));
+                    vo.setUsedSpaceStr(FileSizeUtil.formatFileSize(detailEntity.getUsedSpace().longValue()));
+                    vo.setTotalSpaceStr(FileSizeUtil.formatFileSize(detailEntity.getTotalSpace().longValue()));
+                }
+                vo.setType(detailEntity.getType());
+                vo.setCountry(detailEntity.getCountry());
+                vo.setCameraType(detailEntity.getType()+"");
+            }
+        }
+        return vo;
+    }
+
+    @Override
     public List<CameraAppVo> getCameraInfo(String childName, String childPassword) {
         return this.getBaseMapper().getCameraInfo(childName,childPassword);
     }

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

@@ -8,27 +8,22 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ConstantRegex;
 import com.fdkankan.common.constant.ConstantUrl;
 import com.fdkankan.common.exception.BusinessException;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.common.util.JwtUtil;
-import com.fdkankan.common.util.SecurityUtil;
+import com.fdkankan.common.util.*;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.sensitive.Variable;
 import com.fdkankan.ucenter.constant.LoginConstant;
-import com.fdkankan.ucenter.entity.ReceiverInfo;
-import com.fdkankan.ucenter.entity.User;
+import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.mapper.IUserMapper;
-import com.fdkankan.ucenter.service.ICameraDetailService;
-import com.fdkankan.ucenter.service.IReceiverInfoService;
-import com.fdkankan.ucenter.service.IUserIncrementService;
-import com.fdkankan.ucenter.service.IUserService;
+import com.fdkankan.ucenter.service.*;
 import com.fdkankan.ucenter.util.DateUserUtil;
 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.UserVo;
+import com.fdkankan.ucenter.vo.response.*;
+
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Date;
@@ -38,6 +33,8 @@ import java.util.Set;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.Days;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -67,6 +64,10 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     RedisUtil redisUtil;
     @Autowired
     FYunFileServiceInterface fYunFileService;
+    @Autowired
+    ICameraService cameraService;
+    @Autowired
+    ICameraSpaceService cameraSpaceService;
 
     private User getByEmail(String email){
         QueryWrapper<User> queryWrapper = new QueryWrapper<>();
@@ -289,4 +290,41 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         String username = JwtUtil.getUsername(token);
         return this.getByUserName(username);
     }
+
+    @Override
+    public Object findCameraDetailByChildName(String token, String childName) {
+        User user = this.getByToken(token);
+        CameraVo cameraVo = cameraService.getVoByChildName(childName);
+        if(user != null){
+            cameraVo.setNickName(user.getNickName());
+        }else {
+            if(cameraVo.getType().equals(9)){
+                cameraVo.setNickName("Minion设备用户");
+            }else if(cameraVo.getType().equals(10)){
+                cameraVo.setNickName("Laser设备用户");
+            }else{
+                cameraVo.setNickName("Pro设备用户");
+            }
+        }
+        List<CameraSpaceVo> voList = cameraSpaceService.getVoListByCameraId(cameraVo.getId());
+        if(voList != null && voList.size() > 0){
+            CameraSpaceVo cameraSpace = voList.get(0);
+            Long space = cameraSpace.getSpace();
+            cameraVo.setSpaceId(cameraSpace.getId());
+            cameraVo.setSpace((long) FileSizeUtil.formetFileSize(space, FileSizeUtil.SIZETYPE_GB));
+            cameraVo.setSpaceStr(FileSizeUtil.formatFileSize(space));
+            cameraVo.setSpaceEndStr(DateUtil.date2String(cameraSpace.getSpaceEndTime(), DateUtil.YYYY_MM_DD_DATE_FORMAT));
+            if(Days.daysBetween(new DateTime(), new DateTime(cameraSpace.getSpaceEndTime())).getDays() < 7){
+                cameraVo.setIsExpire(true);
+            }
+        }
+        //获取会员权益
+        UserIncrement userIncrement = userIncrementService.getByCameraId(cameraVo.getId());
+        if(userIncrement != null){
+            ResponseUserIncrement responseUserIncrement = new ResponseUserIncrement();
+            BeanUtils.copyProperties(userIncrement,responseUserIncrement);
+            cameraVo.setResponseUserIncrement(responseUserIncrement);
+        }
+        return cameraVo;
+    }
 }

src/main/java/com/fdkankan/ucenter/vo/response/CameraVo.java

@@ -2,6 +2,8 @@ package com.fdkankan.ucenter.vo.response;
 
 import lombok.Data;
 
+import java.util.Date;
+
 @Data
 public class CameraVo {
     private Long id;
@@ -36,4 +38,21 @@ public class CameraVo {
     private Integer surplusDate;
 
     private Long goodsId;
+
+
+    /**"相机容量表id", name = "spaceId*/
+    private Long spaceId;
+    /**"国际，0国内，1国际", name = "country*/
+    private int country;
+
+    /**"用户id", name = "userId*/
+    private Long userId;
+
+    /**"激活时间", name = "activatedTime*/
+    private String activatedTime;
+
+    /**"昵称", name = "nickName*/
+    private String nickName;
+
+    private  ResponseUserIncrement responseUserIncrement;
 }

src/main/java/com/fdkankan/ucenter/vo/response/ResponseUserIncrement.java

@@ -0,0 +1,51 @@
+package com.fdkankan.ucenter.vo.response;
+
+import com.fdkankan.ucenter.common.RequestBase;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Created by Hb_zzZ on 2021/3/16.
+ */
+@Data
+public class ResponseUserIncrement extends RequestBase {
+
+    private String key;
+
+    private Long id;
+
+    private Long userId;
+
+    private Long cameraId;
+
+    private String orderSn;
+
+    /**
+     * 生效时间
+     */
+    private Date incrementStartTime;
+    /**
+     * 结束时间
+     */
+    private Date incrementEndTime;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    private String snCode;
+
+    private String incrementStartStr;
+
+    private String incrementEndStr;
+
+    private String createStr;
+
+    private Boolean isExpire;
+
+    private String keyWord;
+
+    private Integer isExpired;
+}