Merge branch 'dev' of depot-qinghai/depot-basic-qinghai into master

src/main/java/com/chinaitop/depot/basic/mapper/BasicTankMapper.xml

@@ -40,6 +40,10 @@
     
     <result column="tyygbm" property="tyygbm" jdbcType="VARCHAR" />
     
+    <result column="design_life" property="designLife" jdbcType="DECIMAL" />
+    <result column="start_date" property="startDate" jdbcType="TIMESTAMP" />
+    <result column="keeper" property="keeper" jdbcType="VARCHAR" />
+    
     
   </resultMap>
   <sql id="Example_Where_Clause" >
@@ -105,7 +109,7 @@
     heating_type, tank_type, diameter, height, buildDate, check_way, weld_way, tank_apply, 
     tank_status, library_type, org_id, del_flag, updatetime, bottom_area, design_height, 
     oil_height, insport_height, tank_chart, tanklib_chart, basic_truck_type, crk_status, ygdm, ygajdm, lylx, jsdw, sjdw, jldw,
-    spt_dataid,tyygbm
+    spt_dataid,tyygbm,design_life,start_date,keeper
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.basic.model.BasicTankExample" >
     select
@@ -147,7 +151,7 @@
       del_flag, updatetime, bottom_area, 
       design_height, oil_height, insport_height, 
       tank_chart, tanklib_chart, basic_truck_type, crk_status, ygdm, ygajdm, lylx, jsdw, sjdw, jldw,
-      spt_dataid,tyygbm
+      spt_dataid,tyygbm,design_life,start_date,keeper
       )
     values (#{id,jdbcType=VARCHAR}, #{storagetankCode,jdbcType=VARCHAR}, #{storagetankName,jdbcType=VARCHAR}, 
       #{orgCode,jdbcType=VARCHAR}, #{tankCapacity,jdbcType=DECIMAL}, #{createdate,jdbcType=TIMESTAMP}, 
@@ -160,7 +164,7 @@
       #{tankChart,jdbcType=VARCHAR}, #{tanklibChart,jdbcType=VARCHAR}, #{basicTruckType,jdbcType=VARCHAR},
       #{crkStatus,jdbcType=VARCHAR},#{ygdm,jdbcType=VARCHAR},#{ygajdm,jdbcType=VARCHAR}, #{lylx,jdbcType=VARCHAR},
       #{jsdw,jdbcType=VARCHAR},#{sjdw,jdbcType=VARCHAR},#{jldw,jdbcType=VARCHAR},#{sptDataid,jdbcType=VARCHAR},
-      #{tyygbm,jdbcType=VARCHAR}
+      #{tyygbm,jdbcType=VARCHAR},#{designLife,jdbcType=DECIMAL},#{startDate,jdbcType=TIMESTAMP},#{keeper,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.basic.model.BasicTank" >
@@ -274,6 +278,15 @@
       <if test="tyygbm != null">
         tyygbm,
       </if>
+      <if test="designLife != null">
+        design_life,
+      </if>
+      <if test="startDate != null">
+        start_date,
+      </if>
+      <if test="keeper != null">
+        keeper,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -384,6 +397,15 @@
       <if test="tyygbm != null">
         #{tyygbm,jdbcType=VARCHAR},
       </if>
+      <if test="designLife != null">
+        #{designLife,jdbcType=DECIMAL},
+      </if>
+      <if test="startDate != null">
+        #{startDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="keeper != null">
+        #{keeper,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.basic.model.BasicTankExample" resultType="java.lang.Integer" >
@@ -503,6 +525,15 @@
       <if test="record.tyygbm != null">
         tyygbm = #{record.tyygbm,jdbcType=VARCHAR},
       </if>
+      <if test="record.designLife != null">
+        design_life = #{record.designLife,jdbcType=DECIMAL},
+      </if>
+      <if test="record.startDate != null">
+        start_date = #{record.startDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.keeper != null">
+        keeper = #{record.keeper,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -545,7 +576,10 @@
       sjdw = #{record.sjdw,jdbcType=VARCHAR},
       jldw = #{record.jldw,jdbcType=VARCHAR},
       spt_dataid = #{record.sptDataid,jdbcType=VARCHAR},
-      tyygbm = #{record.tyygbm,jdbcType=VARCHAR}
+      tyygbm = #{record.tyygbm,jdbcType=VARCHAR},
+      design_life = #{designLife,jdbcType=DECIMAL},
+      start_date = #{startDate,jdbcType=TIMESTAMP},
+      keeper = #{record.keeper,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -658,6 +692,15 @@
       <if test="tyygbm != null">
         tyygbm = #{tyygbm,jdbcType=VARCHAR},
       </if>
+      <if test="designLife != null">
+        design_life = #{designLife,jdbcType=DECIMAL},
+      </if>
+      <if test="startDate != null">
+        start_date = #{startDate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="keeper != null">
+        keeper = #{keeper,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=VARCHAR}
   </update>
@@ -697,7 +740,10 @@
       sjdw = #{sjdw,jdbcType=VARCHAR},
       jldw = #{jldw,jdbcType=VARCHAR},
       spt_dataid = #{sptDataid,jdbcType=VARCHAR},
-      tyygbm = #{tyygbm,jdbcType=VARCHAR}
+      tyygbm = #{tyygbm,jdbcType=VARCHAR},
+      design_life = #{designLife,jdbcType=DECIMAL},
+      start_date = #{startDate,jdbcType=TIMESTAMP},
+      keeper = #{keeper,jdbcType=VARCHAR}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 

src/main/java/com/chinaitop/depot/basic/model/BasicTank.java

@@ -5,6 +5,40 @@ import java.util.Date;
 
 public class BasicTank {
 	
+	
+	private BigDecimal designLife; //设计年限
+
+    private Date startDate;//启用日期
+
+    private String keeper;//保管员
+    
+	
+    
+	
+	public BigDecimal getDesignLife() {
+		return designLife;
+	}
+
+	public void setDesignLife(BigDecimal designLife) {
+		this.designLife = designLife;
+	}
+
+	public Date getStartDate() {
+		return startDate;
+	}
+
+	public void setStartDate(Date startDate) {
+		this.startDate = startDate;
+	}
+
+	public String getKeeper() {
+		return keeper;
+	}
+
+	public void setKeeper(String keeper) {
+		this.keeper = keeper;
+	}
+
 	private String tyygbm;
 	
     public String getTyygbm() {

src/main/java/com/chinaitop/depot/gjjsj/mapper/GjjMapper.java

@@ -49,6 +49,8 @@ public interface GjjMapper {
 	Map<String, Object> getZjGjjDate(String id);
 
 	Map<String, Object> getWjGjjData(String ywId);
+
+	Map<String, Object> getCnsptxGjjData(String ywId);
 	
 
 

src/main/java/com/chinaitop/depot/gjjsj/mapper/GjjMapper.xml

@@ -782,6 +782,7 @@
     </select>
     
     
+    <!-- 文件信息 -->
     <select id="getWjGjjData" parameterType="java.lang.String" resultType="java.util.Map">
     		SELECT
 				org_id id,
@@ -794,6 +795,30 @@
 			FROM
 				org_info
 		    where 
-			   org_class_id=5318 and org_id = #{id}
+			   org_class_id=5318 and org_id = #{ywId}
+    </select>
+    
+    <!-- 仓内视频图像信息 -->
+    <select id="getCnsptxGjjData" parameterType="java.lang.String" resultType="java.util.Map">
+    		SELECT
+				a.id,
+				b.kqbm kqdm, -- 库区代码 Y
+				b.tykqbm tykqbm, -- 统一库区编码 Y
+				a.camera_id spjksbid,-- 视频监控设备id  K
+				c.cfbm cfdm, -- 仓房代码  K
+				c.tycfbm tycfbm,-- 统一仓房编码 Y
+				d.hwdm hwdm,-- 货位代码 Y
+				d.tyhwbm tyhwbm,-- 统一货位编码 Y
+				DATE_FORMAT(a.zpsj, '%Y-%m-%d %H:%i:%s') zpsj,-- 抓拍时间 K
+				a.cntxwjl cntxdz,-- 仓内图像地址 Y
+				'jpg' AS txwjhzm,-- 图像文件后缀名 
+				CONCAT(d.hwdm,01) Yzwbh,-- 预置位编号K
+				DATE_FORMAT(a.createdate, '%Y-%m-%d %H:%i:%s') zhgxsj  -- 最后更新时间----Y
+				FROM
+					camera_capture a
+				left JOIN org_info b on a.org_id = b.org_id
+				LEFT JOIN basic_storehouse c on c.storehouse_id = a.storehouse_id
+				LEFT JOIN basic_warehouse d on d.warehouse_id = a.warehouse_id
+			where a.id = #{ywId}
     </select>
 </mapper>

src/main/java/com/chinaitop/mq/dto/jkEnum.java

@@ -48,6 +48,8 @@ public enum jkEnum {
 	
 	xz("熏蒸",2431,"ODS_UP_XZZYXXJK"),
 	
+	cnsptx("仓内视频图像信息",2432,"ODS_UP_CNSPTXXXJK"),
+	
 	wgyj("违规预警信息",2434,"ODS_UP_WGYJXXJK"),
 	
 	zj("质检",2435,"ODS_UP_ZJXXJK"),

src/main/java/com/chinaitop/mq/sub/MyMessageListener.java

@@ -194,6 +194,15 @@ public class MyMessageListener implements MessageListener {
     			
     			pjsjmap.remove("tpdz");
     			
+    		}else if(tableName.equals(jkEnum.cnsptx.getTableName())){//仓内视频图像信息
+    			pjsjmap = gjjMapper.getCnsptxGjjData(ywId);
+    			
+    			String cntxdz = (String) pjsjmap.get("cntxdz");
+    			String wjl = FileUtil.getBase64Content(cntxdz);
+    			pjsjmap.put("cntxwjl", wjl);
+    			
+    			pjsjmap.remove("cntxdz");
+    			
     		}
     		
     		if(!pjsjmap.isEmpty() && pjsjmap != null){