From 049eb20574eb3a70b563e71233633f6a4acf09af Mon Sep 17 00:00:00 2001 From: icanci Date: Sat, 29 Oct 2022 21:17:07 +0800 Subject: [PATCH 1/2] readme --- .gitignore | 1 - README.md | 13 ++- pom.xml | 1 + .../dal/mongo/mapper/AbstractBaseDAO.java | 9 +- .../rec/admin/dal/mongo/model/BaseDO.java | 79 +++++++++---- .../main/resources/mybatis/mapper/.gitkeep | 0 rec-common/pom.xml | 19 +++ .../java/cn/icanci/rec/common/BaseVO.java | 109 ++++++++++++++++++ .../java/cn/icanci/rec/common/Symbol.java | 9 ++ 9 files changed, 205 insertions(+), 35 deletions(-) create mode 100644 rec-admin/rec-admin-dal/src/main/resources/mybatis/mapper/.gitkeep create mode 100644 rec-common/pom.xml create mode 100644 rec-common/src/main/java/cn/icanci/rec/common/BaseVO.java create mode 100644 rec-common/src/main/java/cn/icanci/rec/common/Symbol.java diff --git a/.gitignore b/.gitignore index 0d6ad58..6f5ed2d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,6 @@ logs # Mobile Tools for Java (J2ME) .mtj.tmp/ -log/ .idea/ *target/ diff --git a/README.md b/README.md index e3865e1..99cf451 100644 --- a/README.md +++ b/README.md @@ -150,16 +150,17 @@ REC（Rule Engine Component）规则引擎组件：提供统一的规则处理 | desc | String | 功能描述 | | createTime | Date | 创建时间 | | updateTime | Date | 更新时间 | +| isDelete | int | 状态 1有效，0无效 | | env | String | 环境 | -- 域数据存储设计(文档名称：**rec-domian**) +- 域数据存储设计(文档名称：rec-domain) | **字段名称** | **类型** | **备注** | | --- | --- | --- | | domainName | String | 域名称 | | domainCode | String | 域Code | -- 域场景 +- 域场景(文档名称：rec-scene) | **字段名称** | **类型** | **备注** | | --- | --- | --- | @@ -167,7 +168,7 @@ REC（Rule Engine Component）规则引擎组件：提供统一的规则处理 | sceneName | String | 场景名称 | | sceneCode | String | 场景Code | -- 元数据 +- 元数据(文档名称：rec-metadata) | **字段名称** | **类型** | **备注** | | --- | --- | --- | @@ -175,7 +176,7 @@ REC（Rule Engine Component）规则引擎组件：提供统一的规则处理 | metadataName | String | 元数据名称 | | metadataList | String(JSON格式) | 元数据枚举值 | -- 基础数据 +- 基础数据(文档名称：rec-basedata) | **字段名称** | **类型** | **备注** | | --- | --- | --- | @@ -186,7 +187,7 @@ REC（Rule Engine Component）规则引擎组件：提供统一的规则处理 | scriptContent | String | 脚本内容 | | resultType | String | 脚本执行返回类型(只能是基本数据类型) | -- 数据源 +- 数据源(文档名称：rec-dataSource) | **字段名称** | **类型** | **备注** | | --- | --- | --- | @@ -197,7 +198,7 @@ REC（Rule Engine Component）规则引擎组件：提供统一的规则处理 | httpInfo | Object | 数据源为HTTP的执行数据集 | | sqlInfo | Object | 数据源为SQL的执行数据集 | -- 策略组 +- 策略组(文档名称：rec-strategy) | **字段名称** | **类型** | **备注** | | --- | --- | --- | diff --git a/pom.xml b/pom.xml index 0324a82..29e5cac 100644 --- a/pom.xml +++ b/pom.xml @@ -14,6 +14,7 @@ rec-engine rec-spring-boot-starter rec-socket + rec-common diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/AbstractBaseDAO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/AbstractBaseDAO.java index 2621f7c..1ccac57 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/AbstractBaseDAO.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/AbstractBaseDAO.java @@ -10,17 +10,20 @@ import java.util.Date; */ public abstract class AbstractBaseDAO extends MongoPageHelper implements BaseDAO { + protected String DEFAULT_ENV = "test"; + @Override public void insert(T t) { // 处理插入数据 t.setId(null); t.setIsDelete(0); - t.setGmtCreate(new Date()); - t.setGmtModified(new Date()); + t.setCreateTime(new Date()); + t.setCreateTime(new Date()); + t.setEnv(DEFAULT_ENV); } @Override public void update(T t) { - t.setGmtModified(new Date()); + t.setUpdateTime(new Date()); } } diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/model/BaseDO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/model/BaseDO.java index 9a3d980..eb9568e 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/model/BaseDO.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/model/BaseDO.java @@ -5,9 +5,9 @@ import java.util.StringJoiner; import org.springframework.data.annotation.Id; -import com.fasterxml.jackson.annotation.JsonFormat; - /** + * 基础存储模型 BaseDO + * * @author icanci(1205068) * @version Id: BaseDO, v 0.1 2022/10/24 11:26 icanci Exp $ */ @@ -16,25 +16,37 @@ public class BaseDO { * 文档id */ @Id - private String id; + private String id; + + /** + * 雪花算法随机UUID + */ + private String uuid; + /** - * 状态,1:有效，0:无效 + * 功能描述 */ - private Integer isDelete; + private String desc; + /** * 创建时间 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - private Date gmtCreate; + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + /** - * 修改时间 + * 状态 0有效，1无效 */ - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - private Date gmtModified; + private int isDelete; + /** - * 操作环境 + * 环境 */ - protected String env; + private String env; public String getId() { return id; @@ -44,28 +56,44 @@ public class BaseDO { this.id = id; } - public Integer getIsDelete() { - return isDelete; + public String getUuid() { + return uuid; } - public void setIsDelete(Integer isDelete) { - this.isDelete = isDelete; + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getDesc() { + return desc; } - public Date getGmtCreate() { - return gmtCreate; + public void setDesc(String desc) { + this.desc = desc; } - public void setGmtCreate(Date gmtCreate) { - this.gmtCreate = gmtCreate; + public Date getCreateTime() { + return createTime; } - public Date getGmtModified() { - return gmtModified; + public void setCreateTime(Date createTime) { + this.createTime = createTime; } - public void setGmtModified(Date gmtModified) { - this.gmtModified = gmtModified; + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public int getIsDelete() { + return isDelete; + } + + public void setIsDelete(int isDelete) { + this.isDelete = isDelete; } public String getEnv() { @@ -78,6 +106,7 @@ public class BaseDO { @Override public String toString() { - return new StringJoiner(",").add("id=" + id).add("isDelete=" + isDelete).add("gmtCreate=" + gmtCreate).add("gmtModified=" + gmtModified).add("env=" + env).toString(); + return new StringJoiner(",").add("id=" + id).add("uuid=" + uuid).add("desc=" + desc).add("createTime=" + createTime).add("updateTime=" + updateTime) + .add("isDelete=" + isDelete).add("env=" + env).toString(); } } \ No newline at end of file diff --git a/rec-admin/rec-admin-dal/src/main/resources/mybatis/mapper/.gitkeep b/rec-admin/rec-admin-dal/src/main/resources/mybatis/mapper/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/rec-common/pom.xml b/rec-common/pom.xml new file mode 100644 index 0000000..fb3e314 --- /dev/null +++ b/rec-common/pom.xml @@ -0,0 +1,19 @@ + + + + rec-parent + cn.icanci.rec + ${revision} + + 4.0.0 + + rec-common + + + 8 + 8 + + + \ No newline at end of file diff --git a/rec-common/src/main/java/cn/icanci/rec/common/BaseVO.java b/rec-common/src/main/java/cn/icanci/rec/common/BaseVO.java new file mode 100644 index 0000000..ca239bf --- /dev/null +++ b/rec-common/src/main/java/cn/icanci/rec/common/BaseVO.java @@ -0,0 +1,109 @@ +package cn.icanci.rec.common; + +import java.util.Date; +import java.util.StringJoiner; + +/** + * 基础模型构建 + * + * @author icanci(1205068) + * @version Id: BaseVO, v 0.1 2022/10/29 21:12 icanci Exp $ + */ +public class BaseVO { + /** + * 文档id + */ + private String id; + + /** + * 雪花算法随机UUID + */ + private String uuid; + + /** + * 功能描述 + */ + private String desc; + + /** + * 创建时间 + */ + private Date createTime; + + /** + * 更新时间 + */ + private Date updateTime; + + /** + * 状态 0有效，1无效 + */ + private int isDelete; + + /** + * 环境 + */ + private String env; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getDesc() { + return desc; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public int getIsDelete() { + return isDelete; + } + + public void setIsDelete(int isDelete) { + this.isDelete = isDelete; + } + + public String getEnv() { + return env; + } + + public void setEnv(String env) { + this.env = env; + } + + @Override + public String toString() { + return new StringJoiner(",").add("id=" + id).add("uuid=" + uuid).add("desc=" + desc).add("createTime=" + createTime).add("updateTime=" + updateTime) + .add("isDelete=" + isDelete).add("env=" + env).toString(); + } +} \ No newline at end of file diff --git a/rec-common/src/main/java/cn/icanci/rec/common/Symbol.java b/rec-common/src/main/java/cn/icanci/rec/common/Symbol.java new file mode 100644 index 0000000..6e5b291 --- /dev/null +++ b/rec-common/src/main/java/cn/icanci/rec/common/Symbol.java @@ -0,0 +1,9 @@ +package cn.icanci.rec.common; + +/** + * @author icanci(1205068) + * @version Id: Symbol, v 0.1 2022/10/29 21:12 icanci Exp $ + */ +public class Symbol { + public static final String AMPERSAND = "&"; +} \ No newline at end of file -- Gitee From 7140d1d23fd2d123c1dc2108b9f1b04c946a0bd1 Mon Sep 17 00:00:00 2001 From: icanci Date: Sun, 30 Oct 2022 05:47:23 +0800 Subject: [PATCH 2/2] MongoStrategyDAO --- rec-admin/pom.xml | 11 ++- rec-admin/rec-admin-dal/pom.xml | 29 +++--- .../admin/dal/mongo/mapper/StrategyDAO.java | 8 -- .../mongo/mapper/impl/MongoStrategyDAO.java | 29 ------ .../admin/dal/mongodb/MongoConnection.java | 99 +++++++++++++++++++ .../model => mongodb/common}/PageList.java | 2 +- .../model => mongodb/common}/Paginator.java | 2 +- .../daointerface}/BaseDAO.java | 36 +++---- .../dal/mongodb/daointerface/StrategyDAO.java | 24 +++++ .../model => mongodb/dateobject}/BaseDO.java | 2 +- .../dal/mongodb/dateobject/StrategyDO.java | 8 ++ .../mongo}/AbstractBaseDAO.java | 5 +- .../mongo}/MongoPageHelper.java | 6 +- .../dal/mongodb/mongo/MongoStrategyDAO.java | 50 ++++++++++ .../src/main/resources/application.yml | 22 ++--- .../java/cn/icanci/rec/common/Symbol.java | 4 + 16 files changed, 245 insertions(+), 92 deletions(-) delete mode 100644 rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/StrategyDAO.java delete mode 100644 rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/impl/MongoStrategyDAO.java create mode 100644 rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/MongoConnection.java rename rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/{mongo/model => mongodb/common}/PageList.java (96%) rename rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/{mongo/model => mongodb/common}/Paginator.java (98%) rename rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/{mongo/mapper => mongodb/daointerface}/BaseDAO.java (62%) create mode 100644 rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/StrategyDAO.java rename rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/{mongo/model => mongodb/dateobject}/BaseDO.java (97%) create mode 100644 rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/dateobject/StrategyDO.java rename rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/{mongo/mapper => mongodb/mongo}/AbstractBaseDAO.java (77%) rename rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/{mongo/mapper => mongodb/mongo}/MongoPageHelper.java (96%) create mode 100644 rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoStrategyDAO.java diff --git a/rec-admin/pom.xml b/rec-admin/pom.xml index ce5c831..3df8853 100644 --- a/rec-admin/pom.xml +++ b/rec-admin/pom.xml @@ -26,10 +26,15 @@ + + + + + - org.mybatis.spring.boot - mybatis-spring-boot-starter - ${spring.boot.mybatis.version.version} + cn.icanci.rec + rec-common + ${revision} diff --git a/rec-admin/rec-admin-dal/pom.xml b/rec-admin/rec-admin-dal/pom.xml index 6397727..cc67400 100644 --- a/rec-admin/rec-admin-dal/pom.xml +++ b/rec-admin/rec-admin-dal/pom.xml @@ -17,18 +17,18 @@ - - org.mybatis.spring.boot - mybatis-spring-boot-starter - - - org.springframework.boot - spring-boot-starter-jdbc - - - mysql - mysql-connector-java - + + + + + + + + + + + + org.springframework spring-context @@ -49,5 +49,10 @@ com.google.guava guava + + cn.icanci.rec + rec-common + + \ No newline at end of file diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/StrategyDAO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/StrategyDAO.java deleted file mode 100644 index 2038185..0000000 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/StrategyDAO.java +++ /dev/null @@ -1,8 +0,0 @@ -package cn.icanci.rec.admin.dal.mongo.mapper; - -/** - * @author icanci(1205068) - * @version Id: StrategyDAO, v 0.1 2022/10/26 21:15 icanci Exp $ - */ -public interface StrategyDAO { -} \ No newline at end of file diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/impl/MongoStrategyDAO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/impl/MongoStrategyDAO.java deleted file mode 100644 index 21980d1..0000000 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/impl/MongoStrategyDAO.java +++ /dev/null @@ -1,29 +0,0 @@ -package cn.icanci.rec.admin.dal.mongo.mapper.impl; - -import cn.icanci.rec.admin.dal.mongo.mapper.AbstractBaseDAO; -import cn.icanci.rec.admin.dal.mongo.mapper.StrategyDAO; -import cn.icanci.rec.admin.dal.mongo.model.BaseDO; -import cn.icanci.rec.admin.dal.mongo.model.PageList; - -import java.util.List; - -/** - * @author icanci(1205068) - * @version Id: MongoStrategyDAO, v 0.1 2022/10/26 21:15 icanci Exp $ - */ -public class MongoStrategyDAO extends AbstractBaseDAO implements StrategyDAO { - @Override - public List queryAll() { - return null; - } - - @Override - public PageList pageQuery(BaseDO baseDO, int pageNum, int pageSize) { - return null; - } - - @Override - public BaseDO queryOneById(String _id) { - return null; - } -} \ No newline at end of file diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/MongoConnection.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/MongoConnection.java new file mode 100644 index 0000000..7cdca97 --- /dev/null +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/MongoConnection.java @@ -0,0 +1,99 @@ +package cn.icanci.rec.admin.dal.mongodb; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; + +import com.mongodb.*; + +/** + * @author icanci(1205068) + * @version Id: MongoConnection, v 0.1 2022/10/29 21:19 icanci Exp $ + */ +public class MongoConnection extends MongoClient { + /** + * 创建单片无账号密码客户端 + * + * @param host 服务器host + * @param port 端口 + */ + public MongoConnection(String host, int port) { + super(host, port); + } + + /** + * 创建单片带账号密码客户端 + * + * @param userName 连接账号 + * @param password 连接密码 + * @param host host + * @param port 端口 + * @param databaseName 库名 + */ + public MongoConnection(String userName, String password, String host, int port, String databaseName) { + super(new ServerAddress(host, port), Collections.singletonList(MongoCredential.createCredential(userName, databaseName, password.toCharArray())), + MongoClientOptions.builder().readPreference(ReadPreference.primaryPreferred()).build()); + } + + /** + * 创建服务集带账号密码客户端 + * + * @param userName 连接账号 + * @param password 连接密码 + * @param addresses 服务集 + * @param databaseName 库名 + */ + public MongoConnection(String userName, String password, List addresses, String databaseName) { + super(addresses, Collections.singletonList(MongoCredential.createCredential(userName, databaseName, password.toCharArray())), + MongoClientOptions.builder().readPreference(ReadPreference.primaryPreferred()).build()); + } + + /** + * 创建服务集带账号密码客户端 + * @param userName 连接账号 + * @param password 连接密码 + * @param addressesStr 服务集地址 字符串 127.0.0.1:27017;127.0.0.1:27018; + * @param databaseName 库名 + */ + public MongoConnection(String userName, String password, String addressesStr, String databaseName, String readType) { + super(createServerAddress(addressesStr), Collections.singletonList(MongoCredential.createCredential(userName, databaseName, password.toCharArray())), + MongoClientOptions.builder().readPreference(readPreference(readType)).build()); + } + + /** + * readPreference + * + * @param readType readType + * @return ReadPreference + */ + private static ReadPreference readPreference(String readType) { + if (StringUtils.isBlank(readType)) { + return ReadPreference.secondaryPreferred(); + } + switch (readType) { + case "PRIMARY": + return ReadPreference.primaryPreferred(); + default: + return ReadPreference.secondaryPreferred(); + } + } + + /** + * 拆开服务地址 + * + * @param addressStr 127.0.0.1:27017; + * @return 服务地址 + */ + public static List createServerAddress(String addressStr) { + List serverAddressesList = new ArrayList<>(); + String[] addressArray = addressStr.split(";"); + for (String address : addressArray) { + String[] hostAndPort = address.split(":"); + serverAddressesList.add(new ServerAddress(hostAndPort[0], new Integer(hostAndPort[1]))); + } + + return serverAddressesList; + } +} \ No newline at end of file diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/model/PageList.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/common/PageList.java similarity index 96% rename from rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/model/PageList.java rename to rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/common/PageList.java index 45b55f1..8de924d 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/model/PageList.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/common/PageList.java @@ -1,4 +1,4 @@ -package cn.icanci.rec.admin.dal.mongo.model; +package cn.icanci.rec.admin.dal.mongodb.common; import java.io.Serializable; import java.util.Collection; diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/model/Paginator.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/common/Paginator.java similarity index 98% rename from rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/model/Paginator.java rename to rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/common/Paginator.java index 2f18639..4b2f3e7 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/model/Paginator.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/common/Paginator.java @@ -1,4 +1,4 @@ -package cn.icanci.rec.admin.dal.mongo.model; +package cn.icanci.rec.admin.dal.mongodb.common; import java.io.Serializable; diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/BaseDAO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/BaseDAO.java similarity index 62% rename from rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/BaseDAO.java rename to rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/BaseDAO.java index 031ec2d..7f29bde 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/BaseDAO.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/BaseDAO.java @@ -1,7 +1,7 @@ -package cn.icanci.rec.admin.dal.mongo.mapper; +package cn.icanci.rec.admin.dal.mongodb.daointerface; -import cn.icanci.rec.admin.dal.mongo.model.BaseDO; -import cn.icanci.rec.admin.dal.mongo.model.PageList; +import cn.icanci.rec.admin.dal.mongodb.common.PageList; +import cn.icanci.rec.admin.dal.mongodb.dateobject.BaseDO; import java.util.List; @@ -54,24 +54,18 @@ public interface BaseDAO { /** 基本表 */ interface BaseColumn { /** 文档id */ - String _id = "_id"; - - /** 状态,1:有效，0:无效 */ - String isDelete = "isDelete"; - - /** 创建人 */ - String creator = "creator"; - - /** 修改人 */ - String operator = "operator"; - - /** 创建时间 */ - String gmtCreate = "gmtCreate"; - - /** 修改时间 */ - String gmtModified = "gmtModified"; - + String _id = "_id"; + /** uuid */ + String uuid = "uuid"; + /** desc */ + String desc = "desc"; + /** createTime */ + String createTime = "createTime"; + /** updateTime */ + String updateTime = "updateTime"; + /** 状态 0:有效，1:无效 */ + String isDelete = "isDelete"; /** 操作环境 */ - String env = "env"; + String env = "env"; } } diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/StrategyDAO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/StrategyDAO.java new file mode 100644 index 0000000..f5f7283 --- /dev/null +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/daointerface/StrategyDAO.java @@ -0,0 +1,24 @@ +package cn.icanci.rec.admin.dal.mongodb.daointerface; + +import cn.icanci.rec.admin.dal.mongodb.dateobject.StrategyDO; + +/** + * 策略 + * + * @author icanci(1205068) + * @version Id: StrategyDAO, v 0.1 2022/10/26 21:15 icanci Exp $ + */ +public interface StrategyDAO extends BaseDAO { + /** + * 文档对应的名字 + */ + String COLLECTION_NAME = "rec-strategy"; + /** + * 文档对应的Class + */ + Class COLLECTION_CLASS = StrategyDO.class; + + interface StrategyColumn extends BaseColumn { + + } +} \ No newline at end of file diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/model/BaseDO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/dateobject/BaseDO.java similarity index 97% rename from rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/model/BaseDO.java rename to rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/dateobject/BaseDO.java index eb9568e..c6f90b5 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/model/BaseDO.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/dateobject/BaseDO.java @@ -1,4 +1,4 @@ -package cn.icanci.rec.admin.dal.mongo.model; +package cn.icanci.rec.admin.dal.mongodb.dateobject; import java.util.Date; import java.util.StringJoiner; diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/dateobject/StrategyDO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/dateobject/StrategyDO.java new file mode 100644 index 0000000..1a331ce --- /dev/null +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/dateobject/StrategyDO.java @@ -0,0 +1,8 @@ +package cn.icanci.rec.admin.dal.mongodb.dateobject; + +/** + * @author icanci(1205068) + * @version Id: StrategyDO, v 0.1 2022/10/29 21:26 icanci Exp $ + */ +public class StrategyDO extends BaseDO { +} \ No newline at end of file diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/AbstractBaseDAO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/AbstractBaseDAO.java similarity index 77% rename from rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/AbstractBaseDAO.java rename to rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/AbstractBaseDAO.java index 1ccac57..28746d2 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/AbstractBaseDAO.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/AbstractBaseDAO.java @@ -1,6 +1,7 @@ -package cn.icanci.rec.admin.dal.mongo.mapper; +package cn.icanci.rec.admin.dal.mongodb.mongo; -import cn.icanci.rec.admin.dal.mongo.model.BaseDO; +import cn.icanci.rec.admin.dal.mongodb.daointerface.BaseDAO; +import cn.icanci.rec.admin.dal.mongodb.dateobject.BaseDO; import java.util.Date; diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/MongoPageHelper.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoPageHelper.java similarity index 96% rename from rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/MongoPageHelper.java rename to rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoPageHelper.java index 8bf5efb..2552006 100644 --- a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongo/mapper/MongoPageHelper.java +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoPageHelper.java @@ -1,7 +1,7 @@ -package cn.icanci.rec.admin.dal.mongo.mapper; +package cn.icanci.rec.admin.dal.mongodb.mongo; -import cn.icanci.rec.admin.dal.mongo.model.PageList; -import cn.icanci.rec.admin.dal.mongo.model.Paginator; +import cn.icanci.rec.admin.dal.mongodb.common.PageList; +import cn.icanci.rec.admin.dal.mongodb.common.Paginator; import java.util.List; import java.util.function.Function; diff --git a/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoStrategyDAO.java b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoStrategyDAO.java new file mode 100644 index 0000000..ce27cde --- /dev/null +++ b/rec-admin/rec-admin-dal/src/main/java/cn/icanci/rec/admin/dal/mongodb/mongo/MongoStrategyDAO.java @@ -0,0 +1,50 @@ +package cn.icanci.rec.admin.dal.mongodb.mongo; + +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 java.util.List; + +import org.springframework.data.mongodb.core.query.Criteria; +import org.springframework.data.mongodb.core.query.Query; +import org.springframework.stereotype.Service; + +/** + * @author icanci(1205068) + * @version Id: MongoStrategyDAO, v 0.1 2022/10/26 21:15 icanci Exp $ + */ +@Service("strategyDAO") +public class MongoStrategyDAO extends AbstractBaseDAO implements StrategyDAO { + + @Override + public void insert(StrategyDO strategyDO) { + super.insert(strategyDO); + } + + @Override + public void update(StrategyDO strategyDO) { + super.update(strategyDO); + } + + @Override + public List queryAll() { + Criteria criteria = Criteria.where(StrategyColumn.env).is(DEFAULT_ENV); + Query query = new Query(criteria); + return mongoTemplate.find(query, COLLECTION_CLASS, COLLECTION_NAME); + } + + @Override + public PageList pageQuery(StrategyDO strategyDO, int pageNum, int pageSize) { + return null; + } + + @Override + public StrategyDO queryOneById(String _id) { + // 必须和文档中的字段一致 + Criteria criteria = Criteria.where(StrategyColumn._id).is(_id); + criteria.and(StrategyColumn.env).is(DEFAULT_ENV); + Query query = new Query(criteria); + return mongoTemplate.findOne(query, COLLECTION_CLASS, COLLECTION_NAME); + } +} \ No newline at end of file diff --git a/rec-admin/rec-admin-views/src/main/resources/application.yml b/rec-admin/rec-admin-views/src/main/resources/application.yml index 5e58fb5..8f0941f 100644 --- a/rec-admin/rec-admin-views/src/main/resources/application.yml +++ b/rec-admin/rec-admin-views/src/main/resources/application.yml @@ -10,11 +10,11 @@ logging: config: classpath:log4j2.xml spring: - datasource: - driverClassName: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/rec?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC - username: root - password: root + # datasource: + # driverClassName: com.mysql.cj.jdbc.Driver + # url: jdbc:mysql://127.0.0.1:3306/rec?useUnicode=true&characterEncoding=utf-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=UTC + # username: root + # password: root servlet: multipart: max-file-size: 10MB @@ -28,10 +28,10 @@ spring: mongodb: uri: mongodb://127.0.0.1:27017/rec - # 指定别名设置的包为所有entity - type-aliases-package: cn.icanci.rec.admin.dal.model - configuration: - map-underscore-to-camel-case: true # 驼峰命名规范 - mapper-locations: # mapper映射文件位置 - - classpath:mybatis/mapper/*.xml +# 指定别名设置的包为所有entity +# type-aliases-package: cn.icanci.rec.admin.dal.model +# configuration: +# map-underscore-to-camel-case: true # 驼峰命名规范 +# mapper-locations: # mapper映射文件位置 +# - classpath:mybatis/mapper/*.xml diff --git a/rec-common/src/main/java/cn/icanci/rec/common/Symbol.java b/rec-common/src/main/java/cn/icanci/rec/common/Symbol.java index 6e5b291..2abf391 100644 --- a/rec-common/src/main/java/cn/icanci/rec/common/Symbol.java +++ b/rec-common/src/main/java/cn/icanci/rec/common/Symbol.java @@ -6,4 +6,8 @@ package cn.icanci.rec.common; */ public class Symbol { public static final String AMPERSAND = "&"; + + public static final String SEMICOLON = ";"; + + public static final String COLON = ":"; } \ No newline at end of file -- Gitee