Merge branch 'release' into 'master'

Release

See merge request !515

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

@@ -89,15 +89,17 @@ public class BehaviorController extends BaseController {
             @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 = "keyword", value = "关键词",defaultValue = "", paramType = "query", dataType = "string")
+            @ApiImplicitParam(name = "keyword", value = "关键词",defaultValue = "", paramType = "query", dataType = "string"),
+            @ApiImplicitParam(name = "roleId", value = "用户权限",defaultValue = "", paramType = "query", dataType = "int")
     })
     @GetMapping("/logRecord/list")
     public ResponseResult findLogRecordList(@RequestParam(value = "page", defaultValue = "1") int page,
                                             @RequestParam(value = "pageSize", defaultValue = "10") int pageSize,
                                             @RequestParam("startTime") long startTime,
                                             @RequestParam("endTime") long endTime,
-                                   @RequestParam(value = "keyword", defaultValue = "") String keyword) {
-        return ResponseResult.success(behaviorService.findLogRecordList(page, pageSize, startTime, endTime, keyword));
+                                            @RequestParam(value = "keyword", defaultValue = "") String keyword,
+                                            @RequestParam(value = "roleId", required = false) Integer roleId) {
+        return ResponseResult.success(behaviorService.findLogRecordList(page, pageSize, startTime, endTime, keyword, roleId));
     }
 
     @ApiOperation("下载用户操作记录列表")

src/main/java/com/zhiwei/brandkbs2/service/BehaviorService.java

@@ -65,7 +65,7 @@ public interface BehaviorService {
      * @param nickname 用户昵称
      * @return 用户行为列表
      */
-    PageVO<UserLogRecord> findLogRecordList(int page, int size, long startTime, long endTime, String nickname);
+    PageVO<UserLogRecord> findLogRecordList(int page, int size, long startTime, long endTime, String nickname, Integer roleId);
 
     /**
      * 下载用户操作记录列表

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

@@ -181,7 +181,7 @@ public class BehaviorServiceImpl implements BehaviorService {
     }
 
     @Override
-    public PageVO<UserLogRecord> findLogRecordList(int page, int size, long startTime, long endTime, String nickname) {
+    public PageVO<UserLogRecord> findLogRecordList(int page, int size, long startTime, long endTime, String nickname, Integer roleId) {
         Date start = new Date(startTime);
         Date end = new Date(endTime);
         String projectId = UserThreadLocal.getProjectId();
@@ -193,6 +193,9 @@ public class BehaviorServiceImpl implements BehaviorService {
         if (StringUtils.isNotEmpty(nickname)) {
             userLogRecordDao.addKeywordFuzz(query, nickname, "nickname");
         }
+        if (Objects.nonNull(roleId)){
+            query.addCriteria(Criteria.where("roleId").is(roleId));
+        }
         long count = userLogRecordDao.count(query, collectionNames);
         List<UserLogRecord> behaviorList = new ArrayList<>();
         int pageSizeFlag = size;