Merge branch 'dev' of depot-qinghai/depot-device-qinghai into master

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

@@ -10,6 +10,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -121,14 +122,14 @@ public class BasicEquipmentEquipmentPoolController {
 		  @ApiImplicitParam(name = "orgId", value = "当前登录人组织id", paramType = "form"),
 		  @ApiImplicitParam(name = "poolJson", value = "数据对象", paramType = "form")
 	})
-	public Map<String, Object> update(String poolJson ,Integer userId ,Integer orgId) {
+	public Map<String, Object> update(@RequestBody BasicEquipmentEquipmentPool pool) {
 		Map<String, Object> map = new HashMap<String, Object>();
-		ObjectMapper mapper = new ObjectMapper();
+		/*ObjectMapper mapper = new ObjectMapper();*/
 		try {
-			BasicEquipmentEquipmentPool pool = mapper.readValue(poolJson, BasicEquipmentEquipmentPool.class);
+			/*BasicEquipmentEquipmentPool pool = mapper.readValue(poolJson, BasicEquipmentEquipmentPool.class);*/
 			if (pool.getId() == null) {
-				pool.setOrgId(orgId);
-				pool.setInputPersonId(userId);
+				pool.setOrgId(pool.getOrgId());
+				pool.setInputPersonId(pool.getInputPersonId());
 				pool.setInputDate(new Date());
 				poolServivce.add(pool);
 			} else {

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

@@ -1,26 +1,16 @@
 package com.chinaitop.depot.device.controller;
 
 
-import com.chinaitop.depot.device.model.BusinessImAsset;
 import com.chinaitop.depot.device.model.BusinessImPurchaseSale;
-import com.chinaitop.depot.device.model.param.BusinessImPurchaseSaleAddParam;
-import com.chinaitop.depot.device.model.param.BusinessImPurchaseSaleEditParam;
 import com.chinaitop.depot.device.model.param.BusinessImPurchaseSalePageParam;
 import com.chinaitop.depot.device.service.BusinessImPurchaseSaleService;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 

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

@@ -15,6 +15,7 @@ import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -96,14 +97,11 @@ public class DFacilitiesController {
 
     @RequestMapping(value = "/basics/remove", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
     @ApiOperation(value = "根据id删除设施基础信息", notes = "根据id删除设施基础信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "id", value = "主键id", paramType = "query")
-    })
-    public Map<String, Object> remove(Integer id) {
+    public Map<String, Object> remove(@RequestBody DFacilitiesBasics dFacilitiesBasics) {
         Map<String, Object> modelMap = new HashMap<>();
         try {
-            if (id != null) {
-                dFacilitiesBasicsService.remove(id);
+            if (dFacilitiesBasics.getId() != null) {
+                dFacilitiesBasicsService.remove(dFacilitiesBasics.getId());
                 modelMap.put("status", "success");
             } else {
                 modelMap.put("status", "error");
@@ -144,12 +142,12 @@ public class DFacilitiesController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "dFacilitiesBasicsJson", value = "设施基础信息数据", paramType = "form")
     })
-    public Map<String, Object> scrap(String dFacilitiesBasicsJson) {
+    public Map<String, Object> scrap(@RequestBody DFacilitiesBasics dFacilitiesBasics) {
         Map<String, Object> modelMap = new HashMap<>();
         // JSON字符串转对象
-        ObjectMapper mapper = new ObjectMapper();
+        /*ObjectMapper mapper = new ObjectMapper();*/
         try {
-            DFacilitiesBasics dFacilitiesBasics = mapper.readValue(dFacilitiesBasicsJson, DFacilitiesBasics.class);
+            /*DFacilitiesBasics dFacilitiesBasics = mapper.readValue(dFacilitiesBasicsJson, DFacilitiesBasics.class);*/
             if (dFacilitiesBasics.getId()!=null) {
                 dFacilitiesBasicsService.scrap(dFacilitiesBasics);
             } else {
@@ -199,16 +197,13 @@ public class DFacilitiesController {
 
     @RequestMapping(value = "/maintain/save", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value = "保存/编辑设施保养信息", notes = "设施保养信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "dFacilitiesMaintainJson", value = "设施保养信息", paramType = "query")
-    })
-    public Map<String, Object> saveMaintain(String dFacilitiesMaintainJson) {
+    public Map<String, Object> saveMaintain(@RequestBody DFacilitiesMaintain dFacilitiesMaintain) {
         Map<String, Object> modelMap = new HashMap<>();
         // JSON字符串转对象
         ObjectMapper mapper = new ObjectMapper();
         try {
-            DFacilitiesMaintain dFacilitiesMaintain = mapper.readValue(dFacilitiesMaintainJson, DFacilitiesMaintain.class);
-            if (dFacilitiesMaintain.getId()==null) {
+/*            DFacilitiesMaintain dFacilitiesMaintain = mapper.readValue(dFacilitiesMaintainJson, DFacilitiesMaintain.class);
+*/            if (dFacilitiesMaintain.getId()==null) {
                 dFacilitiesMaintain.setCreateTime(new Date()); // 创建时间
                 dFacilitiesMaintainService.save(dFacilitiesMaintain); // 新增
             } else {

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

@@ -12,9 +12,12 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
@@ -89,12 +92,12 @@ public class DSblxxjyController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "dSbxxsjyJson", value = "主表数据", paramType = "form")
     })
-    public Map<String, Object> save(String dSbxxsjyJson) {
+    public Map<String, Object> save(@RequestBody DSbxxsjy dSbxxsjy) {
         Map<String, Object> modelMap = new HashMap<>();
         // JSON字符串转对象
-        ObjectMapper mapper = new ObjectMapper();
-        try {
-            DSbxxsjy dSbxxsjy = mapper.readValue(dSbxxsjyJson, DSbxxsjy.class);
+/*        ObjectMapper mapper = new ObjectMapper();
+*/        try {
+            /*DSbxxsjy dSbxxsjy = mapper.readValue(dSbxxsjyJson, DSbxxsjy.class);*/
             dSbxxsjy.setWhsj(dSbxxsjy.getCreateDate()); // 维护时间
             // 生成设备器材编码
             if (StringUtils.isBlank(dSbxxsjy.getSbbh())) {
@@ -177,21 +180,22 @@ public class DSblxxjyController {
     }
 
     @RequestMapping(value = "/outUpdate", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
-    @ApiOperation(value = "保存数据", notes = "保存")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "sbbh", value = "主表数据", paramType = "form")
-    })
-    public Map<String, Object> outUpdate(String sbbh) {
-        Map<String, Object> modelMap = new HashMap<>();
+    @ApiOperation(value = "报废", notes = "报废")
+    @ApiImplicitParams({ @ApiImplicitParam(name = "sbbh", value = "主表数据", dataType = "String", example = "example value", required = true) })
+    public Map<String,Object> outUpdate(@RequestParam String sbbh) {
+        Map<String,Object> modelMap = new HashMap<>();
         try {
             //根据设备编号获取入库表的该设备信息
             DSbxxsjyExample example = new DSbxxsjyExample();
             DSbxxsjyExample.Criteria criteria = example.createCriteria();
             criteria.andSbbhEqualTo(sbbh);
-            DSbxxsjy dSbxxsjy = sblxxjyService.getList(example).get(0);
-            dSbxxsjy.setStatus("0");
-            sblxxjyService.update(dSbxxsjy); // 修改
-            modelMap.put("status", "success");
+            List<DSbxxsjy> dSbxxsjyList = sblxxjyService.getList(example);
+            if(dSbxxsjyList.size()>0){
+            	dSbxxsjyList.get(0).setStatus("0");
+                sblxxjyService.update(dSbxxsjyList.get(0)); // 修改
+                modelMap.put("status", "success");
+            }
+            
         } catch (Exception e) {
             modelMap.put("status", "error");
             e.printStackTrace();

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

@@ -1,6 +1,5 @@
 package com.chinaitop.depot.device.controller;
 
-import com.chinaitop.depot.device.model.BasicEquipmentEquipmentPool;
 import com.chinaitop.depot.device.service.BasicEquipmentEquipmentPoolService;
 import com.chinaitop.depot.device.model.StorageDevicecheck;
 import com.chinaitop.depot.device.model.StorageDevicecheckExample;
@@ -17,6 +16,7 @@ import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -173,10 +173,11 @@ public class StorageDeviceCheckController {
             @ApiImplicitParam(name = "deviceCheckJson", value = "新增数据", paramType = "form"),
             @ApiImplicitParam(name = "type", value = "类型", paramType = "form")
     })
-    public Map<String, Object> add(String deviceCheckJson, String type) {
+    public Map<String, Object> add(@RequestBody StorageDevicecheck storageDevicecheck) {
         Map<String, Object> modelMap = new HashMap<>();
         try {
-            storageDeviceCheckService.add(deviceCheckJson, type);
+            //storageDeviceCheckService.add(deviceCheckJson, type);
+            storageDeviceCheckService.insert(storageDevicecheck);
             modelMap.put("status", "success");
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletRequest;
 import com.chinaitop.depot.device.model.*;
 import com.chinaitop.depot.device.service.*;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -107,15 +108,15 @@ public class StorageDeviceGetController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "deviceGetJson", value = "新增数据", paramType = "form")
     })
-    public Map<String, Object> save(String deviceGetJson) {
+    public Map<String, Object> save(@RequestBody StorageDeviceget storageDeviceget) {
         Map<String, Object> modelMap = new HashMap<>();
         // JSON字符串转对象
         ObjectMapper mapper = new ObjectMapper();
-        StorageDeviceget storageDeviceget = null;
+        //StorageDeviceget storageDeviceget = null;
         try {
             //保存领用数据
 //        	ContentBean cb=(ContentBean)mapper.readValue(contentBeanJson, ContentBean.class);
-            storageDeviceget = (StorageDeviceget) mapper.readValue(deviceGetJson, StorageDeviceget.class);
+            //storageDeviceget = (StorageDeviceget) mapper.readValue(deviceGetJson, StorageDeviceget.class);
         	/*storageDeviceget.setDeviceName(cb.getDeviceName());//器材名称
         	storageDeviceget.setDeviceType(cb.getDeviceTypeId());//类型
         	storageDeviceget.setModel(cb.getModel());//规格型号
@@ -154,7 +155,7 @@ public class StorageDeviceGetController {
             	deviceInputService.save(storageDeviceinput);
             }*/
             modelMap.put("status", "success");
-        } catch (IOException e) {
+        } catch (Exception e) {
             modelMap.put("status", "error");
             e.printStackTrace();
         }
@@ -350,17 +351,17 @@ public class StorageDeviceGetController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "deviceBackJson", value = "增加数据", paramType = "query")
     })
-    public Map<String, Object> endMore(String deviceBackJson) {
+    public Map<String, Object> endMore(@RequestBody StorageDeviceback storageDeviceback) {
         Map<String, Object> modelMap = new HashMap<>();
         // JSON字符串转对象
-        ObjectMapper mapper = new ObjectMapper();
+        //ObjectMapper mapper = new ObjectMapper();
         StorageDeviceget storageDeviceget = null; //领用
-        StorageDeviceback storageDeviceback = null; //归还
+        //StorageDeviceback storageDeviceback = null; //归还
 //        StorageDeviceinput storageDeviceinput = null;
 
         try {
             //storageDeviceget = (StorageDeviceget)mapper.readValue(deviceBackJson, StorageDeviceget.class);
-            storageDeviceback = (StorageDeviceback) mapper.readValue(deviceBackJson, StorageDeviceback.class);
+            //storageDeviceback = (StorageDeviceback) mapper.readValue(deviceBackJson, StorageDeviceback.class);
             //增加归还信息（归还表）
             storageDeviceback.setGetId(storageDeviceback.getId());
 //           storageDeviceback.setId(0);

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

@@ -17,6 +17,7 @@ import com.chinaitop.depot.device.service.DSblxxjyService;
 import com.google.common.collect.Maps;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -108,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);
@@ -137,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();
         }
@@ -181,13 +182,13 @@ public class StorageDeviceKeepController {
      */
     @RequestMapping(value="/save", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
    	@ApiOperation(value="新增保养", notes = "新增保养")
-    public Map<String, Object> save(String deviceAddJson) {
+    public Map<String, Object> save(@RequestBody StorageDevicekeep storageDevicekeep) {
         Map<String, Object> modelMap = new HashMap<>();
         // JSON字符串转对象
         ObjectMapper mapper = new ObjectMapper();
-        StorageDevicekeep storageDevicekeep = null;
+        /*StorageDevicekeep storageDevicekeep = null;*/
         try {
-        	storageDevicekeep = (StorageDevicekeep)mapper.readValue(deviceAddJson, StorageDevicekeep.class);
+        	/*storageDevicekeep = (StorageDevicekeep)mapper.readValue(deviceAddJson, StorageDevicekeep.class);*/
         	storageDevicekeep.setKeepStatus(1);
         	deviceKeepService.save(storageDevicekeep);
 
@@ -209,7 +210,7 @@ public class StorageDeviceKeepController {
         	inputList.get(0).setUseCount(inputList.get(0).getUseCount()-1);//数量减少
         	deviceInputService.updateByPrimaryKeySelective(inputList.get(0));*/
             modelMap.put("status", "success");
-        } catch (IOException e) {
+        } catch (Exception e) {
             modelMap.put("status", "error");
             e.printStackTrace();
         }

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

@@ -13,6 +13,7 @@ import javax.servlet.http.HttpServletRequest;
 import com.chinaitop.depot.device.model.*;
 import com.chinaitop.depot.device.service.DSblxxjyService;
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -86,13 +87,13 @@ public class StorageDeviceRepairController {
      */
     @RequestMapping(value = "/save", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value = "保存数据", notes = "保存增加或修改的数据")
-    public Map<String, Object> save(String deviceRepairJson) {
+    public Map<String, Object> save(@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(deviceRepairJson, StorageDevicerepair.class);
+            //storageDevicerepair = (StorageDevicerepair) mapper.readValue(deviceRepairJson, StorageDevicerepair.class);
             storageDevicerepair.setRepairStatus(1);//改变维修表中的状态
             deviceRepairService.save(storageDevicerepair);
 
@@ -107,7 +108,7 @@ public class StorageDeviceRepairController {
             dSbxxsjy.setMqzt("3");
             sblxxjyService.update(dSbxxsjy);
             modelMap.put("status", "success");
-        } catch (IOException e) {
+        } catch (Exception e) {
             modelMap.put("status", "error");
             e.printStackTrace();
         }
@@ -193,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);
@@ -217,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();
         }
@@ -232,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");

src/main/java/com/chinaitop/depot/device/service/StorageDeviceCheckService.java

@@ -45,4 +45,6 @@ public interface StorageDeviceCheckService {
      * @return
      */
 	int getCountForDate(Map<String,Object> map);
+
+	void insert(StorageDevicecheck storageDevicecheck);
 }

src/main/java/com/chinaitop/depot/device/service/impl/DSblxxjyServiceImpl.java

@@ -38,7 +38,7 @@ public class DSblxxjyServiceImpl implements DSblxxjyService {
     @Override
     public void save(DSbxxsjy dSbxxsjy) {
         sbxxsjyMapper.insert(dSbxxsjy);
-        this.gjjjk(dSbxxsjy.getSbbh(),dSbxxsjy.getSzdwdm(),"i");
+        //this.gjjjk(dSbxxsjy.getSbbh(),dSbxxsjy.getSzdwdm(),"i");
         
     }
 

src/main/java/com/chinaitop/depot/device/service/impl/StorageDeviceCheckServiceImpl.java

@@ -122,4 +122,14 @@ public class StorageDeviceCheckServiceImpl implements StorageDeviceCheckService
         deviceCheck.setCheckDate(new Date());
         storageDevicecheckMapper.insert(deviceCheck);
     }
+
+
+	@Override
+	public void insert(StorageDevicecheck storageDevicecheck) {
+		// TODO Auto-generated method stub
+		remove(storageDevicecheck.getCheckNumber());
+		storageDevicecheck.setCheckDate(new Date());
+        storageDevicecheckMapper.insert(storageDevicecheck);
+		
+	}
 }