lyhzzz 8 months ago
parent
commit
00990827bd

+ 7 - 0
src/main/java/com/fdkankan/ucenter/controller/inner/InnerController.java

@@ -6,8 +6,10 @@ import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.ucenter.annotation.CheckInnerApiPermit;
 import com.fdkankan.ucenter.annotation.CheckInnerApiPermit;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.common.ResultData;
 import com.fdkankan.ucenter.service.IInnerService;
 import com.fdkankan.ucenter.service.IInnerService;
 import com.fdkankan.ucenter.vo.request.CameraDetailParam;
 import com.fdkankan.ucenter.vo.request.CameraDetailParam;
+import com.fdkankan.ucenter.vo.request.CameraInStoreParam;
 import com.fdkankan.ucenter.vo.response.CameraVo;
 import com.fdkankan.ucenter.vo.response.CameraVo;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -105,4 +107,9 @@ public class InnerController extends BaseController {
         }
         }
         return Result.success(innerService.getCameraDetail(snCode));
         return Result.success(innerService.getCameraDetail(snCode));
     }
     }
+
+    @PostMapping(value = "/cameraInStore")
+    public ResultData cameraInStore(@RequestBody CameraInStoreParam param){
+        return ResultData.ok(innerService.cameraInStore(param));
+    }
 }
 }

+ 3 - 1
src/main/java/com/fdkankan/ucenter/service/ICameraService.java

@@ -3,6 +3,7 @@ package com.fdkankan.ucenter.service;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.entity.Camera;
 import com.fdkankan.ucenter.entity.Camera;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.ucenter.vo.request.CameraInStoreParam;
 import com.fdkankan.ucenter.vo.request.CameraParam;
 import com.fdkankan.ucenter.vo.request.CameraParam;
 import com.fdkankan.ucenter.vo.response.CameraAppVo;
 import com.fdkankan.ucenter.vo.response.CameraAppVo;
 import com.fdkankan.ucenter.vo.response.CameraVo;
 import com.fdkankan.ucenter.vo.response.CameraVo;
@@ -54,5 +55,6 @@ public interface ICameraService extends IService<Camera> {
 
 
     List<Camera> getBySnCodes(List<String> snCodes);
     List<Camera> getBySnCodes(List<String> snCodes);
 
 
-    void add(String snCode, Integer cameraType);
+    Camera add(String snCode, Integer cameraType);
+
 }
 }

+ 3 - 0
src/main/java/com/fdkankan/ucenter/service/IInnerService.java

@@ -1,6 +1,7 @@
 package com.fdkankan.ucenter.service;
 package com.fdkankan.ucenter.service;
 
 
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.vo.request.CameraInStoreParam;
 import com.fdkankan.ucenter.vo.response.LaserSceneInfoVo;
 import com.fdkankan.ucenter.vo.response.LaserSceneInfoVo;
 
 
 /**
 /**
@@ -26,4 +27,6 @@ public interface IInnerService {
     LaserSceneInfoVo getSceneInfo(String num);
     LaserSceneInfoVo getSceneInfo(String num);
 
 
     Object getCameraDetail(String snCode);
     Object getCameraDetail(String snCode);
+
+    Object cameraInStore(CameraInStoreParam param);
 }
 }

+ 2 - 1
src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java

@@ -503,7 +503,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     }
     }
 
 
     @Override
     @Override
-    public void add(String snCode, Integer cameraType) {
+    public Camera add(String snCode, Integer cameraType) {
         Camera camera = new Camera();
         Camera camera = new Camera();
         camera.setWifiName(snCode);
         camera.setWifiName(snCode);
         camera.setSnCode(snCode);
         camera.setSnCode(snCode);
@@ -536,6 +536,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         cameraDetail.setOwn(2);
         cameraDetail.setOwn(2);
         cameraDetail.setOutTime(DateUserUtil.getDate(new Date()));
         cameraDetail.setOutTime(DateUserUtil.getDate(new Date()));
         cameraDetailService.save(cameraDetail);
         cameraDetailService.save(cameraDetail);
+        return camera;
 
 
 //        UserIncrement userIncrementEntity = new UserIncrement();
 //        UserIncrement userIncrementEntity = new UserIncrement();
 //        userIncrementEntity.setKeyWord(UUID.randomUUID().toString().replace("-", ""));
 //        userIncrementEntity.setKeyWord(UUID.randomUUID().toString().replace("-", ""));

+ 16 - 0
src/main/java/com/fdkankan/ucenter/service/impl/InnerServiceImpl.java

@@ -14,9 +14,11 @@ import com.fdkankan.ucenter.common.constants.ResultCode;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.constant.LoginConstant;
 import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.service.*;
 import com.fdkankan.ucenter.service.*;
+import com.fdkankan.ucenter.vo.request.CameraInStoreParam;
 import com.fdkankan.ucenter.vo.response.LaserSceneInfoVo;
 import com.fdkankan.ucenter.vo.response.LaserSceneInfoVo;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
@@ -214,4 +216,18 @@ public class InnerServiceImpl implements IInnerService {
         }
         }
         return cameraDetailService.getByCameraId(camera.getId());
         return cameraDetailService.getByCameraId(camera.getId());
     }
     }
+
+
+    @Override
+    public Camera cameraInStore(CameraInStoreParam param) {
+        if(param.getCameraType() == null || StringUtils.isBlank(param.getSnCode())){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
+        }
+        Camera camera = cameraService.getBySnCode(param.getSnCode());
+        if(camera != null){
+            return camera;
+        }
+        return cameraService.add(param.getSnCode(),param.getCameraType());
+
+    }
 }
 }

+ 9 - 0
src/main/java/com/fdkankan/ucenter/vo/request/CameraInStoreParam.java

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