zayac/zayac-admin
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style: 适配 Java 16 新特性

Browse Source 
1.instanceof 模式匹配（Java 14 预览特性 => Java 16 标准特性）
详情请参阅：https://docs.oracle.com/en/java/javase/16/language/pattern-matching-instanceof-operator.html
This commit is contained in:
Charles7c 2023-03-31 23:08:50 +08:00
parent 38f52aaafa
commit cf3044312c
6 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseServiceImpl.java
View File

@ -217,8 +217,7 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseDO,
* 待填充列表信息 * 待填充列表信息
*/ */
protected void fill(Object baseObj) { protected void fill(Object baseObj) {
if (baseObj instanceof BaseVO) { if (baseObj instanceof BaseVO baseVO) {
BaseVO baseVO = (BaseVO)baseObj;
Long createUser = baseVO.getCreateUser(); Long createUser = baseVO.getCreateUser();
if (createUser == null) { if (createUser == null) {
return; return;
@ -235,8 +234,7 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseDO,
* 待填充详情信息 * 待填充详情信息
*/ */
protected void fillDetail(Object detailObj) { protected void fillDetail(Object detailObj) {
if (detailObj instanceof BaseDetailVO) { if (detailObj instanceof BaseDetailVO detailVO) {
BaseDetailVO detailVO = (BaseDetailVO)detailObj;
this.fill(detailVO); this.fill(detailVO);
Long updateUser = detailVO.getUpdateUser(); Long updateUser = detailVO.getUpdateUser();

6
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/config/mybatis/MyBatisPlusMetaObjectHandler.java
View File

@ -60,9 +60,8 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler {
Long createUser = LoginHelper.getUserId(); Long createUser = LoginHelper.getUserId();
LocalDateTime createTime = LocalDateTime.now(); LocalDateTime createTime = LocalDateTime.now();
if (metaObject.getOriginalObject() instanceof BaseDO) { if (metaObject.getOriginalObject()instanceof BaseDO baseDO) {
// 继承了 BaseDO 的类，填充创建信息 // 继承了 BaseDO 的类，填充创建信息
BaseDO baseDO = (BaseDO)metaObject.getOriginalObject();
baseDO.setCreateUser(ObjectUtil.defaultIfNull(baseDO.getCreateUser(), createUser)); baseDO.setCreateUser(ObjectUtil.defaultIfNull(baseDO.getCreateUser(), createUser));
baseDO.setCreateTime(ObjectUtil.defaultIfNull(baseDO.getCreateTime(), createTime)); baseDO.setCreateTime(ObjectUtil.defaultIfNull(baseDO.getCreateTime(), createTime));
baseDO.setUpdateUser(ObjectUtil.defaultIfNull(baseDO.getUpdateUser(), createUser)); baseDO.setUpdateUser(ObjectUtil.defaultIfNull(baseDO.getUpdateUser(), createUser));
@ -94,9 +93,8 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler {
Long updateUser = LoginHelper.getUserId(); Long updateUser = LoginHelper.getUserId();
LocalDateTime updateTime = LocalDateTime.now(); LocalDateTime updateTime = LocalDateTime.now();
if (metaObject.getOriginalObject() instanceof BaseDO) { if (metaObject.getOriginalObject()instanceof BaseDO baseDO) {
// 继承了 BaseDO 的类，填充修改信息 // 继承了 BaseDO 的类，填充修改信息
BaseDO baseDO = (BaseDO)metaObject.getOriginalObject();
baseDO.setUpdateUser(updateUser); baseDO.setUpdateUser(updateUser);
baseDO.setUpdateTime(updateTime); baseDO.setUpdateTime(updateTime);
} else { } else {

3
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/util/ExceptionUtils.java
View File

@ -44,9 +44,8 @@ public class ExceptionUtils {
* 异常 * 异常
*/ */
public static void printException(Runnable runnable, Throwable throwable) { public static void printException(Runnable runnable, Throwable throwable) {
if (throwable == null && runnable instanceof Future<?>) { if (throwable == null && runnable instanceof Future<?> future) {
try { try {
Future<?> future = (Future<?>)runnable;
if (future.isDone()) { if (future.isDone()) {
future.get(); future.get();
} }

3
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/DeptServiceImpl.java
View File

@ -131,8 +131,7 @@ public class DeptServiceImpl extends BaseServiceImpl<DeptMapper, DeptDO, DeptVO,
@Override @Override
public void fillDetail(Object detailObj) { public void fillDetail(Object detailObj) {
super.fillDetail(detailObj); super.fillDetail(detailObj);
if (detailObj instanceof DeptDetailVO) { if (detailObj instanceof DeptDetailVO detailVO) {
DeptDetailVO detailVO = (DeptDetailVO)detailObj;
if (Objects.equals(SysConsts.SUPER_PARENT_ID, detailVO.getParentId())) { if (Objects.equals(SysConsts.SUPER_PARENT_ID, detailVO.getParentId())) {
return; return;
} }

3
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/RoleServiceImpl.java
View File

@ -137,8 +137,7 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleMapper, RoleDO, RoleVO,
@Override @Override
public void fillDetail(Object detailObj) { public void fillDetail(Object detailObj) {
super.fillDetail(detailObj); super.fillDetail(detailObj);
if (detailObj instanceof RoleDetailVO) { if (detailObj instanceof RoleDetailVO detailVO) {
RoleDetailVO detailVO = (RoleDetailVO)detailObj;
Long roleId = detailVO.getId(); Long roleId = detailVO.getId();
if (SysConsts.ADMIN_ROLE_CODE.equals(detailVO.getCode())) { if (SysConsts.ADMIN_ROLE_CODE.equals(detailVO.getCode())) {
List<MenuVO> list = menuService.list(null, null); List<MenuVO> list = menuService.list(null, null);

3
continew-admin-system/src/main/java/top/charles7c/cnadmin/system/service/impl/UserServiceImpl.java
View File

@ -147,8 +147,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserVO,
@Override @Override
public void fillDetail(Object detailObj) { public void fillDetail(Object detailObj) {
super.fillDetail(detailObj); super.fillDetail(detailObj);
if (detailObj instanceof UserDetailVO) { if (detailObj instanceof UserDetailVO detailVO) {
UserDetailVO detailVO = (UserDetailVO)detailObj;
detailVO.setDeptName(ExceptionUtils.exToNull(() -> deptService.get(detailVO.getDeptId()).getName())); detailVO.setDeptName(ExceptionUtils.exToNull(() -> deptService.get(detailVO.getDeptId()).getName()));
List<Long> roleIdList = userRoleService.listRoleIdByUserId(detailVO.getId()); List<Long> roleIdList = userRoleService.listRoleIdByUserId(detailVO.getId());
detailVO.setRoleIds(roleIdList); detailVO.setRoleIds(roleIdList);