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

src/main/java/com/chinaitop/depot/warningAndAlarm/common/StatusUtils.java

@@ -0,0 +1,24 @@
+package com.chinaitop.depot.warningAndAlarm.common;
+
+public class StatusUtils {
+
+	/**
+     * 数据处理状态：未处理
+     */
+    public static final String STATUS_0 = "0";
+
+    /**
+     * 数据处理状态：已处理
+     */
+    public static final String STATUS_1 = "1";
+
+    /**
+     * 轮换报警预警类型：轮换预警
+     */
+    public static final String LHYJBJ_TYPE_0 = "0";
+
+    /**
+     * 轮换报警预警类型：应轮未轮报警
+     */
+    public static final String LHYJBJ_TYPE_1 = "1";
+}

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

@@ -43,4 +43,15 @@ public class TimedTaskController {
 			log.error(e.getMessage(), e);
 		}
 	}
+
+	@Scheduled(cron = "0 0 2 * * ?")
+	@RequestMapping(value="/checkJkqyj", method = RequestMethod.GET)
+	@ApiOperation(value="检测架空期预警数据", notes = "定时任务检测,每天凌晨2点执行")
+	public void checkJkqyj() {
+		try {
+			timeTaskService.insertJkqyj();
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+	}
 }

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

@@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSONObject;
 import com.chinaitop.depot.unissoft.model.ResponseEntity;
+import com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning;
 import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarning;
 import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningWithBLOBs;
 import com.chinaitop.depot.warningAndAlarm.service.YjbjService;
@@ -120,4 +121,69 @@ public class YjBjController {
 		}
 		return ResponseEntity.ok();
 	}
+
+	@RequestMapping(value="/getJkqPageInfoList", method = RequestMethod.GET)
+	@ApiOperation(value="架空期预警列表", notes = "支持分页")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "pageNum", value = "页码", paramType = "query"),
+        @ApiImplicitParam(name = "pageSize", value = "每页条数", paramType = "query"),
+        @ApiImplicitParam(name = "orgId", value = "库ID", paramType = "query"),
+        @ApiImplicitParam(name = "ch", value = "仓房ID", paramType = "query"),
+        @ApiImplicitParam(name = "hwh", value = "货位ID", paramType = "query"),
+        @ApiImplicitParam(name = "jhwh", value = "计划文号", paramType = "query"),
+        @ApiImplicitParam(name = "lhnd", value = "轮换年度", paramType = "query")
+	})
+	public ResponseEntity<PageInfo<StorageJkqWarning>> getJkqPageInfoList(Integer pageNum, Integer pageSize, Integer orgId, 
+			Integer ch, Integer hwh, String jhwh, String lhnd) {
+		PageInfo<StorageJkqWarning> pageInfo = null;
+		try {
+			if (pageNum != null && pageSize != null) {
+	            PageHelper.startPage(pageNum, pageSize);
+	        }
+			List<StorageJkqWarning> list = yjbjService.queryJkqyjList(orgId, ch, hwh, jhwh, lhnd);
+			pageInfo = new PageInfo<>(list);
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+		return ResponseEntity.ok(pageInfo);
+	}
+
+	@RequestMapping(value = "queryByIdJkq", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+    @ApiOperation(value = "根据id加载架空期数据", notes = "根据id加载架空期数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "主键id", paramType = "query"),
+    })
+    public ResponseEntity<StorageJkqWarning> queryByIdJkq(String id) {
+        try {
+            if (id == null) {
+                return ResponseEntity.failed("数据ID不能为空！");
+            }
+            return ResponseEntity.ok(yjbjService.queryByIdJkq(id));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseEntity.failed(e.getMessage());
+        }
+    }
+
+	@RequestMapping(value="/editJkqyj", method = RequestMethod.GET)
+	@ApiOperation(value="架空期预警数据更新", notes = "")
+	@ApiImplicitParams({
+        @ApiImplicitParam(name = "jkqyjJson", value = "数据对象", paramType = "form")
+	})
+	public ResponseEntity editJkqyj(String jkqyjJson) {
+		try {
+			if (StringUtils.isNotBlank(jkqyjJson)) {
+				StorageJkqWarning storageJkqWarning = JSONObject.parseObject(jkqyjJson, StorageJkqWarning.class);
+                if (storageJkqWarning.getId() == null) {
+                    return ResponseEntity.failed("数据ID不能为空！");
+                }
+
+                yjbjService.updateDate(storageJkqWarning);
+            }
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			return ResponseEntity.ok(e.getMessage(), jkqyjJson);
+		}
+		return ResponseEntity.ok();
+	}
 }

src/main/java/com/chinaitop/depot/warningAndAlarm/mapper/StorageJkqWarningMapper.java

@@ -0,0 +1,36 @@
+package com.chinaitop.depot.warningAndAlarm.mapper;
+
+import com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning;
+import com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarningExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface StorageJkqWarningMapper {
+    int countByExample(StorageJkqWarningExample example);
+
+    int deleteByExample(StorageJkqWarningExample example);
+
+    int deleteByPrimaryKey(String id);
+
+    int insert(StorageJkqWarning record);
+
+    int insertSelective(StorageJkqWarning record);
+
+    List<StorageJkqWarning> selectByExampleWithBLOBs(StorageJkqWarningExample example);
+
+    List<StorageJkqWarning> selectByExample(StorageJkqWarningExample example);
+
+    StorageJkqWarning selectByPrimaryKey(String id);
+
+    int updateByExampleSelective(@Param("record") StorageJkqWarning record, @Param("example") StorageJkqWarningExample example);
+
+    int updateByExampleWithBLOBs(@Param("record") StorageJkqWarning record, @Param("example") StorageJkqWarningExample example);
+
+    int updateByExample(@Param("record") StorageJkqWarning record, @Param("example") StorageJkqWarningExample example);
+
+    int updateByPrimaryKeySelective(StorageJkqWarning record);
+
+    int updateByPrimaryKeyWithBLOBs(StorageJkqWarning record);
+
+    int updateByPrimaryKey(StorageJkqWarning record);
+}

src/main/java/com/chinaitop/depot/warningAndAlarm/mapper/StorageJkqWarningMapper.xml

@@ -0,0 +1,465 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.chinaitop.depot.warningAndAlarm.mapper.StorageJkqWarningMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <result column="ch" jdbcType="INTEGER" property="ch" />
+    <result column="hwh" jdbcType="INTEGER" property="hwh" />
+    <result column="jhwh" jdbcType="VARCHAR" property="jhwh" />
+    <result column="lhnd" jdbcType="VARCHAR" property="lhnd" />
+    <result column="jkqzt" jdbcType="VARCHAR" property="jkqzt" />
+    <result column="jkqjzr" jdbcType="VARCHAR" property="jkqjzr" />
+    <result column="jzrqylrsl" jdbcType="DECIMAL" property="jzrqylrsl" />
+    <result column="jzrqsylrsl" jdbcType="DECIMAL" property="jzrqsylrsl" />
+    <result column="yjrq" jdbcType="VARCHAR" property="yjrq" />
+    <result column="clzt" jdbcType="VARCHAR" property="clzt" />
+    <result column="clr" jdbcType="VARCHAR" property="clr" />
+    <result column="clsj" jdbcType="TIMESTAMP" property="clsj" />
+    <result column="scsj" jdbcType="TIMESTAMP" property="scsj" />
+    <result column="updatetime" jdbcType="TIMESTAMP" property="updatetime" />
+  </resultMap>
+  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning">
+    <result column="clyj" jdbcType="LONGVARCHAR" property="clyj" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, org_id, ch, hwh, jhwh, lhnd, jkqzt, jkqjzr, jzrqylrsl, jzrqsylrsl, yjrq, clzt, 
+    clr, clsj, scsj, updatetime
+  </sql>
+  <sql id="Blob_Column_List">
+    clyj
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarningExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from storage_jkq_warning
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByExample" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarningExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_jkq_warning
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
+    select 
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from storage_jkq_warning
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from storage_jkq_warning
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarningExample">
+    delete from storage_jkq_warning
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning">
+    insert into storage_jkq_warning (id, org_id, ch, 
+      hwh, jhwh, lhnd, jkqzt, 
+      jkqjzr, jzrqylrsl, jzrqsylrsl, 
+      yjrq, clzt, clr, clsj, 
+      scsj, updatetime, clyj
+      )
+    values (#{id,jdbcType=VARCHAR}, #{orgId,jdbcType=INTEGER}, #{ch,jdbcType=INTEGER}, 
+      #{hwh,jdbcType=INTEGER}, #{jhwh,jdbcType=VARCHAR}, #{lhnd,jdbcType=VARCHAR}, #{jkqzt,jdbcType=VARCHAR}, 
+      #{jkqjzr,jdbcType=VARCHAR}, #{jzrqylrsl,jdbcType=DECIMAL}, #{jzrqsylrsl,jdbcType=DECIMAL}, 
+      #{yjrq,jdbcType=VARCHAR}, #{clzt,jdbcType=VARCHAR}, #{clr,jdbcType=VARCHAR}, #{clsj,jdbcType=TIMESTAMP}, 
+      #{scsj,jdbcType=TIMESTAMP}, #{updatetime,jdbcType=TIMESTAMP}, #{clyj,jdbcType=LONGVARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning">
+    insert into storage_jkq_warning
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="ch != null">
+        ch,
+      </if>
+      <if test="hwh != null">
+        hwh,
+      </if>
+      <if test="jhwh != null">
+        jhwh,
+      </if>
+      <if test="lhnd != null">
+        lhnd,
+      </if>
+      <if test="jkqzt != null">
+        jkqzt,
+      </if>
+      <if test="jkqjzr != null">
+        jkqjzr,
+      </if>
+      <if test="jzrqylrsl != null">
+        jzrqylrsl,
+      </if>
+      <if test="jzrqsylrsl != null">
+        jzrqsylrsl,
+      </if>
+      <if test="yjrq != null">
+        yjrq,
+      </if>
+      <if test="clzt != null">
+        clzt,
+      </if>
+      <if test="clr != null">
+        clr,
+      </if>
+      <if test="clsj != null">
+        clsj,
+      </if>
+      <if test="scsj != null">
+        scsj,
+      </if>
+      <if test="updatetime != null">
+        updatetime,
+      </if>
+      <if test="clyj != null">
+        clyj,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="ch != null">
+        #{ch,jdbcType=INTEGER},
+      </if>
+      <if test="hwh != null">
+        #{hwh,jdbcType=INTEGER},
+      </if>
+      <if test="jhwh != null">
+        #{jhwh,jdbcType=VARCHAR},
+      </if>
+      <if test="lhnd != null">
+        #{lhnd,jdbcType=VARCHAR},
+      </if>
+      <if test="jkqzt != null">
+        #{jkqzt,jdbcType=VARCHAR},
+      </if>
+      <if test="jkqjzr != null">
+        #{jkqjzr,jdbcType=VARCHAR},
+      </if>
+      <if test="jzrqylrsl != null">
+        #{jzrqylrsl,jdbcType=DECIMAL},
+      </if>
+      <if test="jzrqsylrsl != null">
+        #{jzrqsylrsl,jdbcType=DECIMAL},
+      </if>
+      <if test="yjrq != null">
+        #{yjrq,jdbcType=VARCHAR},
+      </if>
+      <if test="clzt != null">
+        #{clzt,jdbcType=VARCHAR},
+      </if>
+      <if test="clr != null">
+        #{clr,jdbcType=VARCHAR},
+      </if>
+      <if test="clsj != null">
+        #{clsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="scsj != null">
+        #{scsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null">
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="clyj != null">
+        #{clyj,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarningExample" resultType="java.lang.Integer">
+    select count(*) from storage_jkq_warning
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update storage_jkq_warning
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </if>
+      <if test="record.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </if>
+      <if test="record.ch != null">
+        ch = #{record.ch,jdbcType=INTEGER},
+      </if>
+      <if test="record.hwh != null">
+        hwh = #{record.hwh,jdbcType=INTEGER},
+      </if>
+      <if test="record.jhwh != null">
+        jhwh = #{record.jhwh,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lhnd != null">
+        lhnd = #{record.lhnd,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jkqzt != null">
+        jkqzt = #{record.jkqzt,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jkqjzr != null">
+        jkqjzr = #{record.jkqjzr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.jzrqylrsl != null">
+        jzrqylrsl = #{record.jzrqylrsl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.jzrqsylrsl != null">
+        jzrqsylrsl = #{record.jzrqsylrsl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.yjrq != null">
+        yjrq = #{record.yjrq,jdbcType=VARCHAR},
+      </if>
+      <if test="record.clzt != null">
+        clzt = #{record.clzt,jdbcType=VARCHAR},
+      </if>
+      <if test="record.clr != null">
+        clr = #{record.clr,jdbcType=VARCHAR},
+      </if>
+      <if test="record.clsj != null">
+        clsj = #{record.clsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.scsj != null">
+        scsj = #{record.scsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatetime != null">
+        updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.clyj != null">
+        clyj = #{record.clyj,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExampleWithBLOBs" parameterType="map">
+    update storage_jkq_warning
+    set id = #{record.id,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      ch = #{record.ch,jdbcType=INTEGER},
+      hwh = #{record.hwh,jdbcType=INTEGER},
+      jhwh = #{record.jhwh,jdbcType=VARCHAR},
+      lhnd = #{record.lhnd,jdbcType=VARCHAR},
+      jkqzt = #{record.jkqzt,jdbcType=VARCHAR},
+      jkqjzr = #{record.jkqjzr,jdbcType=VARCHAR},
+      jzrqylrsl = #{record.jzrqylrsl,jdbcType=DECIMAL},
+      jzrqsylrsl = #{record.jzrqsylrsl,jdbcType=DECIMAL},
+      yjrq = #{record.yjrq,jdbcType=VARCHAR},
+      clzt = #{record.clzt,jdbcType=VARCHAR},
+      clr = #{record.clr,jdbcType=VARCHAR},
+      clsj = #{record.clsj,jdbcType=TIMESTAMP},
+      scsj = #{record.scsj,jdbcType=TIMESTAMP},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      clyj = #{record.clyj,jdbcType=LONGVARCHAR}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update storage_jkq_warning
+    set id = #{record.id,jdbcType=VARCHAR},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      ch = #{record.ch,jdbcType=INTEGER},
+      hwh = #{record.hwh,jdbcType=INTEGER},
+      jhwh = #{record.jhwh,jdbcType=VARCHAR},
+      lhnd = #{record.lhnd,jdbcType=VARCHAR},
+      jkqzt = #{record.jkqzt,jdbcType=VARCHAR},
+      jkqjzr = #{record.jkqjzr,jdbcType=VARCHAR},
+      jzrqylrsl = #{record.jzrqylrsl,jdbcType=DECIMAL},
+      jzrqsylrsl = #{record.jzrqsylrsl,jdbcType=DECIMAL},
+      yjrq = #{record.yjrq,jdbcType=VARCHAR},
+      clzt = #{record.clzt,jdbcType=VARCHAR},
+      clr = #{record.clr,jdbcType=VARCHAR},
+      clsj = #{record.clsj,jdbcType=TIMESTAMP},
+      scsj = #{record.scsj,jdbcType=TIMESTAMP},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning">
+    update storage_jkq_warning
+    <set>
+      <if test="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="ch != null">
+        ch = #{ch,jdbcType=INTEGER},
+      </if>
+      <if test="hwh != null">
+        hwh = #{hwh,jdbcType=INTEGER},
+      </if>
+      <if test="jhwh != null">
+        jhwh = #{jhwh,jdbcType=VARCHAR},
+      </if>
+      <if test="lhnd != null">
+        lhnd = #{lhnd,jdbcType=VARCHAR},
+      </if>
+      <if test="jkqzt != null">
+        jkqzt = #{jkqzt,jdbcType=VARCHAR},
+      </if>
+      <if test="jkqjzr != null">
+        jkqjzr = #{jkqjzr,jdbcType=VARCHAR},
+      </if>
+      <if test="jzrqylrsl != null">
+        jzrqylrsl = #{jzrqylrsl,jdbcType=DECIMAL},
+      </if>
+      <if test="jzrqsylrsl != null">
+        jzrqsylrsl = #{jzrqsylrsl,jdbcType=DECIMAL},
+      </if>
+      <if test="yjrq != null">
+        yjrq = #{yjrq,jdbcType=VARCHAR},
+      </if>
+      <if test="clzt != null">
+        clzt = #{clzt,jdbcType=VARCHAR},
+      </if>
+      <if test="clr != null">
+        clr = #{clr,jdbcType=VARCHAR},
+      </if>
+      <if test="clsj != null">
+        clsj = #{clsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="scsj != null">
+        scsj = #{scsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null">
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="clyj != null">
+        clyj = #{clyj,jdbcType=LONGVARCHAR},
+      </if>
+    </set>
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKeyWithBLOBs" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning">
+    update storage_jkq_warning
+    set org_id = #{orgId,jdbcType=INTEGER},
+      ch = #{ch,jdbcType=INTEGER},
+      hwh = #{hwh,jdbcType=INTEGER},
+      jhwh = #{jhwh,jdbcType=VARCHAR},
+      lhnd = #{lhnd,jdbcType=VARCHAR},
+      jkqzt = #{jkqzt,jdbcType=VARCHAR},
+      jkqjzr = #{jkqjzr,jdbcType=VARCHAR},
+      jzrqylrsl = #{jzrqylrsl,jdbcType=DECIMAL},
+      jzrqsylrsl = #{jzrqsylrsl,jdbcType=DECIMAL},
+      yjrq = #{yjrq,jdbcType=VARCHAR},
+      clzt = #{clzt,jdbcType=VARCHAR},
+      clr = #{clr,jdbcType=VARCHAR},
+      clsj = #{clsj,jdbcType=TIMESTAMP},
+      scsj = #{scsj,jdbcType=TIMESTAMP},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      clyj = #{clyj,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning">
+    update storage_jkq_warning
+    set org_id = #{orgId,jdbcType=INTEGER},
+      ch = #{ch,jdbcType=INTEGER},
+      hwh = #{hwh,jdbcType=INTEGER},
+      jhwh = #{jhwh,jdbcType=VARCHAR},
+      lhnd = #{lhnd,jdbcType=VARCHAR},
+      jkqzt = #{jkqzt,jdbcType=VARCHAR},
+      jkqjzr = #{jkqjzr,jdbcType=VARCHAR},
+      jzrqylrsl = #{jzrqylrsl,jdbcType=DECIMAL},
+      jzrqsylrsl = #{jzrqsylrsl,jdbcType=DECIMAL},
+      yjrq = #{yjrq,jdbcType=VARCHAR},
+      clzt = #{clzt,jdbcType=VARCHAR},
+      clr = #{clr,jdbcType=VARCHAR},
+      clsj = #{clsj,jdbcType=TIMESTAMP},
+      scsj = #{scsj,jdbcType=TIMESTAMP},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  
+</mapper>

src/main/java/com/chinaitop/depot/warningAndAlarm/mapper/TimedTaskMapper.java

@@ -1,7 +1,9 @@
 package com.chinaitop.depot.warningAndAlarm.mapper;
 
 import java.util.List;
+import java.util.Map;
 
+import com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning;
 import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningWithBLOBs;
 
 public interface TimedTaskMapper {
@@ -15,4 +17,15 @@ public interface TimedTaskMapper {
 	 * 检查轮换预警的数据
 	 */
 	List<StorageRotationWarningWithBLOBs> selectLhyj();
+
+	/**
+	 * 检查架空期预警的前置数据
+	 */
+	List<StorageJkqWarning> selectJkqjyqzsj();
+
+	/**
+     * 查询架空期预警的其它数据
+     * @return
+     */
+	StorageJkqWarning selectJkqjyqtsj(Map<String, String> map);
 }

src/main/java/com/chinaitop/depot/warningAndAlarm/mapper/TimedTaskMapper.xml

@@ -58,4 +58,44 @@
     WHERE 1=1 
     and DATE_FORMAT(NOW(), '%Y-%m-%d') >= DATE_FORMAT(datas.bjrq, '%Y-%m-%d')
   </select>
+
+  <select id="selectJkqjyqzsj" resultType="com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning">
+     SELECT 
+       REPLACE(UUID(), '-', '') id,
+       a.plan_year lhnd,
+       tzdxx.chID ch,
+       tzdxx.hwID hwh,
+       a.plan_number jhwh,
+       tzdxx.UnitID org_id,
+       tzdxx.jzrqylrsl,
+       tzdxx.jzrqsylrsl,
+       a.start_date startDate,
+       a.end_date endDate
+       FROM province_all.biz_rp_issuance a 
+     LEFT JOIN (
+       SELECT 
+         tzdcb.UnitID,tzdzb.jhdID, tzdcb.chID, tzdcb.hwID, SUM(tzdcb.count) jzrqylrsl, SUM(tzdcb.sysl) jzrqsylrsl
+       from crk_qh.data_crkyw_tzdxx_default tzdzb
+       LEFT JOIN crk_qh.data_crkyw_tzdxx_flt_001 tzdcb on tzdcb.MainDataID=tzdzb.DataID
+       INNER JOIN business_rp_inbound rkjh on rkjh.rp_report_id=tzdzb.jhdID
+       GROUP BY tzdzb.jhdID, tzdcb.hwID
+     ) tzdxx ON tzdxx.jhdID=a.rp_report_id
+     WHERE 1=1 
+     AND DATE_FORMAT(CURDATE(), "%Y-%m-%d") BETWEEN a.start_date AND a.end_date
+    </select>
+
+    <select id="selectJkqjyqtsj" resultType="com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning" parameterType="java.util.Map">
+      SELECT 
+        CASE WHEN CURDATE() > LAST_DAY(DATE_ADD(m1.rq, INTERVAL 4 MONTH)) THEN '1' ELSE '0' END jkqzt,
+        LAST_DAY(DATE_ADD(m1.rq, INTERVAL 4 MONTH)) jkqjzr,
+        LAST_DAY(DATE_ADD(m1.rq, INTERVAL 4 MONTH)) - INTERVAL 15 DAY yjrq
+      from crk_qh.data_kcgl_fcbgz_default m1 
+      INNER JOIN crk_qh.data_crkyw_ckcmz_default m2 ON m1.DataID = m2.DataID
+      INNER JOIN crk_qh.data_crkyw_ckrmdj_default m3 ON m3.bizno = m2.bizno 
+      WHERE 1=1 
+      AND m1.hwh=#{hwh,jdbcType=VARCHAR}
+      AND DATE_FORMAT(m1.rq, "%Y-%m-%d") BETWEEN #{startDate,jdbcType=VARCHAR} AND #{EndDate,jdbcType=VARCHAR}
+      ORDER BY m1.rq ASC
+      LIMIT 1
+    </select>
 </mapper>

src/main/java/com/chinaitop/depot/warningAndAlarm/model/StorageJkqWarning.java

@@ -0,0 +1,354 @@
+package com.chinaitop.depot.warningAndAlarm.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+public class StorageJkqWarning {
+    private String id;
+
+    private Integer orgId;
+
+    private Integer ch;
+
+    private Integer hwh;
+
+    private String jhwh;
+
+    private String lhnd;
+
+    private String jkqzt;
+
+    private String jkqjzr;
+
+    private BigDecimal jzrqylrsl;
+
+    private BigDecimal jzrqsylrsl;
+
+    private String yjrq;
+
+    private String clzt;
+
+    private String clr;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date clsj;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date scsj;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date updatetime;
+
+    private String clyj;
+
+    private String startDate;
+
+    private String endDate;
+
+    /**
+     * 唯一主键uuid
+     * @return id 唯一主键uuid
+     */
+    public String getId() {
+        return id;
+    }
+
+    /**
+     * 唯一主键uuid
+     * @param id 唯一主键uuid
+     */
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
+    /**
+     * 库ID
+     * @return org_id 库ID
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 库ID
+     * @param orgId 库ID
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 仓房ID
+     * @return ch 仓房ID
+     */
+    public Integer getCh() {
+        return ch;
+    }
+
+    /**
+     * 仓房ID
+     * @param ch 仓房ID
+     */
+    public void setCh(Integer ch) {
+        this.ch = ch;
+    }
+
+    /**
+     * 货位ID
+     * @return hwh 货位ID
+     */
+    public Integer getHwh() {
+        return hwh;
+    }
+
+    /**
+     * 货位ID
+     * @param hwh 货位ID
+     */
+    public void setHwh(Integer hwh) {
+        this.hwh = hwh;
+    }
+
+    /**
+     * 计划文号
+     * @return jhwh 计划文号
+     */
+    public String getJhwh() {
+        return jhwh;
+    }
+
+    /**
+     * 计划文号
+     * @param jhwh 计划文号
+     */
+    public void setJhwh(String jhwh) {
+        this.jhwh = jhwh == null ? null : jhwh.trim();
+    }
+
+    /**
+     * 轮换年度
+     * @return lhnd 轮换年度
+     */
+    public String getLhnd() {
+        return lhnd;
+    }
+
+    /**
+     * 轮换年度
+     * @param lhnd 轮换年度
+     */
+    public void setLhnd(String lhnd) {
+        this.lhnd = lhnd == null ? null : lhnd.trim();
+    }
+
+    /**
+     * 架空期状态(0:正常,1:延期)
+     * @return jkqzt 架空期状态(0:正常,1:延期)
+     */
+    public String getJkqzt() {
+        return jkqzt;
+    }
+
+    /**
+     * 架空期状态(0:正常,1:延期)
+     * @param jkqzt 架空期状态(0:正常,1:延期)
+     */
+    public void setJkqzt(String jkqzt) {
+        this.jkqzt = jkqzt == null ? null : jkqzt.trim();
+    }
+
+    /**
+     * 架空期截止日
+     * @return jkqjzr 架空期截止日
+     */
+    public String getJkqjzr() {
+        return jkqjzr;
+    }
+
+    /**
+     * 架空期截止日
+     * @param jkqjzr 架空期截止日
+     */
+    public void setJkqjzr(String jkqjzr) {
+        this.jkqjzr = jkqjzr == null ? null : jkqjzr.trim();
+    }
+
+    /**
+     * 截止日前应轮入数量
+     * @return jzrqylrsl 截止日前应轮入数量
+     */
+    public BigDecimal getJzrqylrsl() {
+        return jzrqylrsl;
+    }
+
+    /**
+     * 截止日前应轮入数量
+     * @param jzrqylrsl 截止日前应轮入数量
+     */
+    public void setJzrqylrsl(BigDecimal jzrqylrsl) {
+        this.jzrqylrsl = jzrqylrsl;
+    }
+
+    /**
+     * 截止日前剩余轮入数量
+     * @return jzrqsylrsl 截止日前剩余轮入数量
+     */
+    public BigDecimal getJzrqsylrsl() {
+        return jzrqsylrsl;
+    }
+
+    /**
+     * 截止日前剩余轮入数量
+     * @param jzrqsylrsl 截止日前剩余轮入数量
+     */
+    public void setJzrqsylrsl(BigDecimal jzrqsylrsl) {
+        this.jzrqsylrsl = jzrqsylrsl;
+    }
+
+    /**
+     * 预警日期
+     * @return yjrq 预警日期
+     */
+    public String getYjrq() {
+        return yjrq;
+    }
+
+    /**
+     * 预警日期
+     * @param yjrq 预警日期
+     */
+    public void setYjrq(String yjrq) {
+        this.yjrq = yjrq == null ? null : yjrq.trim();
+    }
+
+    /**
+     * 处理状态(0:未处理,1:已处理)
+     * @return clzt 处理状态(0:未处理,1:已处理)
+     */
+    public String getClzt() {
+        return clzt;
+    }
+
+    /**
+     * 处理状态(0:未处理,1:已处理)
+     * @param clzt 处理状态(0:未处理,1:已处理)
+     */
+    public void setClzt(String clzt) {
+        this.clzt = clzt == null ? null : clzt.trim();
+    }
+
+    /**
+     * 处理人
+     * @return clr 处理人
+     */
+    public String getClr() {
+        return clr;
+    }
+
+    /**
+     * 处理人
+     * @param clr 处理人
+     */
+    public void setClr(String clr) {
+        this.clr = clr == null ? null : clr.trim();
+    }
+
+    /**
+     * 处理时间
+     * @return clsj 处理时间
+     */
+    public Date getClsj() {
+        return clsj;
+    }
+
+    /**
+     * 处理时间
+     * @param clsj 处理时间
+     */
+    public void setClsj(Date clsj) {
+        this.clsj = clsj;
+    }
+
+    /**
+     * 数据生成时间
+     * @return scsj 数据生成时间
+     */
+    public Date getScsj() {
+        return scsj;
+    }
+
+    /**
+     * 数据生成时间
+     * @param scsj 数据生成时间
+     */
+    public void setScsj(Date scsj) {
+        this.scsj = scsj;
+    }
+
+    /**
+     * 最后修改时间
+     * @return updatetime 最后修改时间
+     */
+    public Date getUpdatetime() {
+        return updatetime;
+    }
+
+    /**
+     * 最后修改时间
+     * @param updatetime 最后修改时间
+     */
+    public void setUpdatetime(Date updatetime) {
+        this.updatetime = updatetime;
+    }
+
+    /**
+     * 处理意见
+     * @return clyj 处理意见
+     */
+    public String getClyj() {
+        return clyj;
+    }
+
+    /**
+     * 处理意见
+     * @param clyj 处理意见
+     */
+    public void setClyj(String clyj) {
+        this.clyj = clyj == null ? null : clyj.trim();
+    }
+
+    /**
+     * 计划开始执行时间
+     * @return
+     */
+	public String getStartDate() {
+		return startDate;
+	}
+
+	/**
+	 * 计划开始执行时间
+	 * @param startDate
+	 */
+	public void setStartDate(String startDate) {
+		this.startDate = startDate;
+	}
+
+	/**
+	 * 计划结束执行时间
+	 * @return
+	 */
+	public String getEndDate() {
+		return endDate;
+	}
+
+	/**
+	 * 计划结束执行时间
+	 * @param endDate
+	 */
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+    
+}

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

@@ -11,5 +11,11 @@ public interface TimedTaskService {
 	/**
 	 * 检测达到轮换预警的数据并保存
 	 */
-	void insertLhyj();
+	void insertLhyj() throws Exception;
+
+	/**
+	 * 检测架空期预警的数据并保存
+	 * @throws Exception
+	 */
+	void insertJkqyj() throws Exception;
 }

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

@@ -2,6 +2,7 @@ package com.chinaitop.depot.warningAndAlarm.service;
 
 import java.util.List;
 
+import com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning;
 import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarning;
 import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningWithBLOBs;
 
@@ -37,10 +38,37 @@ public interface YjbjService {
 	public void updateDate(StorageRotationWarningWithBLOBs storageRotationWarningWithBLOBs) throws Exception;
 
 	/**
-	 * 按主键ID查询一条数据
-	 * @param id
+	 * 按主键ID查询一条轮换预警报警数据
+	 * @param id 主键唯一ID
 	 * @return
 	 * @throws Exception 
 	 */
 	public StorageRotationWarningWithBLOBs queryById(String id) throws Exception;
+
+	/**
+	 * 查询架空期预警列表数据
+	 * @param orgId 库ID
+	 * @param ch 仓房ID
+	 * @param hwh 货位ID
+	 * @param jhwh 计划文号
+	 * @param lhnd 轮换年度
+	 * @return
+	 * @throws Exception
+	 */
+	public List<StorageJkqWarning> queryJkqyjList(Integer orgId, Integer ch, Integer hwh, String jhwh, String lhnd) throws Exception;
+
+	/**
+	 * 按主键ID查询一条架空期预警数据
+	 * @param id 主键唯一ID
+	 * @return
+	 * @throws Exception
+	 */
+	public StorageJkqWarning queryByIdJkq(String id) throws Exception;
+
+	/**
+	 * 更新架空期预警数据的处理结果信息
+	 * @param storageJkqWarning
+	 * @throws Exception
+	 */
+	public void updateDate(StorageJkqWarning storageJkqWarning) throws Exception;
 }

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

@@ -1,14 +1,20 @@
 package com.chinaitop.depot.warningAndAlarm.service.impl;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
 
+import com.chinaitop.depot.warningAndAlarm.common.StatusUtils;
+import com.chinaitop.depot.warningAndAlarm.mapper.StorageJkqWarningMapper;
 import com.chinaitop.depot.warningAndAlarm.mapper.StorageRotationWarningMapper;
 import com.chinaitop.depot.warningAndAlarm.mapper.TimedTaskMapper;
+import com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning;
+import com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarningExample;
 import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarning;
 import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningExample;
 import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningExample.Criteria;
@@ -24,20 +30,23 @@ public class TimedTaskServiceImpl implements TimedTaskService {
 	@Resource
 	private StorageRotationWarningMapper storageRotationWarningMapper;
 
+	@Resource
+	private StorageJkqWarningMapper storageJkqWarningMapper;
+
 	@Override
 	public void insertYlwl() throws Exception {
 
 		List<StorageRotationWarningWithBLOBs> list = timedTaskMapper.selectYlwl();
-		
+
 		if (null != list && list.size() > 0) {
 			StorageRotationWarningWithBLOBs s = null;
 			for (int i = 0; i < list.size(); i++) {
 				s = list.get(i);
-				boolean k = checkData(s, "1");
+				boolean k = checkDataLhyjbj(s, "1");
 				if (!k) {//如果有了，那就不在增加了，否则就重复报警了
 					Date date = new Date();
 					s.setScsj(date);
-					s.setClzt("0");
+					s.setClzt(StatusUtils.STATUS_0);
 					s.setUpdatetime(date);
 					storageRotationWarningMapper.insert(s);
 				}
@@ -51,7 +60,7 @@ public class TimedTaskServiceImpl implements TimedTaskService {
 	 * @param bjlx 报警类型(0:轮换预警,1:应轮未轮)
 	 * @return
 	 */
-	private boolean checkData(StorageRotationWarningWithBLOBs rotationWarning, String bjlx) {
+	private boolean checkDataLhyjbj(StorageRotationWarningWithBLOBs rotationWarning, String bjlx) {
 		boolean b = false;
 		StorageRotationWarningExample example = new StorageRotationWarningExample();
 		Criteria criteria = example.createCriteria();
@@ -67,19 +76,19 @@ public class TimedTaskServiceImpl implements TimedTaskService {
 	}
 
 	@Override
-	public void insertLhyj() {
+	public void insertLhyj() throws Exception {
 
 		List<StorageRotationWarningWithBLOBs> list = timedTaskMapper.selectLhyj();
-		
+
 		if (null != list && list.size() > 0) {
 			StorageRotationWarningWithBLOBs s = null;
 			for (int i = 0; i < list.size(); i++) {
 				s = list.get(i);
-				boolean k = checkData(s, "0");
+				boolean k = checkDataLhyjbj(s, "0");
 				if (!k) {//如果有了，那就不在增加了，否则就重复报警了
 					Date date = new Date();
 					s.setScsj(date);
-					s.setClzt("0");
+					s.setClzt(StatusUtils.STATUS_0);
 					s.setUpdatetime(date);
 					storageRotationWarningMapper.insert(s);
 				}
@@ -87,4 +96,82 @@ public class TimedTaskServiceImpl implements TimedTaskService {
 		}
 	}
 
+	@Override
+	public void insertJkqyj() throws Exception {
+
+		List<StorageJkqWarning> list = timedTaskMapper.selectJkqjyqzsj();
+
+		if (null != list && list.size() > 0) {
+			StorageJkqWarning s = null;
+			for (int i = 0; i < list.size(); i++) {
+				s = list.get(i);
+				
+				//查询架空期截止日期、架空期状态、报警日期
+				s = selectJkqjyqtsj(s);
+
+				boolean k = checkDataJkqyj(s);
+				Date date = new Date();
+				if (!k) {//如果有了，那就不在增加了，否则就重复报警了
+					s.setScsj(date);
+					s.setClzt(StatusUtils.STATUS_0);
+					s.setUpdatetime(date);
+					storageJkqWarningMapper.insert(s);
+				} else {
+					s.setUpdatetime(date);
+					storageJkqWarningMapper.updateByPrimaryKey(s);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 查询架空期截止日期、架空期状态、报警日期
+	 * @param s
+	 * @return
+	 */
+	private StorageJkqWarning selectJkqjyqtsj(StorageJkqWarning s) {
+		
+		//组装查询条件
+		Map<String, String> map = new HashMap<>();
+		map.put("hwh", s.getHwh().toString());
+		map.put("startDate", s.getStartDate());
+		map.put("endDate", s.getEndDate());
+
+		//查询
+		StorageJkqWarning sj = timedTaskMapper.selectJkqjyqtsj(map);
+
+		if (null != sj) {
+			s.setJkqjzr(sj.getJkqjzr());
+			s.setJkqzt(sj.getJkqzt());
+			s.setYjrq(sj.getYjrq());
+		}
+
+		return s;
+	}
+
+	/**
+	 * 校验架空期数据是否已经存在
+	 * 查询条件：仓房、货位、计划文号、轮换年度
+	 * @param storageJkqWarning
+	 * @return
+	 */
+	public boolean checkDataJkqyj(StorageJkqWarning storageJkqWarning) {
+
+		boolean b = false;
+
+		StorageJkqWarningExample example = new StorageJkqWarningExample();
+		StorageJkqWarningExample.Criteria criteria = example.createCriteria();
+
+		criteria.andHwhEqualTo(storageJkqWarning.getHwh());
+		criteria.andChEqualTo(storageJkqWarning.getCh());
+		criteria.andJhwhEqualTo(storageJkqWarning.getJhwh());
+		criteria.andLhndEqualTo(storageJkqWarning.getLhnd());
+
+		List<StorageJkqWarning> list = storageJkqWarningMapper.selectByExample(example);
+		if (null != list && list.size() > 0) {
+			b = true;
+		}
+
+		return b;
+	}
 }

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

@@ -7,7 +7,11 @@ import javax.annotation.Resource;
 
 import org.springframework.stereotype.Service;
 
+import com.chinaitop.depot.warningAndAlarm.common.StatusUtils;
+import com.chinaitop.depot.warningAndAlarm.mapper.StorageJkqWarningMapper;
 import com.chinaitop.depot.warningAndAlarm.mapper.StorageRotationWarningMapper;
+import com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarning;
+import com.chinaitop.depot.warningAndAlarm.model.StorageJkqWarningExample;
 import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarning;
 import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningExample;
 import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningExample.Criteria;
@@ -20,6 +24,9 @@ public class YjbjServiceImpl implements YjbjService {
 	@Resource
 	private StorageRotationWarningMapper storageRotationWarningMapper;
 
+	@Resource
+	private StorageJkqWarningMapper storageJkqWarningMapper;
+
 	@Override
 	public List<StorageRotationWarning> queryLhyjList(Integer orgId, Integer ch, Integer hwh, Integer lspz)
 			throws Exception {
@@ -40,7 +47,7 @@ public class YjbjServiceImpl implements YjbjService {
 			criteria.andLspzEqualTo(lspz);  //粮食品种ID
 		}
 
-		criteria.andBjlxEqualTo("0"); //查询轮换预警的数据
+		criteria.andBjlxEqualTo(StatusUtils.LHYJBJ_TYPE_0); //查询轮换预警的数据
 
 		example.setOrderByClause("scsj desc"); //按照数据的生成时间倒序排序
 
@@ -69,7 +76,7 @@ public class YjbjServiceImpl implements YjbjService {
 			criteria.andLspzEqualTo(lspz);  //粮食品种ID
 		}
 
-		criteria.andBjlxEqualTo("1"); //查询应轮未轮报警的数据
+		criteria.andBjlxEqualTo(StatusUtils.LHYJBJ_TYPE_1); //查询应轮未轮报警的数据
 
 		example.setOrderByClause("scsj desc"); //按照数据的生成时间倒序排序
 
@@ -81,7 +88,7 @@ public class YjbjServiceImpl implements YjbjService {
 	@Override
 	public void updateDate(StorageRotationWarningWithBLOBs storageRotationWarningWithBLOBs) throws Exception {
 		storageRotationWarningWithBLOBs.setUpdatetime(new Date());
-		storageRotationWarningWithBLOBs.setClzt("1"); //设置为已处理
+		storageRotationWarningWithBLOBs.setClzt(StatusUtils.STATUS_1); //设置为已处理
 		storageRotationWarningMapper.updateByPrimaryKeyWithBLOBs(storageRotationWarningWithBLOBs);
 	}
 
@@ -90,4 +97,46 @@ public class YjbjServiceImpl implements YjbjService {
 		return storageRotationWarningMapper.selectByPrimaryKey(id);
 	}
 
+	@Override
+	public List<StorageJkqWarning> queryJkqyjList(Integer orgId, Integer ch, Integer hwh, String jhwh, String lhnd)
+			throws Exception {
+
+		StorageJkqWarningExample example = new StorageJkqWarningExample();
+		StorageJkqWarningExample.Criteria criteria = example.createCriteria();
+
+		if (null != orgId) {
+			criteria.andOrgIdEqualTo(orgId);
+		}
+		if (null != ch) {
+			criteria.andChEqualTo(ch);
+		}
+		if (null != hwh) {
+			criteria.andHwhEqualTo(hwh);
+		}
+		if (null != jhwh) {
+			criteria.andJhwhEqualTo(jhwh);
+		}
+		if (null != lhnd) {
+			criteria.andLhndEqualTo(lhnd);
+		}
+
+		example.setOrderByClause("scsj desc");
+
+		List<StorageJkqWarning> list = storageJkqWarningMapper.selectByExample(example);
+
+		return list;
+	}
+
+	@Override
+	public StorageJkqWarning queryByIdJkq(String id) throws Exception {
+		return storageJkqWarningMapper.selectByPrimaryKey(id);
+	}
+
+	@Override
+	public void updateDate(StorageJkqWarning storageJkqWarning) throws Exception {
+		storageJkqWarning.setUpdatetime(new Date());
+		storageJkqWarning.setClzt(StatusUtils.STATUS_1); //设置为已处理
+		storageJkqWarningMapper.updateByPrimaryKeyWithBLOBs(storageJkqWarning);
+	}
+
 }