设备定义树——设备分类树

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

@@ -38,12 +38,12 @@ 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")
 @Slf4j
@@ -60,8 +60,8 @@ public class TpmEquipmentDefineController extends JeecgController<TpmEquipmentDe
 	 * @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,
@@ -156,8 +156,8 @@ public class TpmEquipmentDefineController extends JeecgController<TpmEquipmentDe
       * @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());
@@ -174,8 +174,8 @@ 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 {
@@ -198,8 +198,8 @@ public class TpmEquipmentDefineController extends JeecgController<TpmEquipmentDe
 	 * @param tpmEquipmentDefine
 	 * @return
 	 */
-	@AutoLog(value = "设备定义树-添加")
-	@ApiOperation(value="设备定义树-添加", notes="设备定义树-添加")
+	@AutoLog(value = "设备树定义-添加")
+	@ApiOperation(value="设备树定义-添加", notes="设备树定义-添加")
     //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_define:add")
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody TpmEquipmentDefine tpmEquipmentDefine) {
@@ -213,8 +213,8 @@ public class TpmEquipmentDefineController extends JeecgController<TpmEquipmentDe
 	 * @param tpmEquipmentDefine
 	 * @return
 	 */
-	@AutoLog(value = "设备定义树-编辑")
-	@ApiOperation(value="设备定义树-编辑", notes="设备定义树-编辑")
+	@AutoLog(value = "设备树定义-编辑")
+	@ApiOperation(value="设备树定义-编辑", notes="设备树定义-编辑")
     //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_define:edit")
 	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
 	public Result<String> edit(@RequestBody TpmEquipmentDefine tpmEquipmentDefine) {
@@ -228,8 +228,8 @@ public class TpmEquipmentDefineController extends JeecgController<TpmEquipmentDe
 	 * @param id
 	 * @return
 	 */
-	@AutoLog(value = "设备定义树-通过id删除")
-	@ApiOperation(value="设备定义树-通过id删除", notes="设备定义树-通过id删除")
+	@AutoLog(value = "设备树定义-通过id删除")
+	@ApiOperation(value="设备树定义-通过id删除", notes="设备树定义-通过id删除")
     //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_define:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
@@ -243,8 +243,8 @@ public class TpmEquipmentDefineController extends JeecgController<TpmEquipmentDe
 	 * @param ids
 	 * @return
 	 */
-	@AutoLog(value = "设备定义树-批量删除")
-	@ApiOperation(value="设备定义树-批量删除", notes="设备定义树-批量删除")
+	@AutoLog(value = "设备树定义-批量删除")
+	@ApiOperation(value="设备树定义-批量删除", notes="设备树定义-批量删除")
     //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_define:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -258,8 +258,8 @@ public class TpmEquipmentDefineController extends JeecgController<TpmEquipmentDe
 	 * @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);
@@ -278,7 +278,7 @@ public class TpmEquipmentDefineController extends JeecgController<TpmEquipmentDe
     //@RequiresPermissions("org.jeecg.modules:ems_tpm_equipment_define:exportXls")
     @RequestMapping(value = "/exportXls")
     public ModelAndView exportXls(HttpServletRequest request, TpmEquipmentDefine tpmEquipmentDefine) {
-		return super.exportXls(request, tpmEquipmentDefine, TpmEquipmentDefine.class, "设备定义树");
+		return super.exportXls(request, tpmEquipmentDefine, TpmEquipmentDefine.class, "设备树定义");
     }
 
     /**

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

@@ -17,52 +17,51 @@ 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="设备定义树")
+@ApiModel(value="ems_tpm_equipment_define对象", description="设备树定义")
 public class TpmEquipmentDefine implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**设备定义ID*/
-	@Excel(name = "设备定义ID", width = 15)
-    @ApiModelProperty(value = "设备定义ID")
-    private java.lang.String equipdefid;
-	/**名称*/
-	@Excel(name = "名称", width = 15)
-    @ApiModelProperty(value = "名称")
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**设备分类名称*/
+	@Excel(name = "设备分类名称", width = 15)
+    @ApiModelProperty(value = "设备分类名称")
     private java.lang.String name;
 	/**上级ID*/
 	@Excel(name = "上级ID", width = 15)
     @ApiModelProperty(value = "上级ID")
     private java.lang.String parentid;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
 	/**是否有子节点*/
 	@Excel(name = "是否有子节点", width = 15, dicCode = "yn")
 	@Dict(dicCode = "yn")
     @ApiModelProperty(value = "是否有子节点")
     private java.lang.String hasChild;
-	/**创建者*/
-    @ApiModelProperty(value = "创建者")
-    private java.lang.String createBy;
-	/**创建时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "创建时间")
-    private java.util.Date createTime;
-	/**更新者*/
-    @ApiModelProperty(value = "更新者")
-    private java.lang.String updateBy;
-	/**更新时间*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "更新时间")
-    private java.util.Date updateTime;
-	/**备注*/
-	@Excel(name = "备注", width = 15)
-    @ApiModelProperty(value = "备注")
-    private java.lang.String remark;
 }

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

@@ -9,7 +9,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @Description: 设备定义树
+ * @Description: 设备树定义
  * @Author: jeecg-boot
  * @Date:   2024-01-09
  * @Version: V1.0

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

@@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import java.util.List;
 
 /**
- * @Description: 设备定义树
+ * @Description: 设备树定义
  * @Author: jeecg-boot
  * @Date:   2024-01-09
  * @Version: V1.0

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

@@ -17,7 +17,7 @@ import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 /**
- * @Description: 设备定义树
+ * @Description: 设备树定义
  * @Author: jeecg-boot
  * @Date:   2024-01-09
  * @Version: V1.0
@@ -41,10 +41,10 @@ public class TpmEquipmentDefineServiceImpl extends ServiceImpl<TpmEquipmentDefin
 		}
 		baseMapper.insert(tpmEquipmentDefine);
 	}
-
+	
 	@Override
 	public void updateTpmEquipmentDefine(TpmEquipmentDefine tpmEquipmentDefine) {
-		TpmEquipmentDefine entity = this.getById(tpmEquipmentDefine.getEquipdefid());
+		TpmEquipmentDefine entity = this.getById(tpmEquipmentDefine.getId());
 		if(entity==null) {
 			throw new JeecgBootException("未找到对应实体");
 		}
@@ -61,7 +61,7 @@ public class TpmEquipmentDefineServiceImpl extends ServiceImpl<TpmEquipmentDefin
 		}
 		baseMapper.updateById(tpmEquipmentDefine);
 	}
-
+	
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	public void deleteTpmEquipmentDefine(String id) throws JeecgBootException {
@@ -99,7 +99,7 @@ public class TpmEquipmentDefineServiceImpl extends ServiceImpl<TpmEquipmentDefin
             baseMapper.deleteById(id);
         }
 	}
-
+	
 	@Override
     public List<TpmEquipmentDefine> queryTreeListNoPage(QueryWrapper<TpmEquipmentDefine> queryWrapper) {
         List<TpmEquipmentDefine> dataList = baseMapper.selectList(queryWrapper);
@@ -134,7 +134,7 @@ public class TpmEquipmentDefineServiceImpl extends ServiceImpl<TpmEquipmentDefin
             if (list.size() > 1) {
                 throw new JeecgBootException("该编码【" + parentCode + "】存在多个，请核实!");
             }
-            pid = list.get(0).getEquipdefid();
+            pid = list.get(0).getId();
         }
         return baseMapper.queryListByPid(pid, null);
     }
@@ -207,10 +207,10 @@ public class TpmEquipmentDefineServiceImpl extends ServiceImpl<TpmEquipmentDefin
         List<TpmEquipmentDefine> dataList = baseMapper.selectList(new QueryWrapper<TpmEquipmentDefine>().eq("parentid", pidVal));
         if(dataList != null && dataList.size()>0){
             for(TpmEquipmentDefine tree : dataList) {
-                if(!sb.toString().contains(tree.getEquipdefid())){
-                    sb.append(",").append(tree.getEquipdefid());
+                if(!sb.toString().contains(tree.getId())){
+                    sb.append(",").append(tree.getId());
                 }
-                this.getTreeChildIds(tree.getEquipdefid(),sb);
+                this.getTreeChildIds(tree.getId(),sb);
             }
         }
         return sb;