From 4ea6d79c5d42d99d543fe12e06b0316252a02d05 Mon Sep 17 00:00:00 2001 From: icanci Date: Sun, 15 Jan 2023 19:45:48 +0800 Subject: [PATCH] mock call --- ...MockMapper.java => AppMockCallMapper.java} | 6 +- ...ckService.java => AppMockCallService.java} | 12 +- ...eImpl.java => AppMockCallServiceImpl.java} | 48 ++++---- .../amc/biz/service/impl/AppServiceImpl.java | 104 ++++++++++++++++++ .../biz/service/impl/GroupServiceImpl.java | 83 ++++++++++++++ .../dal/mongodb/daointerface/AppDAO.java | 4 + .../{AppMockDAO.java => AppMockCallDAO.java} | 12 +- .../dal/mongodb/daointerface/GroupDAO.java | 4 + .../{AppMockDO.java => AppMockCallDO.java} | 2 +- .../admin/dal/mongodb/mongo/MongoAppDAO.java | 24 +++- ...pMockDAO.java => MongoAppMockCallDAO.java} | 48 ++++---- .../dal/mongodb/mongo/MongoGroupDAO.java | 10 ++ ...roller.java => AppMockCallController.java} | 36 +++--- ...eryForm.java => AppMockCallQueryForm.java} | 14 +-- ...bMapper.java => AppMockCallWebMapper.java} | 6 +- .../model/{AppMock.java => AppMockCall.java} | 2 +- .../{AppMockVO.java => AppMockCallVO.java} | 2 +- 17 files changed, 319 insertions(+), 98 deletions(-) rename admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/mapper/{AppMockMapper.java => AppMockCallMapper.java} (69%) rename admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/{AppMockService.java => AppMockCallService.java} (48%) rename admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/{AppMockServiceImpl.java => AppMockCallServiceImpl.java} (61%) create mode 100644 admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/AppServiceImpl.java create mode 100644 admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/GroupServiceImpl.java rename admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/{AppMockDAO.java => AppMockCallDAO.java} (61%) rename admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/dataobject/{AppMockDO.java => AppMockCallDO.java} (96%) rename admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/{MongoAppMockDAO.java => MongoAppMockCallDAO.java} (48%) rename admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/controller/config/{AppMockController.java => AppMockCallController.java} (40%) rename admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/form/{AppMockQueryForm.java => AppMockCallQueryForm.java} (34%) rename admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/mapper/{AppMockWebMapper.java => AppMockCallWebMapper.java} (58%) rename admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/model/{AppMock.java => AppMockCall.java} (96%) rename common/src/main/java/cn/icanci/loopstack/amc/common/model/config/{AppMockVO.java => AppMockCallVO.java} (97%) diff --git a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/mapper/AppMockMapper.java b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/mapper/AppMockCallMapper.java similarity index 69% rename from admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/mapper/AppMockMapper.java rename to admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/mapper/AppMockCallMapper.java index 2ed283a..6dfef66 100644 --- a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/mapper/AppMockMapper.java +++ b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/mapper/AppMockCallMapper.java @@ -1,7 +1,7 @@ package cn.icanci.loopstack.amc.biz.mapper; -import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.AppMockDO; -import cn.icanci.loopstack.amc.common.model.config.AppMockVO; +import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.AppMockCallDO; +import cn.icanci.loopstack.amc.common.model.config.AppMockCallVO; import org.mapstruct.Mapper; import org.mapstruct.NullValueMappingStrategy; @@ -11,5 +11,5 @@ import org.mapstruct.NullValueMappingStrategy; * @since 1.0 Created in 2023/01/15 12:45 */ @Mapper(componentModel = "spring", uses = {}, nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL) -public interface AppMockMapper extends BaseMapper { +public interface AppMockCallMapper extends BaseMapper { } diff --git a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/AppMockService.java b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/AppMockCallService.java similarity index 48% rename from admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/AppMockService.java rename to admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/AppMockCallService.java index 3a1fe67..396bd8b 100644 --- a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/AppMockService.java +++ b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/AppMockCallService.java @@ -3,7 +3,7 @@ package cn.icanci.loopstack.amc.biz.service; import cn.icanci.loopstack.amc.biz.model.AppMockDebugResult; import cn.icanci.loopstack.amc.common.model.PageList; import cn.icanci.loopstack.amc.common.model.TextValue; -import cn.icanci.loopstack.amc.common.model.config.AppMockVO; +import cn.icanci.loopstack.amc.common.model.config.AppMockCallVO; import java.util.List; @@ -11,15 +11,15 @@ import java.util.List; * @author icanci * @since 1.0 Created in 2023/01/15 13:04 */ -public interface AppMockService { +public interface AppMockCallService { - PageList queryPage(AppMockVO web2vo, int currentPage, int pageSize); + PageList queryPage(AppMockCallVO web2vo, int currentPage, int pageSize); - void save(AppMockVO web2vo); + void save(AppMockCallVO web2vo); - AppMockVO queryByAppMockName(String mockName); + AppMockCallVO validateAppMockCallName(String mockName); List loadSelector(); - AppMockDebugResult debug(AppMockVO appMock, String scriptContentTest); + AppMockDebugResult debug(AppMockCallVO appMock, String scriptContentTest); } diff --git a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/AppMockServiceImpl.java b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/AppMockCallServiceImpl.java similarity index 61% rename from admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/AppMockServiceImpl.java rename to admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/AppMockCallServiceImpl.java index f073af0..aef8856 100644 --- a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/AppMockServiceImpl.java +++ b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/AppMockCallServiceImpl.java @@ -1,18 +1,18 @@ package cn.icanci.loopstack.amc.biz.service.impl; import cn.hutool.json.JSONUtil; -import cn.icanci.loopstack.amc.admin.dal.mongodb.daointerface.AppMockDAO; -import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.AppMockDO; +import cn.icanci.loopstack.amc.admin.dal.mongodb.daointerface.AppMockCallDAO; +import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.AppMockCallDO; import cn.icanci.loopstack.amc.biz.event.log.LogEvent; -import cn.icanci.loopstack.amc.biz.mapper.AppMockMapper; +import cn.icanci.loopstack.amc.biz.mapper.AppMockCallMapper; import cn.icanci.loopstack.amc.biz.model.AppMockDebugResult; -import cn.icanci.loopstack.amc.biz.service.AppMockService; +import cn.icanci.loopstack.amc.biz.service.AppMockCallService; import cn.icanci.loopstack.amc.biz.service.BaseService; import cn.icanci.loopstack.amc.common.enums.LogOperatorTypeEnum; import cn.icanci.loopstack.amc.common.enums.ModuleTypeEnum; import cn.icanci.loopstack.amc.common.model.PageList; import cn.icanci.loopstack.amc.common.model.TextValue; -import cn.icanci.loopstack.amc.common.model.config.AppMockVO; +import cn.icanci.loopstack.amc.common.model.config.AppMockCallVO; import cn.icanci.loopstack.script.LsiScriptEngine; import cn.icanci.loopstack.script.context.LsiScriptEngineContext; import cn.icanci.loopstack.script.enums.ScriptTypeEnum; @@ -31,27 +31,27 @@ import com.google.common.collect.Lists; * @since 1.0 Created in 2023/01/15 13:14 */ @Service -public class AppMockServiceImpl extends BaseService implements AppMockService { +public class AppMockCallServiceImpl extends BaseService implements AppMockCallService { @Resource - private AppMockDAO appMockDAO; + private AppMockCallDAO appMockDAO; @Resource - private AppMockMapper appMockMapper; + private AppMockCallMapper appMockMapper; @Resource - private LsiScriptEngine lsiScriptEngine; + private LsiScriptEngine lsiScriptEngine; @Override - public PageList queryPage(AppMockVO web2vo, int currentPage, int pageSize) { - PageList pageQuery = appMockDAO.pageQuery(appMockMapper.vo2do(web2vo), currentPage, pageSize); + public PageList queryPage(AppMockCallVO web2vo, int currentPage, int pageSize) { + PageList pageQuery = appMockDAO.pageQuery(appMockMapper.vo2do(web2vo), currentPage, pageSize); return new PageList<>(appMockMapper.dos2vos(pageQuery.getData()), pageQuery.getPaginator()); } @Override - public void save(AppMockVO appMock) { + public void save(AppMockCallVO appMock) { if (doInsert(appMock)) { - AppMockDO appMockDO = appMockMapper.vo2do(appMock); - appMockDAO.insert(appMockDO); - eventDispatcher.fire(new LogEvent(appMockDO.getUuid(), ModuleTypeEnum.AMC_APP_MOCK, JSONUtil.toJsonStr(appMockDO), LogOperatorTypeEnum.CREATE)); + AppMockCallDO appMockCallDO = appMockMapper.vo2do(appMock); + appMockDAO.insert(appMockCallDO); + eventDispatcher.fire(new LogEvent(appMockCallDO.getUuid(), ModuleTypeEnum.AMC_APP_MOCK, JSONUtil.toJsonStr(appMockCallDO), LogOperatorTypeEnum.CREATE)); } else { appMockDAO.update(appMockMapper.vo2do(appMock)); eventDispatcher.fire(new LogEvent(appMock.getUuid(), ModuleTypeEnum.AMC_APP_MOCK, JSONUtil.toJsonStr(appMock), LogOperatorTypeEnum.UPDATE)); @@ -59,32 +59,32 @@ public class AppMockServiceImpl extends BaseService implements AppMoc } @Override - public AppMockVO queryByAppMockName(String mockName) { + public AppMockCallVO validateAppMockCallName(String mockName) { return appMockMapper.do2vo(appMockDAO.queryByAppMockName(mockName)); } @Override public List loadSelector() { - List appMockList = appMockDAO.queryAll(); + List appMockList = appMockDAO.queryAll(); if (CollectionUtils.isEmpty(appMockList)) { return Lists.newArrayList(); } List textValues = Lists.newArrayList(); - for (AppMockDO appMockDO : appMockList) { + for (AppMockCallDO appMockCallDO : appMockList) { String label; - AppMockVO appMockVO = appMockMapper.do2vo(appMockDO); - if (isDeleted(appMockVO)) { - label = String.format(DELETED_FORMAT, appMockVO.getMockName()); + AppMockCallVO appMockCallVO = appMockMapper.do2vo(appMockCallDO); + if (isDeleted(appMockCallVO)) { + label = String.format(DELETED_FORMAT, appMockCallVO.getMockName()); } else { - label = String.format(NOT_DELETED_FORMAT, appMockVO.getMockName()); + label = String.format(NOT_DELETED_FORMAT, appMockCallVO.getMockName()); } - textValues.add(new TextValue(label, appMockVO.getUuid())); + textValues.add(new TextValue(label, appMockCallVO.getUuid())); } return textValues; } @Override - public AppMockDebugResult debug(AppMockVO appMock, String scriptContentTest) { + public AppMockDebugResult debug(AppMockCallVO appMock, String scriptContentTest) { ScriptTypeEnum scriptType = appMock.getScriptType(); LsiScriptEngineContext context = lsiScriptEngine.eval(scriptType, scriptContentTest); diff --git a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/AppServiceImpl.java b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/AppServiceImpl.java new file mode 100644 index 0000000..8c64247 --- /dev/null +++ b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/AppServiceImpl.java @@ -0,0 +1,104 @@ +package cn.icanci.loopstack.amc.biz.service.impl; + +import cn.hutool.json.JSONUtil; +import cn.icanci.loopstack.amc.admin.dal.mongodb.daointerface.AppDAO; +import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.AppDO; +import cn.icanci.loopstack.amc.biz.event.log.LogEvent; +import cn.icanci.loopstack.amc.biz.mapper.AppMapper; +import cn.icanci.loopstack.amc.biz.service.AppService; +import cn.icanci.loopstack.amc.biz.service.BaseService; +import cn.icanci.loopstack.amc.common.enums.LogOperatorTypeEnum; +import cn.icanci.loopstack.amc.common.enums.ModuleTypeEnum; +import cn.icanci.loopstack.amc.common.model.PageList; +import cn.icanci.loopstack.amc.common.model.TextValue; +import cn.icanci.loopstack.amc.common.model.config.AppVO; + +import java.util.List; + +import javax.annotation.Resource; + +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import com.google.common.collect.Lists; + +/** + * @author icanci + * @since 1.0 Created in 2023/01/15 13:55 + */ +@Service +public class AppServiceImpl extends BaseService implements AppService { + + @Resource + private AppDAO appDAO; + @Resource + private AppMapper appMapper; + + @Override + public PageList queryPage(AppVO web2vo, int currentPage, int pageSize) { + PageList pageQuery = appDAO.pageQuery(appMapper.vo2do(web2vo), currentPage, pageSize); + return new PageList<>(appMapper.dos2vos(pageQuery.getData()), pageQuery.getPaginator()); + } + + @Override + public void save(AppVO app) { + if (doInsert(app)) { + AppDO appDO = appMapper.vo2do(app); + appDAO.insert(appDO); + eventDispatcher.fire(new LogEvent(appDO.getUuid(), ModuleTypeEnum.AMC_APP, JSONUtil.toJsonStr(appDO), LogOperatorTypeEnum.CREATE)); + } else { + appDAO.update(appMapper.vo2do(app)); + eventDispatcher.fire(new LogEvent(app.getUuid(), ModuleTypeEnum.AMC_APP, JSONUtil.toJsonStr(app), LogOperatorTypeEnum.UPDATE)); + } + } + + @Override + public AppVO queryByAppId(String appId) { + return appMapper.do2vo(appDAO.queryByAppId(appId)); + } + + @Override + public AppVO queryByAppName(String appName) { + return appMapper.do2vo(appDAO.queryByAppName(appName)); + } + + @Override + public List loadSelector() { + List appList = appDAO.queryAll(); + if (CollectionUtils.isEmpty(appList)) { + return Lists.newArrayList(); + } + List textValues = Lists.newArrayList(); + for (AppDO appDO : appList) { + String label; + AppVO appVO = appMapper.do2vo(appDO); + if (isDeleted(appVO)) { + label = String.format(DELETED_FORMAT, appVO.getAppName()); + } else { + label = String.format(NOT_DELETED_FORMAT, appVO.getAppName()); + } + textValues.add(new TextValue(label, appVO.getUuid())); + } + return textValues; + } + + @Override + public List loadAppIdSelector() { + List appList = appDAO.queryAll(); + if (CollectionUtils.isEmpty(appList)) { + return Lists.newArrayList(); + } + List textValues = Lists.newArrayList(); + for (AppDO appDO : appList) { + String label; + AppVO appVO = appMapper.do2vo(appDO); + if (isDeleted(appVO)) { + label = String.format(DELETED_FORMAT, appVO.getAppName()); + } else { + label = String.format(NOT_DELETED_FORMAT, appVO.getAppName()); + } + textValues.add(new TextValue(label, appVO.getAppId())); + } + return textValues; + } +} diff --git a/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/GroupServiceImpl.java b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/GroupServiceImpl.java new file mode 100644 index 0000000..08f3e46 --- /dev/null +++ b/admin/admin-biz/src/main/java/cn/icanci/loopstack/amc/biz/service/impl/GroupServiceImpl.java @@ -0,0 +1,83 @@ +package cn.icanci.loopstack.amc.biz.service.impl; + +import cn.hutool.json.JSONUtil; +import cn.icanci.loopstack.amc.admin.dal.mongodb.daointerface.GroupDAO; +import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.GroupDO; +import cn.icanci.loopstack.amc.biz.event.log.LogEvent; +import cn.icanci.loopstack.amc.biz.mapper.GroupMapper; +import cn.icanci.loopstack.amc.biz.service.BaseService; +import cn.icanci.loopstack.amc.biz.service.GroupService; +import cn.icanci.loopstack.amc.common.enums.LogOperatorTypeEnum; +import cn.icanci.loopstack.amc.common.enums.ModuleTypeEnum; +import cn.icanci.loopstack.amc.common.model.PageList; +import cn.icanci.loopstack.amc.common.model.TextValue; +import cn.icanci.loopstack.amc.common.model.config.GroupVO; + +import java.util.List; + +import javax.annotation.Resource; + +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import com.google.common.collect.Lists; + +/** + * @author icanci + * @since 1.0 Created in 2023/01/15 14:00 + */ +@Service +public class GroupServiceImpl extends BaseService implements GroupService { + @Resource + private GroupDAO groupDAO; + @Resource + private GroupMapper groupMapper; + + @Override + public PageList queryPage(GroupVO web2vo, int currentPage, int pageSize) { + PageList pageQuery = groupDAO.pageQuery(groupMapper.vo2do(web2vo), currentPage, pageSize); + return new PageList<>(groupMapper.dos2vos(pageQuery.getData()), pageQuery.getPaginator()); + } + + @Override + public void save(GroupVO groupVO) { + if (doInsert(groupVO)) { + GroupDO groupDO = groupMapper.vo2do(groupVO); + groupDAO.insert(groupDO); + eventDispatcher.fire(new LogEvent(groupDO.getUuid(), ModuleTypeEnum.AMC_GROUP, JSONUtil.toJsonStr(groupDO), LogOperatorTypeEnum.CREATE)); + } else { + groupDAO.update(groupMapper.vo2do(groupVO)); + eventDispatcher.fire(new LogEvent(groupVO.getUuid(), ModuleTypeEnum.AMC_GROUP, JSONUtil.toJsonStr(groupVO), LogOperatorTypeEnum.UPDATE)); + } + } + + @Override + public GroupVO queryByGroupId(String groupId) { + return groupMapper.do2vo(groupDAO.queryByGroupId(groupId)); + } + + @Override + public GroupVO queryByGroupName(String groupName) { + return groupMapper.do2vo(groupDAO.queryByGroupName(groupName)); + } + + @Override + public List loadSelector() { + List groupList = groupDAO.queryAll(); + if (CollectionUtils.isEmpty(groupList)) { + return Lists.newArrayList(); + } + List textValues = Lists.newArrayList(); + for (GroupDO groupDO : groupList) { + String label; + GroupVO groupVO = groupMapper.do2vo(groupDO); + if (isDeleted(groupVO)) { + label = String.format(DELETED_FORMAT, groupVO.getGroupName()); + } else { + label = String.format(NOT_DELETED_FORMAT, groupVO.getGroupName()); + } + textValues.add(new TextValue(label, groupVO.getUuid())); + } + return textValues; + } +} diff --git a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/AppDAO.java b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/AppDAO.java index 77bb570..3d6cce0 100644 --- a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/AppDAO.java +++ b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/AppDAO.java @@ -16,6 +16,10 @@ public interface AppDAO extends BaseDAO { */ Class COLLECTION_CLASS = AppDO.class; + AppDO queryByAppId(String appId); + + AppDO queryByAppName(String appName); + interface AppColumn extends BaseColumn { String appId = "appId"; String appName = "appName"; diff --git a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/AppMockDAO.java b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/AppMockCallDAO.java similarity index 61% rename from admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/AppMockDAO.java rename to admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/AppMockCallDAO.java index d63e9dd..56256ca 100644 --- a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/AppMockDAO.java +++ b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/AppMockCallDAO.java @@ -1,24 +1,24 @@ package cn.icanci.loopstack.amc.admin.dal.mongodb.daointerface; -import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.AppMockDO; +import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.AppMockCallDO; /** * @author icanci * @since 1.0 Created in 2023/01/15 12:23 */ -public interface AppMockDAO extends BaseDAO { +public interface AppMockCallDAO extends BaseDAO { /** * 文档对应的名字 */ - String COLLECTION_NAME = "amc-app-mock"; + String COLLECTION_NAME = "amc-app-mock-call"; /** * 文档对应的Class */ - Class COLLECTION_CLASS = AppMockDO.class; + Class COLLECTION_CLASS = AppMockCallDO.class; - AppMockDO queryByAppMockName(String mockName); + AppMockCallDO queryByAppMockName(String mockName); - interface AppMockColumn extends BaseColumn { + interface AppMockCallColumn extends BaseColumn { String mockName = "mockName"; String appUuid = "appUuid"; String scriptType = "scriptType"; diff --git a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/GroupDAO.java b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/GroupDAO.java index 6d3c9c5..c8e65d3 100644 --- a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/GroupDAO.java +++ b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/daointerface/GroupDAO.java @@ -16,6 +16,10 @@ public interface GroupDAO extends BaseDAO { */ Class COLLECTION_CLASS = GroupDO.class; + GroupDO queryByGroupId(String groupId); + + GroupDO queryByGroupName(String groupName); + interface GroupColumn extends BaseColumn { String groupId = "groupId"; String groupName = "groupName"; diff --git a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/dataobject/AppMockDO.java b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/dataobject/AppMockCallDO.java similarity index 96% rename from admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/dataobject/AppMockDO.java rename to admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/dataobject/AppMockCallDO.java index bd815a9..b55501b 100644 --- a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/dataobject/AppMockDO.java +++ b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/dataobject/AppMockCallDO.java @@ -4,7 +4,7 @@ package cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject; * @author icanci * @since 1.0 Created in 2023/01/07 15:22 */ -public class AppMockDO extends BaseDO { +public class AppMockCallDO extends BaseDO { /** * mock 配置名称 diff --git a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoAppDAO.java b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoAppDAO.java index 1d6d862..1ed9187 100644 --- a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoAppDAO.java +++ b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoAppDAO.java @@ -1,9 +1,5 @@ package cn.icanci.loopstack.amc.admin.dal.mongodb.mongo; -import cn.icanci.loopstack.amc.admin.dal.mongodb.daointerface.AppDAO; -import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.AppDO; -import cn.icanci.loopstack.amc.common.model.PageList; - import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -12,6 +8,10 @@ import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; +import cn.icanci.loopstack.amc.admin.dal.mongodb.daointerface.AppDAO; +import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.AppDO; +import cn.icanci.loopstack.amc.common.model.PageList; + /** * @author icanci * @since 1.0 Created in 2023/01/15 12:24 @@ -64,4 +64,20 @@ public class MongoAppDAO extends AbstractBaseDAO implements AppDAO { Query query = new Query(criteria); return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); } + + @Override + public AppDO queryByAppId(String appId) { + Criteria criteria = Criteria.where(AppColumn.appId).is(appId); + criteria.and(AppColumn.env).is(DEFAULT_ENV); + Query query = new Query(criteria); + return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); + } + + @Override + public AppDO queryByAppName(String appName) { + Criteria criteria = Criteria.where(AppColumn.appName).is(appName); + criteria.and(AppColumn.env).is(DEFAULT_ENV); + Query query = new Query(criteria); + return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); + } } diff --git a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoAppMockDAO.java b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoAppMockCallDAO.java similarity index 48% rename from admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoAppMockDAO.java rename to admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoAppMockCallDAO.java index 1d251b0..8503009 100644 --- a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoAppMockDAO.java +++ b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoAppMockCallDAO.java @@ -1,5 +1,9 @@ package cn.icanci.loopstack.amc.admin.dal.mongodb.mongo; +import cn.icanci.loopstack.amc.admin.dal.mongodb.daointerface.AppMockCallDAO; +import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.AppMockCallDO; +import cn.icanci.loopstack.amc.common.model.PageList; + import java.util.List; import org.apache.commons.lang3.StringUtils; @@ -8,63 +12,59 @@ import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.stereotype.Service; -import cn.icanci.loopstack.amc.admin.dal.mongodb.daointerface.AppMockDAO; -import cn.icanci.loopstack.amc.admin.dal.mongodb.dataobject.AppMockDO; -import cn.icanci.loopstack.amc.common.model.PageList; - /** * @author icanci * @since 1.0 Created in 2023/01/15 12:24 */ @Service("appMockDAO") -public class MongoAppMockDAO extends AbstractBaseDAO implements AppMockDAO { +public class MongoAppMockCallDAO extends AbstractBaseDAO implements AppMockCallDAO { @Override - public void insert(AppMockDO appMockDO) { - super.insert(appMockDO); - mongoTemplate.insert(appMockDO, COLLECTION_NAME); + public void insert(AppMockCallDO appMockCallDO) { + super.insert(appMockCallDO); + mongoTemplate.insert(appMockCallDO, COLLECTION_NAME); } @Override - public void update(AppMockDO appMockDO) { - super.update(appMockDO); - mongoTemplate.save(appMockDO, COLLECTION_NAME); + public void update(AppMockCallDO appMockCallDO) { + super.update(appMockCallDO); + mongoTemplate.save(appMockCallDO, COLLECTION_NAME); } @Override - public List queryAll() { - Criteria criteria = Criteria.where(AppMockColumn.env).is(DEFAULT_ENV); + public List queryAll() { + Criteria criteria = Criteria.where(AppMockCallColumn.env).is(DEFAULT_ENV); Query query = new Query(criteria); return mongoTemplate.find(query, COLLECTION_CLASS, COLLECTION_NAME); } @Override - public PageList pageQuery(AppMockDO appMockDO, int pageNum, int pageSize) { - Criteria criteria = Criteria.where(AppMockColumn.env).is(DEFAULT_ENV); + public PageList pageQuery(AppMockCallDO appMockCallDO, int pageNum, int pageSize) { + Criteria criteria = Criteria.where(AppMockCallColumn.env).is(DEFAULT_ENV); - if (StringUtils.isNotBlank(appMockDO.getMockName())) { + if (StringUtils.isNotBlank(appMockCallDO.getMockName())) { // 不分区大小写查询，其中操作符"i"：表示不分区大小写 - criteria.and(AppMockColumn.mockName).regex("^.*" + appMockDO.getMockName() + ".*$", "i"); + criteria.and(AppMockCallColumn.mockName).regex("^.*" + appMockCallDO.getMockName() + ".*$", "i"); } Query query = new Query(criteria); - query.with(Sort.by(Sort.Direction.DESC, AppMockColumn.createTime)); + query.with(Sort.by(Sort.Direction.DESC, AppMockCallColumn.createTime)); return pageQuery(query, COLLECTION_CLASS, pageSize, pageNum, COLLECTION_NAME); } @Override - public AppMockDO queryOneById(String _id) { - Criteria criteria = Criteria.where(AppMockColumn._id).is(_id); - criteria.and(AppMockColumn.env).is(DEFAULT_ENV); + public AppMockCallDO queryOneById(String _id) { + Criteria criteria = Criteria.where(AppMockCallColumn._id).is(_id); + criteria.and(AppMockCallColumn.env).is(DEFAULT_ENV); Query query = new Query(criteria); return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); } @Override - public AppMockDO queryByAppMockName(String mockName) { - Criteria criteria = Criteria.where(AppMockColumn.mockName).is(mockName); - criteria.and(AppMockColumn.env).is(DEFAULT_ENV); + public AppMockCallDO queryByAppMockName(String mockName) { + Criteria criteria = Criteria.where(AppMockCallColumn.mockName).is(mockName); + criteria.and(AppMockCallColumn.env).is(DEFAULT_ENV); Query query = new Query(criteria); return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); } diff --git a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoGroupDAO.java b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoGroupDAO.java index c4e9462..c330d0b 100644 --- a/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoGroupDAO.java +++ b/admin/admin-dal/src/main/java/cn/icanci/loopstack/amc/admin/dal/mongodb/mongo/MongoGroupDAO.java @@ -64,4 +64,14 @@ public class MongoGroupDAO extends AbstractBaseDAO implements GroupDAO Query query = new Query(criteria); return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); } + + @Override + public GroupDO queryByGroupId(String groupId) { + return null; + } + + @Override + public GroupDO queryByGroupName(String groupName) { + return null; + } } diff --git a/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/controller/config/AppMockController.java b/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/controller/config/AppMockCallController.java similarity index 40% rename from admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/controller/config/AppMockController.java rename to admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/controller/config/AppMockCallController.java index e5615b0..6f920e1 100644 --- a/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/controller/config/AppMockController.java +++ b/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/controller/config/AppMockCallController.java @@ -1,13 +1,13 @@ package cn.icanci.loopstack.amc.web.controller.config; -import cn.icanci.loopstack.amc.biz.service.AppMockService; +import cn.icanci.loopstack.amc.biz.service.AppMockCallService; import cn.icanci.loopstack.amc.common.model.PageList; import cn.icanci.loopstack.amc.common.model.TextValue; -import cn.icanci.loopstack.amc.common.model.config.AppMockVO; +import cn.icanci.loopstack.amc.common.model.config.AppMockCallVO; import cn.icanci.loopstack.amc.common.result.R; -import cn.icanci.loopstack.amc.web.form.AppMockQueryForm; -import cn.icanci.loopstack.amc.web.mapper.AppMockWebMapper; -import cn.icanci.loopstack.amc.web.model.AppMock; +import cn.icanci.loopstack.amc.web.form.AppMockCallQueryForm; +import cn.icanci.loopstack.amc.web.mapper.AppMockCallWebMapper; +import cn.icanci.loopstack.amc.web.model.AppMockCall; import java.util.List; @@ -20,36 +20,36 @@ import org.springframework.web.bind.annotation.*; * @since 1.0 Created in 2023/01/06 21:11 */ @RestController -@RequestMapping("/amc/appMock") -public class AppMockController { +@RequestMapping("/amc/appMockCall") +public class AppMockCallController { @Resource - private AppMockService appMockService; + private AppMockCallService appMockCallService; @Resource - private AppMockWebMapper appMockWebMapper; + private AppMockCallWebMapper appMockCallWebMapper; @PostMapping("query") - public R query(@RequestBody AppMockQueryForm form) { - PageList queryPage = appMockService.queryPage(appMockWebMapper.web2vo(form.getAppMock()), form.getPaginator().getCurrentPage(), + public R query(@RequestBody AppMockCallQueryForm form) { + PageList queryPage = appMockCallService.queryPage(appMockCallWebMapper.web2vo(form.getAppMockCall()), form.getPaginator().getCurrentPage(), form.getPaginator().getPageSize()); - PageList ret = new PageList<>(appMockWebMapper.vos2webs(queryPage.getData()), queryPage.getPaginator()); + PageList ret = new PageList<>(appMockCallWebMapper.vos2webs(queryPage.getData()), queryPage.getPaginator()); return R.builderOk().data("queryPage", ret).build(); } @PostMapping("save") - public R save(@RequestBody AppMock appMock) { - appMockService.save(appMockWebMapper.web2vo(appMock)); + public R save(@RequestBody AppMockCall appMock) { + appMockCallService.save(appMockCallWebMapper.web2vo(appMock)); return R.builderOk().build(); } - @GetMapping("validateAppMockName/{mockName:.*}") - public R validateAppMockName(@PathVariable("mockName") String mockName) { - AppMockVO appMock = appMockService.queryByAppMockName(mockName); + @GetMapping("validateAppMockCallName/{mockName:.*}") + public R validateAppMockCallName(@PathVariable("mockName") String mockName) { + AppMockCallVO appMock = appMockCallService.validateAppMockCallName(mockName); return R.builderOk().data("result", appMock == null).build(); } @GetMapping("loadSelector") public R loadSelector() { - List textValues = appMockService.loadSelector(); + List textValues = appMockCallService.loadSelector(); return R.builderOk().data("textValues", textValues).build(); } } diff --git a/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/form/AppMockQueryForm.java b/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/form/AppMockCallQueryForm.java similarity index 34% rename from admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/form/AppMockQueryForm.java rename to admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/form/AppMockCallQueryForm.java index d3e0d88..a3ec45f 100644 --- a/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/form/AppMockQueryForm.java +++ b/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/form/AppMockCallQueryForm.java @@ -1,22 +1,22 @@ package cn.icanci.loopstack.amc.web.form; -import cn.icanci.loopstack.amc.web.model.AppMock; +import cn.icanci.loopstack.amc.web.model.AppMockCall; /** * @author icanci * @since 1.0 Created in 2023/01/08 10:28 */ -public class AppMockQueryForm extends BaseQueryForm { +public class AppMockCallQueryForm extends BaseQueryForm { /** * App 查询信息 */ - private AppMock appMock; + private AppMockCall appMockCall; - public AppMock getAppMock() { - return appMock; + public AppMockCall getAppMockCall() { + return appMockCall; } - public void setAppMock(AppMock appMock) { - this.appMock = appMock; + public void setAppMockCall(AppMockCall appMockCall) { + this.appMockCall = appMockCall; } } diff --git a/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/mapper/AppMockWebMapper.java b/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/mapper/AppMockCallWebMapper.java similarity index 58% rename from admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/mapper/AppMockWebMapper.java rename to admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/mapper/AppMockCallWebMapper.java index 12ffce0..9138fe7 100644 --- a/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/mapper/AppMockWebMapper.java +++ b/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/mapper/AppMockCallWebMapper.java @@ -1,7 +1,7 @@ package cn.icanci.loopstack.amc.web.mapper; -import cn.icanci.loopstack.amc.common.model.config.AppMockVO; -import cn.icanci.loopstack.amc.web.model.AppMock; +import cn.icanci.loopstack.amc.common.model.config.AppMockCallVO; +import cn.icanci.loopstack.amc.web.model.AppMockCall; import org.mapstruct.Mapper; import org.mapstruct.NullValueMappingStrategy; @@ -11,5 +11,5 @@ import org.mapstruct.NullValueMappingStrategy; * @since 1.0 Created in 2023/01/15 12:55 */ @Mapper(componentModel = "spring", nullValueMappingStrategy = NullValueMappingStrategy.RETURN_NULL) -public interface AppMockWebMapper extends BaseWebMapper { +public interface AppMockCallWebMapper extends BaseWebMapper { } diff --git a/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/model/AppMock.java b/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/model/AppMockCall.java similarity index 96% rename from admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/model/AppMock.java rename to admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/model/AppMockCall.java index f717ef6..14ff04b 100644 --- a/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/model/AppMock.java +++ b/admin/admin-web/src/main/java/cn/icanci/loopstack/amc/web/model/AppMockCall.java @@ -4,7 +4,7 @@ package cn.icanci.loopstack.amc.web.model; * @author icanci * @since 1.0 Created in 2023/01/07 15:22 */ -public class AppMock extends Base { +public class AppMockCall extends Base { /** * mock 配置名称 diff --git a/common/src/main/java/cn/icanci/loopstack/amc/common/model/config/AppMockVO.java b/common/src/main/java/cn/icanci/loopstack/amc/common/model/config/AppMockCallVO.java similarity index 97% rename from common/src/main/java/cn/icanci/loopstack/amc/common/model/config/AppMockVO.java rename to common/src/main/java/cn/icanci/loopstack/amc/common/model/config/AppMockCallVO.java index 763c60f..a6bf03e 100644 --- a/common/src/main/java/cn/icanci/loopstack/amc/common/model/config/AppMockVO.java +++ b/common/src/main/java/cn/icanci/loopstack/amc/common/model/config/AppMockCallVO.java @@ -11,7 +11,7 @@ import java.util.StringJoiner; * @author icanci * @since 1.0 Created in 2023/01/14 20:01 */ -public class AppMockVO extends BaseVO { +public class AppMockCallVO extends BaseVO { /** * mockName */ -- Gitee