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/entity/Mould.java

@@ -14,7 +14,7 @@ import java.io.Serializable;
  * </p>
  *
  * @author 吴涛涛
- * @since 2019-08-05
+ * @since 2019-08-19
  */
 @TableName("tb_mould")
 public class Mould extends Model<Mould> {
@@ -106,19 +106,19 @@ public class Mould extends Model<Mould> {
     private String rfid;
 
     /**
-     * 使用寿命
+     * 使用寿命 单位：次
      */
     @TableField("setting_life")
     private Integer settingLife;
 
     /**
-     * 工厂位置
+     * 生产方公司位置
      */
     @TableField("area")
     private String area;
 
     /**
-     * 生产方公司名称
+     * 生产方名称
      */
     @TableField("produce_company_name")
     private String produceCompanyName;
@@ -152,17 +152,31 @@ public class Mould extends Model<Mould> {
      */
     @TableField("run_times")
     private Integer runTimes;
+
     /**
-     * 保养提醒 0-不需要保养，1-保养
+     * 保养提醒 0-不需要，1-需要
      */
     @TableField("is_maintain")
     private Integer isMaintain;
+
     /**
-     * 保养设定次数："1,2,3"
+     * 保养设定次数:1,2,3
      */
     @TableField("maintain_count")
     private String maintainCount;
 
+    /**
+     * 穴数
+     */
+    @TableField("holes")
+    private String holes;
+
+    /**
+     * 更新前的id
+     */
+    @TableField("pre_update_id")
+    private Integer preUpdateId;
+
 
     public Integer getId() {
         return id;
@@ -292,6 +306,13 @@ public class Mould extends Model<Mould> {
         this.area = area;
     }
 
+    public String getProduceCompanyName() {
+        return produceCompanyName;
+    }
+
+    public void setProduceCompanyName(String produceCompanyName) {
+        this.produceCompanyName = produceCompanyName;
+    }
 
     public Integer getInitialModulus() {
         return initialModulus;
@@ -349,21 +370,25 @@ public class Mould extends Model<Mould> {
         this.maintainCount = maintainCount;
     }
 
-    @Override
-    protected Serializable pkVal() {
-        return this.id;
+    public String getHoles() {
+        return holes;
     }
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
+    public void setHoles(String holes) {
+        this.holes = holes;
     }
 
-    public String getProduceCompanyName() {
-        return produceCompanyName;
+    public Integer getPreUpdateId() {
+        return preUpdateId;
     }
 
-    public void setProduceCompanyName(String produceCompanyName) {
-        this.produceCompanyName = produceCompanyName;
+    public void setPreUpdateId(Integer preUpdateId) {
+        this.preUpdateId = preUpdateId;
+    }
+
+    @Override
+    protected Serializable pkVal() {
+        return this.id;
     }
 
     @Override
@@ -385,11 +410,16 @@ public class Mould extends Model<Mould> {
         ", rfid=" + rfid +
         ", settingLife=" + settingLife +
         ", area=" + area +
+        ", produceCompanyName=" + produceCompanyName +
         ", initialModulus=" + initialModulus +
         ", equipmentId=" + equipmentId +
         ", belongProjectGrade=" + belongProjectGrade +
         ", produceCompanyId=" + produceCompanyId +
         ", runTimes=" + runTimes +
+        ", isMaintain=" + isMaintain +
+        ", maintainCount=" + maintainCount +
+        ", holes=" + holes +
+        ", preUpdateId=" + preUpdateId +
         "}";
     }
 }

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

@@ -204,7 +204,7 @@ public class CodeGenerator {
         //若想要生成的实体类继承某个Controller，则可打开下面注释。写上需要继承的Controller的位置即可
 //        strategy.setSuperControllerClass("com.baomidou.ant.common.BaseController");
         //此处user是表名，多个英文逗号分割
-        strategy.setInclude("tb_asset_custom_company");
+        strategy.setInclude("tb_mould");
 //        strategy.setExclude();//数据库表全生成
 //        strategy.setInclude(scanner("user").split(","));//表名，多个英文逗号分割
         strategy.setControllerMappingHyphenStyle(true);

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

@@ -20,22 +20,23 @@
         <result column="rfid" property="rfid" />
         <result column="setting_life" property="settingLife" />
         <result column="area" property="area" />
+        <result column="produce_company_name" property="produceCompanyName" />
         <result column="initial_modulus" property="initialModulus" />
         <result column="equipment_id" property="equipmentId" />
         <result column="belong_project_grade" property="belongProjectGrade" />
         <result column="produce_company_id" property="produceCompanyId" />
-        <result column="produce_company_name" property="produceCompanyName" />
         <result column="run_times" property="runTimes" />
         <result column="is_maintain" property="isMaintain" />
         <result column="maintain_count" property="maintainCount" />
+        <result column="holes" property="holes" />
+        <result column="pre_update_id" property="preUpdateId" />
     </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, factory_id, factory_name, initial_modulus, equipment_id, belong_project_grade, produce_company_id, run_times
+        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
     </sql>
 
-
     <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldVO">
         <id column="id" property="id"/>
         <result column="maintain_count" property="maintainCount" />
@@ -69,6 +70,8 @@
         <result column="ownerCompanyName" property="ownerCompanyName"/>
         <result column="companyName" property="companyName"/>
         <result column="is_maintain" property="isMaintain" />
+        <result column="holes" property="holes" />
+        <result column="pre_update_id" property="preUpdateId" />
     </resultMap>
 
     <update id="updateMouldByProjectId">
@@ -77,8 +80,8 @@
 
     <select id="selectListByCondition" resultMap="BaseResultMapVO">
         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,
-        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbco.company_name produceCompany,
+        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,tbco.company_name produceCompany,tbm.pre_update_id,
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.hill_number hillNumber,tbm.oc_cycle oc_cycle,tbp.manager_id managerId,
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName,tbm.run_times run_times
         from
@@ -116,7 +119,7 @@
     <select id="selectListByConditionByProject" resultMap="BaseResultMapVO">
         select
         tbm.id id,tbm.model_no model_no, tbm.model_name model_name,tbm.initial_modulus initial_modulus,tbm.rfid rfid,tbp.manager_id managerId,tbm.equipment_id equipment_id,is_maintain,
-        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,
+        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbc.company_name companyName,tbm.holes,tbm.pre_update_id,
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.hill_number hillNumber,tbm.oc_cycle oc_cycle,tbm.creator_id creator_id,
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life,tbp.owner_company_name ownerCompanyName,tbm.run_times run_times
         from
@@ -152,8 +155,8 @@
     select
         tbm.project_id project_id, tbm.setting_life setting_life, tbm.area area,tbm.equipment_id equipment_id,tbm.maintain_count maintain_count,is_maintain,
         tbm.id id,tbm.model_no model_no, tbm.model_name,tbm.initial_modulus initial_modulus,tbp.manager_id managerId,tbm.produce_company_id produce_company_id,
-        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbco.company_name produceCompany,tbm.creator_id creator_id,
-        tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbm.rfid rfid,tbm.oc_cycle oc_cycle,tbc.company_name companyName,
+        tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,tbco.company_name produceCompany,tbm.creator_id creator_id,tbm.holes,
+        tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbm.rfid rfid,tbm.oc_cycle oc_cycle,tbc.company_name companyName,tbm.pre_update_id,
         tbmp.equipment_no equipmentNo,tbmp.hill_number hillNumber,tbm.setting_life setting_life,tbm.run_times run_times
         from
         tb_mould tbm