fix设备分类——设备树

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipment/entity/TpmEquipment.java

@@ -40,10 +40,10 @@ public class TpmEquipment implements Serializable {
 	@Excel(name = "设备名称", width = 15)
     @ApiModelProperty(value = "设备名称")
     private java.lang.String equipmentname;
-	/**设备定义ID（分类id）*/
-	@Excel(name = "设备定义ID（分类id）", width = 15, dictTable = "ems_tpm_equipment_define", dicText = "name", dicCode = "id")
-	@Dict(dictTable = "ems_tpm_equipment_define", dicText = "name", dicCode = "id")
-    @ApiModelProperty(value = "设备定义ID（分类id）")
+	/**设备树ID（分类id）*/
+	@Excel(name = "设备树ID（分类id）", width = 15, dictTable = "ems_tpm_equipment_tree", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "ems_tpm_equipment_tree", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "设备树ID（分类id）")
     private java.lang.String equipdefid;
 	/**设备编号*/
 	@Excel(name = "设备编号", width = 15)

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipmentDefine/controller/TpmEquipmentDefineController.java

@@ -1,90 +1,77 @@
-package org.jeecg.modules.tpmEquipmentDefine.controller;
+package org.jeecg.modules.tpmEquipmentTree.controller;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.tpmEquipmentDefine.entity.TpmEquipmentDefine;
-import org.jeecg.modules.tpmEquipmentDefine.service.ITpmEquipmentDefineService;
+import org.jeecg.modules.tpmEquipmentTree.entity.TpmEquipmentTree;
+import org.jeecg.modules.tpmEquipmentTree.service.ITpmEquipmentTreeService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.jeecg.common.aspect.annotation.AutoLog;
 
  /**
- * @Description: 设备树定义
+ * @Description: 设备树
  * @Author: jeecg-boot
  * @Date:   2024-01-09
  * @Version: V1.0
  */
-@Api(tags="设备树定义")
+@Api(tags="设备树")
 @RestController
-@RequestMapping("/tpmEquipmentDefine/tpmEquipmentDefine")
+@RequestMapping("/tpmEquipmentTree/tpmEquipmentTree")
 @Slf4j
-public class TpmEquipmentDefineController extends JeecgController<TpmEquipmentDefine, ITpmEquipmentDefineService>{
+public class TpmEquipmentTreeController extends JeecgController<TpmEquipmentTree, ITpmEquipmentTreeService>{
 	@Autowired
-	private ITpmEquipmentDefineService tpmEquipmentDefineService;
+	private ITpmEquipmentTreeService tpmEquipmentDefineService;
 
 	/**
 	 * 分页列表查询
 	 *
-	 * @param tpmEquipmentDefine
+	 * @param tpmEquipmentTree
 	 * @param pageNo
 	 * @param pageSize
 	 * @param req
 	 * @return
 	 */
-	//@AutoLog(value = "设备树定义-分页列表查询")
-	@ApiOperation(value="设备树定义-分页列表查询", notes="设备树定义-分页列表查询")
+	//@AutoLog(value = "设备树-分页列表查询")
+	@ApiOperation(value="设备树-分页列表查询", notes="设备树-分页列表查询")
 	@GetMapping(value = "/rootList")
-	public Result<IPage<TpmEquipmentDefine>> queryPageList(TpmEquipmentDefine tpmEquipmentDefine,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+	public Result<IPage<TpmEquipmentTree>> queryPageList(TpmEquipmentTree tpmEquipmentTree,
+														 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														 HttpServletRequest req) {
 		String hasQuery = req.getParameter("hasQuery");
         if(hasQuery != null && "true".equals(hasQuery)){
-            QueryWrapper<TpmEquipmentDefine> queryWrapper =  QueryGenerator.initQueryWrapper(tpmEquipmentDefine, req.getParameterMap());
-            List<TpmEquipmentDefine> list = tpmEquipmentDefineService.queryTreeListNoPage(queryWrapper);
-            IPage<TpmEquipmentDefine> pageList = new Page<>(1, 10, list.size());
+            QueryWrapper<TpmEquipmentTree> queryWrapper =  QueryGenerator.initQueryWrapper(tpmEquipmentTree, req.getParameterMap());
+            List<TpmEquipmentTree> list = tpmEquipmentDefineService.queryTreeListNoPage(queryWrapper);
+            IPage<TpmEquipmentTree> pageList = new Page<>(1, 10, list.size());
             pageList.setRecords(list);
             return Result.OK(pageList);
         }else{
-            String parentId = tpmEquipmentDefine.getParentid();
+            String parentId = tpmEquipmentTree.getParentid();
             if (oConvertUtils.isEmpty(parentId)) {
                 parentId = "0";
             }
-            tpmEquipmentDefine.setParentid(null);
-            QueryWrapper<TpmEquipmentDefine> queryWrapper = QueryGenerator.initQueryWrapper(tpmEquipmentDefine, req.getParameterMap());
+            tpmEquipmentTree.setParentid(null);
+            QueryWrapper<TpmEquipmentTree> queryWrapper = QueryGenerator.initQueryWrapper(tpmEquipmentTree, req.getParameterMap());
             // 使用 eq 防止模糊查询
             queryWrapper.eq("parentid", parentId);
-            Page<TpmEquipmentDefine> page = new Page<TpmEquipmentDefine>(pageNo, pageSize);
-            IPage<TpmEquipmentDefine> pageList = tpmEquipmentDefineService.page(page, queryWrapper);
+            Page<TpmEquipmentTree> page = new Page<TpmEquipmentTree>(pageNo, pageSize);
+            IPage<TpmEquipmentTree> pageList = tpmEquipmentDefineService.page(page, queryWrapper);
             return Result.OK(pageList);
         }
 	}
@@ -152,17 +139,17 @@ public class TpmEquipmentDefineController extends JeecgController<TpmEquipmentDe
 
 	 /**
       * 获取子数据
-      * @param tpmEquipmentDefine
+      * @param tpmEquipmentTree
       * @param req
       * @return
       */
-	//@AutoLog(value = "设备树定义-获取子数据")
-	@ApiOperation(value="设备树定义-获取子数据", notes="设备树定义-获取子数据")
+	//@AutoLog(value = "设备树-获取子数据")
+	@ApiOperation(value="设备树-获取子数据", notes="设备树-获取子数据")
 	@GetMapping(value = "/childList")
-	public Result<IPage<TpmEquipmentDefine>> queryPageList(TpmEquipmentDefine tpmEquipmentDefine,HttpServletRequest req) {
-		QueryWrapper<TpmEquipmentDefine> queryWrapper = QueryGenerator.initQueryWrapper(tpmEquipmentDefine, req.getParameterMap());
-		List<TpmEquipmentDefine> list = tpmEquipmentDefineService.list(queryWrapper);
-		IPage<TpmEquipmentDefine> pageList = new Page<>(1, 10, list.size());
+	public Result<IPage<TpmEquipmentTree>> queryPageList(TpmEquipmentTree tpmEquipmentTree, HttpServletRequest req) {
+		QueryWrapper<TpmEquipmentTree> queryWrapper = QueryGenerator.initQueryWrapper(tpmEquipmentTree, req.getParameterMap());
+		List<TpmEquipmentTree> list = tpmEquipmentDefineService.list(queryWrapper);
+		IPage<TpmEquipmentTree> pageList = new Page<>(1, 10, list.size());
         pageList.setRecords(list);
 		return Result.OK(pageList);
 	}
@@ -174,16 +161,16 @@ public class TpmEquipmentDefineController extends JeecgController<TpmEquipmentDe
       * @param parentIds
       * @return
       */
-	//@AutoLog(value = "设备树定义-批量获取子数据")
-    @ApiOperation(value="设备树定义-批量获取子数据", notes="设备树定义-批量获取子数据")
+	//@AutoLog(value = "设备树-批量获取子数据")
+    @ApiOperation(value="设备树-批量获取子数据", notes="设备树-批量获取子数据")
     @GetMapping("/getChildListBatch")
     public Result getChildListBatch(@RequestParam("parentIds") String parentIds) {
         try {
-            QueryWrapper<TpmEquipmentDefine> queryWrapper = new QueryWrapper<>();
+            QueryWrapper<TpmEquipmentTree> queryWrapper = new QueryWrapper<>();
             List<String> parentIdList = Arrays.asList(parentIds.split(","));
             queryWrapper.in("parentid", parentIdList);
-            List<TpmEquipmentDefine> list = tpmEquipmentDefineService.list(queryWrapper);
-            IPage<TpmEquipmentDefine> pageList = new Page<>(1, 10, list.size());
+            List<TpmEquipmentTree> list = tpmEquipmentDefineService.list(queryWrapper);
+            IPage<TpmEquipmentTree> pageList = new Page<>(1, 10, list.size());
             pageList.setRecords(list);
             return Result.OK(pageList);
         } catch (Exception e) {
@@ -191,94 +178,94 @@ public class TpmEquipmentDefineController extends JeecgController<TpmEquipmentDe
             return Result.error("批量查询子节点失败：" + e.getMessage());
         }
     }
-	
+
 	/**
 	 *   添加
 	 *
-	 * @param tpmEquipmentDefine
+	 * @param tpmEquipmentTree
 	 * @return
 	 */
-	@AutoLog(value = "设备树定义-添加")
-	@ApiOperation(value="设备树定义-添加", notes="设备树定义-添加")
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_define:add")
+	@AutoLog(value = "设备树-添加")
+	@ApiOperation(value="设备树-添加", notes="设备树-添加")
+    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_tree:add")
 	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody TpmEquipmentDefine tpmEquipmentDefine) {
-		tpmEquipmentDefineService.addTpmEquipmentDefine(tpmEquipmentDefine);
+	public Result<String> add(@RequestBody TpmEquipmentTree tpmEquipmentTree) {
+		tpmEquipmentDefineService.addTpmEquipmentDefine(tpmEquipmentTree);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
-	 * @param tpmEquipmentDefine
+	 * @param tpmEquipmentTree
 	 * @return
 	 */
-	@AutoLog(value = "设备树定义-编辑")
-	@ApiOperation(value="设备树定义-编辑", notes="设备树定义-编辑")
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_define:edit")
+	@AutoLog(value = "设备树-编辑")
+	@ApiOperation(value="设备树-编辑", notes="设备树-编辑")
+    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_tree:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody TpmEquipmentDefine tpmEquipmentDefine) {
-		tpmEquipmentDefineService.updateTpmEquipmentDefine(tpmEquipmentDefine);
+	public Result<String> edit(@RequestBody TpmEquipmentTree tpmEquipmentTree) {
+		tpmEquipmentDefineService.updateTpmEquipmentDefine(tpmEquipmentTree);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "设备树定义-通过id删除")
-	@ApiOperation(value="设备树定义-通过id删除", notes="设备树定义-通过id删除")
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_define:delete")
+	@AutoLog(value = "设备树-通过id删除")
+	@ApiOperation(value="设备树-通过id删除", notes="设备树-通过id删除")
+    //@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);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "设备树定义-批量删除")
-	@ApiOperation(value="设备树定义-批量删除", notes="设备树定义-批量删除")
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_define:deleteBatch")
+	@AutoLog(value = "设备树-批量删除")
+	@ApiOperation(value="设备树-批量删除", notes="设备树-批量删除")
+    //@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(",")));
 		return Result.OK("批量删除成功！");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
 	 * @param id
 	 * @return
 	 */
-	//@AutoLog(value = "设备树定义-通过id查询")
-	@ApiOperation(value="设备树定义-通过id查询", notes="设备树定义-通过id查询")
+	//@AutoLog(value = "设备树-通过id查询")
+	@ApiOperation(value="设备树-通过id查询", notes="设备树-通过id查询")
 	@GetMapping(value = "/queryById")
-	public Result<TpmEquipmentDefine> queryById(@RequestParam(name="id",required=true) String id) {
-		TpmEquipmentDefine tpmEquipmentDefine = tpmEquipmentDefineService.getById(id);
-		if(tpmEquipmentDefine==null) {
+	public Result<TpmEquipmentTree> queryById(@RequestParam(name="id",required=true) String id) {
+		TpmEquipmentTree tpmEquipmentTree = tpmEquipmentDefineService.getById(id);
+		if(tpmEquipmentTree ==null) {
 			return Result.error("未找到对应数据");
 		}
-		return Result.OK(tpmEquipmentDefine);
+		return Result.OK(tpmEquipmentTree);
 	}
 
     /**
     * 导出excel
     *
     * @param request
-    * @param tpmEquipmentDefine
+    * @param tpmEquipmentTree
     */
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_define:exportXls")
+    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_tree:exportXls")
     @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, TpmEquipmentDefine tpmEquipmentDefine) {
-		return super.exportXls(request, tpmEquipmentDefine, TpmEquipmentDefine.class, "设备树定义");
+    public ModelAndView exportXls(HttpServletRequest request, TpmEquipmentTree tpmEquipmentTree) {
+		return super.exportXls(request, tpmEquipmentTree, TpmEquipmentTree.class, "设备树");
     }
 
     /**
@@ -288,10 +275,10 @@ public class TpmEquipmentDefineController extends JeecgController<TpmEquipmentDe
     * @param response
     * @return
     */
-    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_define:importExcel")
+    //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_tree:importExcel")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-		return super.importExcel(request, response, TpmEquipmentDefine.class);
+		return super.importExcel(request, response, TpmEquipmentTree.class);
     }
 
 }

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipmentDefine/entity/TpmEquipmentDefine.java

@@ -1,12 +1,10 @@
-package org.jeecg.modules.tpmEquipmentDefine.entity;
+package org.jeecg.modules.tpmEquipmentTree.entity;
 
 import java.io.Serializable;
-import java.util.Date;
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -14,18 +12,17 @@ import org.jeecgframework.poi.excel.annotation.Excel;
 import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.io.UnsupportedEncodingException;
 
 /**
- * @Description: 设备树定义
+ * @Description: 设备树
  * @Author: jeecg-boot
  * @Date:   2024-01-09
  * @Version: V1.0
  */
 @Data
-@TableName("ems_tpm_equipment_define")
-@ApiModel(value="ems_tpm_equipment_define对象", description="设备树定义")
-public class TpmEquipmentDefine implements Serializable {
+@TableName("ems_tpm_equipment_tree")
+@ApiModel(value="ems_tpm_equipment_tree", description="设备树")
+public class TpmEquipmentTree implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipmentDefine/mapper/TpmEquipmentDefineMapper.java

@@ -1,20 +1,20 @@
-package org.jeecg.modules.tpmEquipmentDefine.mapper;
+package org.jeecg.modules.tpmEquipmentTree.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.tpmEquipmentDefine.entity.TpmEquipmentDefine;
+import org.jeecg.modules.tpmEquipmentTree.entity.TpmEquipmentTree;
 
 import java.util.List;
 import java.util.Map;
 
 /**
- * @Description: 设备树定义
+ * @Description: 设备树
  * @Author: jeecg-boot
  * @Date:   2024-01-09
  * @Version: V1.0
  */
-public interface TpmEquipmentDefineMapper extends BaseMapper<TpmEquipmentDefine> {
+public interface TpmEquipmentTreeMapper extends BaseMapper<TpmEquipmentTree> {
 
 	/**
 	 * 编辑节点状态

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipmentDefine/mapper/xml/TpmEquipmentDefineMapper.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.tpmEquipmentDefine.mapper.TpmEquipmentDefineMapper">
+<mapper namespace="org.jeecg.modules.tpmEquipmentTree.mapper.TpmEquipmentTreeMapper">
 
 	<update id="updateTreeNodeStatus" parameterType="java.lang.String">
-		update ems_tpm_equipment_define set has_child = #{status} where id = #{id}
+		update ems_tpm_equipment_tree set has_child = #{status} where id = #{id}
 	</update>
 
   	<!-- 【vue3专用】 -->
@@ -13,7 +13,7 @@
 		  name as "title",
 		  (case when has_child = '1' then 0 else 1 end) as isLeaf,
 		  parentid as parentId
-		from ems_tpm_equipment_define
+		from ems_tpm_equipment_tree
 		where parentid = #{pid}
 		<if test="query != null">
 			<foreach collection="query.entrySet()" item="value" index="key">
@@ -22,4 +22,4 @@
 		</if>
 	</select>
 
-</mapper>
+</mapper>

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipmentDefine/service/ITpmEquipmentDefineService.java

@@ -1,44 +1,44 @@
-package org.jeecg.modules.tpmEquipmentDefine.service;
+package org.jeecg.modules.tpmEquipmentTree.service;
 
 import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.tpmEquipmentDefine.entity.TpmEquipmentDefine;
+import org.jeecg.modules.tpmEquipmentTree.entity.TpmEquipmentTree;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.common.exception.JeecgBootException;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import java.util.List;
 
 /**
- * @Description: 设备树定义
+ * @Description: 设备树
  * @Author: jeecg-boot
  * @Date:   2024-01-09
  * @Version: V1.0
  */
-public interface ITpmEquipmentDefineService extends IService<TpmEquipmentDefine> {
+public interface ITpmEquipmentTreeService extends IService<TpmEquipmentTree> {
 
 	/**根节点父ID的值*/
 	public static final String ROOT_PID_VALUE = "0";
-	
+
 	/**树节点有子节点状态值*/
 	public static final String HASCHILD = "1";
-	
+
 	/**树节点无子节点状态值*/
 	public static final String NOCHILD = "0";
 
 	/**
 	 * 新增节点
 	 *
-	 * @param tpmEquipmentDefine
+	 * @param tpmEquipmentTree
 	 */
-	void addTpmEquipmentDefine(TpmEquipmentDefine tpmEquipmentDefine);
-	
+	void addTpmEquipmentDefine(TpmEquipmentTree tpmEquipmentTree);
+
 	/**
    * 修改节点
    *
-   * @param tpmEquipmentDefine
+   * @param tpmEquipmentTree
    * @throws JeecgBootException
    */
-	void updateTpmEquipmentDefine(TpmEquipmentDefine tpmEquipmentDefine) throws JeecgBootException;
-	
+	void updateTpmEquipmentDefine(TpmEquipmentTree tpmEquipmentTree) throws JeecgBootException;
+
 	/**
 	 * 删除节点
 	 *
@@ -53,7 +53,7 @@ public interface ITpmEquipmentDefineService extends IService<TpmEquipmentDefine>
 	   * @param queryWrapper
 	   * @return List<TpmEquipmentDefine>
 	   */
-    List<TpmEquipmentDefine> queryTreeListNoPage(QueryWrapper<TpmEquipmentDefine> queryWrapper);
+    List<TpmEquipmentTree> queryTreeListNoPage(QueryWrapper<TpmEquipmentTree> queryWrapper);
 
 	/**
 	 * 【vue3专用】根据父级编码加载分类字典的数据

jeecg_module_ems/src/main/java/org/jeecg/modules/tpmEquipmentDefine/service/impl/TpmEquipmentDefineServiceImpl.java

@@ -1,12 +1,12 @@
-package org.jeecg.modules.tpmEquipmentDefine.service.impl;
+package org.jeecg.modules.tpmEquipmentTree.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.common.system.vo.SelectTreeModel;
-import org.jeecg.modules.tpmEquipmentDefine.entity.TpmEquipmentDefine;
-import org.jeecg.modules.tpmEquipmentDefine.mapper.TpmEquipmentDefineMapper;
-import org.jeecg.modules.tpmEquipmentDefine.service.ITpmEquipmentDefineService;
+import org.jeecg.modules.tpmEquipmentTree.entity.TpmEquipmentTree;
+import org.jeecg.modules.tpmEquipmentTree.mapper.TpmEquipmentTreeMapper;
+import org.jeecg.modules.tpmEquipmentTree.service.ITpmEquipmentTreeService;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,51 +17,51 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @Description: 设备树定义
+ * @Description: 设备树
  * @Author: jeecg-boot
  * @Date:   2024-01-09
  * @Version: V1.0
  */
 @Service
-public class TpmEquipmentDefineServiceImpl extends ServiceImpl<TpmEquipmentDefineMapper, TpmEquipmentDefine> implements ITpmEquipmentDefineService {
+public class TpmEquipmentTreeServiceImpl extends ServiceImpl<TpmEquipmentTreeMapper, TpmEquipmentTree> implements ITpmEquipmentTreeService {
 
 	@Override
-	public void addTpmEquipmentDefine(TpmEquipmentDefine tpmEquipmentDefine) {
+	public void addTpmEquipmentDefine(TpmEquipmentTree tpmEquipmentTree) {
 	   //新增时设置hasChild为0
-	    tpmEquipmentDefine.setHasChild(ITpmEquipmentDefineService.NOCHILD);
-		if(oConvertUtils.isEmpty(tpmEquipmentDefine.getParentid())){
-			tpmEquipmentDefine.setParentid(ITpmEquipmentDefineService.ROOT_PID_VALUE);
+	    tpmEquipmentTree.setHasChild(ITpmEquipmentTreeService.NOCHILD);
+		if(oConvertUtils.isEmpty(tpmEquipmentTree.getParentid())){
+			tpmEquipmentTree.setParentid(ITpmEquipmentTreeService.ROOT_PID_VALUE);
 		}else{
 			//如果当前节点父ID不为空 则设置父节点的hasChildren 为1
-			TpmEquipmentDefine parent = baseMapper.selectById(tpmEquipmentDefine.getParentid());
+			TpmEquipmentTree parent = baseMapper.selectById(tpmEquipmentTree.getParentid());
 			if(parent!=null && !"1".equals(parent.getHasChild())){
 				parent.setHasChild("1");
 				baseMapper.updateById(parent);
 			}
 		}
-		baseMapper.insert(tpmEquipmentDefine);
+		baseMapper.insert(tpmEquipmentTree);
 	}
-	
+
 	@Override
-	public void updateTpmEquipmentDefine(TpmEquipmentDefine tpmEquipmentDefine) {
-		TpmEquipmentDefine entity = this.getById(tpmEquipmentDefine.getId());
+	public void updateTpmEquipmentDefine(TpmEquipmentTree tpmEquipmentTree) {
+		TpmEquipmentTree entity = this.getById(tpmEquipmentTree.getId());
 		if(entity==null) {
 			throw new JeecgBootException("未找到对应实体");
 		}
 		String old_pid = entity.getParentid();
-		String new_pid = tpmEquipmentDefine.getParentid();
+		String new_pid = tpmEquipmentTree.getParentid();
 		if(!old_pid.equals(new_pid)) {
 			updateOldParentNode(old_pid);
 			if(oConvertUtils.isEmpty(new_pid)){
-				tpmEquipmentDefine.setParentid(ITpmEquipmentDefineService.ROOT_PID_VALUE);
+				tpmEquipmentTree.setParentid(ITpmEquipmentTreeService.ROOT_PID_VALUE);
 			}
-			if(!ITpmEquipmentDefineService.ROOT_PID_VALUE.equals(tpmEquipmentDefine.getParentid())) {
-				baseMapper.updateTreeNodeStatus(tpmEquipmentDefine.getParentid(), ITpmEquipmentDefineService.HASCHILD);
+			if(!ITpmEquipmentTreeService.ROOT_PID_VALUE.equals(tpmEquipmentTree.getParentid())) {
+				baseMapper.updateTreeNodeStatus(tpmEquipmentTree.getParentid(), ITpmEquipmentTreeService.HASCHILD);
 			}
 		}
-		baseMapper.updateById(tpmEquipmentDefine);
+		baseMapper.updateById(tpmEquipmentTree);
 	}
-	
+
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void deleteTpmEquipmentDefine(String id) throws JeecgBootException {
@@ -72,10 +72,10 @@ public class TpmEquipmentDefineServiceImpl extends ServiceImpl<TpmEquipmentDefin
             String[] idArr = id.split(",");
             for (String idVal : idArr) {
                 if(idVal != null){
-                    TpmEquipmentDefine tpmEquipmentDefine = this.getById(idVal);
-                    String pidVal = tpmEquipmentDefine.getParentid();
+                    TpmEquipmentTree tpmEquipmentTree = this.getById(idVal);
+                    String pidVal = tpmEquipmentTree.getParentid();
                     //查询此节点上一级是否还有其他子节点
-                    List<TpmEquipmentDefine> dataList = baseMapper.selectList(new QueryWrapper<TpmEquipmentDefine>().eq("parentid", pidVal).notIn("id",Arrays.asList(idArr)));
+                    List<TpmEquipmentTree> dataList = baseMapper.selectList(new QueryWrapper<TpmEquipmentTree>().eq("parentid", pidVal).notIn("id",Arrays.asList(idArr)));
                     boolean flag = (dataList == null || dataList.size() == 0) && !Arrays.asList(idArr).contains(pidVal) && !sb.toString().contains(pidVal);
                     if(flag){
                         //如果当前节点原本有子节点 现在木有了，更新状态
@@ -91,24 +91,24 @@ public class TpmEquipmentDefineServiceImpl extends ServiceImpl<TpmEquipmentDefin
                 this.updateOldParentNode(pid);
             }
         }else{
-            TpmEquipmentDefine tpmEquipmentDefine = this.getById(id);
-            if(tpmEquipmentDefine==null) {
+            TpmEquipmentTree tpmEquipmentTree = this.getById(id);
+            if(tpmEquipmentTree ==null) {
                 throw new JeecgBootException("未找到对应实体");
             }
-            updateOldParentNode(tpmEquipmentDefine.getParentid());
+            updateOldParentNode(tpmEquipmentTree.getParentid());
             baseMapper.deleteById(id);
         }
 	}
-	
+
 	@Override
-    public List<TpmEquipmentDefine> queryTreeListNoPage(QueryWrapper<TpmEquipmentDefine> queryWrapper) {
-        List<TpmEquipmentDefine> dataList = baseMapper.selectList(queryWrapper);
-        List<TpmEquipmentDefine> mapList = new ArrayList<>();
-        for(TpmEquipmentDefine data : dataList){
+    public List<TpmEquipmentTree> queryTreeListNoPage(QueryWrapper<TpmEquipmentTree> queryWrapper) {
+        List<TpmEquipmentTree> dataList = baseMapper.selectList(queryWrapper);
+        List<TpmEquipmentTree> mapList = new ArrayList<>();
+        for(TpmEquipmentTree data : dataList){
             String pidVal = data.getParentid();
             //递归查询子节点的根节点
-            if(pidVal != null && !ITpmEquipmentDefineService.NOCHILD.equals(pidVal)){
-                TpmEquipmentDefine rootVal = this.getTreeRoot(pidVal);
+            if(pidVal != null && !ITpmEquipmentTreeService.NOCHILD.equals(pidVal)){
+                TpmEquipmentTree rootVal = this.getTreeRoot(pidVal);
                 if(rootVal != null && !mapList.contains(rootVal)){
                     mapList.add(rootVal);
                 }
@@ -125,9 +125,9 @@ public class TpmEquipmentDefineServiceImpl extends ServiceImpl<TpmEquipmentDefin
     public List<SelectTreeModel> queryListByCode(String parentCode) {
         String pid = ROOT_PID_VALUE;
         if (oConvertUtils.isNotEmpty(parentCode)) {
-            LambdaQueryWrapper<TpmEquipmentDefine> queryWrapper = new LambdaQueryWrapper<>();
-            queryWrapper.eq(TpmEquipmentDefine::getParentid, parentCode);
-            List<TpmEquipmentDefine> list = baseMapper.selectList(queryWrapper);
+            LambdaQueryWrapper<TpmEquipmentTree> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(TpmEquipmentTree::getParentid, parentCode);
+            List<TpmEquipmentTree> list = baseMapper.selectList(queryWrapper);
             if (list == null || list.size() == 0) {
                 throw new JeecgBootException("该编码【" + parentCode + "】不存在，请核实!");
             }
@@ -152,10 +152,10 @@ public class TpmEquipmentDefineServiceImpl extends ServiceImpl<TpmEquipmentDefin
 	 * @param pid
 	 */
 	private void updateOldParentNode(String pid) {
-		if(!ITpmEquipmentDefineService.ROOT_PID_VALUE.equals(pid)) {
-			Long count = baseMapper.selectCount(new QueryWrapper<TpmEquipmentDefine>().eq("parentid", pid));
+		if(!ITpmEquipmentTreeService.ROOT_PID_VALUE.equals(pid)) {
+			Long count = baseMapper.selectCount(new QueryWrapper<TpmEquipmentTree>().eq("parentid", pid));
 			if(count==null || count<=1) {
-				baseMapper.updateTreeNodeStatus(pid, ITpmEquipmentDefineService.NOCHILD);
+				baseMapper.updateTreeNodeStatus(pid, ITpmEquipmentTreeService.NOCHILD);
 			}
 		}
 	}
@@ -165,9 +165,9 @@ public class TpmEquipmentDefineServiceImpl extends ServiceImpl<TpmEquipmentDefin
      * @param pidVal
      * @return
      */
-    private TpmEquipmentDefine getTreeRoot(String pidVal){
-        TpmEquipmentDefine data =  baseMapper.selectById(pidVal);
-        if(data != null && !ITpmEquipmentDefineService.ROOT_PID_VALUE.equals(data.getParentid())){
+    private TpmEquipmentTree getTreeRoot(String pidVal){
+        TpmEquipmentTree data =  baseMapper.selectById(pidVal);
+        if(data != null && !ITpmEquipmentTreeService.ROOT_PID_VALUE.equals(data.getParentid())){
             return this.getTreeRoot(data.getParentid());
         }else{
             return data;
@@ -204,9 +204,9 @@ public class TpmEquipmentDefineServiceImpl extends ServiceImpl<TpmEquipmentDefin
      * @return
      */
     private StringBuffer getTreeChildIds(String pidVal,StringBuffer sb){
-        List<TpmEquipmentDefine> dataList = baseMapper.selectList(new QueryWrapper<TpmEquipmentDefine>().eq("parentid", pidVal));
+        List<TpmEquipmentTree> dataList = baseMapper.selectList(new QueryWrapper<TpmEquipmentTree>().eq("parentid", pidVal));
         if(dataList != null && dataList.size()>0){
-            for(TpmEquipmentDefine tree : dataList) {
+            for(TpmEquipmentTree tree : dataList) {
                 if(!sb.toString().contains(tree.getId())){
                     sb.append(",").append(tree.getId());
                 }