style: 优化部分代码格式

continew-org · Nov 5, 2023 · 2f87310 · 2f87310
1 parent 7b741d5
commit 2f87310
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/...c/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java b/...c/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java
@@ -60,7 +60,7 @@ public void insertFill(MetaObject metaObject) {
 
             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 void updateFill(MetaObject metaObject) {
 
             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/...onitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/DashboardServiceImpl.java b/...onitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/DashboardServiceImpl.java
@@ -19,7 +19,6 @@
 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 DashboardGeoDistributionResp getGeoDistribution() {
         List<Map<String, Object>> 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/...dmin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java b/...dmin-monitor/src/main/java/top/charles7c/cnadmin/monitor/service/impl/LogServiceImpl.java
@@ -139,10 +139,9 @@ public PageDataResp<SystemLogResp> page(SystemLogQuery query, PageQuery pageQuer
     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/...admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java b/...admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java
@@ -82,7 +82,7 @@ public void update(DeptReq req, Long id) {
         String oldName = oldDept.getName();
         DisEnableStatusEnum newStatus = req.getStatus();
         Long oldParentId = oldDept.getParentId();
-        if (oldDept.getIsSystem()) {
+        if (Boolean.TRUE.equals(oldDept.getIsSystem())) {
             CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, newStatus, "[{}] 是系统内置部门，不允许禁用", oldName);
             CheckUtils.throwIfNotEqual(req.getParentId(), oldParentId, "[{}] 是系统内置部门，不允许变更上级部门", oldName);
         }

diff --git a/...admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java b/...admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java
@@ -92,7 +92,7 @@ public void update(RoleReq req, Long id) {
         RoleDO oldRole = super.getById(id);
         DataScopeEnum oldDataScope = oldRole.getDataScope();
         String oldCode = oldRole.getCode();
-        if (oldRole.getIsSystem()) {
+        if (Boolean.TRUE.equals(oldRole.getIsSystem())) {
             CheckUtils.throwIfEqual(DisEnableStatusEnum.DISABLE, req.getStatus(), "[{}] 是系统内置角色，不允许禁用",
                 oldRole.getName());
             CheckUtils.throwIfNotEqual(req.getCode(), oldCode, "[{}] 是系统内置角色，不允许修改角色编码", oldRole.getName());
@@ -152,7 +152,7 @@ public List<LabelValueResp<Long>> buildDict(List<RoleResp> list) {
         if (CollUtil.isEmpty(list)) {
             return new ArrayList<>(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