diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/SblxController.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/SblxController.java index 7bf181c..92fabfb 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/SblxController.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/SblxController.java @@ -1,7 +1,5 @@ package com.lideeyunji.service.system.controller; -import com.lideeyunji.service.system.controller.vo.dept.dept.DeptRespVO; -import com.lideeyunji.service.system.controller.vo.dept.dept.DeptSimpleRespVO; import com.lideeyunji.service.system.controller.vo.sblx.SblxListReqVO; import com.lideeyunji.service.system.controller.vo.sblx.SblxRespVO; import com.lideeyunji.service.system.controller.vo.sblx.SblxSaveReqVO; @@ -77,9 +75,9 @@ public class SblxController { @Operation(tags = "设备类型管理",summary = "获得设备类型信息") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('system:sblx:query')") - public CommonResult getDept(@RequestParam("id") Long id) { + public CommonResult getDept(@RequestParam("id") Long id) { SblxDO sblx = sblxService.getSblx(id); - return success(BeanUtils.toBean(sblx, DeptRespVO.class)); + return success(BeanUtils.toBean(sblx, SblxRespVO.class)); } } diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/sblx/SblxRespVO.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/sblx/SblxRespVO.java index 9aed175..df53e28 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/sblx/SblxRespVO.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/sblx/SblxRespVO.java @@ -18,6 +18,9 @@ public class SblxRespVO { @Schema(description = "设备类型编码", requiredMode = Schema.RequiredMode.REQUIRED) private String industryCode; + @Schema(description = "所属部门", example = "1024") + private Long deptId; + @Schema(description = "父设备类型 ID", example = "1024") private Long parentId; diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/sblx/SblxSaveReqVO.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/sblx/SblxSaveReqVO.java index dfcfbcc..dba19ab 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/sblx/SblxSaveReqVO.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/controller/vo/sblx/SblxSaveReqVO.java @@ -27,6 +27,9 @@ public class SblxSaveReqVO { @Schema(description = "父设备类型 ID", example = "1024") private Long parentId; + @Schema(description = "所属部门", example = "1024") + private Long deptId; + @Schema(description = "显示顺序不能为空", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024") @NotNull(message = "显示顺序不能为空") private Integer sort; diff --git a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/entity/SblxDO.java b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/entity/SblxDO.java index 4870e2d..ec7026b 100644 --- a/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/entity/SblxDO.java +++ b/lidee-service/lidee-service-system-biz/src/main/java/com/lideeyunji/service/system/entity/SblxDO.java @@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.annotation.*; import com.lideeyunji.tool.framework.common.enums.CommonStatusEnum; import com.lideeyunji.tool.framework.mybatis.core.dataobject.BaseDO; import com.lideeyunji.tool.framework.tenant.core.db.TenantBaseDO; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import javax.validation.constraints.NotBlank; + /** * 设备类型表 * @@ -41,6 +44,11 @@ public class SblxDO extends BaseDO { */ private Long parentId; + /** + * 所属部门 + */ + private Long deptId; + /** * 显示顺序 */