Merge remote-tracking branch 'origin/master'

huimv-farm-v2/huimv-pigfarm-local-device/src/main/java/com/huimv/huimvpigfarmlocaldevice/controller/DeviceController.java

@@ -33,7 +33,7 @@ public class DeviceController {
     private DateUtil dateUtil;
 
     //新建设备信息
-    @RequestMapping(value = "/newDevice",method = RequestMethod.POST)
+    @RequestMapping(value = "/newDevice",method = RequestMethod.GET)
     public Result saveDevice(@RequestParam(value = "deviceName",required = true) String deviceName,@RequestParam(value = "deviceCode",required = true) String deviceCode,@RequestParam(value = "deviceType",required = true) String deviceType,
                              @RequestParam(value = "factory",required = true) String factory,@RequestParam(value = "worker",required = true) String worker,@RequestParam(value = "mainParams",required = true) String mainParams,
                              @RequestParam(value = "state",required = true) Integer state, @RequestParam(value = "record",required = true) String record, @RequestParam(value = "farmId",required = true) Integer farmId){
@@ -42,7 +42,7 @@ public class DeviceController {
     }
 
     //编辑设备信息
-    @RequestMapping(value = "/editDevice",method = RequestMethod.POST)
+    @RequestMapping(value = "/editDevice",method = RequestMethod.GET)
     public Result editDevice(@RequestParam(value = "deviceName",required = true) String deviceName,@RequestParam(value = "deviceCode",required = true) String deviceCode,@RequestParam(value = "deviceType",required = true) String deviceType,
                              @RequestParam(value = "factory",required = true) String factory,@RequestParam(value = "worker",required = true) String worker,@RequestParam(value = "mainParams",required = true) String mainParams,
                              @RequestParam(value = "state",required = true) Integer state, @RequestParam(value = "record",required = true) String record, @RequestParam(value = "farmId",required = true) Integer farmId,
@@ -52,7 +52,7 @@ public class DeviceController {
     }
 
     //删除设备信息
-    @RequestMapping(value = "/removeDevice",method = RequestMethod.POST)
+    @RequestMapping(value = "/removeDevice",method = RequestMethod.GET)
     public Result removeDevice(@RequestParam(value = "ids",required = true) String ids,@RequestParam(value = "farmId",required = true) Integer farmId){
         //
         return iDevice.removeDevice(ids,farmId);