From 6ffcdc3c33deac50a4a79e98024235cd4e2d61cc Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Wed, 7 Nov 2018 15:55:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=86=E6=9E=90=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=8C=81=E4=B9=85=E5=8C=96=EF=BC=8Cbaserepository?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 43 +-- .../base/jpa/daoimpl/BaseMongoRepositoryImpl.java | 26 +- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 112 ++++-- .../estsh/i3plus/pojo/base/tool/BsonPackTool.java | 381 +++++++++++++++------ .../i3plus/pojo/platform/bean/LogOperate.java | 6 +- .../LogOperateRepository.java | 3 +- .../LogSystemRepository.java | 5 +- 7 files changed, 386 insertions(+), 190 deletions(-) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{repository => repositorymongo}/LogOperateRepository.java (87%) rename modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/{repository => repositorymongo}/LogSystemRepository.java (62%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java index b0c41a1..22151c7 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java @@ -63,31 +63,23 @@ public interface BaseRepository extends JpaReposito int executeUpdate(String qlString, List values); /** - * 通过属性删除 - * @param propName - * @param propValue + * 强删除 */ - public void deleteByProperties(String propName, Object propValue); + public void deleteById(ID id); + public int deleteByProperty(String propName, Object propValue); + public int deleteByPropertyIn(String propName, Object[] propValues); + public int deleteByIds(ID[] ids); + public int deleteByProperties(String[] propNames, Object[] objValues); /** - * 通过多个属性删除 - * @param propName - * @param propValue + * 弱删除 + * @return count */ - public void deleteByProperties(String[] propName, Object[] propValue); - - /** - * 通过 in 批量删除 - * @param ids 熟悉值数组 - */ - public void deleteByIds(Long[] ids); - - /** - * 批量删除 指定列名 - * @param propName - * @param ids - */ - public void deleteByTypeLong(String propName, Long[] ids); + public int deleteWeaklyById(ID id); + public int deleteWeaklyByIds(Long[] ids) ; + public int deleteWeaklyByProperty(String propName, Object propValue); + public int deleteWeaklyByPropertyIn(String propName, Object[] propValues); + public int deleteWeaklyByProperties(String[] propNames, Object[] objValues); /** * 通过多单属性进行单个值更新 @@ -135,13 +127,6 @@ public interface BaseRepository extends JpaReposito public int updateByHqlWhere(String hqlWhere,String propertyName, Object propertyValue); /** - * 批量弱删除仓库信息 - * @param ids - * @return - */ - public boolean deleteWeaklyByIds(Long[] ids) ; - - /** * 批量修改数据熟悉 * @param hqlWhere HQL where 语句 * @param propertyName 修改的字段名称 @@ -240,6 +225,4 @@ public interface BaseRepository extends JpaReposito public List findBySqlObjList(String sql); public List findBySqlObjListByPager(String sql,Pager pager); - - } 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 f44aa09..bd7ab88 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 @@ -191,7 +191,12 @@ public class BaseMongoRepositoryImpl extends SimpleM } }; - FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson); + FindIterable findIter = null; + if(bson != null) { + findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson); + }else{ + findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(); + } if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){ //排序 if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){ @@ -207,7 +212,11 @@ public class BaseMongoRepositoryImpl extends SimpleM @Override public long findByBsonCount(Bson bson) { - return mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(bson); + if(bson == null){ + return mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(); + }else { + return mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(bson); + } } private List packObjectListFromDocument(List dList) { @@ -235,9 +244,16 @@ public class BaseMongoRepositoryImpl extends SimpleM } }; - FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson) - .skip(pager.getStartRow()) - .limit(pager.getPageSize()); + FindIterable findIter = null; + if(bson == null) { + findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find() + .skip(pager.getStartRow()) + .limit(pager.getPageSize()); + }else{ + findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson) + .skip(pager.getStartRow()) + .limit(pager.getPageSize()); + } if(StringUtils.isNotBlank(orderByParam) && ascOrDesc != 0){ //排序 if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()){ diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java index 7f78c9a..1fa0cec 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.base.jpa.daoimpl; import cn.estsh.i3plus.pojo.base.common.Pager; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.base.tool.SnowflakeIdMaker; import org.slf4j.Logger; @@ -32,10 +34,10 @@ public class BaseRepositoryImpl extends SimpleJpaRep private Class persistentClass; - public BaseRepositoryImpl(Class tClass, EntityManager em) { - super(tClass, em); + public BaseRepositoryImpl(Class clz, EntityManager em) { + super(clz, em); this.entityManager = em; - this.persistentClass = tClass; + this.persistentClass = clz; } private void setParameter(Query query, String[] propName, Object[] propValue) { @@ -125,39 +127,97 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public void deleteByProperties(String propName, Object propValue) { - deleteByProperties(new String[] { propName }, new Object[] { propValue }); + public void deleteById(ID id){ + deleteByProperty("id", id); } @Override - public void deleteByProperties(String[] propName, Object[] propValue) { + public int deleteByProperty(String propName, Object propValue) { + return deleteByProperties(new String[] { propName }, new Object[] { propValue }); + } + + @Override + public int deleteByProperties(String[] propName, Object[] propValue) { if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { StringBuffer sb = new StringBuffer("delete from " + persistentClass.getName() + " model where 1=1 "); appendQL(sb,propName,propValue); Query query = entityManager.createQuery(sb.toString()); setParameter(query,propName,propValue); - query.executeUpdate(); + return query.executeUpdate(); }else{ throw new IllegalArgumentException("Method deleteByProperties argument is illegal!propName:" + propName + ",propValue:" + propValue); } } @Override - public void deleteByIds(Long[] ids) { - deleteByTypeLong("id", ids); + public int deleteByIds(ID[] ids) { + return deleteByPropertyIn("id", ids); } @Override - public void deleteByTypeLong(String propName, Long[] ids) { - if ((propName != null && propName.length() > 0) && (ids != null && ids.length > 0)) { - String hql = "delete from " + persistentClass.getName() + " model where model."+propName+" in(:ids) "; + public int deleteByPropertyIn(String propName, Object[] propValues) { + if ((propName != null && propName.length() > 0) && (propValues != null && propValues.length > 0)) { + String hql = "delete from " + persistentClass.getName() + " model where model."+propName+" in(:"+propName+") "; Query query = entityManager.createQuery(hql); - query.setParameter("ids", Arrays.asList(ids)); + query.setParameter(propName, Arrays.asList(propValues)); + + return query.executeUpdate(); + }else{ + throw new IllegalArgumentException("删除出错："+propName+":" + propValues); + } + } + + @Override + public int deleteWeaklyById(ID id) { + return deleteWeaklyByProperty("id", id); + } + + @Override + public int deleteWeaklyByIds(Long[] ids) { + return deleteWeaklyByPropertyIn("id", ids); + } + + @Override + public int deleteWeaklyByProperty(String propName, Object propValue) { + return deleteWeaklyByProperties(new String[] { propName }, new Object[] { propValue }); + } + + /** + * 批量弱删除 + * @return + */ + @Override + public int deleteWeaklyByPropertyIn(String propName, Object[] propValues) { + if(propValues != null && propValues.length > 0){ + String hql = "update " + persistentClass.getName() + " model set model.isValid = :isValid where model."+propName+" in(:"+propName+") "; + Query query = entityManager.createQuery(hql); + query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue()); + query.setParameter(propName, Arrays.asList(propValues)); + + return query.executeUpdate(); + }else{ + throw new IllegalArgumentException("弱删除失败："+propName+":" + propValues); + } + } + + /** + * 批量弱删除 + * @return + */ + @Override + public int deleteWeaklyByProperties(String[] propName, Object[] propValue) { + if ((propName != null) && (propName.length > 0) && (propValue != null) && (propValue.length > 0) && (propValue.length == propName.length)) { + StringBuffer sb = new StringBuffer("update " + persistentClass.getName() + " model set model.isValid = :isValid where 1=1 "); + appendQL(sb,propName,propValue); + Query query = entityManager.createQuery(sb.toString()); + query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue()); + + setParameter(query,propName,propValue); - query.executeUpdate(); + return query.executeUpdate(); }else{ - throw new IllegalArgumentException("Method deleteByPropertiesIn argument is illegal! "+propName+":" + ids); + throw new IllegalArgumentException("弱删除失败："+propName+":" + propValue); } } @@ -782,28 +842,6 @@ public class BaseRepositoryImpl extends SimpleJpaRep } /** - * 批量弱删除 - * @param ids - * @return - */ - @Override - public boolean deleteWeaklyByIds(Long[] ids) { - if(ids != null && ids.length > 0){ - String hql = "update " + persistentClass.getName() + " model where model.id in(:ids) "; - Query query = entityManager.createQuery(hql); - query.setParameter("ids", Arrays.asList(ids)); - - int delResult = query.executeUpdate(); - if (delResult == ids.length) { - return true; - } - }else{ - throw new IllegalArgumentException("Method deleteByPropertiesIn argument is illegal! ids:" + ids); - } - return false; - } - - /** * 保存对象 * @param item 保存对象 * @return diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java index d8892ed..d7d98aa 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java @@ -76,8 +76,13 @@ public class BsonPackTool { //查询 MongoCollection collection = mongoOperations.getCollection(tableName); - collection.find(bson).skip(skip).limit(limit).forEach(saveBlock); - collection.count(bson); + if(bson == null) { + collection.count(); + collection.find().skip(skip).limit(limit).forEach(saveBlock); + }else { + collection.count(bson); + collection.find(bson).skip(skip).limit(limit).forEach(saveBlock); + } return newLins; } @@ -95,8 +100,9 @@ public class BsonPackTool { List list = new ArrayList<>(); long count = mongoOperations.getCollection(tableName).count(bson); int loops = (int)((count + pageSize - 1) / pageSize); + List newFinds = null; for(int i = 0; i < loops; i++) { - List newFinds = query(mongoOperations, tableName, bson, i * pageSize, pageSize); + newFinds = query(mongoOperations, tableName, bson, i * pageSize, pageSize); list.addAll(newFinds); } return list; @@ -131,11 +137,18 @@ public class BsonPackTool { if (isShowTime&& endDate.trim().length()<=11) { endDate+= " 23:59:59"; } - bson = Filters.and( - bson, - Filters.gte(columnName,startDate), //大于等于开始日期 - Filters.lte(columnName,endDate) //小于等于结束日期 - ); + if(bson == null) { + bson = Filters.and( + Filters.gte(columnName, startDate), //大于等于开始日期 + Filters.lte(columnName, endDate) //小于等于结束日期 + ); + }else{ + bson = Filters.and( + bson, + Filters.gte(columnName, startDate), //大于等于开始日期 + Filters.lte(columnName, endDate) //小于等于结束日期 + ); + } return bson; } @@ -160,11 +173,16 @@ public class BsonPackTool { String[] time = date.split(","); if(time.length == 1){ //只有开始日期，没有结束日期 - bson = Filters.and( - bson, - //Filters.eq(columnName,time[0]) - Filters.regex(columnName, "^"+time[0]) //like 日期%^ - ); + if(bson == null){ + bson = Filters.and( + Filters.regex(columnName, "^" + time[0]) //like 日期%^ + ); + }else { + bson = Filters.and( + bson, + Filters.regex(columnName, "^" + time[0]) //like 日期%^ + ); + } }else if (time.length == 2 && ((time[0] != null && time[0].trim().length() > 0) || (time[1] != null & time[1].trim().length() > 0))) { if (time[0] == null || time[0].trim().length() == 0) { time[0] = "1900-01-01"; @@ -182,26 +200,46 @@ public class BsonPackTool { if (isShowTime&& time[1].trim().length()<=11) { time[1]+= " 23:59:59"; } - bson = Filters.and( - bson, - Filters.gte(columnName,time[0]), //大于等于开始日期 - Filters.lte(columnName,time[1]) //小于等于结束日期 - ); + if(bson == null) { + bson = Filters.and( + Filters.gte(columnName, time[0]), //大于等于开始日期 + Filters.lte(columnName, time[1]) //小于等于结束日期 + ); + }else{ + bson = Filters.and( + bson, + Filters.gte(columnName, time[0]), //大于等于开始日期 + Filters.lte(columnName, time[1]) //小于等于结束日期 + ); + } } else { if (showTaday) { if (isShowTime) { - - bson = Filters.and( - bson, - Filters.gte(columnName,time[0] + " 00:00:00"), //大于等于开始日期 - Filters.lte(columnName,time[1] + " 23:59:59") //小于等于结束日期 - ); + if(bson == null) { + bson = Filters.and( + Filters.gte(columnName, time[0] + " 00:00:00"), //大于等于开始日期 + Filters.lte(columnName, time[1] + " 23:59:59") //小于等于结束日期 + ); + }else{ + bson = Filters.and( + bson, + Filters.gte(columnName, time[0] + " 00:00:00"), //大于等于开始日期 + Filters.lte(columnName, time[1] + " 23:59:59") //小于等于结束日期 + ); + } }else{ - bson = Filters.and( - bson, - Filters.gte(columnName,time[0]), //大于等于开始日期 - Filters.lte(columnName,time[1]) //小于等于结束日期 - ); + if(bson == null) { + bson = Filters.and( + Filters.gte(columnName, time[0]), //大于等于开始日期 + Filters.lte(columnName, time[1]) //小于等于结束日期 + ); + }else{ + bson = Filters.and( + bson, + Filters.gte(columnName, time[0]), //大于等于开始日期 + Filters.lte(columnName, time[1]) //小于等于结束日期 + ); + } } } } @@ -219,10 +257,16 @@ public class BsonPackTool { if (str != null && str.trim().length() > 0) { str = getSafeParam(str); - bson = Filters.and( - bson, - Filters.regex(columnName, str) //like - ); + if(bson == null) { + bson = Filters.and( + Filters.regex(columnName, str) //like + ); + }else{ + bson = Filters.and( + bson, + Filters.regex(columnName, str) //like + ); + } } return bson; @@ -238,12 +282,18 @@ public class BsonPackTool { if (str != null && str.trim().length() > 0) { str = getSafeParam(str); - bson = Filters.and( - bson, - Filters.or( - Filters.regex(columnName, str) //like - ) - ); + if(bson == null) { + bson = Filters.or( + Filters.regex(columnName, str) //like + ); + }else { + bson = Filters.and( + bson, + Filters.or( + Filters.regex(columnName, str) //like + ) + ); + } } return bson; } @@ -257,10 +307,16 @@ public class BsonPackTool { public static Bson getStringRightLikerPack(String str,String columnName, Bson bson) { if (str != null && str.trim().length() > 0) { str = getSafeParam(str); - bson = Filters.and( - bson, - Filters.regex(columnName, str + "^") //like - ); + if(bson == null) { + bson = Filters.and( + Filters.regex(columnName, str + "^") //like + ); + }else{ + bson = Filters.and( + bson, + Filters.regex(columnName, str + "^") //like + ); + } } return bson; } @@ -274,10 +330,16 @@ public class BsonPackTool { public static Bson getStringLeftLikerPack(String str,String columnName, Bson bson) { if (str != null && str.trim().length() > 0) { str = getSafeParam(str); - bson = Filters.and( - bson, - Filters.regex(columnName, "^" + str) //like - ); + if(bson == null) { + bson = Filters.and( + Filters.regex(columnName, "^" + str) //like + ); + }else{ + bson = Filters.and( + bson, + Filters.regex(columnName, "^" + str) //like + ); + } } return bson; } @@ -290,10 +352,16 @@ public class BsonPackTool { public static Bson getStringEqualPack(String data,String columnName, Bson bson) { if(data != null && data.trim().length() > 0){ data = getSafeParam(data); - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.eq(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.eq(columnName, data) + ); + } } return bson; } @@ -306,10 +374,16 @@ public class BsonPackTool { public static Bson getNumEqualPack(Object data,String columnName, Bson bson) { if(data!=null&&Long.parseLong(data.toString()) > 0){ data = getSafeParam(data); - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.eq(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.eq(columnName, data) + ); + } } return bson; } @@ -322,10 +396,17 @@ public class BsonPackTool { public static Bson getNumEqualPackForZero(Object data,String columnName, Bson bson) { if(data!=null&&Long.parseLong(data.toString()) >= 0){ data = getSafeParam(data); - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); + + if(bson == null) { + bson = Filters.and( + Filters.eq(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.eq(columnName, data) + ); + } } return bson; } @@ -338,10 +419,16 @@ public class BsonPackTool { public static Bson getNumWithZeroEqualPack(Object data,String columnName, Bson bson) { if(data!=null&&Long.parseLong(data.toString()) >= 0){ data = getSafeParam(data); - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.eq(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.eq(columnName, data) + ); + } } return bson; } @@ -354,10 +441,16 @@ public class BsonPackTool { public static Bson getNumBiggerPack(Object data,String columnName, Bson bson) { if(data!=null&&Long.parseLong(data.toString()) > 0){ data = getSafeParam(data); - bson = Filters.and( - bson, - Filters.gt(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.gt(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.gt(columnName, data) + ); + } } return bson; } @@ -370,10 +463,16 @@ public class BsonPackTool { public static Bson getNumSmallerPack(Object data,String columnName, Bson bson) { if(data!=null&&Long.parseLong(data.toString()) > 0){ data = getSafeParam(data); - bson = Filters.and( - bson, - Filters.lt(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.lt(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.lt(columnName, data) + ); + } } return bson; } @@ -386,10 +485,16 @@ public class BsonPackTool { public static Bson getDoubleBiggerPack(Object data,String columnName, Bson bson) { if(data!=null&&Double.parseDouble(data.toString()) > 0){ data = getSafeParam(data); - bson = Filters.and( - bson, - Filters.gt(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.gt(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.gt(columnName, data) + ); + } } return bson; } @@ -402,10 +507,16 @@ public class BsonPackTool { public static Bson getDoubleSmallerPack(Object data,String columnName, Bson bson) { if(data!=null&&Double.parseDouble(data.toString()) > 0){ data = getSafeParam(data); - bson = Filters.and( - bson, - Filters.lt(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.lt(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.lt(columnName, data) + ); + } } return bson; } @@ -418,10 +529,16 @@ public class BsonPackTool { public static Bson getNumEqualPack(Object data,String columnName, Bson bson,Integer expvalue) { if(data!=null&&Long.parseLong(data.toString()) > (long)expvalue){ data = getSafeParam(data); - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.eq(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.eq(columnName, data) + ); + } } return bson; } @@ -434,10 +551,16 @@ public class BsonPackTool { public static Bson getNumEqualPackDouble(Object data,String columnName, Bson bson) { if(data!=null&&Double.parseDouble(data.toString()) > 0){ data = getSafeParam(data); - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.eq(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.eq(columnName, data) + ); + } } return bson; } @@ -450,10 +573,16 @@ public class BsonPackTool { public static Bson getNumEqualPackDouble(Object data,String columnName, Bson bson,Integer expvalue) { if(data!=null&&Double.parseDouble(data.toString()) > (double)expvalue){ data = getSafeParam(data); - bson = Filters.and( - bson, - Filters.eq(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.eq(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.eq(columnName, data) + ); + } } return bson; } @@ -466,10 +595,16 @@ public class BsonPackTool { public static Bson getNumNOEqualPack(Object data,String columnName, Bson bson) { if(data!=null){ data = getSafeParam(data); - bson = Filters.and( - bson, - Filters.ne(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.ne(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.ne(columnName, data) + ); + } } return bson; } @@ -483,10 +618,16 @@ public class BsonPackTool { public static Bson getInPack(String data,String columnName, Bson bson){ if (data!=null&&data.trim().length()>0) { data = getSafeParam(data); - bson = Filters.and( - bson, - Filters.in(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.in(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.in(columnName, data) + ); + } } return bson; } @@ -513,10 +654,16 @@ public class BsonPackTool { data += "'" + dataArray[i] + "',"; } } - bson = Filters.and( - bson, - Filters.in(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.in(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.in(columnName, data) + ); + } } return bson; } @@ -543,10 +690,16 @@ public class BsonPackTool { data += "'" + dataArray[i] + "',"; } } - bson = Filters.and( - bson, - Filters.nin(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.nin(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.nin(columnName, data) + ); + } } return bson; } @@ -560,10 +713,16 @@ public class BsonPackTool { public static Bson getNotInPack(String data,String columnName, Bson bson){ if (data!=null&&data.trim().length()>0) { data = getSafeParam(data); - bson = Filters.and( - bson, - Filters.nin(columnName, data) - ); + if(bson == null) { + bson = Filters.and( + Filters.nin(columnName, data) + ); + }else{ + bson = Filters.and( + bson, + Filters.nin(columnName, data) + ); + } } return bson; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java index da111f8..bd5b703 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java @@ -31,9 +31,9 @@ public class LogOperate extends BaseBean { @ApiParam(value ="系统模块（枚举）", example = "1") //CommonEnumUtil.SOFT_TYPE private Integer operateModuleId; - - @Column(name="OPERATE_TYPE_ID（枚举）") - //ImppEnumUtil.OPERATE_TYPE + + @Column(name="OPERATE_TYPE_ID") + //ImppEnumUtil.OPERATE_TYPE（枚举） @ApiParam(value ="操作类型" , example = "-1") private Integer operateTypeId; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java similarity index 87% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java index c046242..9d4ff80 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogOperateRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogOperateRepository.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.pojo.platform.repository; +package cn.estsh.i3plus.pojo.platform.repositorymongo; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; import cn.estsh.i3plus.pojo.platform.bean.LogOperate; @@ -10,6 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.LogOperate; * @Date : 2018-10-22 12:03:00.118 * @Modify : **/ - public interface LogOperateRepository extends BaseMongoRepository { } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogSystemRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogSystemRepository.java similarity index 62% rename from modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogSystemRepository.java rename to modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogSystemRepository.java index c608ab9..fccdc6c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/LogSystemRepository.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repositorymongo/LogSystemRepository.java @@ -1,5 +1,6 @@ -package cn.estsh.i3plus.pojo.platform.repository; +package cn.estsh.i3plus.pojo.platform.repositorymongo; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository; import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; import cn.estsh.i3plus.pojo.platform.bean.LogSystem; import org.springframework.data.mongodb.repository.MongoRepository; @@ -11,5 +12,5 @@ import org.springframework.data.mongodb.repository.MongoRepository; * @Date : 2018-10-22 12:03:00.158 * @Modify : **/ -public interface LogSystemRepository extends MongoRepository { +public interface LogSystemRepository extends BaseMongoRepository { }