1

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

@@ -26,8 +26,10 @@ public class TempWetTask {
 
     /**
      * 每年12月1日进行增一条下一年的设置数据,默认值与上一年保持一致
+     * 生成温湿度报警配置设置数据
      */
     @Scheduled(cron = "0 0 0 1 12 ?") // 每年12月1号0点0分0秒触发任务
+//    @Scheduled(cron = "0 22 16 * * ?") // 测试
     public void tempWetYear() {
         log.info("----每年12月1号0点0分0秒触发任务----");
         tempWetThresholdService.saveNextYear();
@@ -35,8 +37,9 @@ public class TempWetTask {
 
     /**
      * 每日中午12点，定时任务全平台进行算法计算
+     * 生成温湿度报警数据
      */
-//    @Scheduled(cron = "0 45 14 * * ?") // 测试
+//    @Scheduled(cron = "0 31 16 * * ?") // 测试
     @Scheduled(cron = "0 0 12 * * ?") // 每天中午12点触发任务
     public void tempWetWarning() {
         log.info("----每天中午12点触发任务----");
@@ -45,6 +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/TTempWetAlarmController.java

@@ -34,7 +34,9 @@ public class TTempWetAlarmController {
     @ApiOperation(value = "温湿度报警列表", notes = "支持分页")
     public ResponseEntity getPageList(TTempWetAlarmPageParam pageParam) {
         try {
-            PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize());
+        	if (null != pageParam.getPageNum() && null != pageParam.getPageSize()) {
+        		PageHelper.startPage(pageParam.getPageNum(), pageParam.getPageSize());
+        	}
             return ResponseEntity.ok(new PageInfo<>(tempWetAlarmService.getPageList(pageParam)));
         } catch (Exception e) {
             e.printStackTrace();
@@ -64,4 +66,14 @@ public class TTempWetAlarmController {
             return ResponseEntity.failed("查询失败");
         }
     }
+    
+    @GetMapping("/tempWetWarning")
+    @ApiOperation(value = "手动生成温湿度数据", notes = "")
+    public void tempWetWarning() {
+        try {
+        	tempWetAlarmService.saveTempWetWarning();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -5,6 +5,7 @@ import com.chinaitop.depot.tempWarn.model.TTempWetAlarmExample;
 import java.util.List;
 import java.util.Map;
 
+import com.chinaitop.depot.tempWarn.param.TTempWetAlarmPageParam;
 import com.chinaitop.depot.tempWarn.param.TempWetCheckRecordPageParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -41,4 +42,6 @@ public interface TTempWetAlarmMapper {
     List<TTempWetAlarm> selectAllByRestoreTimeIsNull(String yesterday);
 
     List<Map<String,Object>> getModalPageList(TempWetCheckRecordPageParam pageParam);
+
+    List<TTempWetAlarm> selectList(TTempWetAlarmPageParam pageParam);
 }

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

@@ -17,6 +17,9 @@
     <result column="temp_value" property="tempValue" jdbcType="DECIMAL" />
     <result column="process_status" property="processStatus" jdbcType="VARCHAR" />
     <result column="supervision_status" property="supervisionStatus" jdbcType="VARCHAR" />
+    <!-- 下面是业务字段 -->
+    <result column="yjzt" property="yjzt" jdbcType="VARCHAR" />
+    <result column="clordbzt" property="clordbzt" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Example_Where_Clause" >
     <where >
@@ -424,4 +427,50 @@
         and storehouse = #{houseCode}
         and t_time between #{startTime} and #{endTime}
   </select>
+  <select id="selectList" parameterType="com.chinaitop.depot.tempWarn.param.TTempWetAlarmPageParam" resultMap="BaseResultMap">
+    select 
+ 	    *
+	from (
+  		select 
+		    id, house_id, house_code, hwxz, pz, threshold_value, alarm_time, 
+		    restore_time, duration_days, approval_status, org_id, threshold_type,
+		    temp_value, process_status, supervision_status, 
+		    case approval_status 
+		        when '900000' then '待处理'
+		        when '900001' then '处理中'
+		        when '900002' then '待处理 督办中'
+		        when '900003' then '处理中 督办中'
+		        when '900004' then '督办中'
+		        when '900005' then '二次督办中'
+		        when '900006' then '二次督办完成'
+		        when '900007' then '待督办'
+		        when '999999' then '处理完成'
+		        else ''
+		    end clordbzt,
+		    case when (restore_time is not null) and (approval_status = '999999' or approval_status = '900086') then '已解决' else'未解决' end yjzt
+		from t_temp_wet_alarm
+	) a 
+	where 1=1 
+	<if test="orgId != null">
+	and a.org_id=#{orgId}
+	</if>
+	<if test="thresholdType != null">
+	and a.threshold_type=#{thresholdType}
+	</if>
+	<if test="pz != null">
+	and a.pz=#{pz}
+	</if>
+	<if test="hwxz != null">
+	and a.hwxz=#{hwxz}
+	</if>
+	<if test="alarmTime != null">
+	and a.alarm_time=#{alarmTime}
+	</if>
+	<if test="clordbzt != null">
+	and a.clordbzt=#{clordbzt}
+	</if>
+	<if test="yjzt != null">
+	and a.yjzt=#{yjzt}
+	</if>
+  </select>
 </mapper>

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

@@ -44,4 +44,6 @@ public class TTempWetAlarm {
     // 业务数据
     private BigDecimal inH;// 内湿
     private BigDecimal tMax;// 粮温-最高温
+    private String yjzt;//预警状态
+    private String clordbzt;//(处理/督办)状态
 }

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

@@ -1,13 +1,15 @@
 package com.chinaitop.depot.tempWarn.param;
 
+import java.io.Serializable;
+
+import javax.validation.constraints.NotNull;
+
 import com.chinaitop.depot.common.PageParam;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-
 /**
  * @author qingsong.han
  * @description:
@@ -27,4 +29,19 @@ public class TTempWetAlarmPageParam extends PageParam implements Serializable {
 
     @ApiModelProperty(value = "仓号(basic_storehouse.storehouse_id)")
     private Integer houseId;
+
+    @ApiModelProperty(value = "粮食品种")
+    private Integer pz;
+
+    @ApiModelProperty(value = "粮食性质")
+    private Integer hwxz;
+
+    @ApiModelProperty(value = "预警日期")
+    private String alarmTime;
+
+    @ApiModelProperty(value = "预警状态")
+    private String yjzt;
+
+    @ApiModelProperty(value = "(处理/督办)状态")
+    private String clordbzt;
 }

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

@@ -7,6 +7,8 @@ import com.chinaitop.depot.tempWarn.model.*;
 import com.chinaitop.depot.tempWarn.param.TTempWetAlarmPageParam;
 import com.chinaitop.depot.tempWarn.param.TempWetCheckRecordPageParam;
 import com.chinaitop.depot.tempWarn.service.TTempWetAlarmService;
+import com.chinaitop.depot.utils.ParameterUtil;
+
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -38,14 +40,28 @@ public class TTempWetAlarmServiceImpl implements TTempWetAlarmService {
 
     @Override
     public List<TTempWetAlarm> getPageList(TTempWetAlarmPageParam pageParam) {
-        TTempWetAlarmExample example = new TTempWetAlarmExample();
-        TTempWetAlarmExample.Criteria criteria = example.createCriteria();
-        criteria.andOrgIdEqualTo(pageParam.getOrgId());
-        criteria.andThresholdTypeEqualTo(pageParam.getThresholdType());
-        if (!ObjectUtils.isEmpty(pageParam.getHouseId())) {
-            criteria.andHouseIdEqualTo(pageParam.getHouseId());
+    	/*TTempWetAlarm t = new TTempWetAlarm();
+    	t.setOrgId(pageParam.getOrgId());
+        t.setThresholdType(pageParam.getThresholdType());
+        if (!ObjectUtils.isEmpty(pageParam.getHouseId())) {//仓号
+        	t.setHouseId(pageParam.getHouseId());
+        }
+        if (!ObjectUtils.isEmpty(pageParam.getPz())) {//粮食品种
+        	t.setPz(pageParam.getPz());
+        }
+        if (!ObjectUtils.isEmpty(pageParam.getHwxz())) {//粮食性质
+            t.setHwxz(pageParam.getHwxz());
+        }
+        if (!ObjectUtils.isEmpty(pageParam.getAlarmTime())) {//预警日期
+            t.setAlarmTime(ParameterUtil.string2date(pageParam.getAlarmTime()));
+        }
+        if (!ObjectUtils.isEmpty(pageParam.getClordbzt())) {//(处理/督办)状态
+            t.setClordbzt(pageParam.getClordbzt());
         }
-        return tempWetAlarmMapper.selectByExample(example);
+        if (!ObjectUtils.isEmpty(pageParam.getYjzt())) {//预警状态
+        	t.setYjzt(pageParam.getYjzt());
+        }*/
+        return tempWetAlarmMapper.selectList(pageParam);
     }
 
     @Override
@@ -86,7 +102,8 @@ public class TTempWetAlarmServiceImpl implements TTempWetAlarmService {
                                     t.setThresholdValue(currentMonthTemp);
                                     t.setAlarmTime(new Date());
                                     t.setDurationDays(1);
-                                    t.setApprovalStatus("100201"); // 审批流程初始化
+                                    t.setProcessStatus("100201");
+                                    t.setApprovalStatus("900000"); // 审批流程初始化
                                     tempWetAlarmMapper.insertSelective(t);
                                 } else {
                                     Integer durationDays = alarm.getDurationDays();
@@ -119,7 +136,8 @@ public class TTempWetAlarmServiceImpl implements TTempWetAlarmService {
                                     t.setThresholdValue(currentMonthWet);
                                     t.setAlarmTime(new Date());
                                     t.setDurationDays(1);
-                                    t.setApprovalStatus("100201"); // 审批流程初始化
+                                    t.setProcessStatus("100201");
+                                    t.setApprovalStatus("900000"); // 审批流程初始化
                                     tempWetAlarmMapper.insertSelective(t);
                                 } else {
                                     Integer durationDays = alarm.getDurationDays();

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

@@ -61,6 +61,7 @@ public class TTempWetThresholdServiceImpl implements TTempWetThresholdService {
         // 查询当前年设置数据
         Calendar calendar = Calendar.getInstance();
         Integer year = calendar.get(Calendar.YEAR);
+//        Integer year = 2024;
         log.info("当前年份: {}", year);
         List<TTempWetThreshold> list = tempWetThresholdMapper.getList(year);
         // 为空初始化
@@ -70,6 +71,18 @@ public class TTempWetThresholdServiceImpl implements TTempWetThresholdService {
                 TTempWetThreshold threshold = new TTempWetThreshold();
                 threshold.setDifferentYears(year + 1);// 加一年
                 threshold.setThresholdType(0);// 阀值类型(0:温度报警设置,1:湿度报警设置)
+                threshold.setThresholdJanuary(10);//1
+                threshold.setThresholdFebruary(10);//2
+                threshold.setThresholdMarch(10);//3
+                threshold.setThresholdApril(10);//4
+                threshold.setThresholdMay(10);//5
+                threshold.setThresholdJune(10);//6
+                threshold.setThresholdJuly(10);//7
+                threshold.setThresholdAugust(10);//8
+                threshold.setThresholdSeptember(10);//9
+                threshold.setThresholdOctober(10);//10
+                threshold.setThresholdNovember(10);//11
+                threshold.setThresholdDecember(10);//12
                 threshold.setOrgId(org);
                 this.saveData(threshold);
             });
@@ -78,6 +91,18 @@ public class TTempWetThresholdServiceImpl implements TTempWetThresholdService {
                 threshold.setDifferentYears(year + 1);// 加一年
                 threshold.setThresholdType(1);// 阀值类型(0:温度报警设置,1:湿度报警设置)
                 threshold.setOrgId(org);
+                threshold.setThresholdJanuary(30);//1
+                threshold.setThresholdFebruary(30);//2
+                threshold.setThresholdMarch(30);//3
+                threshold.setThresholdApril(30);//4
+                threshold.setThresholdMay(30);//5
+                threshold.setThresholdJune(30);//6
+                threshold.setThresholdJuly(30);//7
+                threshold.setThresholdAugust(30);//8
+                threshold.setThresholdSeptember(30);//9
+                threshold.setThresholdOctober(30);//10
+                threshold.setThresholdNovember(30);//11
+                threshold.setThresholdDecember(30);//12
                 this.saveData(threshold);
             });
         } else {