From 28aa1337b485bacdcb5619abcb8b85aa41d34717 Mon Sep 17 00:00:00 2001 From: aoshiguchen <1052045476@qq.com> Date: Sun, 12 Mar 2023 14:20:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=AB=AF=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../proxy/server/service/ClientConnectRecordService.java | 6 +++--- .../neutrino/proxy/server/service/JobInfoService.java | 6 +++--- .../asgc/neutrino/proxy/server/service/JobLogService.java | 6 +++--- .../neutrino/proxy/server/service/LicenseService.java | 8 ++++---- .../neutrino/proxy/server/service/PortMappingService.java | 6 +++--- .../neutrino/proxy/server/service/PortPoolService.java | 8 ++++---- .../proxy/server/service/UserLoginRecordService.java | 6 +++--- .../asgc/neutrino/proxy/server/service/UserService.java | 8 ++++---- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java index 8f88032e..d04eed96 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/ClientConnectRecordService.java @@ -17,7 +17,7 @@ import fun.asgc.neutrino.proxy.server.dal.entity.ClientConnectRecordDO; import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO; import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; import lombok.extern.slf4j.Slf4j; -import ma.glasnost.orika.MapperFactory; +import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; @@ -36,7 +36,7 @@ import java.util.stream.Collectors; @Component public class ClientConnectRecordService { @Inject - private MapperFactory mapperFactory; + private MapperFacade mapperFacade; @Db private ClientConnectRecordMapper clientConnectRecordMapper; @Db @@ -53,7 +53,7 @@ public class ClientConnectRecordService { List list = clientConnectRecordMapper.selectList(new LambdaQueryWrapper() .orderByDesc(ClientConnectRecordDO::getId) ); - List respList = mapperFactory.getMapperFacade().mapAsList(list, ClientConnectRecordListRes.class); + List respList = mapperFacade.mapAsList(list, ClientConnectRecordListRes.class); if (CollectionUtils.isEmpty(list)) { return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize()); } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java index 0e8e9aee..84dcab60 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobInfoService.java @@ -24,7 +24,7 @@ import fun.asgc.solon.extend.job.IJobSource; import fun.asgc.solon.extend.job.JobInfo; import fun.asgc.solon.extend.job.impl.JobExecutor; import lombok.extern.slf4j.Slf4j; -import ma.glasnost.orika.MapperFactory; +import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.Solon; import org.noear.solon.annotation.Component; @@ -42,7 +42,7 @@ import java.util.List; @Component public class JobInfoService implements IJobSource { @Inject - private MapperFactory mapperFactory; + private MapperFacade mapperFacade; @Db private JobInfoMapper jobInfoMapper; @@ -51,7 +51,7 @@ public class JobInfoService implements IJobSource { List list = jobInfoMapper.selectList(new LambdaQueryWrapper() .orderByAsc(JobInfoDO::getId) ); - List respList = mapperFactory.getMapperFacade().mapAsList(list, JobInfoListRes.class); + List respList = mapperFacade.mapAsList(list, JobInfoListRes.class); return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize()); } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java index 794a49aa..de7fe25d 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/JobLogService.java @@ -33,7 +33,7 @@ import fun.asgc.neutrino.proxy.server.dal.entity.JobLogDO; import fun.asgc.solon.extend.job.IJobCallback; import fun.asgc.solon.extend.job.JobInfo; import lombok.extern.slf4j.Slf4j; -import ma.glasnost.orika.MapperFactory; +import ma.glasnost.orika.MapperFacade; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; @@ -51,7 +51,7 @@ import java.util.List; @Component public class JobLogService implements IJobCallback { @Inject - private MapperFactory mapperFactory; + private MapperFacade mapperFacade; @Db private JobLogMapper jobLogMapper; @@ -84,7 +84,7 @@ public class JobLogService implements IJobCallback { .eq(null != req.getJobId(), JobLogDO::getJobId, req.getJobId()) .orderByDesc(JobLogDO::getId) ); - List respList = mapperFactory.getMapperFacade().mapAsList(list, JobLogListRes.class); + List respList = mapperFacade.mapAsList(list, JobLogListRes.class); return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize()); } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java index ca5bdc9d..eaf41bef 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/LicenseService.java @@ -22,7 +22,7 @@ import fun.asgc.neutrino.proxy.server.dal.UserMapper; import fun.asgc.neutrino.proxy.server.dal.entity.LicenseDO; import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; -import ma.glasnost.orika.MapperFactory; +import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; @@ -40,7 +40,7 @@ import java.util.stream.Collectors; @Component public class LicenseService implements Lifecycle { @Inject - private MapperFactory mapperFactory; + private MapperFacade mapperFacade; @Db private LicenseMapper licenseMapper; @Db @@ -53,7 +53,7 @@ public class LicenseService implements Lifecycle { List list = licenseMapper.selectList(new LambdaQueryWrapper() .orderByAsc(LicenseDO::getId) ); - List respList = mapperFactory.getMapperFacade().mapAsList(list, LicenseListRes.class); + List respList = mapperFacade.mapAsList(list, LicenseListRes.class); if (CollectionUtils.isEmpty(list)) { return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize()); } @@ -76,7 +76,7 @@ public class LicenseService implements Lifecycle { List list = licenseMapper.selectList(new LambdaQueryWrapper() .eq(LicenseDO::getEnable, EnableStatusEnum.ENABLE.getStatus()) ); - List licenseList = mapperFactory.getMapperFacade().mapAsList(list, LicenseListRes.class); + List licenseList = mapperFacade.mapAsList(list, LicenseListRes.class); if (!CollectionUtil.isEmpty(licenseList)) { Set userIds = licenseList.stream().map(LicenseListRes::getUserId).collect(Collectors.toSet()); List userList = userMapper.findByIds(userIds); diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java index 41aa525f..12bfb5b9 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortMappingService.java @@ -26,7 +26,7 @@ import fun.asgc.neutrino.proxy.server.dal.entity.PortMappingDO; import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO; import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; -import ma.glasnost.orika.MapperFactory; +import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; @@ -47,7 +47,7 @@ import java.util.stream.Collectors; @Component public class PortMappingService implements Lifecycle { @Inject - private MapperFactory mapperFactory; + private MapperFacade mapperFacade; @Db private PortMappingMapper portMappingMapper; @Db @@ -64,7 +64,7 @@ public class PortMappingService implements Lifecycle { List list = portMappingMapper.selectList(new LambdaQueryWrapper() .orderByAsc(PortMappingDO::getId) ); - List respList = mapperFactory.getMapperFacade().mapAsList(list, PortMappingListRes.class); + List respList = mapperFacade.mapAsList(list, PortMappingListRes.class); if (CollectionUtils.isEmpty(list)) { return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize()); } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java index 549fccc6..29623474 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/PortPoolService.java @@ -37,7 +37,7 @@ import fun.asgc.neutrino.proxy.server.controller.res.PortPoolUpdateEnableStatusR import fun.asgc.neutrino.proxy.server.dal.PortPoolMapper; import fun.asgc.neutrino.proxy.server.dal.entity.PortPoolDO; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; -import ma.glasnost.orika.MapperFactory; +import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; @@ -53,7 +53,7 @@ import java.util.List; @Component public class PortPoolService { @Inject - private MapperFactory mapperFactory; + private MapperFacade mapperFacade; @Db private PortPoolMapper portPoolMapper; @Inject @@ -64,7 +64,7 @@ public class PortPoolService { List list = portPoolMapper.selectList(new LambdaQueryWrapper() .orderByAsc(PortPoolDO::getId) ); - List respList = mapperFactory.getMapperFacade().mapAsList(list, PortPoolListRes.class); + List respList = mapperFacade.mapAsList(list, PortPoolListRes.class); return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize()); } @@ -72,7 +72,7 @@ public class PortPoolService { List list = portPoolMapper.selectList(new LambdaQueryWrapper() .eq(PortPoolDO::getEnable, EnableStatusEnum.ENABLE.getStatus()) ); - return mapperFactory.getMapperFacade().mapAsList(list, PortPoolListRes.class); + return mapperFacade.mapAsList(list, PortPoolListRes.class); } public PortPoolCreateRes create(PortPoolCreateReq req) { diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java index 77804177..bf55ac33 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserLoginRecordService.java @@ -13,7 +13,7 @@ import fun.asgc.neutrino.proxy.server.dal.UserLoginRecordMapper; import fun.asgc.neutrino.proxy.server.dal.UserMapper; import fun.asgc.neutrino.proxy.server.dal.entity.UserDO; import fun.asgc.neutrino.proxy.server.dal.entity.UserLoginRecordDO; -import ma.glasnost.orika.MapperFactory; +import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; @@ -32,7 +32,7 @@ import java.util.stream.Collectors; @Component public class UserLoginRecordService { @Inject - private MapperFactory mapperFactory; + private MapperFacade mapperFacade; @Db private UserLoginRecordMapper userLoginRecordMapper; @Db @@ -43,7 +43,7 @@ public class UserLoginRecordService { List list = userLoginRecordMapper.selectList(new LambdaQueryWrapper() .orderByDesc(UserLoginRecordDO::getCreateTime) ); - List respList = mapperFactory.getMapperFacade().mapAsList(list, UserLoginRecordListRes.class); + List respList = mapperFacade.mapAsList(list, UserLoginRecordListRes.class); if (CollectionUtils.isEmpty(list)) { return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize()); } diff --git a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java index 1cd60d9e..a293963f 100644 --- a/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java +++ b/neutrino-proxy-server/src/main/java/fun/asgc/neutrino/proxy/server/service/UserService.java @@ -21,7 +21,7 @@ import fun.asgc.neutrino.proxy.server.dal.entity.UserLoginRecordDO; import fun.asgc.neutrino.proxy.server.dal.entity.UserTokenDO; import fun.asgc.neutrino.proxy.server.util.Md5Util; import fun.asgc.neutrino.proxy.server.util.ParamCheckUtil; -import ma.glasnost.orika.MapperFactory; +import ma.glasnost.orika.MapperFacade; import org.apache.ibatis.solon.annotation.Db; import org.noear.solon.annotation.Component; import org.noear.solon.annotation.Inject; @@ -40,7 +40,7 @@ import java.util.UUID; public class UserService { private static final String DEFAULT_PASSWORD = "123456"; @Inject - private MapperFactory mapperFactory; + private MapperFacade mapperFacade; @Db private UserMapper userMapper; @Db @@ -124,7 +124,7 @@ public class UserService { List list = userMapper.selectList(new LambdaQueryWrapper() .orderByAsc(UserDO::getId) ); - List respList = mapperFactory.getMapperFacade().mapAsList(list, UserListRes.class); + List respList = mapperFacade.mapAsList(list, UserListRes.class); return PageInfo.of(respList, result.getTotal(), pageQuery.getCurrent(), pageQuery.getSize()); } @@ -133,7 +133,7 @@ public class UserService { .eq(UserDO::getEnable, EnableStatusEnum.ENABLE.getStatus()) .orderByAsc(UserDO::getId) ); - return mapperFactory.getMapperFacade().mapAsList(userDOList, UserListRes.class); + return mapperFacade.mapAsList(userDOList, UserListRes.class); } public UserInfoRes info(UserInfoReq req) {