场景中心 test

4dkankan-center-api/4dkankan-center-platform-api/src/main/java/com/fdkankan/platform/api/feign/PlatformClient.java

@@ -1,7 +1,8 @@
 package com.fdkankan.platform.api.feign;
 
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.platform.api.vo.UserIncrement;
+import com.fdkankan.common.user.SSOUser;
+import com.fdkankan.platform.api.vo.*;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,47 +17,47 @@ public interface PlatformClient {
      * @return Camera
      */
     @PostMapping("/getCameraByChildName")
-    ResultData getCameraByChildName(@RequestParam(value = "childName",required = false) String childName);
+    ResultData<Camera> getCameraByChildName(@RequestParam(value = "childName",required = false) String childName);
 
     /**
      *
      * @return CameraDetail
      */
     @PostMapping("/getCameraDetailByCameraId")
-    ResultData getCameraDetailByCameraId(@RequestParam(value = "cameraId",required = false) Long cameraId);
+    ResultData<CameraDetail> getCameraDetailByCameraId(@RequestParam(value = "cameraId",required = false) Long cameraId);
 
     /**
      *
      * @return CameraDetail
      */
     @PostMapping("/updateCameraDetailByCameraIdAndSpace")
-    ResultData updateCameraDetailByCameraIdAndSpace(@RequestParam(value = "cameraId", required = false) Long cameraId,
+    ResultData<CameraDetail> updateCameraDetailByCameraIdAndSpace(@RequestParam(value = "cameraId", required = false) Long cameraId,
                                                            @RequestParam(value = "space", required = false) Long space);
     /**
      *
      * @return Camera
      */
     @PostMapping("/getCameraBySnCode")
-    ResultData getCameraBySnCode(@RequestParam(value = "snCode", required = false) String snCode);
+    ResultData<Camera> getCameraBySnCode(@RequestParam(value = "snCode", required = false) String snCode);
     /**
      *
      * @return SSOUser
      */
     @PostMapping("/getSSOUserByUserId")
-    ResultData getSSOUserByUserId(@RequestParam(value = "userId", required = false) Long userId) ;
+    ResultData<SSOUser> getSSOUserByUserId(@RequestParam(value = "userId", required = false) Long userId) ;
 
     /**
      *
      * @return company
      */
     @PostMapping("/getCompanyById")
-    ResultData getCompanyById(@RequestParam(value = "companyId", required = false) Long companyId) ;
+    ResultData<Company> getCompanyById(@RequestParam(value = "companyId", required = false) Long companyId) ;
     /**
      *
      * @return user
      */
     @PostMapping("/getUserByName")
-    ResultData getUserByName(@RequestParam(value = "userName", required = false) String userName) ;
+    ResultData<User> getUserByName(@RequestParam(value = "userName", required = false) String userName) ;
     /**
      *
      * @return UserIncrement