1

doc/update-1.5.0.sql

@@ -42,3 +42,9 @@ ALTER TABLE `4dkankan_v4`.`jy_user`
 
 ALTER TABLE `4dkankan_v4`.`jy_user`
     ADD UNIQUE INDEX `id_card_index`(`id_card`, `rec_status`) USING HASH;
+
+
+
+ALTER TABLE t_camera_detail MODIFY total_space BIGINT NOT NULL;
+
+ALTER TABLE t_camera_detail MODIFY used_space BIGINT NOT NULL;

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

@@ -9,6 +9,7 @@ public enum CameraTypeEnum {
     DOUBLE_EYE(0,"KK-","4DKK_","旧双目相机"),
     FDKK_PRO(1,"KK-","4DKKPRO_","四维看看pro八目相机"),
     FDKK_LITE(2,"KK-","4DKKLITE_","四维看看lite"),
+    fdsfdsfds(4,"KK-","4DKKPRO_","指房宝小红屋相机"),
     ZHIHOUSE_REDHOUSE(5,"KK-","4DKKLITE_","指房宝小红屋相机"),
     DOUBLE_EYE_TURN(9,"KJ-","4DKKMI_","双目转台"),
     LASER_TURN(10,"SS-","4DSS_","激光转台"),
@@ -56,6 +57,12 @@ public enum CameraTypeEnum {
         }
         return "";
     }
+    public static String getCameraPrefixByType(Integer type){
+        if(typeMaps.containsKey(type)){
+            return typeMaps.get(type).getWifiNamePrefix();
+        }
+        return "";
+    }
 
     public static Integer getTypeByWifiNamePrefix(String wifiNamePrefix){
         return typePrefixMap.get(wifiNamePrefix);

src/main/java/com/fdkankan/manage/controller/inner/InnerAPIController.java

@@ -3,17 +3,16 @@ package com.fdkankan.manage.controller.inner;
 import cn.hutool.extra.servlet.ServletUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.manage.common.CameraTypeEnum;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.common.ResultCode;
 import com.fdkankan.manage.common.ResultData;
 import com.fdkankan.manage.controller.BaseController;
-import com.fdkankan.manage.entity.JySceneAuth;
-import com.fdkankan.manage.entity.JySceneUserAuth;
-import com.fdkankan.manage.entity.JyUser;
-import com.fdkankan.manage.entity.UserShareParam;
+import com.fdkankan.manage.entity.*;
 import com.fdkankan.manage.exception.BusinessException;
 import com.fdkankan.manage.service.*;
 import com.fdkankan.manage.util.RsaUtils;
+import com.fdkankan.manage.vo.request.CameraInStoreParam;
 import com.fdkankan.manage.vo.request.SceneParam;
 import com.fdkankan.manage.vo.request.UserParam;
 import com.fdkankan.manage.vo.response.UserAuthSceneVo;
@@ -306,6 +305,21 @@ public class InnerAPIController extends BaseController {
     }
 
 
-
+    @Autowired
+    ICameraService cameraService;
+    @PostMapping(value = "/cameraInStore")
+    public ResultData cameraInStore(@RequestBody CameraInStoreParam param){
+        if(StringUtils.isBlank(param.getSnCode()) || param.getCameraType() == null){
+            throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        Camera camera = cameraService.getBySnCode(param.getSnCode());
+        if(camera !=null){
+            return ResultData.ok(camera);
+        }
+        String wifiPre = CameraTypeEnum.getCameraPrefixByType(param.getCameraType());
+        cameraService.in(wifiPre + param.getSnCode().toUpperCase());
+        camera = cameraService.getBySnCode(param.getSnCode());
+        return ResultData.ok(camera);
+    }
 
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage.common.PageInfo;
 import com.fdkankan.manage.entity.Camera;
 import com.fdkankan.manage.vo.request.CameraInOutParam;
+import com.fdkankan.manage.vo.request.CameraInStoreParam;
 import com.fdkankan.manage.vo.request.CameraParam;
 
 import java.util.HashMap;

src/main/java/com/fdkankan/manage/vo/request/CameraInStoreParam.java

@@ -0,0 +1,10 @@
+package com.fdkankan.manage.vo.request;
+
+import lombok.Data;
+
+@Data
+public class CameraInStoreParam {
+    private Integer cameraType;
+    private String snCode;
+    private Integer userId;
+}