feat:部门硬件分组

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/entity/SysDept.java

@@ -28,6 +28,7 @@ import lombok.EqualsAndHashCode;
 
 import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
+
 import java.time.LocalDateTime;
 
 /**
@@ -44,66 +45,72 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 public class SysDept extends Model<SysDept> {
 
-	private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 1L;
 
-	@TableId(value = "dept_id", type = IdType.ASSIGN_ID)
-	@Schema(description = "部门id")
-	private Long deptId;
+    @TableId(value = "dept_id", type = IdType.ASSIGN_ID)
+    @Schema(description = "部门id")
+    private Long deptId;
 
-	/**
-	 * 部门名称
-	 */
-	@NotBlank(message = "部门名称不能为空")
-	@Schema(description = "部门名称")
-	private String name;
+    /**
+     * 部门名称
+     */
+    @NotBlank(message = "部门名称不能为空")
+    @Schema(description = "部门名称")
+    private String name;
 
-	/**
-	 * 排序
-	 */
-	@NotNull(message = "排序值不能为空")
-	@Schema(description = "排序值")
-	private Integer sortOrder;
+    /**
+     * 硬件分类id
+     */
+    @Schema(description = "硬件分类id")
+    private Long hardGroupId;
 
-	/**
-	 * 创建人
-	 */
-	@TableField(fill = FieldFill.INSERT)
-	@Schema(description = "创建人")
-	private String createBy;
+    /**
+     * 排序
+     */
+    @NotNull(message = "排序值不能为空")
+    @Schema(description = "排序值")
+    private Integer sortOrder;
 
-	/**
-	 * 修改人
-	 */
-	@TableField(fill = FieldFill.UPDATE)
-	@Schema(description = "修改人")
-	private String updateBy;
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Schema(description = "创建人")
+    private String createBy;
 
-	/**
-	 * 创建时间
-	 */
-	@Schema(description = "创建时间")
-	@TableField(fill = FieldFill.INSERT)
-	private LocalDateTime createTime;
+    /**
+     * 修改人
+     */
+    @TableField(fill = FieldFill.UPDATE)
+    @Schema(description = "修改人")
+    private String updateBy;
 
-	/**
-	 * 修改时间
-	 */
-	@Schema(description = "修改时间")
-	@TableField(fill = FieldFill.UPDATE)
-	private LocalDateTime updateTime;
+    /**
+     * 创建时间
+     */
+    @Schema(description = "创建时间")
+    @TableField(fill = FieldFill.INSERT)
+    private LocalDateTime createTime;
 
-	/**
-	 * 父级部门id
-	 */
-	@Schema(description = "父级部门id")
-	private Long parentId;
+    /**
+     * 修改时间
+     */
+    @Schema(description = "修改时间")
+    @TableField(fill = FieldFill.UPDATE)
+    private LocalDateTime updateTime;
 
-	/**
-	 * 是否删除 1：已删除 0：正常
-	 */
-	@TableLogic
-	@Schema(description = "删除标记,1:已删除,0:正常")
-	@TableField(fill = FieldFill.INSERT)
-	private String delFlag;
+    /**
+     * 父级部门id
+     */
+    @Schema(description = "父级部门id")
+    private Long parentId;
+
+    /**
+     * 是否删除 1：已删除 0：正常
+     */
+    @TableLogic
+    @Schema(description = "删除标记,1:已删除,0:正常")
+    @TableField(fill = FieldFill.INSERT)
+    private String delFlag;
 
 }

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteDeptService.java

@@ -84,4 +84,13 @@ public interface RemoteDeptService {
     @NoToken
     @GetMapping("/dept/getParentDeptList")
     R<List<SysDept>> getParentDeptList(@RequestParam("deptId") Long deptId);
+
+    /**
+     * 查询部门所属的分组部门
+     * @param deptId
+     * @return
+     */
+    @NoToken
+    @GetMapping("/dept/getParentDeptHardGroup")
+    R<SysDept> getParentDeptHardGroup(@RequestParam("deptId") Long deptId);
 }