From cf3044312c8631a8c2b306e466e3d4d663d8eb6d Mon Sep 17 00:00:00 2001 From: Charles7c Date: Fri, 31 Mar 2023 23:08:50 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E9=80=82=E9=85=8D=20Java=2016=20?= =?UTF-8?q?=E6=96=B0=E7=89=B9=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.instanceof 模式匹配（Java 14 预览特性 => Java 16 标准特性） 详情请参阅：https://docs.oracle.com/en/java/javase/16/language/pattern-matching-instanceof-operator.html --- .../top/charles7c/cnadmin/common/base/BaseServiceImpl.java | 6 ++---- .../common/config/mybatis/MyBatisPlusMetaObjectHandler.java | 6 ++---- .../top/charles7c/cnadmin/common/util/ExceptionUtils.java | 3 +-- .../cnadmin/system/service/impl/DeptServiceImpl.java | 3 +-- .../cnadmin/system/service/impl/RoleServiceImpl.java | 3 +-- .../cnadmin/system/service/impl/UserServiceImpl.java | 3 +-- 6 files changed, 8 insertions(+), 16 deletions(-) diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java index 8eca32d4..2dc6c93a 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java @@ -217,8 +217,7 @@ public abstract class BaseServiceImpl, T extends BaseDO, * 待填充列表信息 */ protected void fill(Object baseObj) { - if (baseObj instanceof BaseVO) { - BaseVO baseVO = (BaseVO)baseObj; + if (baseObj instanceof BaseVO baseVO) { Long createUser = baseVO.getCreateUser(); if (createUser == null) { return; @@ -235,8 +234,7 @@ public abstract class BaseServiceImpl, T extends BaseDO, * 待填充详情信息 */ protected void fillDetail(Object detailObj) { - if (detailObj instanceof BaseDetailVO) { - BaseDetailVO detailVO = (BaseDetailVO)detailObj; + if (detailObj instanceof BaseDetailVO detailVO) { this.fill(detailVO); Long updateUser = detailVO.getUpdateUser(); 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 410bb9b8..dda88a7e 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,9 +60,8 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler { Long createUser = LoginHelper.getUserId(); LocalDateTime createTime = LocalDateTime.now(); - if (metaObject.getOriginalObject() instanceof BaseDO) { + if (metaObject.getOriginalObject()instanceof BaseDO baseDO) { // 继承了 BaseDO 的类，填充创建信息 - BaseDO baseDO = (BaseDO)metaObject.getOriginalObject(); baseDO.setCreateUser(ObjectUtil.defaultIfNull(baseDO.getCreateUser(), createUser)); baseDO.setCreateTime(ObjectUtil.defaultIfNull(baseDO.getCreateTime(), createTime)); baseDO.setUpdateUser(ObjectUtil.defaultIfNull(baseDO.getUpdateUser(), createUser)); @@ -94,9 +93,8 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler { Long updateUser = LoginHelper.getUserId(); LocalDateTime updateTime = LocalDateTime.now(); - if (metaObject.getOriginalObject() instanceof BaseDO) { + if (metaObject.getOriginalObject()instanceof BaseDO baseDO) { // 继承了 BaseDO 的类，填充修改信息 - BaseDO baseDO = (BaseDO)metaObject.getOriginalObject(); baseDO.setUpdateUser(updateUser); baseDO.setUpdateTime(updateTime); } else { diff --git a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java index 310c30ee..4c0ed35d 100644 --- a/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java +++ b/continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java @@ -44,9 +44,8 @@ public class ExceptionUtils { * 异常 */ public static void printException(Runnable runnable, Throwable throwable) { - if (throwable == null && runnable instanceof Future) { + if (throwable == null && runnable instanceof Future future) { try { - Future future = (Future)runnable; if (future.isDone()) { future.get(); } 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 faad2c26..198d5276 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 @@ -131,8 +131,7 @@ public class DeptServiceImpl extends BaseServiceImpl list = menuService.list(null, null); diff --git a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java index dcb9504e..ca6c54a3 100644 --- a/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java +++ b/continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java @@ -147,8 +147,7 @@ public class UserServiceImpl extends BaseServiceImpl deptService.get(detailVO.getDeptId()).getName())); List roleIdList = userRoleService.listRoleIdByUserId(detailVO.getId()); detailVO.setRoleIds(roleIdList);