From 9575c2f5bddbc6d7867e2fff820e36eb6bd09752 Mon Sep 17 00:00:00 2001 From: Dreamglade Date: Fri, 1 Aug 2025 19:32:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=82=E7=BA=A7=E9=85=8D=E7=BD=AE=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/Factory/FactoryController.java | 14 +++++------ .../config/Factory/vo/FactorySaveReqVO.java | 23 +++++++------------ .../config/Factory/FactoryServiceImpl.java | 17 +++++--------- 3 files changed, 20 insertions(+), 34 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Factory/FactoryController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Factory/FactoryController.java index d74a1d6..731897b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Factory/FactoryController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Factory/FactoryController.java @@ -10,8 +10,8 @@ import cn.iocoder.yudao.module.system.dal.dataobject.config.FactoryDO; import cn.iocoder.yudao.module.system.service.config.Factory.FactoryService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; // 新增导入 import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -19,27 +19,25 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; @Tag(name = "管理后台 - 厂级管理") @RestController -@RequestMapping("/system/Factory") // 【注意】根据您的业务，这里可能应该是 /system/plant +@RequestMapping("/system/Factory") @Validated +@RequiredArgsConstructor // << 修改点1：新增注解 public class FactoryController { - @Resource - private FactoryService factoryService; // 变量名建议小写开头 factoryService + private final FactoryService factoryService; // << 修改点2：移除@Resource, 添加final @GetMapping("/page") @Operation(summary = "获得厂级分页列表") public CommonResult> getFactoryPage(@Valid FactoryPageReqVO reqVO) { - // 【核心修改】直接接收 Service 返回的 PageResult PageResult pageResult = factoryService.getFactoryPage(reqVO); return success(pageResult); } + // ... 其他方法保持不变 ... @GetMapping("/get") @Operation(summary = "获得厂级详情") public CommonResult getFactory(@RequestParam("id") Long id) { FactoryDO factory = factoryService.getFactory(id); - // 【注意】这里也需要处理集团名称的关联显示，简单起见暂时保持原样 - // 理想情况下，getFactory 也应该返回一个包含 areaName 的 VO return success(FactoryConvert.INSTANCE.convert(factory)); } @@ -62,4 +60,4 @@ public class FactoryController { factoryService.deleteFactory(id); return success(true); } -} +} \ 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/config/Factory/vo/FactorySaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Factory/vo/FactorySaveReqVO.java index a591408..85a3748 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Factory/vo/FactorySaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/config/Factory/vo/FactorySaveReqVO.java @@ -1,37 +1,30 @@ -// ----------------------------------------------------------------- package cn.iocoder.yudao.module.system.controller.admin.config.Factory.vo; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; +import lombok.Data; // 新增导入 @Schema(description = "管理后台 - 电厂创建/修改 Request VO") +@Data // << 修改点：新增注解，并移除所有手写的getter/setter public class FactorySaveReqVO { @Schema(description = "电厂编号，更新时必填", example = "1") - private Long id; // 对应 plant_id + private Long id; @Schema(description = "电厂名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "正宁电厂") @NotBlank(message = "电厂名称不能为空") @Size(max = 255) - private String name; // 对应 plant_name + private String name; @Schema(description = "电厂简称", example = "正宁") @Size(max = 50) - private String shortName; // 对应 plant_shortname + private String shortName; @Schema(description = "所属集团编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "9") @NotNull(message = "所属集团不能为空") - private Long areaId; // 对应 area_id + private Long areaId; - // --- Getter 和 Setter 方法 --- - public Long getId() { return id; } - public void setId(Long id) { this.id = id; } - public String getName() { return name; } - public void setName(String name) { this.name = name; } - public String getShortName() { return shortName; } - public void setShortName(String shortName) { this.shortName = shortName; } - public Long getAreaId() { return areaId; } - public void setAreaId(Long areaId) { this.areaId = areaId; } -} + // --- 此处所有手写的 Getter 和 Setter 方法均已删除 --- +} \ 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/config/Factory/FactoryServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/Factory/FactoryServiceImpl.java index 76c2454..bb288c4 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/Factory/FactoryServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/config/Factory/FactoryServiceImpl.java @@ -7,9 +7,9 @@ import cn.iocoder.yudao.module.system.controller.admin.config.Factory.vo.Factory import cn.iocoder.yudao.module.system.convert.config.FactoryConvert; import cn.iocoder.yudao.module.system.dal.dataobject.config.FactoryDO; import cn.iocoder.yudao.module.system.dal.mysql.config.FactoryMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; // 【关键新增】导入 IPage 类 -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; // 【关键新增】导入 Page 类 -import jakarta.annotation.Resource; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.RequiredArgsConstructor; // 新增导入 import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -19,12 +19,11 @@ import java.util.List; @Service @Validated +@RequiredArgsConstructor // << 修改点1：新增注解 public class FactoryServiceImpl implements FactoryService { - @Resource - private FactoryMapper factoryMapper; - @Resource - private FactoryConvert factoryConvert; + private final FactoryMapper factoryMapper; // << 修改点2：移除@Resource, 添加final + private final FactoryConvert factoryConvert; // << 修改点3：移除@Resource, 添加final @Override public Long createFactory(FactorySaveReqVO createReqVO) { @@ -59,12 +58,8 @@ public class FactoryServiceImpl implements FactoryService { @Override public PageResult getFactoryPage(FactoryPageReqVO pageReqVO) { - // 1. 创建MyBatis-Plus的Page对象 Page page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); - // 2. 调用我们新定义的、专门用于JOIN查询的Mapper方法 IPage pageResult = factoryMapper.selectFactoryPage(page, pageReqVO); - // 3. 将MyBatis-Plus的IPage结果，转换为框架自定义的PageResult return new PageResult<>(factoryConvert.convertList(pageResult.getRecords()), pageResult.getTotal()); } - } \ No newline at end of file