Merge branch 'dev-2.2.0' of depot-qinghai/depot-storage-qinghai into dev

src/main/java/com/chinaitop/depot/warningAndAlarm/controller/YjBjController.java

@@ -5,6 +5,7 @@ import java.util.List;
 import javax.annotation.Resource;
 
 import org.apache.commons.lang.StringUtils;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -81,13 +82,29 @@ public class YjBjController {
 		return ResponseEntity.ok(pageInfo);
 	}
 
+	@RequestMapping(value = "queryById", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value = "根据id加载对应数据", notes = "根据id加载对应数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键id", paramType = "query"),
+    })
+    public ResponseEntity<StorageRotationWarningWithBLOBs> queryById(String id) {
+        try {
+            if (id == null) {
+                return ResponseEntity.failed("数据ID不能为空！");
+            }
+            return ResponseEntity.ok(yjbjService.queryById(id));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseEntity.failed(e.getMessage());
+        }
+    }
+
 	@RequestMapping(value="/editLhyj", method = RequestMethod.GET)
 	@ApiOperation(value="预警报警数据更新", notes = "")
 	@ApiImplicitParams({
-        @ApiImplicitParam(name = "lhyjJson", value = "数据对象", paramType = "query")
+        @ApiImplicitParam(name = "lhyjJson", value = "数据对象", paramType = "form")
 	})
 	public ResponseEntity editLhyj(String lhyjJson) {
-		PageInfo<StorageRotationWarning> pageInfo = null;
 		try {
 			if (StringUtils.isNotBlank(lhyjJson)) {
 				StorageRotationWarningWithBLOBs storageRotationWarningWithBLOBs = JSONObject.parseObject(lhyjJson, StorageRotationWarningWithBLOBs.class);
@@ -96,12 +113,11 @@ public class YjBjController {
                 }
 
                 yjbjService.updateDate(storageRotationWarningWithBLOBs);
-
-                return ResponseEntity.ok();
             }
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
+			return ResponseEntity.ok(e.getMessage(), lhyjJson);
 		}
-		return ResponseEntity.ok(pageInfo);
+		return ResponseEntity.ok();
 	}
 }

src/main/java/com/chinaitop/depot/warningAndAlarm/service/YjbjService.java

@@ -35,4 +35,12 @@ public interface YjbjService {
 	 * @throws Exception
 	 */
 	public void updateDate(StorageRotationWarningWithBLOBs storageRotationWarningWithBLOBs) throws Exception;
+
+	/**
+	 * 按主键ID查询一条数据
+	 * @param id
+	 * @return
+	 * @throws Exception 
+	 */
+	public StorageRotationWarningWithBLOBs queryById(String id) throws Exception;
 }

src/main/java/com/chinaitop/depot/warningAndAlarm/service/impl/YjbjServiceImpl.java

@@ -85,4 +85,9 @@ public class YjbjServiceImpl implements YjbjService {
 		storageRotationWarningMapper.updateByPrimaryKeyWithBLOBs(storageRotationWarningWithBLOBs);
 	}
 
+	@Override
+	public StorageRotationWarningWithBLOBs queryById(String id) throws Exception {
+		return storageRotationWarningMapper.selectByPrimaryKey(id);
+	}
+
 }