增加当前电量和当前温度字段

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

@@ -9,68 +9,68 @@ public interface TbMouldEquipmentMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	int updateByPrimaryKey(TbMouldEquipment record);
 }

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

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="equipment_name" jdbcType="VARCHAR" property="equipmentName" />
@@ -22,12 +22,14 @@
     <result column="agent" jdbcType="VARCHAR" property="agent" />
     <result column="stage" jdbcType="INTEGER" property="stage" />
     <result column="sim" jdbcType="VARCHAR" property="sim" />
+    <result column="curhill_number" jdbcType="VARCHAR" property="curhillNumber" />
+    <result column="curtemperature" jdbcType="INTEGER" property="curtemperature" />
   </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 Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -61,7 +63,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -95,16 +97,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, 
-    is_use, hill_number, lng, lat, temperature, agent, stage, sim
+    is_use, hill_number, lng, lat, temperature, agent, stage, sim, curhill_number, curtemperature
   </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 Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     select
     <if test="distinct">
@@ -123,7 +125,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -134,7 +136,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     delete from tb_mould_equipment
     where id = #{id,jdbcType=INTEGER}
@@ -143,7 +145,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     delete from tb_mould_equipment
     <if test="_parameter != null">
@@ -154,7 +156,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -163,18 +165,20 @@
       use_life, belong_company_id, equipment_no, 
       is_use, hill_number, lng, 
       lat, temperature, agent, 
-      stage, sim)
+      stage, sim, curhill_number, 
+      curtemperature)
     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}, #{agent,jdbcType=VARCHAR}, 
-      #{stage,jdbcType=INTEGER}, #{sim,jdbcType=VARCHAR})
+      #{stage,jdbcType=INTEGER}, #{sim,jdbcType=VARCHAR}, #{curhillNumber,jdbcType=VARCHAR}, 
+      #{curtemperature,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 Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -223,6 +227,12 @@
       <if test="sim != null">
         sim,
       </if>
+      <if test="curhillNumber != null">
+        curhill_number,
+      </if>
+      <if test="curtemperature != null">
+        curtemperature,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="equipmentName != null">
@@ -267,13 +277,19 @@
       <if test="sim != null">
         #{sim,jdbcType=VARCHAR},
       </if>
+      <if test="curhillNumber != null">
+        #{curhillNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="curtemperature != null">
+        #{curtemperature,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 Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     select count(*) from tb_mould_equipment
     <if test="_parameter != null">
@@ -284,7 +300,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     update tb_mould_equipment
     <set>
@@ -333,6 +349,12 @@
       <if test="record.sim != null">
         sim = #{record.sim,jdbcType=VARCHAR},
       </if>
+      <if test="record.curhillNumber != null">
+        curhill_number = #{record.curhillNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="record.curtemperature != null">
+        curtemperature = #{record.curtemperature,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -342,7 +364,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     update tb_mould_equipment
     set id = #{record.id,jdbcType=INTEGER},
@@ -359,7 +381,9 @@
       temperature = #{record.temperature,jdbcType=INTEGER},
       agent = #{record.agent,jdbcType=VARCHAR},
       stage = #{record.stage,jdbcType=INTEGER},
-      sim = #{record.sim,jdbcType=VARCHAR}
+      sim = #{record.sim,jdbcType=VARCHAR},
+      curhill_number = #{record.curhillNumber,jdbcType=VARCHAR},
+      curtemperature = #{record.curtemperature,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -368,7 +392,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     update tb_mould_equipment
     <set>
@@ -414,6 +438,12 @@
       <if test="sim != null">
         sim = #{sim,jdbcType=VARCHAR},
       </if>
+      <if test="curhillNumber != null">
+        curhill_number = #{curhillNumber,jdbcType=VARCHAR},
+      </if>
+      <if test="curtemperature != null">
+        curtemperature = #{curtemperature,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -421,7 +451,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Oct 10 11:19:27 CST 2019.
+      This element was generated on Mon Oct 28 19:24:40 CST 2019.
     -->
     update tb_mould_equipment
     set equipment_name = #{equipmentName,jdbcType=VARCHAR},
@@ -437,7 +467,9 @@
       temperature = #{temperature,jdbcType=INTEGER},
       agent = #{agent,jdbcType=VARCHAR},
       stage = #{stage,jdbcType=INTEGER},
-      sim = #{sim,jdbcType=VARCHAR}
+      sim = #{sim,jdbcType=VARCHAR},
+      curhill_number = #{curhillNumber,jdbcType=VARCHAR},
+      curtemperature = #{curtemperature,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

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

@@ -6,84 +6,94 @@ public class TbMouldEquipment {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.id
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private Integer temperature;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.agent
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private String agent;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.stage
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private Integer stage;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.sim
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	private String sim;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.curhill_number
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
+	 */
+	private String curhillNumber;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould_equipment.curtemperature
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
+	 */
+	private Integer curtemperature;
 
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -92,7 +102,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -101,7 +111,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public String getEquipmentName() {
 		return equipmentName;
@@ -110,7 +120,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setEquipmentName(String equipmentName) {
 		this.equipmentName = equipmentName;
@@ -119,7 +129,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Date getStartTime() {
 		return startTime;
@@ -128,7 +138,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
@@ -137,7 +147,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Date getEndTime() {
 		return endTime;
@@ -146,7 +156,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setEndTime(Date endTime) {
 		this.endTime = endTime;
@@ -155,7 +165,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Integer getUseLife() {
 		return useLife;
@@ -164,7 +174,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setUseLife(Integer useLife) {
 		this.useLife = useLife;
@@ -173,7 +183,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Integer getBelongCompanyId() {
 		return belongCompanyId;
@@ -182,7 +192,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setBelongCompanyId(Integer belongCompanyId) {
 		this.belongCompanyId = belongCompanyId;
@@ -191,7 +201,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public String getEquipmentNo() {
 		return equipmentNo;
@@ -200,7 +210,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setEquipmentNo(String equipmentNo) {
 		this.equipmentNo = equipmentNo;
@@ -209,7 +219,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Integer getIsUse() {
 		return isUse;
@@ -218,7 +228,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setIsUse(Integer isUse) {
 		this.isUse = isUse;
@@ -227,7 +237,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public String getHillNumber() {
 		return hillNumber;
@@ -236,7 +246,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setHillNumber(String hillNumber) {
 		this.hillNumber = hillNumber;
@@ -245,7 +255,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Double getLng() {
 		return lng;
@@ -254,7 +264,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setLng(Double lng) {
 		this.lng = lng;
@@ -263,7 +273,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Double getLat() {
 		return lat;
@@ -272,7 +282,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setLat(Double lat) {
 		this.lat = lat;
@@ -281,7 +291,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Integer getTemperature() {
 		return temperature;
@@ -290,7 +300,7 @@ public class TbMouldEquipment {
 	/**
 	 * 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  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setTemperature(Integer temperature) {
 		this.temperature = temperature;
@@ -299,7 +309,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.agent
 	 * @return  the value of tb_mould_equipment.agent
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public String getAgent() {
 		return agent;
@@ -308,7 +318,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.agent
 	 * @param agent  the value for tb_mould_equipment.agent
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setAgent(String agent) {
 		this.agent = agent;
@@ -317,7 +327,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.stage
 	 * @return  the value of tb_mould_equipment.stage
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Integer getStage() {
 		return stage;
@@ -326,7 +336,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.stage
 	 * @param stage  the value for tb_mould_equipment.stage
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setStage(Integer stage) {
 		this.stage = stage;
@@ -335,7 +345,7 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.sim
 	 * @return  the value of tb_mould_equipment.sim
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public String getSim() {
 		return sim;
@@ -344,9 +354,45 @@ public class TbMouldEquipment {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.sim
 	 * @param sim  the value for tb_mould_equipment.sim
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 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 tb_mould_equipment.curhill_number
+	 * @return  the value of tb_mould_equipment.curhill_number
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
+	 */
+	public String getCurhillNumber() {
+		return curhillNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.curhill_number
+	 * @param curhillNumber  the value for tb_mould_equipment.curhill_number
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
+	 */
+	public void setCurhillNumber(String curhillNumber) {
+		this.curhillNumber = curhillNumber;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould_equipment.curtemperature
+	 * @return  the value of tb_mould_equipment.curtemperature
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
+	 */
+	public Integer getCurtemperature() {
+		return curtemperature;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould_equipment.curtemperature
+	 * @param curtemperature  the value for tb_mould_equipment.curtemperature
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
+	 */
+	public void setCurtemperature(Integer curtemperature) {
+		this.curtemperature = curtemperature;
+	}
 }

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

@@ -7,23 +7,23 @@ import java.util.List;
 public class TbMouldEquipmentExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public TbMouldEquipmentExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class TbMouldEquipmentExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1112,11 +1112,141 @@ public class TbMouldEquipmentExample {
 			addCriterion("sim not between", value1, value2, "sim");
 			return (Criteria) this;
 		}
+
+		public Criteria andCurhillNumberIsNull() {
+			addCriterion("curhill_number is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberIsNotNull() {
+			addCriterion("curhill_number is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberEqualTo(String value) {
+			addCriterion("curhill_number =", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberNotEqualTo(String value) {
+			addCriterion("curhill_number <>", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberGreaterThan(String value) {
+			addCriterion("curhill_number >", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberGreaterThanOrEqualTo(String value) {
+			addCriterion("curhill_number >=", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberLessThan(String value) {
+			addCriterion("curhill_number <", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberLessThanOrEqualTo(String value) {
+			addCriterion("curhill_number <=", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberLike(String value) {
+			addCriterion("curhill_number like", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberNotLike(String value) {
+			addCriterion("curhill_number not like", value, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberIn(List<String> values) {
+			addCriterion("curhill_number in", values, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberNotIn(List<String> values) {
+			addCriterion("curhill_number not in", values, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberBetween(String value1, String value2) {
+			addCriterion("curhill_number between", value1, value2, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurhillNumberNotBetween(String value1, String value2) {
+			addCriterion("curhill_number not between", value1, value2, "curhillNumber");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureIsNull() {
+			addCriterion("curtemperature is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureIsNotNull() {
+			addCriterion("curtemperature is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureEqualTo(Integer value) {
+			addCriterion("curtemperature =", value, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureNotEqualTo(Integer value) {
+			addCriterion("curtemperature <>", value, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureGreaterThan(Integer value) {
+			addCriterion("curtemperature >", value, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureGreaterThanOrEqualTo(Integer value) {
+			addCriterion("curtemperature >=", value, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureLessThan(Integer value) {
+			addCriterion("curtemperature <", value, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureLessThanOrEqualTo(Integer value) {
+			addCriterion("curtemperature <=", value, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureIn(List<Integer> values) {
+			addCriterion("curtemperature in", values, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureNotIn(List<Integer> values) {
+			addCriterion("curtemperature not in", values, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureBetween(Integer value1, Integer value2) {
+			addCriterion("curtemperature between", value1, value2, "curtemperature");
+			return (Criteria) this;
+		}
+
+		public Criteria andCurtemperatureNotBetween(Integer value1, Integer value2) {
+			addCriterion("curtemperature not between", value1, value2, "curtemperature");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
+	 * @mbg.generated  Mon Oct 28 19:24:40 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -299,13 +299,13 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 		meqExp.createCriteria().andEquipmentNoEqualTo(item.getEquipmentNo());
 		if (tbMouldEquipmentMapper.countByExample(meqExp) > 0) {
 			TbMouldEquipment me = tbMouldEquipmentMapper.selectByExample(meqExp).get(0);
-			me.setHillNumber(item.getBattery() + "");
+			me.setCurhillNumber(item.getBattery() + "");
 			if (item.getLng() != null) {
 				logger.info("更新经纬度:");
 				me.setLng(Double.parseDouble(item.getLng()));
 				me.setLat(Double.parseDouble(item.getLat()));
 			}
-			me.setTemperature(item.getTemperature());
+			me.setCurtemperature(item.getTemperature());
 			if (item.getAlarm() == 8) {
 				me.setStage(3);// 安装被拆
 			} else if (item.getAlarm() == 1) {
@@ -321,7 +321,6 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 				 * 无报警 0； 低电量报警 1； 温度过热 2； 安装被拆 8。
 				 */
 				logger.info("设备报警啦:" + item.getAlarm());
-
 			}
 			tbMouldEquipmentMapper.updateByPrimaryKeySelective(me);
 			logger.info("更新完了tbMouldEquipment的状态和温度以及经纬度");