1

src/main/java/com/chinaitop/depot/yjbj/controller/StorageTemperaturepointWarningController.java

@@ -38,15 +38,16 @@ public class StorageTemperaturepointWarningController {
 		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
         @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
         @ApiImplicitParam(name = "cfbm", value = "仓房国标编码", paramType = "query"),
-        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
+        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query"),
+        @ApiImplicitParam(name = "alarmType", value = "预警类型 1-测温设备故障 2-测温数据上传故障", required=true, paramType = "query")
 	})
-	public ResponseEntity getCwdgzPageList(Integer pageNum, Integer pageSize, String cfbm, Integer orgId) {
+	public ResponseEntity getCwdgzPageList(Integer pageNum, Integer pageSize, String cfbm, Integer orgId, Integer alarmType) {
 		PageInfo<Sbyj> pageInfo = null;
 		try {
 			if (pageNum != null && pageSize != null) {
 	            PageHelper.startPage(pageNum, pageSize);
 	        }
-			List<Sbyj> list = storageTemperaturepointWarningService.findByConditions(cfbm, orgId);
+			List<Sbyj> list = storageTemperaturepointWarningService.findByConditions(cfbm, orgId, alarmType);
 			pageInfo = new PageInfo<>(list);
 			return ResponseEntity.ok(pageInfo);
 		} catch (Exception e) {

src/main/java/com/chinaitop/depot/yjbj/service/SbyjService.java

@@ -10,10 +10,11 @@ public interface SbyjService {
 	 * 按条件查询集合数据
 	 * @param cfbm 仓房国标编码
 	 * @param orgId 库ID
+	 * @param alarmType 预警类型 1-测温设备故障 2-测温数据上传故障
 	 * @return
 	 * @throws Exception
 	 */
-	List<Sbyj> findByConditions(String cfbm, Integer orgId) throws Exception;
+	List<Sbyj> findByConditions(String cfbm, Integer orgId, Integer alarmType) throws Exception;
 
 	/**
 	 * 按主键ID查询一条数据

src/main/java/com/chinaitop/depot/yjbj/service/impl/SbyjServiceImpl.java

@@ -18,11 +18,11 @@ public class SbyjServiceImpl implements SbyjService {
 	private SbyjMapper sbyjMapper;
 
 	@Override
-	public List<Sbyj> findByConditions(String cfbm, Integer orgId)
+	public List<Sbyj> findByConditions(String cfbm, Integer orgId, Integer alarmType)
 			throws Exception {
 		Sbyj obj = new Sbyj();
 		obj.setDataFlag("1");//数据类型：1-库区 0-市级
-		obj.setAlarmType(1);//预警类型 1-测温设备故障 2-测温数据上传故障
+		obj.setAlarmType(alarmType);//预警类型 1-测温设备故障 2-测温数据上传故障
 		obj.setOrgId(orgId);
 		if (StringUtils.isNotBlank(cfbm)) {
 			obj.setCfbm(cfbm);