Merge remote-tracking branch 'origin/master'

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepItem/mapper/CmmsUpkeepItemMapper.java

@@ -24,6 +24,18 @@ public interface CmmsUpkeepItemMapper extends BaseMapper<CmmsUpkeepItem> {
     public List<CmmsUpkeepItemDto> getAllCmmsUpkeepItem(Page<CmmsUpkeepItemDto> page, CmmsUpkeepItem cmmsUpkeepItem);
 
     /**
+     * 根据id查询保养项
+     *
+     */
+    public List<CmmsUpkeepItemDto> getCmmsUpkeepItemById(@Param("id") String id);
+
+    /**
+     * 根据保养计划id查找保养项
+     *
+     */
+    public List<CmmsUpkeepItemDto> getCmmsUpkeepItemByPid(@Param("upkeepplanid") String upkeepplanid);
+
+    /**
      * 根据设备id查找设备类型id以及设备类型名称，根据设备类型id查询保养项
      *
      */

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepItem/mapper/xml/CmmsUpkeepItemMapper.xml

@@ -27,6 +27,18 @@
         order by c.create_time desc
     </select>
 
+    <select id="getCmmsUpkeepItemById" parameterType="String" resultMap="CmmsUpkeepItemResult">
+        select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.itemcode, c.itemname, c.equipdefid, c.itemcontent, c.remark, t.name as equiptypeName
+        from cmms_upkeep_item as c left join tpm_equipment_tree as t on c.equipdefid = t.id
+        where c.id=#{id}
+    </select>
+
+    <select id="getCmmsUpkeepItemByPid" parameterType="String" resultMap="CmmsUpkeepItemResult">
+        select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.itemcode, c.itemname, c.equipdefid, c.itemcontent, c.remark, t.name as equiptypeName
+        from cmms_upkeep_plan_item as pi left join cmms_upkeep_item as c on pi.upkeepitemid=c.id left join tpm_equipment_tree as t on c.equipdefid = t.id
+        where pi.upkeepplanid=#{upkeepplanid}
+    </select>
+
     <select id="getCmmsUpkeepItemByEqid" parameterType="String" resultMap="CmmsUpkeepItemResult">
         select c.id, c.create_by, c.create_time, c.update_by, c.update_time, c.itemcode, c.itemname, c.equipdefid, c.itemcontent, c.remark, t.name as equiptypeName
         from tpm_equipment as e

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepItem/service/ICmmsUpkeepItemService.java

@@ -24,6 +24,18 @@ public interface ICmmsUpkeepItemService extends IService<CmmsUpkeepItem> {
     public List<CmmsUpkeepItemDto> getAllCmmsUpkeepItem(Page<CmmsUpkeepItemDto> page, CmmsUpkeepItem cmmsUpkeepItem);
 
     /**
+     * 根据id查询保养项
+     *
+     */
+    public List<CmmsUpkeepItemDto> getCmmsUpkeepItemById(String id);
+
+    /**
+     * 根据保养计划id查找保养项
+     *
+     */
+    public List<CmmsUpkeepItemDto> getCmmsUpkeepItemByPid(String upkeepplanid);
+
+    /**
      * 新增保养项
      *
      * @param cmmsUpkeepItem 保养项

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepItem/service/impl/CmmsUpkeepItemServiceImpl.java

@@ -54,6 +54,22 @@ public class CmmsUpkeepItemServiceImpl extends ServiceImpl<CmmsUpkeepItemMapper,
     }
 
     /**
+     * 根据id查询保养项
+     *
+     */
+    public List<CmmsUpkeepItemDto> getCmmsUpkeepItemById(String id){
+        return cmmsUpkeepItemMapper.getCmmsUpkeepItemById(id);
+    }
+
+    /**
+     * 根据保养计划id查找保养项
+     *
+     */
+    public List<CmmsUpkeepItemDto> getCmmsUpkeepItemByPid(String upkeepplanid){
+        return cmmsUpkeepItemMapper.getCmmsUpkeepItemByPid(upkeepplanid);
+    }
+
+    /**
      * 新增保养项
      * 单选设备类型  多选设备类型ID
      *

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/controller/CmmsUpkeepPlanController.java

@@ -166,12 +166,13 @@ public class CmmsUpkeepPlanController extends JeecgController<CmmsUpkeepPlan, IC
 	//@AutoLog(value = "保养计划-通过id查询")
 	@ApiOperation(value="保养计划-通过id查询", notes="保养计划-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<CmmsUpkeepPlan> queryById(@RequestParam(name="id",required=true) String id) {
-		CmmsUpkeepPlan cmmsUpkeepPlan = cmmsUpkeepPlanService.getById(id);
-		if(cmmsUpkeepPlan==null) {
+	public Result<CmmsUpkeepPlanDto> queryById(@RequestParam(name="id",required=true) String id) {
+		CmmsUpkeepPlanDto cmmsUpkeepPlanDto = cmmsUpkeepPlanService.getCmmsUpkeepPlanById(id);
+//		CmmsUpkeepPlan cmmsUpkeepPlan = cmmsUpkeepPlanService.getById(id);
+		if(cmmsUpkeepPlanDto==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(cmmsUpkeepPlan);
+		return Result.OK(cmmsUpkeepPlanDto);
 	}
 
     /**

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/entity/CmmsUpkeepPlan.java

@@ -93,7 +93,7 @@ public class CmmsUpkeepPlan implements Serializable {
     @ApiModelProperty(value = "联系人电话")
     private java.lang.String linkertel;
 	/**负责人*/
-	@Excel(name = "负责人", width = 15)
+	@Excel(name = "负责人", width = 15, dicCode = "id")
     @ApiModelProperty(value = "负责人")
     @Dict(dicCode = "id",dictTable="sys_user",dicText="realname")
     private java.lang.String chargeruser;

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/mapper/CmmsUpkeepPlanMapper.java

@@ -32,7 +32,7 @@ public interface CmmsUpkeepPlanMapper extends BaseMapper<CmmsUpkeepPlan> {
      * 根据id查找保养计划
      *
      */
-    public List<CmmsUpkeepPlanDto> getCmmsUpkeepPlanContentById(@Param("id") String id);
+    public CmmsUpkeepPlanDto getCmmsUpkeepPlanContentById(@Param("id") String id);
 
     /**
      *

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/mapper/xml/CmmsUpkeepPlanMapper.xml

@@ -48,7 +48,7 @@
     <select id="getCmmsUpkeepPlanContentById" parameterType="String" resultMap="CmmsUpkeepPlanResult">
         select p.id, p.create_by, p.create_time, p.update_by, p.update_time, p.remark, p.plancode, p.planname, p.upkeepprojid, p.projectname, p.address, p.supplier, p.suppliertel, p.linker, p.linkertel, p.chargeruser, p.plandesc, p.begintime, p.repeatnum, p.repeattype, p.noticenum, p.noticetype, p.status, p.nexttime, p.ifnotice, p.noticetime, e.equipmentname as equipmentName
         from cmms_upkeep_plan as p left join tpm_equipment as e on p.equipmentid = e.id
-        where a.id = #{id}
+        where p.id = #{id}
     </select>
 
     <select id="getCmmsUpkeepPlanByStatus" parameterType="String" resultType="org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan">

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/service/ICmmsUpkeepPlanService.java

@@ -5,6 +5,7 @@ import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlanDto;
+import org.jeecg.modules.util.CacheKey;
 
 import java.util.List;
 
@@ -24,6 +25,12 @@ public interface ICmmsUpkeepPlanService extends IService<CmmsUpkeepPlan> {
     public List<CmmsUpkeepPlanDto> getAllCmmsUpkeepPlan(Page<CmmsUpkeepPlanDto> page, CmmsUpkeepPlan cmmsUpkeepPlan);
 
     /**
+     * 根据id查询  查询保养计划，还有保养计划-保养项
+     *
+     */
+    public CmmsUpkeepPlanDto getCmmsUpkeepPlanById(String id);
+
+    /**
      * 根据status查找启用的保养计划
      */
     public List<CmmsUpkeepPlan> getCmmsUpkeepPlanByStatus(String status);
@@ -67,4 +74,14 @@ public interface ICmmsUpkeepPlanService extends IService<CmmsUpkeepPlan> {
      */
     public int updateCmmsUpkeepPlanIfnoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList);
 
+    /**
+     * 将计划放入redis中
+     */
+    public void setRedisCache();
+
+    /**
+     * 从redis中获取启用的所有保养计划
+     */
+    public List<CmmsUpkeepPlan> selectAllPlan0Status();
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlan/service/impl/CmmsUpkeepPlanServiceImpl.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Update;
 import org.jeecg.common.constant.CommonConstant;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItemDto;
+import org.jeecg.modules.cmmsUpkeepItem.service.ICmmsUpkeepItemService;
 import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlan;
 import org.jeecg.modules.cmmsUpkeepPlan.entity.CmmsUpkeepPlanDto;
 import org.jeecg.modules.cmmsUpkeepPlan.mapper.CmmsUpkeepPlanMapper;
@@ -42,6 +43,10 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
 
     @Autowired
     @SuppressWarnings("all")
+    private ICmmsUpkeepItemService cmmsUpkeepItemService;
+
+    @Autowired
+    @SuppressWarnings("all")
     private AutoCodeUtil autoCodeUtil;
 
     @Autowired
@@ -98,6 +103,17 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
     }
 
     /**
+     * 根据id查询  查询保养计划，还有保养计划-保养项
+     *
+     */
+    public CmmsUpkeepPlanDto getCmmsUpkeepPlanById(String id){
+        CmmsUpkeepPlanDto cmmsUpkeepPlanDto = cmmsUpkeepPlanMapper.getCmmsUpkeepPlanContentById(id);
+        List<CmmsUpkeepItemDto> cmmsUpkeepItemDtoList = cmmsUpkeepItemService.getCmmsUpkeepItemByPid(id);
+        cmmsUpkeepPlanDto.setCmmsUpkeepItemDtoList(cmmsUpkeepItemDtoList);
+        return cmmsUpkeepPlanDto;
+    }
+
+    /**
      * 根据status查找启用的保养计划
      */
     public List<CmmsUpkeepPlan> getCmmsUpkeepPlanByStatus(String status){
@@ -134,7 +150,7 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
         if(cmmsUpkeepPlanDto.getNoticenum() != null) cmmsUpkeepPlan.setNoticenum(cmmsUpkeepPlanDto.getNoticenum());//保养计划执行提前通知时间
         if(cmmsUpkeepPlanDto.getNoticetype() != null) cmmsUpkeepPlan.setNoticetype(cmmsUpkeepPlanDto.getNoticetype());//保养计划执行提前通知时间单位
         if(cmmsUpkeepPlanDto.getStatus() != null) cmmsUpkeepPlan.setStatus(cmmsUpkeepPlanDto.getStatus());//保养计划是否启用状态 0启用 1停用
-        if(cmmsUpkeepPlanDto.getIfnotice() != null) cmmsUpkeepPlan.setIfnotice(cmmsUpkeepPlanDto.getIfnotice());//保养计划即将执行是否已通知 是/否
+        if(cmmsUpkeepPlanDto.getIfnotice() != null) cmmsUpkeepPlan.setIfnotice("否");//保养计划即将执行是否已通知 是/否
         if(cmmsUpkeepPlanDto.getEquipmentid() != null) cmmsUpkeepPlan.setEquipmentid(cmmsUpkeepPlanDto.getEquipmentid());//保养计划对应的设备id
         if(cmmsUpkeepPlanDto.getRemark() != null & (!("".equals(cmmsUpkeepPlanDto.getRemark())))) cmmsUpkeepPlan.setRemark(cmmsUpkeepPlanDto.getRemark());//保养计划备注
 //        cmmsUpkeepPlan.setNexttime(getNextTime(cmmsUpkeepPlanDto.getBegintime(), cmmsUpkeepPlanDto.getRepeattype(), cmmsUpkeepPlanDto.getRepeatnum()));//下次保养计划执行时间
@@ -213,7 +229,9 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
      *
      */
     public int updateCmmsUpkeepCreateNoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList){
-        return cmmsUpkeepPlanMapper.updateCmmsUpkeepCreateNoticeByIds(cmmsUpkeepPlanList);
+        int rtn = cmmsUpkeepPlanMapper.updateCmmsUpkeepCreateNoticeByIds(cmmsUpkeepPlanList);
+        setRedisCache();
+        return rtn;
     }
 
 
@@ -222,7 +240,9 @@ public class CmmsUpkeepPlanServiceImpl extends ServiceImpl<CmmsUpkeepPlanMapper,
      *
      */
     public int updateCmmsUpkeepPlanIfnoticeByIds(List<CmmsUpkeepPlan> cmmsUpkeepPlanList){
-        return cmmsUpkeepPlanMapper.updateCmmsUpkeepPlanIfnoticeByIds(cmmsUpkeepPlanList);
+        int rtn = cmmsUpkeepPlanMapper.updateCmmsUpkeepPlanIfnoticeByIds(cmmsUpkeepPlanList);
+        setRedisCache();
+        return rtn;
     }
 
     /**

module_cmms/src/main/java/org/jeecg/modules/cmmsUpkeepPlanItem/mapper/CmmsUpkeepPlanItemMapper.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.cmmsUpkeepPlanItem.mapper;
 import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.cmmsUpkeepItem.entity.CmmsUpkeepItemDto;
 import org.jeecg.modules.cmmsUpkeepPlanItem.entity.CmmsUpkeepPlanItem;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.cmmsUpkeepPlanItem.entity.CmmsUpkeepPlanItemDto;
@@ -21,6 +22,7 @@ public interface CmmsUpkeepPlanItemMapper extends BaseMapper<CmmsUpkeepPlanItem>
      */
     public List<CmmsUpkeepPlanItemDto> getCmmsUpkeepPlanItemByPid(@Param("upkeepplanid") String upkeepplanid);
 
+
     /**
      * 根据保养计划id删除 保养计划-保养项
      *