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

# Conflicts:
#	cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldFileServiceImpl.java

cloud-model/src/main/java/com/hssx/cloudmodel/controller/MouldController.java

@@ -68,9 +68,9 @@ public class MouldController {
     @ApiOperation("更换模具云模盒")
     @RequestMapping("/changeMouldEquipment")
     @ResponseBody
-    public HttpRespMsg changeMouldEquipment(Mould mould, String token) {
+    public HttpRespMsg changeMouldEquipment(Mould mould,Integer mouldId, String token) {
         HttpRespMsg msg = new HttpRespMsg();
-        msg = mouldService.changeMouldEquipment(mould,token);
+        msg = mouldService.changeMouldEquipment(mould,mouldId,token);
         return msg;
     }
 

cloud-model/src/main/java/com/hssx/cloudmodel/entity/Mould.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-08-19
+ * @since 2019-10-10
  */
 @TableName("tb_mould")
 public class Mould extends Model<Mould> {
@@ -136,7 +136,7 @@ public class Mould extends Model<Mould> {
     private Integer equipmentId;
 
     /**
-     * 在项目中所属的部分如：1
+     * 在项目中所属的部分如：1/10
      */
     @TableField("belong_project_grade")
     private String belongProjectGrade;
@@ -177,6 +177,12 @@ public class Mould extends Model<Mould> {
     @TableField("pre_update_id")
     private Integer preUpdateId;
 
+    /**
+     * 历史运行次数只对换绑云模盒时进行处理
+     */
+    @TableField("history_run_times")
+    private Integer historyRunTimes;
+
 
     public Integer getId() {
         return id;
@@ -386,6 +392,14 @@ public class Mould extends Model<Mould> {
         this.preUpdateId = preUpdateId;
     }
 
+    public Integer getHistoryRunTimes() {
+        return historyRunTimes;
+    }
+
+    public void setHistoryRunTimes(Integer historyRunTimes) {
+        this.historyRunTimes = historyRunTimes;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -420,6 +434,7 @@ public class Mould extends Model<Mould> {
         ", maintainCount=" + maintainCount +
         ", holes=" + holes +
         ", preUpdateId=" + preUpdateId +
+        ", historyRunTimes=" + historyRunTimes +
         "}";
     }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/entity/MouldEquipment.java

@@ -6,8 +6,6 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import java.io.Serializable;
 
 /**
@@ -16,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-08-21
+ * @since 2019-10-10
  */
 @TableName("tb_mould_equipment")
 public class MouldEquipment extends Model<MouldEquipment> {
@@ -39,14 +37,12 @@ public class MouldEquipment extends Model<MouldEquipment> {
      * 启动时间
      */
     @TableField("start_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime startTime;
 
     /**
      * 结束时间
      */
     @TableField("end_time")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private LocalDateTime endTime;
 
     /**
@@ -103,39 +99,18 @@ public class MouldEquipment extends Model<MouldEquipment> {
     @TableField("agent")
     private String agent;
 
-    public Integer getStage() {
-        return stage;
-    }
-
-    public void setStage(Integer stage) {
-        this.stage = stage;
-    }
-
     /**
      * 状态,0-正常，1-温度过高，2-电量过低,3-温度过高且电量低
      */
     @TableField("stage")
     private Integer stage;
 
-    @Override
-    public String toString() {
-        return "MouldEquipment{" +
-                "id=" + id +
-                ", equipmentName='" + equipmentName + '\'' +
-                ", startTime=" + startTime +
-                ", endTime=" + endTime +
-                ", useLife=" + useLife +
-                ", belongCompanyId=" + belongCompanyId +
-                ", equipmentNo='" + equipmentNo + '\'' +
-                ", isUse=" + isUse +
-                ", hillNumber='" + hillNumber + '\'' +
-                ", lng=" + lng +
-                ", lat=" + lat +
-                ", temperature=" + temperature +
-                ", agent='" + agent + '\'' +
-                ", stage=" + stage +
-                '}';
-    }
+    /**
+     * sim卡号
+     */
+    @TableField("sim")
+    private String sim;
+
 
     public Integer getId() {
         return id;
@@ -241,9 +216,45 @@ public class MouldEquipment extends Model<MouldEquipment> {
         this.agent = agent;
     }
 
+    public Integer getStage() {
+        return stage;
+    }
+
+    public void setStage(Integer stage) {
+        this.stage = stage;
+    }
+
+    public String getSim() {
+        return sim;
+    }
+
+    public void setSim(String sim) {
+        this.sim = sim;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
     }
 
+    @Override
+    public String toString() {
+        return "MouldEquipment{" +
+        "id=" + id +
+        ", equipmentName=" + equipmentName +
+        ", startTime=" + startTime +
+        ", endTime=" + endTime +
+        ", useLife=" + useLife +
+        ", belongCompanyId=" + belongCompanyId +
+        ", equipmentNo=" + equipmentNo +
+        ", isUse=" + isUse +
+        ", hillNumber=" + hillNumber +
+        ", lng=" + lng +
+        ", lat=" + lat +
+        ", temperature=" + temperature +
+        ", agent=" + agent +
+        ", stage=" + stage +
+        ", sim=" + sim +
+        "}";
+    }
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/MouldService.java

@@ -31,5 +31,5 @@ public interface MouldService extends IService<Mould> {
 
     HttpRespMsg scrapMouldList(UserVO userVO);
 
-    HttpRespMsg changeMouldEquipment(Mould mould, String token);
+    HttpRespMsg changeMouldEquipment(Mould mould,Integer mouldId, String token);
 }

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/MouldServiceImpl.java

@@ -117,6 +117,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
                 mould.setProduceCompanyId(model.getProduceCompanyId());
                 mould.setArea(model.getArea());
                 mould.setBelongProjectGrade(0 + "");
+                mould.setHistoryRunTimes(model.getRunTimes());
                 mouldMapper.insert(mould);
                 msg.data = mould;
                 //将之前的模具与项目和设备解绑
@@ -532,15 +533,16 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
     }
 
     @Override
-    public HttpRespMsg changeMouldEquipment(Mould mould, String token) {
+    public HttpRespMsg changeMouldEquipment(Mould mould,Integer mouldId,String token) {
         HttpRespMsg msg = new HttpRespMsg();
         User currentUser = userMapper.selectOne(new QueryWrapper<User>().eq("head_imgurl", token));
         if (currentUser != null) {
+            Mould mou = mouldMapper.selectById(mouldId);
             Mould m = new Mould();
-            m.setId(mould.getId());
+            m.setId(mouldId);
             m.setEquipmentId(mould.getEquipmentId());
+            m.setHistoryRunTimes(mou.getRunTimes());
             mouldMapper.updateById(m);
-            Mould mou = mouldMapper.selectById(mould.getId());
             Project project = projectMapper.selectById(mou.getProjectId());
             //添加通知消息
             NewsNotice newsNotice = new NewsNotice();
@@ -550,7 +552,7 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
             newsNotice.setContent(mou.getModelNo() + "-" + Constant.EMERGENCY_NOTICE);
             newsNoticeMapper.insert(newsNotice);
             //通知该模具所属资产方的管理员
-            User user = userMapper.selectOne(new QueryWrapper<User>().eq("company_id", mould.getCompanyId()).eq("parent_id", 1));
+            User user = userMapper.selectOne(new QueryWrapper<User>().eq("company_id", mou.getCompanyId()).eq("parent_id", 1));
             NewsNoticeUser newsNoticeUser = new NewsNoticeUser();
             newsNoticeUser.setNewsId(newsNotice.getId());
             newsNoticeUser.setUserId(user.getId());

cloud-model/src/main/java/com/hssx/cloudmodel/util/CodeGenerator.java

@@ -96,7 +96,7 @@ public class CodeGenerator {
 //        dsc.setSchemaName("public");
         dsc.setDriverName("com.mysql.cj.jdbc.Driver");
         dsc.setUsername("root");
-        dsc.setPassword("p011430seya10");
+        dsc.setPassword("p011430seya1026");
         mpg.setDataSource(dsc);
 
         // 包配置
@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_pdf_file");
+        strategy.setInclude("tb_mould_equipment");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

cloud-model/src/main/resources/mapper/MouldEquipmentMapper.xml

@@ -18,11 +18,12 @@
         <result column="temperature" property="temperature" />
         <result column="agent" property="agent" />
         <result column="stage" property="stage" />
+        <result column="sim" property="sim" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, is_use, hill_number, lng, lat, temperature, agent,stage
+        id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, is_use, hill_number, lng, lat, temperature, agent, stage, sim
     </sql>
     <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldEquipmentVO">
         <id column="id" property="id" />
@@ -39,6 +40,7 @@
         <result column="agent" property="agent" />
         <result column="modelName" property="modelName" />
         <result column="stage" property="stage" />
+        <result column="sim" property="sim" />
     </resultMap>
 
     <select id="getListByCompanyId" resultMap="BaseResultMapVO">
@@ -65,7 +67,7 @@
     <select id="getList" resultMap="BaseResultMapVO">
         select
         tbme.id id, tbme.equipment_name equipment_name, tbme.start_time start_time, tbme.end_time end_time,tbme.agent,
-        tbme.use_life use_life, tbme.belong_company_id belong_company_id, tbme.equipment_no equipment_no,
+        tbme.use_life use_life, tbme.belong_company_id belong_company_id, tbme.equipment_no equipment_no,tbme.sim sim,
         tbme.is_use, tbme.hill_number,tbc.company_name companyName,tbm.model_no modelNo,tbm.model_name modelName,tbme.stage
         from
         tb_mould_equipment tbme

cloud-model/src/main/resources/mapper/MouldMapper.xml

@@ -30,13 +30,13 @@
         <result column="maintain_count" property="maintainCount" />
         <result column="holes" property="holes" />
         <result column="pre_update_id" property="preUpdateId" />
+        <result column="history_run_times" property="historyRunTimes" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        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, produce_company_name, initial_modulus, equipment_id, belong_project_grade, produce_company_id, run_times, is_maintain, maintain_count, holes, pre_update_id
+        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, produce_company_name, initial_modulus, equipment_id, belong_project_grade, produce_company_id, run_times, is_maintain, maintain_count, holes, pre_update_id, history_run_times
     </sql>
-
     <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldVO">
         <id column="id" property="id"/>
         <result column="maintain_count" property="maintainCount" />
@@ -203,7 +203,7 @@
     </select>
 
     <select id="selectListByCompanyId" resultMap="BaseResultMapVO">
-select
+        select
         tbm.id id,tbm.model_no model_no, tbm.model_name model_name,tbm.initial_modulus initial_modulus,tbm.rfid rfid,tbm.creator_id creator_id,tbm.equipment_id equipment_id,tbm.is_maintain,tbm.holes,
         tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbm.pre_update_id,tbm.company_id,tbco.company_name produce_company_name,tbm.produce_company_id,
         tbp.manager mangerName,tbco.company_address area,tbmp.hill_number hillNumber,tbm.oc_cycle oc_cycle,tbp.manager_id managerId,
@@ -227,18 +227,20 @@ select
         on
         tbco.id = tbm.produce_company_id
         where
-          tbm.company_id = #{companyId}
-          AND tbm.equipment_id is not null
-          AND tbm.project_id is null
+        tbm.company_id = #{companyId}
+        AND tbm.equipment_id is not null
+        AND tbm.project_id is null
         <if test="projectId != null">
-          OR tbm.project_id = #{projectId}
+            OR tbm.project_id = #{projectId}
         </if>
     </select>
-    
+
     <update id="updateModelProjectIdAndEquipmentIdToNullById">
         update
           tb_mould
           SET /*project_id = NULL , */equipment_id = NULL
           where id = #{model.id}
     </update>
+
+
 </mapper>

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

@@ -11,7 +11,7 @@
     <javaModelGenerator targetPackage="com.js.kbt.model" targetProject="cloud-socket" />
     <sqlMapGenerator targetPackage="com.js.kbt.mapper" targetProject="cloud-socket" />
     <javaClientGenerator targetPackage="com.js.kbt.mapper" targetProject="cloud-socket" type="XMLMAPPER" />
-    <table schema="cloud_model" tableName="mould_down_packet" >
+    <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_mould_equipment" > -->

cloud-socket/src/com/js/kbt/controller/WeiXinUserInfoController.java

@@ -24,7 +24,6 @@ import com.js.kbt.mapper.MouldDownPacketMapper;
 import com.js.kbt.mapper.TbUserMapper;
 import com.js.kbt.model.MouldDownPacket;
 import com.js.kbt.model.MouldDownPacketExample;
-import com.js.kbt.model.PacketMessage;
 import com.js.kbt.model.TbUser;
 import com.js.kbt.model.TbUserExample;
 import com.js.kbt.util.MD5Util;
@@ -44,8 +43,6 @@ public class WeiXinUserInfoController {
 	private HttpServletRequest request;
 	@Resource(name = "tbUserMapper")
 	private TbUserMapper tbUserMapper;
-	@Resource(name = "packetMessage")
-	private PacketMessage packetMessage;
 	@Resource(name = "mouldDownPacketMapper")
 	private MouldDownPacketMapper mouldDownPacketMapper;
 
@@ -257,7 +254,7 @@ public class WeiXinUserInfoController {
 	 * 云平台下行配置数据包接口
 	 * lowPowerLimit 低电量报警限值：（1 字节,十六进制）如：1e
 	 * hotAlarmLimit 热报警限值：（1 字节,十六进制）如：50
-	 * equipmentNo 设备编号
+	 * equipmentNo 设备编号（可能是多个或者一个）多个以“，”隔开传  如："123456"(单个)，"123456,456878,123589"(多个)
 	 */
 	@RequestMapping("/setPacket")
 	public void bindAccount(HttpServletResponse response,String lowPowerLimit,String hotAlarmLimit,String equipmentNo) {
@@ -265,20 +262,23 @@ public class WeiXinUserInfoController {
 		String setPacketMessage = "";
 		MouldDownPacket mouldDownPacket = new MouldDownPacket();
 		MouldDownPacketExample exp = new MouldDownPacketExample();
-		exp.createCriteria().andEquipmentNoEqualTo(equipmentNo);
-		List<MouldDownPacket> list = mouldDownPacketMapper.selectByExample(exp);
-		if(list.size()>0){
-			mouldDownPacket = list.get(0);
-			setPacketMessage = downProcessMsg(lowPowerLimit,hotAlarmLimit);
-			mouldDownPacket.setPacketStr(setPacketMessage);
-			mouldDownPacket.setIsUse(0);
-			mouldDownPacketMapper.updateByPrimaryKey(mouldDownPacket);
-			
-		}else{
-			setPacketMessage = downProcessMsg(lowPowerLimit,hotAlarmLimit);
-			mouldDownPacket.setEquipmentNo(equipmentNo);
-			mouldDownPacket.setPacketStr(setPacketMessage);
-			mouldDownPacketMapper.insertSelective(mouldDownPacket);
+		String[] split = equipmentNo.split(",");
+		for (String string : split) {
+			exp.createCriteria().andEquipmentNoEqualTo(string);
+			List<MouldDownPacket> list = mouldDownPacketMapper.selectByExample(exp);
+			if(list.size()>0){
+				mouldDownPacket = list.get(0);
+				setPacketMessage = downProcessMsg(lowPowerLimit,hotAlarmLimit);
+				mouldDownPacket.setPacketStr(setPacketMessage);
+				mouldDownPacket.setIsUse(0);
+				mouldDownPacketMapper.updateByPrimaryKey(mouldDownPacket);
+				
+			}else{
+				setPacketMessage = downProcessMsg(lowPowerLimit,hotAlarmLimit);
+				mouldDownPacket.setEquipmentNo(equipmentNo);
+				mouldDownPacket.setPacketStr(setPacketMessage);
+				mouldDownPacketMapper.insertSelective(mouldDownPacket);
+			}
 		}
 		response.setContentType("application/json");
 		response.setCharacterEncoding("UTF-8");

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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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 Mon Aug 05 15:54:09 CST 2019.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="equipment_name" jdbcType="VARCHAR" property="equipmentName" />
@@ -19,12 +19,15 @@
     <result column="lng" jdbcType="DOUBLE" property="lng" />
     <result column="lat" jdbcType="DOUBLE" property="lat" />
     <result column="temperature" jdbcType="INTEGER" property="temperature" />
+    <result column="agent" jdbcType="VARCHAR" property="agent" />
+    <result column="stage" jdbcType="INTEGER" property="stage" />
+    <result column="sim" jdbcType="VARCHAR" property="sim" />
   </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.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -58,7 +61,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -92,16 +95,16 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     id, equipment_name, start_time, end_time, use_life, belong_company_id, equipment_no, 
-    is_use, hill_number, lng, lat, temperature
+    is_use, hill_number, lng, lat, temperature, agent, stage, sim
   </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.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     select
     <if test="distinct">
@@ -120,7 +123,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -131,7 +134,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     delete from tb_mould_equipment
     where id = #{id,jdbcType=INTEGER}
@@ -140,7 +143,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     delete from tb_mould_equipment
     <if test="_parameter != null">
@@ -151,7 +154,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -159,17 +162,19 @@
     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)
+      lat, temperature, agent, 
+      stage, sim)
     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})
+      #{lat,jdbcType=DOUBLE}, #{temperature,jdbcType=INTEGER}, #{agent,jdbcType=VARCHAR}, 
+      #{stage,jdbcType=INTEGER}, #{sim,jdbcType=VARCHAR})
   </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.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -209,6 +214,15 @@
       <if test="temperature != null">
         temperature,
       </if>
+      <if test="agent != null">
+        agent,
+      </if>
+      <if test="stage != null">
+        stage,
+      </if>
+      <if test="sim != null">
+        sim,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="equipmentName != null">
@@ -244,13 +258,22 @@
       <if test="temperature != null">
         #{temperature,jdbcType=INTEGER},
       </if>
+      <if test="agent != null">
+        #{agent,jdbcType=VARCHAR},
+      </if>
+      <if test="stage != null">
+        #{stage,jdbcType=INTEGER},
+      </if>
+      <if test="sim != null">
+        #{sim,jdbcType=VARCHAR},
+      </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.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     select count(*) from tb_mould_equipment
     <if test="_parameter != null">
@@ -261,7 +284,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     update tb_mould_equipment
     <set>
@@ -301,6 +324,15 @@
       <if test="record.temperature != null">
         temperature = #{record.temperature,jdbcType=INTEGER},
       </if>
+      <if test="record.agent != null">
+        agent = #{record.agent,jdbcType=VARCHAR},
+      </if>
+      <if test="record.stage != null">
+        stage = #{record.stage,jdbcType=INTEGER},
+      </if>
+      <if test="record.sim != null">
+        sim = #{record.sim,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -310,7 +342,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     update tb_mould_equipment
     set id = #{record.id,jdbcType=INTEGER},
@@ -324,7 +356,10 @@
       hill_number = #{record.hillNumber,jdbcType=VARCHAR},
       lng = #{record.lng,jdbcType=DOUBLE},
       lat = #{record.lat,jdbcType=DOUBLE},
-      temperature = #{record.temperature,jdbcType=INTEGER}
+      temperature = #{record.temperature,jdbcType=INTEGER},
+      agent = #{record.agent,jdbcType=VARCHAR},
+      stage = #{record.stage,jdbcType=INTEGER},
+      sim = #{record.sim,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -333,7 +368,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     update tb_mould_equipment
     <set>
@@ -370,6 +405,15 @@
       <if test="temperature != null">
         temperature = #{temperature,jdbcType=INTEGER},
       </if>
+      <if test="agent != null">
+        agent = #{agent,jdbcType=VARCHAR},
+      </if>
+      <if test="stage != null">
+        stage = #{stage,jdbcType=INTEGER},
+      </if>
+      <if test="sim != null">
+        sim = #{sim,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -377,7 +421,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:19:27 CST 2019.
     -->
     update tb_mould_equipment
     set equipment_name = #{equipmentName,jdbcType=VARCHAR},
@@ -390,7 +434,10 @@
       hill_number = #{hillNumber,jdbcType=VARCHAR},
       lng = #{lng,jdbcType=DOUBLE},
       lat = #{lat,jdbcType=DOUBLE},
-      temperature = #{temperature,jdbcType=INTEGER}
+      temperature = #{temperature,jdbcType=INTEGER},
+      agent = #{agent,jdbcType=VARCHAR},
+      stage = #{stage,jdbcType=INTEGER},
+      sim = #{sim,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

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

@@ -9,67 +9,67 @@ 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	int updateByPrimaryKey(TbMould record);
 }

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

@@ -5,7 +5,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:01:44 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="model_no" jdbcType="VARCHAR" property="modelNo" />
@@ -23,19 +23,23 @@
     <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="produce_company_name" jdbcType="VARCHAR" property="produceCompanyName" />
     <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" />
+    <result column="is_maintain" jdbcType="INTEGER" property="isMaintain" />
+    <result column="maintain_count" jdbcType="VARCHAR" property="maintainCount" />
+    <result column="holes" jdbcType="VARCHAR" property="holes" />
+    <result column="pre_update_id" jdbcType="INTEGER" property="preUpdateId" />
+    <result column="history_run_times" jdbcType="INTEGER" property="historyRunTimes" />
   </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.
+      This element was generated on Thu Oct 10 11:01:44 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -69,7 +73,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:01:44 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -103,18 +107,19 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:01:44 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
+    area, produce_company_name, initial_modulus, equipment_id, belong_project_grade, 
+    produce_company_id, run_times, is_maintain, maintain_count, holes, pre_update_id, 
+    history_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.
+      This element was generated on Thu Oct 10 11:01:44 CST 2019.
     -->
     select
     <if test="distinct">
@@ -133,7 +138,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:01:44 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -144,7 +149,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:01:44 CST 2019.
     -->
     delete from tb_mould
     where id = #{id,jdbcType=INTEGER}
@@ -153,7 +158,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:01:44 CST 2019.
     -->
     delete from tb_mould
     <if test="_parameter != null">
@@ -164,7 +169,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:01:44 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -174,23 +179,25 @@
       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)
+      produce_company_name, initial_modulus, equipment_id, 
+      belong_project_grade, produce_company_id, run_times, 
+      is_maintain, maintain_count, holes, 
+      pre_update_id, history_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})
+      #{produceCompanyName,jdbcType=VARCHAR}, #{initialModulus,jdbcType=INTEGER}, #{equipmentId,jdbcType=INTEGER}, 
+      #{belongProjectGrade,jdbcType=VARCHAR}, #{produceCompanyId,jdbcType=INTEGER}, #{runTimes,jdbcType=INTEGER}, 
+      #{isMaintain,jdbcType=INTEGER}, #{maintainCount,jdbcType=VARCHAR}, #{holes,jdbcType=VARCHAR}, 
+      #{preUpdateId,jdbcType=INTEGER}, #{historyRunTimes,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.
+      This element was generated on Thu Oct 10 11:01:44 CST 2019.
     -->
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
       SELECT LAST_INSERT_ID()
@@ -242,11 +249,8 @@
       <if test="area != null">
         area,
       </if>
-      <if test="factoryId != null">
-        factory_id,
-      </if>
-      <if test="factoryName != null">
-        factory_name,
+      <if test="produceCompanyName != null">
+        produce_company_name,
       </if>
       <if test="initialModulus != null">
         initial_modulus,
@@ -263,6 +267,21 @@
       <if test="runTimes != null">
         run_times,
       </if>
+      <if test="isMaintain != null">
+        is_maintain,
+      </if>
+      <if test="maintainCount != null">
+        maintain_count,
+      </if>
+      <if test="holes != null">
+        holes,
+      </if>
+      <if test="preUpdateId != null">
+        pre_update_id,
+      </if>
+      <if test="historyRunTimes != null">
+        history_run_times,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="modelNo != null">
@@ -310,11 +329,8 @@
       <if test="area != null">
         #{area,jdbcType=VARCHAR},
       </if>
-      <if test="factoryId != null">
-        #{factoryId,jdbcType=INTEGER},
-      </if>
-      <if test="factoryName != null">
-        #{factoryName,jdbcType=VARCHAR},
+      <if test="produceCompanyName != null">
+        #{produceCompanyName,jdbcType=VARCHAR},
       </if>
       <if test="initialModulus != null">
         #{initialModulus,jdbcType=INTEGER},
@@ -331,13 +347,28 @@
       <if test="runTimes != null">
         #{runTimes,jdbcType=INTEGER},
       </if>
+      <if test="isMaintain != null">
+        #{isMaintain,jdbcType=INTEGER},
+      </if>
+      <if test="maintainCount != null">
+        #{maintainCount,jdbcType=VARCHAR},
+      </if>
+      <if test="holes != null">
+        #{holes,jdbcType=VARCHAR},
+      </if>
+      <if test="preUpdateId != null">
+        #{preUpdateId,jdbcType=INTEGER},
+      </if>
+      <if test="historyRunTimes != null">
+        #{historyRunTimes,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.
+      This element was generated on Thu Oct 10 11:01:44 CST 2019.
     -->
     select count(*) from tb_mould
     <if test="_parameter != null">
@@ -348,7 +379,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:01:44 CST 2019.
     -->
     update tb_mould
     <set>
@@ -400,11 +431,8 @@
       <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 test="record.produceCompanyName != null">
+        produce_company_name = #{record.produceCompanyName,jdbcType=VARCHAR},
       </if>
       <if test="record.initialModulus != null">
         initial_modulus = #{record.initialModulus,jdbcType=INTEGER},
@@ -421,6 +449,21 @@
       <if test="record.runTimes != null">
         run_times = #{record.runTimes,jdbcType=INTEGER},
       </if>
+      <if test="record.isMaintain != null">
+        is_maintain = #{record.isMaintain,jdbcType=INTEGER},
+      </if>
+      <if test="record.maintainCount != null">
+        maintain_count = #{record.maintainCount,jdbcType=VARCHAR},
+      </if>
+      <if test="record.holes != null">
+        holes = #{record.holes,jdbcType=VARCHAR},
+      </if>
+      <if test="record.preUpdateId != null">
+        pre_update_id = #{record.preUpdateId,jdbcType=INTEGER},
+      </if>
+      <if test="record.historyRunTimes != null">
+        history_run_times = #{record.historyRunTimes,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -430,7 +473,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:01:44 CST 2019.
     -->
     update tb_mould
     set id = #{record.id,jdbcType=INTEGER},
@@ -449,13 +492,17 @@
       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},
+      produce_company_name = #{record.produceCompanyName,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}
+      run_times = #{record.runTimes,jdbcType=INTEGER},
+      is_maintain = #{record.isMaintain,jdbcType=INTEGER},
+      maintain_count = #{record.maintainCount,jdbcType=VARCHAR},
+      holes = #{record.holes,jdbcType=VARCHAR},
+      pre_update_id = #{record.preUpdateId,jdbcType=INTEGER},
+      history_run_times = #{record.historyRunTimes,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -464,7 +511,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:01:44 CST 2019.
     -->
     update tb_mould
     <set>
@@ -513,11 +560,8 @@
       <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 test="produceCompanyName != null">
+        produce_company_name = #{produceCompanyName,jdbcType=VARCHAR},
       </if>
       <if test="initialModulus != null">
         initial_modulus = #{initialModulus,jdbcType=INTEGER},
@@ -534,6 +578,21 @@
       <if test="runTimes != null">
         run_times = #{runTimes,jdbcType=INTEGER},
       </if>
+      <if test="isMaintain != null">
+        is_maintain = #{isMaintain,jdbcType=INTEGER},
+      </if>
+      <if test="maintainCount != null">
+        maintain_count = #{maintainCount,jdbcType=VARCHAR},
+      </if>
+      <if test="holes != null">
+        holes = #{holes,jdbcType=VARCHAR},
+      </if>
+      <if test="preUpdateId != null">
+        pre_update_id = #{preUpdateId,jdbcType=INTEGER},
+      </if>
+      <if test="historyRunTimes != null">
+        history_run_times = #{historyRunTimes,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -541,7 +600,7 @@
     <!--
       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.
+      This element was generated on Thu Oct 10 11:01:44 CST 2019.
     -->
     update tb_mould
     set model_no = #{modelNo,jdbcType=VARCHAR},
@@ -559,13 +618,17 @@
       rfid = #{rfid,jdbcType=VARCHAR},
       setting_life = #{settingLife,jdbcType=INTEGER},
       area = #{area,jdbcType=VARCHAR},
-      factory_id = #{factoryId,jdbcType=INTEGER},
-      factory_name = #{factoryName,jdbcType=VARCHAR},
+      produce_company_name = #{produceCompanyName,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}
+      run_times = #{runTimes,jdbcType=INTEGER},
+      is_maintain = #{isMaintain,jdbcType=INTEGER},
+      maintain_count = #{maintainCount,jdbcType=VARCHAR},
+      holes = #{holes,jdbcType=VARCHAR},
+      pre_update_id = #{preUpdateId,jdbcType=INTEGER},
+      history_run_times = #{historyRunTimes,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

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

@@ -6,124 +6,144 @@ 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.produce_company_name
+	 * @mbg.generated  Thu Oct 10 11:01:44 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;
+	private String produceCompanyName;
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	private Integer runTimes;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.is_maintain
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	private Integer isMaintain;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.maintain_count
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	private String maintainCount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.holes
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	private String holes;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.pre_update_id
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	private Integer preUpdateId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column tb_mould.history_run_times
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	private Integer historyRunTimes;
 
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -132,7 +152,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -141,7 +161,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public String getModelNo() {
 		return modelNo;
@@ -150,7 +170,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setModelNo(String modelNo) {
 		this.modelNo = modelNo;
@@ -159,7 +179,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public String getModelName() {
 		return modelName;
@@ -168,7 +188,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setModelName(String modelName) {
 		this.modelName = modelName;
@@ -177,7 +197,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public BigDecimal getWaterGap() {
 		return waterGap;
@@ -186,7 +206,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setWaterGap(BigDecimal waterGap) {
 		this.waterGap = waterGap;
@@ -195,7 +215,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public BigDecimal getTonnage() {
 		return tonnage;
@@ -204,7 +224,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setTonnage(BigDecimal tonnage) {
 		this.tonnage = tonnage;
@@ -213,7 +233,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public BigDecimal getOcCycle() {
 		return ocCycle;
@@ -222,7 +242,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setOcCycle(BigDecimal ocCycle) {
 		this.ocCycle = ocCycle;
@@ -231,7 +251,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public BigDecimal getDailyOutput() {
 		return dailyOutput;
@@ -240,7 +260,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setDailyOutput(BigDecimal dailyOutput) {
 		this.dailyOutput = dailyOutput;
@@ -249,7 +269,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public Integer getCompanyId() {
 		return companyId;
@@ -258,7 +278,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setCompanyId(Integer companyId) {
 		this.companyId = companyId;
@@ -267,7 +287,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public Integer getCurrentVersionId() {
 		return currentVersionId;
@@ -276,7 +296,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setCurrentVersionId(Integer currentVersionId) {
 		this.currentVersionId = currentVersionId;
@@ -285,7 +305,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public String getState() {
 		return state;
@@ -294,7 +314,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setState(String state) {
 		this.state = state;
@@ -303,7 +323,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public Integer getIsDelete() {
 		return isDelete;
@@ -312,7 +332,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setIsDelete(Integer isDelete) {
 		this.isDelete = isDelete;
@@ -321,7 +341,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public Integer getCreatorId() {
 		return creatorId;
@@ -330,7 +350,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setCreatorId(Integer creatorId) {
 		this.creatorId = creatorId;
@@ -339,7 +359,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public Integer getProjectId() {
 		return projectId;
@@ -348,7 +368,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setProjectId(Integer projectId) {
 		this.projectId = projectId;
@@ -357,7 +377,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public String getRfid() {
 		return rfid;
@@ -366,7 +386,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setRfid(String rfid) {
 		this.rfid = rfid;
@@ -375,7 +395,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public Integer getSettingLife() {
 		return settingLife;
@@ -384,7 +404,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setSettingLife(Integer settingLife) {
 		this.settingLife = settingLife;
@@ -393,7 +413,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public String getArea() {
 		return area;
@@ -402,52 +422,34 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 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
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.produce_company_name
+	 * @return  the value of tb_mould.produce_company_name
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
-	public String getFactoryName() {
-		return factoryName;
+	public String getProduceCompanyName() {
+		return produceCompanyName;
 	}
 
 	/**
-	 * 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
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.produce_company_name
+	 * @param produceCompanyName  the value for tb_mould.produce_company_name
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
-	public void setFactoryName(String factoryName) {
-		this.factoryName = factoryName;
+	public void setProduceCompanyName(String produceCompanyName) {
+		this.produceCompanyName = produceCompanyName;
 	}
 
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public Integer getInitialModulus() {
 		return initialModulus;
@@ -456,7 +458,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setInitialModulus(Integer initialModulus) {
 		this.initialModulus = initialModulus;
@@ -465,7 +467,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public Integer getEquipmentId() {
 		return equipmentId;
@@ -474,7 +476,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setEquipmentId(Integer equipmentId) {
 		this.equipmentId = equipmentId;
@@ -483,7 +485,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public String getBelongProjectGrade() {
 		return belongProjectGrade;
@@ -492,7 +494,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setBelongProjectGrade(String belongProjectGrade) {
 		this.belongProjectGrade = belongProjectGrade;
@@ -501,7 +503,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public Integer getProduceCompanyId() {
 		return produceCompanyId;
@@ -510,7 +512,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setProduceCompanyId(Integer produceCompanyId) {
 		this.produceCompanyId = produceCompanyId;
@@ -519,7 +521,7 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public Integer getRunTimes() {
 		return runTimes;
@@ -528,9 +530,99 @@ public class TbMould {
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setRunTimes(Integer runTimes) {
 		this.runTimes = runTimes;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.is_maintain
+	 * @return  the value of tb_mould.is_maintain
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	public Integer getIsMaintain() {
+		return isMaintain;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.is_maintain
+	 * @param isMaintain  the value for tb_mould.is_maintain
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	public void setIsMaintain(Integer isMaintain) {
+		this.isMaintain = isMaintain;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.maintain_count
+	 * @return  the value of tb_mould.maintain_count
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	public String getMaintainCount() {
+		return maintainCount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.maintain_count
+	 * @param maintainCount  the value for tb_mould.maintain_count
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	public void setMaintainCount(String maintainCount) {
+		this.maintainCount = maintainCount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.holes
+	 * @return  the value of tb_mould.holes
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	public String getHoles() {
+		return holes;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.holes
+	 * @param holes  the value for tb_mould.holes
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	public void setHoles(String holes) {
+		this.holes = holes;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.pre_update_id
+	 * @return  the value of tb_mould.pre_update_id
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	public Integer getPreUpdateId() {
+		return preUpdateId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.pre_update_id
+	 * @param preUpdateId  the value for tb_mould.pre_update_id
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	public void setPreUpdateId(Integer preUpdateId) {
+		this.preUpdateId = preUpdateId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column tb_mould.history_run_times
+	 * @return  the value of tb_mould.history_run_times
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	public Integer getHistoryRunTimes() {
+		return historyRunTimes;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column tb_mould.history_run_times
+	 * @param historyRunTimes  the value for tb_mould.history_run_times
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
+	 */
+	public void setHistoryRunTimes(Integer historyRunTimes) {
+		this.historyRunTimes = historyRunTimes;
+	}
 }

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

@@ -6,69 +6,84 @@ 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 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
+	 */
+	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
+	 */
+	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
+	 */
+	private String sim;
 
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -77,7 +92,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -86,7 +101,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public String getEquipmentName() {
 		return equipmentName;
@@ -95,7 +110,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public void setEquipmentName(String equipmentName) {
 		this.equipmentName = equipmentName;
@@ -104,7 +119,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public Date getStartTime() {
 		return startTime;
@@ -113,7 +128,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public void setStartTime(Date startTime) {
 		this.startTime = startTime;
@@ -122,7 +137,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public Date getEndTime() {
 		return endTime;
@@ -131,7 +146,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public void setEndTime(Date endTime) {
 		this.endTime = endTime;
@@ -140,7 +155,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public Integer getUseLife() {
 		return useLife;
@@ -149,7 +164,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public void setUseLife(Integer useLife) {
 		this.useLife = useLife;
@@ -158,7 +173,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public Integer getBelongCompanyId() {
 		return belongCompanyId;
@@ -167,7 +182,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public void setBelongCompanyId(Integer belongCompanyId) {
 		this.belongCompanyId = belongCompanyId;
@@ -176,7 +191,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public String getEquipmentNo() {
 		return equipmentNo;
@@ -185,7 +200,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public void setEquipmentNo(String equipmentNo) {
 		this.equipmentNo = equipmentNo;
@@ -194,7 +209,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public Integer getIsUse() {
 		return isUse;
@@ -203,7 +218,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public void setIsUse(Integer isUse) {
 		this.isUse = isUse;
@@ -212,7 +227,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public String getHillNumber() {
 		return hillNumber;
@@ -221,7 +236,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public void setHillNumber(String hillNumber) {
 		this.hillNumber = hillNumber;
@@ -230,7 +245,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public Double getLng() {
 		return lng;
@@ -239,7 +254,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public void setLng(Double lng) {
 		this.lng = lng;
@@ -248,7 +263,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public Double getLat() {
 		return lat;
@@ -257,7 +272,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public void setLat(Double lat) {
 		this.lat = lat;
@@ -266,7 +281,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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public Integer getTemperature() {
 		return temperature;
@@ -275,9 +290,63 @@ 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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public void setTemperature(Integer temperature) {
 		this.temperature = temperature;
 	}
+
+	/**
+	 * 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
+	 */
+	public String getAgent() {
+		return agent;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setAgent(String agent) {
+		this.agent = agent;
+	}
+
+	/**
+	 * 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
+	 */
+	public Integer getStage() {
+		return stage;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setStage(Integer stage) {
+		this.stage = stage;
+	}
+
+	/**
+	 * 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
+	 */
+	public String getSim() {
+		return sim;
+	}
+
+	/**
+	 * 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
+	 */
+	public void setSim(String sim) {
+		this.sim = sim;
+	}
 }

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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 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  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -912,11 +912,211 @@ public class TbMouldEquipmentExample {
 			addCriterion("temperature not between", value1, value2, "temperature");
 			return (Criteria) this;
 		}
+
+		public Criteria andAgentIsNull() {
+			addCriterion("agent is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentIsNotNull() {
+			addCriterion("agent is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentEqualTo(String value) {
+			addCriterion("agent =", value, "agent");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentNotEqualTo(String value) {
+			addCriterion("agent <>", value, "agent");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentGreaterThan(String value) {
+			addCriterion("agent >", value, "agent");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentGreaterThanOrEqualTo(String value) {
+			addCriterion("agent >=", value, "agent");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentLessThan(String value) {
+			addCriterion("agent <", value, "agent");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentLessThanOrEqualTo(String value) {
+			addCriterion("agent <=", value, "agent");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentLike(String value) {
+			addCriterion("agent like", value, "agent");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentNotLike(String value) {
+			addCriterion("agent not like", value, "agent");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentIn(List<String> values) {
+			addCriterion("agent in", values, "agent");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentNotIn(List<String> values) {
+			addCriterion("agent not in", values, "agent");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentBetween(String value1, String value2) {
+			addCriterion("agent between", value1, value2, "agent");
+			return (Criteria) this;
+		}
+
+		public Criteria andAgentNotBetween(String value1, String value2) {
+			addCriterion("agent not between", value1, value2, "agent");
+			return (Criteria) this;
+		}
+
+		public Criteria andStageIsNull() {
+			addCriterion("stage is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStageIsNotNull() {
+			addCriterion("stage is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStageEqualTo(Integer value) {
+			addCriterion("stage =", value, "stage");
+			return (Criteria) this;
+		}
+
+		public Criteria andStageNotEqualTo(Integer value) {
+			addCriterion("stage <>", value, "stage");
+			return (Criteria) this;
+		}
+
+		public Criteria andStageGreaterThan(Integer value) {
+			addCriterion("stage >", value, "stage");
+			return (Criteria) this;
+		}
+
+		public Criteria andStageGreaterThanOrEqualTo(Integer value) {
+			addCriterion("stage >=", value, "stage");
+			return (Criteria) this;
+		}
+
+		public Criteria andStageLessThan(Integer value) {
+			addCriterion("stage <", value, "stage");
+			return (Criteria) this;
+		}
+
+		public Criteria andStageLessThanOrEqualTo(Integer value) {
+			addCriterion("stage <=", value, "stage");
+			return (Criteria) this;
+		}
+
+		public Criteria andStageIn(List<Integer> values) {
+			addCriterion("stage in", values, "stage");
+			return (Criteria) this;
+		}
+
+		public Criteria andStageNotIn(List<Integer> values) {
+			addCriterion("stage not in", values, "stage");
+			return (Criteria) this;
+		}
+
+		public Criteria andStageBetween(Integer value1, Integer value2) {
+			addCriterion("stage between", value1, value2, "stage");
+			return (Criteria) this;
+		}
+
+		public Criteria andStageNotBetween(Integer value1, Integer value2) {
+			addCriterion("stage not between", value1, value2, "stage");
+			return (Criteria) this;
+		}
+
+		public Criteria andSimIsNull() {
+			addCriterion("sim is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSimIsNotNull() {
+			addCriterion("sim is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andSimEqualTo(String value) {
+			addCriterion("sim =", value, "sim");
+			return (Criteria) this;
+		}
+
+		public Criteria andSimNotEqualTo(String value) {
+			addCriterion("sim <>", value, "sim");
+			return (Criteria) this;
+		}
+
+		public Criteria andSimGreaterThan(String value) {
+			addCriterion("sim >", value, "sim");
+			return (Criteria) this;
+		}
+
+		public Criteria andSimGreaterThanOrEqualTo(String value) {
+			addCriterion("sim >=", value, "sim");
+			return (Criteria) this;
+		}
+
+		public Criteria andSimLessThan(String value) {
+			addCriterion("sim <", value, "sim");
+			return (Criteria) this;
+		}
+
+		public Criteria andSimLessThanOrEqualTo(String value) {
+			addCriterion("sim <=", value, "sim");
+			return (Criteria) this;
+		}
+
+		public Criteria andSimLike(String value) {
+			addCriterion("sim like", value, "sim");
+			return (Criteria) this;
+		}
+
+		public Criteria andSimNotLike(String value) {
+			addCriterion("sim not like", value, "sim");
+			return (Criteria) this;
+		}
+
+		public Criteria andSimIn(List<String> values) {
+			addCriterion("sim in", values, "sim");
+			return (Criteria) this;
+		}
+
+		public Criteria andSimNotIn(List<String> values) {
+			addCriterion("sim not in", values, "sim");
+			return (Criteria) this;
+		}
+
+		public Criteria andSimBetween(String value1, String value2) {
+			addCriterion("sim between", value1, value2, "sim");
+			return (Criteria) this;
+		}
+
+		public Criteria andSimNotBetween(String value1, String value2) {
+			addCriterion("sim not between", value1, value2, "sim");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table tb_mould_equipment
-	 * @mbg.generated  Mon Aug 05 15:54:09 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:19:27 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -7,23 +7,23 @@ import java.util.List;
 public class TbMouldExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table tb_mould
-	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table tb_mould
-	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table tb_mould
-	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public TbMouldExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class TbMouldExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class TbMouldExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class TbMouldExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class TbMouldExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class TbMouldExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class TbMouldExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class TbMouldExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class TbMouldExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class TbMouldExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class TbMouldExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class TbMouldExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table tb_mould
-	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1173,133 +1173,73 @@ public class TbMouldExample {
 			return (Criteria) this;
 		}
 
-		public Criteria andFactoryIdIsNull() {
-			addCriterion("factory_id is null");
+		public Criteria andProduceCompanyNameIsNull() {
+			addCriterion("produce_company_name is null");
 			return (Criteria) this;
 		}
 
-		public Criteria andFactoryIdIsNotNull() {
-			addCriterion("factory_id is not null");
+		public Criteria andProduceCompanyNameIsNotNull() {
+			addCriterion("produce_company_name is not null");
 			return (Criteria) this;
 		}
 
-		public Criteria andFactoryIdEqualTo(Integer value) {
-			addCriterion("factory_id =", value, "factoryId");
+		public Criteria andProduceCompanyNameEqualTo(String value) {
+			addCriterion("produce_company_name =", value, "produceCompanyName");
 			return (Criteria) this;
 		}
 
-		public Criteria andFactoryIdNotEqualTo(Integer value) {
-			addCriterion("factory_id <>", value, "factoryId");
+		public Criteria andProduceCompanyNameNotEqualTo(String value) {
+			addCriterion("produce_company_name <>", value, "produceCompanyName");
 			return (Criteria) this;
 		}
 
-		public Criteria andFactoryIdGreaterThan(Integer value) {
-			addCriterion("factory_id >", value, "factoryId");
+		public Criteria andProduceCompanyNameGreaterThan(String value) {
+			addCriterion("produce_company_name >", value, "produceCompanyName");
 			return (Criteria) this;
 		}
 
-		public Criteria andFactoryIdGreaterThanOrEqualTo(Integer value) {
-			addCriterion("factory_id >=", value, "factoryId");
+		public Criteria andProduceCompanyNameGreaterThanOrEqualTo(String value) {
+			addCriterion("produce_company_name >=", value, "produceCompanyName");
 			return (Criteria) this;
 		}
 
-		public Criteria andFactoryIdLessThan(Integer value) {
-			addCriterion("factory_id <", value, "factoryId");
+		public Criteria andProduceCompanyNameLessThan(String value) {
+			addCriterion("produce_company_name <", value, "produceCompanyName");
 			return (Criteria) this;
 		}
 
-		public Criteria andFactoryIdLessThanOrEqualTo(Integer value) {
-			addCriterion("factory_id <=", value, "factoryId");
+		public Criteria andProduceCompanyNameLessThanOrEqualTo(String value) {
+			addCriterion("produce_company_name <=", value, "produceCompanyName");
 			return (Criteria) this;
 		}
 
-		public Criteria andFactoryIdIn(List<Integer> values) {
-			addCriterion("factory_id in", values, "factoryId");
+		public Criteria andProduceCompanyNameLike(String value) {
+			addCriterion("produce_company_name like", value, "produceCompanyName");
 			return (Criteria) this;
 		}
 
-		public Criteria andFactoryIdNotIn(List<Integer> values) {
-			addCriterion("factory_id not in", values, "factoryId");
+		public Criteria andProduceCompanyNameNotLike(String value) {
+			addCriterion("produce_company_name not like", value, "produceCompanyName");
 			return (Criteria) this;
 		}
 
-		public Criteria andFactoryIdBetween(Integer value1, Integer value2) {
-			addCriterion("factory_id between", value1, value2, "factoryId");
+		public Criteria andProduceCompanyNameIn(List<String> values) {
+			addCriterion("produce_company_name in", values, "produceCompanyName");
 			return (Criteria) this;
 		}
 
-		public Criteria andFactoryIdNotBetween(Integer value1, Integer value2) {
-			addCriterion("factory_id not between", value1, value2, "factoryId");
+		public Criteria andProduceCompanyNameNotIn(List<String> values) {
+			addCriterion("produce_company_name not in", values, "produceCompanyName");
 			return (Criteria) this;
 		}
 
-		public Criteria andFactoryNameIsNull() {
-			addCriterion("factory_name is null");
+		public Criteria andProduceCompanyNameBetween(String value1, String value2) {
+			addCriterion("produce_company_name between", value1, value2, "produceCompanyName");
 			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");
+		public Criteria andProduceCompanyNameNotBetween(String value1, String value2) {
+			addCriterion("produce_company_name not between", value1, value2, "produceCompanyName");
 			return (Criteria) this;
 		}
 
@@ -1612,11 +1552,331 @@ public class TbMouldExample {
 			addCriterion("run_times not between", value1, value2, "runTimes");
 			return (Criteria) this;
 		}
+
+		public Criteria andIsMaintainIsNull() {
+			addCriterion("is_maintain is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIsMaintainIsNotNull() {
+			addCriterion("is_maintain is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andIsMaintainEqualTo(Integer value) {
+			addCriterion("is_maintain =", value, "isMaintain");
+			return (Criteria) this;
+		}
+
+		public Criteria andIsMaintainNotEqualTo(Integer value) {
+			addCriterion("is_maintain <>", value, "isMaintain");
+			return (Criteria) this;
+		}
+
+		public Criteria andIsMaintainGreaterThan(Integer value) {
+			addCriterion("is_maintain >", value, "isMaintain");
+			return (Criteria) this;
+		}
+
+		public Criteria andIsMaintainGreaterThanOrEqualTo(Integer value) {
+			addCriterion("is_maintain >=", value, "isMaintain");
+			return (Criteria) this;
+		}
+
+		public Criteria andIsMaintainLessThan(Integer value) {
+			addCriterion("is_maintain <", value, "isMaintain");
+			return (Criteria) this;
+		}
+
+		public Criteria andIsMaintainLessThanOrEqualTo(Integer value) {
+			addCriterion("is_maintain <=", value, "isMaintain");
+			return (Criteria) this;
+		}
+
+		public Criteria andIsMaintainIn(List<Integer> values) {
+			addCriterion("is_maintain in", values, "isMaintain");
+			return (Criteria) this;
+		}
+
+		public Criteria andIsMaintainNotIn(List<Integer> values) {
+			addCriterion("is_maintain not in", values, "isMaintain");
+			return (Criteria) this;
+		}
+
+		public Criteria andIsMaintainBetween(Integer value1, Integer value2) {
+			addCriterion("is_maintain between", value1, value2, "isMaintain");
+			return (Criteria) this;
+		}
+
+		public Criteria andIsMaintainNotBetween(Integer value1, Integer value2) {
+			addCriterion("is_maintain not between", value1, value2, "isMaintain");
+			return (Criteria) this;
+		}
+
+		public Criteria andMaintainCountIsNull() {
+			addCriterion("maintain_count is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andMaintainCountIsNotNull() {
+			addCriterion("maintain_count is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andMaintainCountEqualTo(String value) {
+			addCriterion("maintain_count =", value, "maintainCount");
+			return (Criteria) this;
+		}
+
+		public Criteria andMaintainCountNotEqualTo(String value) {
+			addCriterion("maintain_count <>", value, "maintainCount");
+			return (Criteria) this;
+		}
+
+		public Criteria andMaintainCountGreaterThan(String value) {
+			addCriterion("maintain_count >", value, "maintainCount");
+			return (Criteria) this;
+		}
+
+		public Criteria andMaintainCountGreaterThanOrEqualTo(String value) {
+			addCriterion("maintain_count >=", value, "maintainCount");
+			return (Criteria) this;
+		}
+
+		public Criteria andMaintainCountLessThan(String value) {
+			addCriterion("maintain_count <", value, "maintainCount");
+			return (Criteria) this;
+		}
+
+		public Criteria andMaintainCountLessThanOrEqualTo(String value) {
+			addCriterion("maintain_count <=", value, "maintainCount");
+			return (Criteria) this;
+		}
+
+		public Criteria andMaintainCountLike(String value) {
+			addCriterion("maintain_count like", value, "maintainCount");
+			return (Criteria) this;
+		}
+
+		public Criteria andMaintainCountNotLike(String value) {
+			addCriterion("maintain_count not like", value, "maintainCount");
+			return (Criteria) this;
+		}
+
+		public Criteria andMaintainCountIn(List<String> values) {
+			addCriterion("maintain_count in", values, "maintainCount");
+			return (Criteria) this;
+		}
+
+		public Criteria andMaintainCountNotIn(List<String> values) {
+			addCriterion("maintain_count not in", values, "maintainCount");
+			return (Criteria) this;
+		}
+
+		public Criteria andMaintainCountBetween(String value1, String value2) {
+			addCriterion("maintain_count between", value1, value2, "maintainCount");
+			return (Criteria) this;
+		}
+
+		public Criteria andMaintainCountNotBetween(String value1, String value2) {
+			addCriterion("maintain_count not between", value1, value2, "maintainCount");
+			return (Criteria) this;
+		}
+
+		public Criteria andHolesIsNull() {
+			addCriterion("holes is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andHolesIsNotNull() {
+			addCriterion("holes is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andHolesEqualTo(String value) {
+			addCriterion("holes =", value, "holes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHolesNotEqualTo(String value) {
+			addCriterion("holes <>", value, "holes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHolesGreaterThan(String value) {
+			addCriterion("holes >", value, "holes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHolesGreaterThanOrEqualTo(String value) {
+			addCriterion("holes >=", value, "holes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHolesLessThan(String value) {
+			addCriterion("holes <", value, "holes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHolesLessThanOrEqualTo(String value) {
+			addCriterion("holes <=", value, "holes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHolesLike(String value) {
+			addCriterion("holes like", value, "holes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHolesNotLike(String value) {
+			addCriterion("holes not like", value, "holes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHolesIn(List<String> values) {
+			addCriterion("holes in", values, "holes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHolesNotIn(List<String> values) {
+			addCriterion("holes not in", values, "holes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHolesBetween(String value1, String value2) {
+			addCriterion("holes between", value1, value2, "holes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHolesNotBetween(String value1, String value2) {
+			addCriterion("holes not between", value1, value2, "holes");
+			return (Criteria) this;
+		}
+
+		public Criteria andPreUpdateIdIsNull() {
+			addCriterion("pre_update_id is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPreUpdateIdIsNotNull() {
+			addCriterion("pre_update_id is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPreUpdateIdEqualTo(Integer value) {
+			addCriterion("pre_update_id =", value, "preUpdateId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPreUpdateIdNotEqualTo(Integer value) {
+			addCriterion("pre_update_id <>", value, "preUpdateId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPreUpdateIdGreaterThan(Integer value) {
+			addCriterion("pre_update_id >", value, "preUpdateId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPreUpdateIdGreaterThanOrEqualTo(Integer value) {
+			addCriterion("pre_update_id >=", value, "preUpdateId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPreUpdateIdLessThan(Integer value) {
+			addCriterion("pre_update_id <", value, "preUpdateId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPreUpdateIdLessThanOrEqualTo(Integer value) {
+			addCriterion("pre_update_id <=", value, "preUpdateId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPreUpdateIdIn(List<Integer> values) {
+			addCriterion("pre_update_id in", values, "preUpdateId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPreUpdateIdNotIn(List<Integer> values) {
+			addCriterion("pre_update_id not in", values, "preUpdateId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPreUpdateIdBetween(Integer value1, Integer value2) {
+			addCriterion("pre_update_id between", value1, value2, "preUpdateId");
+			return (Criteria) this;
+		}
+
+		public Criteria andPreUpdateIdNotBetween(Integer value1, Integer value2) {
+			addCriterion("pre_update_id not between", value1, value2, "preUpdateId");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryRunTimesIsNull() {
+			addCriterion("history_run_times is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryRunTimesIsNotNull() {
+			addCriterion("history_run_times is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryRunTimesEqualTo(Integer value) {
+			addCriterion("history_run_times =", value, "historyRunTimes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryRunTimesNotEqualTo(Integer value) {
+			addCriterion("history_run_times <>", value, "historyRunTimes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryRunTimesGreaterThan(Integer value) {
+			addCriterion("history_run_times >", value, "historyRunTimes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryRunTimesGreaterThanOrEqualTo(Integer value) {
+			addCriterion("history_run_times >=", value, "historyRunTimes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryRunTimesLessThan(Integer value) {
+			addCriterion("history_run_times <", value, "historyRunTimes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryRunTimesLessThanOrEqualTo(Integer value) {
+			addCriterion("history_run_times <=", value, "historyRunTimes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryRunTimesIn(List<Integer> values) {
+			addCriterion("history_run_times in", values, "historyRunTimes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryRunTimesNotIn(List<Integer> values) {
+			addCriterion("history_run_times not in", values, "historyRunTimes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryRunTimesBetween(Integer value1, Integer value2) {
+			addCriterion("history_run_times between", value1, value2, "historyRunTimes");
+			return (Criteria) this;
+		}
+
+		public Criteria andHistoryRunTimesNotBetween(Integer value1, Integer value2) {
+			addCriterion("history_run_times not between", value1, value2, "historyRunTimes");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table tb_mould
-	 * @mbg.generated  Mon Aug 05 15:13:45 CST 2019
+	 * @mbg.generated  Thu Oct 10 11:01:44 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -12,7 +12,6 @@ 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.MouldDownPacketMapper;
 import com.js.kbt.mapper.MouldHistoryMapper;
 import com.js.kbt.mapper.MouldHistoryTimeMapper;
@@ -25,15 +24,10 @@ import com.js.kbt.model.MouldDownPacketExample;
 import com.js.kbt.model.MouldHistory;
 import com.js.kbt.model.MouldHistoryTime;
 import com.js.kbt.model.MouldHistoryTimeExample;
-import com.js.kbt.model.MouldHoding;
-import com.js.kbt.model.PacketMessage;
 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 com.sun.mail.dsn.message_deliverystatus;
-
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.channel.ChannelHandlerContext;
@@ -80,15 +74,14 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 			return ret;
 		}
 		MouldHistory item = new MouldHistory();
-
-		// 抽取手机号码
-		String mobilePart = input.substring(4 * 2, 15 * 2);
+		// 抽取手机号码4-5(预留)丢包情况硬件会上报状态01，服务器判断02时候下发printall
+		String mobilePart = input.substring(4 * 2, 5 * 2);
 		System.out.println("原始mobile=" + mobilePart);
 		String mobile = getStringFromHexStr(mobilePart);
 		System.out.println("手机号码为" + mobile);
 		item.setSim(mobile);
 		// 获取设备编码15-24
-		String deviceNumPart = input.substring(15 * 2, 25 * 2);
+		String deviceNumPart = input.substring(5 * 2, 25 * 2);
 		String deviceNum = getStringFromHexStr(deviceNumPart);
 		System.out.println("设备No=" + deviceNum);
 		item.setEquipmentNo(deviceNum);
@@ -184,6 +177,12 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 			avgTime = totalTime / list.size();
 		}
 		handleModLogic(item, avgTime);
+		//判断预留字节的
+		if("02".equals(mobilePart)){
+			//丢包数据已占满缓存，调用读取命令
+			sendMsg("#PRINTFALL;");
+			return deviceNum;
+		}
 		//返回设备编号
 		return deviceNum;
 	}
@@ -226,8 +225,8 @@ public class UserHandler extends SimpleChannelInboundHandler<String> {
 			if (tbMouldMapper.countByExample(tExp) > 0) {
 				TbMould tm = tbMouldMapper.selectByExample(tExp).get(0);
 				tm.setState(item.getStatus());
-				tm.setRunTimes(tm.getRunTimes() + item.getRunCnt());
-
+				//云模盒运行次数+模具的历史运行次数
+				tm.setRunTimes(item.getRunCnt()+tm.getHistoryRunTimes());
 				// 处理每模平均周期(单位秒)
 				BigDecimal bd = new BigDecimal(avgTime * 1.00 / 1000);
 				tm.setOcCycle(bd);

cloud-socket/src/jdbc.properties

@@ -1,5 +1,5 @@
-#classPath=D:/model/cloud-socket/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
+classPath=D:/model/cloud-socket/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