修改网关地址说明

roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/dao/UsersDao.java

@@ -4,6 +4,8 @@ import com.roncoo.education.common.core.base.Page;
 import com.roncoo.education.user.dao.impl.mapper.entity.Users;
 import com.roncoo.education.user.dao.impl.mapper.entity.UsersExample;
 
+import java.util.List;
+
 public interface UsersDao {
     int save(Users record);
 
@@ -17,4 +19,5 @@ public interface UsersDao {
 
     Users getByMobile(String mobile);
 
+    List<Users> listByIds(List<Long> userIdList);
 }

roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/dao/impl/UsersDaoImpl.java

@@ -62,4 +62,11 @@ public class UsersDaoImpl extends AbstractBaseJdbc implements UsersDao {
         }
         return list.get(0);
     }
+
+    @Override
+    public List<Users> listByIds(List<Long> userIdList) {
+        UsersExample example = new UsersExample();
+        example.createCriteria().andIdIn(userIdList);
+        return this.usersMapper.selectByExample(example);
+    }
 }

roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/admin/biz/AdminLogLoginBiz.java

 package com.roncoo.education.user.service.admin.biz;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.DesensitizedUtil;
 import com.roncoo.education.common.core.base.Page;
 import com.roncoo.education.common.core.base.PageUtil;
 import com.roncoo.education.common.core.base.Result;
 import com.roncoo.education.common.core.tools.BeanUtil;
 import com.roncoo.education.common.service.BaseBiz;
 import com.roncoo.education.user.dao.LogLoginDao;
+import com.roncoo.education.user.dao.UsersDao;
 import com.roncoo.education.user.dao.impl.mapper.entity.LogLogin;
 import com.roncoo.education.user.dao.impl.mapper.entity.LogLoginExample;
 import com.roncoo.education.user.dao.impl.mapper.entity.LogLoginExample.Criteria;
@@ -18,6 +21,9 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
 
 import javax.validation.constraints.NotNull;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * ADMIN-用户登录日志
@@ -30,6 +36,8 @@ public class AdminLogLoginBiz extends BaseBiz {
 
     @NotNull
     private final LogLoginDao dao;
+    @NotNull
+    private final UsersDao usersDao;
 
     /**
      * 用户登录日志分页
@@ -43,6 +51,13 @@ public class AdminLogLoginBiz extends BaseBiz {
         example.setOrderByClause("id desc");
         Page<LogLogin> page = dao.page(req.getPageCurrent(), req.getPageSize(), example);
         Page<AdminLogLoginPageResp> respPage = PageUtil.transform(page, AdminLogLoginPageResp.class);
+        if (CollUtil.isNotEmpty(respPage.getList())) {
+            List<Long> userIdList = respPage.getList().stream().map(AdminLogLoginPageResp::getUserId).collect(Collectors.toList());
+            Map<Long, String> mobileMap = usersDao.listByIds(userIdList).stream().collect(Collectors.toMap(item -> item.getId(), item -> item.getMobile()));
+            for (AdminLogLoginPageResp resp : respPage.getList()) {
+                resp.setMoblie(DesensitizedUtil.mobilePhone(mobileMap.get(resp.getUserId())));
+            }
+        }
         return Result.success(respPage);
     }
 

roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/admin/req/AdminLogLoginPageReq.java

 package com.roncoo.education.user.service.admin.req;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -23,37 +21,6 @@ public class AdminLogLoginPageReq implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "主键")
-    private Long id;
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "创建时间")
-    private LocalDateTime gmtCreate;
-
-    @ApiModelProperty(value = "用户ID")
-    private Long userId;
-
-    @ApiModelProperty(value = "登录状态(1成功，0失败)")
-    private Integer loginStatus;
-
-    @ApiModelProperty(value = "登录IP")
-    private String loginIp;
-
-    @ApiModelProperty(value = "国家")
-    private String country;
-
-    @ApiModelProperty(value = "省")
-    private String province;
-
-    @ApiModelProperty(value = "市")
-    private String city;
-
-    @ApiModelProperty(value = "浏览器")
-    private String browser;
-
-    @ApiModelProperty(value = "操作系统")
-    private String os;
-
     @ApiModelProperty(value = "当前页")
     private int pageCurrent = 1;
 

roncoo-education-user/roncoo-education-user-service/src/main/java/com/roncoo/education/user/service/admin/resp/AdminLogLoginPageResp.java

@@ -33,6 +33,9 @@ public class AdminLogLoginPageResp implements Serializable {
     @ApiModelProperty(value = "用户ID")
     private Long userId;
 
+    @ApiModelProperty(value = "用户手机")
+    private String moblie;
+
     @ApiModelProperty(value = "登录状态(1成功，0失败)")
     private Integer loginStatus;