diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java index 6b474a0..9340a93 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/enums/ErrorCodeConstants.java @@ -170,6 +170,5 @@ public interface ErrorCodeConstants { ErrorCode EXA_POINT_IMPORT_LIST_IS_EMPTY = new ErrorCode(1_002_029_000, "导入EXA测点数据不能为空!"); ErrorCode Company_NOT_EXISTS = new ErrorCode(1_002_30_000,"集团不存在"); - ErrorCode Company_DISABLED = new ErrorCode(1_002_30_001,"集团被禁用"); ErrorCode Company_NAME_DUPLICATE = new ErrorCode(1_002_31_000,"集团名称已存在"); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/CompanyController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/CompanyController.java similarity index 71% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/CompanyController.java rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/CompanyController.java index 213295f..073ba1d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/CompanyController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/CompanyController.java @@ -1,12 +1,14 @@ // CompanyController.java -package cn.iocoder.yudao.module.system.controller.admin.unit.Company; +package cn.iocoder.yudao.module.system.controller.admin.config.Company; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo.*; -import cn.iocoder.yudao.module.system.convert.unit.CompanyConvert; -import cn.iocoder.yudao.module.system.dal.dataobject.unit.CompanyDO; -import cn.iocoder.yudao.module.system.service.unit.Company.CompanyService; +import cn.iocoder.yudao.module.system.controller.admin.config.Company.vo.CompanyPageReqVO; +import cn.iocoder.yudao.module.system.controller.admin.config.Company.vo.CompanyRespVO; +import cn.iocoder.yudao.module.system.controller.admin.config.Company.vo.CompanySaveReqVO; +import cn.iocoder.yudao.module.system.convert.config.CompanyConvert; +import cn.iocoder.yudao.module.system.dal.dataobject.config.CompanyDO; +import cn.iocoder.yudao.module.system.service.config.Company.CompanyService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; @@ -40,14 +42,14 @@ public class CompanyController { @PostMapping("/create") @Operation(summary = "创建集团") - public CommonResult createCompany(@Valid @RequestBody CompanyCreateReqVO reqVO) { - return success(companyService.createCompany(CompanyConvert.INSTANCE.convert(reqVO))); + public CommonResult createCompany(@Valid @RequestBody CompanySaveReqVO reqVO) { + return success(companyService.createCompany(reqVO)); } @PutMapping("/update") @Operation(summary = "修改集团") - public CommonResult updateCompany(@Valid @RequestBody CompanyUpdateReqVO reqVO) { - companyService.updateCompany(CompanyConvert.INSTANCE.convert(reqVO)); + public CommonResult updateCompany(@Valid @RequestBody CompanySaveReqVO reqVO) { + companyService.updateCompany(reqVO); return success(true); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyBaseVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyBaseVO.java similarity index 69% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyBaseVO.java rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyBaseVO.java index 058b3db..3804d04 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyBaseVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyBaseVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo; +package cn.iocoder.yudao.module.system.controller.admin.config.Company.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -7,18 +7,18 @@ import lombok.Data; @Data public class CompanyBaseVO { - @Schema(description = "集团序号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1001") + @Schema(description = "序号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long id; + @Schema(description = "集团序号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1001") + + private Long num; + @Schema(description = "集团名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试集团") private String name; @Schema(description = "集团简称", requiredMode = Schema.RequiredMode.REQUIRED, example = "测试") - - private String shortName; // 修改了字段名,因为short是Java关键字 - - @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - private Integer status; + private String shortName; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyCreateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyCreateReqVO.java similarity index 77% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyCreateReqVO.java rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyCreateReqVO.java index 05fadec..96a685e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyCreateReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyCreateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo; +package cn.iocoder.yudao.module.system.controller.admin.config.Company.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyPageReqVO.java similarity index 72% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyPageReqVO.java rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyPageReqVO.java index 13eeab9..a4619fb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyPageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyPageReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo; +package cn.iocoder.yudao.module.system.controller.admin.config.Company.vo; import cn.iocoder.yudao.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; @@ -12,7 +12,5 @@ public class CompanyPageReqVO extends PageParam { @Schema(description = "集团名称", example = "测试") private String name; - - @Schema(description = "状态", example = "1") - private Integer status; + private Long num; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyRespVO.java similarity index 69% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyRespVO.java rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyRespVO.java index 2c9142d..c334ff3 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyRespVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo; +package cn.iocoder.yudao.module.system.controller.admin.config.Company.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -9,18 +9,18 @@ import java.util.Date; @Data public class CompanyRespVO { - @Schema(description = "集团编号", example = "1") + @Schema(description = "序号", example = "1") private Long id; + @Schema(description = "集团序号", example = "1001") + private Long num; + @Schema(description = "集团名称", example = "测试集团") private String name; @Schema(description = "集团简称", example = "测试") private String shortName; - @Schema(description = "状态", example = "1") - private Integer status; - @Schema(description = "创建时间") private Date createTime; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanySaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanySaveReqVO.java similarity index 62% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanySaveReqVO.java rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanySaveReqVO.java index b0eea2e..d57362f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanySaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanySaveReqVO.java @@ -1,26 +1,25 @@ -package cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo; +package cn.iocoder.yudao.module.system.controller.admin.config.Company.vo; -import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; public class CompanySaveReqVO { - // 集团编号,用于更新时指定集团 + // 序号,用于更新时指定集团 private Long id; + // 集团序号 + @NotNull(message = "集团序号不能为空") + private Long num; // 集团名称 - @NotEmpty(message = "集团名称不能为空") + @NotBlank(message = "集团名称不能为空") @Size(max = 100, message = "集团名称长度不能超过100个字符") private String name; // 集团简称 - @NotEmpty(message = "集团简称不能为空") + @NotBlank(message = "集团简称不能为空") @Size(max = 50, message = "集团简称长度不能超过50个字符") private String shortName; - // 集团状态 - @NotNull(message = "集团状态不能为空") - private Integer status; - // Getter 和 Setter 方法 public Long getId() { return id; @@ -30,6 +29,14 @@ public class CompanySaveReqVO { this.id = id; } + public Long getNum() { + return num; + } + + public void setNum(Long num) { + this.num = num; + } + public String getName() { return name; } @@ -45,12 +52,4 @@ public class CompanySaveReqVO { public void setShortName(String shortName) { this.shortName = shortName; } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyUpdateReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyUpdateReqVO.java similarity index 62% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyUpdateReqVO.java rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyUpdateReqVO.java index 14d47c9..f71b715 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/unit/Company/vo/CompanyUpdateReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Company/vo/CompanyUpdateReqVO.java @@ -1,4 +1,4 @@ -package cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo; +package cn.iocoder.yudao.module.system.controller.admin.config.Company.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -10,6 +10,6 @@ import lombok.EqualsAndHashCode; @EqualsAndHashCode(callSuper = true) public class CompanyUpdateReqVO extends CompanyBaseVO { - @Schema(description = "集团编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "序号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long id; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/config/CompanyConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/config/CompanyConvert.java new file mode 100644 index 0000000..7f698e6 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/config/CompanyConvert.java @@ -0,0 +1,37 @@ +package cn.iocoder.yudao.module.system.convert.config; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; +import cn.iocoder.yudao.module.system.controller.admin.config.Company.vo.CompanyRespVO; +import cn.iocoder.yudao.module.system.dal.dataobject.config.CompanyDO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; +import java.util.List; + +@Mapper +public interface CompanyConvert { + + CompanyConvert INSTANCE = Mappers.getMapper(CompanyConvert.class); + + // 单个对象转换(自动映射同名字段,包括 num) + default CompanyRespVO convert(CompanyDO bean) { + return BeanUtils.toBean(bean, CompanyRespVO.class); + } + + // 列表转换 + default List convertList(List list) { + return CollectionUtils.convertList(list, this::convert); + } + + // 分页转换(直接复用 convertList) + default PageResult convertPage(PageResult page) { + if (page == null) { + return null; + } + PageResult result = new PageResult<>(); + result.setList(convertList(page.getList())); + result.setTotal(page.getTotal()); + return result; + } +} \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/unit/CompanyConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/unit/CompanyConvert.java deleted file mode 100644 index 3f7c182..0000000 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/unit/CompanyConvert.java +++ /dev/null @@ -1,36 +0,0 @@ -package cn.iocoder.yudao.module.system.convert.unit; - -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo.CompanyCreateReqVO; -import cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo.CompanyRespVO; -import cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo.CompanySaveReqVO; -import cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo.CompanyUpdateReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.unit.CompanyDO; -import jakarta.validation.Valid; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -@Mapper -public interface CompanyConvert { - - CompanyConvert INSTANCE = Mappers.getMapper(CompanyConvert.class); - - // ========== VO 转 DO ========== - @Valid - CompanySaveReqVO convert(CompanyCreateReqVO bean); - @Valid - CompanySaveReqVO convert(CompanyUpdateReqVO bean); - - // ========== DO 转 VO ========== - CompanyRespVO convert(CompanyDO bean); - List convertList(List list); - PageResult convertPage(PageResult page); - - // ========== 自定义转换 ========== - default CompanyRespVO convertWithExtra(CompanyDO Company, Object extraInfo) { - CompanyRespVO vo = convert(Company); - return vo; - } -} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/unit/CompanyDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/config/CompanyDO.java similarity index 67% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/unit/CompanyDO.java rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/config/CompanyDO.java index 06f4ddb..b85454e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/unit/CompanyDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/config/CompanyDO.java @@ -1,7 +1,7 @@ -package cn.iocoder.yudao.module.system.dal.dataobject.unit; +package cn.iocoder.yudao.module.system.dal.dataobject.config; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; @@ -9,7 +9,7 @@ import lombok.*; /** * 集团 DO */ -@TableName("Company") // 根据您的需求指定表名 +@TableName("area_cfg") @Data @EqualsAndHashCode(callSuper = true) @Builder @@ -18,26 +18,28 @@ import lombok.*; public class CompanyDO extends BaseDO { /** - * 集团序号 + * 集团标识 */ @TableId private Long id; /** + * 集团序号 + */ + @TableField("area_id") + private Long num; /** * 集团名称 */ + @TableField("area_name") private String name; /** * 集团简称 */ + @TableField("area_shortname") private String shortName; - /** - * 帐号状态 - * 枚举 {@link CommonStatusEnum} - */ - private Integer status; + } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/unit/CompanyMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/config/CompanyMapper.java similarity index 67% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/unit/CompanyMapper.java rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/config/CompanyMapper.java index 99a685b..e1e0fbc 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/unit/CompanyMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/config/CompanyMapper.java @@ -1,11 +1,11 @@ // UnitMapper.java -package cn.iocoder.yudao.module.system.dal.mysql.unit; +package cn.iocoder.yudao.module.system.dal.mysql.config; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo.CompanyPageReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.unit.CompanyDO; +import cn.iocoder.yudao.module.system.controller.admin.config.Company.vo.CompanyPageReqVO; +import cn.iocoder.yudao.module.system.dal.dataobject.config.CompanyDO; import org.apache.ibatis.annotations.Mapper; @Mapper @@ -14,7 +14,7 @@ public interface CompanyMapper extends BaseMapperX { default PageResult selectPage(CompanyPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(CompanyDO::getName, reqVO.getName()) - .eqIfPresent(CompanyDO::getStatus, reqVO.getStatus()) .orderByDesc(CompanyDO::getId)); + } } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/unit/Company/CompanyService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/Company/CompanyService.java similarity index 67% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/unit/Company/CompanyService.java rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/Company/CompanyService.java index a4d1e7d..4cecbe1 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/unit/Company/CompanyService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/Company/CompanyService.java @@ -1,10 +1,10 @@ -package cn.iocoder.yudao.module.system.service.unit.Company; +package cn.iocoder.yudao.module.system.service.config.Company; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo.CompanyPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo.CompanySaveReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.unit.CompanyDO; +import cn.iocoder.yudao.module.system.controller.admin.config.Company.vo.CompanyPageReqVO; +import cn.iocoder.yudao.module.system.controller.admin.config.Company.vo.CompanySaveReqVO; +import cn.iocoder.yudao.module.system.dal.dataobject.config.CompanyDO; import jakarta.validation.Valid; import java.util.Collection; @@ -64,20 +64,4 @@ public interface CompanyService { * @param ids 集团编号数组 */ void validateCompanyList(Collection ids); - - /** - * 修改集团状态 - * - * @param id 集团编号 - * @param status 状态 - */ - void updateCompanyStatus(Long id, Integer status); - - /** - * 获得指定状态的集团们 - * - * @param status 状态 - * @return 集团们 - */ - List getCompanyListByStatus(Integer status); } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/unit/Company/CompanyServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/Company/CompanyServiceImpl.java similarity index 73% rename from yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/unit/Company/CompanyServiceImpl.java rename to yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/Company/CompanyServiceImpl.java index 8145047..ce77f58 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/unit/Company/CompanyServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/Company/CompanyServiceImpl.java @@ -1,17 +1,17 @@ // CompanyServiceImpl.java -package cn.iocoder.yudao.module.system.service.unit.Company; +package cn.iocoder.yudao.module.system.service.config.Company; import cn.hutool.core.collection.CollUtil; -import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil; import cn.iocoder.yudao.framework.common.pojo.PageResult; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; -import cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo.CompanyPageReqVO; -import cn.iocoder.yudao.module.system.controller.admin.unit.Company.vo.CompanySaveReqVO; -import cn.iocoder.yudao.module.system.dal.dataobject.unit.CompanyDO; -import cn.iocoder.yudao.module.system.dal.mysql.unit.CompanyMapper; +import cn.iocoder.yudao.module.system.controller.admin.config.Company.vo.CompanyPageReqVO; +import cn.iocoder.yudao.module.system.controller.admin.config.Company.vo.CompanySaveReqVO; +import cn.iocoder.yudao.module.system.dal.dataobject.config.CompanyDO; +import cn.iocoder.yudao.module.system.dal.mysql.config.CompanyMapper; import cn.iocoder.yudao.module.system.enums.ErrorCodeConstants; +import jakarta.validation.Valid; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; import jakarta.annotation.Resource; @@ -32,22 +32,23 @@ public class CompanyServiceImpl implements CompanyService { private CompanyMapper companyMapper; @Override - public Long createCompany(CompanySaveReqVO createReqVO) { + public Long createCompany(@Valid CompanySaveReqVO createReqVO) { // 校验集团名称唯一性 validateCompanyNameUnique(createReqVO.getName(), null); // 插入 CompanyDO Company = new CompanyDO(); + Company.setName(createReqVO.getName()); + Company.setNum(createReqVO.getNum()); Company.setShortName(createReqVO.getShortName()); - Company.setStatus(createReqVO.getStatus()); companyMapper.insert(Company); return Company.getId(); } @Override - public void updateCompany(CompanySaveReqVO updateReqVO) { + public void updateCompany(@Valid CompanySaveReqVO updateReqVO) { // 校验存在 validateCompanyExists(updateReqVO.getId()); // 校验集团名称唯一性 @@ -55,10 +56,10 @@ public class CompanyServiceImpl implements CompanyService { // 更新 CompanyDO updateObj = new CompanyDO(); + updateObj.setNum(updateReqVO.getNum()); updateObj.setId(updateReqVO.getId()); updateObj.setName(updateReqVO.getName()); updateObj.setShortName(updateReqVO.getShortName()); - updateObj.setStatus(updateReqVO.getStatus()); companyMapper.updateById(updateObj); } @@ -101,30 +102,8 @@ public class CompanyServiceImpl implements CompanyService { if (Company == null) { throw ServiceExceptionUtil.exception(ErrorCodeConstants.Company_NOT_EXISTS); } - if (CommonStatusEnum.DISABLE.getStatus().equals(Company.getStatus())) { - throw ServiceExceptionUtil.exception(ErrorCodeConstants.Company_DISABLED); - } }); } - - @Override - public void updateCompanyStatus(Long id, Integer status) { - // 校验存在 - validateCompanyExists(id); - - // 更新状态 - CompanyDO updateObj = new CompanyDO(); - updateObj.setId(id); - updateObj.setStatus(status); - companyMapper.updateById(updateObj); - } - - @Override - public List getCompanyListByStatus(Integer status) { - return companyMapper.selectList(new LambdaQueryWrapperX() - .eq(CompanyDO::getStatus, status)); - } - private void validateCompanyExists(Long id) { if (companyMapper.selectById(id) == null) { throw ServiceExceptionUtil.exception(ErrorCodeConstants.Company_NOT_EXISTS);