Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

cloud-socket/.gitignore

@@ -0,0 +1 @@
+/build/

cloud-socket/src/com/js/kbt/UserTempGenConfig.xml

@@ -14,5 +14,11 @@
     <table schema="cloud_model" tableName="mould_history" >
     	<generatedKey column="id" identity="true" sqlStatement="SELECT LAST_INSERT_ID()"/>
     </table>
+<!--     <table schema="cloud_model" tableName="tb_mould_equipment" > -->
+<!--     	<generatedKey column="id" identity="true" sqlStatement="SELECT LAST_INSERT_ID()"/> -->
+<!--     </table> -->
+<!--     <table schema="cloud_model" tableName="tb_factory" > -->
+<!--     	<generatedKey column="id" identity="true" sqlStatement="SELECT LAST_INSERT_ID()"/> -->
+<!--     </table> -->
   </context>
 </generatorConfiguration>

cloud-socket/src/com/js/kbt/mapper/MouldHistoryMapper.java

@@ -9,67 +9,67 @@ public interface MouldHistoryMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	long countByExample(MouldHistoryExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	int deleteByExample(MouldHistoryExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	int deleteByPrimaryKey(Long id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	int insert(MouldHistory record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	int insertSelective(MouldHistory record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	List<MouldHistory> selectByExample(MouldHistoryExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	MouldHistory selectByPrimaryKey(Long id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	int updateByExampleSelective(@Param("record") MouldHistory record, @Param("example") MouldHistoryExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	int updateByExample(@Param("record") MouldHistory record, @Param("example") MouldHistoryExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	int updateByPrimaryKeySelective(MouldHistory record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	int updateByPrimaryKey(MouldHistory record);
 }

cloud-socket/src/com/js/kbt/mapper/MouldHistoryMapper.xml

@@ -5,17 +5,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="sim" jdbcType="VARCHAR" property="sim" />
-    <result column="model_no" jdbcType="VARCHAR" property="modelNo" />
+    <result column="equipment_no" jdbcType="VARCHAR" property="equipmentNo" />
     <result column="version" jdbcType="VARCHAR" property="version" />
     <result column="status" jdbcType="VARCHAR" property="status" />
     <result column="lng" jdbcType="VARCHAR" property="lng" />
     <result column="lat" jdbcType="VARCHAR" property="lat" />
     <result column="gprs_lac" jdbcType="VARCHAR" property="gprsLac" />
-    <result column="gprs_ic" jdbcType="VARCHAR" property="gprsIc" />
+    <result column="gprs_ci" jdbcType="VARCHAR" property="gprsCi" />
     <result column="wifi_bbsid" jdbcType="VARCHAR" property="wifiBbsid" />
     <result column="temperature" jdbcType="INTEGER" property="temperature" />
     <result column="battery" jdbcType="INTEGER" property="battery" />
@@ -32,7 +32,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -66,7 +66,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -100,16 +100,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
-    id, sim, model_no, version, status, lng, lat, gprs_lac, gprs_ic, wifi_bbsid, temperature, 
-    battery, sig_2g, sig_nb, sig_wifi, ext0, alarm, run_cnt, crc_code, indate
+    id, sim, equipment_no, version, status, lng, lat, gprs_lac, gprs_ci, wifi_bbsid, 
+    temperature, battery, sig_2g, sig_nb, sig_wifi, ext0, alarm, run_cnt, crc_code, indate
   </sql>
   <select id="selectByExample" parameterType="com.js.kbt.model.MouldHistoryExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
     select
     <if test="distinct">
@@ -128,7 +128,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -139,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
     delete from mould_history
     where id = #{id,jdbcType=BIGINT}
@@ -148,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
     delete from mould_history
     <if test="_parameter != null">
@@ -159,21 +159,21 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
     </selectKey>
-    insert into mould_history (sim, model_no, version, 
+    insert into mould_history (sim, equipment_no, version, 
       status, lng, lat, gprs_lac, 
-      gprs_ic, wifi_bbsid, temperature, 
+      gprs_ci, wifi_bbsid, temperature, 
       battery, sig_2g, sig_nb, 
       sig_wifi, ext0, alarm, 
       run_cnt, crc_code, indate
       )
-    values (#{sim,jdbcType=VARCHAR}, #{modelNo,jdbcType=VARCHAR}, #{version,jdbcType=VARCHAR}, 
+    values (#{sim,jdbcType=VARCHAR}, #{equipmentNo,jdbcType=VARCHAR}, #{version,jdbcType=VARCHAR}, 
       #{status,jdbcType=VARCHAR}, #{lng,jdbcType=VARCHAR}, #{lat,jdbcType=VARCHAR}, #{gprsLac,jdbcType=VARCHAR}, 
-      #{gprsIc,jdbcType=VARCHAR}, #{wifiBbsid,jdbcType=VARCHAR}, #{temperature,jdbcType=INTEGER}, 
+      #{gprsCi,jdbcType=VARCHAR}, #{wifiBbsid,jdbcType=VARCHAR}, #{temperature,jdbcType=INTEGER}, 
       #{battery,jdbcType=INTEGER}, #{sig2g,jdbcType=INTEGER}, #{sigNb,jdbcType=INTEGER}, 
       #{sigWifi,jdbcType=INTEGER}, #{ext0,jdbcType=VARCHAR}, #{alarm,jdbcType=INTEGER}, 
       #{runCnt,jdbcType=INTEGER}, #{crcCode,jdbcType=VARCHAR}, #{indate,jdbcType=TIMESTAMP}
@@ -183,7 +183,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
       SELECT LAST_INSERT_ID()
@@ -193,8 +193,8 @@
       <if test="sim != null">
         sim,
       </if>
-      <if test="modelNo != null">
-        model_no,
+      <if test="equipmentNo != null">
+        equipment_no,
       </if>
       <if test="version != null">
         version,
@@ -211,8 +211,8 @@
       <if test="gprsLac != null">
         gprs_lac,
       </if>
-      <if test="gprsIc != null">
-        gprs_ic,
+      <if test="gprsCi != null">
+        gprs_ci,
       </if>
       <if test="wifiBbsid != null">
         wifi_bbsid,
@@ -252,8 +252,8 @@
       <if test="sim != null">
         #{sim,jdbcType=VARCHAR},
       </if>
-      <if test="modelNo != null">
-        #{modelNo,jdbcType=VARCHAR},
+      <if test="equipmentNo != null">
+        #{equipmentNo,jdbcType=VARCHAR},
       </if>
       <if test="version != null">
         #{version,jdbcType=VARCHAR},
@@ -270,8 +270,8 @@
       <if test="gprsLac != null">
         #{gprsLac,jdbcType=VARCHAR},
       </if>
-      <if test="gprsIc != null">
-        #{gprsIc,jdbcType=VARCHAR},
+      <if test="gprsCi != null">
+        #{gprsCi,jdbcType=VARCHAR},
       </if>
       <if test="wifiBbsid != null">
         #{wifiBbsid,jdbcType=VARCHAR},
@@ -312,7 +312,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
     select count(*) from mould_history
     <if test="_parameter != null">
@@ -323,7 +323,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
     update mould_history
     <set>
@@ -333,8 +333,8 @@
       <if test="record.sim != null">
         sim = #{record.sim,jdbcType=VARCHAR},
       </if>
-      <if test="record.modelNo != null">
-        model_no = #{record.modelNo,jdbcType=VARCHAR},
+      <if test="record.equipmentNo != null">
+        equipment_no = #{record.equipmentNo,jdbcType=VARCHAR},
       </if>
       <if test="record.version != null">
         version = #{record.version,jdbcType=VARCHAR},
@@ -351,8 +351,8 @@
       <if test="record.gprsLac != null">
         gprs_lac = #{record.gprsLac,jdbcType=VARCHAR},
       </if>
-      <if test="record.gprsIc != null">
-        gprs_ic = #{record.gprsIc,jdbcType=VARCHAR},
+      <if test="record.gprsCi != null">
+        gprs_ci = #{record.gprsCi,jdbcType=VARCHAR},
       </if>
       <if test="record.wifiBbsid != null">
         wifi_bbsid = #{record.wifiBbsid,jdbcType=VARCHAR},
@@ -396,18 +396,18 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
     update mould_history
     set id = #{record.id,jdbcType=BIGINT},
       sim = #{record.sim,jdbcType=VARCHAR},
-      model_no = #{record.modelNo,jdbcType=VARCHAR},
+      equipment_no = #{record.equipmentNo,jdbcType=VARCHAR},
       version = #{record.version,jdbcType=VARCHAR},
       status = #{record.status,jdbcType=VARCHAR},
       lng = #{record.lng,jdbcType=VARCHAR},
       lat = #{record.lat,jdbcType=VARCHAR},
       gprs_lac = #{record.gprsLac,jdbcType=VARCHAR},
-      gprs_ic = #{record.gprsIc,jdbcType=VARCHAR},
+      gprs_ci = #{record.gprsCi,jdbcType=VARCHAR},
       wifi_bbsid = #{record.wifiBbsid,jdbcType=VARCHAR},
       temperature = #{record.temperature,jdbcType=INTEGER},
       battery = #{record.battery,jdbcType=INTEGER},
@@ -427,15 +427,15 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
     update mould_history
     <set>
       <if test="sim != null">
         sim = #{sim,jdbcType=VARCHAR},
       </if>
-      <if test="modelNo != null">
-        model_no = #{modelNo,jdbcType=VARCHAR},
+      <if test="equipmentNo != null">
+        equipment_no = #{equipmentNo,jdbcType=VARCHAR},
       </if>
       <if test="version != null">
         version = #{version,jdbcType=VARCHAR},
@@ -452,8 +452,8 @@
       <if test="gprsLac != null">
         gprs_lac = #{gprsLac,jdbcType=VARCHAR},
       </if>
-      <if test="gprsIc != null">
-        gprs_ic = #{gprsIc,jdbcType=VARCHAR},
+      <if test="gprsCi != null">
+        gprs_ci = #{gprsCi,jdbcType=VARCHAR},
       </if>
       <if test="wifiBbsid != null">
         wifi_bbsid = #{wifiBbsid,jdbcType=VARCHAR},
@@ -495,17 +495,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Aug 01 15:49:20 CST 2019.
+      This element was generated on Mon Aug 05 16:59:03 CST 2019.
     -->
     update mould_history
     set sim = #{sim,jdbcType=VARCHAR},
-      model_no = #{modelNo,jdbcType=VARCHAR},
+      equipment_no = #{equipmentNo,jdbcType=VARCHAR},
       version = #{version,jdbcType=VARCHAR},
       status = #{status,jdbcType=VARCHAR},
       lng = #{lng,jdbcType=VARCHAR},
       lat = #{lat,jdbcType=VARCHAR},
       gprs_lac = #{gprsLac,jdbcType=VARCHAR},
-      gprs_ic = #{gprsIc,jdbcType=VARCHAR},
+      gprs_ci = #{gprsCi,jdbcType=VARCHAR},
       wifi_bbsid = #{wifiBbsid,jdbcType=VARCHAR},
       temperature = #{temperature,jdbcType=INTEGER},
       battery = #{battery,jdbcType=INTEGER},

cloud-socket/src/com/js/kbt/mapper/MouldHistoryTimeMapper.java

@@ -0,0 +1,52 @@
+package com.js.kbt.mapper;
+
+import com.js.kbt.model.MouldHistoryTime;
+import com.js.kbt.model.MouldHistoryTimeExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface MouldHistoryTimeMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	long countByExample(MouldHistoryTimeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	int deleteByExample(MouldHistoryTimeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	int insert(MouldHistoryTime record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	int insertSelective(MouldHistoryTime record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	List<MouldHistoryTime> selectByExample(MouldHistoryTimeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") MouldHistoryTime record,
+			@Param("example") MouldHistoryTimeExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	int updateByExample(@Param("record") MouldHistoryTime record, @Param("example") MouldHistoryTimeExample example);
+}

cloud-socket/src/com/js/kbt/mapper/MouldHistoryTimeMapper.xml

@@ -0,0 +1,230 @@
+<?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.js.kbt.mapper.MouldHistoryTimeMapper">
+  <resultMap id="BaseResultMap" type="com.js.kbt.model.MouldHistoryTime">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:38:00 CST 2019.
+    -->
+    <result column="history_id" jdbcType="BIGINT" property="historyId" />
+    <result column="seq" jdbcType="INTEGER" property="seq" />
+    <result column="close_time" jdbcType="TIMESTAMP" property="closeTime" />
+    <result column="open_time" jdbcType="TIMESTAMP" property="openTime" />
+    <result column="time_cost" jdbcType="INTEGER" property="timeCost" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:38:00 CST 2019.
+    -->
+    <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">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:38:00 CST 2019.
+    -->
+    <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">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:38:00 CST 2019.
+    -->
+    history_id, seq, close_time, open_time, time_cost
+  </sql>
+  <select id="selectByExample" parameterType="com.js.kbt.model.MouldHistoryTimeExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:38:00 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from mould_history_time
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <delete id="deleteByExample" parameterType="com.js.kbt.model.MouldHistoryTimeExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:38:00 CST 2019.
+    -->
+    delete from mould_history_time
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.js.kbt.model.MouldHistoryTime">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:38:00 CST 2019.
+    -->
+    insert into mould_history_time (history_id, seq, close_time, 
+      open_time, time_cost)
+    values (#{historyId,jdbcType=BIGINT}, #{seq,jdbcType=INTEGER}, #{closeTime,jdbcType=TIMESTAMP}, 
+      #{openTime,jdbcType=TIMESTAMP}, #{timeCost,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.js.kbt.model.MouldHistoryTime">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:38:00 CST 2019.
+    -->
+    insert into mould_history_time
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="historyId != null">
+        history_id,
+      </if>
+      <if test="seq != null">
+        seq,
+      </if>
+      <if test="closeTime != null">
+        close_time,
+      </if>
+      <if test="openTime != null">
+        open_time,
+      </if>
+      <if test="timeCost != null">
+        time_cost,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="historyId != null">
+        #{historyId,jdbcType=BIGINT},
+      </if>
+      <if test="seq != null">
+        #{seq,jdbcType=INTEGER},
+      </if>
+      <if test="closeTime != null">
+        #{closeTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="openTime != null">
+        #{openTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="timeCost != null">
+        #{timeCost,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.js.kbt.model.MouldHistoryTimeExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:38:00 CST 2019.
+    -->
+    select count(*) from mould_history_time
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:38:00 CST 2019.
+    -->
+    update mould_history_time
+    <set>
+      <if test="record.historyId != null">
+        history_id = #{record.historyId,jdbcType=BIGINT},
+      </if>
+      <if test="record.seq != null">
+        seq = #{record.seq,jdbcType=INTEGER},
+      </if>
+      <if test="record.closeTime != null">
+        close_time = #{record.closeTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.openTime != null">
+        open_time = #{record.openTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.timeCost != null">
+        time_cost = #{record.timeCost,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:38:00 CST 2019.
+    -->
+    update mould_history_time
+    set history_id = #{record.historyId,jdbcType=BIGINT},
+      seq = #{record.seq,jdbcType=INTEGER},
+      close_time = #{record.closeTime,jdbcType=TIMESTAMP},
+      open_time = #{record.openTime,jdbcType=TIMESTAMP},
+      time_cost = #{record.timeCost,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+</mapper>

cloud-socket/src/com/js/kbt/mapper/TbFactoryMapper.java

@@ -0,0 +1,96 @@
+package com.js.kbt.mapper;
+
+import com.js.kbt.model.TbFactory;
+import com.js.kbt.model.TbFactoryExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TbFactoryMapper {
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    long countByExample(TbFactoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    int deleteByExample(TbFactoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    int deleteByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    int insert(TbFactory record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    int insertSelective(TbFactory record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    List<TbFactory> selectByExample(TbFactoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    TbFactory selectByPrimaryKey(Integer id);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    int updateByExampleSelective(@Param("record") TbFactory record, @Param("example") TbFactoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    int updateByExample(@Param("record") TbFactory record, @Param("example") TbFactoryExample example);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    int updateByPrimaryKeySelective(TbFactory record);
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    int updateByPrimaryKey(TbFactory record);
+}

cloud-socket/src/com/js/kbt/mapper/TbFactoryMapper.xml

@@ -0,0 +1,318 @@
+<?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.js.kbt.mapper.TbFactoryMapper">
+  <resultMap id="BaseResultMap" type="com.js.kbt.model.TbFactory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="factory_name" jdbcType="VARCHAR" property="factoryName" />
+    <result column="factory_area" jdbcType="VARCHAR" property="factoryArea" />
+    <result column="y_lng" jdbcType="VARCHAR" property="yLng" />
+    <result column="x_lat" jdbcType="VARCHAR" property="xLat" />
+    <result column="indate" jdbcType="TIMESTAMP" property="indate" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    <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">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    <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">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    id, factory_name, factory_area, y_lng, x_lat, indate, company_id
+  </sql>
+  <select id="selectByExample" parameterType="com.js.kbt.model.TbFactoryExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from tb_factory
+    <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.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from tb_factory
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    delete from tb_factory
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.js.kbt.model.TbFactoryExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    delete from tb_factory
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.js.kbt.model.TbFactory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into tb_factory (factory_name, factory_area, y_lng, 
+      x_lat, indate, company_id
+      )
+    values (#{factoryName,jdbcType=VARCHAR}, #{factoryArea,jdbcType=VARCHAR}, #{yLng,jdbcType=VARCHAR}, 
+      #{xLat,jdbcType=VARCHAR}, #{indate,jdbcType=TIMESTAMP}, #{companyId,jdbcType=INTEGER}
+      )
+  </insert>
+  <insert id="insertSelective" parameterType="com.js.kbt.model.TbFactory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into tb_factory
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="factoryName != null">
+        factory_name,
+      </if>
+      <if test="factoryArea != null">
+        factory_area,
+      </if>
+      <if test="yLng != null">
+        y_lng,
+      </if>
+      <if test="xLat != null">
+        x_lat,
+      </if>
+      <if test="indate != null">
+        indate,
+      </if>
+      <if test="companyId != null">
+        company_id,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="factoryName != null">
+        #{factoryName,jdbcType=VARCHAR},
+      </if>
+      <if test="factoryArea != null">
+        #{factoryArea,jdbcType=VARCHAR},
+      </if>
+      <if test="yLng != null">
+        #{yLng,jdbcType=VARCHAR},
+      </if>
+      <if test="xLat != null">
+        #{xLat,jdbcType=VARCHAR},
+      </if>
+      <if test="indate != null">
+        #{indate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="companyId != null">
+        #{companyId,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.js.kbt.model.TbFactoryExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    select count(*) from tb_factory
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    update tb_factory
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.factoryName != null">
+        factory_name = #{record.factoryName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.factoryArea != null">
+        factory_area = #{record.factoryArea,jdbcType=VARCHAR},
+      </if>
+      <if test="record.yLng != null">
+        y_lng = #{record.yLng,jdbcType=VARCHAR},
+      </if>
+      <if test="record.xLat != null">
+        x_lat = #{record.xLat,jdbcType=VARCHAR},
+      </if>
+      <if test="record.indate != null">
+        indate = #{record.indate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.companyId != null">
+        company_id = #{record.companyId,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    update tb_factory
+    set id = #{record.id,jdbcType=INTEGER},
+      factory_name = #{record.factoryName,jdbcType=VARCHAR},
+      factory_area = #{record.factoryArea,jdbcType=VARCHAR},
+      y_lng = #{record.yLng,jdbcType=VARCHAR},
+      x_lat = #{record.xLat,jdbcType=VARCHAR},
+      indate = #{record.indate,jdbcType=TIMESTAMP},
+      company_id = #{record.companyId,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.js.kbt.model.TbFactory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    update tb_factory
+    <set>
+      <if test="factoryName != null">
+        factory_name = #{factoryName,jdbcType=VARCHAR},
+      </if>
+      <if test="factoryArea != null">
+        factory_area = #{factoryArea,jdbcType=VARCHAR},
+      </if>
+      <if test="yLng != null">
+        y_lng = #{yLng,jdbcType=VARCHAR},
+      </if>
+      <if test="xLat != null">
+        x_lat = #{xLat,jdbcType=VARCHAR},
+      </if>
+      <if test="indate != null">
+        indate = #{indate,jdbcType=TIMESTAMP},
+      </if>
+      <if test="companyId != null">
+        company_id = #{companyId,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.js.kbt.model.TbFactory">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:03:49 CST 2019.
+    -->
+    update tb_factory
+    set factory_name = #{factoryName,jdbcType=VARCHAR},
+      factory_area = #{factoryArea,jdbcType=VARCHAR},
+      y_lng = #{yLng,jdbcType=VARCHAR},
+      x_lat = #{xLat,jdbcType=VARCHAR},
+      indate = #{indate,jdbcType=TIMESTAMP},
+      company_id = #{companyId,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

cloud-socket/src/com/js/kbt/mapper/TbMouldEquipmentMapper.java

@@ -0,0 +1,76 @@
+package com.js.kbt.mapper;
+
+import com.js.kbt.model.TbMouldEquipment;
+import com.js.kbt.model.TbMouldEquipmentExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TbMouldEquipmentMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	long countByExample(TbMouldEquipmentExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	int deleteByExample(TbMouldEquipmentExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	int insert(TbMouldEquipment record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	int insertSelective(TbMouldEquipment record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	List<TbMouldEquipment> selectByExample(TbMouldEquipmentExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	TbMouldEquipment selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") TbMouldEquipment record,
+			@Param("example") TbMouldEquipmentExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	int updateByExample(@Param("record") TbMouldEquipment record, @Param("example") TbMouldEquipmentExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	int updateByPrimaryKeySelective(TbMouldEquipment record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	int updateByPrimaryKey(TbMouldEquipment record);
+}

cloud-socket/src/com/js/kbt/mapper/TbMouldEquipmentMapper.xml

@@ -0,0 +1,396 @@
+<?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.js.kbt.mapper.TbMouldEquipmentMapper">
+  <resultMap id="BaseResultMap" type="com.js.kbt.model.TbMouldEquipment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="equipment_name" jdbcType="VARCHAR" property="equipmentName" />
+    <result column="start_time" jdbcType="TIMESTAMP" property="startTime" />
+    <result column="end_time" jdbcType="TIMESTAMP" property="endTime" />
+    <result column="use_life" jdbcType="INTEGER" property="useLife" />
+    <result column="belong_company_id" jdbcType="INTEGER" property="belongCompanyId" />
+    <result column="equipment_no" jdbcType="VARCHAR" property="equipmentNo" />
+    <result column="is_use" jdbcType="INTEGER" property="isUse" />
+    <result column="hill_number" jdbcType="VARCHAR" property="hillNumber" />
+    <result column="lng" jdbcType="DOUBLE" property="lng" />
+    <result column="lat" jdbcType="DOUBLE" property="lat" />
+    <result column="temperature" jdbcType="INTEGER" property="temperature" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    <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">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    <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">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, 
+    is_use, hill_number, lng, lat, temperature
+  </sql>
+  <select id="selectByExample" parameterType="com.js.kbt.model.TbMouldEquipmentExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from tb_mould_equipment
+    <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.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from tb_mould_equipment
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    delete from tb_mould_equipment
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.js.kbt.model.TbMouldEquipmentExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    delete from tb_mould_equipment
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.js.kbt.model.TbMouldEquipment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into tb_mould_equipment (equipment_name, start_time, end_time, 
+      use_life, belong_company_id, equipment_no, 
+      is_use, hill_number, lng, 
+      lat, temperature)
+    values (#{equipmentName,jdbcType=VARCHAR}, #{startTime,jdbcType=TIMESTAMP}, #{endTime,jdbcType=TIMESTAMP}, 
+      #{useLife,jdbcType=INTEGER}, #{belongCompanyId,jdbcType=INTEGER}, #{equipmentNo,jdbcType=VARCHAR}, 
+      #{isUse,jdbcType=INTEGER}, #{hillNumber,jdbcType=VARCHAR}, #{lng,jdbcType=DOUBLE}, 
+      #{lat,jdbcType=DOUBLE}, #{temperature,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.js.kbt.model.TbMouldEquipment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into tb_mould_equipment
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="equipmentName != null">
+        equipment_name,
+      </if>
+      <if test="startTime != null">
+        start_time,
+      </if>
+      <if test="endTime != null">
+        end_time,
+      </if>
+      <if test="useLife != null">
+        use_life,
+      </if>
+      <if test="belongCompanyId != null">
+        belong_company_id,
+      </if>
+      <if test="equipmentNo != null">
+        equipment_no,
+      </if>
+      <if test="isUse != null">
+        is_use,
+      </if>
+      <if test="hillNumber != null">
+        hill_number,
+      </if>
+      <if test="lng != null">
+        lng,
+      </if>
+      <if test="lat != null">
+        lat,
+      </if>
+      <if test="temperature != null">
+        temperature,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="equipmentName != null">
+        #{equipmentName,jdbcType=VARCHAR},
+      </if>
+      <if test="startTime != null">
+        #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="useLife != null">
+        #{useLife,jdbcType=INTEGER},
+      </if>
+      <if test="belongCompanyId != null">
+        #{belongCompanyId,jdbcType=INTEGER},
+      </if>
+      <if test="equipmentNo != null">
+        #{equipmentNo,jdbcType=VARCHAR},
+      </if>
+      <if test="isUse != null">
+        #{isUse,jdbcType=INTEGER},
+      </if>
+      <if test="hillNumber != null">
+        #{hillNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="lng != null">
+        #{lng,jdbcType=DOUBLE},
+      </if>
+      <if test="lat != null">
+        #{lat,jdbcType=DOUBLE},
+      </if>
+      <if test="temperature != null">
+        #{temperature,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.js.kbt.model.TbMouldEquipmentExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    select count(*) from tb_mould_equipment
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    update tb_mould_equipment
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.equipmentName != null">
+        equipment_name = #{record.equipmentName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.startTime != null">
+        start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.endTime != null">
+        end_time = #{record.endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.useLife != null">
+        use_life = #{record.useLife,jdbcType=INTEGER},
+      </if>
+      <if test="record.belongCompanyId != null">
+        belong_company_id = #{record.belongCompanyId,jdbcType=INTEGER},
+      </if>
+      <if test="record.equipmentNo != null">
+        equipment_no = #{record.equipmentNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isUse != null">
+        is_use = #{record.isUse,jdbcType=INTEGER},
+      </if>
+      <if test="record.hillNumber != null">
+        hill_number = #{record.hillNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.lng != null">
+        lng = #{record.lng,jdbcType=DOUBLE},
+      </if>
+      <if test="record.lat != null">
+        lat = #{record.lat,jdbcType=DOUBLE},
+      </if>
+      <if test="record.temperature != null">
+        temperature = #{record.temperature,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    update tb_mould_equipment
+    set id = #{record.id,jdbcType=INTEGER},
+      equipment_name = #{record.equipmentName,jdbcType=VARCHAR},
+      start_time = #{record.startTime,jdbcType=TIMESTAMP},
+      end_time = #{record.endTime,jdbcType=TIMESTAMP},
+      use_life = #{record.useLife,jdbcType=INTEGER},
+      belong_company_id = #{record.belongCompanyId,jdbcType=INTEGER},
+      equipment_no = #{record.equipmentNo,jdbcType=VARCHAR},
+      is_use = #{record.isUse,jdbcType=INTEGER},
+      hill_number = #{record.hillNumber,jdbcType=VARCHAR},
+      lng = #{record.lng,jdbcType=DOUBLE},
+      lat = #{record.lat,jdbcType=DOUBLE},
+      temperature = #{record.temperature,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.js.kbt.model.TbMouldEquipment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    update tb_mould_equipment
+    <set>
+      <if test="equipmentName != null">
+        equipment_name = #{equipmentName,jdbcType=VARCHAR},
+      </if>
+      <if test="startTime != null">
+        start_time = #{startTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="endTime != null">
+        end_time = #{endTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="useLife != null">
+        use_life = #{useLife,jdbcType=INTEGER},
+      </if>
+      <if test="belongCompanyId != null">
+        belong_company_id = #{belongCompanyId,jdbcType=INTEGER},
+      </if>
+      <if test="equipmentNo != null">
+        equipment_no = #{equipmentNo,jdbcType=VARCHAR},
+      </if>
+      <if test="isUse != null">
+        is_use = #{isUse,jdbcType=INTEGER},
+      </if>
+      <if test="hillNumber != null">
+        hill_number = #{hillNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="lng != null">
+        lng = #{lng,jdbcType=DOUBLE},
+      </if>
+      <if test="lat != null">
+        lat = #{lat,jdbcType=DOUBLE},
+      </if>
+      <if test="temperature != null">
+        temperature = #{temperature,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.js.kbt.model.TbMouldEquipment">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:54:09 CST 2019.
+    -->
+    update tb_mould_equipment
+    set equipment_name = #{equipmentName,jdbcType=VARCHAR},
+      start_time = #{startTime,jdbcType=TIMESTAMP},
+      end_time = #{endTime,jdbcType=TIMESTAMP},
+      use_life = #{useLife,jdbcType=INTEGER},
+      belong_company_id = #{belongCompanyId,jdbcType=INTEGER},
+      equipment_no = #{equipmentNo,jdbcType=VARCHAR},
+      is_use = #{isUse,jdbcType=INTEGER},
+      hill_number = #{hillNumber,jdbcType=VARCHAR},
+      lng = #{lng,jdbcType=DOUBLE},
+      lat = #{lat,jdbcType=DOUBLE},
+      temperature = #{temperature,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

cloud-socket/src/com/js/kbt/mapper/TbMouldMapper.java

@@ -0,0 +1,75 @@
+package com.js.kbt.mapper;
+
+import com.js.kbt.model.TbMould;
+import com.js.kbt.model.TbMouldExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface TbMouldMapper {
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	long countByExample(TbMouldExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	int deleteByExample(TbMouldExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	int insert(TbMould record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	int insertSelective(TbMould record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	List<TbMould> selectByExample(TbMouldExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	TbMould selectByPrimaryKey(Integer id);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") TbMould record, @Param("example") TbMouldExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	int updateByExample(@Param("record") TbMould record, @Param("example") TbMouldExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	int updateByPrimaryKeySelective(TbMould record);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	int updateByPrimaryKey(TbMould record);
+}

cloud-socket/src/com/js/kbt/mapper/TbMouldMapper.xml

@@ -0,0 +1,571 @@
+<?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.js.kbt.mapper.TbMouldMapper">
+  <resultMap id="BaseResultMap" type="com.js.kbt.model.TbMould">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    <id column="id" jdbcType="INTEGER" property="id" />
+    <result column="model_no" jdbcType="VARCHAR" property="modelNo" />
+    <result column="model_name" jdbcType="VARCHAR" property="modelName" />
+    <result column="water_gap" jdbcType="DECIMAL" property="waterGap" />
+    <result column="tonnage" jdbcType="DECIMAL" property="tonnage" />
+    <result column="oc_cycle" jdbcType="DECIMAL" property="ocCycle" />
+    <result column="daily_output" jdbcType="DECIMAL" property="dailyOutput" />
+    <result column="company_id" jdbcType="INTEGER" property="companyId" />
+    <result column="current_version_id" jdbcType="INTEGER" property="currentVersionId" />
+    <result column="state" jdbcType="VARCHAR" property="state" />
+    <result column="is_delete" jdbcType="INTEGER" property="isDelete" />
+    <result column="creator_id" jdbcType="INTEGER" property="creatorId" />
+    <result column="project_id" jdbcType="INTEGER" property="projectId" />
+    <result column="rfid" jdbcType="VARCHAR" property="rfid" />
+    <result column="setting_life" jdbcType="INTEGER" property="settingLife" />
+    <result column="area" jdbcType="VARCHAR" property="area" />
+    <result column="factory_id" jdbcType="INTEGER" property="factoryId" />
+    <result column="factory_name" jdbcType="VARCHAR" property="factoryName" />
+    <result column="initial_modulus" jdbcType="INTEGER" property="initialModulus" />
+    <result column="equipment_id" jdbcType="INTEGER" property="equipmentId" />
+    <result column="belong_project_grade" jdbcType="VARCHAR" property="belongProjectGrade" />
+    <result column="produce_company_id" jdbcType="INTEGER" property="produceCompanyId" />
+    <result column="run_times" jdbcType="INTEGER" property="runTimes" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    <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">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    <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">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    id, model_no, model_name, water_gap, tonnage, oc_cycle, daily_output, company_id, 
+    current_version_id, state, is_delete, creator_id, project_id, rfid, setting_life, 
+    area, factory_id, factory_name, initial_modulus, equipment_id, belong_project_grade, 
+    produce_company_id, run_times
+  </sql>
+  <select id="selectByExample" parameterType="com.js.kbt.model.TbMouldExample" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from tb_mould
+    <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.Integer" resultMap="BaseResultMap">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    select 
+    <include refid="Base_Column_List" />
+    from tb_mould
+    where id = #{id,jdbcType=INTEGER}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    delete from tb_mould
+    where id = #{id,jdbcType=INTEGER}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.js.kbt.model.TbMouldExample">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    delete from tb_mould
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.js.kbt.model.TbMould">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into tb_mould (model_no, model_name, water_gap, 
+      tonnage, oc_cycle, daily_output, 
+      company_id, current_version_id, state, 
+      is_delete, creator_id, project_id, 
+      rfid, setting_life, area, 
+      factory_id, factory_name, initial_modulus, 
+      equipment_id, belong_project_grade, produce_company_id, 
+      run_times)
+    values (#{modelNo,jdbcType=VARCHAR}, #{modelName,jdbcType=VARCHAR}, #{waterGap,jdbcType=DECIMAL}, 
+      #{tonnage,jdbcType=DECIMAL}, #{ocCycle,jdbcType=DECIMAL}, #{dailyOutput,jdbcType=DECIMAL}, 
+      #{companyId,jdbcType=INTEGER}, #{currentVersionId,jdbcType=INTEGER}, #{state,jdbcType=VARCHAR}, 
+      #{isDelete,jdbcType=INTEGER}, #{creatorId,jdbcType=INTEGER}, #{projectId,jdbcType=INTEGER}, 
+      #{rfid,jdbcType=VARCHAR}, #{settingLife,jdbcType=INTEGER}, #{area,jdbcType=VARCHAR}, 
+      #{factoryId,jdbcType=INTEGER}, #{factoryName,jdbcType=VARCHAR}, #{initialModulus,jdbcType=INTEGER}, 
+      #{equipmentId,jdbcType=INTEGER}, #{belongProjectGrade,jdbcType=VARCHAR}, #{produceCompanyId,jdbcType=INTEGER}, 
+      #{runTimes,jdbcType=INTEGER})
+  </insert>
+  <insert id="insertSelective" parameterType="com.js.kbt.model.TbMould">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
+      SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into tb_mould
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="modelNo != null">
+        model_no,
+      </if>
+      <if test="modelName != null">
+        model_name,
+      </if>
+      <if test="waterGap != null">
+        water_gap,
+      </if>
+      <if test="tonnage != null">
+        tonnage,
+      </if>
+      <if test="ocCycle != null">
+        oc_cycle,
+      </if>
+      <if test="dailyOutput != null">
+        daily_output,
+      </if>
+      <if test="companyId != null">
+        company_id,
+      </if>
+      <if test="currentVersionId != null">
+        current_version_id,
+      </if>
+      <if test="state != null">
+        state,
+      </if>
+      <if test="isDelete != null">
+        is_delete,
+      </if>
+      <if test="creatorId != null">
+        creator_id,
+      </if>
+      <if test="projectId != null">
+        project_id,
+      </if>
+      <if test="rfid != null">
+        rfid,
+      </if>
+      <if test="settingLife != null">
+        setting_life,
+      </if>
+      <if test="area != null">
+        area,
+      </if>
+      <if test="factoryId != null">
+        factory_id,
+      </if>
+      <if test="factoryName != null">
+        factory_name,
+      </if>
+      <if test="initialModulus != null">
+        initial_modulus,
+      </if>
+      <if test="equipmentId != null">
+        equipment_id,
+      </if>
+      <if test="belongProjectGrade != null">
+        belong_project_grade,
+      </if>
+      <if test="produceCompanyId != null">
+        produce_company_id,
+      </if>
+      <if test="runTimes != null">
+        run_times,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="modelNo != null">
+        #{modelNo,jdbcType=VARCHAR},
+      </if>
+      <if test="modelName != null">
+        #{modelName,jdbcType=VARCHAR},
+      </if>
+      <if test="waterGap != null">
+        #{waterGap,jdbcType=DECIMAL},
+      </if>
+      <if test="tonnage != null">
+        #{tonnage,jdbcType=DECIMAL},
+      </if>
+      <if test="ocCycle != null">
+        #{ocCycle,jdbcType=DECIMAL},
+      </if>
+      <if test="dailyOutput != null">
+        #{dailyOutput,jdbcType=DECIMAL},
+      </if>
+      <if test="companyId != null">
+        #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="currentVersionId != null">
+        #{currentVersionId,jdbcType=INTEGER},
+      </if>
+      <if test="state != null">
+        #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="isDelete != null">
+        #{isDelete,jdbcType=INTEGER},
+      </if>
+      <if test="creatorId != null">
+        #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="projectId != null">
+        #{projectId,jdbcType=INTEGER},
+      </if>
+      <if test="rfid != null">
+        #{rfid,jdbcType=VARCHAR},
+      </if>
+      <if test="settingLife != null">
+        #{settingLife,jdbcType=INTEGER},
+      </if>
+      <if test="area != null">
+        #{area,jdbcType=VARCHAR},
+      </if>
+      <if test="factoryId != null">
+        #{factoryId,jdbcType=INTEGER},
+      </if>
+      <if test="factoryName != null">
+        #{factoryName,jdbcType=VARCHAR},
+      </if>
+      <if test="initialModulus != null">
+        #{initialModulus,jdbcType=INTEGER},
+      </if>
+      <if test="equipmentId != null">
+        #{equipmentId,jdbcType=INTEGER},
+      </if>
+      <if test="belongProjectGrade != null">
+        #{belongProjectGrade,jdbcType=VARCHAR},
+      </if>
+      <if test="produceCompanyId != null">
+        #{produceCompanyId,jdbcType=INTEGER},
+      </if>
+      <if test="runTimes != null">
+        #{runTimes,jdbcType=INTEGER},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.js.kbt.model.TbMouldExample" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    select count(*) from tb_mould
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    update tb_mould
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=INTEGER},
+      </if>
+      <if test="record.modelNo != null">
+        model_no = #{record.modelNo,jdbcType=VARCHAR},
+      </if>
+      <if test="record.modelName != null">
+        model_name = #{record.modelName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.waterGap != null">
+        water_gap = #{record.waterGap,jdbcType=DECIMAL},
+      </if>
+      <if test="record.tonnage != null">
+        tonnage = #{record.tonnage,jdbcType=DECIMAL},
+      </if>
+      <if test="record.ocCycle != null">
+        oc_cycle = #{record.ocCycle,jdbcType=DECIMAL},
+      </if>
+      <if test="record.dailyOutput != null">
+        daily_output = #{record.dailyOutput,jdbcType=DECIMAL},
+      </if>
+      <if test="record.companyId != null">
+        company_id = #{record.companyId,jdbcType=INTEGER},
+      </if>
+      <if test="record.currentVersionId != null">
+        current_version_id = #{record.currentVersionId,jdbcType=INTEGER},
+      </if>
+      <if test="record.state != null">
+        state = #{record.state,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isDelete != null">
+        is_delete = #{record.isDelete,jdbcType=INTEGER},
+      </if>
+      <if test="record.creatorId != null">
+        creator_id = #{record.creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="record.projectId != null">
+        project_id = #{record.projectId,jdbcType=INTEGER},
+      </if>
+      <if test="record.rfid != null">
+        rfid = #{record.rfid,jdbcType=VARCHAR},
+      </if>
+      <if test="record.settingLife != null">
+        setting_life = #{record.settingLife,jdbcType=INTEGER},
+      </if>
+      <if test="record.area != null">
+        area = #{record.area,jdbcType=VARCHAR},
+      </if>
+      <if test="record.factoryId != null">
+        factory_id = #{record.factoryId,jdbcType=INTEGER},
+      </if>
+      <if test="record.factoryName != null">
+        factory_name = #{record.factoryName,jdbcType=VARCHAR},
+      </if>
+      <if test="record.initialModulus != null">
+        initial_modulus = #{record.initialModulus,jdbcType=INTEGER},
+      </if>
+      <if test="record.equipmentId != null">
+        equipment_id = #{record.equipmentId,jdbcType=INTEGER},
+      </if>
+      <if test="record.belongProjectGrade != null">
+        belong_project_grade = #{record.belongProjectGrade,jdbcType=VARCHAR},
+      </if>
+      <if test="record.produceCompanyId != null">
+        produce_company_id = #{record.produceCompanyId,jdbcType=INTEGER},
+      </if>
+      <if test="record.runTimes != null">
+        run_times = #{record.runTimes,jdbcType=INTEGER},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    update tb_mould
+    set id = #{record.id,jdbcType=INTEGER},
+      model_no = #{record.modelNo,jdbcType=VARCHAR},
+      model_name = #{record.modelName,jdbcType=VARCHAR},
+      water_gap = #{record.waterGap,jdbcType=DECIMAL},
+      tonnage = #{record.tonnage,jdbcType=DECIMAL},
+      oc_cycle = #{record.ocCycle,jdbcType=DECIMAL},
+      daily_output = #{record.dailyOutput,jdbcType=DECIMAL},
+      company_id = #{record.companyId,jdbcType=INTEGER},
+      current_version_id = #{record.currentVersionId,jdbcType=INTEGER},
+      state = #{record.state,jdbcType=VARCHAR},
+      is_delete = #{record.isDelete,jdbcType=INTEGER},
+      creator_id = #{record.creatorId,jdbcType=INTEGER},
+      project_id = #{record.projectId,jdbcType=INTEGER},
+      rfid = #{record.rfid,jdbcType=VARCHAR},
+      setting_life = #{record.settingLife,jdbcType=INTEGER},
+      area = #{record.area,jdbcType=VARCHAR},
+      factory_id = #{record.factoryId,jdbcType=INTEGER},
+      factory_name = #{record.factoryName,jdbcType=VARCHAR},
+      initial_modulus = #{record.initialModulus,jdbcType=INTEGER},
+      equipment_id = #{record.equipmentId,jdbcType=INTEGER},
+      belong_project_grade = #{record.belongProjectGrade,jdbcType=VARCHAR},
+      produce_company_id = #{record.produceCompanyId,jdbcType=INTEGER},
+      run_times = #{record.runTimes,jdbcType=INTEGER}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.js.kbt.model.TbMould">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    update tb_mould
+    <set>
+      <if test="modelNo != null">
+        model_no = #{modelNo,jdbcType=VARCHAR},
+      </if>
+      <if test="modelName != null">
+        model_name = #{modelName,jdbcType=VARCHAR},
+      </if>
+      <if test="waterGap != null">
+        water_gap = #{waterGap,jdbcType=DECIMAL},
+      </if>
+      <if test="tonnage != null">
+        tonnage = #{tonnage,jdbcType=DECIMAL},
+      </if>
+      <if test="ocCycle != null">
+        oc_cycle = #{ocCycle,jdbcType=DECIMAL},
+      </if>
+      <if test="dailyOutput != null">
+        daily_output = #{dailyOutput,jdbcType=DECIMAL},
+      </if>
+      <if test="companyId != null">
+        company_id = #{companyId,jdbcType=INTEGER},
+      </if>
+      <if test="currentVersionId != null">
+        current_version_id = #{currentVersionId,jdbcType=INTEGER},
+      </if>
+      <if test="state != null">
+        state = #{state,jdbcType=VARCHAR},
+      </if>
+      <if test="isDelete != null">
+        is_delete = #{isDelete,jdbcType=INTEGER},
+      </if>
+      <if test="creatorId != null">
+        creator_id = #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="projectId != null">
+        project_id = #{projectId,jdbcType=INTEGER},
+      </if>
+      <if test="rfid != null">
+        rfid = #{rfid,jdbcType=VARCHAR},
+      </if>
+      <if test="settingLife != null">
+        setting_life = #{settingLife,jdbcType=INTEGER},
+      </if>
+      <if test="area != null">
+        area = #{area,jdbcType=VARCHAR},
+      </if>
+      <if test="factoryId != null">
+        factory_id = #{factoryId,jdbcType=INTEGER},
+      </if>
+      <if test="factoryName != null">
+        factory_name = #{factoryName,jdbcType=VARCHAR},
+      </if>
+      <if test="initialModulus != null">
+        initial_modulus = #{initialModulus,jdbcType=INTEGER},
+      </if>
+      <if test="equipmentId != null">
+        equipment_id = #{equipmentId,jdbcType=INTEGER},
+      </if>
+      <if test="belongProjectGrade != null">
+        belong_project_grade = #{belongProjectGrade,jdbcType=VARCHAR},
+      </if>
+      <if test="produceCompanyId != null">
+        produce_company_id = #{produceCompanyId,jdbcType=INTEGER},
+      </if>
+      <if test="runTimes != null">
+        run_times = #{runTimes,jdbcType=INTEGER},
+      </if>
+    </set>
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.js.kbt.model.TbMould">
+    <!--
+      WARNING - @mbg.generated
+      This element is automatically generated by MyBatis Generator, do not modify.
+      This element was generated on Mon Aug 05 15:13:45 CST 2019.
+    -->
+    update tb_mould
+    set model_no = #{modelNo,jdbcType=VARCHAR},
+      model_name = #{modelName,jdbcType=VARCHAR},
+      water_gap = #{waterGap,jdbcType=DECIMAL},
+      tonnage = #{tonnage,jdbcType=DECIMAL},
+      oc_cycle = #{ocCycle,jdbcType=DECIMAL},
+      daily_output = #{dailyOutput,jdbcType=DECIMAL},
+      company_id = #{companyId,jdbcType=INTEGER},
+      current_version_id = #{currentVersionId,jdbcType=INTEGER},
+      state = #{state,jdbcType=VARCHAR},
+      is_delete = #{isDelete,jdbcType=INTEGER},
+      creator_id = #{creatorId,jdbcType=INTEGER},
+      project_id = #{projectId,jdbcType=INTEGER},
+      rfid = #{rfid,jdbcType=VARCHAR},
+      setting_life = #{settingLife,jdbcType=INTEGER},
+      area = #{area,jdbcType=VARCHAR},
+      factory_id = #{factoryId,jdbcType=INTEGER},
+      factory_name = #{factoryName,jdbcType=VARCHAR},
+      initial_modulus = #{initialModulus,jdbcType=INTEGER},
+      equipment_id = #{equipmentId,jdbcType=INTEGER},
+      belong_project_grade = #{belongProjectGrade,jdbcType=VARCHAR},
+      produce_company_id = #{produceCompanyId,jdbcType=INTEGER},
+      run_times = #{runTimes,jdbcType=INTEGER}
+    where id = #{id,jdbcType=INTEGER}
+  </update>
+</mapper>

cloud-socket/src/com/js/kbt/model/MouldHistory.java

@@ -6,109 +6,109 @@ public class MouldHistory {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.id
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private Long id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.sim
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private String sim;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.model_no
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.equipment_no
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
-	private String modelNo;
+	private String equipmentNo;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.version
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private String version;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.status
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private String status;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.lng
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private String lng;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.lat
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private String lat;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.gprs_lac
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private String gprsLac;
 	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.gprs_ic
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.gprs_ci
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
-	private String gprsIc;
+	private String gprsCi;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.wifi_bbsid
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private String wifiBbsid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.temperature
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private Integer temperature;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.battery
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private Integer battery;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.sig_2g
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private Integer sig2g;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.sig_nb
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private Integer sigNb;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.sig_wifi
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private Integer sigWifi;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.ext0
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private String ext0;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.alarm
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private Integer alarm;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.run_cnt
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private Integer runCnt;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.crc_code
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private String crcCode;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history.indate
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	private Date indate;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.id
 	 * @return  the value of mould_history.id
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public Long getId() {
 		return id;
@@ -117,7 +117,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.id
 	 * @param id  the value for mould_history.id
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setId(Long id) {
 		this.id = id;
@@ -126,7 +126,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.sim
 	 * @return  the value of mould_history.sim
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public String getSim() {
 		return sim;
@@ -135,34 +135,34 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.sim
 	 * @param sim  the value for mould_history.sim
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setSim(String sim) {
 		this.sim = sim;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.model_no
-	 * @return  the value of mould_history.model_no
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.equipment_no
+	 * @return  the value of mould_history.equipment_no
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
-	public String getModelNo() {
-		return modelNo;
+	public String getEquipmentNo() {
+		return equipmentNo;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.model_no
-	 * @param modelNo  the value for mould_history.model_no
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.equipment_no
+	 * @param equipmentNo  the value for mould_history.equipment_no
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
-	public void setModelNo(String modelNo) {
-		this.modelNo = modelNo;
+	public void setEquipmentNo(String equipmentNo) {
+		this.equipmentNo = equipmentNo;
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.version
 	 * @return  the value of mould_history.version
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public String getVersion() {
 		return version;
@@ -171,7 +171,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.version
 	 * @param version  the value for mould_history.version
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setVersion(String version) {
 		this.version = version;
@@ -180,7 +180,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.status
 	 * @return  the value of mould_history.status
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public String getStatus() {
 		return status;
@@ -189,7 +189,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.status
 	 * @param status  the value for mould_history.status
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setStatus(String status) {
 		this.status = status;
@@ -198,7 +198,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.lng
 	 * @return  the value of mould_history.lng
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public String getLng() {
 		return lng;
@@ -207,7 +207,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.lng
 	 * @param lng  the value for mould_history.lng
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setLng(String lng) {
 		this.lng = lng;
@@ -216,7 +216,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.lat
 	 * @return  the value of mould_history.lat
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public String getLat() {
 		return lat;
@@ -225,7 +225,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.lat
 	 * @param lat  the value for mould_history.lat
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setLat(String lat) {
 		this.lat = lat;
@@ -234,7 +234,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.gprs_lac
 	 * @return  the value of mould_history.gprs_lac
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public String getGprsLac() {
 		return gprsLac;
@@ -243,34 +243,34 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.gprs_lac
 	 * @param gprsLac  the value for mould_history.gprs_lac
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setGprsLac(String gprsLac) {
 		this.gprsLac = gprsLac;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.gprs_ic
-	 * @return  the value of mould_history.gprs_ic
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.gprs_ci
+	 * @return  the value of mould_history.gprs_ci
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
-	public String getGprsIc() {
-		return gprsIc;
+	public String getGprsCi() {
+		return gprsCi;
 	}
 
 	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.gprs_ic
-	 * @param gprsIc  the value for mould_history.gprs_ic
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.gprs_ci
+	 * @param gprsCi  the value for mould_history.gprs_ci
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
-	public void setGprsIc(String gprsIc) {
-		this.gprsIc = gprsIc;
+	public void setGprsCi(String gprsCi) {
+		this.gprsCi = gprsCi;
 	}
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.wifi_bbsid
 	 * @return  the value of mould_history.wifi_bbsid
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public String getWifiBbsid() {
 		return wifiBbsid;
@@ -279,7 +279,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.wifi_bbsid
 	 * @param wifiBbsid  the value for mould_history.wifi_bbsid
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setWifiBbsid(String wifiBbsid) {
 		this.wifiBbsid = wifiBbsid;
@@ -288,7 +288,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.temperature
 	 * @return  the value of mould_history.temperature
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public Integer getTemperature() {
 		return temperature;
@@ -297,7 +297,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.temperature
 	 * @param temperature  the value for mould_history.temperature
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setTemperature(Integer temperature) {
 		this.temperature = temperature;
@@ -306,7 +306,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.battery
 	 * @return  the value of mould_history.battery
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public Integer getBattery() {
 		return battery;
@@ -315,7 +315,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.battery
 	 * @param battery  the value for mould_history.battery
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setBattery(Integer battery) {
 		this.battery = battery;
@@ -324,7 +324,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.sig_2g
 	 * @return  the value of mould_history.sig_2g
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public Integer getSig2g() {
 		return sig2g;
@@ -333,7 +333,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.sig_2g
 	 * @param sig2g  the value for mould_history.sig_2g
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setSig2g(Integer sig2g) {
 		this.sig2g = sig2g;
@@ -342,7 +342,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.sig_nb
 	 * @return  the value of mould_history.sig_nb
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public Integer getSigNb() {
 		return sigNb;
@@ -351,7 +351,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.sig_nb
 	 * @param sigNb  the value for mould_history.sig_nb
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setSigNb(Integer sigNb) {
 		this.sigNb = sigNb;
@@ -360,7 +360,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.sig_wifi
 	 * @return  the value of mould_history.sig_wifi
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public Integer getSigWifi() {
 		return sigWifi;
@@ -369,7 +369,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.sig_wifi
 	 * @param sigWifi  the value for mould_history.sig_wifi
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setSigWifi(Integer sigWifi) {
 		this.sigWifi = sigWifi;
@@ -378,7 +378,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.ext0
 	 * @return  the value of mould_history.ext0
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public String getExt0() {
 		return ext0;
@@ -387,7 +387,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.ext0
 	 * @param ext0  the value for mould_history.ext0
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setExt0(String ext0) {
 		this.ext0 = ext0;
@@ -396,7 +396,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.alarm
 	 * @return  the value of mould_history.alarm
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public Integer getAlarm() {
 		return alarm;
@@ -405,7 +405,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.alarm
 	 * @param alarm  the value for mould_history.alarm
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setAlarm(Integer alarm) {
 		this.alarm = alarm;
@@ -414,7 +414,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.run_cnt
 	 * @return  the value of mould_history.run_cnt
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public Integer getRunCnt() {
 		return runCnt;
@@ -423,7 +423,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.run_cnt
 	 * @param runCnt  the value for mould_history.run_cnt
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setRunCnt(Integer runCnt) {
 		this.runCnt = runCnt;
@@ -432,7 +432,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.crc_code
 	 * @return  the value of mould_history.crc_code
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public String getCrcCode() {
 		return crcCode;
@@ -441,7 +441,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.crc_code
 	 * @param crcCode  the value for mould_history.crc_code
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setCrcCode(String crcCode) {
 		this.crcCode = crcCode;
@@ -450,7 +450,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history.indate
 	 * @return  the value of mould_history.indate
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public Date getIndate() {
 		return indate;
@@ -459,7 +459,7 @@ public class MouldHistory {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history.indate
 	 * @param indate  the value for mould_history.indate
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setIndate(Date indate) {
 		this.indate = indate;

cloud-socket/src/com/js/kbt/model/MouldHistoryExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class MouldHistoryExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public MouldHistoryExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class MouldHistoryExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class MouldHistoryExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class MouldHistoryExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class MouldHistoryExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class MouldHistoryExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class MouldHistoryExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class MouldHistoryExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class MouldHistoryExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class MouldHistoryExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class MouldHistoryExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class MouldHistoryExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -293,73 +293,73 @@ public class MouldHistoryExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andModelNoIsNull() {
-			addCriterion("model_no is null");
+		public Criteria andEquipmentNoIsNull() {
+			addCriterion("equipment_no is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andModelNoIsNotNull() {
-			addCriterion("model_no is not null");
+		public Criteria andEquipmentNoIsNotNull() {
+			addCriterion("equipment_no is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andModelNoEqualTo(String value) {
-			addCriterion("model_no =", value, "modelNo");
+		public Criteria andEquipmentNoEqualTo(String value) {
+			addCriterion("equipment_no =", value, "equipmentNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andModelNoNotEqualTo(String value) {
-			addCriterion("model_no <>", value, "modelNo");
+		public Criteria andEquipmentNoNotEqualTo(String value) {
+			addCriterion("equipment_no <>", value, "equipmentNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andModelNoGreaterThan(String value) {
-			addCriterion("model_no >", value, "modelNo");
+		public Criteria andEquipmentNoGreaterThan(String value) {
+			addCriterion("equipment_no >", value, "equipmentNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andModelNoGreaterThanOrEqualTo(String value) {
-			addCriterion("model_no >=", value, "modelNo");
+		public Criteria andEquipmentNoGreaterThanOrEqualTo(String value) {
+			addCriterion("equipment_no >=", value, "equipmentNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andModelNoLessThan(String value) {
-			addCriterion("model_no <", value, "modelNo");
+		public Criteria andEquipmentNoLessThan(String value) {
+			addCriterion("equipment_no <", value, "equipmentNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andModelNoLessThanOrEqualTo(String value) {
-			addCriterion("model_no <=", value, "modelNo");
+		public Criteria andEquipmentNoLessThanOrEqualTo(String value) {
+			addCriterion("equipment_no <=", value, "equipmentNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andModelNoLike(String value) {
-			addCriterion("model_no like", value, "modelNo");
+		public Criteria andEquipmentNoLike(String value) {
+			addCriterion("equipment_no like", value, "equipmentNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andModelNoNotLike(String value) {
-			addCriterion("model_no not like", value, "modelNo");
+		public Criteria andEquipmentNoNotLike(String value) {
+			addCriterion("equipment_no not like", value, "equipmentNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andModelNoIn(List<String> values) {
-			addCriterion("model_no in", values, "modelNo");
+		public Criteria andEquipmentNoIn(List<String> values) {
+			addCriterion("equipment_no in", values, "equipmentNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andModelNoNotIn(List<String> values) {
-			addCriterion("model_no not in", values, "modelNo");
+		public Criteria andEquipmentNoNotIn(List<String> values) {
+			addCriterion("equipment_no not in", values, "equipmentNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andModelNoBetween(String value1, String value2) {
-			addCriterion("model_no between", value1, value2, "modelNo");
+		public Criteria andEquipmentNoBetween(String value1, String value2) {
+			addCriterion("equipment_no between", value1, value2, "equipmentNo");
 			return (Criteria) this;
 		}
 
-		public Criteria andModelNoNotBetween(String value1, String value2) {
-			addCriterion("model_no not between", value1, value2, "modelNo");
+		public Criteria andEquipmentNoNotBetween(String value1, String value2) {
+			addCriterion("equipment_no not between", value1, value2, "equipmentNo");
 			return (Criteria) this;
 		}
 
@@ -713,73 +713,73 @@ public class MouldHistoryExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andGprsIcIsNull() {
-			addCriterion("gprs_ic is null");
+		public Criteria andGprsCiIsNull() {
+			addCriterion("gprs_ci is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andGprsIcIsNotNull() {
-			addCriterion("gprs_ic is not null");
+		public Criteria andGprsCiIsNotNull() {
+			addCriterion("gprs_ci is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andGprsIcEqualTo(String value) {
-			addCriterion("gprs_ic =", value, "gprsIc");
+		public Criteria andGprsCiEqualTo(String value) {
+			addCriterion("gprs_ci =", value, "gprsCi");
 			return (Criteria) this;
 		}
 
-		public Criteria andGprsIcNotEqualTo(String value) {
-			addCriterion("gprs_ic <>", value, "gprsIc");
+		public Criteria andGprsCiNotEqualTo(String value) {
+			addCriterion("gprs_ci <>", value, "gprsCi");
 			return (Criteria) this;
 		}
 
-		public Criteria andGprsIcGreaterThan(String value) {
-			addCriterion("gprs_ic >", value, "gprsIc");
+		public Criteria andGprsCiGreaterThan(String value) {
+			addCriterion("gprs_ci >", value, "gprsCi");
 			return (Criteria) this;
 		}
 
-		public Criteria andGprsIcGreaterThanOrEqualTo(String value) {
-			addCriterion("gprs_ic >=", value, "gprsIc");
+		public Criteria andGprsCiGreaterThanOrEqualTo(String value) {
+			addCriterion("gprs_ci >=", value, "gprsCi");
 			return (Criteria) this;
 		}
 
-		public Criteria andGprsIcLessThan(String value) {
-			addCriterion("gprs_ic <", value, "gprsIc");
+		public Criteria andGprsCiLessThan(String value) {
+			addCriterion("gprs_ci <", value, "gprsCi");
 			return (Criteria) this;
 		}
 
-		public Criteria andGprsIcLessThanOrEqualTo(String value) {
-			addCriterion("gprs_ic <=", value, "gprsIc");
+		public Criteria andGprsCiLessThanOrEqualTo(String value) {
+			addCriterion("gprs_ci <=", value, "gprsCi");
 			return (Criteria) this;
 		}
 
-		public Criteria andGprsIcLike(String value) {
-			addCriterion("gprs_ic like", value, "gprsIc");
+		public Criteria andGprsCiLike(String value) {
+			addCriterion("gprs_ci like", value, "gprsCi");
 			return (Criteria) this;
 		}
 
-		public Criteria andGprsIcNotLike(String value) {
-			addCriterion("gprs_ic not like", value, "gprsIc");
+		public Criteria andGprsCiNotLike(String value) {
+			addCriterion("gprs_ci not like", value, "gprsCi");
 			return (Criteria) this;
 		}
 
-		public Criteria andGprsIcIn(List<String> values) {
-			addCriterion("gprs_ic in", values, "gprsIc");
+		public Criteria andGprsCiIn(List<String> values) {
+			addCriterion("gprs_ci in", values, "gprsCi");
 			return (Criteria) this;
 		}
 
-		public Criteria andGprsIcNotIn(List<String> values) {
-			addCriterion("gprs_ic not in", values, "gprsIc");
+		public Criteria andGprsCiNotIn(List<String> values) {
+			addCriterion("gprs_ci not in", values, "gprsCi");
 			return (Criteria) this;
 		}
 
-		public Criteria andGprsIcBetween(String value1, String value2) {
-			addCriterion("gprs_ic between", value1, value2, "gprsIc");
+		public Criteria andGprsCiBetween(String value1, String value2) {
+			addCriterion("gprs_ci between", value1, value2, "gprsCi");
 			return (Criteria) this;
 		}
 
-		public Criteria andGprsIcNotBetween(String value1, String value2) {
-			addCriterion("gprs_ic not between", value1, value2, "gprsIc");
+		public Criteria andGprsCiNotBetween(String value1, String value2) {
+			addCriterion("gprs_ci not between", value1, value2, "gprsCi");
 			return (Criteria) this;
 		}
 
@@ -1476,7 +1476,7 @@ public class MouldHistoryExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table mould_history
-	 * @mbg.generated  Thu Aug 01 15:49:20 CST 2019
+	 * @mbg.generated  Mon Aug 05 16:59:03 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

cloud-socket/src/com/js/kbt/model/MouldHistoryTime.java

@@ -0,0 +1,122 @@
+package com.js.kbt.model;
+
+import java.util.Date;
+
+public class MouldHistoryTime {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history_time.history_id
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	private Long historyId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history_time.seq
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	private Integer seq;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history_time.close_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	private Date closeTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history_time.open_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	private Date openTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column mould_history_time.time_cost
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	private Integer timeCost;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history_time.history_id
+	 * @return  the value of mould_history_time.history_id
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public Long getHistoryId() {
+		return historyId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history_time.history_id
+	 * @param historyId  the value for mould_history_time.history_id
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public void setHistoryId(Long historyId) {
+		this.historyId = historyId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history_time.seq
+	 * @return  the value of mould_history_time.seq
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public Integer getSeq() {
+		return seq;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history_time.seq
+	 * @param seq  the value for mould_history_time.seq
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public void setSeq(Integer seq) {
+		this.seq = seq;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history_time.close_time
+	 * @return  the value of mould_history_time.close_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public Date getCloseTime() {
+		return closeTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history_time.close_time
+	 * @param closeTime  the value for mould_history_time.close_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public void setCloseTime(Date closeTime) {
+		this.closeTime = closeTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history_time.open_time
+	 * @return  the value of mould_history_time.open_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public Date getOpenTime() {
+		return openTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history_time.open_time
+	 * @param openTime  the value for mould_history_time.open_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public void setOpenTime(Date openTime) {
+		this.openTime = openTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column mould_history_time.time_cost
+	 * @return  the value of mould_history_time.time_cost
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public Integer getTimeCost() {
+		return timeCost;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column mould_history_time.time_cost
+	 * @param timeCost  the value for mould_history_time.time_cost
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public void setTimeCost(Integer timeCost) {
+		this.timeCost = timeCost;
+	}
+}

cloud-socket/src/com/js/kbt/model/MouldHistoryTimeExample.java

@@ -0,0 +1,562 @@
+package com.js.kbt.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class MouldHistoryTimeExample {
+    /**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	protected String orderByClause;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	protected boolean distinct;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	protected List<Criteria> oredCriteria;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public MouldHistoryTimeExample() {
+		oredCriteria = new ArrayList<Criteria>();
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public void setOrderByClause(String orderByClause) {
+		this.orderByClause = orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public String getOrderByClause() {
+		return orderByClause;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public void setDistinct(boolean distinct) {
+		this.distinct = distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public boolean isDistinct() {
+		return distinct;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public List<Criteria> getOredCriteria() {
+		return oredCriteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public void or(Criteria criteria) {
+		oredCriteria.add(criteria);
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public Criteria or() {
+		Criteria criteria = createCriteriaInternal();
+		oredCriteria.add(criteria);
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public Criteria createCriteria() {
+		Criteria criteria = createCriteriaInternal();
+		if (oredCriteria.size() == 0) {
+			oredCriteria.add(criteria);
+		}
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	protected Criteria createCriteriaInternal() {
+		Criteria criteria = new Criteria();
+		return criteria;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public void clear() {
+		oredCriteria.clear();
+		orderByClause = null;
+		distinct = false;
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	protected abstract static class GeneratedCriteria {
+		protected List<Criterion> criteria;
+
+		protected GeneratedCriteria() {
+			super();
+			criteria = new ArrayList<Criterion>();
+		}
+
+		public boolean isValid() {
+			return criteria.size() > 0;
+		}
+
+		public List<Criterion> getAllCriteria() {
+			return criteria;
+		}
+
+		public List<Criterion> getCriteria() {
+			return criteria;
+		}
+
+		protected void addCriterion(String condition) {
+			if (condition == null) {
+				throw new RuntimeException("Value for condition cannot be null");
+			}
+			criteria.add(new Criterion(condition));
+		}
+
+		protected void addCriterion(String condition, Object value, String property) {
+			if (value == null) {
+				throw new RuntimeException("Value for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value));
+		}
+
+		protected void addCriterion(String condition, Object value1, Object value2, String property) {
+			if (value1 == null || value2 == null) {
+				throw new RuntimeException("Between values for " + property + " cannot be null");
+			}
+			criteria.add(new Criterion(condition, value1, value2));
+		}
+
+		public Criteria andHistoryIdIsNull() {
+			addCriterion("history_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryIdIsNotNull() {
+			addCriterion("history_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryIdEqualTo(Long value) {
+			addCriterion("history_id =", value, "historyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryIdNotEqualTo(Long value) {
+			addCriterion("history_id <>", value, "historyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryIdGreaterThan(Long value) {
+			addCriterion("history_id >", value, "historyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryIdGreaterThanOrEqualTo(Long value) {
+			addCriterion("history_id >=", value, "historyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryIdLessThan(Long value) {
+			addCriterion("history_id <", value, "historyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryIdLessThanOrEqualTo(Long value) {
+			addCriterion("history_id <=", value, "historyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryIdIn(List<Long> values) {
+			addCriterion("history_id in", values, "historyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryIdNotIn(List<Long> values) {
+			addCriterion("history_id not in", values, "historyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryIdBetween(Long value1, Long value2) {
+			addCriterion("history_id between", value1, value2, "historyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryIdNotBetween(Long value1, Long value2) {
+			addCriterion("history_id not between", value1, value2, "historyId");
+			return (Criteria) this;
+		}
+
+		public Criteria andSeqIsNull() {
+			addCriterion("seq is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSeqIsNotNull() {
+			addCriterion("seq is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSeqEqualTo(Integer value) {
+			addCriterion("seq =", value, "seq");
+			return (Criteria) this;
+		}
+
+		public Criteria andSeqNotEqualTo(Integer value) {
+			addCriterion("seq <>", value, "seq");
+			return (Criteria) this;
+		}
+
+		public Criteria andSeqGreaterThan(Integer value) {
+			addCriterion("seq >", value, "seq");
+			return (Criteria) this;
+		}
+
+		public Criteria andSeqGreaterThanOrEqualTo(Integer value) {
+			addCriterion("seq >=", value, "seq");
+			return (Criteria) this;
+		}
+
+		public Criteria andSeqLessThan(Integer value) {
+			addCriterion("seq <", value, "seq");
+			return (Criteria) this;
+		}
+
+		public Criteria andSeqLessThanOrEqualTo(Integer value) {
+			addCriterion("seq <=", value, "seq");
+			return (Criteria) this;
+		}
+
+		public Criteria andSeqIn(List<Integer> values) {
+			addCriterion("seq in", values, "seq");
+			return (Criteria) this;
+		}
+
+		public Criteria andSeqNotIn(List<Integer> values) {
+			addCriterion("seq not in", values, "seq");
+			return (Criteria) this;
+		}
+
+		public Criteria andSeqBetween(Integer value1, Integer value2) {
+			addCriterion("seq between", value1, value2, "seq");
+			return (Criteria) this;
+		}
+
+		public Criteria andSeqNotBetween(Integer value1, Integer value2) {
+			addCriterion("seq not between", value1, value2, "seq");
+			return (Criteria) this;
+		}
+
+		public Criteria andCloseTimeIsNull() {
+			addCriterion("close_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCloseTimeIsNotNull() {
+			addCriterion("close_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCloseTimeEqualTo(Date value) {
+			addCriterion("close_time =", value, "closeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCloseTimeNotEqualTo(Date value) {
+			addCriterion("close_time <>", value, "closeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCloseTimeGreaterThan(Date value) {
+			addCriterion("close_time >", value, "closeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCloseTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("close_time >=", value, "closeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCloseTimeLessThan(Date value) {
+			addCriterion("close_time <", value, "closeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCloseTimeLessThanOrEqualTo(Date value) {
+			addCriterion("close_time <=", value, "closeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCloseTimeIn(List<Date> values) {
+			addCriterion("close_time in", values, "closeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCloseTimeNotIn(List<Date> values) {
+			addCriterion("close_time not in", values, "closeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCloseTimeBetween(Date value1, Date value2) {
+			addCriterion("close_time between", value1, value2, "closeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andCloseTimeNotBetween(Date value1, Date value2) {
+			addCriterion("close_time not between", value1, value2, "closeTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andOpenTimeIsNull() {
+			addCriterion("open_time is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOpenTimeIsNotNull() {
+			addCriterion("open_time is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andOpenTimeEqualTo(Date value) {
+			addCriterion("open_time =", value, "openTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andOpenTimeNotEqualTo(Date value) {
+			addCriterion("open_time <>", value, "openTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andOpenTimeGreaterThan(Date value) {
+			addCriterion("open_time >", value, "openTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andOpenTimeGreaterThanOrEqualTo(Date value) {
+			addCriterion("open_time >=", value, "openTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andOpenTimeLessThan(Date value) {
+			addCriterion("open_time <", value, "openTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andOpenTimeLessThanOrEqualTo(Date value) {
+			addCriterion("open_time <=", value, "openTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andOpenTimeIn(List<Date> values) {
+			addCriterion("open_time in", values, "openTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andOpenTimeNotIn(List<Date> values) {
+			addCriterion("open_time not in", values, "openTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andOpenTimeBetween(Date value1, Date value2) {
+			addCriterion("open_time between", value1, value2, "openTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andOpenTimeNotBetween(Date value1, Date value2) {
+			addCriterion("open_time not between", value1, value2, "openTime");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimeCostIsNull() {
+			addCriterion("time_cost is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimeCostIsNotNull() {
+			addCriterion("time_cost is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimeCostEqualTo(Integer value) {
+			addCriterion("time_cost =", value, "timeCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimeCostNotEqualTo(Integer value) {
+			addCriterion("time_cost <>", value, "timeCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimeCostGreaterThan(Integer value) {
+			addCriterion("time_cost >", value, "timeCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimeCostGreaterThanOrEqualTo(Integer value) {
+			addCriterion("time_cost >=", value, "timeCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimeCostLessThan(Integer value) {
+			addCriterion("time_cost <", value, "timeCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimeCostLessThanOrEqualTo(Integer value) {
+			addCriterion("time_cost <=", value, "timeCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimeCostIn(List<Integer> values) {
+			addCriterion("time_cost in", values, "timeCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimeCostNotIn(List<Integer> values) {
+			addCriterion("time_cost not in", values, "timeCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimeCostBetween(Integer value1, Integer value2) {
+			addCriterion("time_cost between", value1, value2, "timeCost");
+			return (Criteria) this;
+		}
+
+		public Criteria andTimeCostNotBetween(Integer value1, Integer value2) {
+			addCriterion("time_cost not between", value1, value2, "timeCost");
+			return (Criteria) this;
+		}
+	}
+
+	/**
+	 * This class was generated by MyBatis Generator. This class corresponds to the database table mould_history_time
+	 * @mbg.generated  Mon Aug 05 15:38:00 CST 2019
+	 */
+	public static class Criterion {
+		private String condition;
+		private Object value;
+		private Object secondValue;
+		private boolean noValue;
+		private boolean singleValue;
+		private boolean betweenValue;
+		private boolean listValue;
+		private String typeHandler;
+
+		public String getCondition() {
+			return condition;
+		}
+
+		public Object getValue() {
+			return value;
+		}
+
+		public Object getSecondValue() {
+			return secondValue;
+		}
+
+		public boolean isNoValue() {
+			return noValue;
+		}
+
+		public boolean isSingleValue() {
+			return singleValue;
+		}
+
+		public boolean isBetweenValue() {
+			return betweenValue;
+		}
+
+		public boolean isListValue() {
+			return listValue;
+		}
+
+		public String getTypeHandler() {
+			return typeHandler;
+		}
+
+		protected Criterion(String condition) {
+			super();
+			this.condition = condition;
+			this.typeHandler = null;
+			this.noValue = true;
+		}
+
+		protected Criterion(String condition, Object value, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.typeHandler = typeHandler;
+			if (value instanceof List<?>) {
+				this.listValue = true;
+			} else {
+				this.singleValue = true;
+			}
+		}
+
+		protected Criterion(String condition, Object value) {
+			this(condition, value, null);
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+			super();
+			this.condition = condition;
+			this.value = value;
+			this.secondValue = secondValue;
+			this.typeHandler = typeHandler;
+			this.betweenValue = true;
+		}
+
+		protected Criterion(String condition, Object value, Object secondValue) {
+			this(condition, value, secondValue, null);
+		}
+	}
+
+	/**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table mould_history_time
+     *
+     * @mbg.generated do_not_delete_during_merge Mon Aug 05 11:53:11 CST 2019
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+}

cloud-socket/src/com/js/kbt/model/TbFactory.java

@@ -0,0 +1,236 @@
+package com.js.kbt.model;
+
+import java.util.Date;
+
+public class TbFactory {
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column tb_factory.id
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    private Integer id;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column tb_factory.factory_name
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    private String factoryName;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column tb_factory.factory_area
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    private String factoryArea;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column tb_factory.y_lng
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    private String yLng;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column tb_factory.x_lat
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    private String xLat;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column tb_factory.indate
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    private Date indate;
+
+    /**
+     *
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database column tb_factory.company_id
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    private Integer companyId;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column tb_factory.id
+     *
+     * @return the value of tb_factory.id
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column tb_factory.id
+     *
+     * @param id the value for tb_factory.id
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column tb_factory.factory_name
+     *
+     * @return the value of tb_factory.factory_name
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public String getFactoryName() {
+        return factoryName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column tb_factory.factory_name
+     *
+     * @param factoryName the value for tb_factory.factory_name
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public void setFactoryName(String factoryName) {
+        this.factoryName = factoryName;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column tb_factory.factory_area
+     *
+     * @return the value of tb_factory.factory_area
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public String getFactoryArea() {
+        return factoryArea;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column tb_factory.factory_area
+     *
+     * @param factoryArea the value for tb_factory.factory_area
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public void setFactoryArea(String factoryArea) {
+        this.factoryArea = factoryArea;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column tb_factory.y_lng
+     *
+     * @return the value of tb_factory.y_lng
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public String getyLng() {
+        return yLng;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column tb_factory.y_lng
+     *
+     * @param yLng the value for tb_factory.y_lng
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public void setyLng(String yLng) {
+        this.yLng = yLng;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column tb_factory.x_lat
+     *
+     * @return the value of tb_factory.x_lat
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public String getxLat() {
+        return xLat;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column tb_factory.x_lat
+     *
+     * @param xLat the value for tb_factory.x_lat
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public void setxLat(String xLat) {
+        this.xLat = xLat;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column tb_factory.indate
+     *
+     * @return the value of tb_factory.indate
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public Date getIndate() {
+        return indate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column tb_factory.indate
+     *
+     * @param indate the value for tb_factory.indate
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public void setIndate(Date indate) {
+        this.indate = indate;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method returns the value of the database column tb_factory.company_id
+     *
+     * @return the value of tb_factory.company_id
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public Integer getCompanyId() {
+        return companyId;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method sets the value of the database column tb_factory.company_id
+     *
+     * @param companyId the value for tb_factory.company_id
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public void setCompanyId(Integer companyId) {
+        this.companyId = companyId;
+    }
+}

cloud-socket/src/com/js/kbt/model/TbFactoryExample.java

@@ -0,0 +1,763 @@
+package com.js.kbt.model;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class TbFactoryExample {
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    protected String orderByClause;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    protected boolean distinct;
+
+    /**
+     * This field was generated by MyBatis Generator.
+     * This field corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    protected List<Criteria> oredCriteria;
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public TbFactoryExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    /**
+     * This method was generated by MyBatis Generator.
+     * This method corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryNameIsNull() {
+            addCriterion("factory_name is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryNameIsNotNull() {
+            addCriterion("factory_name is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryNameEqualTo(String value) {
+            addCriterion("factory_name =", value, "factoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryNameNotEqualTo(String value) {
+            addCriterion("factory_name <>", value, "factoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryNameGreaterThan(String value) {
+            addCriterion("factory_name >", value, "factoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryNameGreaterThanOrEqualTo(String value) {
+            addCriterion("factory_name >=", value, "factoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryNameLessThan(String value) {
+            addCriterion("factory_name <", value, "factoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryNameLessThanOrEqualTo(String value) {
+            addCriterion("factory_name <=", value, "factoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryNameLike(String value) {
+            addCriterion("factory_name like", value, "factoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryNameNotLike(String value) {
+            addCriterion("factory_name not like", value, "factoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryNameIn(List<String> values) {
+            addCriterion("factory_name in", values, "factoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryNameNotIn(List<String> values) {
+            addCriterion("factory_name not in", values, "factoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryNameBetween(String value1, String value2) {
+            addCriterion("factory_name between", value1, value2, "factoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryNameNotBetween(String value1, String value2) {
+            addCriterion("factory_name not between", value1, value2, "factoryName");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryAreaIsNull() {
+            addCriterion("factory_area is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryAreaIsNotNull() {
+            addCriterion("factory_area is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryAreaEqualTo(String value) {
+            addCriterion("factory_area =", value, "factoryArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryAreaNotEqualTo(String value) {
+            addCriterion("factory_area <>", value, "factoryArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryAreaGreaterThan(String value) {
+            addCriterion("factory_area >", value, "factoryArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryAreaGreaterThanOrEqualTo(String value) {
+            addCriterion("factory_area >=", value, "factoryArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryAreaLessThan(String value) {
+            addCriterion("factory_area <", value, "factoryArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryAreaLessThanOrEqualTo(String value) {
+            addCriterion("factory_area <=", value, "factoryArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryAreaLike(String value) {
+            addCriterion("factory_area like", value, "factoryArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryAreaNotLike(String value) {
+            addCriterion("factory_area not like", value, "factoryArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryAreaIn(List<String> values) {
+            addCriterion("factory_area in", values, "factoryArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryAreaNotIn(List<String> values) {
+            addCriterion("factory_area not in", values, "factoryArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryAreaBetween(String value1, String value2) {
+            addCriterion("factory_area between", value1, value2, "factoryArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andFactoryAreaNotBetween(String value1, String value2) {
+            addCriterion("factory_area not between", value1, value2, "factoryArea");
+            return (Criteria) this;
+        }
+
+        public Criteria andYLngIsNull() {
+            addCriterion("y_lng is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYLngIsNotNull() {
+            addCriterion("y_lng is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andYLngEqualTo(String value) {
+            addCriterion("y_lng =", value, "yLng");
+            return (Criteria) this;
+        }
+
+        public Criteria andYLngNotEqualTo(String value) {
+            addCriterion("y_lng <>", value, "yLng");
+            return (Criteria) this;
+        }
+
+        public Criteria andYLngGreaterThan(String value) {
+            addCriterion("y_lng >", value, "yLng");
+            return (Criteria) this;
+        }
+
+        public Criteria andYLngGreaterThanOrEqualTo(String value) {
+            addCriterion("y_lng >=", value, "yLng");
+            return (Criteria) this;
+        }
+
+        public Criteria andYLngLessThan(String value) {
+            addCriterion("y_lng <", value, "yLng");
+            return (Criteria) this;
+        }
+
+        public Criteria andYLngLessThanOrEqualTo(String value) {
+            addCriterion("y_lng <=", value, "yLng");
+            return (Criteria) this;
+        }
+
+        public Criteria andYLngLike(String value) {
+            addCriterion("y_lng like", value, "yLng");
+            return (Criteria) this;
+        }
+
+        public Criteria andYLngNotLike(String value) {
+            addCriterion("y_lng not like", value, "yLng");
+            return (Criteria) this;
+        }
+
+        public Criteria andYLngIn(List<String> values) {
+            addCriterion("y_lng in", values, "yLng");
+            return (Criteria) this;
+        }
+
+        public Criteria andYLngNotIn(List<String> values) {
+            addCriterion("y_lng not in", values, "yLng");
+            return (Criteria) this;
+        }
+
+        public Criteria andYLngBetween(String value1, String value2) {
+            addCriterion("y_lng between", value1, value2, "yLng");
+            return (Criteria) this;
+        }
+
+        public Criteria andYLngNotBetween(String value1, String value2) {
+            addCriterion("y_lng not between", value1, value2, "yLng");
+            return (Criteria) this;
+        }
+
+        public Criteria andXLatIsNull() {
+            addCriterion("x_lat is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andXLatIsNotNull() {
+            addCriterion("x_lat is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andXLatEqualTo(String value) {
+            addCriterion("x_lat =", value, "xLat");
+            return (Criteria) this;
+        }
+
+        public Criteria andXLatNotEqualTo(String value) {
+            addCriterion("x_lat <>", value, "xLat");
+            return (Criteria) this;
+        }
+
+        public Criteria andXLatGreaterThan(String value) {
+            addCriterion("x_lat >", value, "xLat");
+            return (Criteria) this;
+        }
+
+        public Criteria andXLatGreaterThanOrEqualTo(String value) {
+            addCriterion("x_lat >=", value, "xLat");
+            return (Criteria) this;
+        }
+
+        public Criteria andXLatLessThan(String value) {
+            addCriterion("x_lat <", value, "xLat");
+            return (Criteria) this;
+        }
+
+        public Criteria andXLatLessThanOrEqualTo(String value) {
+            addCriterion("x_lat <=", value, "xLat");
+            return (Criteria) this;
+        }
+
+        public Criteria andXLatLike(String value) {
+            addCriterion("x_lat like", value, "xLat");
+            return (Criteria) this;
+        }
+
+        public Criteria andXLatNotLike(String value) {
+            addCriterion("x_lat not like", value, "xLat");
+            return (Criteria) this;
+        }
+
+        public Criteria andXLatIn(List<String> values) {
+            addCriterion("x_lat in", values, "xLat");
+            return (Criteria) this;
+        }
+
+        public Criteria andXLatNotIn(List<String> values) {
+            addCriterion("x_lat not in", values, "xLat");
+            return (Criteria) this;
+        }
+
+        public Criteria andXLatBetween(String value1, String value2) {
+            addCriterion("x_lat between", value1, value2, "xLat");
+            return (Criteria) this;
+        }
+
+        public Criteria andXLatNotBetween(String value1, String value2) {
+            addCriterion("x_lat not between", value1, value2, "xLat");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndateIsNull() {
+            addCriterion("indate is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndateIsNotNull() {
+            addCriterion("indate is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndateEqualTo(Date value) {
+            addCriterion("indate =", value, "indate");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndateNotEqualTo(Date value) {
+            addCriterion("indate <>", value, "indate");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndateGreaterThan(Date value) {
+            addCriterion("indate >", value, "indate");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndateGreaterThanOrEqualTo(Date value) {
+            addCriterion("indate >=", value, "indate");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndateLessThan(Date value) {
+            addCriterion("indate <", value, "indate");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndateLessThanOrEqualTo(Date value) {
+            addCriterion("indate <=", value, "indate");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndateIn(List<Date> values) {
+            addCriterion("indate in", values, "indate");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndateNotIn(List<Date> values) {
+            addCriterion("indate not in", values, "indate");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndateBetween(Date value1, Date value2) {
+            addCriterion("indate between", value1, value2, "indate");
+            return (Criteria) this;
+        }
+
+        public Criteria andIndateNotBetween(Date value1, Date value2) {
+            addCriterion("indate not between", value1, value2, "indate");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNull() {
+            addCriterion("company_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIsNotNull() {
+            addCriterion("company_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdEqualTo(Integer value) {
+            addCriterion("company_id =", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotEqualTo(Integer value) {
+            addCriterion("company_id <>", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThan(Integer value) {
+            addCriterion("company_id >", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("company_id >=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThan(Integer value) {
+            addCriterion("company_id <", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdLessThanOrEqualTo(Integer value) {
+            addCriterion("company_id <=", value, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdIn(List<Integer> values) {
+            addCriterion("company_id in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotIn(List<Integer> values) {
+            addCriterion("company_id not in", values, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdBetween(Integer value1, Integer value2) {
+            addCriterion("company_id between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCompanyIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("company_id not between", value1, value2, "companyId");
+            return (Criteria) this;
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table tb_factory
+     *
+     * @mbg.generated do_not_delete_during_merge Mon Aug 05 15:03:49 CST 2019
+     */
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    /**
+     * This class was generated by MyBatis Generator.
+     * This class corresponds to the database table tb_factory
+     *
+     * @mbg.generated Mon Aug 05 15:03:49 CST 2019
+     */
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

cloud-socket/src/com/js/kbt/model/TbMould.java

@@ -0,0 +1,536 @@
+package com.js.kbt.model;
+
+import java.math.BigDecimal;
+
+public class TbMould {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.model_no
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private String modelNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.model_name
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private String modelName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.water_gap
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private BigDecimal waterGap;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.tonnage
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private BigDecimal tonnage;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.oc_cycle
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private BigDecimal ocCycle;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.daily_output
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private BigDecimal dailyOutput;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.company_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private Integer companyId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.current_version_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private Integer currentVersionId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.state
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private String state;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.is_delete
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private Integer isDelete;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.creator_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private Integer creatorId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.project_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private Integer projectId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.rfid
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private String rfid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.setting_life
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private Integer settingLife;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.area
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private String area;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.factory_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private Integer factoryId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.factory_name
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private String factoryName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.initial_modulus
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private Integer initialModulus;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.equipment_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private Integer equipmentId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.belong_project_grade
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private String belongProjectGrade;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.produce_company_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private Integer produceCompanyId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.run_times
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	private Integer runTimes;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.id
+	 * @return  the value of tb_mould.id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.id
+	 * @param id  the value for tb_mould.id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.model_no
+	 * @return  the value of tb_mould.model_no
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public String getModelNo() {
+		return modelNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.model_no
+	 * @param modelNo  the value for tb_mould.model_no
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setModelNo(String modelNo) {
+		this.modelNo = modelNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.model_name
+	 * @return  the value of tb_mould.model_name
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public String getModelName() {
+		return modelName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.model_name
+	 * @param modelName  the value for tb_mould.model_name
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setModelName(String modelName) {
+		this.modelName = modelName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.water_gap
+	 * @return  the value of tb_mould.water_gap
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public BigDecimal getWaterGap() {
+		return waterGap;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.water_gap
+	 * @param waterGap  the value for tb_mould.water_gap
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setWaterGap(BigDecimal waterGap) {
+		this.waterGap = waterGap;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.tonnage
+	 * @return  the value of tb_mould.tonnage
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public BigDecimal getTonnage() {
+		return tonnage;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.tonnage
+	 * @param tonnage  the value for tb_mould.tonnage
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setTonnage(BigDecimal tonnage) {
+		this.tonnage = tonnage;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.oc_cycle
+	 * @return  the value of tb_mould.oc_cycle
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public BigDecimal getOcCycle() {
+		return ocCycle;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.oc_cycle
+	 * @param ocCycle  the value for tb_mould.oc_cycle
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setOcCycle(BigDecimal ocCycle) {
+		this.ocCycle = ocCycle;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.daily_output
+	 * @return  the value of tb_mould.daily_output
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public BigDecimal getDailyOutput() {
+		return dailyOutput;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.daily_output
+	 * @param dailyOutput  the value for tb_mould.daily_output
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setDailyOutput(BigDecimal dailyOutput) {
+		this.dailyOutput = dailyOutput;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.company_id
+	 * @return  the value of tb_mould.company_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public Integer getCompanyId() {
+		return companyId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.company_id
+	 * @param companyId  the value for tb_mould.company_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setCompanyId(Integer companyId) {
+		this.companyId = companyId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.current_version_id
+	 * @return  the value of tb_mould.current_version_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public Integer getCurrentVersionId() {
+		return currentVersionId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.current_version_id
+	 * @param currentVersionId  the value for tb_mould.current_version_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setCurrentVersionId(Integer currentVersionId) {
+		this.currentVersionId = currentVersionId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.state
+	 * @return  the value of tb_mould.state
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public String getState() {
+		return state;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.state
+	 * @param state  the value for tb_mould.state
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setState(String state) {
+		this.state = state;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.is_delete
+	 * @return  the value of tb_mould.is_delete
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public Integer getIsDelete() {
+		return isDelete;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.is_delete
+	 * @param isDelete  the value for tb_mould.is_delete
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setIsDelete(Integer isDelete) {
+		this.isDelete = isDelete;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.creator_id
+	 * @return  the value of tb_mould.creator_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public Integer getCreatorId() {
+		return creatorId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.creator_id
+	 * @param creatorId  the value for tb_mould.creator_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setCreatorId(Integer creatorId) {
+		this.creatorId = creatorId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.project_id
+	 * @return  the value of tb_mould.project_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public Integer getProjectId() {
+		return projectId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.project_id
+	 * @param projectId  the value for tb_mould.project_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setProjectId(Integer projectId) {
+		this.projectId = projectId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.rfid
+	 * @return  the value of tb_mould.rfid
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public String getRfid() {
+		return rfid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.rfid
+	 * @param rfid  the value for tb_mould.rfid
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setRfid(String rfid) {
+		this.rfid = rfid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.setting_life
+	 * @return  the value of tb_mould.setting_life
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public Integer getSettingLife() {
+		return settingLife;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.setting_life
+	 * @param settingLife  the value for tb_mould.setting_life
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setSettingLife(Integer settingLife) {
+		this.settingLife = settingLife;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.area
+	 * @return  the value of tb_mould.area
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public String getArea() {
+		return area;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.area
+	 * @param area  the value for tb_mould.area
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setArea(String area) {
+		this.area = area;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.factory_id
+	 * @return  the value of tb_mould.factory_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public Integer getFactoryId() {
+		return factoryId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.factory_id
+	 * @param factoryId  the value for tb_mould.factory_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setFactoryId(Integer factoryId) {
+		this.factoryId = factoryId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.factory_name
+	 * @return  the value of tb_mould.factory_name
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public String getFactoryName() {
+		return factoryName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.factory_name
+	 * @param factoryName  the value for tb_mould.factory_name
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setFactoryName(String factoryName) {
+		this.factoryName = factoryName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.initial_modulus
+	 * @return  the value of tb_mould.initial_modulus
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public Integer getInitialModulus() {
+		return initialModulus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.initial_modulus
+	 * @param initialModulus  the value for tb_mould.initial_modulus
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setInitialModulus(Integer initialModulus) {
+		this.initialModulus = initialModulus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.equipment_id
+	 * @return  the value of tb_mould.equipment_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public Integer getEquipmentId() {
+		return equipmentId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.equipment_id
+	 * @param equipmentId  the value for tb_mould.equipment_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setEquipmentId(Integer equipmentId) {
+		this.equipmentId = equipmentId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.belong_project_grade
+	 * @return  the value of tb_mould.belong_project_grade
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public String getBelongProjectGrade() {
+		return belongProjectGrade;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.belong_project_grade
+	 * @param belongProjectGrade  the value for tb_mould.belong_project_grade
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setBelongProjectGrade(String belongProjectGrade) {
+		this.belongProjectGrade = belongProjectGrade;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.produce_company_id
+	 * @return  the value of tb_mould.produce_company_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public Integer getProduceCompanyId() {
+		return produceCompanyId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.produce_company_id
+	 * @param produceCompanyId  the value for tb_mould.produce_company_id
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setProduceCompanyId(Integer produceCompanyId) {
+		this.produceCompanyId = produceCompanyId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.run_times
+	 * @return  the value of tb_mould.run_times
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public Integer getRunTimes() {
+		return runTimes;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.run_times
+	 * @param runTimes  the value for tb_mould.run_times
+	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 */
+	public void setRunTimes(Integer runTimes) {
+		this.runTimes = runTimes;
+	}
+}

cloud-socket/src/com/js/kbt/model/TbMouldEquipment.java

@@ -0,0 +1,283 @@
+package com.js.kbt.model;
+
+import java.util.Date;
+
+public class TbMouldEquipment {
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.id
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.equipment_name
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	private String equipmentName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.start_time
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	private Date startTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.end_time
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	private Date endTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.use_life
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	private Integer useLife;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.belong_company_id
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	private Integer belongCompanyId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.equipment_no
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	private String equipmentNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.is_use
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	private Integer isUse;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.hill_number
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	private String hillNumber;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.lng
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	private Double lng;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.lat
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	private Double lat;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.temperature
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	private Integer temperature;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.id
+	 * @return  the value of tb_mould_equipment.id
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.id
+	 * @param id  the value for tb_mould_equipment.id
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.equipment_name
+	 * @return  the value of tb_mould_equipment.equipment_name
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public String getEquipmentName() {
+		return equipmentName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.equipment_name
+	 * @param equipmentName  the value for tb_mould_equipment.equipment_name
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public void setEquipmentName(String equipmentName) {
+		this.equipmentName = equipmentName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.start_time
+	 * @return  the value of tb_mould_equipment.start_time
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.start_time
+	 * @param startTime  the value for tb_mould_equipment.start_time
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.end_time
+	 * @return  the value of tb_mould_equipment.end_time
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.end_time
+	 * @param endTime  the value for tb_mould_equipment.end_time
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.use_life
+	 * @return  the value of tb_mould_equipment.use_life
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public Integer getUseLife() {
+		return useLife;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.use_life
+	 * @param useLife  the value for tb_mould_equipment.use_life
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public void setUseLife(Integer useLife) {
+		this.useLife = useLife;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.belong_company_id
+	 * @return  the value of tb_mould_equipment.belong_company_id
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public Integer getBelongCompanyId() {
+		return belongCompanyId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.belong_company_id
+	 * @param belongCompanyId  the value for tb_mould_equipment.belong_company_id
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public void setBelongCompanyId(Integer belongCompanyId) {
+		this.belongCompanyId = belongCompanyId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.equipment_no
+	 * @return  the value of tb_mould_equipment.equipment_no
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public String getEquipmentNo() {
+		return equipmentNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.equipment_no
+	 * @param equipmentNo  the value for tb_mould_equipment.equipment_no
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public void setEquipmentNo(String equipmentNo) {
+		this.equipmentNo = equipmentNo;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.is_use
+	 * @return  the value of tb_mould_equipment.is_use
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public Integer getIsUse() {
+		return isUse;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.is_use
+	 * @param isUse  the value for tb_mould_equipment.is_use
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public void setIsUse(Integer isUse) {
+		this.isUse = isUse;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.hill_number
+	 * @return  the value of tb_mould_equipment.hill_number
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public String getHillNumber() {
+		return hillNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.hill_number
+	 * @param hillNumber  the value for tb_mould_equipment.hill_number
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public void setHillNumber(String hillNumber) {
+		this.hillNumber = hillNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.lng
+	 * @return  the value of tb_mould_equipment.lng
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public Double getLng() {
+		return lng;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.lng
+	 * @param lng  the value for tb_mould_equipment.lng
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public void setLng(Double lng) {
+		this.lng = lng;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.lat
+	 * @return  the value of tb_mould_equipment.lat
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public Double getLat() {
+		return lat;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.lat
+	 * @param lat  the value for tb_mould_equipment.lat
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public void setLat(Double lat) {
+		this.lat = lat;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.temperature
+	 * @return  the value of tb_mould_equipment.temperature
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public Integer getTemperature() {
+		return temperature;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.temperature
+	 * @param temperature  the value for tb_mould_equipment.temperature
+	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 */
+	public void setTemperature(Integer temperature) {
+		this.temperature = temperature;
+	}
+}

cloud-socket/src/com/js/kbt/socket/UserHandler.java

@@ -1,14 +1,30 @@
 package com.js.kbt.socket;
  
+import java.math.BigDecimal;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.List;
 
 import javax.annotation.Resource;
 
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.http.HttpRequest;
 import com.js.kbt.mapper.MouldHistoryMapper;
+import com.js.kbt.mapper.MouldHistoryTimeMapper;
+import com.js.kbt.mapper.TbFactoryMapper;
+import com.js.kbt.mapper.TbMouldEquipmentMapper;
+import com.js.kbt.mapper.TbMouldMapper;
 import com.js.kbt.model.MouldHistory;
+import com.js.kbt.model.MouldHistoryTime;
+import com.js.kbt.model.MouldHistoryTimeExample;
+import com.js.kbt.model.TbMould;
+import com.js.kbt.model.TbMouldEquipment;
+import com.js.kbt.model.TbMouldEquipmentExample;
+import com.js.kbt.model.TbMouldExample;
 import com.js.kbt.util.MathUtil;
 
 import io.netty.buffer.ByteBuf;
@@ -26,6 +42,14 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 	
 	@Resource
 	private MouldHistoryMapper mouldHistoryMapper;
+	@Resource
+	private MouldHistoryTimeMapper mouldHistoryTimeMapper;
+	@Resource
+	private TbMouldMapper tbMouldMapper;
+	@Resource
+	private TbMouldEquipmentMapper tbMouldEquipmentMapper;
+	@Resource
+	private TbFactoryMapper tbFactoryMapper;
 	
     @Override
     protected void channelRead0(ChannelHandlerContext arg0, String arg1)
@@ -37,7 +61,7 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
     
     private String processMsg(String input) {
     	String ret = "FA AF 00 07 02 1e 78 1e 50 00 3C";
-    	System.out.println(new Date().toLocaleString()+"=====接收到======"+input);
+    	logger.info("=====接收到======"+input);
     	MouldHistory item = new MouldHistory();
     	
     	//抽取手机号码
@@ -50,14 +74,14 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
     	String deviceNumPart = input.substring(15*2, 25*2);
     	String deviceNum = getStringFromHexStr(deviceNumPart);
     	System.out.println(deviceNum);
-    	item.setModelNo(deviceNum);
+    	item.setEquipmentNo(deviceNum);
     	//软件版本号25
     	String version = input.substring(25*2, 26*2);
     	System.out.println("软件版本号="+version);
     	item.setVersion(version);
     	String status = input.substring(26*2, 27*2);
     	System.out.println("工作状态="+status);
-    	item.setStatus(status);
+    	item.setStatus(Integer.decode("0x"+status).toString());
     	//经度27-37
     	String longitude = getStringFromHexStr(input.substring(27*2, 38*2));
     	System.out.println("经度="+longitude);
@@ -66,9 +90,11 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
     	String latitude = getStringFromHexStr(input.substring(38*2, 48*2));
     	System.out.println("纬度="+latitude);
     	item.setLat(latitude);
-    	item.setGprsLac(getStringFromHexStr(input.substring(48*2, 50*2)));
-    	item.setGprsIc(getStringFromHexStr(input.substring(50*2, 52*2)));
-    	item.setWifiBbsid(getStringFromHexStr(input.substring(52*2, 58*2)));
+    	System.out.println("==lac"+reverseParseHex(input.substring(48*2, 50*2)));
+    	System.out.println("==ci"+reverseParseHex(input.substring(50*2, 52*2)));
+    	item.setGprsLac(""+reverseParseHex(input.substring(48*2, 50*2)));
+    	item.setGprsCi(""+reverseParseHex(input.substring(50*2, 52*2)));
+    	item.setWifiBbsid(input.substring(52*2, 58*2));
     	String temp = "0x"+input.substring(58*2, 59*2);
     	System.out.println(temp);
     	int i = Integer.decode(temp);
@@ -78,10 +104,22 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
     	item.setSig2g(Integer.decode("0x"+input.substring(60*2, 61*2)));
     	item.setSigNb(Integer.decode("0x"+input.substring(61*2, 62*2)));
     	item.setSigWifi(Integer.decode("0x"+input.substring(62*2, 63*2)));
-    	item.setExt0(getStringFromHexStr(input.substring(63*2, 64*2)));
+    	item.setExt0(""+Integer.decode("0x"+input.substring(63*2, 64*2)));
     	item.setAlarm(Integer.decode("0x"+input.substring(64*2, 65*2)));
     	String str = input.substring(65*2, 69*2);
-    	item.setRunCnt(MathUtil.parseHexInt(str, true));
+    	item.setRunCnt(reverseParseHex(str));
+    	
+    	//根据基站lac和ci获取经纬度
+    	String api = "http://api.cellocation.com:81/cell/?mcc=460&mnc=0&lac="+item.getGprsLac()+"&ci="+item.getGprsCi()+"&output=json";
+    	String resp = com.js.kbt.util.HttpRequest.sendGet(api, null);
+    	JSONObject json = JSONObject.parseObject(resp);
+    	if (json.getInteger("errcode") == 0) {
+    		item.setLng(json.getDouble("lon") + "");
+    		item.setLat(json.getDouble("lat") + "");
+    	} else {
+    		logger.error("调用基站解析平台出错: " + resp);
+    	}
+    	
     	//存入数据库
     	mouldHistoryMapper.insertSelective(item);
     	//模具开合记录
@@ -90,31 +128,120 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
     	System.out.println("开合模次数="+cnt);
     	for (int pos=0; pos<cnt; pos++ ) {
     		//合模时间
-    		String year = input.substring((start+pos*6)*2, (start+pos*6 + 1)*2);
-    		String month = input.substring((start+pos*6+1)*2, (start+pos*6 + 2)*2);
-    		String day = input.substring((start+pos*6+2)*2, (start+pos*6 + 3)*2);
-    		String hh = input.substring((start+pos*6+3)*2, (start+pos*6 + 4)*2);
-    		String mm = input.substring((start+pos*6+4)*2, (start+pos*6 + 5)*2);
-    		String ss = input.substring((start+pos*6+5)*2, (start+pos*6 + 6)*2);
-    		StringBuilder sb = new StringBuilder();
-    		Date d = new Date();
-    		System.out.println(year);
-    		System.out.println(month);
-    		System.out.println(day);
-    		System.out.println(hh);
-    		System.out.println(mm);
-    		System.out.println(ss);
-//    		if (year < 100) {
-//    			sb.append("20");
-//    		} else {
-//    			sb.append("2");
-//    		}
-//    		.append(year)
-//    		String time = "20" + year + month +
+    		MouldHistoryTime time = new MouldHistoryTime();
+    		time.setHistoryId(item.getId());
+    		time.setSeq(pos + 1);
+    		Date closeTime = parseDate(input, start, pos, 0);
+    		time.setCloseTime(closeTime);
+    		//开模时间
+    		Date openTime = parseDate(input, start, pos, 6);
+    		time.setOpenTime(openTime);
+    		int timeCost = (int) (openTime.getTime() - closeTime.getTime());
+    		time.setTimeCost(timeCost);
+    		mouldHistoryTimeMapper.insertSelective(time);
+    	}
+    	MouldHistoryTimeExample exp = new MouldHistoryTimeExample();
+    	exp.createCriteria().andHistoryIdEqualTo(item.getId());
+    	List<MouldHistoryTime> list = mouldHistoryTimeMapper.selectByExample(exp);
+    	int avgTime = 0;
+    	int totalTime = 0;
+    	for (MouldHistoryTime t : list) {
+    		totalTime += t.getTimeCost();
+    	}
+    	if (list.size() == 0) {
+    		avgTime = 0;
+    	} else {
+    		avgTime = totalTime / list.size();
     	}
+    	
+    	handleModLogic(item, avgTime);
     	return ret;
     }
     
+    private void handleModLogic(MouldHistory item, int avgTime) {
+    	TbMouldEquipmentExample meqExp = new TbMouldEquipmentExample();
+    	meqExp.createCriteria().andEquipmentNoEqualTo(item.getEquipmentNo());
+    	if (tbMouldEquipmentMapper.countByExample(meqExp) > 0) {
+    		TbMouldEquipment me = tbMouldEquipmentMapper.selectByExample(meqExp).get(0);
+    		me.setHillNumber(item.getBattery()+"%");
+    		if (item.getLng() != null) {
+    			me.setLng(Double.parseDouble(item.getLng()));
+    			me.setLat(Double.parseDouble(item.getLat()));
+    		}
+			
+			me.setTemperature(item.getTemperature());
+			tbMouldEquipmentMapper.updateByPrimaryKeySelective(me);
+			
+    		TbMouldExample tExp = new TbMouldExample();	
+    		tExp.setOrderByClause("id desc limit 1");
+    		tExp.createCriteria().andEquipmentIdEqualTo(me.getId());
+    		if (tbMouldMapper.countByExample(tExp) > 0) {
+    			TbMould tm = tbMouldMapper.selectByExample(tExp).get(0);
+    			tm.setState(item.getStatus());
+    			tm.setRunTimes(tm.getRunTimes() + item.getRunCnt());
+    			
+    			//处理每模平均周期(单位秒)
+    			BigDecimal bd = new BigDecimal(avgTime*1.00/1000);
+    			tm.setOcCycle(bd);
+    			tbMouldMapper.updateByPrimaryKeySelective(tm);
+    			
+    			//处理报警
+    			if (item.getAlarm() > 0) {
+    				/**
+    				 * 无报警  0；
+					  低电量报警 1；
+					  温度过热 2；
+					  安装被拆 8。
+    				 */
+    				logger.info("设备报警啦:"+item.getAlarm());
+    			}
+    		}
+    	}
+    }
+    
+    /**
+     * 低位在前的16进制解析
+     * @param rHex
+     * @return
+     */
+    public static int reverseParseHex(String rHex) {
+    	int size = rHex.length()/2;
+    	StringBuilder sb = new StringBuilder();
+    	for (int i=0;i<size; i++) {
+    		sb.append(rHex.substring((size - i -1)*2, (size - i)*2));
+    	}
+    	String str = sb.toString();
+    	return Integer.parseInt(str, 16);
+    }
+    
+    private Date parseDate(String input, int start, int pos, int dateStartPos) {
+    	String year = input.substring((start+pos*6 + dateStartPos)*2, (start+pos*6 + 1 + dateStartPos)*2);
+		String month = input.substring((start+pos*6+1 + dateStartPos)*2, (start+pos*6 + 2 + dateStartPos)*2);
+		String day = input.substring((start+pos*6+2 + dateStartPos)*2, (start+pos*6 + 3 + dateStartPos)*2);
+		String hh = input.substring((start+pos*6+3 + dateStartPos)*2, (start+pos*6 + 4 + dateStartPos)*2);
+		String mm = input.substring((start+pos*6+4 + dateStartPos)*2, (start+pos*6 + 5 + dateStartPos)*2);
+		String ss = input.substring((start+pos*6+5 + dateStartPos)*2, (start+pos*6 + 6 + dateStartPos)*2);
+		StringBuilder sb = new StringBuilder();
+		int yearInt = Integer.parseInt(year, 16);
+		sb.append(yearInt < 100?"20":"2");
+		sb.append(yearInt).append("-");
+		int monthInt = Integer.parseInt(month, 16);
+		sb.append(monthInt<10?"0":"").append(monthInt).append("-");
+		int dayInt = Integer.parseInt(day, 16);
+		sb.append(dayInt<10?"0":"").append(dayInt);
+		Date parseDate = null;
+		try {
+			parseDate = new SimpleDateFormat("yyyy-MM-dd").parse(sb.toString());
+			parseDate.setHours(Integer.parseInt(hh, 16));
+			parseDate.setMinutes(Integer.parseInt(mm, 16));
+			parseDate.setSeconds(Integer.parseInt(ss, 16));
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		return parseDate;
+    }
+    
+    
     private String getStringFromHexStr(String hexStr) {
     	StringBuilder sb = new StringBuilder();
     	for (int i=0;i<hexStr.length()/2; i++) {
@@ -232,10 +359,13 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 	}
 	
 	public static void main(String[] args) {
-		String str = "FAAF11223133393030323538383435303130313132333435361201453131372E3030323334354E33382E36393030343527BD11D20102030405063C50303030000000000001110B05142022110B051430229988";
-		String temp = "0x"+str.substring(68*2, 69*2);
-		System.out.println("FAAF11223133393030323538383435303130313132333435361201453131372E3030323334354E33382E3639303034354E33382E36393030343527BD11D2010203040506".length());
-    	System.out.println(temp);
+//		String str = "1F51";
+		String str = "E85F";
+		String temp = "0x"+str;
+		int i = Integer.decode(temp);
+		System.out.println(i);
+		int p = reverseParseHex(str);
+		System.out.println(p);
 	}
 	
 }

cloud-socket/src/jdbc.properties

@@ -1,4 +1,4 @@
-classPath=D:/workspace/FengChuan/WebContent/WEB-INF/lib/mysql-connector-java-5.1.31-bin.jar
+classPath=D:/workspace/yunsu/cloud-socket/WebContent/WEB-INF/lib/mysql-connector-java-5.1.31-bin.jar
 driver=com.mysql.jdbc.Driver
 url=jdbc:mysql://118.190.47.230:3306/cloud_model?autoReconnect=true&rewriteBatchedStatements=TRUE&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=UTF-8
 username=root

ys_vue/src/main.js

@@ -70,7 +70,9 @@ router.beforeEach((to, from, next) => {
                 } else if(routes[i].name == "项目管理") {
                     var children = routes[i].children;
                     for(var j in children){
-                        children[j].hidden = false
+                        if(children[j].name != "项目详情"){
+                            children[j].hidden = false
+                        }
                     }
                 }
             }

ys_vue/src/port.js

@@ -19,6 +19,7 @@ export default {
     },
     mold: {
         addMold: '/mould/addOrUpdate', //添加/修改模具设备
+        molds: '/mould/list', //模具列表
         modelList: '/mould/modelList', //给项目分配模具获取该公司下的模具列表
     },
     // 基础管理

ys_vue/src/views/Home.vue

@@ -1,328 +1,445 @@
 <template>
-	<el-row class="container">
-		<el-col :span="24" class="header">
-			<el-col :span="10" class="logo" :class="collapsed?'logo-collapse-width':'logo-width'">
-				{{collapsed?'':sysName}}
-			</el-col>
-			<el-col :span="10">
-				<div class="tools" @click.prevent="collapse">
-					<i class="fa fa-align-justify"></i>
-				</div>
-			</el-col>
-			<el-col :span="4" class="userinfo">
-				<el-dropdown trigger="hover">
-					<span class="el-dropdown-link userinfo-inner"><img src="../assets/image/userHead.jpg" /> {{sysUserName}}</span>
-					<el-dropdown-menu slot="dropdown">
-						<el-dropdown-item @click.native="reset">修改密码</el-dropdown-item>
-						<el-dropdown-item divided @click.native="logout">退出登录</el-dropdown-item>
-					</el-dropdown-menu>
-				</el-dropdown>
-                <el-badge is-dot class="itemNew">
-                    <i class="el-icon-message-solid" style="font-size:24px"></i>
-                </el-badge>
-			</el-col>
-		</el-col>
-		<el-col :span="24" class="main">
-			<aside :class="collapsed?'menu-collapsed':'menu-expanded'">
-				<!--导航菜单-->
-				<el-menu :default-active="$route.path" class="el-menu-vertical-demo" @open="handleopen" @close="handleclose" @select="handleselect" unique-opened router v-if="!collapsed">
-					<template v-for="(item,index) in $router.options.routes" v-if="!item.hidden">
-						<el-submenu :index="index+''" v-if="!item.leaf">
-							<template slot="title"><i :class="item.iconCls"></i><span class="itemName">{{item.name}}</span></template>
-							<el-menu-item v-for="child in item.children" :index="child.path" :key="child.path" v-if="!child.hidden">{{child.name}}</el-menu-item>
-						</el-submenu>
-						<el-menu-item v-if="item.leaf&&item.children.length>0" :index="item.children[0].path"><i :class="item.iconCls"></i>{{item.children[0].name}}</el-menu-item>
-					</template>
-				</el-menu>
-				<!--导航菜单-折叠后-->
-				<ul class="el-menu el-menu-vertical-demo collapsed" v-if="collapsed" ref="menuCollapsed">
-					<li v-for="(item,index) in $router.options.routes" v-if="!item.hidden" class="el-submenu item" :style="{overflow:!item.leaf?'':'hidden'}">
-						<template v-if="!item.leaf">
-							<div class="el-submenu__title" style="padding-left: 20px;" @mouseover="showMenu(index,true)" @mouseout="showMenu(index,false)"><i :class="item.iconCls"></i></div>
-							<ul class="el-menu submenu" :class="'submenu-hook-'+index" @mouseover="showMenu(index,true)" @mouseout="showMenu(index,false)"> 
-								<li v-for="child in item.children" v-if="!child.hidden" :key="child.path" class="el-menu-item" style="padding-left: 40px;" :class="$route.path==child.path?'is-active':''" @click="$router.push(child.path)">{{child.name}}</li>
-							</ul>
-						</template>
-						<template v-else>
-							<li class="el-submenu">
-								<div class="el-submenu__title el-menu-item" style="padding-left: 20px;height: 56px;line-height: 56px;padding: 0 20px;" :class="$route.path==item.children[0].path?'is-active':''" @click="$router.push(item.children[0].path)"><i :class="item.iconCls"></i></div>
-							</li>
-						</template>
-					</li>
-				</ul>
-			</aside>
-			<section class="content-container">
-				<div class="grid-content bg-purple-light">
-					<!-- <el-col :span="24" class="breadcrumb-container">
+  <el-row class="container">
+    <el-col :span="24" class="header">
+      <el-col
+        :span="10"
+        class="logo"
+        :class="collapsed?'logo-collapse-width':'logo-width'"
+      >{{collapsed?'':sysName}}</el-col>
+      <el-col :span="10">
+        <div class="tools" @click.prevent="collapse">
+          <i class="fa fa-align-justify"></i>
+        </div>
+      </el-col>
+      <el-col :span="4" class="userinfo">
+        <el-badge is-dot class="itemNew">
+          <i class="el-icon-message-solid" style="font-size:24px" v-popover:popover1></i>
+          <!-- 消息中心 -->
+          <el-popover ref="popover1" placement="bottom" width="400" trigger="hover">
+            <div class="popover-main">消息盒子</div>
+            <div class="popover-item" v-for="item in popoverData">
+              <p class="popover-title">
+                {{item.title}}
+                <span class="popover-type">[{{item.type}}]</span>
+              </p>
+              <p>{{item.article}}</p>
+            </div>
+            <div class="popover-button">查看全部</div>
+          </el-popover>
+        </el-badge>
+        <el-dropdown trigger="hover">
+          <span class="el-dropdown-link userinfo-inner">
+            <img src="../assets/image/userHead.jpg" />
+            {{sysUserName}}
+          </span>
+          <el-dropdown-menu slot="dropdown">
+            <el-dropdown-item @click.native="reset">修改密码</el-dropdown-item>
+            <el-dropdown-item divided @click.native="logout">退出登录</el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </el-col>
+    </el-col>
+    <el-col :span="24" class="main">
+      <aside :class="collapsed?'menu-collapsed':'menu-expanded'">
+        <!--导航菜单-->
+        <el-menu
+          :default-active="$route.path"
+          class="el-menu-vertical-demo"
+          @open="handleopen"
+          @close="handleclose"
+          @select="handleselect"
+          unique-opened
+          router
+          v-if="!collapsed"
+        >
+          <template v-for="(item,index) in $router.options.routes" v-if="!item.hidden">
+            <el-submenu :index="index+''" v-if="!item.leaf">
+              <template slot="title">
+                <i :class="item.iconCls"></i>
+                <span class="itemName">{{item.name}}</span>
+              </template>
+              <el-menu-item
+                v-for="child in item.children"
+                :index="child.path"
+                :key="child.path"
+                v-if="!child.hidden"
+              >{{child.name}}</el-menu-item>
+            </el-submenu>
+            <el-menu-item v-if="item.leaf&&item.children.length>0" :index="item.children[0].path">
+              <i :class="item.iconCls"></i>
+              {{item.children[0].name}}
+            </el-menu-item>
+          </template>
+        </el-menu>
+        <!--导航菜单-折叠后-->
+        <ul class="el-menu el-menu-vertical-demo collapsed" v-if="collapsed" ref="menuCollapsed">
+          <li
+            v-for="(item,index) in $router.options.routes"
+            v-if="!item.hidden"
+            class="el-submenu item"
+            :style="{overflow:!item.leaf?'':'hidden'}"
+          >
+            <template v-if="!item.leaf">
+              <div
+                class="el-submenu__title"
+                style="padding-left: 20px;"
+                @mouseover="showMenu(index,true)"
+                @mouseout="showMenu(index,false)"
+              >
+                <i :class="item.iconCls"></i>
+              </div>
+              <ul
+                class="el-menu submenu"
+                :class="'submenu-hook-'+index"
+                @mouseover="showMenu(index,true)"
+                @mouseout="showMenu(index,false)"
+              >
+                <li
+                  v-for="child in item.children"
+                  v-if="!child.hidden"
+                  :key="child.path"
+                  class="el-menu-item"
+                  style="padding-left: 40px;"
+                  :class="$route.path==child.path?'is-active':''"
+                  @click="$router.push(child.path)"
+                >{{child.name}}</li>
+              </ul>
+            </template>
+            <template v-else>
+              <li class="el-submenu">
+                <div
+                  class="el-submenu__title el-menu-item"
+                  style="padding-left: 20px;height: 56px;line-height: 56px;padding: 0 20px;"
+                  :class="$route.path==item.children[0].path?'is-active':''"
+                  @click="$router.push(item.children[0].path)"
+                >
+                  <i :class="item.iconCls"></i>
+                </div>
+              </li>
+            </template>
+          </li>
+        </ul>
+      </aside>
+      <section class="content-container">
+        <div class="grid-content bg-purple-light">
+          <!-- <el-col :span="24" class="breadcrumb-container">
 						<strong class="title">{{$route.name}}</strong>
 						<el-breadcrumb separator="/" class="breadcrumb-inner">
 							<el-breadcrumb-item v-for="item in $route.matched" :key="item.path">
 								{{ item.name }}
 							</el-breadcrumb-item>
 						</el-breadcrumb>
-					</el-col> -->
-					<el-col :span="24" class="content-wrapper">
-						<transition name="fade" mode="out-in">
-							<router-view></router-view>
-						</transition>
-					</el-col>
-				</div>
+          </el-col>-->
+          <el-col :span="24" class="content-wrapper">
+            <transition name="fade" mode="out-in">
+              <router-view></router-view>
+            </transition>
+          </el-col>
+        </div>
 
-                <!--修改密码-->
-                <el-dialog title="修改密码" v-if="editPassWord" :visible.sync="editPassWord" :close-on-click-modal="false" customClass='customWidth'>
-                    <el-form :model="addForm" label-width="80px" :rules="passRule" ref="addForm">
-                        <el-form-item label="新密码" prop="password">
-                            <el-input v-model="addForm.password" autocomplete="off" placeholder="请输入新密码" show-password></el-input>
-                        </el-form-item>
-                    </el-form>
-                    <div slot="footer" class="dialog-footer">
-                        <el-button @click.native="editPassWord = false">取消</el-button>
-                        <el-button type="primary" @click.native="resetPwd" :loading="editLoading">提交</el-button>
-                    </div>
-                </el-dialog>
-			</section>
-		</el-col>
-	</el-row>
+        <!--修改密码-->
+        <el-dialog
+          title="修改密码"
+          v-if="editPassWord"
+          :visible.sync="editPassWord"
+          :close-on-click-modal="false"
+          customClass="customWidth"
+        >
+          <el-form :model="addForm" label-width="80px" :rules="passRule" ref="addForm">
+            <el-form-item label="新密码" prop="password">
+              <el-input
+                v-model="addForm.password"
+                autocomplete="off"
+                placeholder="请输入新密码"
+                show-password
+              ></el-input>
+            </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button @click.native="editPassWord = false">取消</el-button>
+            <el-button type="primary" @click.native="resetPwd" :loading="editLoading">提交</el-button>
+          </div>
+        </el-dialog>
+      </section>
+    </el-col>
+  </el-row>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-                user: sessionStorage.getItem('user'),
-				sysName:'云塑网后台管理系统',
-				collapsed:false,
-				sysUserName: '',
-				
-                editPassWord: false,
-                editLoading: false,
-                addForm: {
-                    password: ''
-                },
-                passRule: {
-                    password: [
-                        { required: true, message: '请输入新密码', trigger: 'blur' }
-                    ]
-                }
-			}
-		},
-		methods: {
-            onSubmit() {
-			},
-			handleopen() {
-			},
-			handleclose() {
-			},
-			handleselect: function (a, b) {
-			},
-			//退出登录
-			logout: function () {
-				var _this = this;
-				this.$confirm('确认退出吗?', '提示', {
-					//type: 'warning'
-				}).then(() => {
-					sessionStorage.removeItem('user');
-					_this.$router.push('/login');
-				});
-			},
-			//折叠导航栏
-			collapse:function(){
-                this.collapsed=!this.collapsed;
-			},
-			showMenu(i,status){
-				this.$refs.menuCollapsed.getElementsByClassName('submenu-hook-'+i)[0].style.display=status?'block':'none';
-            },
-            reset() {
-                this.editPassWord = true;
-                this.addForm.id = JSON.parse(sessionStorage.getItem('user')).id;
-                this.addForm.account = JSON.parse(sessionStorage.getItem('user')).account;
-            },
-            resetPwd(){
-                this.$refs.addForm.validate((valid) => {
-					if (valid) {
-                        this.editLoading = true;
-                        this.http.post(this.port.pwd.resetPwd, this.addForm , res => {
-                            this.editLoading = false;
-                            this.editPassWord = false;
-                            if (res.code == "ok") {
-                                this.$message({
-                                    message: '修改成功,请重新登录',
-                                    type: 'success'
-                                });
-                                this.$router.push('/login');
-                            } else {
-                                this.$message({
-                                    message: res.msg,
-                                    type: 'error'
-                                });
-                            }
-                        }, error => {
-                            this.editLoading = false;
-                            this.editPassWord = false;
-                            this.$message({
-                                message: error,
-                                type: 'error'
-                            });
-                        })
-					}
-				});
-            }
+export default {
+  data() {
+    return {
+      user: sessionStorage.getItem("user"),
+      sysName: "云塑网后台管理系统",
+      collapsed: false,
+      sysUserName: "",
+
+      editPassWord: false,
+      editLoading: false,
+      addForm: {
+        password: ""
+      },
+      passRule: {
+        password: [{ required: true, message: "请输入新密码", trigger: "blur" }]
+      },
+      popoverData: [
+        {
+          title: "墨盒测试项目——零件文档",
+          article: "模具开发人员：王有财已上传完毕，待您审核",
+          type: "审批"
         },
-		mounted() {
-			if (this.user) {
-                var user = JSON.parse(this.user);
-                this.user = user;
-                this.sysUserName = user.username || '';
-            } else {
-                this.$router.push('/login');
+        {
+          title: "墨盒测试项目——零件文档",
+          article: "您上传的文档未通过项目经理：张多金审批，请修改后重新上传",
+          type: "审批"
+        },
+        {
+          title: "墨盒测试项目——零件文档",
+          article: "该模具需要保养，请前往处理",
+          type: "保养"
+        }
+      ]
+    };
+  },
+  methods: {
+    onSubmit() {},
+    handleopen() {},
+    handleclose() {},
+    handleselect: function(a, b) {},
+    //退出登录
+    logout: function() {
+      var _this = this;
+      this.$confirm("确认退出吗?", "提示", {
+        //type: 'warning'
+      }).then(() => {
+        sessionStorage.removeItem("user");
+        _this.$router.push("/login");
+      });
+    },
+    //折叠导航栏
+    collapse: function() {
+      this.collapsed = !this.collapsed;
+    },
+    showMenu(i, status) {
+      this.$refs.menuCollapsed.getElementsByClassName(
+        "submenu-hook-" + i
+      )[0].style.display = status ? "block" : "none";
+    },
+    reset() {
+      this.editPassWord = true;
+      this.addForm.id = JSON.parse(sessionStorage.getItem("user")).id;
+      this.addForm.account = JSON.parse(sessionStorage.getItem("user")).account;
+    },
+    resetPwd() {
+      this.$refs.addForm.validate(valid => {
+        if (valid) {
+          this.editLoading = true;
+          this.http.post(
+            this.port.pwd.resetPwd,
+            this.addForm,
+            res => {
+              this.editLoading = false;
+              this.editPassWord = false;
+              if (res.code == "ok") {
+                this.$message({
+                  message: "修改成功,请重新登录",
+                  type: "success"
+                });
+                this.$router.push("/login");
+              } else {
+                this.$message({
+                  message: res.msg,
+                  type: "error"
+                });
+              }
+            },
+            error => {
+              this.editLoading = false;
+              this.editPassWord = false;
+              this.$message({
+                message: error,
+                type: "error"
+              });
             }
-		}
-	}
-
+          );
+        }
+      });
+    }
+  },
+  mounted() {
+    if (this.user) {
+      var user = JSON.parse(this.user);
+      this.user = user;
+      this.sysUserName = user.username || "";
+    } else {
+      this.$router.push("/login");
+    }
+  }
+};
 </script>
 
 <style scoped lang="scss">
-    @import '~scss_vars';
-	
-    .el-menu-vertical-demo i {
-        margin-right: 10px;
-    }
+@import "~scss_vars";
+
+.el-menu-vertical-demo i {
+  margin-right: 10px;
+}
+
+.itemNew {
+  height: 25px;
+  margin-left: 15px;
+  i {
+    vertical-align: top;
+  }
+}
 
-    .itemNew {
-        height: 25px;
-        margin-left: 15px;
-        i {
-            vertical-align: top;
+.container {
+  position: absolute;
+  top: 0px;
+  bottom: 0px;
+  width: 100%;
+  .header {
+    height: 60px;
+    line-height: 60px;
+    background: $color-primary;
+    color: #fff;
+    .userinfo {
+      text-align: right;
+      padding-right: 35px;
+      float: right;
+      .userinfo-inner {
+        cursor: pointer;
+        color: #fff;
+        img {
+          width: 40px;
+          height: 40px;
+          border-radius: 20px;
+          margin: 10px 10px 10px 10px;
+          // float: right;
+          float: left;
         }
+      }
     }
+    .logo {
+      //width:230px;
+      height: 60px;
+      font-size: 21px;
+      padding-left: 20px;
+      padding-right: 20px;
+      border-color: rgba(238, 241, 146, 0.3);
+      border-right-width: 1px;
+      border-right-style: solid;
+      img {
+        width: 40px;
+        float: left;
+        margin: 10px 10px 10px 18px;
+      }
+      .txt {
+        color: #fff;
+      }
+    }
+    .logo-width {
+      width: 230px;
+    }
+    .logo-collapse-width {
+      width: 60px;
+    }
+    .tools {
+      padding: 0px 23px;
+      width: 14px;
+      height: 60px;
+      line-height: 60px;
+      cursor: pointer;
+    }
+  }
+  .main {
+    display: flex;
+    // background: #324057;
+    position: absolute;
+    top: 60px;
+    bottom: 0px;
+    overflow: hidden;
+    aside {
+      flex: 0 0 230px;
+      width: 230px;
+      // position: absolute;
+      // top: 0px;
+      // bottom: 0px;
+      .el-menu {
+        height: 100%;
+      }
+      .collapsed {
+        width: 60px;
+        .item {
+          position: relative;
+        }
+        .submenu {
+          position: absolute;
+          top: 0px;
+          left: 60px;
+          z-index: 99999;
+          height: auto;
+          display: none;
+        }
+      }
+    }
+    .menu-collapsed {
+      flex: 0 0 60px;
+      width: 60px;
+    }
+    .menu-expanded {
+      flex: 0 0 230px;
+      width: 230px;
+    }
+    .content-container {
+      // background: #f8f8f8;
+      //f1f2f7
+      flex: 1;
+      width: 80%;
+      // position: absolute;
+      // right: 0px;
+      // top: 0px;
+      // bottom: 0px;
+      // left: 230px;
+      // overflow-y: scroll;
+      padding: 20px;
+      .breadcrumb-container {
+        //margin-bottom: 15px;
+        .title {
+          width: 200px;
+          float: left;
+          color: #475669;
+        }
+        .breadcrumb-inner {
+          float: right;
+        }
+      }
+      .content-wrapper {
+        background-color: #fff;
+        box-sizing: border-box;
+      }
+    }
+  }
+}
 
-	.container {
-		position: absolute;
-		top: 0px;
-		bottom: 0px;
-		width: 100%;
-		.header {
-			height: 60px;
-			line-height: 60px;
-			background: $color-primary;
-			color:#fff;
-			.userinfo {
-				text-align: right;
-				padding-right: 35px;
-				float: right;
-				.userinfo-inner {
-					cursor: pointer;
-					color:#fff;
-					img {
-						width: 40px;
-						height: 40px;
-						border-radius: 20px;
-						margin: 10px 10px 10px 10px;
-						// float: right;
-                        float: left;
-					}
-				}
-			}
-			.logo {
-				//width:230px;
-				height:60px;
-				font-size: 21px;
-				padding-left:20px;
-				padding-right:20px;
-				border-color: rgba(238,241,146,0.3);
-				border-right-width: 1px;
-				border-right-style: solid;
-				img {
-					width: 40px;
-					float: left;
-					margin: 10px 10px 10px 18px;
-				}
-				.txt {
-					color:#fff;
-				}
-			}
-			.logo-width{
-				width:230px;
-			}
-			.logo-collapse-width{
-				width:60px
-			}
-			.tools{
-				padding: 0px 23px;
-				width:14px;
-				height: 60px;
-				line-height: 60px;
-				cursor: pointer;
-			}
-		}
-		.main {
-			display: flex;
-			// background: #324057;
-			position: absolute;
-			top: 60px;
-			bottom: 0px;
-			overflow: hidden;
-			aside {
-				flex:0 0 230px;
-				width: 230px;
-				// position: absolute;
-				// top: 0px;
-				// bottom: 0px;
-				.el-menu{
-					height: 100%;
-				}
-				.collapsed{
-					width:60px;
-					.item{
-						position: relative;
-					}
-					.submenu{
-						position:absolute;
-						top:0px;
-						left:60px;
-						z-index:99999;
-						height:auto;
-						display:none;
-					}
-
-				}
-			}
-			.menu-collapsed{
-				flex:0 0 60px;
-				width: 60px;
-			}
-			.menu-expanded{
-				flex:0 0 230px;
-				width: 230px;
-			}
-			.content-container {
-				// background: #f8f8f8;
-                //f1f2f7
-				flex:1;
-                width: 80%;
-				// position: absolute;
-				// right: 0px;
-				// top: 0px;
-				// bottom: 0px;
-				// left: 230px;
-				// overflow-y: scroll;
-				padding: 20px;
-				.breadcrumb-container {
-					//margin-bottom: 15px;
-					.title {
-						width: 200px;
-						float: left;
-						color: #475669;
-					}
-					.breadcrumb-inner {
-						float: right;
-					}
-				}
-				.content-wrapper {
-					background-color: #fff;
-					box-sizing: border-box;
-				}
-			}
-		}
-	}
+.popover-main {
+  font-weight: 700;
+  padding-bottom: 12px;
+  border-bottom: 1px grey solid;
+}
+.popover-title {
+  color: blue;
+}
+.popover-type {
+  color: black;
+  float: right;
+}
+.popover-item {
+  border-bottom: 1px grey solid;
+}
+.popover-button {
+  font-weight: 700;
+  padding-top: 12px;
+  text-align: center;
+}
 </style>

ys_vue/src/views/base/allocation.vue

@@ -1,425 +1,406 @@
 <template>
-  <section>
-    <!--工具条-->
-    <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-      <el-form :inline="true" :model="filters">
-        <el-col :span="3">
-          <el-form-item>
-            <el-select v-model="filters.value" placeholder="按公司筛选">
-              <el-option label="编号" value="0"></el-option>
-              <el-option label="名称" value="1"></el-option>
-            </el-select>
-          </el-form-item>
+    <section>
+        <!--工具条-->
+        <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
+            <el-form :inline="true" :model="filters">
+                <el-col :span="3">
+                    <el-form-item>
+                        <el-select v-model="filters.value" placeholder="按公司筛选">
+                        <el-option label="编号" value="0"></el-option>
+                        <el-option label="名称" value="1"></el-option>
+                        </el-select>
+                    </el-form-item>
+                </el-col>
+                <el-form-item>
+                    <el-input v-model="filters.name" placeholder="请输入关键字进行搜索"></el-input>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary">查询</el-button>
+                </el-form-item>
+                <el-form-item style="float: right;">
+                    <el-button type="primary" @click="showAllocation">新建</el-button>
+                </el-form-item>
+            </el-form>
         </el-col>
-        <el-form-item>
-          <el-input v-model="filters.name" placeholder="请输入关键字进行搜索"></el-input>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary">查询</el-button>
-        </el-form-item>
-        <el-form-item style="float: right;">
-          <el-button type="primary" @click="showAllocation">新建</el-button>
-        </el-form-item>
-      </el-form>
-    </el-col>
 
-    <!--列表-->
-    <el-table
-      :data="allocations"
-      :height="tableHeight"
-      highlight-current-row
-      v-loading="listLoading"
-      style="width: 100%;"
-    >
-      <el-table-column type="index" width="60"></el-table-column>
-      <el-table-column prop="equipmentNo" label="云模盒编号" width="130" sortable></el-table-column>
-      <el-table-column label="电量" width="80" sortable></el-table-column>
-      <el-table-column prop="useLife" label="倒计时" width="100" sortable></el-table-column>
-      <el-table-column prop="equipmentName" label="模具名称" sortable></el-table-column>
-      <el-table-column label="模具编号" sortable></el-table-column>
-      <el-table-column prop="belongCompanyId" label="资产方" sortable></el-table-column>
-      <el-table-column label="模具状态" width="100" sortable>
-        <template slot-scope="scope">
-          <span v-if="scope.row.isUse == 0">未启用</span>
-          <span v-else>已启用</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="220" sortable>
-        <template slot-scope="scope">
-          <el-button
-            size="small"
-            type="primary"
-            @click="enable(scope.$index)"
-            :disabled="scope.row.isUse == 1"
-          >启用</el-button>
-          <el-button size="small" @click="showEdit(scope.row.id)">修改</el-button>
-          <el-button type="danger" size="small">删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
+        <!--列表-->
+        <el-table :data="allocations" :height="tableHeight" highlight-current-row v-loading="listLoading" style="width: 100%;">
+            <el-table-column type="index" width="60"></el-table-column>
+            <el-table-column prop="equipmentNo" label="云模盒编号" width="130" sortable></el-table-column>
+            <el-table-column label="电量" width="100" sortable></el-table-column>
+            <el-table-column prop="useLife" label="倒计时" width="100" sortable>
+                <template slot-scope="scope">{{scope.row.useLife}}天</template>
+            </el-table-column>
+            <el-table-column prop="equipmentName" label="模具名称" sortable></el-table-column>
+            <el-table-column label="模具编号" sortable></el-table-column>
+            <el-table-column prop="companyName" label="公司名称" sortable></el-table-column>
+            <el-table-column label="模具状态" width="100" sortable>
+                <template slot-scope="scope">
+                <span v-if="scope.row.isUse == 0">未启用</span>
+                <span v-else>已启用</span>
+                </template>
+            </el-table-column>
+            <el-table-column label="操作" width="220" sortable>
+                <template slot-scope="scope">
+                    <el-button size="small" type="primary" @click="enable(scope.$index)" :disabled="scope.row.isUse == 1">启用</el-button>
+                    <el-button size="small" @click="showEdit(scope.$index, scope.row)">修改</el-button>
+                    <!-- <el-button type="danger" size="small">删除</el-button> -->
+                </template>
+            </el-table-column>
+        </el-table>
 
-    <!--工具条-->
-    <el-col :span="24" class="toolbar">
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[20 , 50 , 80 , 100]"
-        :page-size="20"
-        layout="total, sizes, prev, pager, next"
-        :total="total"
-        style="float:right;"
-      ></el-pagination>
-    </el-col>
+        <!--工具条-->
+        <el-col :span="24" class="toolbar">
+        <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :page-sizes="[20 , 50 , 80 , 100]"
+            :page-size="20"
+            layout="total, sizes, prev, pager, next"
+            :total="total"
+            style="float:right;"
+        ></el-pagination>
+        </el-col>
 
-    <!--新增界面-->
-    <el-dialog
-      title="新建模具"
-      v-if="addFormVisible"
-      :visible.sync="addFormVisible"
-      :close-on-click-modal="false"
-      customClass="customWidth"
-    >
-      <el-form
-        :model="newAllocation"
-        label-width="100px"
-        :rules="formRules"
-        ref="newAllocation"
-        :inline="true"
-        class="demo-form-inline"
-      >
-        <el-form-item label="云模盒编号" prop="equipmentNo">
-          <el-input v-model="newAllocation.equipmentNo" autocomplete="off" placeholder="请填写"></el-input>
-        </el-form-item>
-        <el-form-item label="所属公司" prop="belongCompanyId">
-          <el-select
-            v-model="newAllocation.belongCompanyId"
-            filterable
-            clearable
-            placeholder="请选择"
-            style="width: 202px"
-          >
-            <el-option
-              v-for="item in companies"
-              :key="item.id"
-              :label="item.companyName"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="使用年限" prop="useLife">
-          <el-input v-model="newAllocation.useLife" autocomplete="off" placeholder="请填写"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click.native="addFormVisible = false">取消</el-button>
-        <el-button type="primary" @click="addMould()">提交</el-button>
-      </div>
-    </el-dialog>
+        <!--新增界面-->
+        <el-dialog title="新建模具" v-if="addFormVisible" :visible.sync="addFormVisible" :close-on-click-modal="false" customClass="customWidth">
+            <el-form
+                :model="newAllocation"
+                label-width="100px"
+                :rules="formRules"
+                ref="newAllocation"
+                :inline="true"
+                class="demo-form-inline"
+            >
+                <el-form-item label="云模盒编号" prop="equipmentNo">
+                <el-input v-model="newAllocation.equipmentNo" autocomplete="off" placeholder="请填写"></el-input>
+                </el-form-item>
+                <el-form-item label="所属公司" prop="belongCompanyId">
+                <el-select
+                    v-model="newAllocation.belongCompanyId"
+                    filterable
+                    clearable
+                    placeholder="请选择"
+                    style="width: 202px"
+                >
+                    <el-option
+                    v-for="item in companies"
+                    :key="item.id"
+                    :label="item.companyName"
+                    :value="item.id"
+                    ></el-option>
+                </el-select>
+                </el-form-item>
+                <el-form-item label="使用年限" prop="useLife">
+                <el-input
+                    v-model.number="newAllocation.useLife"
+                    type="age"
+                    autocomplete="off"
+                    placeholder="请填写"
+                ></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="addFormVisible = false">取消</el-button>
+                <el-button type="primary" @click="addMould()">提交</el-button>
+            </div>
+        </el-dialog>
 
-    <!--修改界面-->
-    <el-dialog
-      title="修改模具"
-      v-if="editFormVisible"
-      :visible.sync="editFormVisible"
-      :close-on-click-modal="false"
-      customClass="customWidth"
-    >
-      <el-form
-        :model="newAllocation"
-        label-width="100px"
-        :rules="formRules"
-        ref="newAllocation"
-        :inline="true"
-        class="demo-form-inline"
-      >
-        <el-form-item label="云模盒编号" prop="equipmentNo">
-          <el-input v-model="newAllocation.equipmentNo" autocomplete="off" placeholder="请填写"></el-input>
-        </el-form-item>
-        <el-form-item label="所属公司" prop="belongCompanyId">
-          <el-select
-            v-model="newAllocation.belongCompanyId"
-            filterable
-            clearable
-            placeholder="请选择"
-            style="width: 202px"
-          >
-            <el-option
-              v-for="item in companies"
-              :key="item.id"
-              :label="item.companyName"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="设备名称" prop="equipmentName">
-          <el-input v-model="newAllocation.equipmentName" autocomplete="off" placeholder="请填写"></el-input>
-        </el-form-item>
-        <el-form-item label="使用年限" prop="useLife">
-          <el-input v-model="newAllocation.useLife" autocomplete="off" placeholder="请填写"></el-input>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click.native="editFormVisible = false">取消</el-button>
-        <el-button type="primary" @click="editMould(newAllocation.id)">提交</el-button>
-      </div>
-    </el-dialog>
-  </section>
+        <!--修改界面-->
+        <el-dialog
+        title="修改模具"
+        v-if="editFormVisible"
+        :visible.sync="editFormVisible"
+        :close-on-click-modal="false"
+        customClass="customWidth"
+        >
+            <el-form
+                :model="newAllocation"
+                label-width="100px"
+                :rules="formRules"
+                ref="newAllocation"
+                :inline="true"
+                class="demo-form-inline"
+            >
+                <el-form-item label="云模盒编号" prop="equipmentNo">
+                <el-input v-model="newAllocation.equipmentNo" autocomplete="off" placeholder="请填写"></el-input>
+                </el-form-item>
+                <el-form-item label="所属公司" prop="belongCompanyId">
+                <el-select
+                    v-model="newAllocation.belongCompanyId"
+                    filterable
+                    clearable
+                    placeholder="请选择"
+                    style="width: 202px"
+                >
+                    <el-option
+                    v-for="item in companies"
+                    :key="item.id"
+                    :label="item.companyName"
+                    :value="item.id"
+                    ></el-option>
+                </el-select>
+                </el-form-item>
+                <el-form-item label="使用年限" prop="useLife">
+                <el-input
+                    v-model.number="newAllocation.useLife"
+                    type="age"
+                    autocomplete="off"
+                    placeholder="请填写"
+                ></el-input>
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button @click.native="editFormVisible = false">取消</el-button>
+                <el-button type="primary" @click="editMould(newAllocation.id)">提交</el-button>
+            </div>
+        </el-dialog>
+    </section>
 </template>
 
 <script>
-import util from "../../common/js/util";
-export default {
-  data() {
-    return {
-      allocations: [],
-      companies: {},
-      newAllocation: {
-        equipmentNo: "", //设备编号
-        useLife: "", //使用年限
-        equipmentName: "", //设备名称
-        id: "", //设备id
-        belongCompanyId: "" //所属公司ID
-      },
-      filters: {
-        name: "",
-        value: ""
-      },
-      formRules: {
-        equipmentNo: [
-          { required: true, message: "请输入云模盒编号", trigger: "blur" }
-        ],
-        useLife: [
-          {
-            required: true,
-            message: "请输入使用年限",
-            trigger: "blur"
-          }
-        ],
-        equipmentName: [
-          { required: true, message: "请输入设备名称", trigger: "blur" }
-        ],
-        belongCompanyId: [
-          {
-            required: true,
-            message: "请选择所属公司",
-            trigger: ["blur", "change"]
-          }
-        ]
-      },
-      listLoading: false,
-      addLoading: false,
-      editLoading: false,
-      total: 0,
-      page: 1,
-      size: 20,
-      tableHeight: 0,
-      addFormVisible: false,
-      editFormVisible: false
-    };
-  },
-  methods: {
-    //分页
-    handleCurrentChange(val) {
-      this.page = val;
-      this.getMoulds();
-    },
-    handleSizeChange(val) {
-      this.size = val;
-      this.getMoulds();
-    },
-    //读取云模盒信息
-    getMoulds() {
-      this.listLoading = true;
-      this.http.post(
-        this.port.base.mouldeList,
-        {},
-        res => {
-          this.listLoading = false;
-          if (res.code == "ok") {
-            this.allocations = res.data.list;
-            this.total = res.data.total;
-          } else {
-            this.$message({
-              message: res.msg,
-              type: "error"
-            });
-          }
+    import util from "../../common/js/util";
+    export default {
+        data() {
+            return {
+                allocations: [],
+                companies: {},
+                newAllocation: {
+                    equipmentNo: "", //设备编号
+                    useLife: "", //使用年限
+                    equipmentName: "", //设备名称
+                    id: "", //设备id
+                    belongCompanyId: "" //所属公司ID
+                },
+                filters: {
+                    name: "",
+                    value: ""
+                },
+                formRules: {
+                    equipmentNo: [
+                        { required: true, message: "请输入云模盒编号", trigger: "blur" }
+                    ],
+                    useLife: [
+                        { required: true, message: '请输入使用年限'},
+                        { type: 'number', message: '使用年限必须为数字值'}
+                    ],
+                    belongCompanyId: [
+                        { required: true, message: "请选择所属公司", trigger: ["blur", "change"] }
+                    ]
+                },
+                listLoading: false,
+                addLoading: false,
+                editLoading: false,
+                total: 0,
+                page: 1,
+                size: 20,
+                tableHeight: 0,
+                addFormVisible: false,
+                editFormVisible: false
+            };
         },
-        error => {
-          this.listLoading = false;
-          this.$message({
-            message: error,
-            type: "error"
-          });
-        }
-      );
-    },
-    //添加界面
-    showAllocation() {
-      this.addFormVisible = true;
-      this.newAllocation = {
-        id: "",
-        useLife: "",
-        equipmentName: "",
-        equipmentNo: "",
-        belongCompanyId: ""
-      };
-    },
-    //修改界面
-    showEdit(equipmentId) {
-      this.editFormVisible = true;
-      this.newAllocation = {
-        id: equipmentId,
-        useLife: "",
-        equipmentName: "",
-        equipmentNo: "",
-        belongCompanyId: ""
-      };
-    },
-    //添加模具
-    addMould() {
-      this.$refs.newAllocation.validate(valid => {
-        if (valid) {
-          this.addLoading = true;
-          this.http.post(
-            this.port.base.editMould,
-            {
-              equipmentNo: this.newAllocation.equipmentNo,
-              belongCompanyId: this.newAllocation.belongCompanyId,
-              useLife: this.newAllocation.useLife
-            },
-            res => {
-              this.addLoading = false;
-              this.addFormVisible = false;
-              if (res.code == "ok") {
-                this.$message({
-                  message: "添加成功",
-                  type: "success"
+        methods: {
+            getMsg() {
+                //获取公司下拉列表
+                this.http.post( this.port.base.comps, {},
+                res => {
+                    if (res.code == "ok") {
+                        this.companies = res.data;
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
                 });
+            },
+
+            //分页
+            handleCurrentChange(val) {
+                this.page = val;
                 this.getMoulds();
-              } else {
-                this.$message({
-                  message: res.msg,
-                  type: "error"
-                });
-              }
             },
-            error => {
-              this.addLoading = false;
-              this.addFormVisible = false;
-              this.$message({
-                message: error,
-                type: "error"
-              });
-            }
-          );
-        }
-      });
-    },
-    //编辑模具
-    editMould() {
-      this.$refs.newAllocation.validate(valid => {
-        if (valid) {
-          this.editLoading = true;
-          this.http.post(
-            this.port.base.editMould,
-            {
-              id: this.newAllocation.id,
-              equipmentNo: this.newAllocation.equipmentNo,
-              equipmentName: this.newAllocation.equipmentName,
-              belongCompanyId: this.newAllocation.belongCompanyId,
-              useLife: this.newAllocation.useLife
+
+            handleSizeChange(val) {
+                    this.size = val;
+                    this.getMoulds();
+            },
+
+            //读取云模盒信息
+            getMoulds() {
+                this.listLoading = true;
+                this.http.post(
+                    this.port.base.mouldeList,
+                    {},
+                    res => {
+                    this.listLoading = false;
+                    if (res.code == "ok") {
+                        this.allocations = res.data.list;
+                        this.total = res.data.total;
+                    } else {
+                        this.$message({
+                        message: res.msg,
+                        type: "error"
+                        });
+                    }
+                    },
+                    error => {
+                    this.listLoading = false;
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                    }
+                );
+            },
+            //添加界面
+            showAllocation() {
+                this.addFormVisible = true;
+                this.newAllocation = {
+                    id: "",
+                    useLife: "",
+                    equipmentNo: "",
+                    belongCompanyId: ""
+                };
             },
-            res => {
-              this.editLoading = false;
-              this.editFormVisible = false;
-              if (res.code == "ok") {
-                this.$message({
-                  message: "添加成功",
-                  type: "success"
+           
+            //添加模具
+            addMould() {
+                this.$refs.newAllocation.validate(valid => {
+                    if (valid) {
+                    this.addLoading = true;
+                    this.http.post(
+                        this.port.base.editMould,
+                        {
+                        equipmentNo: this.newAllocation.equipmentNo,
+                        belongCompanyId: this.newAllocation.belongCompanyId,
+                        useLife: this.newAllocation.useLife
+                        },
+                        res => {
+                        this.addLoading = false;
+                        this.addFormVisible = false;
+                        if (res.code == "ok") {
+                            this.$message({
+                            message: "添加成功",
+                            type: "success"
+                            });
+                            this.getMoulds();
+                        } else {
+                            this.$message({
+                            message: res.msg,
+                            type: "error"
+                            });
+                        }
+                        },
+                        error => {
+                        this.addLoading = false;
+                        this.addFormVisible = false;
+                        this.$message({
+                            message: error,
+                            type: "error"
+                        });
+                        }
+                    );
+                    }
                 });
-                this.getMoulds();
-              } else {
-                this.$message({
-                  message: res.msg,
-                  type: "error"
+            },
+
+             //修改界面
+            showEdit(index, row) {
+                this.editFormVisible = true;
+                this.newAllocation = {
+                    id: row.id,
+                    useLife: row.useLife,
+                    equipmentNo: row.equipmentNo,
+                    belongCompanyId: row.belongCompanyId
+                };
+            },
+
+            //编辑模具
+            editMould() {
+                this.$refs.newAllocation.validate(valid => {
+                    if (valid) {
+                        this.editLoading = true;
+                        this.http.post( this.port.base.editMould, {
+                            id: this.newAllocation.id,
+                            equipmentNo: this.newAllocation.equipmentNo,
+                            equipmentName: this.newAllocation.equipmentName,
+                            belongCompanyId: this.newAllocation.belongCompanyId,
+                            useLife: this.newAllocation.useLife
+                        },
+                        res => {
+                            this.editLoading = false;
+                            this.editFormVisible = false;
+                            if (res.code == "ok") {
+                                this.$message({
+                                message: "添加成功",
+                                type: "success"
+                                });
+                                this.getMoulds();
+                            } else {
+                                this.$message({
+                                message: res.msg,
+                                type: "error"
+                                });
+                            }
+                        },
+                        error => {
+                            this.editLoading = false;
+                            this.editFormVisible = false;
+                            this.$message({
+                                message: error,
+                                type: "error"
+                            });
+                        });
+                    }
                 });
-              }
             },
-            error => {
-              this.editLoading = false;
-              this.editFormVisible = false;
-              this.$message({
-                message: error,
-                type: "error"
-              });
+
+            //启用设备
+            enable(index) {
+                this.allocations[index].isUse = 1;
+                this.http.post( this.port.base.enableMould, {
+                    id: this.allocations[index].id,
+                    isUse: 1
+                },
+                res => {
+                    if (res.code == "ok") {
+                        this.$message({
+                            message: "修改成功",
+                            type: "success"
+                        });
+                        this.getMoulds();
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: "error"
+                        });
+                    }
+                },
+                error => {
+                    this.$message({
+                        message: error,
+                        type: "error"
+                    });
+                });
             }
-          );
-        }
-      });
-    },
-    //启用设备
-    enable(index) {
-      this.allocations[index].isUse = 1;
-      this.http.post(
-        this.port.base.enableMould,
-        {
-          id: this.allocations[index].id,
-          isUse: 1
         },
-        res => {
-          if (res.code == "ok") {
-            this.$message({
-              message: "修改成功",
-              type: "success"
-            });
-            this.getMoulds();
-          } else {
-            this.$message({
-              message: res.msg,
-              type: "error"
-            });
-          }
+        created() {
+            let height = window.innerHeight;
+            this.tableHeight = height - 210;
         },
-        error => {
-          this.$message({
-            message: error,
-            type: "error"
-          });
-        }
-      );
-    }
-  },
-  created() {
-    let height = window.innerHeight;
-    this.tableHeight = height - 210;
-  },
-  mounted() {
-    //获取模具列表
-    this.getMoulds();
-    //获取公司下拉列表
-    this.http.post(
-      this.port.base.comps,
-      {},
-      res => {
-        if (res.code == "ok") {
-          this.companies = res.data;
-        } else {
-          this.$message({
-            message: res.msg,
-            type: "error"
-          });
+        mounted() {
+            this.getMsg();
+            //获取模具列表
+            this.getMoulds();
         }
-      },
-      error => {
-        this.$message({
-          message: error,
-          type: "error"
-        });
-      }
-    );
-  }
-};
+    };
 </script>
 
 <style scoped>

ys_vue/src/views/mold/moldDetail.vue

@@ -2,11 +2,6 @@
     <section>
         <!--工具条-->
         <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
-            <!-- <el-form :inline="true">
-                <el-form-item>
-                    <el-button type="primary" @click="backToList">返回</el-button>
-                </el-form-item>
-            </el-form> -->
             <el-form :inline="true">
                 <el-form-item>
                     <el-button type="text" @click="backToList" icon="el-icon-back" class="back">返回</el-button>
@@ -24,7 +19,9 @@
             </el-form>
         </el-col>
         <el-col :span="24" :style="allDetail">
-            <el-col :span="24" class="title">模具基本信息</el-col>
+            <el-col :span="24" class="title">模具基本信息
+                <i class="el-icon-edit editDetail" ></i>
+            </el-col>
             <el-col :span="24" class="main">
                 <el-col :span="6" class="detail">
                     云模盒编号：
@@ -72,7 +69,11 @@
                   </el-col>
             </el-col>
 
-            <el-col :span="24" class="title">文档资料</el-col>
+            <el-col :span="24" class="title">文档资料
+                <el-upload class="upload-demo" action="customize" :http-request="uploadFile" :show-file-list="false" multiple :limit="5" style="float:right;">
+                    <el-button size="small" type="primary">点击上传</el-button>
+                </el-upload>
+            </el-col>
             <el-col :span="24">
                 <el-tabs v-model="activePage" @tab-click="handleClick">
                     <el-tab-pane label="模具文档" name="0">
@@ -229,6 +230,12 @@
         border-left: 1px blue solid;
     }
 
+    .editDetail {
+        margin-left: 10px;
+        color:#20a0ff;
+        cursor: pointer;
+    }
+
     .info {
         color: grey;
     }

ys_vue/src/views/mold/moldList.vue

@@ -144,8 +144,9 @@
                     }
                 ],
                 filters: {
-                    name: "",
-                    value: ""
+                    keyName: "",
+                    serchType: -1,
+                    projectId: ""
                 },
                 
                 formRules: {
@@ -206,31 +207,29 @@
 
             //获取模具列表
             getMoldList() {
-                // this.listLoading = true;
-                // this.http.post(this.port.mold.modelList, {
-                //     keyName: this.filters.keyName,
-                //     currentPage: this.page,
-                //     pageSize: this.size,
-                //     companyId: this.filters.companyId==''?-1:this.filters.companyId,
-                //     flag: this.filters.flag=='姓名'?0:this.filters.flag
-                // }, res => {
-                //     this.listLoading = false;
-                //     if (res.code == "ok") {
-                //         this.list = res.data.list;
-                //         this.total = res.data.total;
-                //     } else {
-                //         this.$message({
-                //             message: res.msg,
-                //             type: 'error'
-                //         });
-                //     }
-                // }, error => {
-                //     this.listLoading = false;
-                //     this.$message({
-                //         message: error,
-                //         type: 'error'
-                //     });
-                // })
+                this.listLoading = true;
+                this.http.post(this.port.mold.molds, {
+                    keyName: this.filters.keyName,
+                    currentPage: this.page,
+                    pageSize: this.size
+                }, res => {
+                    this.listLoading = false;
+                    if (res.code == "ok") {
+                        this.molds = res.data.list;
+                        this.total = res.data.total;
+                    } else {
+                        this.$message({
+                            message: res.msg,
+                            type: 'error'
+                        });
+                    }
+                }, error => {
+                    this.listLoading = false;
+                    this.$message({
+                        message: error,
+                        type: 'error'
+                    });
+                })
             },
             //详情
             toDetail(id) {