通风 增加记录

src/main/java/com/chinaitop/depot/intelligent/ventilation/controller/AerationRecordController.java

@@ -47,13 +47,13 @@ public class AerationRecordController {
             @ApiImplicitParam(name = "vDevKindCode", value = "设备类型", paramType = "query"),
             @ApiImplicitParam(name = "vCfCode", value = "仓库名称", paramType = "query")
     })
-    public ResponseEntity<PageInfo<TVentilation>> getList(Integer pageNum, Integer pageSize, String vCfCode, String vDevKindCode) {
+    public ResponseEntity<PageInfo<TVentilation>> getList(Integer pageNum, Integer pageSize, String vCfCode, String vDevKindCode,String type) {
         List<TVentilation> list = null;
         try {
             if (null != pageNum && null != pageSize) {
                 PageHelper.startPage(pageNum, pageSize);
             }
-            list = aerationRecordService.getList(vCfCode, vDevKindCode);
+            list = aerationRecordService.getList(vCfCode, vDevKindCode,type);
         } catch (Exception e) {
             e.printStackTrace();
             ResponseEntity.failed(e.getMessage());
@@ -137,4 +137,53 @@ public class AerationRecordController {
         return ResponseEntity.ok(tVentilation);
     }
 
+    
+    @RequestMapping(value = "/add", produces = MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.POST)
+    @ApiOperation(value = "数据更新与添加", notes = "数据更新与添加")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "tVentilationJson", value = "表数据json串", paramType = "form")
+    })
+    public ResponseEntity add(String tVentilationJson,Integer orgId) {
+        try {
+        	aerationRecordService.add(tVentilationJson,orgId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            ResponseEntity.failed(e.getMessage());
+        }
+        return ResponseEntity.ok();
+    }
+    
+    
+    @RequestMapping(value = "/deleteById", method = RequestMethod.POST)
+    @ApiOperation(value = "根据粮情id删除信息", notes = "根据粮情id删除信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "粮情id", paramType = "query"),
+            @ApiImplicitParam(name = "aerationParamJson", value = "通风参数json字符串", paramType = "query")
+    })
+    public ResponseEntity deleteById(String id) {
+        if (StringUtils.isNotBlank(id)) {
+            int count = aerationRecordService.deleteById(id);
+            if (count > 0) {
+                return ResponseEntity.ok();
+            } else {
+                return ResponseEntity.failed("删除失败!");
+            }
+        }
+        return ResponseEntity.failed("ID数据有误!");
+    }
+    
+    @RequestMapping(value = "/getById", method = RequestMethod.POST)
+    @ApiOperation(value = "根据id查询信息", notes = "根据id查询信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "id", value = "id", paramType = "query")
+    })
+    public ResponseEntity<TVentilation> getById(String id) {
+    	TVentilation tVentilation = null;
+        if (StringUtils.isNotBlank(id)) {
+        	tVentilation = aerationRecordService.getById(id);
+        } else {
+            return ResponseEntity.failed("ID数据有误!");
+        }
+        return ResponseEntity.ok(tVentilation);
+    }
 }

src/main/java/com/chinaitop/depot/intelligent/ventilation/controller/KcswController.java

@@ -0,0 +1,45 @@
+package com.chinaitop.depot.intelligent.ventilation.controller;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.http.MediaType;
+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.intelligent.ventilation.model.DataKcglKcswDefault;
+import com.chinaitop.depot.intelligent.ventilation.service.KcswService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+
+@RestController
+@RequestMapping(value="/agile/kcsw")
+@Api(value= "KcswController", description = "库存实物控制类")
+public class KcswController {
+
+	@Resource
+	private KcswService kcswService;
+	
+	
+	
+	/**
+	 * 销售计划 查询当前组织的库存信息
+	 */
+	@RequestMapping(value="/queryKcData",produces=MediaType.APPLICATION_JSON_VALUE, method = RequestMethod.GET)
+	@ApiOperation(value="查询当前组织的库存信息", notes = "查询当前组织的库存信息")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "orgId", value = "登录对象", paramType = "form")
+	})
+	public List<DataKcglKcswDefault> queryKcData(Integer orgId, String houseId, String warehouseId){
+		return kcswService.queryKcData(orgId,houseId,warehouseId);
+	}
+
+	
+	
+
+}

src/main/java/com/chinaitop/depot/intelligent/ventilation/mapper/DataKcglKcswDefaultMapper.java

@@ -0,0 +1,15 @@
+package com.chinaitop.depot.intelligent.ventilation.mapper;
+
+
+import java.util.List;
+
+
+import com.chinaitop.depot.intelligent.ventilation.model.DataKcglKcswDefault;
+import com.chinaitop.depot.intelligent.ventilation.model.DataKcglKcswDefaultExample;
+
+public interface DataKcglKcswDefaultMapper {
+
+    List<DataKcglKcswDefault> selectByExample(DataKcglKcswDefaultExample example);
+
+    
+}

src/main/java/com/chinaitop/depot/intelligent/ventilation/mapper/DataKcglKcswDefaultMapper.xml

@@ -0,0 +1,103 @@
+<?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.intelligent.ventilation.mapper.DataKcglKcswDefaultMapper">
+  <resultMap id="BaseResultMap" type="com.chinaitop.depot.intelligent.ventilation.model.DataKcglKcswDefault">
+    <id column="DataID" jdbcType="CHAR" property="dataid" />
+    <result column="UnitID" jdbcType="CHAR" property="unitid" />
+    <result column="PeriodID" jdbcType="CHAR" property="periodid" />
+    <result column="RoundID" jdbcType="TINYINT" property="roundid" />
+    <result column="ModifyDate" jdbcType="TIMESTAMP" property="modifydate" />
+    <result column="builder" jdbcType="CHAR" property="builder" />
+    <result column="lkmc" jdbcType="VARCHAR" property="lkmc" />
+    <result column="lkbm" jdbcType="VARCHAR" property="lkbm" />
+    <result column="hwxz" jdbcType="CHAR" property="hwxz" />
+    <result column="ch" jdbcType="INTEGER" property="ch" />
+    <result column="hwh" jdbcType="INTEGER" property="hwh" />
+    <result column="pz" jdbcType="CHAR" property="pz" />
+    <result column="mxpz" jdbcType="CHAR" property="mxpz" />
+    <result column="dj" jdbcType="CHAR" property="dj" />
+    <result column="rq" jdbcType="TIMESTAMP" property="rq" />
+    <result column="wjh" jdbcType="VARCHAR" property="wjh" />
+    <result column="kcsl" jdbcType="DOUBLE" property="kcsl" />
+    <result column="cjsj" jdbcType="TIMESTAMP" property="cjsj" />
+  </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">
+    DataID, UnitID, PeriodID, RoundID, ModifyDate, builder, lkmc, lkbm, hwxz, ch, hwh, 
+    pz, mxpz, dj, rq, wjh, kcsl, cjsj
+  </sql>
+  
+  <select id="selectByExample" parameterType="com.chinaitop.depot.intelligent.ventilation.model.DataKcglKcswDefaultExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from lsreport_ts.data_kcgl_kcsw_default
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  
+  
+</mapper>

src/main/java/com/chinaitop/depot/intelligent/ventilation/mapper/TJobApplicationMapper.xml

@@ -132,7 +132,7 @@
     aeration_target, state, remark, packingmode, max_ater, min_water, avg_water, areation_plan_number, 
     org_id, updatetime, ldkxd, tflx, fwlx, fwszfs, zfdjmj, fwkkl, kqtjb, tfkszgs, tfjxh, 
     tfjts, dtfjedqy, dtfjedfl, dtfjedgl, sffs, dtfjscfl, dtfjzgl, zfl, dwtfl, scxtzl, 
-    tfzyfzr
+    tfzyfzr,tfzyry
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.intelligent.ventilation.model.TJobApplicationExample" >
     <!--
@@ -202,7 +202,7 @@
       tfjts, dtfjedqy, dtfjedfl, 
       dtfjedgl, sffs, dtfjscfl, 
       dtfjzgl, zfl, dwtfl, 
-      scxtzl, tfzyfzr)
+      scxtzl, tfzyfzr,tfzyry)
     values (#{id,jdbcType=VARCHAR}, #{vCfCode,jdbcType=VARCHAR}, #{aid,jdbcType=VARCHAR}, 
       #{applyPerson,jdbcType=VARCHAR}, #{applyTime,jdbcType=TIMESTAMP}, #{testTime,jdbcType=TIMESTAMP}, 
       #{endTime,jdbcType=TIMESTAMP}, #{ventilationMode,jdbcType=VARCHAR}, #{aerationTarget,jdbcType=VARCHAR}, 
@@ -215,7 +215,7 @@
       #{tfjts,jdbcType=VARCHAR}, #{dtfjedqy,jdbcType=VARCHAR}, #{dtfjedfl,jdbcType=VARCHAR}, 
       #{dtfjedgl,jdbcType=VARCHAR}, #{sffs,jdbcType=VARCHAR}, #{dtfjscfl,jdbcType=VARCHAR}, 
       #{dtfjzgl,jdbcType=VARCHAR}, #{zfl,jdbcType=VARCHAR}, #{dwtfl,jdbcType=VARCHAR}, 
-      #{scxtzl,jdbcType=VARCHAR}, #{tfzyfzr,jdbcType=VARCHAR})
+      #{scxtzl,jdbcType=VARCHAR}, #{tfzyfzr,jdbcType=VARCHAR},#{tfzyry,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.intelligent.ventilation.model.TJobApplication" >
     <!--
@@ -339,6 +339,9 @@
       <if test="tfzyfzr != null" >
         tfzyfzr,
       </if>
+      <if test="tfzyry != null" >
+        tfzyry,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -590,6 +593,9 @@
       <if test="record.tfzyfzr != null" >
         tfzyfzr = #{record.tfzyfzr,jdbcType=VARCHAR},
       </if>
+      <if test="record.tfzyry != null" >
+        tfzyfzr = #{record.tfzyry,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -639,7 +645,8 @@
       zfl = #{record.zfl,jdbcType=VARCHAR},
       dwtfl = #{record.dwtfl,jdbcType=VARCHAR},
       scxtzl = #{record.scxtzl,jdbcType=VARCHAR},
-      tfzyfzr = #{record.tfzyfzr,jdbcType=VARCHAR}
+      tfzyfzr = #{record.tfzyfzr,jdbcType=VARCHAR},
+      tfzyry = #{record.tfzyry,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -763,6 +770,9 @@
       <if test="tfzyfzr != null" >
         tfzyfzr = #{tfzyfzr,jdbcType=VARCHAR},
       </if>
+      <if test="tfzyry != null" >
+        tfzyry = #{tfzyry,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -809,7 +819,8 @@
       zfl = #{zfl,jdbcType=VARCHAR},
       dwtfl = #{dwtfl,jdbcType=VARCHAR},
       scxtzl = #{scxtzl,jdbcType=VARCHAR},
-      tfzyfzr = #{tfzyfzr,jdbcType=VARCHAR}
+      tfzyfzr = #{tfzyfzr,jdbcType=VARCHAR},
+      tfzyry = #{tfzyry,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
   

src/main/java/com/chinaitop/depot/intelligent/ventilation/mapper/TVentilationMapper.xml

@@ -43,7 +43,7 @@
     <result column="jshpjlw" property="jshpjlw" jdbcType="VARCHAR" />
     <result column="jwfd" property="jwfd" jdbcType="VARCHAR" />
     <result column="dljwnh" property="dljwnh" jdbcType="VARCHAR" />
-    <result column="ssl" property="ssl" jdbcType="VARCHAR" />
+    <result column="sslssl" property="sslssl" jdbcType="VARCHAR" />
     <result column="bsxgpjjg" property="bsxgpjjg" jdbcType="VARCHAR" />
     <result column="tfjwjyxpjzc" property="tfjwjyxpjzc" jdbcType="VARCHAR" />
     <result column="tfjwjyxpjsc" property="tfjwjyxpjsc" jdbcType="VARCHAR" />
@@ -136,7 +136,7 @@
     v_end_time, v_distinguish_state, v_state, v_update_person, data_source, v_update_time, 
     updatetime, zhdl, zydyjdqw, zydyjdpjqs, zydyjdtfqpjlw, zydyjdzysc, zydejdqw, zydejdpjqs, 
     zydejdtfqpjlw, zydejdzysc, zydsjdqw, zydsjdpjqs, zydsjdtfqpjlw, zydsjdzysc, zydsijdqw, 
-    zydsijdpjqs, zydsijdtfqpjlw, zydsijdzysc, zyqpjlw, jshpjlw, jwfd, dljwnh, ssl, bsxgpjjg, 
+    zydsijdpjqs, zydsijdtfqpjlw, zydsijdzysc, zyqpjlw, jshpjlw, jwfd, dljwnh, sslssl, bsxgpjjg, 
     tfjwjyxpjzc, tfjwjyxpjsc, tfjwjyxpjzjc, tfjwjyxpjxc, zyqpjsf, zyhpjsf, jsfd, dljsnh, 
     tfjsjyxfxzc, tfjsjyxfxsc, tfjsjyxfxzjc, tfjsjyxfxxc
   </sql>
@@ -208,7 +208,7 @@
       zydsjdzysc, zydsijdqw, zydsijdpjqs, 
       zydsijdtfqpjlw, zydsijdzysc, zyqpjlw, 
       jshpjlw, jwfd, dljwnh, 
-      ssl, bsxgpjjg, tfjwjyxpjzc, 
+      sslssl, bsxgpjjg, tfjwjyxpjzc, 
       tfjwjyxpjsc, tfjwjyxpjzjc, tfjwjyxpjxc, 
       zyqpjsf, zyhpjsf, jsfd, 
       dljsnh, tfjsjyxfxzc, tfjsjyxfxsc, 
@@ -225,7 +225,7 @@
       #{zydsjdzysc,jdbcType=VARCHAR}, #{zydsijdqw,jdbcType=VARCHAR}, #{zydsijdpjqs,jdbcType=VARCHAR}, 
       #{zydsijdtfqpjlw,jdbcType=VARCHAR}, #{zydsijdzysc,jdbcType=VARCHAR}, #{zyqpjlw,jdbcType=VARCHAR}, 
       #{jshpjlw,jdbcType=VARCHAR}, #{jwfd,jdbcType=VARCHAR}, #{dljwnh,jdbcType=VARCHAR}, 
-      #{ssl,jdbcType=VARCHAR}, #{bsxgpjjg,jdbcType=VARCHAR}, #{tfjwjyxpjzc,jdbcType=VARCHAR}, 
+      #{sslssl,jdbcType=VARCHAR}, #{bsxgpjjg,jdbcType=VARCHAR}, #{tfjwjyxpjzc,jdbcType=VARCHAR}, 
       #{tfjwjyxpjsc,jdbcType=VARCHAR}, #{tfjwjyxpjzjc,jdbcType=VARCHAR}, #{tfjwjyxpjxc,jdbcType=VARCHAR}, 
       #{zyqpjsf,jdbcType=VARCHAR}, #{zyhpjsf,jdbcType=VARCHAR}, #{jsfd,jdbcType=VARCHAR}, 
       #{dljsnh,jdbcType=VARCHAR}, #{tfjsjyxfxzc,jdbcType=VARCHAR}, #{tfjsjyxfxsc,jdbcType=VARCHAR}, 
@@ -347,8 +347,8 @@
       <if test="dljwnh != null" >
         dljwnh,
       </if>
-      <if test="ssl != null" >
-        ssl,
+      <if test="sslssl != null" >
+        sslssl,
       </if>
       <if test="bsxgpjjg != null" >
         bsxgpjjg,
@@ -499,8 +499,8 @@
       <if test="dljwnh != null" >
         #{dljwnh,jdbcType=VARCHAR},
       </if>
-      <if test="ssl != null" >
-        #{ssl,jdbcType=VARCHAR},
+      <if test="sslssl != null" >
+        #{sslssl,jdbcType=VARCHAR},
       </if>
       <if test="bsxgpjjg != null" >
         #{bsxgpjjg,jdbcType=VARCHAR},
@@ -670,8 +670,8 @@
       <if test="record.dljwnh != null" >
         dljwnh = #{record.dljwnh,jdbcType=VARCHAR},
       </if>
-      <if test="record.ssl != null" >
-        ssl = #{record.ssl,jdbcType=VARCHAR},
+      <if test="record.sslssl != null" >
+        sslssl = #{record.sslssl,jdbcType=VARCHAR},
       </if>
       <if test="record.bsxgpjjg != null" >
         bsxgpjjg = #{record.bsxgpjjg,jdbcType=VARCHAR},
@@ -760,7 +760,7 @@
       jshpjlw = #{record.jshpjlw,jdbcType=VARCHAR},
       jwfd = #{record.jwfd,jdbcType=VARCHAR},
       dljwnh = #{record.dljwnh,jdbcType=VARCHAR},
-      ssl = #{record.ssl,jdbcType=VARCHAR},
+      sslssl = #{record.sslssl,jdbcType=VARCHAR},
       bsxgpjjg = #{record.bsxgpjjg,jdbcType=VARCHAR},
       tfjwjyxpjzc = #{record.tfjwjyxpjzc,jdbcType=VARCHAR},
       tfjwjyxpjsc = #{record.tfjwjyxpjsc,jdbcType=VARCHAR},
@@ -891,8 +891,8 @@
       <if test="dljwnh != null" >
         dljwnh = #{dljwnh,jdbcType=VARCHAR},
       </if>
-      <if test="ssl != null" >
-        ssl = #{ssl,jdbcType=VARCHAR},
+      <if test="sslssl != null" >
+        sslssl = #{sslssl,jdbcType=VARCHAR},
       </if>
       <if test="bsxgpjjg != null" >
         bsxgpjjg = #{bsxgpjjg,jdbcType=VARCHAR},
@@ -978,7 +978,7 @@
       jshpjlw = #{jshpjlw,jdbcType=VARCHAR},
       jwfd = #{jwfd,jdbcType=VARCHAR},
       dljwnh = #{dljwnh,jdbcType=VARCHAR},
-      ssl = #{ssl,jdbcType=VARCHAR},
+      sslssl = #{sslssl,jdbcType=VARCHAR},
       bsxgpjjg = #{bsxgpjjg,jdbcType=VARCHAR},
       tfjwjyxpjzc = #{tfjwjyxpjzc,jdbcType=VARCHAR},
       tfjwjyxpjsc = #{tfjwjyxpjsc,jdbcType=VARCHAR},

src/main/java/com/chinaitop/depot/intelligent/ventilation/model/DataKcglKcswDefault.java

@@ -0,0 +1,340 @@
+package com.chinaitop.depot.intelligent.ventilation.model;
+
+import java.util.Date;
+
+public class DataKcglKcswDefault {
+    private String dataid;
+
+    private String unitid;
+
+    private String periodid;
+
+    private Byte roundid;
+
+    private Date modifydate;
+
+    private String builder;
+
+    private String lkmc;
+
+    private String lkbm;
+
+    private String hwxz;
+
+    private String ch;
+
+    private String hwh;
+
+    private String pz;
+
+    private String mxpz;
+
+    private String dj;
+
+    private Date rq;
+
+    private String wjh;
+
+    private Double kcsl;
+
+    private Date cjsj;
+
+    /**
+     * 数据记录ID
+     * @return DataID 数据记录ID
+     */
+    public String getDataid() {
+        return dataid;
+    }
+
+    /**
+     * 数据记录ID
+     * @param dataid 数据记录ID
+     */
+    public void setDataid(String dataid) {
+        this.dataid = dataid == null ? null : dataid.trim();
+    }
+
+    /**
+     * 单位ID
+     * @return UnitID 单位ID
+     */
+    public String getUnitid() {
+        return unitid;
+    }
+
+    /**
+     * 单位ID
+     * @param unitid 单位ID
+     */
+    public void setUnitid(String unitid) {
+        this.unitid = unitid == null ? null : unitid.trim();
+    }
+
+    /**
+     * 期间ID
+     * @return PeriodID 期间ID
+     */
+    public String getPeriodid() {
+        return periodid;
+    }
+
+    /**
+     * 期间ID
+     * @param periodid 期间ID
+     */
+    public void setPeriodid(String periodid) {
+        this.periodid = periodid == null ? null : periodid.trim();
+    }
+
+    /**
+     * 舍位ID
+     * @return RoundID 舍位ID
+     */
+    public Byte getRoundid() {
+        return roundid;
+    }
+
+    /**
+     * 舍位ID
+     * @param roundid 舍位ID
+     */
+    public void setRoundid(Byte roundid) {
+        this.roundid = roundid;
+    }
+
+    /**
+     * 最后一次编辑时间
+     * @return ModifyDate 最后一次编辑时间
+     */
+    public Date getModifydate() {
+        return modifydate;
+    }
+
+    /**
+     * 最后一次编辑时间
+     * @param modifydate 最后一次编辑时间
+     */
+    public void setModifydate(Date modifydate) {
+        this.modifydate = modifydate;
+    }
+
+    /**
+     * 条目创建人
+     * @return builder 条目创建人
+     */
+    public String getBuilder() {
+        return builder;
+    }
+
+    /**
+     * 条目创建人
+     * @param builder 条目创建人
+     */
+    public void setBuilder(String builder) {
+        this.builder = builder == null ? null : builder.trim();
+    }
+
+    /**
+     * 粮库名称
+     * @return lkmc 粮库名称
+     */
+    public String getLkmc() {
+        return lkmc;
+    }
+
+    /**
+     * 粮库名称
+     * @param lkmc 粮库名称
+     */
+    public void setLkmc(String lkmc) {
+        this.lkmc = lkmc == null ? null : lkmc.trim();
+    }
+
+    /**
+     * 粮库编码
+     * @return lkbm 粮库编码
+     */
+    public String getLkbm() {
+        return lkbm;
+    }
+
+    /**
+     * 粮库编码
+     * @param lkbm 粮库编码
+     */
+    public void setLkbm(String lkbm) {
+        this.lkbm = lkbm == null ? null : lkbm.trim();
+    }
+
+    /**
+     * 货物性质
+     * @return hwxz 货物性质
+     */
+    public String getHwxz() {
+        return hwxz;
+    }
+
+    /**
+     * 货物性质
+     * @param hwxz 货物性质
+     */
+    public void setHwxz(String hwxz) {
+        this.hwxz = hwxz == null ? null : hwxz.trim();
+    }
+
+    /**
+     * 仓号ID
+     * @return ch 仓号ID
+     */
+    public String getCh() {
+        return ch;
+    }
+
+    /**
+     * 仓号ID
+     * @param ch 仓号ID
+     */
+    public void setCh(String ch) {
+        this.ch = ch == null ? null : ch.trim();
+    }
+
+    /**
+     * 货位号ID
+     * @return hwh 货位号ID
+     */
+    public String getHwh() {
+        return hwh;
+    }
+
+    /**
+     * 货位号ID
+     * @param hwh 货位号ID
+     */
+    public void setHwh(String hwh) {
+        this.hwh = hwh == null ? null : hwh.trim();
+    }
+
+    /**
+     * 品种
+     * @return pz 品种
+     */
+    public String getPz() {
+        return pz;
+    }
+
+    /**
+     * 品种
+     * @param pz 品种
+     */
+    public void setPz(String pz) {
+        this.pz = pz == null ? null : pz.trim();
+    }
+
+    /**
+     * 明细品种
+     * @return mxpz 明细品种
+     */
+    public String getMxpz() {
+        return mxpz;
+    }
+
+    /**
+     * 明细品种
+     * @param mxpz 明细品种
+     */
+    public void setMxpz(String mxpz) {
+        this.mxpz = mxpz == null ? null : mxpz.trim();
+    }
+
+    /**
+     * 等级
+     * @return dj 等级
+     */
+    public String getDj() {
+        return dj;
+    }
+
+    /**
+     * 等级
+     * @param dj 等级
+     */
+    public void setDj(String dj) {
+        this.dj = dj == null ? null : dj.trim();
+    }
+
+    /**
+     * 日期
+     * @return rq 日期
+     */
+    public Date getRq() {
+        return rq;
+    }
+
+    /**
+     * 日期
+     * @param rq 日期
+     */
+    public void setRq(Date rq) {
+        this.rq = rq;
+    }
+
+    /**
+     * 文件号ID
+     * @return wjh 文件号ID
+     */
+    public String getWjh() {
+        return wjh;
+    }
+
+    /**
+     * 文件号ID
+     * @param wjh 文件号ID
+     */
+    public void setWjh(String wjh) {
+        this.wjh = wjh == null ? null : wjh.trim();
+    }
+
+    /**
+     * 库存数量
+     * @return kcsl 库存数量
+     */
+    public Double getKcsl() {
+        return kcsl;
+    }
+
+    /**
+     * 库存数量
+     * @param kcsl 库存数量
+     */
+    public void setKcsl(Double kcsl) {
+        this.kcsl = kcsl;
+    }
+
+    /**
+     * 创建时间
+     * @return cjsj 创建时间
+     */
+    public Date getCjsj() {
+        return cjsj;
+    }
+
+    /**
+     * 创建时间
+     * @param cjsj 创建时间
+     */
+    public void setCjsj(Date cjsj) {
+        this.cjsj = cjsj;
+    }
+    
+    private String scnf; //生产年份
+
+	public String getScnf() {
+		return scnf;
+	}
+
+	public void setScnf(String scnf) {
+		this.scnf = scnf;
+	}
+
+}

src/main/java/com/chinaitop/depot/intelligent/ventilation/model/TJobApplication.java

@@ -7,7 +7,19 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 
 public class TJobApplication {
-    /**
+	
+	//手动增加 通风作业人员
+	private String tfzyry;
+	
+    public String getTfzyry() {
+		return tfzyry;
+	}
+
+	public void setTfzyry(String tfzyry) {
+		this.tfzyry = tfzyry;
+	}
+
+	/**
      * This field was generated by MyBatis Generator.
      * This field corresponds to the database column t_job_application.id
      *
@@ -152,6 +164,7 @@ public class TJobApplication {
      *
      * @mbggenerated Tue Jun 09 10:55:51 CST 2020
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date updatetime;
 
     /**

src/main/java/com/chinaitop/depot/intelligent/ventilation/model/TVentilation.java

@@ -2,6 +2,8 @@ package com.chinaitop.depot.intelligent.ventilation.model;
 
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+
 public class TVentilation {
     /**
      * This field was generated by MyBatis Generator.
@@ -121,6 +123,7 @@ public class TVentilation {
      *
      * @mbggenerated Tue Jun 09 10:55:51 CST 2020
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone="GMT+8")
     private Date updatetime;
 
     /**
@@ -293,11 +296,11 @@ public class TVentilation {
 
     /**
      * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column t_ventilation.ssl
+     * This field corresponds to the database column t_ventilation.sslssl
      *
      * @mbggenerated Tue Jun 09 10:55:51 CST 2020
      */
-    private String ssl;
+    private String sslssl;
 
     /**
      * This field was generated by MyBatis Generator.
@@ -1275,20 +1278,20 @@ public class TVentilation {
      *
      * @mbggenerated Tue Jun 09 10:55:51 CST 2020
      */
-    public String getSsl() {
-        return ssl;
+    public String getSslssl() {
+        return sslssl;
     }
 
     /**
      * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column t_ventilation.ssl
+     * This method sets the value of the database column t_ventilation.sslssl
      *
-     * @param ssl the value for t_ventilation.ssl
+     * @param sslssl the value for t_ventilation.sslssl
      *
      * @mbggenerated Tue Jun 09 10:55:51 CST 2020
      */
-    public void setSsl(String ssl) {
-        this.ssl = ssl == null ? null : ssl.trim();
+    public void setSslssl(String sslssl) {
+        this.sslssl = sslssl == null ? null : sslssl.trim();
     }
 
     /**

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/AerationRecordService.java

@@ -8,7 +8,7 @@ import java.util.Date;
 import java.util.List;
 
 public interface AerationRecordService {
-    List<TVentilation> getList(String vCfCode, String vDevKindCode);
+    List<TVentilation> getList(String vCfCode, String vDevKindCode,String type);
 
 	void save(TCtldevinfo tCtldevinfo, String aerationTaskControl, Integer orgId);
 
@@ -20,4 +20,10 @@ public interface AerationRecordService {
 	 
     List<TVentilation> getByCodeAndTimes(List<String> cDcsCodes,List<Date> cTimes);
 
+	void add(String tVentilationJson, Integer orgId);
+
+	int deleteById(String id);
+
+	TVentilation getById(String id);
+
 }

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/KcswService.java

@@ -0,0 +1,19 @@
+package com.chinaitop.depot.intelligent.ventilation.service;
+
+import java.util.List;
+
+import com.chinaitop.depot.intelligent.ventilation.model.DataKcglKcswDefault;
+
+
+public interface KcswService {
+	
+
+	/**
+	 * 根据orgId查询库存数量
+	 * @param orgId
+	 * @return
+	 */
+	List<DataKcglKcswDefault> queryKcData(Integer orgId, String houseId, String warehouseId);
+
+
+}

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/impl/AerationRecordServiceImpl.java

@@ -36,7 +36,7 @@ public class AerationRecordServiceImpl implements AerationRecordService {
    
 
     @Override
-    public List<TVentilation> getList(String vCfCode, String vDevKindCode) {
+    public List<TVentilation> getList(String vCfCode, String vDevKindCode,String type) {
     	TVentilationExample tVentilationExample = new TVentilationExample();
     	tVentilationExample.setDistinct(true);
     	TVentilationExample.Criteria criteria = tVentilationExample.createCriteria();
@@ -46,6 +46,9 @@ public class AerationRecordServiceImpl implements AerationRecordService {
         if (StringUtils.isNotEmpty(vDevKindCode)) {
         	criteria.andVDeviceCodeEqualTo(vDevKindCode);
         }
+        if(type!=null && type.equals("0")){
+        	criteria.andVDevNameEqualTo("0");//手动增加的记录
+        }
         tVentilationExample.setOrderByClause("v_update_time desc");
         return tVentilationMapper.selectByExample(tVentilationExample);
     }
@@ -238,4 +241,39 @@ public class AerationRecordServiceImpl implements AerationRecordService {
 
 
 
+	@Override
+	public void add(String tVentilationJson, Integer orgId) {
+		// TODO Auto-generated method stub
+		if (StringUtils.isNotBlank(tVentilationJson)) {
+			TVentilation tVentilation = (TVentilation) JsonToObjectUtils.jsonToObject(tVentilationJson, "com.chinaitop.depot.intelligent.ventilation.model.TVentilation");
+			
+			if (StringUtils.isNotBlank(tVentilation.getId())) {
+				tVentilationMapper.updateByPrimaryKey(tVentilation);
+            } else {
+            	tVentilation.setId(UuidUtils.getCode());
+            	tVentilation.setvDevName("0");//只是记录 作业前后的温湿度  不是设备通风的记录
+            	tVentilationMapper.insert(tVentilation);
+            }
+        }
+	}
+
+
+
+	@Override
+	public int deleteById(String id) {
+		// TODO Auto-generated method stub
+		int i = tVentilationMapper.deleteByPrimaryKey(id);
+		return i;
+	}
+
+
+
+	@Override
+	public TVentilation getById(String id) {
+		// TODO Auto-generated method stub
+		return tVentilationMapper.selectByPrimaryKey(id);
+	}
+
+
+
 }

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/impl/AerationTaskServiceImpl.java

@@ -40,13 +40,17 @@ public class AerationTaskServiceImpl implements AerationTaskService {
         if(tJobApplication.getvCfCode()!=null){
         	criteria.andVCfCodeEqualTo(tJobApplication.getvCfCode());
         }
-        if(userId!=null){
-        	criteria.andAidEqualTo(String.valueOf(userId));
-        }
-        if(approvalState==4){//审批结束：4
-        	criteria.andStateEqualTo(4);
+        if(tJobApplication.getAreationPlanNumber()!=null){ //通风记录新增时 ，只通过计划编号获取仓房编号，不做其他操作
+        	criteria.andAreationPlanNumberEqualTo(tJobApplication.getAreationPlanNumber());
         }else{
-        	criteria.andStateNotEqualTo(4);
+        	if(userId!=null){
+        		criteria.andAidEqualTo(String.valueOf(userId));
+        	}
+        	if(null != approvalState && approvalState==4){//审批结束：4
+        		criteria.andStateEqualTo(4);
+        	}else{
+        		criteria.andStateNotEqualTo(4);
+        	}
         }
         tJobApplicationExample.setOrderByClause("apply_time desc");
         return tJobApplicationMapper.selectByExample(tJobApplicationExample);

src/main/java/com/chinaitop/depot/intelligent/ventilation/service/impl/KcswServiceImpl.java

@@ -0,0 +1,53 @@
+package com.chinaitop.depot.intelligent.ventilation.service.impl;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
+import com.chinaitop.depot.intelligent.ventilation.mapper.DataKcglKcswDefaultMapper;
+import com.chinaitop.depot.intelligent.ventilation.model.DataKcglKcswDefault;
+import com.chinaitop.depot.intelligent.ventilation.model.DataKcglKcswDefaultExample;
+import com.chinaitop.depot.intelligent.ventilation.model.DataKcglKcswDefaultExample.Criteria;
+import com.chinaitop.depot.intelligent.ventilation.service.KcswService;
+
+@Service
+public class KcswServiceImpl implements KcswService{
+
+	@Resource
+	private DataKcglKcswDefaultMapper dataKcglKcswDefaultMapper;
+
+	
+	/**
+	 * 根据orgId查询库存数量
+	 */
+	@Override
+	public List<DataKcglKcswDefault> queryKcData(Integer orgId, String houseId, String warehouseId) {
+		// TODO Auto-generated method stub
+		DataKcglKcswDefaultExample example = new DataKcglKcswDefaultExample();
+        Criteria createCriteria = example.createCriteria();
+        if(warehouseId!=null && warehouseId.equals("0")){//油料(仓房号和货位号是一样的)(品种是油的，7031,7036)
+        	if(orgId!=null){
+        		createCriteria.andUnitidEqualTo(String.valueOf(orgId));
+        	}
+        	if(houseId!=null){
+        		createCriteria.andChEqualTo(houseId);
+        	}
+        	createCriteria.andPzBetween("7031", "7036");
+        }else{//粮食的
+        	if(orgId!=null){
+        		createCriteria.andUnitidEqualTo(String.valueOf(orgId));
+        	}
+        	if(houseId!=null){
+        		createCriteria.andChEqualTo(houseId);
+        	}
+        	if(warehouseId!=null){
+        		createCriteria.andHwhEqualTo(warehouseId);
+        	}
+        }
+		return dataKcglKcswDefaultMapper.selectByExample(example);
+	}
+
+	
+}