封仓确认单-效验非空

src/main/java/com/chinaitop/depot/grainSituationCard/controller/StorageSealedConfirmationController.java

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.grainSituationCard.controller;
 
+import com.chinaitop.depot.common.ResponseEntity;
 import com.chinaitop.depot.grainSituationCard.model.StorageSealedConfirmation;
 import com.chinaitop.depot.grainSituationCard.service.StorageSealedConfirmationService;
 import com.chinaitop.depot.param.StorageSealedConfirmationPageParam;
@@ -10,12 +11,8 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -36,7 +33,7 @@ public class StorageSealedConfirmationController {
     @RequestMapping(value = "/getPageList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
     @ApiOperation(value = "根据仓房号和货位号查询", notes = "查询粮情卡列表,支持分页")
     @ApiImplicitParam(name = "param", value = "查询条件", paramType = "body")
-    public ResponseEntity getPageList(StorageSealedConfirmationPageParam param) {
+    public ResponseEntity getPageList(@RequestBody @Validated StorageSealedConfirmationPageParam param) {
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
         List<StorageSealedConfirmation> list = confirmationService.getPageList(param);
         return ResponseEntity.ok(new PageInfo<>(list));
@@ -45,15 +42,25 @@ public class StorageSealedConfirmationController {
     @RequestMapping(value = "/saveData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value = "新增", notes = "新增保存")
     @ApiImplicitParam(name = "data", value = "json对象", paramType = "body")
-    public ResponseEntity saveData(StorageSealedConfirmation data) {
-        return ResponseEntity.ok(confirmationService.saveData(data));
+    public ResponseEntity saveData(@RequestBody StorageSealedConfirmation data) {
+        try {
+            return ResponseEntity.ok(confirmationService.saveData(data));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseEntity.failed("保存失败");
+        }
     }
 
     @RequestMapping(value = "/updateData", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
     @ApiOperation(value = "新增", notes = "新增保存")
     @ApiImplicitParam(name = "data", value = "json对象", paramType = "body")
-    public ResponseEntity updateData(StorageSealedConfirmation data) {
-        return ResponseEntity.ok(confirmationService.updateData(data));
+    public ResponseEntity updateData(@RequestBody StorageSealedConfirmation data) {
+        try {
+            return ResponseEntity.ok(confirmationService.updateData(data));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseEntity.failed("修改失败");
+        }
     }
 
     @RequestMapping(value = "/getDataById/{id}", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
@@ -68,6 +75,7 @@ public class StorageSealedConfirmationController {
 
     /**
      * 查询入库中仓房/油罐
+     *
      * @param orgId 必填
      * @return map list
      */
@@ -78,10 +86,11 @@ public class StorageSealedConfirmationController {
 
     /**
      * 效验粮食性质
-     *  储备粮
+     * 储备粮
      * 6864,6865,6877,6878,6879,6866
-     * @param orgId 必传
-     * @param houseId 必传
+     *
+     * @param orgId       必传
+     * @param houseId     必传
      * @param warehouseId 必传
      * @return 储备信息为空表示非储备粮
      */