设备 传参 修改

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceKeepController.java

@@ -109,13 +109,13 @@ public class StorageDeviceKeepController {
      */
     @RequestMapping(value="/end", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
 	@ApiOperation(value="结束保养", notes = "结束保养")
-    public Map<String, Object> end(String deviceListJson) {
+    public Map<String, Object> end(@RequestBody StorageDevicekeep storageDevicekeep) {
         Map<String, Object> map = new HashMap<>();
         // JSON字符串转对象
-        ObjectMapper mapper = new ObjectMapper();
-        StorageDevicekeep storageDevicekeep = null;
+        //ObjectMapper mapper = new ObjectMapper();
+        //StorageDevicekeep storageDevicekeep = null;
         try {
-        	storageDevicekeep = (StorageDevicekeep)mapper.readValue(deviceListJson, StorageDevicekeep.class);
+        	//storageDevicekeep = (StorageDevicekeep)mapper.readValue(deviceListJson, StorageDevicekeep.class);
         	storageDevicekeep.setKeepEnd(new Date());
         	storageDevicekeep.setKeepStatus(0);
         	deviceKeepService.updateByPrimaryKeySelective(storageDevicekeep);
@@ -138,7 +138,7 @@ public class StorageDeviceKeepController {
         	deviceInputService.updateByPrimaryKeySelective(inputList.get(0));
         	deviceKeepService.updateByPrimaryKeySelective(storageDevicekeep);*/
             map.put("status", "success");
-        } catch (IOException e) {
+        } catch (Exception e) {
             map.put("status", "error");
             e.printStackTrace();
         }

src/main/java/com/chinaitop/depot/device/controller/StorageDeviceRepairController.java

@@ -194,13 +194,13 @@ public class StorageDeviceRepairController {
      */
     @RequestMapping(value = "/end", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value = "结束维修", notes = "结束维修")
-    public Map<String, Object> end(String deviceListJson) {
+    public Map<String, Object> end(@RequestBody StorageDevicerepair storageDevicerepair) {
         Map<String, Object> modelMap = new HashMap<>();
         // JSON字符串转对象
         ObjectMapper mapper = new ObjectMapper();
-        StorageDevicerepair storageDevicerepair = null;
+        //StorageDevicerepair storageDevicerepair = null;
         try {
-            storageDevicerepair = (StorageDevicerepair) mapper.readValue(deviceListJson, StorageDevicerepair.class);
+            //storageDevicerepair = (StorageDevicerepair) mapper.readValue(deviceListJson, StorageDevicerepair.class);
             //改变维修表中的信息
             storageDevicerepair.setRepairEnd(new Date());
             storageDevicerepair.setRepairStatus(0);
@@ -218,7 +218,7 @@ public class StorageDeviceRepairController {
             dSbxxsjy.setMqzt("1");
             sblxxjyService.update(dSbxxsjy);
             modelMap.put("status", "success");
-        } catch (IOException e) {
+        } catch (Exception e) {
             modelMap.put("status", "error");
             e.printStackTrace();
         }
@@ -233,7 +233,7 @@ public class StorageDeviceRepairController {
     public Map<String, Object> endMore(String deviceListJson) {
         Map<String, Object> modelMap = new HashMap<>();
         // JSON字符串转对象
-        ObjectMapper mapper = new ObjectMapper();
+        //ObjectMapper mapper = new ObjectMapper();
         try {
             JSONObject jsonObject = JSONObject.parseObject(deviceListJson);
             String idStr = jsonObject.getString("id");