SRM的待办已办处理

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApi.java

@@ -14,7 +14,13 @@ import java.util.Map;
  * @author 芋道源码
  */
 public interface AdminUserApi {
-
+    /**
+     * 获得用户列表，基于 用户账号 模糊匹配
+     *
+     * @param username 用户账号
+     * @return 用户列表
+     */
+    List<AdminUserRespDTO> getUserListByUsername(String username);
     /**
      * 通过用户 ID 查询用户
      *

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/api/user/AdminUserApiImpl.java

@@ -43,7 +43,11 @@ public class AdminUserApiImpl implements AdminUserApi {
         AdminUserDO userByUsername = userService.getUserByUsername(username);
         return BeanUtils.toBean(userByUsername, AdminUserRespDTO.class);
     }
-
+    @Override
+    public List<AdminUserRespDTO> getUserListByUsername(String username) {
+        List<AdminUserDO> users = userService.getUserListByUsername(username);
+        return BeanUtils.toBean(users, AdminUserRespDTO.class);
+    }
     @Override
     public List<AdminUserRespDTO> getUserListBySubordinate(Long id) {
         // 1.1 获取用户负责的部门

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/LoginLogController.java

@@ -1,17 +1,23 @@
 package cn.iocoder.yudao.module.system.controller.admin.logger;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
 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.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
+import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
+import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.logger.vo.loginlog.LoginLogRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.logger.LoginLogDO;
 import cn.iocoder.yudao.module.system.service.logger.LoginLogService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -23,6 +29,8 @@ import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
@@ -35,13 +43,34 @@ public class LoginLogController {
 
     @Resource
     private LoginLogService loginLogService;
+    @Autowired
+    private AdminUserApi adminUserApi;
+    @Autowired
+    private DeptApi deptApi;
 
     @GetMapping("/page")
     @Operation(summary = "获得登录日志分页列表")
     @PreAuthorize("@ss.hasPermission('system:login-log:query')")
     public CommonResult<PageResult<LoginLogRespVO>> getLoginLogPage(@Valid LoginLogPageReqVO pageReqVO) {
         PageResult<LoginLogDO> pageResult = loginLogService.getLoginLogPage(pageReqVO);
-        return success(BeanUtils.toBean(pageResult, LoginLogRespVO.class));
+        List<LoginLogRespVO> collect = pageResult.getList().stream().map(e -> {
+            LoginLogRespVO loginLogRespVO = new LoginLogRespVO();
+            BeanUtils.copyProperties(e, loginLogRespVO);
+            if (Objects.nonNull(loginLogRespVO.getUsername())) {
+                List<AdminUserRespDTO> users = adminUserApi.getUserListByUsername(loginLogRespVO.getUsername());
+                if (CollUtil.isNotEmpty(users)) {
+                    loginLogRespVO.setNickname(users.get(0).getNickname());
+                    if (Objects.nonNull(users.get(0).getDeptId())) {
+                        DeptRespDTO dept = deptApi.getDept(users.get(0).getDeptId());
+                        if (Objects.nonNull(dept)) {
+                            loginLogRespVO.setDeptName(dept.getName());
+                        }
+                    }
+                }
+            }
+            return loginLogRespVO;
+        }).collect(Collectors.toList());
+        return success(new PageResult<>(collect, pageResult.getTotal()));
     }
 
     @GetMapping("/export-excel")

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/logger/vo/loginlog/LoginLogRespVO.java

@@ -54,4 +54,8 @@ public class LoginLogRespVO {
     @ExcelProperty("登录时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "昵称")
+    private String nickname;
+    @Schema(description = "部门名称")
+    private String deptName;
 }

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/user/AdminUserMapper.java

@@ -47,5 +47,7 @@ public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
     default List<AdminUserDO> selectListByDeptIds(Collection<Long> deptIds) {
         return selectList(AdminUserDO::getDeptId, deptIds);
     }
-
+    default List<AdminUserDO> selectListByUsername(String username) {
+        return selectList(new LambdaQueryWrapperX<AdminUserDO>().like(AdminUserDO::getUsername, username));
+    }
 }

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserService.java

@@ -24,7 +24,13 @@ import java.util.Map;
  * @author 芋道源码
  */
 public interface AdminUserService {
-
+    /**
+     * 获得用户列表，基于 用户账号 模糊匹配
+     *
+     * @param username 用户账号
+     * @return 用户列表
+     */
+    List<AdminUserDO> getUserListByUsername(String username);
     /**
      * 创建用户
      *

yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/service/user/AdminUserServiceImpl.java

@@ -530,4 +530,8 @@ public class AdminUserServiceImpl implements AdminUserService {
         return passwordEncoder.encode(password);
     }
 
+    @Override
+    public List<AdminUserDO> getUserListByUsername(String username) {
+        return userMapper.selectListByUsername(username);
+    }
 }

yudao-server/src/main/java/cn/iocoder/yudao/server/rest/SrmRest.java

@@ -34,6 +34,13 @@ public class SrmRest {
     @Resource
     private AdminAuthService authService;
 
+    /**
+     * 获取SRM的待办及已办的数量
+     * @param workcode
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
     public ImmutableMap<String, Object> getSrmToDoList(String workcode, Integer pageNo, Integer pageSize) {
         AuthOaLoginReqVO reqVO = new AuthOaLoginReqVO();
         reqVO.setUsername(workcode);

yudao-server/src/main/resources/application-dev.yaml

@@ -273,6 +273,8 @@ oa:
   secrit: cc942f10-bd18-4f6c-b2cd-9f804c0c4491
 srm:
   ssoToken: https://srmqas.deepoil.cc/jbl/api/sso/get-temporary-token/OA
+  todo: https://srmqas.deepoil.cc/jbl/api/workflow-request/backlog/page
+  done: https://srmqas.deepoil.cc/jbl/api/workflow-request/through-my/page
 pms:
   secret: cc99d802-ce5c-5f62-b037-9a00726e7109
   ssoToken: https://iot.deepoil.cc/admin-api/system/auth/ssoLogin/getToken