系统编码添加标题字段

sys-api-service/src/main/java/com/xy/service/LogOperateServiceImpl.java

@@ -2,8 +2,11 @@ package com.xy.service;
 
 import cn.easyes.core.biz.EsPageInfo;
 import cn.easyes.core.conditions.LambdaEsQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.xy.collections.list.JArrayList;
 import com.xy.dto.LogOperateDto;
 import com.xy.entity.LogOperate;
+import com.xy.entity.UserInfo;
 import com.xy.mapper.LogOperateMapper;
 import com.xy.utils.Emptys;
 import com.xy.utils.EsQueryWrapper;
@@ -16,6 +19,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
+import static com.xy.utils.Beans.copy;
 import static com.xy.utils.EsBeans.toPageBean;
 
 @Service
@@ -25,6 +31,8 @@ public class LogOperateServiceImpl implements LogOperateService {
 
     private LogOperateMapper logOperateMapper;
 
+    private UserInfoServiceImpl userInfoService;
+
     @PostMapping("page")
     @ApiOperation("分页查询")
     public R<PageBean<LogOperateDto.Vo>> page(@RequestBody LogOperateDto.Page page) {
@@ -36,7 +44,16 @@ public class LogOperateServiceImpl implements LogOperateService {
                 .build()
                 .orderByDesc(!Emptys.check(pageBean.getOrders()), LogOperate::getCreateTime);
         EsPageInfo<LogOperate> esPageInfo = logOperateMapper.pageQuery(lambdaEsQueryWrapper, (int) pageBean.getCurrent(), (int) pageBean.getSize());
-        return R.ok(toPageBean(LogOperateDto.Vo.class, esPageInfo));
+        PageBean<LogOperateDto.Vo> voPageBean = toPageBean(LogOperateDto.Vo.class, esPageInfo);
+        List<LogOperateDto.Vo> records = voPageBean.getRecords();
+        if (!Emptys.check(records)) {
+            return R.ok(voPageBean);
+        }
+        //外键信息
+        copy(records, () -> userInfoService.list(new LambdaQueryWrapper<UserInfo>().in(UserInfo::getAuthorizeUserId, new JArrayList<>(records).getProperty(LogOperateDto.Vo::getOptUserId).comparing())))
+                .join(LogOperateDto.Vo::getOptUserId, UserInfo::getAuthorizeUserId)
+                .result(LogOperateDto.Vo::getOptUserName, UserInfo::getName);
+        return R.ok(voPageBean);
     }
 
 }

sys-api/src/main/java/com/xy/dto/LogOperateDto.java

@@ -56,7 +56,7 @@ public class LogOperateDto {
         @ApiModelProperty("客户端ip")
         private String clientIp;
 
-        @ApiModelProperty("操作人")
+        @ApiModelProperty("操作人ID")
         private Long optUserId;
 
         @ApiModelProperty("操作类型 1=新增 2=修改 3=查询 4=删除 5=导出 6=导入")
@@ -73,5 +73,9 @@ public class LogOperateDto {
 
         @ApiModelProperty("日志类别")
         private String type;
+
+
+        @ApiModelProperty("操作人名称")
+        private String optUserName;
     }
 }