From 8a0e6011c5d4586380572f5cd35aa3b98fa1d798 Mon Sep 17 00:00:00 2001 From: icanci Date: Sat, 12 Nov 2022 11:06:11 +0800 Subject: [PATCH 1/2] event --- .../icanci/rec/admin/biz/event/RecEvent.java | 16 ++++++ .../rec/admin/biz/event/log/LogEvent.java | 11 ++++ .../admin/biz/event/log/LogEventListener.java | 20 ++++++++ .../admin/biz/service/LogOperateService.java | 8 +++ .../admin/biz/service/MetadataService.java | 25 +++++++++ .../rec/admin/biz/service/SceneService.java | 24 +++++++++ .../admin/biz/service/StrategyService.java | 24 +++++++++ .../service/impl/DataSourceServiceImpl.java | 18 ++++--- .../service/impl/LogOperateServiceImpl.java | 13 +++++ .../biz/service/impl/MetadataServiceImpl.java | 51 +++++++++++++++++++ .../biz/service/impl/SceneServiceImpl.java | 51 +++++++++++++++++++ .../biz/service/impl/StrategyServiceImpl.java | 51 +++++++++++++++++++ 12 files changed, 306 insertions(+), 6 deletions(-) create mode 100644 rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/event/RecEvent.java create mode 100644 rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/event/log/LogEvent.java create mode 100644 rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/event/log/LogEventListener.java create mode 100644 rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/LogOperateService.java create mode 100644 rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/MetadataService.java create mode 100644 rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/SceneService.java create mode 100644 rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/StrategyService.java create mode 100644 rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/LogOperateServiceImpl.java create mode 100644 rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/MetadataServiceImpl.java create mode 100644 rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/SceneServiceImpl.java create mode 100644 rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/StrategyServiceImpl.java diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/event/RecEvent.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/event/RecEvent.java new file mode 100644 index 0000000..d9d71a7 --- /dev/null +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/event/RecEvent.java @@ -0,0 +1,16 @@ +package cn.icanci.rec.admin.biz.event; + +import cn.icanci.rec.spi.event.BaseEvent; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 10:50 + */ +public class RecEvent extends BaseEvent { + + private static final long serialVersionUID = -1279926691854740196L; + + public RecEvent() { + super("RECEvent"); + } +} diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/event/log/LogEvent.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/event/log/LogEvent.java new file mode 100644 index 0000000..a0cb389 --- /dev/null +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/event/log/LogEvent.java @@ -0,0 +1,11 @@ +package cn.icanci.rec.admin.biz.event.log; + +import cn.icanci.rec.admin.biz.event.RecEvent; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 10:42 + */ +public class LogEvent extends RecEvent { + private static final long serialVersionUID = 6383748454354078356L; +} diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/event/log/LogEventListener.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/event/log/LogEventListener.java new file mode 100644 index 0000000..4add8cf --- /dev/null +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/event/log/LogEventListener.java @@ -0,0 +1,20 @@ +package cn.icanci.rec.admin.biz.event.log; + +import cn.icanci.rec.spi.event.BaseEventListener; + +import org.springframework.stereotype.Component; + +/** + * 日志事件监听 + * + * @author icanci + * @since 1.0 Created in 2022/11/12 10:50 + */ +@Component +public class LogEventListener extends BaseEventListener { + + @Override + protected void event(LogEvent event) { + + } +} diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/LogOperateService.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/LogOperateService.java new file mode 100644 index 0000000..e899b3b --- /dev/null +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/LogOperateService.java @@ -0,0 +1,8 @@ +package cn.icanci.rec.admin.biz.service; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 10:41 + */ +public interface LogOperateService { +} diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/MetadataService.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/MetadataService.java new file mode 100644 index 0000000..54c3215 --- /dev/null +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/MetadataService.java @@ -0,0 +1,25 @@ +package cn.icanci.rec.admin.biz.service; + +import cn.icanci.rec.admin.dal.mongodb.common.PageList; +import cn.icanci.rec.common.model.config.MetadataVO; + +import java.util.List; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 10:17 + */ +public interface MetadataService extends BaseService { + @Override + List queryAll(); + + @Override + void save(MetadataVO metadataVO); + + @Override + MetadataVO queryById(String id); + + @Override + PageList queryPage(MetadataVO metadataVO, int pageNum, int pageSize); + +} diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/SceneService.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/SceneService.java new file mode 100644 index 0000000..a864477 --- /dev/null +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/SceneService.java @@ -0,0 +1,24 @@ +package cn.icanci.rec.admin.biz.service; + +import cn.icanci.rec.admin.dal.mongodb.common.PageList; +import cn.icanci.rec.common.model.config.SceneVO; + +import java.util.List; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 10:21 + */ +public interface SceneService extends BaseService { + @Override + List queryAll(); + + @Override + void save(SceneVO sceneVO); + + @Override + SceneVO queryById(String id); + + @Override + PageList queryPage(SceneVO sceneVO, int pageNum, int pageSize); +} diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/StrategyService.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/StrategyService.java new file mode 100644 index 0000000..6f7f24a --- /dev/null +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/StrategyService.java @@ -0,0 +1,24 @@ +package cn.icanci.rec.admin.biz.service; + +import cn.icanci.rec.admin.dal.mongodb.common.PageList; +import cn.icanci.rec.common.model.config.StrategyVO; + +import java.util.List; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 10:37 + */ +public interface StrategyService extends BaseService { + @Override + List queryAll(); + + @Override + void save(StrategyVO strategyVO); + + @Override + StrategyVO queryById(String id); + + @Override + PageList queryPage(StrategyVO strategyVO, int pageNum, int pageSize); +} diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/DataSourceServiceImpl.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/DataSourceServiceImpl.java index 28d8d3c..e67c996 100644 --- a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/DataSourceServiceImpl.java +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/DataSourceServiceImpl.java @@ -4,6 +4,7 @@ import cn.icanci.rec.admin.biz.mapper.DataSourceMapper; import cn.icanci.rec.admin.biz.service.DataSourceService; import cn.icanci.rec.admin.dal.mongodb.common.PageList; import cn.icanci.rec.admin.dal.mongodb.daointerface.DataSourceDAO; +import cn.icanci.rec.admin.dal.mongodb.dateobject.DataSourceDO; import cn.icanci.rec.common.model.config.DataSourceVO; import java.util.List; @@ -25,21 +26,26 @@ public class DataSourceServiceImpl implements DataSourceService { @Override public List queryAll() { - return null; + return dataSourceMapper.dos2vos(dataSourceDAO.queryAll()); } @Override - public void save(DataSourceVO dataSourceVO) { - + public void save(DataSourceVO dataSource) { + if (doInsert(dataSource)) { + dataSourceDAO.insert(dataSourceMapper.vo2do(dataSource)); + } else { + dataSourceDAO.update(dataSourceMapper.vo2do(dataSource)); + } } @Override public DataSourceVO queryById(String id) { - return null; + return dataSourceMapper.do2vo(dataSourceDAO.queryOneById(id)); } @Override - public PageList queryPage(DataSourceVO dataSourceVO, int pageNum, int pageSize) { - return null; + public PageList queryPage(DataSourceVO dataSource, int pageNum, int pageSize) { + PageList pageQuery = dataSourceDAO.pageQuery(dataSourceMapper.vo2do(dataSource), pageNum, pageSize); + return new PageList<>(dataSourceMapper.dos2vos(pageQuery.getData()), pageQuery.getPaginator()); } } diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/LogOperateServiceImpl.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/LogOperateServiceImpl.java new file mode 100644 index 0000000..453afd4 --- /dev/null +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/LogOperateServiceImpl.java @@ -0,0 +1,13 @@ +package cn.icanci.rec.admin.biz.service.impl; + +import cn.icanci.rec.admin.biz.service.LogOperateService; + +import org.springframework.stereotype.Service; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 10:41 + */ +@Service +public class LogOperateServiceImpl implements LogOperateService { +} diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/MetadataServiceImpl.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/MetadataServiceImpl.java new file mode 100644 index 0000000..4de1f7c --- /dev/null +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/MetadataServiceImpl.java @@ -0,0 +1,51 @@ +package cn.icanci.rec.admin.biz.service.impl; + +import cn.icanci.rec.admin.biz.mapper.MetadataMapper; +import cn.icanci.rec.admin.biz.service.MetadataService; +import cn.icanci.rec.admin.dal.mongodb.common.PageList; +import cn.icanci.rec.admin.dal.mongodb.daointerface.MetadataDAO; +import cn.icanci.rec.admin.dal.mongodb.dateobject.MetadataDO; +import cn.icanci.rec.common.model.config.MetadataVO; + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 10:18 + */ +@Service +public class MetadataServiceImpl implements MetadataService { + @Resource + private MetadataDAO metadataDAO; + @Resource + private MetadataMapper metadataMapper; + + @Override + public List queryAll() { + return metadataMapper.dos2vos(metadataDAO.queryAll()); + } + + @Override + public void save(MetadataVO metadata) { + if (doInsert(metadata)) { + metadataDAO.insert(metadataMapper.vo2do(metadata)); + } else { + metadataDAO.update(metadataMapper.vo2do(metadata)); + } + } + + @Override + public MetadataVO queryById(String id) { + return metadataMapper.do2vo(metadataDAO.queryOneById(id)); + } + + @Override + public PageList queryPage(MetadataVO metadata, int pageNum, int pageSize) { + PageList pageQuery = metadataDAO.pageQuery(metadataMapper.vo2do(metadata), pageNum, pageSize); + return new PageList<>(metadataMapper.dos2vos(pageQuery.getData()), pageQuery.getPaginator()); + } +} \ No newline at end of file diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/SceneServiceImpl.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/SceneServiceImpl.java new file mode 100644 index 0000000..2357d44 --- /dev/null +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/SceneServiceImpl.java @@ -0,0 +1,51 @@ +package cn.icanci.rec.admin.biz.service.impl; + +import cn.icanci.rec.admin.biz.mapper.SceneMapper; +import cn.icanci.rec.admin.biz.service.SceneService; +import cn.icanci.rec.admin.dal.mongodb.common.PageList; +import cn.icanci.rec.admin.dal.mongodb.daointerface.SceneDAO; +import cn.icanci.rec.admin.dal.mongodb.dateobject.SceneDO; +import cn.icanci.rec.common.model.config.SceneVO; + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 10:21 + */ +@Service +public class SceneServiceImpl implements SceneService { + @Resource + private SceneDAO sceneDAO; + @Resource + private SceneMapper sceneMapper; + + @Override + public List queryAll() { + return sceneMapper.dos2vos(sceneDAO.queryAll()); + } + + @Override + public void save(SceneVO scene) { + if (doInsert(scene)) { + sceneDAO.insert(sceneMapper.vo2do(scene)); + } else { + sceneDAO.update(sceneMapper.vo2do(scene)); + } + } + + @Override + public SceneVO queryById(String id) { + return sceneMapper.do2vo(sceneDAO.queryOneById(id)); + } + + @Override + public PageList queryPage(SceneVO scene, int pageNum, int pageSize) { + PageList pageQuery = sceneDAO.pageQuery(sceneMapper.vo2do(scene), pageNum, pageSize); + return new PageList<>(sceneMapper.dos2vos(pageQuery.getData()), pageQuery.getPaginator()); + } +} diff --git a/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/StrategyServiceImpl.java b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/StrategyServiceImpl.java new file mode 100644 index 0000000..f9c8fe1 --- /dev/null +++ b/rec-admin/rec-admin-biz/src/main/java/cn/icanci/rec/admin/biz/service/impl/StrategyServiceImpl.java @@ -0,0 +1,51 @@ +package cn.icanci.rec.admin.biz.service.impl; + +import cn.icanci.rec.admin.biz.mapper.StrategyMapper; +import cn.icanci.rec.admin.biz.service.StrategyService; +import cn.icanci.rec.admin.dal.mongodb.common.PageList; +import cn.icanci.rec.admin.dal.mongodb.daointerface.StrategyDAO; +import cn.icanci.rec.admin.dal.mongodb.dateobject.StrategyDO; +import cn.icanci.rec.common.model.config.StrategyVO; + +import java.util.List; + +import javax.annotation.Resource; + +import org.springframework.stereotype.Service; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 10:38 + */ +@Service +public class StrategyServiceImpl implements StrategyService { + @Resource + private StrategyDAO strategyDAO; + @Resource + private StrategyMapper strategyMapper; + + @Override + public List queryAll() { + return strategyMapper.dos2vos(strategyDAO.queryAll()); + } + + @Override + public void save(StrategyVO strategy) { + if (doInsert(strategy)) { + strategyDAO.insert(strategyMapper.vo2do(strategy)); + } else { + strategyDAO.update(strategyMapper.vo2do(strategy)); + } + } + + @Override + public StrategyVO queryById(String id) { + return strategyMapper.do2vo(strategyDAO.queryOneById(id)); + } + + @Override + public PageList queryPage(StrategyVO strategy, int pageNum, int pageSize) { + PageList pageQuery = strategyDAO.pageQuery(strategyMapper.vo2do(strategy), pageNum, pageSize); + return new PageList<>(strategyMapper.dos2vos(pageQuery.getData()), pageQuery.getPaginator()); + } +} -- Gitee From 54fdd81beeb59c05fc96edc7d2e91b081a8a4861 Mon Sep 17 00:00:00 2001 From: icanci Date: Sat, 12 Nov 2022 12:02:03 +0800 Subject: [PATCH 2/2] DomainController --- .../admin/web/config/WebExceptionAdvice.java | 30 ++++++++++++++++ .../web/controller/DomainController.java | 26 -------------- .../auth/UserAccountController.java | 2 +- .../controller/config/DomainController.java | 36 +++++++++++++++++++ .../rec/admin/web/form/BaseDataQueryForm.java | 34 ++++++++++++++++++ .../rec/admin/web/form/DomainQueryForm.java | 34 ++++++++++++++++++ .../rec/admin/web/model/AdminLogin.java | 18 +++++----- .../cn/icanci/rec/admin/web/model/Base.java | 18 +++++----- .../icanci/rec/admin/web/model/BaseData.java | 13 +++---- .../rec/admin/web/model/DataSource.java | 13 +++---- .../cn/icanci/rec/admin/web/model/Domain.java | 5 +-- .../rec/admin/web/model/LogOperate.java | 18 +++++----- .../icanci/rec/admin/web/model/Metadata.java | 1 + .../cn/icanci/rec/admin/web/model/Scene.java | 5 +-- .../icanci/rec/admin/web/model/Strategy.java | 17 ++++----- 15 files changed, 195 insertions(+), 75 deletions(-) create mode 100644 rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/config/WebExceptionAdvice.java delete mode 100644 rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/DomainController.java rename rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/{ => controller}/auth/UserAccountController.java (97%) create mode 100644 rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/config/DomainController.java create mode 100644 rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/form/BaseDataQueryForm.java create mode 100644 rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/form/DomainQueryForm.java diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/config/WebExceptionAdvice.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/config/WebExceptionAdvice.java new file mode 100644 index 0000000..2fc9dd8 --- /dev/null +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/config/WebExceptionAdvice.java @@ -0,0 +1,30 @@ +package cn.icanci.rec.admin.web.config; + +import cn.icanci.rec.common.result.R; + +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseBody; + +/** + * 异常处理器 + * + * @author icanci + * @since 1.0 Created in 2022/11/12 11:19 + */ +@ControllerAdvice +public class WebExceptionAdvice { + + /** + * 非跳转页面无权限异常 + * + * @param e 异常 + * @return 返回异常信息 + */ + @ExceptionHandler(value = Exception.class) + @ResponseBody + public R jsonHandlerException(Exception e) { + return R.builderFail().message(e.getMessage()).build(); + } + +} diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/DomainController.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/DomainController.java deleted file mode 100644 index a2f70f7..0000000 --- a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/DomainController.java +++ /dev/null @@ -1,26 +0,0 @@ -package cn.icanci.rec.admin.web.controller; - -import cn.icanci.rec.admin.biz.service.DomainService; -import cn.icanci.rec.common.result.R; - -import javax.annotation.Resource; - -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @author icanci - * @since 1.0 Created in 2022/10/30 15:10 - */ -@RestController -@RequestMapping("/rec/domain") -public class DomainController { - @Resource - private DomainService domainService; - - @GetMapping("query") - public R query() { - return R.builderOk().data("domains", domainService.queryAll()).build(); - } -} diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/auth/UserAccountController.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/auth/UserAccountController.java similarity index 97% rename from rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/auth/UserAccountController.java rename to rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/auth/UserAccountController.java index b8ea318..475d503 100644 --- a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/auth/UserAccountController.java +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/auth/UserAccountController.java @@ -1,4 +1,4 @@ -package cn.icanci.rec.admin.web.auth; +package cn.icanci.rec.admin.web.controller.auth; import cn.icanci.rec.admin.web.model.AdminLogin; import cn.icanci.rec.common.result.R; diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/config/DomainController.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/config/DomainController.java new file mode 100644 index 0000000..3918658 --- /dev/null +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/controller/config/DomainController.java @@ -0,0 +1,36 @@ +package cn.icanci.rec.admin.web.controller.config; + +import cn.icanci.rec.admin.biz.service.DomainService; +import cn.icanci.rec.admin.web.form.DomainQueryForm; +import cn.icanci.rec.admin.web.mapper.DomainWebMapper; +import cn.icanci.rec.admin.web.model.Domain; +import cn.icanci.rec.common.result.R; + +import javax.annotation.Resource; + +import org.springframework.web.bind.annotation.*; + +/** + * @author icanci + * @since 1.0 Created in 2022/10/30 15:10 + */ +@RestController +@RequestMapping("/rec/domain") +public class DomainController { + @Resource + private DomainService domainService; + @Resource + private DomainWebMapper domainWebMapper; + + @GetMapping("query") + public R query(@RequestBody DomainQueryForm form) { + return R.builderOk() + .data("queryPage", domainService.queryPage(domainWebMapper.web2vo(form.getDomain()), form.getPaginator().getCurrentPage(), form.getPaginator().getPageSize())).build(); + } + + @PostMapping("save") + public R save(@RequestBody Domain domain) { + domainService.save(domainWebMapper.web2vo(domain)); + return R.builderOk().build(); + } +} diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/form/BaseDataQueryForm.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/form/BaseDataQueryForm.java new file mode 100644 index 0000000..c1e03d1 --- /dev/null +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/form/BaseDataQueryForm.java @@ -0,0 +1,34 @@ +package cn.icanci.rec.admin.web.form; + +import cn.icanci.rec.admin.dal.mongodb.common.Paginator; +import cn.icanci.rec.admin.web.model.BaseData; + +import java.io.Serializable; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 11:24 + */ +public class BaseDataQueryForm implements Serializable { + private static final long serialVersionUID = 2911663907403903086L; + + private BaseData baseData; + + private Paginator paginator; + + public BaseData getBaseData() { + return baseData; + } + + public void setBaseData(BaseData baseData) { + this.baseData = baseData; + } + + public Paginator getPaginator() { + return paginator; + } + + public void setPaginator(Paginator paginator) { + this.paginator = paginator; + } +} diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/form/DomainQueryForm.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/form/DomainQueryForm.java new file mode 100644 index 0000000..1921b16 --- /dev/null +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/form/DomainQueryForm.java @@ -0,0 +1,34 @@ +package cn.icanci.rec.admin.web.form; + +import cn.icanci.rec.admin.dal.mongodb.common.Paginator; +import cn.icanci.rec.admin.web.model.Domain; + +import java.io.Serializable; + +/** + * @author icanci + * @since 1.0 Created in 2022/11/12 11:24 + */ +public class DomainQueryForm implements Serializable { + private static final long serialVersionUID = 2911663907403903086L; + + private Domain domain; + + private Paginator paginator; + + public Domain getDomain() { + return domain; + } + + public void setDomain(Domain domain) { + this.domain = domain; + } + + public Paginator getPaginator() { + return paginator; + } + + public void setPaginator(Paginator paginator) { + this.paginator = paginator; + } +} diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/AdminLogin.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/AdminLogin.java index 90b399f..3a674ba 100644 --- a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/AdminLogin.java +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/AdminLogin.java @@ -1,5 +1,6 @@ package cn.icanci.rec.admin.web.model; +import java.io.Serializable; import java.util.Date; /** @@ -8,35 +9,36 @@ import java.util.Date; * @author icanci * @since 1.0 Created in 2022/04/25 16:42 */ -public class AdminLogin { +public class AdminLogin implements Serializable { + private static final long serialVersionUID = -6109731549811158442L; /** * 主键 */ - private Integer id; + private Integer id; /** * 用户名 */ - private String username; + private String username; /** * 密码 */ - private String password; + private String password; /** * 权限 */ - private Integer security; + private Integer security; /** * 创建时间 */ - private Date createTime; + private Date createTime; /** * 角色 */ - private String roles; + private String roles; /** * 头像地址 */ - private String avatar; + private String avatar; public Integer getId() { return id; diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Base.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Base.java index 753f755..1cf46f7 100644 --- a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Base.java +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Base.java @@ -1,5 +1,6 @@ package cn.icanci.rec.admin.web.model; +import java.io.Serializable; import java.util.Date; import java.util.StringJoiner; @@ -11,42 +12,43 @@ import org.springframework.data.annotation.Id; * @author icanci(1205068) * @version Id: BaseDO, v 0.1 2022/10/24 11:26 icanci Exp $ */ -public class Base { +public class Base implements Serializable { + private static final long serialVersionUID = -5165235349615451590L; /** * 文档id */ @Id - private String id; + private String id; /** * 雪花算法随机UUID */ - private String uuid; + private String uuid; /** * 功能描述 */ - private String desc; + private String desc; /** * 创建时间 */ - private Date createTime; + private Date createTime; /** * 更新时间 */ - private Date updateTime; + private Date updateTime; /** * 状态 0有效，1无效 */ - private int isDelete; + private int isDelete; /** * 环境 */ - private String env; + private String env; public String getId() { return id; diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/BaseData.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/BaseData.java index 1bf25b3..de13fb1 100644 --- a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/BaseData.java +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/BaseData.java @@ -9,30 +9,31 @@ import cn.icanci.rec.common.enums.ScriptTypeEnum; * @since 1.0 Created in 2022/11/11 11:41 */ public class BaseData extends Base { + private static final long serialVersionUID = -7329729715667961250L; /** * 域Code */ - private String domainCode; + private String domainCode; /** * 基础数据名称 */ - private String fieldName; + private String fieldName; /** * 数据类型(布尔、字符串、数值、日期、元数据等) * * @see DataTypeEnum#name() */ - private String dataType; + private String dataType; /** * 脚本执行类型 * * @see ScriptTypeEnum#name() */ - private String scriptType; + private String scriptType; /** * 脚本内容 */ - private String scriptContent; + private String scriptContent; /** * TODO 是否有必要 * 脚本执行返回类型(只能是基本数据类型) @@ -40,7 +41,7 @@ public class BaseData extends Base { * @see ResultTypeEnum#name() */ @Deprecated - private String resultType; + private String resultType; public String getDomainCode() { return domainCode; diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/DataSource.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/DataSource.java index e069a10..ca662bd 100644 --- a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/DataSource.java +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/DataSource.java @@ -10,31 +10,32 @@ import cn.icanci.rec.common.enums.ScriptTypeEnum; */ public class DataSource extends Base { + private static final long serialVersionUID = -5499193647522360887L; /** * 数据源名称 */ - private String dataSourceName; + private String dataSourceName; /** * 数据源Code */ - private String dataSourceCode; + private String dataSourceCode; /** * 数据源类型 * @see DataSourceTypeEnum@name() */ - private String dataSourceType; + private String dataSourceType; /** * 数据源为脚本的执行数据集 */ - private ScriptInfo scriptInfo; + private ScriptInfo scriptInfo; /** * 数据源为HTTP的执行数据集 */ - private HttpInfo httpInfo; + private HttpInfo httpInfo; /** * 数据源为SQL的执行数据集 */ - private SqlInfo sqlInfo; + private SqlInfo sqlInfo; /** * 数据源为脚本的执行数据集 diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Domain.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Domain.java index 25f8a24..e7a3f2f 100644 --- a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Domain.java +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Domain.java @@ -5,14 +5,15 @@ package cn.icanci.rec.admin.web.model; * @since 1.0 Created in 2022/10/30 15:14 */ public class Domain extends Base { + private static final long serialVersionUID = 5999335867375055580L; /** * 域名称 */ - private String domainName; + private String domainName; /** * 域Code */ - private String domainCode; + private String domainCode; public String getDomainName() { return domainName; diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/LogOperate.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/LogOperate.java index aa15322..858fa1c 100644 --- a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/LogOperate.java +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/LogOperate.java @@ -2,6 +2,7 @@ package cn.icanci.rec.admin.web.model; import cn.icanci.rec.common.enums.LogOperatorTypeEnum; +import java.io.Serializable; import java.util.Date; import org.springframework.data.annotation.Id; @@ -10,32 +11,33 @@ import org.springframework.data.annotation.Id; * @author icanci * @since 1.0 Created in 2022/11/11 13:39 */ -public class LogOperate { +public class LogOperate implements Serializable { + private static final long serialVersionUID = 2251407161280701653L; /** 编号 */ @Id - private String id; + private String id; /** 操作模块 */ - private String module; + private String module; /** 对象编号 */ - private String targetId; + private String targetId; /** * 操作类型 * * @see LogOperatorTypeEnum#name() */ - private String operatorType; + private String operatorType; /** 操作内容 */ - private String content; + private String content; /** 创建时间 */ - private Date createTime; + private Date createTime; /** 环境 */ - private String env; + private String env; public String getId() { return id; diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Metadata.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Metadata.java index 52fdef5..bbb9955 100644 --- a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Metadata.java +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Metadata.java @@ -7,6 +7,7 @@ import java.util.List; * @since 1.0 Created in 2022/11/11 13:33 */ public class Metadata extends Base { + private static final long serialVersionUID = -8006929115092670576L; /** * 域Code */ diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Scene.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Scene.java index a281c83..d7a7dee 100644 --- a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Scene.java +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Scene.java @@ -7,14 +7,15 @@ import java.util.List; * @since 1.0 Created in 2022/11/11 13:34 */ public class Scene extends Base { + private static final long serialVersionUID = -8373561318951746275L; /** * 域Code */ - private String domainCode; + private String domainCode; /** * 场景对 */ - private List scenePairs; + private List scenePairs; public String getDomainCode() { return domainCode; diff --git a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Strategy.java b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Strategy.java index a443066..e48b697 100644 --- a/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Strategy.java +++ b/rec-admin/rec-admin-web/src/main/java/cn/icanci/rec/admin/web/model/Strategy.java @@ -9,42 +9,43 @@ import java.util.List; * @version Id: StrategyDO, v 0.1 2022/10/29 21:26 icanci Exp $ */ public class Strategy extends Base { + private static final long serialVersionUID = 7517936668226312161L; /** * 域Code */ - private String domainCode; + private String domainCode; /** * 场景Code */ - private String sceneCode; + private String sceneCode; /** * 策略组名称 */ - private String strategyName; + private String strategyName; /** * 数据源类型(脚本、接口、SQL) * * @see DataSourceTypeEnum#name() */ - private String dataSourceType; + private String dataSourceType; /** * 数据源关联Code */ - private String dataSourceCode; + private String dataSourceCode; /** * 规则配置类型(默认为List) * * @see RuleTypeEnum#name() */ - private String ruleType; + private String ruleType; /** * 规则配置类型为List时候的规则数据 */ - private RuleListInfo ruleListInfo; + private RuleListInfo ruleListInfo; /** * 规则配置类型为Tree时候的规则数据 */ - private RuleTreeInfo ruleTreeInfo; + private RuleTreeInfo ruleTreeInfo; public String getDomainCode() { return domainCode; -- Gitee