巡检计划查询详情(树状结构)+启停的dict

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/entity/CmmsInspectContent.java

@@ -49,8 +49,9 @@ public class CmmsInspectContent implements Serializable {
     @ApiModelProperty(value = "设备id")
     private java.lang.String equipmentid;
 	/**状态：启用：0、禁用:1*/
-	@Excel(name = "状态：启用：0、禁用:1", width = 15)
+	@Excel(name = "状态：启用：0、禁用:1", width = 15, dicCode = "common_status")
     @ApiModelProperty(value = "状态：启用：0、禁用:1")
+    @Dict(dicCode = "common_status")
     private java.lang.String status;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/service/ICmmsInspectContentService.java

@@ -22,6 +22,7 @@ public interface ICmmsInspectContentService extends IService<CmmsInspectContent>
     boolean updateCmmsInspectContent(CmmsInspectContentVo cmmsInspectContent);
 
     CmmsInspectContentVo getCmmsInspectContentById(String id);
+    CmmsInspectContentVo getCmmsInspectContentTreeById(String id);
 
     /**
      *   author: dzc

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectContent/service/impl/CmmsInspectContentServiceImpl.java

@@ -100,6 +100,19 @@ public class CmmsInspectContentServiceImpl extends ServiceImpl<CmmsInspectConten
         return cmmsInspectContent;
     }
 
+    @Override
+    public CmmsInspectContentVo getCmmsInspectContentTreeById(String id) {
+        CmmsInspectContentVo cmmsInspectContent = inspectContentMapper.getCmmsInspectContentById(id);
+        if (ObjectUtil.isNotNull(cmmsInspectContent)){
+            List<CmmsInspectContentItemVo> list = iCmmsInspectContentItemService.getCmmsInspectContentItemListByCountId(cmmsInspectContent.getId());
+            cmmsInspectContent.setCmmsInspectContentItemList(list);
+            cmmsInspectContent.setTitle(cmmsInspectContent.getContentname());
+            cmmsInspectContent.setKey(cmmsInspectContent.getContentname());
+            cmmsInspectContent.setType("巡检内容");
+        }
+        return cmmsInspectContent;
+    }
+
     /**
     *   author: dzc
     *   version: 1.0

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/service/ICmmsInspectLineService.java

@@ -35,6 +35,7 @@ public interface ICmmsInspectLineService extends IService<CmmsInspectLine> {
     *   date: 2024/1/24
     */
     CmmsInspectLineVo getCmmsInspectLineById(String id);
+    CmmsInspectLineVo getCmmsInspectLineTreeById(String id);
 
     /**
      *   author: dzc

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/service/impl/CmmsInspectLineServiceImpl.java

@@ -129,6 +129,41 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
         return inspectLineVo;
     }
 
+    @Override
+    public CmmsInspectLineVo getCmmsInspectLineTreeById(String id) {
+        // 查询巡检路线
+        CmmsInspectLine cmmsInspectLine = this.getById(id);
+        CmmsInspectLineVo inspectLineVo = CmmsInspectLineConvert.INSTANCE.convert(cmmsInspectLine);
+
+        // 查询巡检路线详情
+        List<CmmsInspectLineDetailVo> list = inspectLineDetailService.selectCmmsInspectLineDetailList(id);
+
+        if (list != null && list.size() > 0) {
+            for (int i = 0; i < list.size(); i++) {
+                // 查询出每个巡检的下的巡检内容
+                List<CmmsInspectSpotEquip> spotcountList = inspectSpotEquipService.getInspectSpotEquipBySprtId(list.get(i).getInspectspotid());
+                ArrayList<CmmsInspectContentVo> contentList = new ArrayList<>();
+                if (spotcountList != null && spotcountList.size() > 0) {
+                    for (int j = 0; j < spotcountList.size(); j++) {
+                        CmmsInspectContentVo cmmsInspectContent = inspectContentService.getCmmsInspectContentTreeById(spotcountList.get(j).getInspectcontid());
+                        contentList.add(cmmsInspectContent);
+                    }
+                }
+                list.get(i).setTitle(list.get(i).getContentname());
+                list.get(i).setKey(list.get(i).getContentname());
+                list.get(i).setType("巡检点");
+                list.get(i).setChildren(contentList);
+            }
+        }
+
+        inspectLineVo.setTitle(cmmsInspectLine.getLinename());
+        inspectLineVo.setKey(cmmsInspectLine.getLinename());
+        inspectLineVo.setType("巡检路线");
+        inspectLineVo.setChildren(list);
+
+        return inspectLineVo;
+    }
+
     /**
      *   author: dzc
      *   version: 1.0

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/controller/CmmsInspectPlanController.java

@@ -228,4 +228,23 @@ public class CmmsInspectPlanController extends JeecgController<CmmsInspectPlan,
 		return Result.error("生成工单失败！");
 	}
 
+
+	 /**
+	  * 通过id查询
+	  *
+	  * @param id
+	  * @return
+	  */
+	 //@AutoLog(value = "巡检计划-通过id查询")
+	 @ApiOperation(value="巡检计划-通过id查询(树)", notes="巡检计划-通过id查询(树)")
+	 @GetMapping(value = "/queryTreeById")
+	 public Result<CmmsInspectPlanVo> queryTreeById(@RequestParam(name="id",required=true) String id) {
+		 //CmmsInspectPlan cmmsInspectPlan = cmmsInspectPlanService.getById(id);
+		 CmmsInspectPlanVo cmmsInspectPlan = cmmsInspectPlanService.getCmmsInspectPlanTreeById(id);
+		 if(cmmsInspectPlan==null) {
+			 return Result.error("未找到对应数据");
+		 }
+		 return Result.OK(cmmsInspectPlan);
+	 }
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/entity/CmmsInspectPlan.java

@@ -91,8 +91,9 @@ public class CmmsInspectPlan implements Serializable {
     @ApiModelProperty(value = "提前通知类型：天、时、分")
     private java.lang.String noticetype;
 	/**状态（0启用 1停用）*/
-	@Excel(name = "状态（0启用 1停用）", width = 15)
+	@Excel(name = "状态（0启用 1停用）", width = 15,dicCode = "common_status")
     @ApiModelProperty(value = "状态（0启用 1停用）")
+    @Dict(dicCode = "common_status")
     private java.lang.String status;
 	/**待办人*/
 	@Excel(name = "待办人", width = 15)

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/service/ICmmsInspectPlanService.java

@@ -94,4 +94,6 @@ public interface ICmmsInspectPlanService extends IService<CmmsInspectPlan> {
      */
     public void setRedisCache();
 
+    CmmsInspectPlanVo getCmmsInspectPlanTreeById(String id);
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlan/service/impl/CmmsInspectPlanServiceImpl.java

@@ -222,6 +222,40 @@ public class CmmsInspectPlanServiceImpl extends ServiceImpl<CmmsInspectPlanMappe
         return cmmsInspectPlanVo;
     }
 
+    @Override
+    public CmmsInspectPlanVo getCmmsInspectPlanTreeById(String id) {
+        CmmsInspectPlan cmmsInspectPlan = this.getById(id);
+        CmmsInspectPlanVo cmmsInspectPlanVo = CmmsInspectPlanConvert.INSTANCE.convert(cmmsInspectPlan);
+
+        List<CmmsInspectPlanTaskVo> taskList = inspectPlanTaskService.getTaskByPlanId(id);
+
+        if (taskList != null && taskList.size() > 0) {
+            for (int i = 0; i < taskList.size(); i++) {
+                String relid = taskList.get(i).getRelid();
+                if ("巡检点".equals(taskList.get(i).getTasktype())){
+                    String name = inspectSpotService.getNameById(taskList.get(i).getRelid());
+                    taskList.get(i).setTitle(name);
+                    taskList.get(i).setKey(name);
+                    taskList.get(i).setType("巡检点");
+                    taskList.get(i).setChildren(inspectSpotService.getCmmsInspectSpotListTreeById(relid).getChildren());
+                }else {
+                    String name = inspectLineService.getNameById(taskList.get(i).getRelid());
+                    taskList.get(i).setTitle(name);
+                    taskList.get(i).setKey(name);
+                    taskList.get(i).setType("巡检路线");
+                    taskList.get(i).setChildren(inspectLineService.getCmmsInspectLineTreeById(relid).getChildren());
+                }
+            }
+        }
+
+        cmmsInspectPlanVo.setTitle(cmmsInspectPlan.getPlanname());
+        cmmsInspectPlanVo.setKey(cmmsInspectPlan.getPlanname());
+        cmmsInspectPlanVo.setType("巡检计划");
+        cmmsInspectPlanVo.setChildren(taskList);
+
+        return cmmsInspectPlanVo;
+    }
+
     /**
     *   author: dzc
     *   version: 1.0

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/service/ICmmsInspectSpotService.java

@@ -22,6 +22,7 @@ public interface ICmmsInspectSpotService extends IService<CmmsInspectSpot> {
     boolean updateCmmsInspectSpot(CmmsInspectSpotVo cmmsInspectSpot);
 
     CmmsInspectSpotVo getCmmsInspectSpotListById(String id);
+    CmmsInspectSpotVo getCmmsInspectSpotListTreeById(String id);
 
     /**
      *   author: dzc

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/service/impl/CmmsInspectSpotServiceImpl.java

@@ -106,6 +106,28 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
         return cmmsInspectSpotVo;
     }
 
+
+    @Override
+    public CmmsInspectSpotVo getCmmsInspectSpotListTreeById(String id) {
+        // 根据id查询出巡检点的信息
+        CmmsInspectSpot cmmsInspectSport = this.getById(id);
+
+        CmmsInspectSpotVo cmmsInspectSpotVo = CmmsInspectSpotConvert.INSTANCE.convert(cmmsInspectSport);
+        // 根据 巡检点的id 查询出巡检点-巡检内容的信息
+        List<CmmsInspectSpotEquip> list = inspectSpotEquipService.getInspectSpotEquipBySprtId(cmmsInspectSport.getId());
+        ArrayList<CmmsInspectContentVo> contList = new ArrayList<>();
+        for (CmmsInspectSpotEquip eq:list) {
+            String equipmentid = eq.getInspectcontid();
+            CmmsInspectContentVo cmmsInspectContent = iCmmsInspectContentService.getCmmsInspectContentTreeById(equipmentid);
+            contList.add(cmmsInspectContent);
+        }
+        cmmsInspectSpotVo.setTitle(cmmsInspectSport.getContentname());
+        cmmsInspectSpotVo.setKey(cmmsInspectSport.getContentname());
+        cmmsInspectSpotVo.setType("巡检点");
+        cmmsInspectSpotVo.setChildren(contList);
+        return cmmsInspectSpotVo;
+    }
+
     /**
      *   author: dzc
      *   version: 1.0