mirror of
https://github.com/continew-org/continew-admin.git
synced 2025-09-09 08:57:16 +08:00
refactor: 💥 调整后端请求、响应参数模型命名风格
XxxRequest => XxxReq XxxVO => XxxResp
This commit is contained in:
@@ -50,11 +50,11 @@ import cn.hutool.json.JSONArray;
|
||||
import cn.hutool.json.JSONObject;
|
||||
import cn.hutool.json.JSONUtil;
|
||||
|
||||
import top.charles7c.cnadmin.auth.model.request.AccountLoginRequest;
|
||||
import top.charles7c.cnadmin.auth.model.req.AccountLoginReq;
|
||||
import top.charles7c.cnadmin.common.constant.StringConsts;
|
||||
import top.charles7c.cnadmin.common.constant.SysConsts;
|
||||
import top.charles7c.cnadmin.common.model.dto.LogContext;
|
||||
import top.charles7c.cnadmin.common.model.vo.R;
|
||||
import top.charles7c.cnadmin.common.model.resp.R;
|
||||
import top.charles7c.cnadmin.common.util.ExceptionUtils;
|
||||
import top.charles7c.cnadmin.common.util.IpUtils;
|
||||
import top.charles7c.cnadmin.common.util.ServletUtils;
|
||||
@@ -225,9 +225,9 @@ public class LogInterceptor implements HandlerInterceptor {
|
||||
logDO.setCreateUser(null);
|
||||
}
|
||||
if (null == logDO.getCreateUser() && SysConsts.LOGIN_URI.equals(requestURI)) {
|
||||
AccountLoginRequest loginRequest = JSONUtil.toBean(requestBody, AccountLoginRequest.class);
|
||||
AccountLoginReq loginReq = JSONUtil.toBean(requestBody, AccountLoginReq.class);
|
||||
logDO.setCreateUser(
|
||||
ExceptionUtils.exToNull(() -> userService.getByUsername(loginRequest.getUsername()).getId()));
|
||||
ExceptionUtils.exToNull(() -> userService.getByUsername(loginReq.getUsername()).getId()));
|
||||
}
|
||||
if (StrUtil.isNotBlank(requestBody)) {
|
||||
if (JSONUtil.isTypeJSONObject(requestBody)) {
|
||||
|
||||
@@ -23,9 +23,9 @@ import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import top.charles7c.cnadmin.common.base.BaseMapper;
|
||||
import top.charles7c.cnadmin.monitor.model.entity.LogDO;
|
||||
import top.charles7c.cnadmin.monitor.model.vo.DashboardAccessTrendVO;
|
||||
import top.charles7c.cnadmin.monitor.model.vo.DashboardPopularModuleVO;
|
||||
import top.charles7c.cnadmin.monitor.model.vo.DashboardTotalVO;
|
||||
import top.charles7c.cnadmin.monitor.model.resp.DashboardAccessTrendResp;
|
||||
import top.charles7c.cnadmin.monitor.model.resp.DashboardPopularModuleResp;
|
||||
import top.charles7c.cnadmin.monitor.model.resp.DashboardTotalResp;
|
||||
|
||||
/**
|
||||
* 系统日志 Mapper
|
||||
@@ -40,7 +40,7 @@ public interface LogMapper extends BaseMapper<LogDO> {
|
||||
*
|
||||
* @return 仪表盘总计信息
|
||||
*/
|
||||
DashboardTotalVO selectDashboardTotal();
|
||||
DashboardTotalResp selectDashboardTotal();
|
||||
|
||||
/**
|
||||
* 查询仪表盘访问趋势信息
|
||||
@@ -50,14 +50,14 @@ public interface LogMapper extends BaseMapper<LogDO> {
|
||||
*
|
||||
* @return 仪表盘访问趋势信息
|
||||
*/
|
||||
List<DashboardAccessTrendVO> selectListDashboardAccessTrend(@Param("days") Integer days);
|
||||
List<DashboardAccessTrendResp> selectListDashboardAccessTrend(@Param("days") Integer days);
|
||||
|
||||
/**
|
||||
* 查询仪表盘热门模块列表
|
||||
*
|
||||
* @return 仪表盘热门模块列表
|
||||
*/
|
||||
List<DashboardPopularModuleVO> selectListDashboardPopularModule();
|
||||
List<DashboardPopularModuleResp> selectListDashboardPopularModule();
|
||||
|
||||
/**
|
||||
* 查询仪表盘访客地域分布信息
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package top.charles7c.cnadmin.monitor.model.vo;
|
||||
package top.charles7c.cnadmin.monitor.model.resp;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@@ -30,7 +30,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "仪表盘-访问趋势信息")
|
||||
public class DashboardAccessTrendVO implements Serializable {
|
||||
public class DashboardAccessTrendResp implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package top.charles7c.cnadmin.monitor.model.vo;
|
||||
package top.charles7c.cnadmin.monitor.model.resp;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
@@ -32,7 +32,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "仪表盘-访客地域分布信息")
|
||||
public class DashboardGeoDistributionVO implements Serializable {
|
||||
public class DashboardGeoDistributionResp implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package top.charles7c.cnadmin.monitor.model.vo;
|
||||
package top.charles7c.cnadmin.monitor.model.resp;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "仪表盘-热门模块信息")
|
||||
public class DashboardPopularModuleVO implements Serializable {
|
||||
public class DashboardPopularModuleResp implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package top.charles7c.cnadmin.monitor.model.vo;
|
||||
package top.charles7c.cnadmin.monitor.model.resp;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.math.BigDecimal;
|
||||
@@ -33,7 +33,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "仪表盘-总计信息")
|
||||
public class DashboardTotalVO implements Serializable {
|
||||
public class DashboardTotalResp implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package top.charles7c.cnadmin.monitor.model.vo;
|
||||
package top.charles7c.cnadmin.monitor.model.resp;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
@@ -32,7 +32,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
* @since 2023/1/17 21:43
|
||||
*/
|
||||
@Data
|
||||
public class LogVO implements Serializable {
|
||||
public class LogResp implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package top.charles7c.cnadmin.monitor.model.vo;
|
||||
package top.charles7c.cnadmin.monitor.model.resp;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -30,7 +30,7 @@ import top.charles7c.cnadmin.monitor.enums.LogStatusEnum;
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "登录日志信息")
|
||||
public class LoginLogVO extends LogVO {
|
||||
public class LoginLogResp extends LogResp {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package top.charles7c.cnadmin.monitor.model.vo;
|
||||
package top.charles7c.cnadmin.monitor.model.resp;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -30,7 +30,7 @@ import top.charles7c.cnadmin.monitor.enums.LogStatusEnum;
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "操作日志信息")
|
||||
public class OperationLogVO extends LogVO {
|
||||
public class OperationLogResp extends LogResp {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package top.charles7c.cnadmin.monitor.model.vo;
|
||||
package top.charles7c.cnadmin.monitor.model.resp;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -28,7 +28,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "系统日志详情信息")
|
||||
public class SystemLogDetailVO extends LogVO {
|
||||
public class SystemLogDetailResp extends LogResp {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package top.charles7c.cnadmin.monitor.model.vo;
|
||||
package top.charles7c.cnadmin.monitor.model.resp;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@@ -28,7 +28,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
|
||||
*/
|
||||
@Data
|
||||
@Schema(description = "系统日志信息")
|
||||
public class SystemLogVO extends LogVO {
|
||||
public class SystemLogResp extends LogResp {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@@ -18,11 +18,11 @@ package top.charles7c.cnadmin.monitor.service;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import top.charles7c.cnadmin.monitor.model.vo.DashboardAccessTrendVO;
|
||||
import top.charles7c.cnadmin.monitor.model.vo.DashboardGeoDistributionVO;
|
||||
import top.charles7c.cnadmin.monitor.model.vo.DashboardPopularModuleVO;
|
||||
import top.charles7c.cnadmin.monitor.model.vo.DashboardTotalVO;
|
||||
import top.charles7c.cnadmin.system.model.vo.DashboardAnnouncementVO;
|
||||
import top.charles7c.cnadmin.monitor.model.resp.DashboardAccessTrendResp;
|
||||
import top.charles7c.cnadmin.monitor.model.resp.DashboardGeoDistributionResp;
|
||||
import top.charles7c.cnadmin.monitor.model.resp.DashboardPopularModuleResp;
|
||||
import top.charles7c.cnadmin.monitor.model.resp.DashboardTotalResp;
|
||||
import top.charles7c.cnadmin.system.model.resp.DashboardAnnouncementResp;
|
||||
|
||||
/**
|
||||
* 仪表盘业务接口
|
||||
@@ -37,7 +37,7 @@ public interface DashboardService {
|
||||
*
|
||||
* @return 总计信息
|
||||
*/
|
||||
DashboardTotalVO getTotal();
|
||||
DashboardTotalResp getTotal();
|
||||
|
||||
/**
|
||||
* 查询访问趋势信息
|
||||
@@ -46,26 +46,26 @@ public interface DashboardService {
|
||||
* 日期数
|
||||
* @return 访问趋势信息
|
||||
*/
|
||||
List<DashboardAccessTrendVO> listAccessTrend(Integer days);
|
||||
List<DashboardAccessTrendResp> listAccessTrend(Integer days);
|
||||
|
||||
/**
|
||||
* 查询热门模块列表
|
||||
*
|
||||
* @return 热门模块列表
|
||||
*/
|
||||
List<DashboardPopularModuleVO> listPopularModule();
|
||||
List<DashboardPopularModuleResp> listPopularModule();
|
||||
|
||||
/**
|
||||
* 查询访客地域分布信息
|
||||
*
|
||||
* @return 访客地域分布信息
|
||||
*/
|
||||
DashboardGeoDistributionVO getGeoDistribution();
|
||||
DashboardGeoDistributionResp getGeoDistribution();
|
||||
|
||||
/**
|
||||
* 查询公告列表
|
||||
*
|
||||
* @return 公告列表
|
||||
*/
|
||||
List<DashboardAnnouncementVO> listAnnouncement();
|
||||
List<DashboardAnnouncementResp> listAnnouncement();
|
||||
}
|
||||
|
||||
@@ -20,11 +20,11 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import top.charles7c.cnadmin.common.model.query.PageQuery;
|
||||
import top.charles7c.cnadmin.common.model.vo.PageDataVO;
|
||||
import top.charles7c.cnadmin.common.model.resp.PageDataResp;
|
||||
import top.charles7c.cnadmin.monitor.model.query.LoginLogQuery;
|
||||
import top.charles7c.cnadmin.monitor.model.query.OperationLogQuery;
|
||||
import top.charles7c.cnadmin.monitor.model.query.SystemLogQuery;
|
||||
import top.charles7c.cnadmin.monitor.model.vo.*;
|
||||
import top.charles7c.cnadmin.monitor.model.resp.*;
|
||||
|
||||
/**
|
||||
* 系统日志业务接口
|
||||
@@ -43,7 +43,7 @@ public interface LogService {
|
||||
* 分页查询条件
|
||||
* @return 操作日志分页信息
|
||||
*/
|
||||
PageDataVO<OperationLogVO> page(OperationLogQuery query, PageQuery pageQuery);
|
||||
PageDataResp<OperationLogResp> page(OperationLogQuery query, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 分页查询登录日志列表
|
||||
@@ -54,7 +54,7 @@ public interface LogService {
|
||||
* 分页查询条件
|
||||
* @return 登录日志分页信息
|
||||
*/
|
||||
PageDataVO<LoginLogVO> page(LoginLogQuery query, PageQuery pageQuery);
|
||||
PageDataResp<LoginLogResp> page(LoginLogQuery query, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 分页查询系统日志列表
|
||||
@@ -65,7 +65,7 @@ public interface LogService {
|
||||
* 分页查询条件
|
||||
* @return 系统日志分页信息
|
||||
*/
|
||||
PageDataVO<SystemLogVO> page(SystemLogQuery query, PageQuery pageQuery);
|
||||
PageDataResp<SystemLogResp> page(SystemLogQuery query, PageQuery pageQuery);
|
||||
|
||||
/**
|
||||
* 查看系统日志详情
|
||||
@@ -74,28 +74,28 @@ public interface LogService {
|
||||
* 日志 ID
|
||||
* @return 系统日志详情
|
||||
*/
|
||||
SystemLogDetailVO get(Long logId);
|
||||
SystemLogDetailResp get(Long logId);
|
||||
|
||||
/**
|
||||
* 查询仪表盘总计信息
|
||||
*
|
||||
* @return 仪表盘总计信息
|
||||
*/
|
||||
DashboardTotalVO getDashboardTotal();
|
||||
DashboardTotalResp getDashboardTotal();
|
||||
|
||||
/**
|
||||
* 查询仪表盘访问趋势信息
|
||||
*
|
||||
* @return 仪表盘访问趋势信息
|
||||
*/
|
||||
List<DashboardAccessTrendVO> listDashboardAccessTrend(Integer days);
|
||||
List<DashboardAccessTrendResp> listDashboardAccessTrend(Integer days);
|
||||
|
||||
/**
|
||||
* 查询仪表盘热门模块列表
|
||||
*
|
||||
* @return 仪表盘热门模块列表
|
||||
*/
|
||||
List<DashboardPopularModuleVO> listDashboardPopularModule();
|
||||
List<DashboardPopularModuleResp> listDashboardPopularModule();
|
||||
|
||||
/**
|
||||
* 查询仪表盘访客地域分布信息
|
||||
|
||||
@@ -31,13 +31,13 @@ import cn.hutool.core.convert.Convert;
|
||||
import cn.hutool.core.util.NumberUtil;
|
||||
|
||||
import top.charles7c.cnadmin.common.constant.CacheConsts;
|
||||
import top.charles7c.cnadmin.monitor.model.vo.DashboardAccessTrendVO;
|
||||
import top.charles7c.cnadmin.monitor.model.vo.DashboardGeoDistributionVO;
|
||||
import top.charles7c.cnadmin.monitor.model.vo.DashboardPopularModuleVO;
|
||||
import top.charles7c.cnadmin.monitor.model.vo.DashboardTotalVO;
|
||||
import top.charles7c.cnadmin.monitor.model.resp.DashboardAccessTrendResp;
|
||||
import top.charles7c.cnadmin.monitor.model.resp.DashboardGeoDistributionResp;
|
||||
import top.charles7c.cnadmin.monitor.model.resp.DashboardPopularModuleResp;
|
||||
import top.charles7c.cnadmin.monitor.model.resp.DashboardTotalResp;
|
||||
import top.charles7c.cnadmin.monitor.service.DashboardService;
|
||||
import top.charles7c.cnadmin.monitor.service.LogService;
|
||||
import top.charles7c.cnadmin.system.model.vo.DashboardAnnouncementVO;
|
||||
import top.charles7c.cnadmin.system.model.resp.DashboardAnnouncementResp;
|
||||
import top.charles7c.cnadmin.system.service.AnnouncementService;
|
||||
|
||||
/**
|
||||
@@ -55,27 +55,27 @@ public class DashboardServiceImpl implements DashboardService {
|
||||
private final AnnouncementService announcementService;
|
||||
|
||||
@Override
|
||||
public DashboardTotalVO getTotal() {
|
||||
DashboardTotalVO totalVO = logService.getDashboardTotal();
|
||||
Long todayPvCount = totalVO.getTodayPvCount();
|
||||
Long yesterdayPvCount = totalVO.getYesterdayPvCount();
|
||||
public DashboardTotalResp getTotal() {
|
||||
DashboardTotalResp totalResp = logService.getDashboardTotal();
|
||||
Long todayPvCount = totalResp.getTodayPvCount();
|
||||
Long yesterdayPvCount = totalResp.getYesterdayPvCount();
|
||||
BigDecimal newPvCountFromYesterday = NumberUtil.sub(todayPvCount, yesterdayPvCount);
|
||||
BigDecimal newPvFromYesterday = (0 == yesterdayPvCount) ? BigDecimal.valueOf(100)
|
||||
: NumberUtil.round(NumberUtil.mul(NumberUtil.div(newPvCountFromYesterday, yesterdayPvCount), 100), 1);
|
||||
totalVO.setNewPvFromYesterday(newPvFromYesterday);
|
||||
return totalVO;
|
||||
totalResp.setNewPvFromYesterday(newPvFromYesterday);
|
||||
return totalResp;
|
||||
}
|
||||
|
||||
@Override
|
||||
@Cacheable(key = "#days")
|
||||
public List<DashboardAccessTrendVO> listAccessTrend(Integer days) {
|
||||
public List<DashboardAccessTrendResp> listAccessTrend(Integer days) {
|
||||
return logService.listDashboardAccessTrend(days);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DashboardPopularModuleVO> listPopularModule() {
|
||||
List<DashboardPopularModuleVO> popularModuleList = logService.listDashboardPopularModule();
|
||||
for (DashboardPopularModuleVO popularModule : popularModuleList) {
|
||||
public List<DashboardPopularModuleResp> listPopularModule() {
|
||||
List<DashboardPopularModuleResp> popularModuleList = logService.listDashboardPopularModule();
|
||||
for (DashboardPopularModuleResp popularModule : popularModuleList) {
|
||||
Long todayPvCount = popularModule.getTodayPvCount();
|
||||
Long yesterdayPvCount = popularModule.getYesterdayPvCount();
|
||||
BigDecimal newPvCountFromYesterday = NumberUtil.sub(todayPvCount, yesterdayPvCount);
|
||||
@@ -87,9 +87,9 @@ public class DashboardServiceImpl implements DashboardService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public DashboardGeoDistributionVO getGeoDistribution() {
|
||||
public DashboardGeoDistributionResp getGeoDistribution() {
|
||||
List<Map<String, Object>> locationIpStatistics = logService.listDashboardGeoDistribution();
|
||||
DashboardGeoDistributionVO geoDistribution = new DashboardGeoDistributionVO();
|
||||
DashboardGeoDistributionResp geoDistribution = new DashboardGeoDistributionResp();
|
||||
geoDistribution.setLocationIpStatistics(locationIpStatistics);
|
||||
geoDistribution.setLocations(
|
||||
locationIpStatistics.stream().map(m -> Convert.toStr(m.get("name"))).collect(Collectors.toList()));
|
||||
@@ -97,7 +97,7 @@ public class DashboardServiceImpl implements DashboardService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DashboardAnnouncementVO> listAnnouncement() {
|
||||
public List<DashboardAnnouncementResp> listAnnouncement() {
|
||||
return announcementService.listDashboard();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@ import cn.hutool.core.util.StrUtil;
|
||||
|
||||
import top.charles7c.cnadmin.common.constant.SysConsts;
|
||||
import top.charles7c.cnadmin.common.model.query.PageQuery;
|
||||
import top.charles7c.cnadmin.common.model.vo.PageDataVO;
|
||||
import top.charles7c.cnadmin.common.model.resp.PageDataResp;
|
||||
import top.charles7c.cnadmin.common.service.CommonUserService;
|
||||
import top.charles7c.cnadmin.common.util.ExceptionUtils;
|
||||
import top.charles7c.cnadmin.common.util.ReflectUtils;
|
||||
@@ -46,7 +46,7 @@ import top.charles7c.cnadmin.monitor.model.entity.LogDO;
|
||||
import top.charles7c.cnadmin.monitor.model.query.LoginLogQuery;
|
||||
import top.charles7c.cnadmin.monitor.model.query.OperationLogQuery;
|
||||
import top.charles7c.cnadmin.monitor.model.query.SystemLogQuery;
|
||||
import top.charles7c.cnadmin.monitor.model.vo.*;
|
||||
import top.charles7c.cnadmin.monitor.model.resp.*;
|
||||
import top.charles7c.cnadmin.monitor.service.LogService;
|
||||
|
||||
/**
|
||||
@@ -70,93 +70,93 @@ public class LogServiceImpl implements LogService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageDataVO<OperationLogVO> page(OperationLogQuery query, PageQuery pageQuery) {
|
||||
public PageDataResp<OperationLogResp> page(OperationLogQuery query, PageQuery pageQuery) {
|
||||
QueryWrapper<LogDO> queryWrapper = QueryHelper.build(query);
|
||||
|
||||
// 限定查询信息
|
||||
List<String> fieldNameList = ReflectUtils.getNonStaticFieldsName(OperationLogVO.class);
|
||||
List<String> fieldNameList = ReflectUtils.getNonStaticFieldsName(OperationLogResp.class);
|
||||
List<String> columnNameList =
|
||||
fieldNameList.stream().filter(n -> !n.endsWith(SysConsts.VO_DESCRIPTION_FIELD_SUFFIX))
|
||||
fieldNameList.stream().filter(n -> !n.endsWith(SysConsts.DESCRIPTION_FIELD_SUFFIX))
|
||||
.map(StrUtil::toUnderlineCase).collect(Collectors.toList());
|
||||
queryWrapper.select(columnNameList);
|
||||
|
||||
// 分页查询
|
||||
IPage<LogDO> page = logMapper.selectPage(pageQuery.toPage(), queryWrapper);
|
||||
PageDataVO<OperationLogVO> pageDataVO = PageDataVO.build(page, OperationLogVO.class);
|
||||
PageDataResp<OperationLogResp> pageDataResp = PageDataResp.build(page, OperationLogResp.class);
|
||||
|
||||
// 填充数据（如果是查询个人操作日志，只查询一次用户信息即可）
|
||||
if (null != query.getUid()) {
|
||||
String nickname = ExceptionUtils.exToNull(() -> commonUserService.getNicknameById(query.getUid()));
|
||||
pageDataVO.getList().forEach(o -> o.setCreateUserString(nickname));
|
||||
pageDataResp.getList().forEach(o -> o.setCreateUserString(nickname));
|
||||
} else {
|
||||
pageDataVO.getList().forEach(this::fill);
|
||||
pageDataResp.getList().forEach(this::fill);
|
||||
}
|
||||
return pageDataVO;
|
||||
return pageDataResp;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageDataVO<LoginLogVO> page(LoginLogQuery query, PageQuery pageQuery) {
|
||||
public PageDataResp<LoginLogResp> page(LoginLogQuery query, PageQuery pageQuery) {
|
||||
QueryWrapper<LogDO> queryWrapper = QueryHelper.build(query);
|
||||
queryWrapper.eq("module", "登录");
|
||||
|
||||
// 限定查询信息
|
||||
List<String> fieldNameList = ReflectUtils.getNonStaticFieldsName(LoginLogVO.class);
|
||||
List<String> fieldNameList = ReflectUtils.getNonStaticFieldsName(LoginLogResp.class);
|
||||
List<String> columnNameList =
|
||||
fieldNameList.stream().filter(n -> !n.endsWith(SysConsts.VO_DESCRIPTION_FIELD_SUFFIX))
|
||||
fieldNameList.stream().filter(n -> !n.endsWith(SysConsts.DESCRIPTION_FIELD_SUFFIX))
|
||||
.map(StrUtil::toUnderlineCase).collect(Collectors.toList());
|
||||
queryWrapper.select(columnNameList);
|
||||
|
||||
// 分页查询
|
||||
IPage<LogDO> page = logMapper.selectPage(pageQuery.toPage(), queryWrapper);
|
||||
PageDataVO<LoginLogVO> pageDataVO = PageDataVO.build(page, LoginLogVO.class);
|
||||
PageDataResp<LoginLogResp> pageDataResp = PageDataResp.build(page, LoginLogResp.class);
|
||||
|
||||
// 填充数据
|
||||
pageDataVO.getList().forEach(this::fill);
|
||||
return pageDataVO;
|
||||
pageDataResp.getList().forEach(this::fill);
|
||||
return pageDataResp;
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageDataVO<SystemLogVO> page(SystemLogQuery query, PageQuery pageQuery) {
|
||||
public PageDataResp<SystemLogResp> page(SystemLogQuery query, PageQuery pageQuery) {
|
||||
QueryWrapper<LogDO> queryWrapper = QueryHelper.build(query);
|
||||
|
||||
// 限定查询信息
|
||||
List<String> fieldNameList = ReflectUtils.getNonStaticFieldsName(SystemLogVO.class);
|
||||
List<String> fieldNameList = ReflectUtils.getNonStaticFieldsName(SystemLogResp.class);
|
||||
List<String> columnNameList =
|
||||
fieldNameList.stream().filter(n -> !n.endsWith(SysConsts.VO_DESCRIPTION_FIELD_SUFFIX))
|
||||
fieldNameList.stream().filter(n -> !n.endsWith(SysConsts.DESCRIPTION_FIELD_SUFFIX))
|
||||
.map(StrUtil::toUnderlineCase).collect(Collectors.toList());
|
||||
queryWrapper.select(columnNameList);
|
||||
|
||||
// 分页查询
|
||||
IPage<LogDO> page = logMapper.selectPage(pageQuery.toPage(), queryWrapper);
|
||||
PageDataVO<SystemLogVO> pageDataVO = PageDataVO.build(page, SystemLogVO.class);
|
||||
PageDataResp<SystemLogResp> pageDataResp = PageDataResp.build(page, SystemLogResp.class);
|
||||
|
||||
// 填充数据
|
||||
pageDataVO.getList().forEach(this::fill);
|
||||
return pageDataVO;
|
||||
pageDataResp.getList().forEach(this::fill);
|
||||
return pageDataResp;
|
||||
}
|
||||
|
||||
@Override
|
||||
public SystemLogDetailVO get(Long id) {
|
||||
public SystemLogDetailResp get(Long id) {
|
||||
LogDO logDO = logMapper.selectById(id);
|
||||
CheckUtils.throwIfNotExists(logDO, "LogDO", "ID", id);
|
||||
|
||||
SystemLogDetailVO detailVO = BeanUtil.copyProperties(logDO, SystemLogDetailVO.class);
|
||||
SystemLogDetailResp detailVO = BeanUtil.copyProperties(logDO, SystemLogDetailResp.class);
|
||||
this.fill(detailVO);
|
||||
return detailVO;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DashboardTotalVO getDashboardTotal() {
|
||||
public DashboardTotalResp getDashboardTotal() {
|
||||
return logMapper.selectDashboardTotal();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DashboardAccessTrendVO> listDashboardAccessTrend(Integer days) {
|
||||
public List<DashboardAccessTrendResp> listDashboardAccessTrend(Integer days) {
|
||||
return logMapper.selectListDashboardAccessTrend(days);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DashboardPopularModuleVO> listDashboardPopularModule() {
|
||||
public List<DashboardPopularModuleResp> listDashboardPopularModule() {
|
||||
return logMapper.selectListDashboardPopularModule();
|
||||
}
|
||||
|
||||
@@ -168,14 +168,14 @@ public class LogServiceImpl implements LogService {
|
||||
/**
|
||||
* 填充数据
|
||||
*
|
||||
* @param logVO
|
||||
* @param logResp
|
||||
* 日志信息
|
||||
*/
|
||||
private void fill(LogVO logVO) {
|
||||
Long createUser = logVO.getCreateUser();
|
||||
private void fill(LogResp logResp) {
|
||||
Long createUser = logResp.getCreateUser();
|
||||
if (null == createUser) {
|
||||
return;
|
||||
}
|
||||
logVO.setCreateUserString(ExceptionUtils.exToNull(() -> commonUserService.getNicknameById(createUser)));
|
||||
logResp.setCreateUserString(ExceptionUtils.exToNull(() -> commonUserService.getNicknameById(createUser)));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="top.charles7c.cnadmin.monitor.mapper.LogMapper">
|
||||
<select id="selectDashboardTotal" resultType="top.charles7c.cnadmin.monitor.model.vo.DashboardTotalVO">
|
||||
<select id="selectDashboardTotal" resultType="top.charles7c.cnadmin.monitor.model.resp.DashboardTotalResp">
|
||||
SELECT
|
||||
(SELECT COUNT(*) FROM `sys_log`) AS pvCount,
|
||||
(SELECT COUNT(DISTINCT `client_ip`) FROM `sys_log`) AS ipCount,
|
||||
@@ -10,7 +10,7 @@
|
||||
</select>
|
||||
|
||||
<select id="selectListDashboardAccessTrend"
|
||||
resultType="top.charles7c.cnadmin.monitor.model.vo.DashboardAccessTrendVO">
|
||||
resultType="top.charles7c.cnadmin.monitor.model.resp.DashboardAccessTrendResp">
|
||||
SELECT
|
||||
DATE(`create_time`) AS date,
|
||||
COUNT(*) AS pvCount,
|
||||
@@ -23,7 +23,7 @@
|
||||
</select>
|
||||
|
||||
<select id="selectListDashboardPopularModule"
|
||||
resultType="top.charles7c.cnadmin.monitor.model.vo.DashboardPopularModuleVO">
|
||||
resultType="top.charles7c.cnadmin.monitor.model.resp.DashboardPopularModuleResp">
|
||||
SELECT
|
||||
`module`,
|
||||
COUNT(*) AS pvCount,
|
||||
|
||||
Reference in New Issue
Block a user