模具详情

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

@@ -6,6 +6,7 @@ import com.hssx.cloudmodel.entity.Company;
 import com.hssx.cloudmodel.entity.Mould;
 import com.hssx.cloudmodel.entity.MouldEquipment;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.MouldVO;
 import com.hssx.cloudmodel.entity.vo.UserVO;
 import com.hssx.cloudmodel.service.*;
 import com.hssx.cloudmodel.util.HttpRespMsg;
@@ -82,5 +83,18 @@ public class MouldController {
         msg = projectService.getModelListByUser(userVO,page);
         return msg;
     }
+
+    /**
+     * 模具详情
+     * 参数 id 模具id
+     * @return
+     */
+    @ApiOperation("模具详情")
+    @RequestMapping("/detail")
+    @ResponseBody
+    public HttpRespMsg detail(MouldVO mouldVO){
+        HttpRespMsg msg = mouldService.getMoildDetail(mouldVO);
+        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-02
+ * @since 2019-08-05
  */
 @TableName("tb_mould")
 public class Mould extends Model<Mould> {
@@ -76,7 +76,7 @@ public class Mould extends Model<Mould> {
     private Integer currentVersionId;
 
     /**
-     * 状态 0-禁止 1-运行
+     * 状态0-静止 1-运动
      */
     @TableField("state")
     private String state;
@@ -153,6 +153,12 @@ public class Mould extends Model<Mould> {
     @TableField("produce_company_id")
     private Integer produceCompanyId;
 
+    /**
+     * 运行次数
+     */
+    @TableField("run_times")
+    private Integer runTimes;
+
 
     public Integer getId() {
         return id;
@@ -330,6 +336,14 @@ public class Mould extends Model<Mould> {
         this.produceCompanyId = produceCompanyId;
     }
 
+    public Integer getRunTimes() {
+        return runTimes;
+    }
+
+    public void setRunTimes(Integer runTimes) {
+        this.runTimes = runTimes;
+    }
+
     @Override
     protected Serializable pkVal() {
         return this.id;
@@ -360,6 +374,7 @@ public class Mould extends Model<Mould> {
         ", equipmentId=" + equipmentId +
         ", belongProjectGrade=" + belongProjectGrade +
         ", produceCompanyId=" + produceCompanyId +
+        ", runTimes=" + runTimes +
         "}";
     }
 }

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

@@ -20,44 +20,5 @@ public class MouldVO extends Mould {
     private LocalDateTime endTime;
     private String mangerName;
     private String equipmentNo;
-
-    public String getMouldEquipmentNo() {
-        return mouldEquipmentNo;
-    }
-
-    public void setMouldEquipmentNo(String mouldEquipmentNo) {
-        this.mouldEquipmentNo = mouldEquipmentNo;
-    }
-
-    public String getProjectName() {
-        return projectName;
-    }
-
-    public void setProjectName(String projectName) {
-        this.projectName = projectName;
-    }
-
-    public LocalDateTime getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(LocalDateTime endTime) {
-        this.endTime = endTime;
-    }
-
-    public String getMangerName() {
-        return mangerName;
-    }
-
-    public void setMangerName(String mangerName) {
-        this.mangerName = mangerName;
-    }
-
-    public String getEquipmentNo() {
-        return equipmentNo;
-    }
-
-    public void setEquipmentNo(String equipmentNo) {
-        this.equipmentNo = equipmentNo;
-    }
+    private String hillNumber;
 }

cloud-model/src/main/java/com/hssx/cloudmodel/mapper/MouldMapper.java

@@ -24,4 +24,6 @@ public interface MouldMapper extends BaseMapper<Mould> {
     List<MouldVO> selectListByCondition(@Param("userVO")UserVO userVO);
 
     List<MouldVO> selectListByConditionByProject(@Param("userVO")UserVO userVO, @Param("list")List<Integer> set);
+
+    MouldVO getDetailById(@Param("mouldVO")MouldVO mouldVO);
 }

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

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.service;
 import com.hssx.cloudmodel.entity.Mould;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.MouldVO;
 import com.hssx.cloudmodel.util.HttpRespMsg;
 
 /**
@@ -16,4 +17,6 @@ import com.hssx.cloudmodel.util.HttpRespMsg;
 public interface MouldService extends IService<Mould> {
 
     HttpRespMsg addAndUpdateMould(Mould mould, User user);
+
+    HttpRespMsg getMoildDetail(MouldVO mould);
 }

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

@@ -3,6 +3,7 @@ package com.hssx.cloudmodel.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hssx.cloudmodel.entity.Mould;
 import com.hssx.cloudmodel.entity.User;
+import com.hssx.cloudmodel.entity.vo.MouldVO;
 import com.hssx.cloudmodel.mapper.MouldMapper;
 import com.hssx.cloudmodel.service.MouldService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -48,4 +49,11 @@ public class MouldServiceImpl extends ServiceImpl<MouldMapper, Mould> implements
         }
         return msg;
     }
+
+    @Override
+    public HttpRespMsg getMoildDetail(MouldVO mouldVO) {
+        HttpRespMsg msg = new HttpRespMsg();
+        msg.data = mouldMapper.getDetailById(mouldVO);
+        return msg;
+    }
 }

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

@@ -26,40 +26,44 @@
         <result column="equipment_id" property="equipmentId" />
         <result column="belong_project_grade" property="belongProjectGrade" />
         <result column="produce_company_id" property="produceCompanyId" />
-    </resultMap>
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldVO">
-        <id column="id" property="id" />
-        <result column="model_no" property="modelNo" />
-        <result column="model_name" property="modelName" />
-        <result column="oc_cycle" property="ocCycle" />
-        <result column="daily_output" property="dailyOutput" />
-        <result column="company_id" property="companyId" />
-        <result column="current_version_id" property="currentVersionId" />
-        <result column="state" property="state" />
-        <result column="is_delete" property="isDelete" />
-        <result column="creator_id" property="creatorId" />
-        <result column="project_id" property="projectId" />
-        <result column="projectName" property="projectName" />
-        <result column="rfid" property="rfid" />
-        <result column="setting_life" property="settingLife" />
-        <result column="area" property="area" />
-        <result column="factory_id" property="factoryId" />
-        <result column="factory_name" property="factoryName" />
-        <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="projectName" property="projectName" />
-        <result column="mangerName" property="mangerName" />
-        <result column="equipmentNo" property="equipmentNo" />
-        <result column="endTime" property="endTime" />
+        <result column="run_times" property="runTimes" />
     </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
+        id, model_no, model_name, water_gap, tonnage, oc_cycle, daily_output, company_id, current_version_id, state, is_delete, creator_id, project_id, rfid, setting_life, area, factory_id, factory_name, initial_modulus, equipment_id, belong_project_grade, produce_company_id, run_times
     </sql>
+
+
+    <resultMap id="BaseResultMapVO" type="com.hssx.cloudmodel.entity.vo.MouldVO">
+        <id column="id" property="id"/>
+        <result column="model_no" property="modelNo"/>
+        <result column="model_name" property="modelName"/>
+        <result column="oc_cycle" property="ocCycle"/>
+        <result column="daily_output" property="dailyOutput"/>
+        <result column="company_id" property="companyId"/>
+        <result column="current_version_id" property="currentVersionId"/>
+        <result column="state" property="state"/>
+        <result column="is_delete" property="isDelete"/>
+        <result column="creator_id" property="creatorId"/>
+        <result column="project_id" property="projectId"/>
+        <result column="projectName" property="projectName"/>
+        <result column="rfid" property="rfid"/>
+        <result column="setting_life" property="settingLife"/>
+        <result column="area" property="area"/>
+        <result column="factory_id" property="factoryId"/>
+        <result column="factory_name" property="factoryName"/>
+        <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="projectName" property="projectName"/>
+        <result column="mangerName" property="mangerName"/>
+        <result column="equipmentNo" property="equipmentNo"/>
+        <result column="endTime" property="endTime"/>
+        <result column="hillNumber" property="hillNumber"/>
+    </resultMap>
+
     <update id="updateMouldByProjectId">
         update tb_mould set project_id = null where project_id = #{project.id}
     </update>
@@ -71,13 +75,13 @@
         tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,
         tbmp.equipment_no equipmentNo,tbm.setting_life setting_life
         from
-          tb_mould tbm
+        tb_mould tbm
         left join
-          tb_mould_equipment tbmp
+        tb_mould_equipment tbmp
         on
-          tbm.equipment_id = tbmp.id
+        tbm.equipment_id = tbmp.id
         left join
-         tb_project  tbp
+        tb_project tbp
         on tbp.id = tbm.project_id
         <where>
             <if test="userVO.parentId != 0">
@@ -96,8 +100,10 @@
     </select>
     <select id="selectListByConditionByProject" resultMap="BaseResultMapVO">
         select
-        tbm.id id,tbm.model_no model_no, tbm.model_name, tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,
-        tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.equipment_no equipmentNo,tbm.setting_life setting_life
+        tbm.id id,tbm.model_no model_no, tbm.model_name, tbmp.end_time endTime,tbm.state state,tbp.project_name
+        projectName,
+        tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbmp.equipment_no
+        equipmentNo,tbm.setting_life setting_life
         from
         tb_mould tbm
         left join
@@ -105,7 +111,7 @@
         on
         tbm.equipment_id = tbmp.id
         left join
-        tb_project  tbp
+        tb_project tbp
         on tbp.id = tbm.project_id
         <where>
             <if test="userVO.serchType == 0">
@@ -114,11 +120,29 @@
             <if test="userVO.serchType == 1">
                 AND tbm.model_name like concat('%',#{userVO.keyName},'%')
             </if>
-                AND tbm.project_id in
+            AND tbm.project_id in
             <foreach item="item" index="index" collection="list"
                      open="(" separator="," close=")">
                 #{item}
             </foreach>
         </where>
     </select>
+
+    <select id="getDetailById" resultMap="BaseResultMapVO">
+    select
+        tbm.id id,tbm.model_no model_no, tbm.model_name,tbm.initial_modulus initial_modulus, tbmp.end_time endTime,tbm.state state,tbp.project_name projectName,
+        tbp.manager mangerName,tbm.factory_name factory_name,tbm.area area,tbm.rfid rfid,
+        tbmp.equipment_no equipmentNo,tbmp.hill_number hillNumber,tbm.setting_life setting_life
+        from
+        tb_mould tbm
+        left join
+        tb_mould_equipment tbmp
+        on
+        tbm.equipment_id = tbmp.id
+        left join
+        tb_project  tbp
+        on tbp.id = tbm.project_id
+        where
+        tbm.id = #{mouldVO.id}
+    </select>
 </mapper>