1

src/main/java/com/fdkankan/fusion/httpClient/FdService.java

@@ -83,8 +83,8 @@ public class FdService {
         return fdKKClient.fdkkCameraDetails(request,getFdToken());
     }
 
-    public FdkkResponse fdkKBind(String cameraSn,String userName) {
-        FdkkCameraParam request = new FdkkCameraParam(cameraSn,cameraSn,userName);
+    public FdkkResponse fdkKBind(String cameraSn,String userName,Integer cameraType) {
+        FdkkCameraParam request = new FdkkCameraParam(cameraSn,cameraSn,userName,cameraType);
         return fdKKClient.fdkKBind(request,getFdToken());
     }
 

src/main/java/com/fdkankan/fusion/httpClient/request/FdkkCameraParam.java

@@ -17,6 +17,8 @@ public class FdkkCameraParam {
     private String userName;
     private String platform = "fusion";
 
+    private Integer cameraType;
+
     public FdkkCameraParam(Long cameraId) {
         this.cameraId = cameraId;
     }
@@ -25,10 +27,11 @@ public class FdkkCameraParam {
         this.ids = ids;
     }
 
-    public FdkkCameraParam(String childName, String snCode,String userName) {
+    public FdkkCameraParam(String childName, String snCode,String userName,Integer cameraType) {
         this.childName = childName;
         this.snCode = snCode;
         this.userName = userName;
+        this.cameraType = cameraType;
     }
     public FdkkCameraParam(String childName, String snCode) {
         this.childName = childName;

src/main/java/com/fdkankan/fusion/response/BindCameraDto.java

@@ -10,4 +10,6 @@ public class BindCameraDto {
     private String deptId;
 
     private String userId;
+
+    private Integer cameraType;
 }

src/main/java/com/fdkankan/fusion/service/impl/TmCameraServiceImpl.java

@@ -83,15 +83,15 @@ public class TmCameraServiceImpl extends ServiceImpl<ITmCameraMapper, TmCamera>
         if(tmCamera != null){
             throw new BusinessException(ResultCode.CAMERA_EXITS);
         }
-        FdkkResponse<CameraVo> fdkkResponse = fdService.getCameraDetail(param.getCameraSn());
-        if(fdkkResponse.getCode() !=0 || fdkkResponse.getData() == null){
-            throw new BusinessException(ResultCode.CAMERA_NOT_EXITS);
-        }
 
-        FdkkResponse fdkkResponse2 =  fdService.fdkKBind(param.getCameraSn(),tmUser.getUserName());
+        FdkkResponse fdkkResponse2 =  fdService.fdkKBind(param.getCameraSn(),tmUser.getUserName(),param.getCameraType());
         if(fdkkResponse2.getCode() != 0){
             throw new BusinessException(fdkkResponse2.getCode(),fdkkResponse2.getMsg());
         }
+        FdkkResponse<CameraVo> fdkkResponse = fdService.getCameraDetail(param.getCameraSn());
+        if(fdkkResponse.getCode() !=0 || fdkkResponse.getData() == null){
+            throw new BusinessException(ResultCode.CAMERA_NOT_EXITS);
+        }
         tmCamera = new TmCamera();
         tmCamera.setId(IdUtils.genId(IdPreEnum.CAMERA_PRE.getPre()));
         tmCamera.setCameraSn(param.getCameraSn());
@@ -147,7 +147,7 @@ public class TmCameraServiceImpl extends ServiceImpl<ITmCameraMapper, TmCamera>
         if(fdkkResponse.getCode() !=0){
             throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
         }
-        fdkkResponse = fdService.fdkKBind(param.getCameraSn(), tmUser.getUserName());
+        fdkkResponse = fdService.fdkKBind(param.getCameraSn(), tmUser.getUserName(),param.getCameraType());
         if(fdkkResponse.getCode() !=0){
             throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
         }