1

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

@@ -33,7 +33,7 @@ public class StorageTemperaturepointWarningController {
 	private SbyjService storageTemperaturepointWarningService;
 
 	@RequestMapping(value="/getCwdgzPageList", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
-	@ApiOperation(value="查询测温设备故障列表", notes = "支持分页")
+	@ApiOperation(value="查询测温设备故障、测温数据上传故障列表", notes = "支持分页")
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
         @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),

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

@@ -53,15 +53,17 @@ public class YjbjController {
 		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
         @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
         @ApiImplicitParam(name = "jkdmc", value = "监控点名称", paramType = "query"),
-        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query")
+        @ApiImplicitParam(name = "orgId", value = "库ID", required=true, paramType = "query"),
+        @ApiImplicitParam(name = "approvalStatus", value = "督办处理状态编码", paramType = "query"),
+        @ApiImplicitParam(name = "yjzt", value = "预警状态", paramType = "query")
 	})
-	public ResponseEntity getJksbgzPageList(Integer pageNum, Integer pageSize, String jkdmc, Integer orgId) {
+	public ResponseEntity getJksbgzPageList(Integer pageNum, Integer pageSize, String jkdmc, Integer orgId, String approvalStatus, String yjzt) {
 		PageInfo<Jksbgz> pageInfo = null;
 		try {
 			if (pageNum != null && pageSize != null) {
 	            PageHelper.startPage(pageNum, pageSize);
 	        }
-			List<Jksbgz> list = yjbjService.selectJksbgz(orgId, jkdmc);
+			List<Jksbgz> list = yjbjService.selectJksbgz(orgId, jkdmc, approvalStatus, yjzt);
 			pageInfo = new PageInfo<>(list);
 			return ResponseEntity.ok(pageInfo);
 		} catch (Exception e) {

src/main/java/com/chinaitop/depot/yjbj/mapper/SbyjMapper.java

@@ -6,7 +6,19 @@ import org.apache.ibatis.annotations.Param;
 
 public interface SbyjMapper {
 
-    List<Sbyj> selectByExample(@Param("obj") Sbyj obj);
+	/**
+	 * 测温设备故障
+	 * @param obj
+	 * @return
+	 */
+    List<Sbyj> selectByCwsbgzExample(@Param("obj") Sbyj obj);
+    
+    /**
+	 * 测温数据上传故障
+	 * @param obj
+	 * @return
+	 */
+    List<Sbyj> selectByCwsjscgzExample(@Param("obj") Sbyj obj);
 
     Sbyj selectByPrimaryKey(String id);
 

src/main/java/com/chinaitop/depot/yjbj/mapper/SbyjMapper.xml

@@ -40,7 +40,7 @@
     process_status, process_status_name, supervise_status, supervise_status_name, alarm_type, 
     pzbm, hfzcsj
   </sql>
-  <select id="selectByExample" resultMap="BaseResultMap" parameterType="map">
+  <select id="selectByCwsbgzExample" resultMap="BaseResultMap" parameterType="map">
     select 
  	    *
 	from (
@@ -82,6 +82,47 @@
     </where>
     order by a.bjsj desc
   </select>
+  <select id="selectByCwsjscgzExample" resultMap="BaseResultMap" parameterType="map">
+    select 
+ 	    *
+	from (
+  		select 
+		    <include refid="Base_Column_List" />,
+		    case approval_status 
+		        when '120200' then '待市级管理单位处理'
+		        when '120201' then '待市级管理单位审核'
+		        when '120203' then '待市级管理单位处理（驳回）'
+		        when '140200' then '待区级管理单位处理'
+		        when '140201' then '待区级管理单位审核'
+		        when '140203' then '待区级管理单位处理（驳回）'
+		        when '999999' then '处理完成'
+		        else ''
+		    end clordbzt,
+		    case when hfzcsj is not null and approval_status = '999999' then '已解决' else'未解决' end yjzt
+		from storage_temperaturepoint_warning
+	) a 
+    <where>
+      <if test="obj.dataFlag != null">
+        and a.data_flag = #{obj.dataFlag,jdbcType=VARCHAR}
+      </if>
+      <if test="obj.alarmType != null">
+        and a.alarm_type = #{obj.alarmType,jdbcType=INTEGER}
+      </if>
+      <if test="obj.cfbm != null">
+        and a.cfbm = #{obj.cfbm,jdbcType=VARCHAR}
+      </if>
+      <if test="obj.orgId != null">
+        and a.org_id = #{obj.orgId,jdbcType=INTEGER}
+      </if>
+      <if test="obj.approvalStatus != null">
+        and a.approval_status = #{obj.approvalStatus,jdbcType=VARCHAR}
+      </if>
+      <if test="obj.yjzt != null">
+        and a.yjzt = #{obj.yjzt,jdbcType=VARCHAR}
+      </if>
+    </where>
+    order by a.bjsj desc
+  </select>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select 
     <include refid="Base_Column_List" />

src/main/java/com/chinaitop/depot/yjbj/mapper/YjbjMapper.xml

@@ -4,14 +4,25 @@
   <!-- 监控设备故障数据查询 -->
   <select id="selectJksbgz" resultType="com.chinaitop.depot.yjbj.model.Jksbgz" parameterType="map">
     select 
-      id, kdmc, jkdmc, gzlx, cxts, lxsj, bjsj, org_id orgId, is_alarm isAlarm 
-    from storage_monitoring_alarm
+ 	    *
+	from (
+  		select 
+      		id, kdmc, jkdmc, gzlx, cxts, lxsj, bjsj, org_id orgId, is_alarm isAlarm, hfzcsj, approval_status approvalStatus, approval_status_name approvalStatusName,
+		    case when hfzcsj is not null and approval_status = '999999' then '已解决' else '未解决' end yjzt
+		from storage_monitoring_alarm
+	) a 
     <where>
       <if test="obj.jkdmc != null">
-        and jkdmc like #{obj.jkdmc,jdbcType=VARCHAR}
+        and a.jkdmc like #{obj.jkdmc,jdbcType=VARCHAR}
       </if>
       <if test="obj.orgId != null">
-        and org_id = #{obj.orgId,jdbcType=INTEGER}
+        and a.org_id = #{obj.orgId,jdbcType=INTEGER}
+      </if>
+      <if test="obj.approvalStatus != null">
+        and a.approval_status = #{obj.approvalStatus,jdbcType=VARCHAR}
+      </if>
+      <if test="obj.yjzt != null">
+        and a.yjzt = #{obj.yjzt,jdbcType=VARCHAR}
       </if>
     </where>
     order by bjsj desc

src/main/java/com/chinaitop/depot/yjbj/model/Jksbgz.java

@@ -25,5 +25,10 @@ public class Jksbgz {
 	private Date bjsj;//报警时间
 	private String isAlarm;//是否预警 0:否 1:是
 	private Integer orgId;//库ID
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "GMT+8")
+	private Date hfzcsj;//故障类型
+	private String approvalStatus;//督办处理状态编码
+	private String approvalStatusName;//督办处理状态名称
+	private String yjzt;//预警状态
 
 }

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

@@ -22,10 +22,12 @@ public interface YjbjService {
 	 * 监控设备故障数据查询
 	 * @param orgId 库ID
 	 * @param jkdmc 监控点名称
+	 * @param approvalStatus 督办处理状态编码
+	 * @param yjzt 预警状态
 	 * @return
 	 * @throws Exception
 	 */
-	List<Jksbgz> selectJksbgz(Integer orgId, String jkdmc) throws Exception;
+	List<Jksbgz> selectJksbgz(Integer orgId, String jkdmc, String approvalStatus, String yjzt) throws Exception;
 
 	/**
 	 * 同号牌入库预警数据查询

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

@@ -36,7 +36,14 @@ public class SbyjServiceImpl implements SbyjService {
 		if (StringUtils.isNotBlank(yjzt)) {
 			obj.setYjzt(yjzt.trim());
 		}
-		return sbyjMapper.selectByExample(obj);
+		List<Sbyj> list = null;
+		if (alarmType == 1) {
+			list = sbyjMapper.selectByCwsbgzExample(obj);
+		}
+		if (alarmType == 2) {
+			list = sbyjMapper.selectByCwsjscgzExample(obj);
+		}
+		return list;
 	}
 
 	@Override

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

@@ -33,12 +33,18 @@ public class YjbjServiceImpl implements YjbjService {
 	private YjbjMapper yjbjMapper;
 
 	@Override
-	public List<Jksbgz> selectJksbgz(Integer orgId, String jkdmc) throws Exception {
+	public List<Jksbgz> selectJksbgz(Integer orgId, String jkdmc, String approvalStatus, String yjzt) throws Exception {
 		Jksbgz obj = new Jksbgz();
 		obj.setOrgId(orgId);
 		if (StringUtils.isNotBlank(jkdmc)) {
 			obj.setJkdmc("%"+jkdmc+"%");
 		}
+		if (StringUtils.isNotBlank(approvalStatus)) {
+			obj.setApprovalStatus(approvalStatus.trim());
+		}
+		if (StringUtils.isNotBlank(yjzt)) {
+			obj.setYjzt(yjzt.trim());
+		}
 		return yjbjMapper.selectJksbgz(obj);
 	}