gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【更新】更新oracle环境下首页查询日志及站内信问题 #I5WOWD

pull/52/head
小诺 2022-10-22 17:09:46 +08:00
parent cbacecb81e
commit d7df6ff222
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/log/provider/DevLogApiProvider.java
View File

@ -17,6 +17,7 @@ import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import vip.xiaonuo.auth.core.util.StpLoginUserUtil; import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
import vip.xiaonuo.common.page.CommonPageRequest;
import vip.xiaonuo.dev.api.DevLogApi; import vip.xiaonuo.dev.api.DevLogApi;
import vip.xiaonuo.dev.modular.log.entity.DevLog; import vip.xiaonuo.dev.modular.log.entity.DevLog;
import vip.xiaonuo.dev.modular.log.enums.DevLogCategoryEnum; import vip.xiaonuo.dev.modular.log.enums.DevLogCategoryEnum;
@ -51,15 +52,19 @@ public class DevLogApiProvider implements DevLogApi {
@Override @Override
public List<JSONObject> currentUserVisLogList() { public List<JSONObject> currentUserVisLogList() {
return devLogService.list(new LambdaQueryWrapper<DevLog>().eq(DevLog::getOpUser, StpLoginUserUtil.getLoginUser().getName()) return devLogService.page(CommonPageRequest.defaultPage(), new LambdaQueryWrapper<DevLog>()
.eq(DevLog::getOpUser, StpLoginUserUtil.getLoginUser().getName())
.in(DevLog::getCategory, DevLogCategoryEnum.LOGIN.getValue(), DevLogCategoryEnum.LOGOUT.getValue()) .in(DevLog::getCategory, DevLogCategoryEnum.LOGIN.getValue(), DevLogCategoryEnum.LOGOUT.getValue())
.last("limit 0, 10").orderByDesc(DevLog::getCreateTime)).stream().map(JSONUtil::parseObj).collect(Collectors.toList()); .orderByDesc(DevLog::getCreateTime))
.getRecords().stream().map(JSONUtil::parseObj).collect(Collectors.toList());
} }
@Override @Override
public List<JSONObject> currentUserOpLogList() { public List<JSONObject> currentUserOpLogList() {
return devLogService.list(new LambdaQueryWrapper<DevLog>().eq(DevLog::getOpUser, StpLoginUserUtil.getLoginUser().getName()) return devLogService.page(CommonPageRequest.defaultPage(), new LambdaQueryWrapper<DevLog>()
.eq(DevLog::getOpUser, StpLoginUserUtil.getLoginUser().getName())
.in(DevLog::getCategory, DevLogCategoryEnum.OPERATE.getValue(), DevLogCategoryEnum.EXCEPTION.getValue()) .in(DevLog::getCategory, DevLogCategoryEnum.OPERATE.getValue(), DevLogCategoryEnum.EXCEPTION.getValue())
.last("limit 0, 10").orderByDesc(DevLog::getCreateTime)).stream().map(JSONUtil::parseObj).collect(Collectors.toList()); .orderByDesc(DevLog::getCreateTime))
.getRecords().stream().map(JSONUtil::parseObj).collect(Collectors.toList());
} }
} }

3
snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/modular/message/service/impl/DevMessageServiceImpl.java
View File

@ -145,8 +145,7 @@ public class DevMessageServiceImpl extends ServiceImpl<DevMessageMapper, DevMess
if(ObjectUtil.isNotEmpty(messageIdList)) { if(ObjectUtil.isNotEmpty(messageIdList)) {
LambdaQueryWrapper<DevMessage> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<DevMessage> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(DevMessage::getId, messageIdList).orderByDesc(DevMessage::getCreateTime); lambdaQueryWrapper.in(DevMessage::getId, messageIdList).orderByDesc(DevMessage::getCreateTime);
lambdaQueryWrapper.last("limit 0, " + devMessageListParam.getLimit()); return this.page(CommonPageRequest.defaultPage(),lambdaQueryWrapper).getRecords();
return this.list(lambdaQueryWrapper);
} }
return CollectionUtil.newArrayList(); return CollectionUtil.newArrayList();
} }