diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java index e7a982a7..72e41708 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java @@ -60,7 +60,7 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler { Long createUser = LoginHelper.getUserId(); LocalDateTime createTime = LocalDateTime.now(); - if (metaObject.getOriginalObject()instanceof BaseDO baseDO) { + if (metaObject.getOriginalObject() instanceof BaseDO baseDO) { // 继承了 BaseDO 的类,填充创建信息 baseDO.setCreateUser(ObjectUtil.defaultIfNull(baseDO.getCreateUser(), createUser)); baseDO.setCreateTime(ObjectUtil.defaultIfNull(baseDO.getCreateTime(), createTime)); @@ -89,7 +89,7 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler { Long updateUser = LoginHelper.getUserId(); LocalDateTime updateTime = LocalDateTime.now(); - if (metaObject.getOriginalObject()instanceof BaseDO baseDO) { + if (metaObject.getOriginalObject() instanceof BaseDO baseDO) { // 继承了 BaseDO 的类,填充修改信息 baseDO.setUpdateUser(updateUser); baseDO.setUpdateTime(updateTime); diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/DashboardServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/DashboardServiceImpl.java index aa7e5f00..b5c83986 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/DashboardServiceImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/DashboardServiceImpl.java @@ -19,7 +19,6 @@ package top.charles7c.cnadmin.monitor.service.impl; import java.math.BigDecimal; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; @@ -91,8 +90,7 @@ public class DashboardServiceImpl implements DashboardService { List> locationIpStatistics = logService.listDashboardGeoDistribution(); DashboardGeoDistributionResp geoDistribution = new DashboardGeoDistributionResp(); geoDistribution.setLocationIpStatistics(locationIpStatistics); - geoDistribution.setLocations( - locationIpStatistics.stream().map(m -> Convert.toStr(m.get("name"))).collect(Collectors.toList())); + geoDistribution.setLocations(locationIpStatistics.stream().map(m -> Convert.toStr(m.get("name"))).toList()); return geoDistribution; } diff --git a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java index b68f6765..d94e9696 100644 --- a/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java +++ b/continew-admin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java @@ -139,10 +139,9 @@ public class LogServiceImpl implements LogService { public SystemLogDetailResp get(Long id) { LogDO logDO = logMapper.selectById(id); CheckUtils.throwIfNotExists(logDO, "LogDO", "ID", id); - - SystemLogDetailResp detailVO = BeanUtil.copyProperties(logDO, SystemLogDetailResp.class); - this.fill(detailVO); - return detailVO; + SystemLogDetailResp detail = BeanUtil.copyProperties(logDO, SystemLogDetailResp.class); + this.fill(detail); + return detail; } @Override diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java index 81834463..8f27ba10 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java @@ -82,7 +82,7 @@ public class DeptServiceImpl extends BaseServiceImpl(0); } - return list.stream().map(r -> new LabelValueResp<>(r.getName(), r.getId())).collect(Collectors.toList()); + return list.stream().map(r -> new LabelValueResp<>(r.getName(), r.getId())).toList(); } @Override