Merge remote-tracking branch 'origin/master'

4dkankan-center-api/4dkankan-center-scene-api/src/main/java/com/fdkankan/scene/api/feign/SceneUserSceneClient.java

@@ -36,14 +36,18 @@ public interface SceneUserSceneClient {
     ResultData<SceneInfoDTO> getSceneViewInfo(@RequestParam(value = "num") String num) throws Exception;
 
     @PostMapping("/lockBeyondSpaceScenes")
-    ResultData lockBeyondSpaceScenes(Long usedSpace, Long totalSpace, Long cameraId);
+    ResultData lockBeyondSpaceScenes(@RequestParam(value = "usedSpace")Long usedSpace,
+                                     @RequestParam(value = "totalSpace")Long totalSpace,
+                                     @RequestParam(value = "cameraId")Long cameraId);
 
     @PostMapping("/unlockBeyondSpaceScenes")
-    ResultData unlockBeyondSpaceScenes(Long usedSpace, Long cameraId);
+    ResultData unlockBeyondSpaceScenes(@RequestParam(value = "usedSpace")Long usedSpace,
+                                       @RequestParam(value = "cameraId")Long cameraId);
 
     @PostMapping("/findAllByYesterday")
     ResultData<List<ScenePODTO>> findAllByYesterday();
 
     @PostMapping("/updatePayStatus")
-    ResultData updatePayStatus(String num ,Integer payStatus);
+    ResultData updatePayStatus(@RequestParam(value = "num") String num ,
+                               @RequestParam(value = "payStatus") Integer payStatus);
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/task/TaskService.java

@@ -56,7 +56,7 @@ public class TaskService {
     @Resource
     private IOrderMapper orderMapper;
 
-    @Value("${oss.type}")
+    @Value("${upload.type}")
     private String ossType;
 
     public void autoDedu() {

4dkankan-center-scene/src/main/java/com/fdkankan/scene/feign/UserSceenFeign.java

@@ -67,13 +67,16 @@ public class UserSceenFeign {
     private ISceneProAppService sceneProAppService;
 
     @PostMapping("/lockBeyondSpaceScenes")
-    ResultData lockBeyondSpaceScenes(Long usedSpace, Long totalSpace, Long cameraId) throws Exception{
+    ResultData lockBeyondSpaceScenes(@RequestParam(value = "usedSpace")Long usedSpace,
+                                     @RequestParam(value = "totalSpace")Long totalSpace,
+                                     @RequestParam(value = "cameraId")Long cameraId) throws Exception{
         sceneProAppService.lockBeyondSpaceScenes(usedSpace,totalSpace,cameraId);
         return ResultData.ok();
     }
 
     @PostMapping("/unlockBeyondSpaceScenes")
-    ResultData unlockBeyondSpaceScenes(Long usedSpace, Long cameraId) throws Exception{
+    ResultData unlockBeyondSpaceScenes(@RequestParam(value = "usedSpace")Long usedSpace,
+                                       @RequestParam(value = "cameraId")Long cameraId) throws Exception{
         sceneProAppService.unlockBeyondSpaceScenes(usedSpace,cameraId);
         return ResultData.ok();
     }
@@ -90,7 +93,8 @@ public class UserSceenFeign {
     }
 
     @PostMapping("/updatePayStatus")
-    ResultData updatePayStatus(String num ,Integer payStatus){
+    ResultData updatePayStatus(@RequestParam(value = "num")String num ,
+                               @RequestParam(value = "payStatus")Integer payStatus){
         sceneService.updatePayStatus(num,payStatus);
         return ResultData.ok();
     }