Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-pojo

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java

@@ -63,31 +63,23 @@ public interface BaseRepository <T, ID extends Serializable> extends JpaReposito
     int executeUpdate(String qlString, List<Object> 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 <T, ID extends Serializable> 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 <T, ID extends Serializable> extends JpaReposito
     public List<Object[]> findBySqlObjList(String sql);
 
     public List<Object[]> findBySqlObjListByPager(String sql,Pager pager);
-
-
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseMongoRepositoryImpl.java

@@ -191,7 +191,12 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> 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,8 +212,12 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
 
     @Override
     public long findByBsonCount(Bson bson) {
+        if(bson == null){
+            return mongoOperations.getCollection(this.entityInformation.getCollectionName()).count();
+        }else {
             return mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(bson);
         }
+    }
 
     private List<T> packObjectListFromDocument(List<Document> dList) {
         //将获取的document转为对象
@@ -235,9 +244,16 @@ public class BaseMongoRepositoryImpl<T, ID extends Serializable> extends SimpleM
             }
         };
 
-        FindIterable findIter = mongoOperations.getCollection(this.entityInformation.getCollectionName()).find(bson)
+        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()){

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<T, ID extends Serializable> extends SimpleJpaRep
 
     private Class<T> persistentClass;
 
-    public BaseRepositoryImpl(Class<T> tClass, EntityManager em) {
-        super(tClass, em);
+    public BaseRepositoryImpl(Class<T> 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<T, ID extends Serializable> 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<T, ID extends Serializable> 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

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java

@@ -76,8 +76,13 @@ public class BsonPackTool {
 
         //查询
         MongoCollection<Document> collection = mongoOperations.getCollection(tableName);
-        collection.find(bson).skip(skip).limit(limit).forEach(saveBlock);
+        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<Document> list = new ArrayList<>();
         long count = mongoOperations.getCollection(tableName).count(bson);
         int loops = (int)((count + pageSize - 1) / pageSize);
+        List<Document> newFinds = null;
         for(int i = 0; i < loops; i++) {
-            List<Document> 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";
         }
+        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)     //小于等于结束日期
+                    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){
                 //只有开始日期，没有结束日期
+                if(bson == null){
+                    bson = Filters.and(
+                            Filters.regex(columnName, "^" + time[0]) //like 日期%^
+                    );
+                }else {
                     bson = Filters.and(
                             bson,
-                        //Filters.eq(columnName,time[0])
-                        Filters.regex(columnName, "^"+time[0]) //like 日期%^
+                            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,30 +200,50 @@ public class BsonPackTool {
                 if (isShowTime&& time[1].trim().length()<=11) {
                     time[1]+= " 23:59:59";
                 }
+                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])     //小于等于结束日期
+                            Filters.gte(columnName, time[0]),  //大于等于开始日期
+                            Filters.lte(columnName, time[1])     //小于等于结束日期
                     );
+                }
             } else {
                 if (showTaday) {
                     if (isShowTime) {
-
+                        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")     //小于等于结束日期
+                                    Filters.gte(columnName, time[0] + " 00:00:00"),  //大于等于开始日期
+                                    Filters.lte(columnName, time[1] + " 23:59:59")     //小于等于结束日期
+                            );
+                        }
+                    }else{
+                        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])     //小于等于结束日期
+                                    Filters.gte(columnName, time[0]),  //大于等于开始日期
+                                    Filters.lte(columnName, time[1])     //小于等于结束日期
                             );
                         }
                     }
                 }
             }
+        }
         return bson;
     }
 
@@ -219,11 +257,17 @@ public class BsonPackTool {
         if (str != null && str.trim().length() > 0) {
             str = getSafeParam(str);
 
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.regex(columnName, str) //like
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.regex(columnName, str) //like
                 );
             }
+        }
 
         return bson;
     }
@@ -238,6 +282,11 @@ public class BsonPackTool {
         if (str != null && str.trim().length() > 0) {
             str = getSafeParam(str);
 
+            if(bson == null) {
+                bson = Filters.or(
+                               Filters.regex(columnName, str) //like
+                        );
+            }else {
                 bson = Filters.and(
                         bson,
                         Filters.or(
@@ -245,6 +294,7 @@ public class BsonPackTool {
                         )
                 );
             }
+        }
         return bson;
     }
 
@@ -257,11 +307,17 @@ public class BsonPackTool {
     public static Bson getStringRightLikerPack(String str,String columnName, Bson bson) {
         if (str != null && str.trim().length() > 0) {
             str = getSafeParam(str);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.regex(columnName, str + "^") //like
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.regex(columnName, str + "^") //like
                 );
             }
+        }
         return bson;
     }
 
@@ -274,11 +330,17 @@ public class BsonPackTool {
     public static Bson getStringLeftLikerPack(String str,String columnName, Bson bson) {
         if (str != null && str.trim().length() > 0) {
             str = getSafeParam(str);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.regex(columnName, "^" + str) //like
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.regex(columnName, "^" + str) //like
                 );
             }
+        }
         return bson;
     }
 
@@ -290,11 +352,17 @@ public class BsonPackTool {
     public static Bson getStringEqualPack(String data,String columnName, Bson bson) {
         if(data != null && data.trim().length() > 0){
             data = getSafeParam(data);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.eq(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.eq(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -306,11 +374,17 @@ public class BsonPackTool {
     public static Bson getNumEqualPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) > 0){
             data = getSafeParam(data);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.eq(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.eq(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -322,11 +396,18 @@ public class BsonPackTool {
     public static Bson getNumEqualPackForZero(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) >= 0){
             data = getSafeParam(data);
+
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.eq(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.eq(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -338,11 +419,17 @@ public class BsonPackTool {
     public static Bson getNumWithZeroEqualPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) >= 0){
             data = getSafeParam(data);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.eq(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.eq(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -354,11 +441,17 @@ public class BsonPackTool {
     public static Bson getNumBiggerPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) > 0){
             data = getSafeParam(data);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.gt(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.gt(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -370,11 +463,17 @@ public class BsonPackTool {
     public static Bson getNumSmallerPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Long.parseLong(data.toString()) > 0){
             data = getSafeParam(data);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.lt(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.lt(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -386,11 +485,17 @@ public class BsonPackTool {
     public static Bson getDoubleBiggerPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Double.parseDouble(data.toString()) > 0){
             data = getSafeParam(data);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.gt(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.gt(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -402,11 +507,17 @@ public class BsonPackTool {
     public static Bson getDoubleSmallerPack(Object data,String columnName, Bson bson) {
         if(data!=null&&Double.parseDouble(data.toString()) > 0){
             data = getSafeParam(data);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.lt(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.lt(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -418,11 +529,17 @@ 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);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.eq(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.eq(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -434,11 +551,17 @@ public class BsonPackTool {
     public static Bson getNumEqualPackDouble(Object data,String columnName, Bson bson) {
         if(data!=null&&Double.parseDouble(data.toString()) > 0){
             data = getSafeParam(data);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.eq(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.eq(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -450,11 +573,17 @@ 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);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.eq(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.eq(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -466,11 +595,17 @@ public class BsonPackTool {
     public static Bson getNumNOEqualPack(Object data,String columnName, Bson bson) {
         if(data!=null){
             data = getSafeParam(data);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.ne(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.ne(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -483,11 +618,17 @@ public class BsonPackTool {
     public static Bson getInPack(String data,String columnName, Bson bson){
         if (data!=null&&data.trim().length()>0) {
             data = getSafeParam(data);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.in(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.in(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -513,11 +654,17 @@ public class BsonPackTool {
                     data += "'" + dataArray[i] + "',";
                 }
             }
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.in(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.in(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -543,11 +690,17 @@ public class BsonPackTool {
                     data += "'" + dataArray[i] + "',";
                 }
             }
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.nin(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.nin(columnName, data)
                 );
             }
+        }
         return bson;
     }
 
@@ -560,11 +713,17 @@ public class BsonPackTool {
     public static Bson getNotInPack(String data,String columnName, Bson bson){
         if (data!=null&&data.trim().length()>0) {
             data = getSafeParam(data);
+            if(bson == null) {
+                bson = Filters.and(
+                        Filters.nin(columnName, data)
+                );
+            }else{
                 bson = Filters.and(
                         bson,
                         Filters.nin(columnName, data)
                 );
             }
+        }
         return bson;
     }
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java

@@ -32,8 +32,8 @@ public class LogOperate extends BaseBean {
     //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;
 

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<LogOperate, Long> {
-//}
+public interface LogOperateRepository extends BaseMongoRepository<LogOperate, Long> {
+}

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<LogSystem, Long> {
+public interface LogSystemRepository extends BaseMongoRepository<LogSystem, Long> {
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/BasCustomer.java

@@ -0,0 +1,60 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :客户信息表
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 17:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="BAS_CUSTOMER")
+@DynamicInsert
+@DynamicUpdate
+@Api(value="客户信息表",description = "客户信息表")
+public class BasCustomer extends BaseBean {
+
+    @Column(name = "CUST_NO")
+    @ApiParam(value = "客户编号")
+    private String custNo;
+
+    @Column(name = "CUST_NAME")
+    @ApiParam(value = "客户简称")
+    private String custName;
+
+    @Column(name = "CUST_DESC")
+    @ApiParam(value = "客户全称")
+    private String custDesc;
+
+    @Column(name = "CUST_ADDR")
+    @ApiParam(value = "客户地址")
+    private String custAddr;
+
+    @Column(name = "CUST_OWNER")
+    @ApiParam(value = "联系人")
+    private String custOwner;
+
+    @Column(name = "CUST_EMAIL")
+    @ApiParam(value = "邮箱")
+    private String custEmail;
+
+    @Column(name = "CUST_TEL")
+    @ApiParam(value = "联系人电话")
+    private String custTel;
+
+    @Column(name = "CUST_FAX")
+    @ApiParam(value = "传真")
+    private String custFax;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsIbCheckPlan.java

@@ -31,9 +31,9 @@ public class WmsIbCheckPlan extends BaseBean{
     @ApiParam(value ="物料编码")
     private String partNo;
 
-    @Column(name="PART_NAME")
+    @Column(name="PART_NAME_RDD")
     @ApiParam(value ="物料名称")
-    private String partName;
+    private String partNameRdd;
 
     @Column(name="START_DATE")
     @ApiParam(value ="开始日期")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsLocate.java

@@ -75,7 +75,7 @@ public class WmsLocate extends BaseBean {
     private Integer maxPartQty;
 
     @Column(name="STOCK_UNIT")
-    @ApiParam(value ="存放单位", example = "-1")
+    @ApiParam(value ="存放单位")
     private String stockUnit;
 
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsShippingFlag.java

@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : 客户发往地
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-07 14:38
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_SHIPPING_FLAG")
+@DynamicInsert
+@DynamicUpdate
+@Api(value="客户发往地信息表",description = "客户发往地信息表")
+public class WmsShippingFlag extends BaseBean {
+
+    @Column(name = "FLAG_NO")
+    @ApiParam(value = "编号")
+    private String flagNo;
+
+    @Column(name = "FLAG_NAME")
+    @ApiParam(value = "简称")
+    private String flagName;
+
+    @Column(name = "FLAG_DESC")
+    @ApiParam(value = "全称")
+    private String flagDesc;
+
+    @Column(name = "FLAG_ADDR")
+    @ApiParam(value = "地址")
+    private String flagAddr;
+
+    @Column(name = "FLAG_OWNER")
+    @ApiParam(value = "联系人")
+    private String flagOwner;
+
+    @Column(name = "FLAG_EMAIL")
+    @ApiParam(value = "邮箱")
+    private String flagEmail;
+
+    @Column(name = "FLAG_TEL")
+    @ApiParam(value = "联系人电话")
+    private String flagTel;
+
+    @Column(name = "FLAG_FAX")
+    @ApiParam(value = "传真")
+    private String flagFax;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsZones.java

@@ -0,0 +1,77 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :存储区
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 11:50
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="WMS_ZONES")
+@DynamicInsert
+@DynamicUpdate
+@Api(value="存储区信息表",description = "存储区信息表")
+public class WmsZones extends BaseBean {
+
+    @Column(name = "WH_NO")
+    @ApiParam(value = "仓库代码")
+    private String whNo;
+
+    @Column(name = "AREA_NO")
+    @ApiParam(value = "库存地代码")
+    private String areaNo;
+
+    @Column(name = "ZONE_NO")
+    @ApiParam(value = "存储区代码")
+    private String zoneNo;
+
+    @Column(name = "ZONE_NAME")
+    @ApiParam(value = "存储区名称")
+    private String zoneName;
+
+    @Column(name = "IS_PM")
+    @ApiParam(value = "零件级管控" , example = "2")
+    private Integer isPm;
+
+    @Column(name = "IS_LM")
+    @ApiParam(value = "批次级管控" , example = "2")
+    private Integer isLm;
+
+    @Column(name = "IS_SN")
+    @ApiParam(value = "条码级管控" , example = "1")
+    private Integer isSn;
+
+    @Column(name = "IS_MIX")
+    @ApiParam(value = "允许混淆" , example = "1")
+    private Integer isMix;
+
+    @Column(name = "IS_SC")
+    @ApiParam(value = "库容检查" , example = "1")
+    private Integer isSc;
+
+    @Column(name = "STRATEGY")
+    @ApiParam(value = "堆放策略")
+    private String strategy;
+
+    @Column(name = "IS_NEGATIVE")
+    @ApiParam(value = "允许负库存" , example = "1")
+    private Integer isNegative;
+
+    @Column(name = "CHECK_FIFO")
+    @ApiParam(value = "校验先进先出" , example = "1")
+    private Integer checkFifo;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.BasCustomer;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(客户信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 17:27
+ * @Modify:
+ **/
+@Repository
+public interface BasCustomerRepositry extends BaseRepository<BasCustomer,Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsShippingFlag;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(客户发往地信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-07 14:58
+ * @Modify:
+ **/
+@Repository
+public interface WmsShippingFlagRepositry extends BaseRepository<WmsShippingFlag, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsZones;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :对象持久层仓用方法控制(存储区信息)
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2018-11-06 13:40
+ * @Modify:
+ **/
+@Repository
+public interface WmsZonesRepositry extends BaseRepository<WmsZones ,Long> {
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -17,6 +17,40 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsTransType;
 public class WmsHqlPack {
 
     /**
+     * 库位物料信息 分页查询
+     * @param wmsLocatePart
+     * @return
+     */
+    public static String packHqlWmsLocatePart(WmsLocatePart wmsLocatePart) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsLocatePart.getLocateNo(), "locateNo", result);
+        HqlPack.getStringLikerPack(wmsLocatePart.getPartNo(), "partNo", result);
+        HqlPack.getStringLikerPack(wmsLocatePart.getPartName(), "partName", result);
+
+        return result.toString();
+    }
+
+    /**
+     * 库位信息 分页查询
+     * @param wmsLocate
+     * @return
+     */
+    public static String packHqlWmsLocates(WmsLocate wmsLocate) {
+        StringBuffer result = new StringBuffer();
+
+        //查询参数封装
+        HqlPack.getStringLikerPack(wmsLocate.getLocateNo(),"locateNo",result);
+        HqlPack.getStringLikerPack(wmsLocate.getLocateName(),"locateName",result);
+        HqlPack.getStringLikerPack(wmsLocate.getLocateType(),"locateType",result);
+        HqlPack.getStringLikerPack(wmsLocate.getWhNo(),"whNo",result);
+        HqlPack.getStringLikerPack(wmsLocate.getZoneNo(),"zoneNo",result);
+
+        return result.toString();
+    }
+
+    /**
      * 工厂仓库模糊分页查询
      * @param wareHouse
      * @return
@@ -124,4 +158,52 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()+"","isValid",result);
         return result.toString();
     }
+
+    /**
+     * 存储区信息 查询条件封装
+     * @param wmsZones
+     * @return
+     */
+    public static String packHqlWmsZones(WmsZones wmsZones) {
+        StringBuffer result = new StringBuffer();
+        //仓库代码
+        HqlPack.getStringLikerPack(wmsZones.getWhNo(),"whNo",result);
+        //库存地代码
+        HqlPack.getStringLikerPack(wmsZones.getAreaNo(),"areaNo",result);
+        //存储区代码
+        HqlPack.getStringLikerPack(wmsZones.getZoneNo(),"zoneNo",result);
+        return result.toString();
+    }
+
+    /**
+     * 客户信息 查询条件封装
+     * @param basCustomer
+     * @return
+     */
+    public static String packHqlBasCustomer(BasCustomer basCustomer){
+        StringBuffer result = new StringBuffer();
+        //客户编号
+        HqlPack.getStringLikerPack(basCustomer.getCustNo(),"custNo",result);
+        //客户简称
+        HqlPack.getStringLikerPack(basCustomer.getCustName(),"custName",result);
+        //客户全称
+        HqlPack.getStringLikerPack(basCustomer.getCustDesc(),"custDesc",result);
+        return result.toString();
+    }
+
+    /**
+     * 客户发往地信息 查询条件封装
+     * @param wmsShippingFlag
+     * @return
+     */
+    public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag){
+        StringBuffer result = new StringBuffer();
+        //供应商编号
+        HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(),"flagNo",result);
+        //供应商简称
+        HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(),"flagName",result);
+       //供应商全称
+        HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(),"flagDesc",result);
+        return result.toString();
+    }
 }