用户行为列表调整

src/main/java/com/zhiwei/brandkbs2/controller/admin/BehaviorController.java

@@ -42,7 +42,7 @@ public class BehaviorController extends BaseController {
     @ApiOperation("分页查询用户行为列表")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "page", value = "页码", defaultValue = "1", paramType = "query", dataType = "int"),
-            @ApiImplicitParam(name = "size", value = "每页记录数", defaultValue = "10", paramType = "query", dataType = "int"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", defaultValue = "10", paramType = "query", dataType = "int"),
             @ApiImplicitParam(name = "startTime", value = "开始时间", required = true, paramType = "query", dataType = "long"),
             @ApiImplicitParam(name = "endTime", value = "结束时间", required = true, paramType = "query", dataType = "long"),
             @ApiImplicitParam(name = "behavior", value = "行为所属(前台=false,后台=true)", defaultValue = "true", paramType = "query", dataType =
@@ -51,12 +51,12 @@ public class BehaviorController extends BaseController {
     })
     @GetMapping("/list")
     public ResponseResult findList(@RequestParam(value = "page", defaultValue = "1") int page,
-                                   @RequestParam(value = "size", defaultValue = "10") int size,
+                                   @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
                                    @RequestParam("startTime") long startTime,
                                    @RequestParam("endTime") long endTime,
                                    @RequestParam(value = "behavior", defaultValue = "true") boolean behavior,
                                    @RequestParam(value = "keyword", defaultValue = "") String keyword) {
-        return ResponseResult.success(behaviorService.findBehaviorList(page, size, startTime, endTime, behavior, keyword));
+        return ResponseResult.success(behaviorService.findBehaviorList(page, pageSize, startTime, endTime, behavior, keyword));
     }
 
     @ApiOperation("导出用户行为列表")

src/main/java/com/zhiwei/brandkbs2/pojo/vo/BehaviorVO.java

@@ -23,7 +23,7 @@ public class BehaviorVO {
     /**
      * 用户ID
      */
-    private String nickname;
+    private String nickName;
     /**
      * IP地址
      */
@@ -46,10 +46,9 @@ public class BehaviorVO {
      */
     private Integer roleId;
 
-    public static BehaviorVO createFromBehavior(Behavior behavior, String nickname, Integer roleId) {
+    public static BehaviorVO createFromBehavior(Behavior behavior, Integer roleId) {
         BehaviorVO behaviorVO = Tools.convertMap(behavior, BehaviorVO.class);
-        // 补充nickname和role
-        behaviorVO.setNickname(nickname);
+        // 补充role
         behaviorVO.setRoleId(roleId);
         return behaviorVO;
     }

src/main/java/com/zhiwei/brandkbs2/service/impl/BehaviorServiceImpl.java

@@ -90,8 +90,8 @@ public class BehaviorServiceImpl implements BehaviorService {
         mongoUtil.start(page, size, query);
         List<Behavior> behaviorList = behaviorDao.findList(query, collectionNames);
         List<BehaviorVO> resList = behaviorList.stream().map(behavior -> {
-            Pair<String, Integer> nicknameAndRoleId = getNicknameAndRoleId(behavior.getUserId(), behavior.getProjectId());
-            return BehaviorVO.createFromBehavior(behavior, nicknameAndRoleId.getLeft(), nicknameAndRoleId.getRight());
+            Integer roleId = getRoleId(behavior.getUserId(), behavior.getProjectId());
+            return BehaviorVO.createFromBehavior(behavior, roleId);
         }).collect(Collectors.toList());
         MongoUtil.PageHelper<BehaviorVO> pageHelper = mongoUtil.pageHelperT(count, resList);
         return PageVO.createPageVo(pageHelper, resList);
@@ -107,19 +107,19 @@ public class BehaviorServiceImpl implements BehaviorService {
         List<ExportBehaviorDTO> resList = new ArrayList<>(behaviorList.size());
         behaviorList.forEach(behavior -> {
             ExportBehaviorDTO exportBehaviorDTO = new ExportBehaviorDTO();
-            Pair<String, Integer> nicknameAndRoleId = getNicknameAndRoleId(behavior.getUserId(), behavior.getProjectId());
-            exportBehaviorDTO.setNickname(nicknameAndRoleId.getLeft());
+            Integer roleId = getRoleId(behavior.getUserId(), behavior.getProjectId());
+            exportBehaviorDTO.setNickname(behavior.getNickName());
             exportBehaviorDTO.setIp(behavior.getIp());
             exportBehaviorDTO.setTime(new Date(behavior.getCTime()));
             exportBehaviorDTO.setController(behavior.getController());
             exportBehaviorDTO.setMethod(behavior.getMethod());
-            exportBehaviorDTO.setRole(RoleEnum.getNameByState(nicknameAndRoleId.getRight()));
+            exportBehaviorDTO.setRole(RoleEnum.getNameByState(roleId));
             resList.add(exportBehaviorDTO);
         });
         return resList;
     }
 
-    private Pair<String, Integer> getNicknameAndRoleId(String userId, String projectId) {
+    private Integer getRoleId(String userId, String projectId) {
         User user = userDao.findOneById(userId);
         Integer roleId = -1;
         if (user.isSuperAdmin()) {
@@ -130,6 +130,6 @@ public class BehaviorServiceImpl implements BehaviorService {
                 roleId = collect.get(0).getRoleId();
             }
         }
-        return Pair.of(user.getNickname(), roleId);
+        return roleId;
     }
 }