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

src/main/java/com/chinaitop/depot/SwaggerConfig.java

@@ -31,6 +31,7 @@ public class SwaggerConfig {
     private static final String risk = "com.chinaitop.depot.risk.controller;";
     private static final String fumigation = "com.chinaitop.depot.fumigation.controller;";
     private static final String spt = "com.chinaitop.depot.sptData.controller;";
+    private static final String warningAndAlarm = "com.chinaitop.depot.warningAndAlarm.controller;";
     /**
      * 1.添加包path
      * 2.append(静态变量)
@@ -39,7 +40,14 @@ public class SwaggerConfig {
      */
     private static String addPackage() {
         StringBuilder countServer = new StringBuilder();
-        countServer.append(business).append(safeProduce).append(storage).append(registration).append(risk).append(fumigation).append(spt);
+        countServer.append(business)
+        			.append(safeProduce)
+        			.append(storage)
+        			.append(registration)
+        			.append(risk)
+        			.append(fumigation)
+        			.append(spt)
+        			.append(warningAndAlarm);
         return countServer.toString();
     }
 

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

@@ -0,0 +1,46 @@
+package com.chinaitop.depot.warningAndAlarm.controller;
+
+import javax.annotation.Resource;
+
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.chinaitop.depot.warningAndAlarm.service.TimedTaskService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+
+@RequestMapping(value="/timesTask")
+@Api(value= "TimedTaskController", description="预警报警数据定时任务检测控制类")
+@RestController
+@Slf4j
+public class TimedTaskController {
+
+	@Resource
+	private TimedTaskService timeTaskService;
+
+	@Scheduled(cron = "0 0 1 * * ?")
+	@RequestMapping(value="/checkYlwl", method = RequestMethod.GET)
+	@ApiOperation(value="检测应轮未轮报警数据", notes = "定时任务检测,每天凌晨1点执行")
+	public void checkYlwl() {
+		try {
+			timeTaskService.insertYlwl();
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+	}
+
+	@Scheduled(cron = "0 30 1 * * ?")
+	@RequestMapping(value="/checkLhyj", method = RequestMethod.GET)
+	@ApiOperation(value="检测轮换预警数据", notes = "定时任务检测,每天凌晨1:30点执行")
+	public void checkLhyj() {
+		try {
+			timeTaskService.insertLhyj();
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+	}
+}

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

@@ -0,0 +1,107 @@
+package com.chinaitop.depot.warningAndAlarm.controller;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.apache.commons.lang.StringUtils;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+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.StorageRotationWarning;
+import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningWithBLOBs;
+import com.chinaitop.depot.warningAndAlarm.service.YjbjService;
+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 lombok.extern.slf4j.Slf4j;
+
+@RequestMapping(value="/yjbj")
+@Api(value= "YjBjController", description="预警报警功能控制类")
+@RestController
+@Slf4j
+@SuppressWarnings("all")
+public class YjBjController {
+
+	@Resource
+	private YjbjService yjbjService;
+
+	@RequestMapping(value="/getLhyjPageInfoList", 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 = "lspz", value = "粮食品种ID", paramType = "query")
+	})
+	public ResponseEntity<PageInfo<StorageRotationWarning>> getLhyjPageInfoList(Integer pageNum, Integer pageSize, Integer orgId, Integer ch, Integer hwh, Integer lspz) {
+		PageInfo<StorageRotationWarning> pageInfo = null;
+		try {
+			if (pageNum != null && pageSize != null) {
+	            PageHelper.startPage(pageNum, pageSize);
+	        }
+			List<StorageRotationWarning> list = yjbjService.queryLhyjList(orgId, ch, hwh, lspz);
+			pageInfo = new PageInfo<>(list);
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+		return ResponseEntity.ok(pageInfo);
+	}
+
+	@RequestMapping(value="/getYlwlPageInfoList", 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 = "lspz", value = "粮食品种ID", paramType = "query")
+	})
+	public ResponseEntity<PageInfo<StorageRotationWarning>> getYlwlPageInfoList(Integer pageNum, Integer pageSize, Integer orgId, Integer ch, Integer hwh, Integer lspz) {
+		PageInfo<StorageRotationWarning> pageInfo = null;
+		try {
+			if (pageNum != null && pageSize != null) {
+	            PageHelper.startPage(pageNum, pageSize);
+	        }
+			List<StorageRotationWarning> list = yjbjService.queryYlwlList(orgId, ch, hwh, lspz);
+			pageInfo = new PageInfo<>(list);
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+		return ResponseEntity.ok(pageInfo);
+	}
+
+	@RequestMapping(value="/editLhyj", method = RequestMethod.GET)
+	@ApiOperation(value="预警报警数据更新", notes = "")
+	@ApiImplicitParams({
+        @ApiImplicitParam(name = "lhyjJson", value = "数据对象", paramType = "query")
+	})
+	public ResponseEntity editLhyj(String lhyjJson) {
+		PageInfo<StorageRotationWarning> pageInfo = null;
+		try {
+			if (StringUtils.isNotBlank(lhyjJson)) {
+				StorageRotationWarningWithBLOBs storageRotationWarningWithBLOBs = JSONObject.parseObject(lhyjJson, StorageRotationWarningWithBLOBs.class);
+                if (storageRotationWarningWithBLOBs.getId() == null) {
+                    return ResponseEntity.failed("数据ID不能为空！");
+                }
+
+                yjbjService.updateDate(storageRotationWarningWithBLOBs);
+
+                return ResponseEntity.ok();
+            }
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+		}
+		return ResponseEntity.ok(pageInfo);
+	}
+}

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

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

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

@@ -0,0 +1,516 @@
+<?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.StorageRotationWarningMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarning">
+    <id column="id" jdbcType="VARCHAR" property="id" />
+    <result column="ch" jdbcType="INTEGER" property="ch" />
+    <result column="hwh" jdbcType="INTEGER" property="hwh" />
+    <result column="lspz" jdbcType="INTEGER" property="lspz" />
+    <result column="lsxz" jdbcType="INTEGER" property="lsxz" />
+    <result column="kcsl" jdbcType="DECIMAL" property="kcsl" />
+    <result column="scnf" jdbcType="INTEGER" property="scnf" />
+    <result column="zhycrq" jdbcType="VARCHAR" property="zhycrq" />
+    <result column="cbnx" jdbcType="VARCHAR" property="cbnx" />
+    <result column="cccxrq" jdbcType="VARCHAR" property="cccxrq" />
+    <result column="bjrq" jdbcType="VARCHAR" property="bjrq" />
+    <result column="bjlx" jdbcType="VARCHAR" property="bjlx" />
+    <result column="clzt" jdbcType="VARCHAR" property="clzt" />
+    <result column="clr" jdbcType="VARCHAR" property="clr" />
+    <result column="clsj" jdbcType="TIMESTAMP" property="clsj" />
+    <result column="org_id" jdbcType="INTEGER" property="orgId" />
+    <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.StorageRotationWarningWithBLOBs">
+    <result column="remark" jdbcType="LONGVARCHAR" property="remark" />
+    <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, ch, hwh, lspz, lsxz, kcsl, scnf, zhycrq, cbnx, cccxrq, bjrq, bjlx, clzt, clr, 
+    clsj, org_id, scsj, updatetime
+  </sql>
+  <sql id="Blob_Column_List">
+    remark, clyj
+  </sql>
+  <select id="selectByExampleWithBLOBs" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningExample" resultMap="ResultMapWithBLOBs">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    ,
+    <include refid="Blob_Column_List" />
+    from storage_rotation_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.StorageRotationWarningExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from storage_rotation_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_rotation_warning
+    where id = #{id,jdbcType=VARCHAR}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
+    delete from storage_rotation_warning
+    where id = #{id,jdbcType=VARCHAR}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningExample">
+    delete from storage_rotation_warning
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningWithBLOBs">
+    insert into storage_rotation_warning (id, ch, hwh, 
+      lspz, lsxz, kcsl, scnf, 
+      zhycrq, cbnx, cccxrq, 
+      bjrq, bjlx, clzt, clr, 
+      clsj, org_id, scsj, 
+      updatetime, remark, clyj
+      )
+    values (#{id,jdbcType=VARCHAR}, #{ch,jdbcType=INTEGER}, #{hwh,jdbcType=INTEGER}, 
+      #{lspz,jdbcType=INTEGER}, #{lsxz,jdbcType=INTEGER}, #{kcsl,jdbcType=DECIMAL}, #{scnf,jdbcType=INTEGER}, 
+      #{zhycrq,jdbcType=VARCHAR}, #{cbnx,jdbcType=VARCHAR}, #{cccxrq,jdbcType=VARCHAR}, 
+      #{bjrq,jdbcType=VARCHAR}, #{bjlx,jdbcType=VARCHAR}, #{clzt,jdbcType=VARCHAR}, #{clr,jdbcType=VARCHAR}, 
+      #{clsj,jdbcType=TIMESTAMP}, #{orgId,jdbcType=INTEGER}, #{scsj,jdbcType=TIMESTAMP}, 
+      #{updatetime,jdbcType=TIMESTAMP}, #{remark,jdbcType=LONGVARCHAR}, #{clyj,jdbcType=LONGVARCHAR}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningWithBLOBs">
+    insert into storage_rotation_warning
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="ch != null">
+        ch,
+      </if>
+      <if test="hwh != null">
+        hwh,
+      </if>
+      <if test="lspz != null">
+        lspz,
+      </if>
+      <if test="lsxz != null">
+        lsxz,
+      </if>
+      <if test="kcsl != null">
+        kcsl,
+      </if>
+      <if test="scnf != null">
+        scnf,
+      </if>
+      <if test="zhycrq != null">
+        zhycrq,
+      </if>
+      <if test="cbnx != null">
+        cbnx,
+      </if>
+      <if test="cccxrq != null">
+        cccxrq,
+      </if>
+      <if test="bjrq != null">
+        bjrq,
+      </if>
+      <if test="bjlx != null">
+        bjlx,
+      </if>
+      <if test="clzt != null">
+        clzt,
+      </if>
+      <if test="clr != null">
+        clr,
+      </if>
+      <if test="clsj != null">
+        clsj,
+      </if>
+      <if test="orgId != null">
+        org_id,
+      </if>
+      <if test="scsj != null">
+        scsj,
+      </if>
+      <if test="updatetime != null">
+        updatetime,
+      </if>
+      <if test="remark != null">
+        remark,
+      </if>
+      <if test="clyj != null">
+        clyj,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=VARCHAR},
+      </if>
+      <if test="ch != null">
+        #{ch,jdbcType=INTEGER},
+      </if>
+      <if test="hwh != null">
+        #{hwh,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null">
+        #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="lsxz != null">
+        #{lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="kcsl != null">
+        #{kcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="scnf != null">
+        #{scnf,jdbcType=INTEGER},
+      </if>
+      <if test="zhycrq != null">
+        #{zhycrq,jdbcType=VARCHAR},
+      </if>
+      <if test="cbnx != null">
+        #{cbnx,jdbcType=VARCHAR},
+      </if>
+      <if test="cccxrq != null">
+        #{cccxrq,jdbcType=VARCHAR},
+      </if>
+      <if test="bjrq != null">
+        #{bjrq,jdbcType=VARCHAR},
+      </if>
+      <if test="bjlx != null">
+        #{bjlx,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="orgId != null">
+        #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="scsj != null">
+        #{scsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null">
+        #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remark != null">
+        #{remark,jdbcType=LONGVARCHAR},
+      </if>
+      <if test="clyj != null">
+        #{clyj,jdbcType=LONGVARCHAR},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningExample" resultType="java.lang.Integer">
+    select count(*) from storage_rotation_warning
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update storage_rotation_warning
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=VARCHAR},
+      </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.lspz != null">
+        lspz = #{record.lspz,jdbcType=INTEGER},
+      </if>
+      <if test="record.lsxz != null">
+        lsxz = #{record.lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="record.kcsl != null">
+        kcsl = #{record.kcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="record.scnf != null">
+        scnf = #{record.scnf,jdbcType=INTEGER},
+      </if>
+      <if test="record.zhycrq != null">
+        zhycrq = #{record.zhycrq,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cbnx != null">
+        cbnx = #{record.cbnx,jdbcType=VARCHAR},
+      </if>
+      <if test="record.cccxrq != null">
+        cccxrq = #{record.cccxrq,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bjrq != null">
+        bjrq = #{record.bjrq,jdbcType=VARCHAR},
+      </if>
+      <if test="record.bjlx != null">
+        bjlx = #{record.bjlx,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.orgId != null">
+        org_id = #{record.orgId,jdbcType=INTEGER},
+      </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.remark != null">
+        remark = #{record.remark,jdbcType=LONGVARCHAR},
+      </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_rotation_warning
+    set id = #{record.id,jdbcType=VARCHAR},
+      ch = #{record.ch,jdbcType=INTEGER},
+      hwh = #{record.hwh,jdbcType=INTEGER},
+      lspz = #{record.lspz,jdbcType=INTEGER},
+      lsxz = #{record.lsxz,jdbcType=INTEGER},
+      kcsl = #{record.kcsl,jdbcType=DECIMAL},
+      scnf = #{record.scnf,jdbcType=INTEGER},
+      zhycrq = #{record.zhycrq,jdbcType=VARCHAR},
+      cbnx = #{record.cbnx,jdbcType=VARCHAR},
+      cccxrq = #{record.cccxrq,jdbcType=VARCHAR},
+      bjrq = #{record.bjrq,jdbcType=VARCHAR},
+      bjlx = #{record.bjlx,jdbcType=VARCHAR},
+      clzt = #{record.clzt,jdbcType=VARCHAR},
+      clr = #{record.clr,jdbcType=VARCHAR},
+      clsj = #{record.clsj,jdbcType=TIMESTAMP},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      scsj = #{record.scsj,jdbcType=TIMESTAMP},
+      updatetime = #{record.updatetime,jdbcType=TIMESTAMP},
+      remark = #{record.remark,jdbcType=LONGVARCHAR},
+      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_rotation_warning
+    set id = #{record.id,jdbcType=VARCHAR},
+      ch = #{record.ch,jdbcType=INTEGER},
+      hwh = #{record.hwh,jdbcType=INTEGER},
+      lspz = #{record.lspz,jdbcType=INTEGER},
+      lsxz = #{record.lsxz,jdbcType=INTEGER},
+      kcsl = #{record.kcsl,jdbcType=DECIMAL},
+      scnf = #{record.scnf,jdbcType=INTEGER},
+      zhycrq = #{record.zhycrq,jdbcType=VARCHAR},
+      cbnx = #{record.cbnx,jdbcType=VARCHAR},
+      cccxrq = #{record.cccxrq,jdbcType=VARCHAR},
+      bjrq = #{record.bjrq,jdbcType=VARCHAR},
+      bjlx = #{record.bjlx,jdbcType=VARCHAR},
+      clzt = #{record.clzt,jdbcType=VARCHAR},
+      clr = #{record.clr,jdbcType=VARCHAR},
+      clsj = #{record.clsj,jdbcType=TIMESTAMP},
+      org_id = #{record.orgId,jdbcType=INTEGER},
+      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.StorageRotationWarningWithBLOBs">
+    update storage_rotation_warning
+    <set>
+      <if test="ch != null">
+        ch = #{ch,jdbcType=INTEGER},
+      </if>
+      <if test="hwh != null">
+        hwh = #{hwh,jdbcType=INTEGER},
+      </if>
+      <if test="lspz != null">
+        lspz = #{lspz,jdbcType=INTEGER},
+      </if>
+      <if test="lsxz != null">
+        lsxz = #{lsxz,jdbcType=INTEGER},
+      </if>
+      <if test="kcsl != null">
+        kcsl = #{kcsl,jdbcType=DECIMAL},
+      </if>
+      <if test="scnf != null">
+        scnf = #{scnf,jdbcType=INTEGER},
+      </if>
+      <if test="zhycrq != null">
+        zhycrq = #{zhycrq,jdbcType=VARCHAR},
+      </if>
+      <if test="cbnx != null">
+        cbnx = #{cbnx,jdbcType=VARCHAR},
+      </if>
+      <if test="cccxrq != null">
+        cccxrq = #{cccxrq,jdbcType=VARCHAR},
+      </if>
+      <if test="bjrq != null">
+        bjrq = #{bjrq,jdbcType=VARCHAR},
+      </if>
+      <if test="bjlx != null">
+        bjlx = #{bjlx,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="orgId != null">
+        org_id = #{orgId,jdbcType=INTEGER},
+      </if>
+      <if test="scsj != null">
+        scsj = #{scsj,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatetime != null">
+        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="remark != null">
+        remark = #{remark,jdbcType=LONGVARCHAR},
+      </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.StorageRotationWarningWithBLOBs">
+    update storage_rotation_warning
+    set ch = #{ch,jdbcType=INTEGER},
+      hwh = #{hwh,jdbcType=INTEGER},
+      lspz = #{lspz,jdbcType=INTEGER},
+      lsxz = #{lsxz,jdbcType=INTEGER},
+      kcsl = #{kcsl,jdbcType=DECIMAL},
+      scnf = #{scnf,jdbcType=INTEGER},
+      zhycrq = #{zhycrq,jdbcType=VARCHAR},
+      cbnx = #{cbnx,jdbcType=VARCHAR},
+      cccxrq = #{cccxrq,jdbcType=VARCHAR},
+      bjrq = #{bjrq,jdbcType=VARCHAR},
+      bjlx = #{bjlx,jdbcType=VARCHAR},
+      clzt = #{clzt,jdbcType=VARCHAR},
+      clr = #{clr,jdbcType=VARCHAR},
+      clsj = #{clsj,jdbcType=TIMESTAMP},
+      org_id = #{orgId,jdbcType=INTEGER},
+      scsj = #{scsj,jdbcType=TIMESTAMP},
+      updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      remark = #{remark,jdbcType=LONGVARCHAR},
+      clyj = #{clyj,jdbcType=LONGVARCHAR}
+    where id = #{id,jdbcType=VARCHAR}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarning">
+    update storage_rotation_warning
+    set ch = #{ch,jdbcType=INTEGER},
+      hwh = #{hwh,jdbcType=INTEGER},
+      lspz = #{lspz,jdbcType=INTEGER},
+      lsxz = #{lsxz,jdbcType=INTEGER},
+      kcsl = #{kcsl,jdbcType=DECIMAL},
+      scnf = #{scnf,jdbcType=INTEGER},
+      zhycrq = #{zhycrq,jdbcType=VARCHAR},
+      cbnx = #{cbnx,jdbcType=VARCHAR},
+      cccxrq = #{cccxrq,jdbcType=VARCHAR},
+      bjrq = #{bjrq,jdbcType=VARCHAR},
+      bjlx = #{bjlx,jdbcType=VARCHAR},
+      clzt = #{clzt,jdbcType=VARCHAR},
+      clr = #{clr,jdbcType=VARCHAR},
+      clsj = #{clsj,jdbcType=TIMESTAMP},
+      org_id = #{orgId,jdbcType=INTEGER},
+      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

@@ -0,0 +1,18 @@
+package com.chinaitop.depot.warningAndAlarm.mapper;
+
+import java.util.List;
+
+import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningWithBLOBs;
+
+public interface TimedTaskMapper {
+
+	/**
+	 * 检查应轮未轮的数据
+	 */
+	List<StorageRotationWarningWithBLOBs> selectYlwl();
+
+	/**
+	 * 检查轮换预警的数据
+	 */
+	List<StorageRotationWarningWithBLOBs> selectLhyj();
+}

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

@@ -0,0 +1,61 @@
+<?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.TimedTaskMapper" >
+
+  <select id="selectYlwl" resultType="com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningWithBLOBs">
+    select * from (
+       SELECT 
+         REPLACE(UUID(), '-', '') id,a.UnitID orgId,a.ch, a.hwh, a.pz lspz, a.hwxz lsxz, a.kcsl, e1.enumName scnf,
+         DATE_FORMAT(a.rq, '%Y-%m-%d') zhycrq,
+         CASE a.pz 
+    	   WHEN '3164' THEN '5年' 
+    	   WHEN '3166' THEN '3年' 
+    	   WHEN '3170' THEN '3年' 
+    	   ELSE NULL 
+  	     END cbnx,
+  	     CASE a.pz 
+    	   WHEN '3164' THEN CONCAT(SUBSTR(a.rq,1,4)+5,'-12-31') 
+    	   WHEN '3166' THEN CONCAT(SUBSTR(a.rq,1,4)+3,'-12-31') 
+    	   WHEN '3170' THEN CONCAT(SUBSTR(a.rq,1,4)+3,'-12-31') 
+    	   ELSE NULL 
+  	     END cccxrq,
+         '1' bjlx,
+         DATE_FORMAT(NOW(), '%Y-%m-%d') bjrq
+	   FROM crk_qh.data_kcgl_kcsw_default a 
+	   LEFT JOIN basic_enum e1 on e1.enumId=a.scnf
+    ) datas
+    WHERE 1=1 
+    and DATE_FORMAT(NOW(), '%Y-%m-%d') > DATE_FORMAT(datas.cccxrq, '%Y-%m-%d')
+  </select>
+
+  <select id="selectLhyj" resultType="com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningWithBLOBs">
+    select * from (
+       SELECT 
+         REPLACE(UUID(), '-', '') id,a.UnitID orgId,a.ch, a.hwh, a.pz lspz, a.hwxz lsxz, a.kcsl, e1.enumName scnf, 
+         DATE_FORMAT(a.rq, '%Y-%m-%d') zhycrq,
+         CASE a.pz 
+    	   WHEN '3164' THEN '5年' 
+    	   WHEN '3166' THEN '3年' 
+    	   WHEN '3170' THEN '3年' 
+    	   ELSE NULL 
+  	     END cbnx,
+  	     CASE a.pz 
+    	   WHEN '3164' THEN CONCAT(SUBSTR(a.rq,1,4)+5,'-12-31') 
+    	   WHEN '3166' THEN CONCAT(SUBSTR(a.rq,1,4)+3,'-12-31') 
+    	   WHEN '3170' THEN CONCAT(SUBSTR(a.rq,1,4)+3,'-12-31') 
+    	   ELSE NULL 
+  	     END cccxrq,
+         '0' bjlx,
+         CASE a.pz 
+    	   WHEN '3164' THEN CONCAT(SUBSTR(a.rq,1,4)+5,'-09-30') 
+    	   WHEN '3166' THEN CONCAT(SUBSTR(a.rq,1,4)+3,'-09-30') 
+    	   WHEN '3170' THEN CONCAT(SUBSTR(a.rq,1,4)+3,'-09-30') 
+    	   ELSE NULL 
+  	     END bjrq
+	   FROM crk_qh.data_kcgl_kcsw_default a 
+	   LEFT JOIN basic_enum e1 on e1.enumId=a.scnf
+    ) datas
+    WHERE 1=1 
+    and DATE_FORMAT(NOW(), '%Y-%m-%d') >= DATE_FORMAT(datas.bjrq, '%Y-%m-%d')
+  </select>
+</mapper>

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

@@ -0,0 +1,335 @@
+package com.chinaitop.depot.warningAndAlarm.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+public class StorageRotationWarning {
+    private String id;
+
+    private Integer ch;
+
+    private Integer hwh;
+
+    private Integer lspz;
+
+    private Integer lsxz;
+
+    private BigDecimal kcsl;
+
+    private Integer scnf;
+
+    private String zhycrq;
+
+    private String cbnx;
+
+    private String cccxrq;
+
+    private String bjrq;
+
+    private String bjlx;
+
+    private String clzt;
+
+    private String clr;
+
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date clsj;
+
+    private Integer orgId;
+
+    @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;
+
+    /**
+     * 主键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();
+    }
+
+    /**
+     * 仓房号
+     * @return ch 仓房号
+     */
+    public Integer getCh() {
+        return ch;
+    }
+
+    /**
+     * 仓房号
+     * @param ch 仓房号
+     */
+    public void setCh(Integer ch) {
+        this.ch = ch;
+    }
+
+    /**
+     * 货位号
+     * @return hwh 货位号
+     */
+    public Integer getHwh() {
+        return hwh;
+    }
+
+    /**
+     * 货位号
+     * @param hwh 货位号
+     */
+    public void setHwh(Integer hwh) {
+        this.hwh = hwh;
+    }
+
+    /**
+     * 粮食品种
+     * @return lspz 粮食品种
+     */
+    public Integer getLspz() {
+        return lspz;
+    }
+
+    /**
+     * 粮食品种
+     * @param lspz 粮食品种
+     */
+    public void setLspz(Integer lspz) {
+        this.lspz = lspz;
+    }
+
+    /**
+     * 粮食性质
+     * @return lsxz 粮食性质
+     */
+    public Integer getLsxz() {
+        return lsxz;
+    }
+
+    /**
+     * 粮食性质
+     * @param lsxz 粮食性质
+     */
+    public void setLsxz(Integer lsxz) {
+        this.lsxz = lsxz;
+    }
+
+    /**
+     * 库存数量
+     * @return kcsl 库存数量
+     */
+    public BigDecimal getKcsl() {
+        return kcsl;
+    }
+
+    /**
+     * 库存数量
+     * @param kcsl 库存数量
+     */
+    public void setKcsl(BigDecimal kcsl) {
+        this.kcsl = kcsl;
+    }
+
+    /**
+     * 生产年份
+     * @return scnf 生产年份
+     */
+    public Integer getScnf() {
+        return scnf;
+    }
+
+    /**
+     * 生产年份
+     * @param scnf 生产年份
+     */
+    public void setScnf(Integer scnf) {
+        this.scnf = scnf;
+    }
+
+    /**
+     * 最后一车作业日期
+     * @return zhycrq 最后一车作业日期
+     */
+    public String getZhycrq() {
+        return zhycrq;
+    }
+
+    /**
+     * 最后一车作业日期
+     * @param zhycrq 最后一车作业日期
+     */
+    public void setZhycrq(String zhycrq) {
+        this.zhycrq = zhycrq == null ? null : zhycrq.trim();
+    }
+
+    /**
+     * 储备年限
+     * @return cbnx 储备年限
+     */
+    public String getCbnx() {
+        return cbnx;
+    }
+
+    /**
+     * 储备年限
+     * @param cbnx 储备年限
+     */
+    public void setCbnx(String cbnx) {
+        this.cbnx = cbnx == null ? null : cbnx.trim();
+    }
+
+    /**
+     * 储存超限时间
+     * @return cccxrq 储存超限时间
+     */
+    public String getCccxrq() {
+        return cccxrq;
+    }
+
+    /**
+     * 储存超限时间
+     * @param cccxrq 储存超限时间
+     */
+    public void setCccxrq(String cccxrq) {
+        this.cccxrq = cccxrq == null ? null : cccxrq.trim();
+    }
+
+    /**
+     * 报警日期
+     * @return bjrq 报警日期
+     */
+    public String getBjrq() {
+        return bjrq;
+    }
+
+    /**
+     * 报警日期
+     * @param bjrq 报警日期
+     */
+    public void setBjrq(String bjrq) {
+        this.bjrq = bjrq == null ? null : bjrq.trim();
+    }
+
+    /**
+     * 报警类型(0:轮换预警,1:应轮未轮)
+     * @return bjlx 报警类型(0:轮换预警,1:应轮未轮)
+     */
+    public String getBjlx() {
+        return bjlx;
+    }
+
+    /**
+     * 报警类型(0:轮换预警,1:应轮未轮)
+     * @param bjlx 报警类型(0:轮换预警,1:应轮未轮)
+     */
+    public void setBjlx(String bjlx) {
+        this.bjlx = bjlx == null ? null : bjlx.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;
+    }
+
+    /**
+     * 库ID
+     * @return org_id 库ID
+     */
+    public Integer getOrgId() {
+        return orgId;
+    }
+
+    /**
+     * 库ID
+     * @param orgId 库ID
+     */
+    public void setOrgId(Integer orgId) {
+        this.orgId = orgId;
+    }
+
+    /**
+     * 生成时间
+     * @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;
+    }
+}

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

@@ -0,0 +1,39 @@
+package com.chinaitop.depot.warningAndAlarm.model;
+
+public class StorageRotationWarningWithBLOBs extends StorageRotationWarning {
+    private String remark;
+
+    private String clyj;
+
+    /**
+     * 备注
+     * @return remark 备注
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 备注
+     * @param remark 备注
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * 处理意见
+     * @return clyj 处理意见
+     */
+    public String getClyj() {
+        return clyj;
+    }
+
+    /**
+     * 处理意见
+     * @param clyj 处理意见
+     */
+    public void setClyj(String clyj) {
+        this.clyj = clyj == null ? null : clyj.trim();
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.chinaitop.depot.warningAndAlarm.service;
+
+public interface TimedTaskService {
+
+	/**
+	 * 检查应轮未轮的预警数据并保存
+	 * @throws Exception
+	 */
+	void insertYlwl() throws Exception;
+
+	/**
+	 * 检测达到轮换预警的数据并保存
+	 */
+	void insertLhyj();
+}

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

@@ -0,0 +1,38 @@
+package com.chinaitop.depot.warningAndAlarm.service;
+
+import java.util.List;
+
+import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarning;
+import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningWithBLOBs;
+
+public interface YjbjService {
+
+	/**
+	 * 查询轮换预警列表
+	 * @param orgId 库ID
+	 * @param ch 仓房ID
+	 * @param hwh 货位ID
+	 * @param lspz 粮食品种ID
+	 * @return
+	 * @throws Exception
+	 */
+	public List<StorageRotationWarning> queryLhyjList(Integer orgId, Integer ch, Integer hwh, Integer lspz) throws Exception;
+
+	/**
+	 * 查询应轮未轮报警列表
+	 * @param orgId 库ID
+	 * @param ch 仓房ID
+	 * @param hwh 货位ID
+	 * @param lspz 粮食品种ID
+	 * @return
+	 * @throws Exception
+	 */
+	public List<StorageRotationWarning> queryYlwlList(Integer orgId, Integer ch, Integer hwh, Integer lspz) throws Exception;
+
+	/**
+	 * 更新轮换预警报警数据的处理结果信息
+	 * @param storageRotationWarningWithBLOBs
+	 * @throws Exception
+	 */
+	public void updateDate(StorageRotationWarningWithBLOBs storageRotationWarningWithBLOBs) throws Exception;
+}

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

@@ -0,0 +1,90 @@
+package com.chinaitop.depot.warningAndAlarm.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.warningAndAlarm.mapper.StorageRotationWarningMapper;
+import com.chinaitop.depot.warningAndAlarm.mapper.TimedTaskMapper;
+import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarning;
+import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningExample;
+import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningExample.Criteria;
+import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningWithBLOBs;
+import com.chinaitop.depot.warningAndAlarm.service.TimedTaskService;
+
+@Service
+public class TimedTaskServiceImpl implements TimedTaskService {
+
+	@Resource
+	private TimedTaskMapper timedTaskMapper;
+
+	@Resource
+	private StorageRotationWarningMapper storageRotationWarningMapper;
+
+	@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");
+				if (!k) {//如果有了，那就不在增加了，否则就重复报警了
+					Date date = new Date();
+					s.setScsj(date);
+					s.setClzt("0");
+					s.setUpdatetime(date);
+					storageRotationWarningMapper.insert(s);
+				}
+			}
+		}
+	}
+
+	/**
+	 * 检查一条轮换预警数据是否已经存在
+	 * @param rotationWarning 
+	 * @param bjlx 报警类型(0:轮换预警,1:应轮未轮)
+	 * @return
+	 */
+	private boolean checkData(StorageRotationWarningWithBLOBs rotationWarning, String bjlx) {
+		boolean b = false;
+		StorageRotationWarningExample example = new StorageRotationWarningExample();
+		Criteria criteria = example.createCriteria();
+		criteria.andHwhEqualTo(rotationWarning.getHwh());
+		criteria.andChEqualTo(rotationWarning.getCh());
+		criteria.andZhycrqEqualTo(rotationWarning.getZhycrq());
+		criteria.andBjlxEqualTo(bjlx);
+		List<StorageRotationWarning> list = storageRotationWarningMapper.selectByExample(example);
+		if (null != list && list.size() > 0) {
+			b = true;
+		}
+		return b;
+	}
+
+	@Override
+	public void insertLhyj() {
+
+		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");
+				if (!k) {//如果有了，那就不在增加了，否则就重复报警了
+					Date date = new Date();
+					s.setScsj(date);
+					s.setClzt("0");
+					s.setUpdatetime(date);
+					storageRotationWarningMapper.insert(s);
+				}
+			}
+		}
+	}
+
+}

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

@@ -0,0 +1,88 @@
+package com.chinaitop.depot.warningAndAlarm.service.impl;
+
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.warningAndAlarm.mapper.StorageRotationWarningMapper;
+import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarning;
+import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningExample;
+import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningExample.Criteria;
+import com.chinaitop.depot.warningAndAlarm.model.StorageRotationWarningWithBLOBs;
+import com.chinaitop.depot.warningAndAlarm.service.YjbjService;
+
+@Service
+public class YjbjServiceImpl implements YjbjService {
+
+	@Resource
+	private StorageRotationWarningMapper storageRotationWarningMapper;
+
+	@Override
+	public List<StorageRotationWarning> queryLhyjList(Integer orgId, Integer ch, Integer hwh, Integer lspz)
+			throws Exception {
+
+		StorageRotationWarningExample example = new StorageRotationWarningExample();
+		Criteria criteria = example.createCriteria();
+
+		if (null != orgId) {
+			criteria.andOrgIdEqualTo(orgId); //库ID
+		}
+		if (null != ch) {
+			criteria.andChEqualTo(ch);  //仓房ID
+		}
+		if (null != hwh) {
+			criteria.andHwhEqualTo(hwh);  //货位ID
+		}
+		if (null != lspz) {
+			criteria.andLspzEqualTo(lspz);  //粮食品种ID
+		}
+
+		criteria.andBjlxEqualTo("0"); //查询轮换预警的数据
+
+		example.setOrderByClause("scsj desc"); //按照数据的生成时间倒序排序
+
+		List<StorageRotationWarning> list = storageRotationWarningMapper.selectByExample(example);
+
+		return list;
+	}
+
+	@Override
+	public List<StorageRotationWarning> queryYlwlList(Integer orgId, Integer ch, Integer hwh, Integer lspz)
+			throws Exception {
+
+		StorageRotationWarningExample example = new StorageRotationWarningExample();
+		Criteria criteria = example.createCriteria();
+
+		if (null != orgId) {
+			criteria.andOrgIdEqualTo(orgId); //库ID
+		}
+		if (null != ch) {
+			criteria.andChEqualTo(ch);  //仓房ID
+		}
+		if (null != hwh) {
+			criteria.andHwhEqualTo(hwh);  //货位ID
+		}
+		if (null != lspz) {
+			criteria.andLspzEqualTo(lspz);  //粮食品种ID
+		}
+
+		criteria.andBjlxEqualTo("1"); //查询应轮未轮报警的数据
+
+		example.setOrderByClause("scsj desc"); //按照数据的生成时间倒序排序
+
+		List<StorageRotationWarning> list = storageRotationWarningMapper.selectByExample(example);
+
+		return list;
+	}
+
+	@Override
+	public void updateDate(StorageRotationWarningWithBLOBs storageRotationWarningWithBLOBs) throws Exception {
+		storageRotationWarningWithBLOBs.setUpdatetime(new Date());
+		storageRotationWarningWithBLOBs.setClzt("1"); //设置为已处理
+		storageRotationWarningMapper.updateByPrimaryKeyWithBLOBs(storageRotationWarningWithBLOBs);
+	}
+
+}

src/main/resources/generatorConfig.xml

@@ -13,10 +13,10 @@
 		
 		<!--数据库连接的信息：驱动类、连接地址、用户名、密码 -->
 		<jdbcConnection 
-			driverClass="com.gbasedbt.jdbc.IfxDriver"
-			connectionURL="jdbc:gbasedbt-sqli://101.36.160.140:19089/base:INFORMIXSERVER=ol_gbasedbt1210;NEWCODESET=GB18030,GB18030-2000,5488;DB_LOCALE=zh_cn.GB18030-2000;GL_USEGLU=1;IFX_USE_STRENC=true;characterEncoding=utf8" 
-			userId="gbasedbt"
-			password="cDbK2S0go8">
+			driverClass="com.mysql.jdbc.Driver"
+			connectionURL="jdbc:mysql://172.16.0.36:3306/depot_qh?useUnicode=true&amp;characterEncoding=utf-8" 
+			userId="root"
+			password="admin@1234">
 		</jdbcConnection>
 		
 		<!-- 默认false，把JDBC DECIMAL 和 NUMERIC 类型解析为 Integer，为 true时把JDBC DECIMAL 和 
@@ -26,7 +26,7 @@
 		</javaTypeResolver>
 
 		<!-- targetProject:生成PO类的位置 -->
-		<javaModelGenerator targetPackage="com.chinaitop.depot.sptData.model"
+		<javaModelGenerator targetPackage="com.chinaitop.depot.warningAndAlarm.model"
 			targetProject=".\src\main\java">
 			<!-- enableSubPackages:是否让schema作为包的后缀 -->
 			<property name="enableSubPackages" value="false" />
@@ -35,7 +35,7 @@
 		</javaModelGenerator>
 		
         <!-- targetProject:mapper映射文件生成的位置 -->
-		<sqlMapGenerator targetPackage="com.chinaitop.depot.sptData.mapper" 
+		<sqlMapGenerator targetPackage="com.chinaitop.depot.warningAndAlarm.mapper" 
 			targetProject=".\src\main\java">
 			<!-- enableSubPackages:是否让schema作为包的后缀 -->
 			<property name="enableSubPackages" value="false" />
@@ -43,13 +43,13 @@
 		
 		<!-- targetPackage：mapper接口生成的位置 -->
 		<javaClientGenerator type="XMLMAPPER"
-			targetPackage="com.chinaitop.depot.sptData.mapper" 
+			targetPackage="com.chinaitop.depot.warningAndAlarm.mapper" 
 			targetProject=".\src\main\java">
 			<!-- enableSubPackages:是否让schema作为包的后缀 -->
 			<property name="enableSubPackages" value="false" />
 		</javaClientGenerator>
 		
 		<!-- 指定要反向生成的数据库表 -->
-		<table schema="" tableName="ty_chubeilyynbao"></table>
+		<table schema="" tableName="storage_rotation_warning"></table>
 	</context>
 </generatorConfiguration>