Browse Source

相机入库增加秘钥校验

dsx 2 years ago
parent
commit
02b5be5260

+ 4 - 2
src/main/java/com/fdkankan/ucenter/controller/CameraController.java

@@ -1,7 +1,9 @@
 package com.fdkankan.ucenter.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.ucenter.common.BaseController;
@@ -78,9 +80,9 @@ public class CameraController extends BaseController {
      *用户绑定设备
      */
     @PostMapping("/add")
-    public Result add(@RequestBody JSONObject jsonObject,@RequestHeader String token){
+    public Result add(@RequestBody JSONObject jsonObject,@RequestHeader String token) throws Exception {
         String username = JwtUtil.getUsername(token);
-        List<String> existCodes = cameraService.bind(jsonObject.getInteger("cameraType"),jsonObject.getString("snCode"),username);
+        List<String> existCodes = cameraService.bind(jsonObject.getInteger("cameraType"),jsonObject.getString("snCode"),username, jsonObject.getString("key"));
         JSONObject object = new JSONObject();
         object.put("errorSnCode",existCodes);
         return Result.success(object);

+ 1 - 1
src/main/java/com/fdkankan/ucenter/controller/fire/FdUserCameraController.java

@@ -67,7 +67,7 @@ public class FdUserCameraController extends BaseController {
         }
 
         // 绑定相机
-        cameraService.bind(cameraDetailEntity.getType(),cameraEntity.getSnCode(), JwtUtil.getUsername(getToken()));
+        cameraService.bind(cameraDetailEntity.getType(),cameraEntity.getSnCode(), JwtUtil.getUsername(getToken()),null);
 
         return Result.success();
     }

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

@@ -7,6 +7,8 @@ import com.fdkankan.ucenter.vo.request.CameraParam;
 import com.fdkankan.ucenter.vo.response.CameraAppVo;
 import com.fdkankan.ucenter.vo.response.CameraVo;
 
+import javax.crypto.NoSuchPaddingException;
+import java.security.NoSuchAlgorithmException;
 import java.util.HashMap;
 import java.util.List;
 
@@ -30,7 +32,7 @@ public interface ICameraService extends IService<Camera> {
 
     void unbind(Long cameraId, String ids,String userName);
 
-    List<String> bind(Integer cameraType, String snCode, String username);
+    List<String> bind(Integer cameraType, String snCode, String username, String key) throws Exception;
 
     void saveCooperationUser(String ids, Long cameraId,String resourceIds, String username);
 

File diff suppressed because it is too large
+ 37 - 1
src/main/java/com/fdkankan/ucenter/service/impl/CameraServiceImpl.java