添加注释

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/DeviceAjController.java

@@ -8,6 +8,7 @@ import com.bizmatics.mhfire.service.DeviceAjService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -33,7 +34,9 @@ public class DeviceAjController {
      * @return
      */
     @GetMapping("/page")
-    public ApiResult<CommonPage<DeviceAj>> page(String deviceType,Integer current,Integer size){
+    public ApiResult<CommonPage<DeviceAj>> page(@RequestParam String deviceType,
+                                                @RequestParam Integer current,
+                                                @RequestParam Integer size){
         return ApiResult.success(deviceAjService.page(deviceType,current,size));
     }
 }

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/DeviceController.java

@@ -10,6 +10,7 @@ import com.bizmatics.mhfire.service.vo.DeviceMapVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -49,7 +50,10 @@ public class DeviceController {
      * @return
      */
     @GetMapping("collect")
-    public ApiResult<CommonPage<DeviceCollectVO>> getCollect(Integer current, Integer size, String deviceType, String deviceCode){
+    public ApiResult<CommonPage<DeviceCollectVO>> getCollect(@RequestParam Integer current,
+                                                             @RequestParam Integer size,
+                                                             @RequestParam(required = false) String deviceType,
+                                                             @RequestParam(required = false) String deviceCode){
         return ApiResult.success(deviceService.getCollect(current,size,deviceType,deviceCode));
     }
 
@@ -59,7 +63,7 @@ public class DeviceController {
      * @return
      */
     @GetMapping("/one")
-    public ApiResult<Device> one(Long id){
+    public ApiResult<Device> one(@RequestParam Long id){
         return ApiResult.success(deviceService.getById(id));
     }
 

mhfire-controller/src/main/java/com/bizmatics/mhfire/controller/web/DeviceInfoController.java

@@ -6,6 +6,7 @@ import com.bizmatics.mhfire.service.DeviceInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Date;
@@ -34,7 +35,9 @@ public class DeviceInfoController {
      * @return
      */
     @GetMapping("/elIco")
-    public ApiResult<List<Map<String,Object>>> elIco(String deviceCode, Date startTime, Date endTime){
+    public ApiResult<List<Map<String,Object>>> elIco(@RequestParam String deviceCode,
+                                                     @RequestParam Date startTime,
+                                                     @RequestParam Date endTime){
         return ApiResult.success(deviceInfoService.elIco(deviceCode,startTime,endTime));
     }
 }