巡检工单树状查询

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/controller/CmmsInspectController.java

@@ -199,5 +199,22 @@ public class CmmsInspectController extends JeecgController<CmmsInspect, ICmmsIns
 		return Result.error("反馈失败!");
 	}
 
+	/**
+	*   author: dzc
+	*   version: 1.0
+	*   des: 巡检工单根据id查询，用于前端展示树形结构
+	*   date: 2024/1/29
+	*/
+	@ApiOperation(value="巡检工单-通过id查询(树)", notes="巡检工单-通过id查询(树)")
+	@GetMapping(value = "/queryTreeById")
+	public Result<CmmsInspectVo> queryTreeById(@RequestParam(name="id",required=true) String id) {
+		//CmmsInspect cmmsInspect = cmmsInspectService.getById(id);
+		CmmsInspectVo cmmsInspect = cmmsInspectService.getCmmsInspectTreeById(id);
+		if(cmmsInspect==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(cmmsInspect);
+	}
+
 
  }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/entity/CmmsInspectVo.java

@@ -26,5 +26,12 @@ public class CmmsInspectVo extends CmmsInspect {
     /** 巡检工单 - 巡检计划列表 */
     private List<CmmsInspectPlanTaskVo> planList;
 
-
+    /** 巡检工单名称 title  用于前端展示树形结构 */
+    private String title;
+    /** 巡检工单名称  key 用于前端展示树形结构 */
+    private String key;
+    /** type */
+    private String type;
+    /** 巡检工单 - 巡检计划列表 children 用于前端展示树形结构 */
+    private List<CmmsInspectPlanTaskVo> children;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/mapper/xml/CmmsInspectMapper.xml

@@ -30,7 +30,7 @@
     </sql>
 
     <select id="getTaskByPlanId" parameterType="String" resultMap="CmmsInspectPlanTaskResult">
-        <include refid="selectCmmsInspectPlanTaskVo"/>
+        select * from cmms_inspect_plan_task
         where inspectplanid = #{id}
     </select>
 

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/service/ICmmsInspectService.java

@@ -21,4 +21,21 @@ public interface ICmmsInspectService extends IService<CmmsInspect> {
     *   date: 2024/1/26
     */
     CmmsInspectPlanVo getCmmsInspectPlanById(String inspectplanid);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 巡检工单根据id查询，用于前端展示树形结构
+    *   date: 2024/1/29
+    */
+    CmmsInspectVo getCmmsInspectTreeById(String id);
+
+    /**
+     *   author: dzc
+     *   version: 1.0
+     *   des: 通过巡检计划id 查询出对应的巡检计划id详情(巡检项的格式为 巡检工单-巡检项的格式) 用于前端展示树形结构
+     *   date: 2024/1/26
+     */
+    CmmsInspectPlanVo getCmmsInspectPlanTreeById(String inspectplanid);
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspect/service/impl/CmmsInspectServiceImpl.java

@@ -75,4 +75,58 @@ public class CmmsInspectServiceImpl extends ServiceImpl<CmmsInspectMapper, CmmsI
 
         return cmmsInspectPlanVo;
     }
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 巡检工单根据id查询，用于前端展示树形结构
+    *   date: 2024/1/29
+    */
+    @Override
+    public CmmsInspectVo getCmmsInspectTreeById(String id) {
+        // 根据巡检工单id查询出对应的巡检工单
+        CmmsInspect cmmInspect = this.getById(id);
+        CmmsInspectVo inspectVo = CmmsInspectConvert.INSTANCE.convert(cmmInspect);
+
+        // 根据 巡检工单表中的 巡检计划id查询出巡检计划的详情
+        CmmsInspectPlanVo cmmsInspectPlanById = this.getCmmsInspectPlanTreeById(cmmInspect.getInspectplanid());
+
+        inspectVo.setTitle(cmmInspect.getInspectname());
+        inspectVo.setKey(cmmInspect.getInspectname());
+        inspectVo.setType("巡检工单");
+        inspectVo.setChildren(cmmsInspectPlanById.getChildren());
+
+        return inspectVo;
+    }
+
+    @Override
+    public CmmsInspectPlanVo getCmmsInspectPlanTreeById(String inspectplanid) {
+        CmmsInspectPlan cmmsInspectPlan = cmmsInspectMapper.getCmmsInspectPlanById(inspectplanid);
+        CmmsInspectPlanVo cmmsInspectPlanVo = CmmsInspectPlanConvert.INSTANCE.convert(cmmsInspectPlan);
+
+        List<CmmsInspectPlanTaskVo> taskList = cmmsInspectMapper.getTaskByPlanId(inspectplanid);
+
+        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).setInspectSpotVo(inspectSpotService.getCmmsInspectSpotListTreeByIdA(relid));
+                    taskList.get(i).setChildren(inspectSpotService.getCmmsInspectSpotListTreeByIdA(relid).getChildren());
+                }else {
+                    String name = inspectLineService.getNameById(taskList.get(i).getRelid());
+                    taskList.get(i).setTitle(name);
+                    taskList.get(i).setKey(name);
+                    //taskList.get(i).setInspectLineVo(inspectLineService.getCmmsInspectLineTreeByIdA(relid));
+                    taskList.get(i).setChildren(inspectLineService.getCmmsInspectLineTreeByIdA(relid).getChildren());
+                }
+            }
+        }
+
+        cmmsInspectPlanVo.setChildren(taskList);
+
+        return cmmsInspectPlanVo;
+    }
 }

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

@@ -27,4 +27,12 @@ public class CmmsInspectContentVo extends CmmsInspectContent{
 
     /** 巡检工单下的巡检内容下的巡检项信息 */
     private List<CmmsInspectTcontentItem> inspectTcontentItemList;
+
+
+    /** title  用于前端展示树形结构 */
+    private String title;
+    /** key 用于前端展示树形结构 */
+    private String key;
+    /** type 用于前端展示树形结构 */
+    private String type;
 }

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

@@ -31,6 +31,8 @@ public interface ICmmsInspectContentService extends IService<CmmsInspectContent>
      */
     CmmsInspectContentVo getCmmsInspectContentByIdA(String id);
 
+    CmmsInspectContentVo getCmmsInspectContentTreeByIdA(String id);
+
     boolean updateStatua(String id,String status);
 
     CmmsInspectContentVo getCmmsInspectContentByEqId(String eqid);

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

@@ -117,6 +117,20 @@ public class CmmsInspectContentServiceImpl extends ServiceImpl<CmmsInspectConten
     }
 
     @Override
+    public CmmsInspectContentVo getCmmsInspectContentTreeByIdA(String id) {
+        CmmsInspectContentVo cmmsInspectContent = inspectContentMapper.getCmmsInspectContentById(id);
+        if (ObjectUtil.isNotNull(cmmsInspectContent)){
+            List<CmmsInspectTcontentItem> inspectTcontentItems = inspectTcontentItemService.getInspectTcontentItems(cmmsInspectContent.getId());
+            cmmsInspectContent.setInspectTcontentItemList(inspectTcontentItems);
+            cmmsInspectContent.setTitle(cmmsInspectContent.getContentname());
+            cmmsInspectContent.setKey(cmmsInspectContent.getContentname());
+            cmmsInspectContent.setType("巡检内容");
+        }
+
+        return cmmsInspectContent;
+    }
+
+    @Override
     public boolean updateStatua(String id,String status) {
         return inspectContentMapper.updateStatua(id,status);
     }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/entity/CmmsInspectLineVo.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.cmmsInspectLine.entity;
 import lombok.Data;
 import org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetail;
 import org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetailVo;
+import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTaskVo;
 
 import java.util.List;
 
@@ -18,4 +19,13 @@ public class CmmsInspectLineVo extends CmmsInspectLine{
 
     private List<CmmsInspectLineDetailVo> detailList;
 
+    /** 巡检工单名称 title  用于前端展示树形结构 */
+    private String title;
+    /** 巡检工单名称  key 用于前端展示树形结构 */
+    private String key;
+    /** type */
+    private String type;
+    /** 巡检工单 - 巡检计划列表 children 用于前端展示树形结构 */
+    private List<CmmsInspectLineDetailVo> children;
+
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/mapper/CmmsInspectLineMapper.java

@@ -14,4 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface CmmsInspectLineMapper extends BaseMapper<CmmsInspectLine> {
 
+    String getNameById(@Param("id") String id);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLine/mapper/xml/CmmsInspectLineMapper.xml

@@ -2,4 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.cmmsInspectLine.mapper.CmmsInspectLineMapper">
 
+    <select id="getNameById" resultType="string">
+        select linename from cmms_inspect_line where id = #{id}
+    </select>
 </mapper>

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

@@ -43,4 +43,14 @@ public interface ICmmsInspectLineService extends IService<CmmsInspectLine> {
      *   date: 2024/1/26
      */
     CmmsInspectLineVo getCmmsInspectLineByIdA(String id);
+
+    CmmsInspectLineVo getCmmsInspectLineTreeByIdA(String id);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 根据id查询巡检路线名称
+    *   date: 2024/1/29
+    */
+    public String getNameById(String id);
 }

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

@@ -164,6 +164,48 @@ public class CmmsInspectLineServiceImpl extends ServiceImpl<CmmsInspectLineMappe
         return inspectLineVo;
     }
 
+
+    @Override
+    public CmmsInspectLineVo getCmmsInspectLineTreeByIdA(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.getCmmsInspectContentTreeByIdA(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;
+    }
+
+
+    @Override
+    public String getNameById(String id) {
+        return inspectLineMapper.getNameById(id);
+    }
+
     private void batchSaveSub(CmmsInspectLineVo cmmsInspectLine) {
         List<CmmsInspectLineDetailVo> detailList = cmmsInspectLine.getDetailList();
         ArrayList<CmmsInspectLineDetail> list = new ArrayList<>();

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectLineDetail/entity/CmmsInspectLineDetailVo.java

@@ -29,4 +29,15 @@ public class CmmsInspectLineDetailVo extends CmmsInspectLineDetail{
     private java.lang.String contentname;
 
     private List<CmmsInspectContentVo> inspectContentList;
+
+
+
+    /** title  用于前端展示树形结构 */
+    private String title;
+    /** key 用于前端展示树形结构 */
+    private String key;
+    /** type */
+    private String type;
+    /** 巡检工单 - 巡检计划列表 children 用于前端展示树形结构 */
+    private List<CmmsInspectContentVo> children;
 }

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

@@ -2,6 +2,7 @@ package org.jeecg.modules.cmmsInspectPlan.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.jeecg.modules.cmmsInspectLineDetail.entity.CmmsInspectLineDetailVo;
 import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTask;
 import org.jeecg.modules.cmmsInspectPlanTask.entity.CmmsInspectPlanTaskVo;
 
@@ -20,4 +21,12 @@ public class CmmsInspectPlanVo extends CmmsInspectPlan{
     @ApiModelProperty(value = "任务")
     private List<CmmsInspectPlanTaskVo> taskList;
 
+    /** title  用于前端展示树形结构 */
+    private String title;
+    /** key 用于前端展示树形结构 */
+    private String key;
+    /** type */
+    private String type;
+    /** children 用于前端展示树形结构 */
+    private List<CmmsInspectPlanTaskVo> children;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectPlanTask/entity/CmmsInspectPlanTaskVo.java

@@ -2,11 +2,14 @@ package org.jeecg.modules.cmmsInspectPlanTask.entity;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.apache.poi.ss.formula.functions.T;
 import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLine;
 import org.jeecg.modules.cmmsInspectLine.entity.CmmsInspectLineVo;
 import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpot;
 import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo;
 
+import java.util.List;
+
 /**
  * @author dzc
  * @date 2024/1/23 9:05
@@ -15,7 +18,7 @@ import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo;
  * @des
  */
 @Data
-public class CmmsInspectPlanTaskVo extends CmmsInspectPlanTask{
+public class CmmsInspectPlanTaskVo<T> extends CmmsInspectPlanTask{
 
     /**
      * 巡检路线相关
@@ -50,5 +53,10 @@ public class CmmsInspectPlanTaskVo extends CmmsInspectPlanTask{
     @ApiModelProperty(value = "设备类型名称")
     private String equipdefname;
 
-
+    /** title  用于前端展示树形结构 */
+    private String title;
+    /** key 用于前端展示树形结构 */
+    private String key;
+    /** children  用于前端展示树形结构 */
+    private List<T> children;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/entity/CmmsInspectSpotVo.java

@@ -19,4 +19,13 @@ public class CmmsInspectSpotVo extends CmmsInspectSpot{
     private String equipdefname;
 
     private List<CmmsInspectContentVo> inspectContentList;
+
+    /** title  用于前端展示树形结构 */
+    private String title;
+    /** key 用于前端展示树形结构 */
+    private String key;
+    /** type 用于前端展示树形结构 */
+    private String type;
+    /** children 用于前端展示树形结构 */
+    private List<CmmsInspectContentVo> children;
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/mapper/CmmsInspectSpotMapper.java

@@ -17,4 +17,6 @@ import org.jeecg.modules.cmmsInspectSpot.entity.CmmsInspectSpotVo;
 public interface CmmsInspectSpotMapper extends BaseMapper<CmmsInspectSpot> {
 
     List<CmmsInspectSpotVo> getCmmsInspectSpotList(@Param("page") Page<CmmsInspectSpotVo> page,@Param("cmmsInspectSpot") CmmsInspectSpot cmmsInspectSpot);
+
+    String getNameById(@Param("id") String id);
 }

module_cmms/src/main/java/org/jeecg/modules/cmmsInspectSpot/mapper/xml/CmmsInspectSpotMapper.xml

@@ -28,4 +28,8 @@
         </where>
         order by c.create_time desc
     </select>
+
+    <select id="getNameById" resultType="String">
+        select contentname from cmms_inspect_spot where id = #{id}
+    </select>
 </mapper>

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

@@ -31,5 +31,15 @@ public interface ICmmsInspectSpotService extends IService<CmmsInspectSpot> {
      */
     CmmsInspectSpotVo getCmmsInspectSpotListByIdA(String id);
 
+    CmmsInspectSpotVo getCmmsInspectSpotListTreeByIdA(String id);
+
     List<CmmsInspectSpotVo> getCmmsInspectSpotListDetails(Page<CmmsInspectSpotVo> page, CmmsInspectSpot cmmsInspectSpot);
+
+    /**
+    *   author: dzc
+    *   version: 1.0
+    *   des: 根据 id 查询巡检点名称
+    *   date: 2024/1/29
+    */
+    public String getNameById(String id);
 }

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

@@ -131,6 +131,27 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
     }
 
 
+    @Override
+    public CmmsInspectSpotVo getCmmsInspectSpotListTreeByIdA(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 cmmsInspectContentByIdA = iCmmsInspectContentService.getCmmsInspectContentTreeByIdA(equipmentid);
+            contList.add(cmmsInspectContentByIdA);
+        }
+        cmmsInspectSpotVo.setTitle(cmmsInspectSport.getContentname());
+        cmmsInspectSpotVo.setKey(cmmsInspectSport.getContentname());
+        cmmsInspectSpotVo.setType("巡检点");
+        cmmsInspectSpotVo.setChildren(contList);
+        return cmmsInspectSpotVo;
+    }
+
     /**
     *   author: dzc
     *   version: 1.0
@@ -154,6 +175,11 @@ public class CmmsInspectSpotServiceImpl extends ServiceImpl<CmmsInspectSpotMappe
         return cmmsInspectSpotList;
     }
 
+    @Override
+    public String getNameById(String id) {
+        return inspectSpotMapper.getNameById(id);
+    }
+
     private void insertCmmsInspectcheckContentItem(CmmsInspectSpotVo cmmsInspectSpot) {
         List<CmmsInspectContentVo> list = cmmsInspectSpot.getInspectContentList();
         String id = cmmsInspectSpot.getId();