获取设备树及设备列表

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipmentTree/controller/TpmEquipmentTreeController.java

@@ -36,7 +36,18 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 @Slf4j
 public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree, ITpmEquipmentTreeService>{
 	@Autowired
-	private ITpmEquipmentTreeService tpmEquipmentDefineService;
+	private ITpmEquipmentTreeService tpmEquipmentTreeService;
+
+
+	 /**
+	  * 获取设备树及设备列表
+	  */
+	 @ApiOperation("获取设备树及设备列表")
+	 @GetMapping("/listtreeandequip")
+	 public Result<List<TpmEquipmentTree>> listTreeAndEquip(TpmEquipmentTree equipmentTree) {
+		 List<TpmEquipmentTree> equipmentTrees = tpmEquipmentTreeService.selectTreeAndEquipList(equipmentTree);
+		 return Result.OK(equipmentTrees);
+	 }
 
 	/**
 	 * 分页列表查询
@@ -57,7 +68,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
 		String hasQuery = req.getParameter("hasQuery");
         if(hasQuery != null && "true".equals(hasQuery)){
             QueryWrapper<TpmEquipmentTree> queryWrapper =  QueryGenerator.initQueryWrapper(tpmEquipmentTree, req.getParameterMap());
-            List<TpmEquipmentTree> list = tpmEquipmentDefineService.queryTreeListNoPage(queryWrapper);
+            List<TpmEquipmentTree> list = tpmEquipmentTreeService.queryTreeListNoPage(queryWrapper);
             IPage<TpmEquipmentTree> pageList = new Page<>(1, 10, list.size());
             pageList.setRecords(list);
             return Result.OK(pageList);
@@ -71,7 +82,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
             // 使用 eq 防止模糊查询
             queryWrapper.eq("parentid", parentId);
             Page<TpmEquipmentTree> page = new Page<TpmEquipmentTree>(pageNo, pageSize);
-            IPage<TpmEquipmentTree> pageList = tpmEquipmentDefineService.page(page, queryWrapper);
+            IPage<TpmEquipmentTree> pageList = tpmEquipmentTreeService.page(page, queryWrapper);
             return Result.OK(pageList);
         }
 	}
@@ -86,7 +97,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
 	 public Result<List<SelectTreeModel>> loadTreeChildren(@RequestParam(name = "pid") String pid) {
 		 Result<List<SelectTreeModel>> result = new Result<>();
 		 try {
-			 List<SelectTreeModel> ls = tpmEquipmentDefineService.queryListByPid(pid);
+			 List<SelectTreeModel> ls = tpmEquipmentTreeService.queryListByPid(pid);
 			 result.setResult(ls);
 			 result.setSuccess(true);
 		 } catch (Exception e) {
@@ -108,7 +119,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
 	 public Result<List<SelectTreeModel>> loadTreeRoot(@RequestParam(name = "async") Boolean async, @RequestParam(name = "pcode") String pcode) {
 		 Result<List<SelectTreeModel>> result = new Result<>();
 		 try {
-			 List<SelectTreeModel> ls = tpmEquipmentDefineService.queryListByCode(pcode);
+			 List<SelectTreeModel> ls = tpmEquipmentTreeService.queryListByCode(pcode);
 			 if (!async) {
 				 loadAllChildren(ls);
 			 }
@@ -129,7 +140,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
 	  */
 	 private void loadAllChildren(List<SelectTreeModel> ls) {
 		 for (SelectTreeModel tsm : ls) {
-			 List<SelectTreeModel> temp = tpmEquipmentDefineService.queryListByPid(tsm.getKey());
+			 List<SelectTreeModel> temp = tpmEquipmentTreeService.queryListByPid(tsm.getKey());
 			 if (temp != null && temp.size() > 0) {
 				 tsm.setChildren(temp);
 				 loadAllChildren(temp);
@@ -148,7 +159,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
 	@GetMapping(value = "/childList")
 	public Result<IPage<TpmEquipmentTree>> queryPageList(TpmEquipmentTree tpmEquipmentTree, HttpServletRequest req) {
 		QueryWrapper<TpmEquipmentTree> queryWrapper = QueryGenerator.initQueryWrapper(tpmEquipmentTree, req.getParameterMap());
-		List<TpmEquipmentTree> list = tpmEquipmentDefineService.list(queryWrapper);
+		List<TpmEquipmentTree> list = tpmEquipmentTreeService.list(queryWrapper);
 		IPage<TpmEquipmentTree> pageList = new Page<>(1, 10, list.size());
         pageList.setRecords(list);
 		return Result.OK(pageList);
@@ -169,7 +180,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
             QueryWrapper<TpmEquipmentTree> queryWrapper = new QueryWrapper<>();
             List<String> parentIdList = Arrays.asList(parentIds.split(","));
             queryWrapper.in("parentid", parentIdList);
-            List<TpmEquipmentTree> list = tpmEquipmentDefineService.list(queryWrapper);
+            List<TpmEquipmentTree> list = tpmEquipmentTreeService.list(queryWrapper);
             IPage<TpmEquipmentTree> pageList = new Page<>(1, 10, list.size());
             pageList.setRecords(list);
             return Result.OK(pageList);
@@ -190,7 +201,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
     //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_tree:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody TpmEquipmentTree tpmEquipmentTree) {
-		tpmEquipmentDefineService.addTpmEquipmentDefine(tpmEquipmentTree);
+		tpmEquipmentTreeService.addTpmEquipmentDefine(tpmEquipmentTree);
 		return Result.OK("添加成功！");
 	}
 
@@ -205,7 +216,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
     //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_tree:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody TpmEquipmentTree tpmEquipmentTree) {
-		tpmEquipmentDefineService.updateTpmEquipmentDefine(tpmEquipmentTree);
+		tpmEquipmentTreeService.updateTpmEquipmentDefine(tpmEquipmentTree);
 		return Result.OK("编辑成功!");
 	}
 
@@ -220,7 +231,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
     //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_tree:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		tpmEquipmentDefineService.deleteTpmEquipmentDefine(id);
+		tpmEquipmentTreeService.deleteTpmEquipmentDefine(id);
 		return Result.OK("删除成功!");
 	}
 
@@ -235,7 +246,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
     //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_tree:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.tpmEquipmentDefineService.removeByIds(Arrays.asList(ids.split(",")));
+		this.tpmEquipmentTreeService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功！");
 	}
 
@@ -249,7 +260,7 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
 	@ApiOperation(value="设备树-通过id查询", notes="设备树-通过id查询")
 	@GetMapping(value = "/queryById")
 	public Result<TpmEquipmentTree> queryById(@RequestParam(name="id",required=true) String id) {
-		TpmEquipmentTree tpmEquipmentTree = tpmEquipmentDefineService.getById(id);
+		TpmEquipmentTree tpmEquipmentTree = tpmEquipmentTreeService.getById(id);
 		if(tpmEquipmentTree ==null) {
 			return Result.error("未找到对应数据");
 		}

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipmentTree/entity/TpmEquipmentTree.java

@@ -1,8 +1,11 @@
 package org.jeecg.modules.tpmEquipmentTree.entity;
 
 import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -61,4 +64,8 @@ public class TpmEquipmentTree implements Serializable {
 	@Dict(dicCode = "yn")
     @ApiModelProperty(value = "是否有子节点")
     private java.lang.String hasChild;
+
+    /** 子设备定义 */
+    @TableField(exist = false)
+    private List<TpmEquipmentTree> children = new ArrayList<TpmEquipmentTree>();
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipmentTree/mapper/TpmEquipmentTreeMapper.java

@@ -17,6 +17,12 @@ import java.util.Map;
 public interface TpmEquipmentTreeMapper extends BaseMapper<TpmEquipmentTree> {
 
 	/**
+	 * 获取设备树及设备列表
+	 */
+	public List<TpmEquipmentTree> selectTreeAndEquipList(TpmEquipmentTree tpmEquipmentTree);
+
+
+	/**
 	 * 编辑节点状态
 	 * @param id
 	 * @param status

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipmentTree/mapper/xml/TpmEquipmentTreeMapper.xml

@@ -2,6 +2,27 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.tpmEquipmentTree.mapper.TpmEquipmentTreeMapper">
 
+	<resultMap type="org.jeecg.modules.tpmEquipmentTree.entity.TpmEquipmentTree" id="EquipmentTreeResult">
+		<id property="id" column="id"/>
+		<result property="parentid" column="parentid"/>
+		<result property="remark" column="remark"/>
+		<result property="name" column="name"/>
+		<result property="createBy" column="create_by"/>
+		<result property="createTime" column="create_time"/>
+		<result property="updateBy" column="update_by"/>
+		<result property="updateTime" column="update_time"/>
+		<result property="parentName" column="parent_name"/>
+	</resultMap>
+
+	<!--获取设备树及设备列表-->
+	<select id="selectTreeAndEquipList" parameterType="org.jeecg.modules.tpmEquipmentTree.entity.TpmEquipmentTree" resultMap="EquipmentTreeResult">
+		select d.id, d.parentid, d.name
+		from ems_tpm_equipment_tree d
+		union
+		select e.id as equipmenttreeid, e.equipmenttreeid as parentid, e.equipmentname as name
+		from ems_tpm_equipment as e
+	</select>
+
 	<update id="updateTreeNodeStatus" parameterType="java.lang.String">
 		update ems_tpm_equipment_tree set has_child = #{status} where id = #{id}
 	</update>

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipmentTree/service/ITpmEquipmentTreeService.java

@@ -24,6 +24,12 @@ public interface ITpmEquipmentTreeService extends IService<TpmEquipmentTree> {
 	/**树节点无子节点状态值*/
 	public static final String NOCHILD = "0";
 
+
+	/**
+	 * 获取设备树及设备列表
+	 */
+	public List<TpmEquipmentTree> selectTreeAndEquipList(TpmEquipmentTree tpmEquipmentTree);
+
 	/**
 	 * 新增节点
 	 *

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipmentTree/service/impl/TpmEquipmentTreeServiceImpl.java

@@ -7,6 +7,7 @@ import org.jeecg.common.system.vo.SelectTreeModel;
 import org.jeecg.modules.tpmEquipmentTree.entity.TpmEquipmentTree;
 import org.jeecg.modules.tpmEquipmentTree.mapper.TpmEquipmentTreeMapper;
 import org.jeecg.modules.tpmEquipmentTree.service.ITpmEquipmentTreeService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.transaction.annotation.Transactional;
@@ -25,6 +26,16 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @Service
 public class TpmEquipmentTreeServiceImpl extends ServiceImpl<TpmEquipmentTreeMapper, TpmEquipmentTree> implements ITpmEquipmentTreeService {
 
+    @Autowired
+    private TpmEquipmentTreeMapper tpmEquipmentTreeMapper;
+
+    /**
+     * 获取设备树及设备列表
+     */
+    public List<TpmEquipmentTree> selectTreeAndEquipList(TpmEquipmentTree tpmEquipmentTree){
+        return tpmEquipmentTreeMapper.selectTreeAndEquipList(tpmEquipmentTree);
+    }
+
 	@Override
 	public void addTpmEquipmentDefine(TpmEquipmentTree tpmEquipmentTree) {
 	   //新增时设置hasChild为0