Merge pull request '厂级配置一次修改' (#22) from Zyq into master

Reviewed-on: http://120.26.116.243:3000/root/alert-backend/pulls/22

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 final FactoryService factoryService; // << 修改点2：移除@Resource, 添加final
-    private FactoryService factoryService; // 变量名建议小写开头 factoryService
 
     @GetMapping("/page")
     @Operation(summary = "获得厂级分页列表")
     public CommonResult<PageResult<FactoryRespVO>> getFactoryPage(@Valid FactoryPageReqVO reqVO) {
-        // 【核心修改】直接接收 Service 返回的 PageResult<FactoryRespVO>
         PageResult<FactoryRespVO> pageResult = factoryService.getFactoryPage(reqVO);
         return success(pageResult);
     }
 
+    // ... 其他方法保持不变 ...
     @GetMapping("/get")
     @Operation(summary = "获得厂级详情")
     public CommonResult<FactoryRespVO> 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);
     }
-}
+}

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 方法 ---
+    // --- 此处所有手写的 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; }
-}

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.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page; // 【关键新增】导入 Page 类
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import jakarta.annotation.Resource;
+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 final FactoryMapper factoryMapper; // << 修改点2：移除@Resource, 添加final
-    private FactoryMapper factoryMapper;
+    private final FactoryConvert factoryConvert; // << 修改点3：移除@Resource, 添加final
-    @Resource
-    private FactoryConvert factoryConvert;
 
     @Override
     public Long createFactory(FactorySaveReqVO createReqVO) {
@@ -59,12 +58,8 @@ public class FactoryServiceImpl implements FactoryService {
 
     @Override
     public PageResult<FactoryRespVO> getFactoryPage(FactoryPageReqVO pageReqVO) {
-        // 1. 创建MyBatis-Plus的Page对象
         Page<FactoryDO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
-        // 2. 调用我们新定义的、专门用于JOIN查询的Mapper方法
         IPage<FactoryDO> pageResult = factoryMapper.selectFactoryPage(page, pageReqVO);
-        // 3. 将MyBatis-Plus的IPage<DO>结果，转换为框架自定义的PageResult<VO>
         return new PageResult<>(factoryConvert.convertList(pageResult.getRecords()), pageResult.getTotal());
     }
-
 }