From 02f95f09394597ea55bec9235247b8ff8e5fa7ad Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Mon, 25 Feb 2019 13:57:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/jpa/dao/BaseMongoRepository.java | 4 +++ .../base/jpa/daoimpl/BaseMongoRepositoryImpl.java | 21 +++++++++++++- .../estsh/i3plus/pojo/platform/bean/SysConfig.java | 12 ++++---- .../estsh/i3plus/pojo/platform/bean/TestInfo.java | 33 ++++++++++++++++++++++ 4 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java index fd1a7b4..04c9a2d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseMongoRepository.java @@ -47,4 +47,8 @@ public interface BaseMongoRepository extends MongoRe List listPager(Pager pager); List listPager(Pager pager,String orderByParam, int ascOrDesc); + + long deleteByProperty(Bson bson); + long deleteByPropertyIn(String propName, Object[] propValues); + long deleteByIds(ID[] ids); } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java index 3ccc1c8..cd67174 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java @@ -104,7 +104,7 @@ public class BaseMongoRepositoryImpl extends SimpleM Object val = idField.get(item); if((type == long.class || type == Long.class) && (val == null || Long.parseLong(val.toString()) == 0)){ // long类型主键，以snowflake为主键 - idField.set(item, snowflakeIdMaker.nextId()); + idField.set(item, snowflakeIdMaker.nextId() + System.currentTimeMillis()); } else if(type == String.class && (val==null || "".equals(val))){ // String类型主键，以UUID为主键 idField.set(item, UUID.randomUUID().toString().replace("-", "").toLowerCase()); @@ -324,4 +324,23 @@ public class BaseMongoRepositoryImpl extends SimpleM findIter.forEach(saveBlock); return packObjectListFromDocument(dList); } + + @Override + public long deleteByProperty(Bson bson) { + return mongoOperations.getCollection(this.entityInformation.getCollectionName()).deleteMany(bson).getDeletedCount(); + } + + @Override + public long deleteByPropertyIn(String propName, Object[] propValues) { + Bson bson = Filters.and( + Filters.in(propName, propValues) + ); + return deleteByProperty(bson); + } + + @Override + public long deleteByIds(ID[] ids) { + return deleteByPropertyIn("id",ids); + } + } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index 6d42cd3..32d44bc 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -34,29 +34,29 @@ public class SysConfig extends BaseBean { private String name; @Column(name="CONFIG_TYPE") - @ApiParam(value ="配置类型ID（枚举：1.系统配置...）" , example ="-1") + @ApiParam(value ="参数类型ID（枚举：1.系统配置...）" , example ="-1") private Integer configType; @Column(name="CONFIG_CODE") - @ApiParam(value ="配置代码") + @ApiParam(value ="参数代码") private String configCode; // 枚举 ImppEnumUtil.SYS_CONFIG_GROUP @Column(name="CONFIG_GROUP") - @ApiParam(value ="配置组") + @ApiParam(value ="参数组") private Integer configGroup; // 枚举 ImppEnumUtil.SYS_VALUE_TYPE @Column(name="CONFIG_VALUE_TYPE") - @ApiParam(value ="配置值类型") + @ApiParam(value ="参数值类型") private String configValueType; @Column(name="CONFIG_VALUE") - @ApiParam(value ="配置值") + @ApiParam(value ="参数值") private String configValue; @Column(name="CONFIG_DESCRIPTION") - @ApiParam(value ="配置描述") + @ApiParam(value ="参数描述") private String configDescription; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java new file mode 100644 index 0000000..e9daa0f --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/TestInfo.java @@ -0,0 +1,33 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; + +/** + * @Description : 测试类 + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-02-24 16:21 + * @Modify: + **/ +public class TestInfo extends BaseBean { + + /** + * 内存信息 + */ + private double ram; + + /** + * cpu信息 + */ + private double cpu; + + /** + * 线程id + */ + private String threadId; + + /** + * 方法名 + */ + private String method; +}