1

src/main/java/com/chinaitop/depot/tasks/TempWetTask.java

@@ -48,7 +48,7 @@ public class TempWetTask {
 
     /**
      * 每日中午12点，定时任务全平台进行算法计算
-     * 储备年限报警
+     * 库内储存年限提醒
      */
 //    @Scheduled(cron = "0 0 0 11 * *") // 测试
     @Scheduled(cron = "0 0 0 1 * *") // 每月1号0点执行一次

src/main/java/com/chinaitop/depot/tempWarn/controller/StorageThresholdAlarmController.java

@@ -3,14 +3,23 @@ package com.chinaitop.depot.tempWarn.controller;
 import com.chinaitop.depot.tempWarn.param.StorageThresholdAlarmPageParam;
 import com.chinaitop.depot.tempWarn.service.StorageThresholdAlarmService;
 import com.chinaitop.depot.unissoft.model.ResponseEntity;
+import com.chinaitop.depot.yjbj.model.StorageAlarmRecordWithBLOBs;
+import com.chinaitop.depot.yjbj.service.StorageAlarmRecordService;
 import com.github.pagehelper.PageHelper;
 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.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 import javax.annotation.Resource;
 
 /**
@@ -27,7 +36,7 @@ public class StorageThresholdAlarmController {
     private StorageThresholdAlarmService thresholdAlarmService;
 
     @GetMapping("/getPageList")
-    @ApiOperation(value = "储备年限预警列表", notes = "支持分页")
+    @ApiOperation(value = "库内储存年限提醒列表", notes = "支持分页")
     public ResponseEntity getPageList(StorageThresholdAlarmPageParam pageParam) {
         try {
             PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize());

src/main/java/com/chinaitop/depot/tempWarn/controller/TTempWetAlarmController.java

@@ -56,11 +56,11 @@ public class TTempWetAlarmController {
         }
     }
 
-    @GetMapping("/getRecordList/{alarmId}")
+    @GetMapping("/getRecordList/{alarmId}/{processType}")
     @ApiOperation(value = "处理记录", notes = "报警id查询")
-    public ResponseEntity getRecordList(@PathVariable("alarmId") String alarmId) {
+    public ResponseEntity getRecordList(@PathVariable("alarmId") String alarmId, @PathVariable("processType") Integer processType) {
         try {
-            return ResponseEntity.ok(tempWetAlarmService.getRecordList(alarmId));
+            return ResponseEntity.ok(tempWetAlarmService.getRecordList(alarmId, processType));
         } catch (Exception e) {
             e.printStackTrace();
             return ResponseEntity.failed("查询失败");

src/main/java/com/chinaitop/depot/tempWarn/mapper/StorageThresholdAlarmMapper.xml

@@ -14,6 +14,8 @@
     <result column="bjsj" property="bjsj" jdbcType="TIMESTAMP" />
     <result column="org_id" property="orgId" jdbcType="INTEGER" />
     <result column="data_flag" property="dataFlag" jdbcType="INTEGER" />
+    <result column="approval_status" property="approvalStatus" jdbcType="VARCHAR" />
+    <result column="approval_status_name" property="approvalStatusName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -74,7 +76,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List" >
-    id, house_id, hwxz, pz, kcsl, scnf, knccnx, cccxsj, bjxx, bjsj, org_id, data_flag
+    id, house_id, hwxz, pz, kcsl, scnf, knccnx, cccxsj, bjxx, bjsj, org_id, data_flag, approval_status, approval_status_name
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.tempWarn.model.StorageThresholdAlarmExample" >
     select
@@ -110,11 +112,11 @@
     insert into storage_threshold_alarm (id, house_id, hwxz, 
       pz, kcsl, scnf, knccnx, 
       cccxsj, bjxx, bjsj, 
-      org_id, data_flag)
+      org_id, data_flag, approval_status, approval_status_name)
     values (#{id,jdbcType=VARCHAR}, #{houseId,jdbcType=INTEGER}, #{hwxz,jdbcType=INTEGER}, 
       #{pz,jdbcType=VARCHAR}, #{kcsl,jdbcType=VARCHAR}, #{scnf,jdbcType=VARCHAR}, #{knccnx,jdbcType=INTEGER}, 
       #{cccxsj,jdbcType=TIMESTAMP}, #{bjxx,jdbcType=VARCHAR}, #{bjsj,jdbcType=TIMESTAMP}, 
-      #{orgId,jdbcType=INTEGER}, #{dataFlag,jdbcType=INTEGER})
+      #{orgId,jdbcType=INTEGER}, #{dataFlag,jdbcType=INTEGER}, #{approvalStatus,jdbcType=VARCHAR}, #{approvalStatusName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.tempWarn.model.StorageThresholdAlarm" >
     insert into storage_threshold_alarm
@@ -155,6 +157,12 @@
       <if test="dataFlag != null" >
         data_flag,
       </if>
+      <if test="approvalStatus != null" >
+        approval_status,
+      </if>
+      <if test="approvalStatusName != null" >
+        approval_status_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -193,6 +201,12 @@
       <if test="dataFlag != null" >
         #{dataFlag,jdbcType=INTEGER},
       </if>
+      <if test="approvalStatus != null" >
+        #{approvalStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalStatusName != null" >
+        #{approvalStatusName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.tempWarn.model.StorageThresholdAlarmExample" resultType="java.lang.Integer" >
@@ -240,6 +254,12 @@
       <if test="record.dataFlag != null" >
         data_flag = #{record.dataFlag,jdbcType=INTEGER},
       </if>
+      <if test="record.approvalStatus != null" >
+        approval_status = #{record.approvalStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="record.approvalStatusName != null" >
+        approval_status_name = #{record.approvalStatusName,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -258,7 +278,9 @@
       bjxx = #{record.bjxx,jdbcType=VARCHAR},
       bjsj = #{record.bjsj,jdbcType=TIMESTAMP},
       org_id = #{record.orgId,jdbcType=INTEGER},
-      data_flag = #{record.dataFlag,jdbcType=INTEGER}
+      data_flag = #{record.dataFlag,jdbcType=INTEGER},
+      approval_status = #{record.approvalStatus,jdbcType=VARCHAR},
+      approval_status_name = #{record.approvalStatusName,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -299,6 +321,12 @@
       <if test="dataFlag != null" >
         data_flag = #{dataFlag,jdbcType=INTEGER},
       </if>
+      <if test="approvalStatus != null" >
+        approval_status = #{approvalStatus,jdbcType=VARCHAR},
+      </if>
+      <if test="approvalStatusName != null" >
+        approval_status_name = #{approvalStatusName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -314,7 +342,9 @@
       bjxx = #{bjxx,jdbcType=VARCHAR},
       bjsj = #{bjsj,jdbcType=TIMESTAMP},
       org_id = #{orgId,jdbcType=INTEGER},
-      data_flag = #{dataFlag,jdbcType=INTEGER}
+      data_flag = #{dataFlag,jdbcType=INTEGER},
+      approval_status = #{approvalStatus,jdbcType=VARCHAR},
+      approval_status_name = #{approvalStatusName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>

src/main/java/com/chinaitop/depot/tempWarn/mapper/TTempWetAlarmMapper.xml

@@ -457,6 +457,9 @@
 	<if test="thresholdType != null">
 	and a.threshold_type=#{thresholdType}
 	</if>
+	<if test="houseId != null">
+	and a.house_id=#{houseId}
+	</if>
 	<if test="pz != null">
 	and a.pz=#{pz}
 	</if>

src/main/java/com/chinaitop/depot/tempWarn/model/StorageThresholdAlarm.java

@@ -36,4 +36,8 @@ public class StorageThresholdAlarm {
 
     // 业务数据
     private String lypzmc;// 品种名称
+
+    private String approvalStatus;//状态编码
+
+    private String approvalStatusName;//状态名称
 }

src/main/java/com/chinaitop/depot/tempWarn/param/StorageThresholdAlarmPageParam.java

@@ -15,4 +15,5 @@ public class StorageThresholdAlarmPageParam extends PageParam {
 
     private Integer orgId;// 机构id
     private Integer houseId;// 仓房id
+    private Integer dataFlag;// 0:市平台预警数据,1:库平台预警数据
 }

src/main/java/com/chinaitop/depot/tempWarn/service/StorageThresholdAlarmService.java

@@ -1,10 +1,10 @@
 package com.chinaitop.depot.tempWarn.service;
 
+import java.util.List;
+
 import com.chinaitop.depot.tempWarn.model.StorageThresholdAlarm;
 import com.chinaitop.depot.tempWarn.param.StorageThresholdAlarmPageParam;
 
-import java.util.List;
-
 /**
  * @author qingsong.han
  * @description:
@@ -14,4 +14,5 @@ public interface StorageThresholdAlarmService {
     List<StorageThresholdAlarm> getPageList(StorageThresholdAlarmPageParam pageParam);
 
     void saveAgeWaring();
+
 }

src/main/java/com/chinaitop/depot/tempWarn/service/TTempWetAlarmService.java

@@ -20,5 +20,5 @@ public interface TTempWetAlarmService {
 
     List<Map<String, Object>> getModalPageList(TempWetCheckRecordPageParam pageParam);
 
-    List<TTempWetAlarmRecordWithBLOBs> getRecordList(String alarmId);
+    List<TTempWetAlarmRecordWithBLOBs> getRecordList(String alarmId, Integer processType);
 }

src/main/java/com/chinaitop/depot/tempWarn/service/impl/StorageThresholdAlarmServiceImpl.java

@@ -1,25 +1,27 @@
 package com.chinaitop.depot.tempWarn.service.impl;
 
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.ObjectUtils;
+
 import com.chinaitop.depot.tempWarn.mapper.StorageThresholdAlarmMapper;
 import com.chinaitop.depot.tempWarn.mapper.StorageThresholdSetMapper;
 import com.chinaitop.depot.tempWarn.model.StorageThresholdAlarm;
 import com.chinaitop.depot.tempWarn.model.StorageThresholdAlarmExample;
 import com.chinaitop.depot.tempWarn.model.StorageThresholdSet;
-import com.chinaitop.depot.tempWarn.model.StorageThresholdSetExample;
 import com.chinaitop.depot.tempWarn.param.StorageThresholdAlarmPageParam;
 import com.chinaitop.depot.tempWarn.service.StorageThresholdAlarmService;
 import com.chinaitop.depot.utils.DateUtil;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-import org.springframework.util.ObjectUtils;
 
-import javax.annotation.Resource;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @author qingsong.han
@@ -39,7 +41,7 @@ public class StorageThresholdAlarmServiceImpl implements StorageThresholdAlarmSe
         StorageThresholdAlarmExample example = new StorageThresholdAlarmExample();
         StorageThresholdAlarmExample.Criteria criteria = example.createCriteria();
         criteria.andOrgIdEqualTo(pageParam.getOrgId());
-        criteria.andDataFlagEqualTo(1);
+        criteria.andDataFlagEqualTo(pageParam.getDataFlag());
         if (!ObjectUtils.isEmpty(pageParam.getHouseId())) {
             criteria.andHouseIdEqualTo(pageParam.getHouseId());
         }
@@ -91,12 +93,20 @@ public class StorageThresholdAlarmServiceImpl implements StorageThresholdAlarmSe
                                                 alarm.setDataFlag(0);
                                                 alarm.setKnccnx(sptccnx);
                                                 alarm.setCccxsj(cccxsj);
-                                                alarm.setBjxx("已超过存储期限要求");
+                                                alarm.setBjxx("已超过储存年限");
                                                 alarm.setBjsj(nowDate);
+                                                if (null != alarm.getHwxz() && alarm.getHwxz().toString().equals("6877")) {//省级储备粮
+                                                	alarm.setApprovalStatus("120200");
+                                                	alarm.setApprovalStatusName("待市级管理单位处理");
+                                                }
+                                                if (null != alarm.getHwxz() && alarm.getHwxz().toString().equals("6878")) {//市级储备粮
+                                                	alarm.setApprovalStatus("140200");
+                                                	alarm.setApprovalStatusName("待区级管理单位处理");
+                                                }
                                                 thresholdAlarmMapper.insertSelective(alarm);
                                             }
                                         }
-                                        // 库平台报警
+                                        // 库平台预警提醒
                                         if (!ObjectUtils.isEmpty(knccnx)) {
                                             // 是否超限
                                             int knccnxPK = Integer.parseInt(scnf) + knccnx;
@@ -115,17 +125,17 @@ public class StorageThresholdAlarmServiceImpl implements StorageThresholdAlarmSe
                                             if (nowStr.equals(cccxsjStr)) {
                                                 Date cccxsj = DateUtil.stringToData(cccxsjStr, "yyyy-MM-dd");
                                                 alarm.setCccxsj(cccxsj);
-                                                alarm.setBjxx("已超过存储期限要求");
+                                                alarm.setBjxx("已超过库内设置的储存期限要求");
                                                 thresholdAlarmMapper.insertSelective(alarm);
                                             } else if (localDate_3.equals(cccxsjStr)) {
                                                 Date cccxsj = DateUtil.stringToData(localDate_3, "yyyy-MM-dd");
                                                 alarm.setCccxsj(cccxsj);
-                                                alarm.setBjxx("距离超过储存期限还有3个月");
+                                                alarm.setBjxx("距离超过库内设置的储存年限还有3个月");
                                                 thresholdAlarmMapper.insertSelective(alarm);
                                             }  else if (localDate_1.equals(cccxsjStr)) {
                                                 Date cccxsj = DateUtil.stringToData(localDate_1, "yyyy-MM-dd");
                                                 alarm.setCccxsj(cccxsj);
-                                                alarm.setBjxx("距离超过储存期限还有1个月");
+                                                alarm.setBjxx("距离超过库内设置的储存年限还有1个月");
                                                 thresholdAlarmMapper.insertSelective(alarm);
                                             }
                                         }

src/main/java/com/chinaitop/depot/tempWarn/service/impl/TTempWetAlarmServiceImpl.java

@@ -171,10 +171,12 @@ public class TTempWetAlarmServiceImpl implements TTempWetAlarmService {
     }
 
     @Override
-    public List<TTempWetAlarmRecordWithBLOBs> getRecordList(String alarmId) {
+    public List<TTempWetAlarmRecordWithBLOBs> getRecordList(String alarmId, Integer processType) {
         TTempWetAlarmRecordExample example = new TTempWetAlarmRecordExample();
         TTempWetAlarmRecordExample.Criteria criteria = example.createCriteria();
         criteria.andAlarmIdEqualTo(alarmId);
+        criteria.andProcessTypeEqualTo(processType);
+        example.setOrderByClause("process_time");
         return tempWetAlarmRecordMapper.selectByExampleWithBLOBs(example);
     }
 

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

@@ -353,11 +353,12 @@ public class YjbjController {
 	@RequestMapping(value="/getCljl", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
 	@ApiOperation(value="查询处理记录", notes = "")
 	@ApiImplicitParams({
-        @ApiImplicitParam(name = "alarmId", value = "数据ID", required=true, paramType = "query")
+        @ApiImplicitParam(name = "alarmId", value = "数据ID", required=true, paramType = "query"),
+        @ApiImplicitParam(name = "type", value = "类型", paramType = "query")
 	})
-	public ResponseEntity getCljl(String alarmId) {
+	public ResponseEntity getCljl(String alarmId, String type) {
 		try {
-			List<StorageAlarmRecordWithBLOBs> list = storageAlarmRecordService.findByCondition(alarmId);
+			List<StorageAlarmRecordWithBLOBs> list = storageAlarmRecordService.findByCondition(alarmId, type);
 			return ResponseEntity.ok(list);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);

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

@@ -9,8 +9,9 @@ public interface StorageAlarmRecordService {
 	/**
 	 * 查询处理记录数据
 	 * @param alarmId 业务数据主键ID
+	 * @param type 类型
 	 * @return
 	 * @throws Exception
 	 */
-	List<StorageAlarmRecordWithBLOBs> findByCondition(String alarmId) throws Exception;
+	List<StorageAlarmRecordWithBLOBs> findByCondition(String alarmId, String type) throws Exception;
 }

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

@@ -1,5 +1,6 @@
 package com.chinaitop.depot.yjbj.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -31,10 +32,22 @@ public class StorageAlarmRecordServiceImpl implements StorageAlarmRecordService
     private FileUrlUtil fileUrlUtil;
 
 	@Override
-	public List<StorageAlarmRecordWithBLOBs> findByCondition(String alarmId) throws Exception {
+	public List<StorageAlarmRecordWithBLOBs> findByCondition(String alarmId, String type) throws Exception {
 		StorageAlarmRecordExample example = new StorageAlarmRecordExample();
 		StorageAlarmRecordExample.Criteria criteria = example.createCriteria();
 		criteria.andAlarmIdEqualTo(alarmId);
+		if ("2".equals(type)) {
+			List<Integer> processTypeList = new ArrayList<>();
+			processTypeList.add(15);
+			processTypeList.add(16);
+			criteria.andProcessTypeIn(processTypeList);
+		}
+		if ("3".equals(type)) {
+			List<Integer> processTypeList = new ArrayList<>();
+			processTypeList.add(13);
+			processTypeList.add(14);
+			criteria.andProcessTypeIn(processTypeList);
+		}
 		example.setOrderByClause("process_time");//按照处理时间排序
 		List<StorageAlarmRecordWithBLOBs> list = storageAlarmRecordMapper.selectByExampleWithBLOBs(example);
 		if (null != list && list.size() > 0) {