设备分类树查询不含设备

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

@@ -76,6 +76,17 @@ public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree
 	 }
 
 	/**
+	 * 获取设备分类树不含设备
+	 */
+	@ApiOperation("获取设备树及设备列表")
+	@GetMapping("/listtypetree")
+	public Result<List<TpmEquipmentTree>> listTypeTree(TpmEquipmentTree equipmentTree) {
+		List<TpmEquipmentTree> equipmentTrees = tpmEquipmentTreeService.selectTypeTreeList(equipmentTree);
+		return Result.OK(equipmentTrees);
+	}
+
+
+	/**
 	 * 分页列表查询
 	 *
 	 * @param tpmEquipmentTree

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

@@ -38,4 +38,11 @@ public interface TpmEquipmentTreeMapper extends BaseMapper<TpmEquipmentTree> {
 	 */
 	List<SelectTreeModel> queryListByPid(@Param("pid") String pid, @Param("query") Map<String, String> query);
 
+	/**
+	*   author: dzc
+	*   version: 1.0
+	*   des: 查询设备分类树不含设备
+	*   date: 2024/4/17
+	*/
+    List<TpmEquipmentTree> selectTypeTreeList(TpmEquipmentTree equipmentTree);
 }

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

@@ -24,6 +24,11 @@
 		from tpm_equipment as e
 	</select>
 
+	<select id="selectTypeTreeList" resultType="org.jeecg.modules.tpmEquipmentTree.entity.TpmEquipmentTree">
+		select d.id, d.parentid, d.name, d.sortorder
+		from tpm_equipment_tree d
+	</select>
+
 	<update id="updateTreeNodeStatus" parameterType="java.lang.String">
 		update tpm_equipment_tree set has_child = #{status} where id = #{id}
 	</update>

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

@@ -84,4 +84,11 @@ public interface ITpmEquipmentTreeService extends IService<TpmEquipmentTree> {
 	 */
 	List<SelectTreeModel> queryListByPid(String pid);
 
+	/**
+	*   author: dzc
+	*   version: 1.0
+	*   des: 查询设备分类树不含设备
+	*   date: 2024/4/17
+	*/
+    List<TpmEquipmentTree> selectTypeTreeList(TpmEquipmentTree equipmentTree);
 }

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

@@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 public class TpmEquipmentTreeServiceImpl extends ServiceImpl<TpmEquipmentTreeMapper, TpmEquipmentTree> implements ITpmEquipmentTreeService {
 
     @Autowired
+    @SuppressWarnings("all")
     private TpmEquipmentTreeMapper tpmEquipmentTreeMapper;
 
     /**
@@ -67,7 +68,12 @@ public class TpmEquipmentTreeServiceImpl extends ServiceImpl<TpmEquipmentTreeMap
         return tpmEquipmentTreeMapper.selectTreeAndEquipList(tpmEquipmentTree);
     }
 
-	@Override
+    @Override
+    public List<TpmEquipmentTree> selectTypeTreeList(TpmEquipmentTree equipmentTree) {
+        return tpmEquipmentTreeMapper.selectTypeTreeList(equipmentTree);
+    }
+
+    @Override
 	public void addTpmEquipmentDefine(TpmEquipmentTree tpmEquipmentTree) {
 	   //新增时设置hasChild为0
 	    tpmEquipmentTree.setHasChild(ITpmEquipmentTreeService.NOCHILD);