1

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

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

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

@@ -16,7 +16,6 @@ public class FdkkCameraParam {
     private String snCode;
     private String userName;
     private String platform = "fusion";
-    private Integer cameraType;
 
     public FdkkCameraParam(Long cameraId) {
         this.cameraId = cameraId;
@@ -26,11 +25,10 @@ public class FdkkCameraParam {
         this.ids = ids;
     }
 
-    public FdkkCameraParam(String childName, String snCode,String userName,Integer cameraType) {
+    public FdkkCameraParam(String childName, String snCode,String userName) {
         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/service/impl/TmCameraServiceImpl.java

@@ -68,7 +68,7 @@ public class TmCameraServiceImpl extends ServiceImpl<ITmCameraMapper, TmCamera>
 
     @Override
     public void bind(BindCameraDto param) {
-        if(StringUtils.isBlank(param.getCameraSn()) || StringUtils.isBlank(param.getDeptId()) || StringUtils.isBlank(param.getUserId()) || param.getCameraType() == null){
+        if(StringUtils.isBlank(param.getCameraSn()) || StringUtils.isBlank(param.getDeptId()) || StringUtils.isBlank(param.getUserId()) ){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         TmUser tmUser = tmUserService.getById(param.getUserId());
@@ -84,7 +84,7 @@ public class TmCameraServiceImpl extends ServiceImpl<ITmCameraMapper, TmCamera>
             throw new BusinessException(ResultCode.CAMERA_EXITS);
         }
 
-        FdkkResponse fdkkResponse2 =  fdService.fdkKBind(param.getCameraSn(),tmUser.getUserName(),param.getCameraType());
+        FdkkResponse fdkkResponse2 =  fdService.fdkKBind(param.getCameraSn(),tmUser.getUserName());
         if(fdkkResponse2.getCode() != 0){
             throw new BusinessException(fdkkResponse2.getCode(),fdkkResponse2.getMsg());
         }
@@ -132,7 +132,7 @@ public class TmCameraServiceImpl extends ServiceImpl<ITmCameraMapper, TmCamera>
 
     @Override
     public void edit(BindCameraDto param) {
-        if(StringUtils.isBlank(param.getCameraSn())|| StringUtils.isBlank(param.getUserId()) || param.getCameraType() == null){
+        if(StringUtils.isBlank(param.getCameraSn())|| StringUtils.isBlank(param.getUserId()) ){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         TmUser tmUser = tmUserService.getById(param.getUserId());
@@ -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(),param.getCameraType());
+        fdkkResponse = fdService.fdkKBind(param.getCameraSn(), tmUser.getUserName());
         if(fdkkResponse.getCode() !=0){
             throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
         }