Merge branch 'feature/easy-trans' of https://gitee.com/zhijiantianya/…

…ruoyi-vue-pro # Conflicts: # yudao-dependencies/pom.xml # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.java # yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/operatelog/OperateLogRespVO.java
YunaiV · Apr 1, 2024 · 398e2a2 · 398e2a2
2 parents c0b1bb0 + beea186
commit 398e2a2
Show file tree

Hide file tree

Showing 17 changed files with 134 additions and 135 deletions.
diff --git a/yudao-framework/yudao-common/pom.xml b/yudao-framework/yudao-common/pom.xml
@@ -133,6 +133,11 @@
             <artifactId>transmittable-thread-local</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.fhs-opensource</groupId> <!-- VO 数据翻译 -->
+            <artifactId>easy-trans-anno</artifactId> <!-- 默认引入的原因，方便 xxx-module-api 包使用 -->
+        </dependency>
+
         <!-- Test 测试相关 -->
         <dependency>
             <groupId>org.springframework.boot</groupId>

diff --git a/yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml b/yudao-framework/yudao-spring-boot-starter-mybatis/pom.xml
@@ -71,6 +71,15 @@
             <groupId>com.github.yulichang</groupId>
             <artifactId>mybatis-plus-join-boot-starter</artifactId> <!-- MyBatis 联表查询 -->
         </dependency>
+
+        <dependency>
+            <groupId>com.fhs-opensource</groupId> <!-- VO 数据翻译 -->
+            <artifactId>easy-trans-spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fhs-opensource</groupId>
+            <artifactId>easy-trans-mybatis-plus-extend</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/...rter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDO.java b/...rter-mybatis/src/main/java/cn/iocoder/yudao/framework/mybatis/core/dataobject/BaseDO.java
@@ -3,6 +3,8 @@
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fhs.core.trans.vo.TransPojo;
 import lombok.Data;
 import org.apache.ibatis.type.JdbcType;
 
@@ -12,10 +14,14 @@
 /**
  * 基础实体对象
  *
+ * 为什么实现 {@link TransPojo} 接口？
+ * 因为使用 Easy-Trans TransType.SIMPLE 模式，集成 MyBatis Plus 查询
+ *
  * @author 芋道源码
  */
 @Data
-public abstract class BaseDO implements Serializable {
+@JsonIgnoreProperties(value = "transMap") // 由于 Easy-Trans 会添加 transMap 属性，避免 Jackson 在 Spring Cache 反序列化报错
+public abstract class BaseDO implements Serializable, TransPojo {
 
     /**
      * 创建时间

diff --git a/...ao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/package-info.java b/...ao-spring-boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/package-info.java
diff --git a/...ain/java/cn/iocoder/yudao/framework/translate/config/YudaoTranslateAutoConfiguration.java b/...ain/java/cn/iocoder/yudao/framework/translate/config/YudaoTranslateAutoConfiguration.java
@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.framework.translate.config;
+
+import cn.iocoder.yudao.framework.translate.core.TranslateUtils;
+import com.fhs.trans.service.impl.TransService;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.context.annotation.Bean;
+
+@AutoConfiguration
+public class YudaoTranslateAutoConfiguration {
+
+    @Bean
+    @SuppressWarnings({"InstantiationOfUtilityClass", "SpringJavaInjectionPointsAutowiringInspection"})
+    public TranslateUtils translateUtils(TransService transService) {
+        TranslateUtils.init(transService);
+        return new TranslateUtils();
+    }
+
+}
diff --git a/...arter-mybatis/src/main/java/cn/iocoder/yudao/framework/translate/core/TranslateUtils.java b/...arter-mybatis/src/main/java/cn/iocoder/yudao/framework/translate/core/TranslateUtils.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.framework.translate.core;
+
+import cn.hutool.core.collection.CollUtil;
+import com.fhs.core.trans.vo.VO;
+import com.fhs.trans.service.impl.TransService;
+
+import java.util.List;
+
+/**
+ * VO 数据翻译 Utils
+ *
+ * @author 芋道源码
+ */
+public class TranslateUtils {
+
+    private static TransService transService;
+
+    public static void init(TransService transService) {
+        TranslateUtils.transService = transService;
+    }
+
+    /**
+     * 数据翻译
+     *
+     * 使用场景：无法使用 @TransMethodResult 注解的场景，只能通过手动触发翻译
+     *
+     * @param data 数据
+     * @return 翻译结果
+     */
+    public static <T extends VO> List<T> translate(List<T> data) {
+        if (CollUtil.isNotEmpty((data))) {
+            transService.transBatch(data);
+        }
+        return data;
+    }
+
+}
diff --git a/...boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/translate/package-info.java b/...boot-starter-mybatis/src/main/java/cn/iocoder/yudao/framework/translate/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 使用 Easy-Trans 提升使用 VO 数据翻译的开发效率
+ */
+package cn.iocoder.yudao.framework.translate;
diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1,2 +1,3 @@
 cn.iocoder.yudao.framework.datasource.config.YudaoDataSourceAutoConfiguration
-cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration
+cn.iocoder.yudao.framework.mybatis.config.YudaoMybatisAutoConfiguration
+cn.iocoder.yudao.framework.translate.config.YudaoTranslateAutoConfiguration
diff --git a/.../main/java/cn/iocoder/yudao/module/crm/controller/admin/product/CrmProductController.java b/.../main/java/cn/iocoder/yudao/module/crm/controller/admin/product/CrmProductController.java
@@ -1,23 +1,19 @@
 package cn.iocoder.yudao.module.crm.controller.admin.product;
 
-import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
+import cn.iocoder.yudao.framework.translate.core.TranslateUtils;
 import cn.iocoder.yudao.module.crm.controller.admin.product.vo.product.CrmProductPageReqVO;
 import cn.iocoder.yudao.module.crm.controller.admin.product.vo.product.CrmProductRespVO;
 import cn.iocoder.yudao.module.crm.controller.admin.product.vo.product.CrmProductSaveReqVO;
-import cn.iocoder.yudao.module.crm.dal.dataobject.product.CrmProductCategoryDO;
 import cn.iocoder.yudao.module.crm.dal.dataobject.product.CrmProductDO;
 import cn.iocoder.yudao.module.crm.enums.product.CrmProductStatusEnum;
-import cn.iocoder.yudao.module.crm.service.product.CrmProductCategoryService;
 import cn.iocoder.yudao.module.crm.service.product.CrmProductService;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
-import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -29,15 +25,11 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
-import java.util.Collections;
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Stream;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
 import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
-import static java.util.Collections.singletonList;
 
 @Tag(name = "管理后台 - CRM 产品")
 @RestController
@@ -47,9 +39,6 @@ public class CrmProductController {
 
     @Resource
     private CrmProductService productService;
-    @Resource
-    private CrmProductCategoryService productCategoryService;
-
     @Resource
     private AdminUserApi adminUserApi;
 
@@ -83,14 +72,7 @@ public CommonResult<Boolean> deleteProduct(@RequestParam("id") Long id) {
     @PreAuthorize("@ss.hasPermission('crm:product:query')")
     public CommonResult<CrmProductRespVO> getProduct(@RequestParam("id") Long id) {
         CrmProductDO product = productService.getProduct(id);
-        return success(buildProductDetail(product));
-    }
-
-    private CrmProductRespVO buildProductDetail(CrmProductDO product) {
-        if (product == null) {
-            return null;
-        }
-        return buildProductDetailList(singletonList(product)).get(0);
+        return success(BeanUtils.toBean(product, CrmProductRespVO.class));
     }
 
     @GetMapping("/simple-list")
@@ -106,7 +88,7 @@ public CommonResult<List<CrmProductRespVO>> getProductSimpleList() {
     @PreAuthorize("@ss.hasPermission('crm:product:query')")
     public CommonResult<PageResult<CrmProductRespVO>> getProductPage(@Valid CrmProductPageReqVO pageVO) {
         PageResult<CrmProductDO> pageResult = productService.getProductPage(pageVO);
-        return success(new PageResult<>(buildProductDetailList(pageResult.getList()), pageResult.getTotal()));
+        return success(BeanUtils.toBean(pageResult, CrmProductRespVO.class));
     }
 
     @GetMapping("/export-excel")
@@ -119,27 +101,7 @@ public void exportProductExcel(@Valid CrmProductPageReqVO exportReqVO,
         List<CrmProductDO> list = productService.getProductPage(exportReqVO).getList();
         // 导出 Excel
         ExcelUtils.write(response, "产品.xls", "数据", CrmProductRespVO.class,
-                buildProductDetailList(list));
-    }
-
-    private List<CrmProductRespVO> buildProductDetailList(List<CrmProductDO> list) {
-        if (CollUtil.isEmpty(list)) {
-            return Collections.emptyList();
-        }
-        // 1.1 获得用户信息
-        Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
-                convertSetByFlatMap(list, user -> Stream.of(Long.valueOf(user.getCreator()), user.getOwnerUserId())));
-        // 1.2 获得分类信息
-        Map<Long, CrmProductCategoryDO> categoryMap = productCategoryService.getProductCategoryMap(
-                convertSet(list, CrmProductDO::getCategoryId));
-        // 2. 拼接数据
-        return BeanUtils.toBean(list, CrmProductRespVO.class, productVO -> {
-            // 2.1 设置用户信息
-            MapUtils.findAndThen(userMap, productVO.getOwnerUserId(), user -> productVO.setOwnerUserName(user.getNickname()));
-            MapUtils.findAndThen(userMap, Long.valueOf(productVO.getCreator()), user -> productVO.setCreatorName(user.getNickname()));
-            // 2.2 设置分类名称
-            MapUtils.findAndThen(categoryMap, productVO.getCategoryId(), category -> productVO.setCategoryName(category.getName()));
-        });
+                TranslateUtils.translate(BeanUtils.toBean(list, CrmProductRespVO.class)));
     }
 
 }
diff --git a/...ava/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductRespVO.java b/...ava/cn/iocoder/yudao/module/crm/controller/admin/product/vo/product/CrmProductRespVO.java
@@ -2,9 +2,13 @@
 
 import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat;
 import cn.iocoder.yudao.framework.excel.core.convert.DictConvert;
+import cn.iocoder.yudao.module.crm.dal.dataobject.product.CrmProductCategoryDO;
 import cn.iocoder.yudao.module.crm.enums.DictTypeConstants;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.fhs.core.trans.vo.VO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -14,7 +18,7 @@
 @Schema(description = "管理后台 - CRM 产品 Response VO")
 @Data
 @ExcelIgnoreUnannotated
-public class CrmProductRespVO {
+public class CrmProductRespVO implements VO {
 
     @Schema(description = "产品编号", example = "20529")
     @ExcelProperty("产品编号")
@@ -43,6 +47,7 @@ public class CrmProductRespVO {
     private Integer status;
 
     @Schema(description = "产品分类编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @Trans(type = TransType.SIMPLE, target = CrmProductCategoryDO.class, fields = "name", ref = "categoryName")
     private Long categoryId;
     @Schema(description = "产品分类名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "衣服")
     @ExcelProperty("产品分类")
@@ -53,12 +58,16 @@ public class CrmProductRespVO {
     private String description;
 
     @Schema(description = "负责人的用户编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "31926")
+    @Trans(type = TransType.RPC, targetClassName = "cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO",
+            fields = "nickname", ref = "ownerUserName")
     private Long ownerUserId;
     @Schema(description = "负责人的用户昵称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
     @ExcelProperty("负责人")
     private String ownerUserName;
 
     @Schema(description = "创建人编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
+    @Trans(type = TransType.RPC, targetClassName = "cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO",
+            fields = "nickname", ref = "creatorName")
     private String creator;
     @Schema(description = "创建人名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋道源码")
     @ExcelProperty("创建人")

diff --git a/...-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogV2RespDTO.java b/...-api/src/main/java/cn/iocoder/yudao/module/system/api/logger/dto/OperateLogV2RespDTO.java
@@ -1,5 +1,8 @@
 package cn.iocoder.yudao.module.system.api.logger.dto;
 
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.fhs.core.trans.vo.VO;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -10,15 +13,21 @@
  * @author HUIHUI
  */
 @Data
-public class OperateLogV2RespDTO {
+public class OperateLogV2RespDTO implements VO {
 
+    /**
+     * 日志编号
+     */
+    private Long id;
     /**
      * 链路追踪编号
      */
     private String traceId;
     /**
      * 用户编号
      */
+    @Trans(type = TransType.RPC, targetClassName = "cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO",
+            fields = "nickname", ref = "userName")
     private Long userId;
     /**
      * 用户名称

diff --git a/...system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java b/...system-biz/src/main/java/cn/iocoder/yudao/module/system/api/logger/OperateLogApiImpl.java
@@ -2,24 +2,19 @@
 
 import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogCreateReqDTO;
 import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogV2CreateReqDTO;
 import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogV2PageReqDTO;
 import cn.iocoder.yudao.module.system.api.logger.dto.OperateLogV2RespDTO;
-import cn.iocoder.yudao.module.system.convert.logger.OperateLogConvert;
 import cn.iocoder.yudao.module.system.dal.dataobject.logger.OperateLogV2DO;
-import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.service.logger.OperateLogService;
-import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import com.fhs.core.trans.anno.TransMethodResult;
+import jakarta.annotation.Resource;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
-import javax.annotation.Resource;
-import java.util.List;
-
-import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
-
 /**
  * 操作日志 API 实现类
  *
@@ -31,8 +26,6 @@ public class OperateLogApiImpl implements OperateLogApi {
 
     @Resource
     private OperateLogService operateLogService;
-    @Resource
-    private AdminUserService adminUserService;
 
     @Override
     public void createOperateLog(OperateLogCreateReqDTO createReqDTO) {
@@ -46,16 +39,13 @@ public void createOperateLogV2(OperateLogV2CreateReqDTO createReqDTO) {
     }
 
     @Override
+    @TransMethodResult
     public PageResult<OperateLogV2RespDTO> getOperateLogPage(OperateLogV2PageReqDTO pageReqVO) {
         PageResult<OperateLogV2DO> operateLogPage = operateLogService.getOperateLogPage(pageReqVO);
         if (CollUtil.isEmpty(operateLogPage.getList())) {
             return PageResult.empty();
         }
-
-        // 获取用户
-        List<AdminUserDO> userList = adminUserService.getUserList(
-                convertSet(operateLogPage.getList(), OperateLogV2DO::getUserId));
-        return OperateLogConvert.INSTANCE.convertPage(operateLogPage, userList);
+        return BeanUtils.toBean(operateLogPage, OperateLogV2RespDTO.class);
     }
 
 }
diff --git a/...ain/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.http b/...ain/java/cn/iocoder/yudao/module/system/controller/admin/logger/OperateLogController.http
@@ -1,4 +1,4 @@
-### 请求 /system/operate-log/demo 接口 => 成功
-GET {{baseUrl}}/system/operate-log/demo
+### 请求 /system/operate-log/page 接口 => 成功
+GET {{baseUrl}}/system/operate-log/page
 Authorization: Bearer {{token}}
 tenant-id: {{adminTenentId}}