From 03ddda82d1e2ccffe6eb9aa79d9f95acf2ba8b94 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Tue, 13 Nov 2018 09:56:00 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=A5=E5=BF=97=20?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AE=8C=E6=88=90=20=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97=20=E5=85=A8=E9=83=A8=E5=AE=8C=E6=88=90=20?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=AF=AD=E8=A8=80=20=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/base/jpa/dao/BaseMongoRepository.java | 4 +- .../i3plus/pojo/base/jpa/dao/BaseRepository.java | 2 +- .../base/jpa/daoimpl/BaseMongoRepositoryImpl.java | 10 ++--- .../pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 5 ++- .../estsh/i3plus/pojo/base/tool/BsonPackTool.java | 41 +++++++---------- .../estsh/i3plus/pojo/platform/bean/LogSystem.java | 17 +++++--- .../pojo/platform/bean/SysLocaleResource.java | 5 --- .../i3plus/pojo/platform/sqlpack/CoreBsonPack.java | 49 +++++++++++++++++++++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 51 ++++++++++++++++++---- 9 files changed, 127 insertions(+), 57 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.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 abb1c6d..fd1a7b4 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 @@ -36,13 +36,13 @@ public interface BaseMongoRepository extends MongoRe List findByBson(Bson bson,String orderByParam, int ascOrDesc); - long findByBsonCount(Bson bson); + int findByBsonCount(Bson bson); List findByBsonPager(Bson bson,Pager pager); List findByBsonPager(Bson bson,Pager pager,String orderByParam, int ascOrDesc); - long listCount(); + int listCount(); List listPager(Pager pager); 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 e13e761..d4cf5f6 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 @@ -151,7 +151,7 @@ public interface BaseRepository extends JpaReposito public int listCount(); - public long findByPropertyCount(String propertyName, Object value); + public int findByPropertyCount(String propertyName, Object value); public int findByPropertyCount(String[] propertyNames, Object[] values); 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 022ca3f..1cc859a 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 @@ -216,11 +216,11 @@ public class BaseMongoRepositoryImpl extends SimpleM } @Override - public long findByBsonCount(Bson bson) { + public int findByBsonCount(Bson bson) { if(bson == null){ - return mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(); + return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(); }else { - return mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(bson); + return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(bson); } } @@ -274,8 +274,8 @@ public class BaseMongoRepositoryImpl extends SimpleM } @Override - public long listCount() { - return mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(); + public int listCount() { + return (int) mongoOperations.getCollection(this.entityInformation.getCollectionName()).count(); } @Override 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 01e6c9d..ebeac43 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 @@ -406,11 +406,12 @@ public class BaseRepositoryImpl extends SimpleJpaRep } @Override - public long findByPropertyCount(String propertyName, Object value) { + public int findByPropertyCount(String propertyName, Object value) { String queryString = "select count(distinct model) from " + persistentClass.getName() + " as model where model." + propertyName + "= :" + propertyName; - return entityManager.createQuery(queryString, Long.class) + Long count = entityManager.createQuery(queryString, Long.class) .setParameter(propertyName, value) .getSingleResult(); + return count == null ? 0 : count.intValue(); } @Override 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 d7d98aa..3de28d8 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 @@ -14,6 +14,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.regex.Pattern; /** * @Description : @@ -118,12 +119,10 @@ public class BsonPackTool { * @param isShowTime 是否包含时分秒 */ public static Bson timeBuilder( String startDate,String endDate, String columnName, Bson bson, boolean isShowTime) { - startDate = getSafeParam(startDate); - endDate = getSafeParam(endDate); - if (startDate == null || startDate.trim().length() == 0) { startDate = "1900-01-01"; } else { + startDate = getSafeParam(startDate); startDate = startDate.trim(); } if (isShowTime && startDate.trim().length()<=11) { @@ -132,6 +131,7 @@ public class BsonPackTool { if (endDate == null || endDate.trim().length() == 0) { endDate = "2100-01-01"; } else { + endDate = getSafeParam(endDate); endDate = endDate.trim(); } if (isShowTime&& endDate.trim().length()<=11) { @@ -158,18 +158,19 @@ public class BsonPackTool { * @param date 开始日期和结束日期，以逗号分隔（分为开始时间和结束时间） * @param columnName HQL里对应的时间字段 * @param bson 封装的bson - * @param showTaday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 + * @param showToday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有 * @param isShowTime 是否包含时分秒 */ - public static Bson timeBuilder( String date, String columnName, Bson bson, Boolean showTaday,boolean isShowTime) { - date = getSafeParam(date); - - String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); - if(date != null && date.trim().length() > 0 && (date.length() == 1 || ",".equals(date))){ - //只有一个逗号 - date = ""; - } + public static Bson timeBuilder( String date, String columnName, Bson bson, Boolean showToday,boolean isShowTime) { if(date != null && date.trim().length() > 0){ + date = getSafeParam(date); + + String today = (new SimpleDateFormat("yyyy-MM-dd")).format(new Date()); + if(date.length() == 1 || ",".equals(date)){ + //只有一个逗号 + date = ""; + } + String[] time = date.split(","); if(time.length == 1){ //只有开始日期，没有结束日期 @@ -213,7 +214,7 @@ public class BsonPackTool { ); } } else { - if (showTaday) { + if (showToday) { if (isShowTime) { if(bson == null) { bson = Filters.and( @@ -264,7 +265,7 @@ public class BsonPackTool { }else{ bson = Filters.and( bson, - Filters.regex(columnName, str) //like + Filters.regex(columnName, str)//like ); } } @@ -373,7 +374,6 @@ 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) @@ -395,8 +395,6 @@ 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) @@ -418,7 +416,6 @@ 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) @@ -440,7 +437,6 @@ 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) @@ -462,7 +458,6 @@ 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) @@ -484,7 +479,6 @@ 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) @@ -506,7 +500,6 @@ 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) @@ -528,7 +521,6 @@ 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) @@ -550,7 +542,6 @@ 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) @@ -572,7 +563,6 @@ 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) @@ -594,7 +584,6 @@ 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) diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java index 5086cab..4784e6a 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java @@ -1,6 +1,8 @@ package cn.estsh.i3plus.pojo.platform.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,12 +33,12 @@ public class LogSystem extends BaseBean { @ApiParam(value ="日志级别" , example ="1") //ImppEnumUtil.LOG_LEVEL private Integer logLevel; - + @Column(name="LOG_MODULE_ID") @ApiParam(value ="系统模块（枚举）", example = "1") //CommonEnumUtil.SOFT_TYPE private Integer logModuleId; - + @Column(name="REMOTE_IP") @ApiParam(value ="请求IP" , access ="请求IP") private String remoteIp; @@ -47,24 +49,24 @@ public class LogSystem extends BaseBean { @Column(name="HTTP_METHOD") @ApiParam(value ="http请求方法" , access ="http请求方法") - private String httpMethod;; + private String httpMethod; @Column(name="LOG_CLASS") @ApiParam(value ="触发类路径" , access ="触发类路径") private String logClass; - + @Column(name="LOG_METHOD") @ApiParam(value ="触发方法" , access ="触发方法") private String logMethod; @Column(name="ARGS_COUNT") - @ApiParam(value ="入参数量" , access ="入参数量") + @ApiParam(value ="入参数量" , access ="入参数量", example = "0") private Integer argsCount; @Column(name="LOG_ARGS") @ApiParam(value ="方法入参" , access ="方法入参") private String logArgs; - + @Column(name="LOG_TITLE") @ApiParam(value ="日志标题") private String logTitle; @@ -80,5 +82,6 @@ public class LogSystem extends BaseBean { @Column(name="EXECUTE_TIME") @ApiParam(value ="执行耗时") - private long executeTime; + @JsonSerialize(using = ToStringSerializer.class) + private Long executeTime; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java index 0adf4c4..f26ea12 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLocaleResource.java @@ -50,9 +50,4 @@ public class SysLocaleResource extends BaseBean { @ApiParam(value = "是否系统参数",example = "2") //系统自带需要有初始化表，只能修改value，无法删除。 private Integer isSystem; - - @Column(name="is_default") - @ApiParam(value = "是否默认",example = "2") - //CommonEnumUtil.TRUE_OR_FALSE，新增resources时如果 - private Integer isDefault; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java new file mode 100644 index 0000000..0eb049a --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreBsonPack.java @@ -0,0 +1,49 @@ +package cn.estsh.i3plus.pojo.platform.sqlpack; + +import cn.estsh.i3plus.pojo.base.tool.BsonPackTool; +import cn.estsh.i3plus.pojo.platform.bean.LogOperate; +import cn.estsh.i3plus.pojo.platform.bean.LogSystem; +import com.mongodb.BasicDBObject; +import com.mongodb.client.model.Filters; +import org.bson.conversions.Bson; + +import java.util.regex.Pattern; + +/** + * @Description : Bson对象封装 + * @Reference : + * @Author : yunhao + * @CreateDate : 2018-11-08 13:15 + * @Modify: + **/ +public class CoreBsonPack { + + /** + * 日志复杂查询 + * @param logSystem + * @return + */ + public static Bson packBsonByLogSystem(LogSystem logSystem){ + Bson bson = new BasicDBObject(); + + bson = BsonPackTool.getNumEqualPack(logSystem.getLogLevel(),"logLevel",bson); + bson = BsonPackTool.getNumEqualPack(logSystem.getLogModuleId(),"logModuleId",bson); + bson = BsonPackTool.timeBuilder(logSystem.getCreateDatetime(),"createDatetime",bson,false,false); + bson = BsonPackTool.getStringLikerPack(logSystem.getRemoteIp(),"remoteIp",bson); + bson = BsonPackTool.getStringLikerPack(logSystem.getRequestUrl(),"requestUrl",bson); + bson = BsonPackTool.getStringLikerPack(logSystem.getLogMethod(),"logMethod",bson); + + return bson; + } + + public static Bson packBsonByLogOperate(LogOperate logOperate){ + Bson bson = new BasicDBObject(); + + bson = BsonPackTool.getNumEqualPack(logOperate.getOperateTypeId(),"operateTypeId",bson); + bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModuleId(),"operateModuleId",bson); + bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(),"createDatetime",bson,false,false); + bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(),"createUser",bson); + + return bson; + } +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index 3214b6b..fe9c284 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -24,12 +24,14 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); //查询日期 - HqlPack.timeBuilder(sysLocaleResource.getCreateDateTimeStart(),sysLocaleResource.getCreateDateTimeEnd(), - "createDateTime", result, false); +// HqlPack.timeBuilder(sysLocaleResource.getCreateDateTimeStart(),sysLocaleResource.getCreateDateTimeEnd(), +// "createDateTime", result, false); //数字类型封装 HqlPack.getNumEqualPack(sysLocaleResource.getResourceType(),"resourceType",result); //字符串类型封装 HqlPack.getStringEqualPack(sysLocaleResource.getLanguageCode(),"languageCode",result); + //字符串类型封装 + HqlPack.getStringLikerPack(sysLocaleResource.getResourceKey(),"resourceKey",result); return result.toString(); } @@ -43,12 +45,12 @@ public class CoreHqlPack { StringBuffer result = new StringBuffer(); //查询日期 - HqlPack.timeBuilder(lang.getCreateDateTimeStart(),lang.getCreateDateTimeEnd(), - "createDateTime", result, false); - //数字类型封装 - HqlPack.getNumEqualPack(lang.getLanguageCode(),"languageCode",result); +// HqlPack.timeBuilder(lang.getCreateDateTimeStart(),lang.getCreateDateTimeEnd(), +// "createDateTime", result, false); //字符串类型封装 - HqlPack.getStringEqualPack(lang.getLanguageName(),"languageName",result); + HqlPack.getStringLikerPack(lang.getLanguageCode(),"languageCode",result); + //字符串类型封装 + HqlPack.getStringLikerPack(lang.getLanguageName(),"languageName",result); return result.toString(); } @@ -306,15 +308,46 @@ public class CoreHqlPack { return result.toString(); } + /** + * 查询字典代码是否重复 + * @param sysDictionary + * @return + */ public static String packHqlSysDictionaryCode(SysDictionary sysDictionary){ StringBuffer result = new StringBuffer(); - // and HqlPack.getStringEqualPack(sysDictionary.getDictionaryCode(),"dictionaryCode",result); - // not HqlPack.getNumNOEqualPack(sysDictionary.getId(),"id",result); return result.toString(); } + /** + * 查询语言代码是否重复 + * @param sysLocaleLanguage + * @return + */ + public static String packHqlSysLocaleLanguageCode(SysLocaleLanguage sysLocaleLanguage){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringEqualPack(sysLocaleLanguage.getLanguageCode(),"languageCode",result); + HqlPack.getNumNOEqualPack(sysLocaleLanguage.getId(),"id",result); + + return result.toString(); + } + + /** + * 检查系统资源是否重复 + * @param sysLocaleResource + * @return + */ + public static String packHqlSysLocaleResourceKey(SysLocaleResource sysLocaleResource){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringEqualPack(sysLocaleResource.getLanguageCode(),"languageCode",result); + HqlPack.getStringEqualPack(sysLocaleResource.getResourceKey(),"resourceKey",result); + HqlPack.getNumNOEqualPack(sysLocaleResource.getId(),"id",result); + + return result.toString(); + } } \ No newline at end of file From 6079c8e1a79d990fb1160f84f5dec966353c7c6a Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Tue, 13 Nov 2018 10:08:06 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=BC=80=E5=8F=91po=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=B8=BB=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 103 +++++++++++++++++++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 +- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 21 +++++ 3 files changed, 126 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 3c06790..feecd2a 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -12,6 +12,109 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class WmsEnumUtil { /** + * PO主表信息 单据类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PO_ORDER_TYPE { + REG(1, "REG", "原物料采购"), + SUB(2, "SUB", "委外采购"), + TAR(3, "TAR", "多角贸易采购"), + TAP(4, "TAP", "多角代采购"); + + private int value; + private String code; + private String description; + + private PO_ORDER_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** + * PO主表信息 状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PO_ORDER_STATUS { + CREATE(0, "新建"), + RECEIPT(10, "收货中"), + RECEIPT_FINISH(20, "收货完成"), + WAREHOUSING(30, "入库中"), + WAREHOUSING_FINISH(40, "入库完成"), + CLOSED(90, "已关闭"), + CANCELLED(91, "已取消"); + + private int value; + private String description; + + private PO_ORDER_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * 交易状态 */ public enum TRANS_STATUS { diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 06c7238..b1921bb 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -31,8 +31,8 @@ public class WmsPOMaster extends BaseBean { public String orderNo; /** - * 单据类型:REG=原物料采购, - * SUB=委外采购,TAR=多角贸易采购,TAP=多角代采购 + * 单据类型:1 REG=原物料采购, + * 2 SUB=委外采购,3 TAR=多角贸易采购,4 TAP=多角代采购 */ @Column(name="TYPE") @ApiParam("单据类型") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index a806b32..06af0d6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -11,6 +11,27 @@ import cn.estsh.i3plus.pojo.wms.bean.*; * @Modify: **/ public class WmsHqlPack { + + /** + * PO订单主表信息 分页查询 + * + * @param wmsPOMaster + * @return + */ + public static String packHqlWmsPOMaster(WmsPOMaster wmsPOMaster) { + StringBuffer result = new StringBuffer(); + + //查询参数封装 + HqlPack.getStringLikerPack(wmsPOMaster.getOrderNo(), "orderNo", result); + HqlPack.getStringLikerPack(wmsPOMaster.getType(), "type", result); + HqlPack.getNumEqualPack(wmsPOMaster.getStatus(), "status", result); + HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result); + HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result); + HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result); + + return result.toString(); + } + /** * 物流路线明细查询条件封装 * From d2860e03fc93698346ae72f42d66a508b158ae7c Mon Sep 17 00:00:00 2001 From: "jessica.chen" Date: Tue, 13 Nov 2018 10:08:38 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=BD=92=E6=A1=A3=E8=A1=A8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=92=8C=E5=BA=93=E5=AD=98=E8=A1=A8=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index a806b32..5d904dd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -392,4 +392,25 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); return result.toString(); } + + /** + * 产品发运信息 查询条件封装 + * + * @param wmsShopping + * @return + */ + public static String packHqlWmsShipping(WmsShopping wmsShopping) { + StringBuffer result = new StringBuffer(); + //有效性 + HqlPack.getNumEqualPack(wmsShopping.getIsValid(), "isValid", result); + //发运单号 + HqlPack.getStringLikerPack(wmsShopping.getOrderNo(), "orderNo", result); + //客户编码 + HqlPack.getStringLikerPack(wmsShopping.getCustNo(), "custNo", result); + //条码 + HqlPack.getStringLikerPack(wmsShopping.getPartNo(), "partNo", result); + //发运状态 + HqlPack.getStringEqualPack(wmsShopping.getStatus().toString(), "status", result); + return result.toString(); + } } From d0c6ec627c86777185d44f9f52a68bc88e000d96 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 13 Nov 2018 10:25:37 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 23 -------------------- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 25 ++++++++++++++++++++-- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 30cb2cf..0bd8dae 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -502,27 +502,4 @@ public class CommonEnumUtil { } } - /** - * 启用或禁用 - */ - public enum OPEN_CLOSE { - OPEN(1, "启用"), - CLOSE(2, "禁用"); - - private int value; - private String description; - - public int getValue() { - return value; - } - - public String getDescription() { - return description; - } - - OPEN_CLOSE(int value, String description) { - this.value = value; - this.description = description; - } - } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index a806b32..520759e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -325,8 +325,8 @@ public class WmsHqlPack { public static String packHqlWmsOpTypeUnique(WmsOpType wmsOpType) { StringBuffer result = new StringBuffer(); - HqlPack.getStringLikerPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); - HqlPack.getStringLikerPack(wmsOpType.getOpTypeName(), "opTypeName", result); + HqlPack.getStringEqualPack(wmsOpType.getOpTypeCode(), "opTypeCode", result); + HqlPack.getStringEqualPack(wmsOpType.getOpTypeName(), "opTypeName", result); return result.toString(); } @@ -392,4 +392,25 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); return result.toString(); } + + /** + * ASN订单分页查询条件 + * @param wmsASNMaster + * @return + */ + public static String packHqlWmsASNMaster(WmsASNMaster wmsASNMaster){ + StringBuffer result = new StringBuffer(); + + HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(),"orderNo",result); + HqlPack.getStringLikerPack(wmsASNMaster.getType(),"type",result); + HqlPack.getStringLikerPack(wmsASNMaster.getStatus().toString(),"status",result); + HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(),"vendorNo",result); + HqlPack.getStringLikerPack(wmsASNMaster.getVersion(),"version",result); + HqlPack.getStringLikerPack(wmsASNMaster.getSrc(),"src",result); + HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(),"poNo",result); + //有效性 + HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result); + + return result.toString(); + } } From f7ceb96badb0670c2894db951912f8224ea5bb6f Mon Sep 17 00:00:00 2001 From: alwaysfrin <39822157+alwaysfrin@users.noreply.github.com> Date: Tue, 13 Nov 2018 10:39:39 +0800 Subject: [PATCH 5/7] =?UTF-8?q?1=EF=BC=8C=E5=BC=B1=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E8=B0=83=E6=95=B4=202=EF=BC=8C=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=8C=96=E5=BC=B1=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/jpa/dao/BaseRepository.java | 2 +- .../cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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 7955b74..d9790e8 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 @@ -229,7 +229,7 @@ public interface BaseRepository extends JpaReposito public int deleteWeaklyByProperties(String[] propNames, Object[] objValues,String username); /** - * 更新有效无效状态 + * 更新启用禁用 * @return count */ public int updateValidStatusById(ID id,int status,String username); 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 dce4a33..fdd8369 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 @@ -883,7 +883,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep + " model set model.isValid = :isValid,model.modifyUser= :modifyUser,model.modifyDatetime=:modifyDatetime where model." + propName + " in(:"+propName+") "; Query query = entityManager.createQuery(hql); - query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue()); + query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); query.setParameter("modifyUser",username); query.setParameter("modifyDatetime",getNowTime(true)); query.setParameter(propName, Arrays.asList(propValues)); @@ -907,7 +907,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep Query query = entityManager.createQuery(sb.toString()); query.setParameter("modifyUser",username); query.setParameter("modifyDatetime",getNowTime(true)); - query.setParameter("isValid",CommonEnumUtil.IS_VAILD.INVAILD.getValue()); + query.setParameter("isDeleted",CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue()); setParameter(query,propName,propValue); @@ -933,7 +933,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } /** - * 批量弱删除 + * 批量禁用 * @return */ @Override @@ -955,7 +955,7 @@ public class BaseRepositoryImpl extends SimpleJpaRep } /** - * 批量弱删除 + * 批量禁用 * @return */ @Override From 0bacd88012822bcf427b2ab4493c2e894f6348b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Tue, 13 Nov 2018 10:42:33 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{BasCustomerRepositry.java => BasCustomerRepository.java} | 2 +- .../{WmsShippingFlagRepositry.java => WmsShippingFlagRepository.java} | 2 +- .../wms/repository/{WmsZonesRepositry.java => WmsZonesRepository.java} | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/{BasCustomerRepositry.java => BasCustomerRepository.java} (82%) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/{WmsShippingFlagRepositry.java => WmsShippingFlagRepository.java} (81%) rename modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/{WmsZonesRepositry.java => WmsZonesRepository.java} (83%) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepository.java similarity index 82% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepository.java index 40478e5..7d24900 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepositry.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/BasCustomerRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface BasCustomerRepositry extends BaseRepository { +public interface BasCustomerRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepository.java similarity index 81% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepository.java index cab9915..cae338f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepositry.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsShippingFlagRepository.java @@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface WmsShippingFlagRepositry extends BaseRepository { +public interface WmsShippingFlagRepository extends BaseRepository { } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java similarity index 83% rename from modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java index c61fec7..776cec3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepositry.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsZonesRepository.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Repository; * @Modify: **/ @Repository -public interface WmsZonesRepositry extends BaseRepository { +public interface WmsZonesRepository extends BaseRepository { } From 1ef429fc783ab40793b496226eb1e5e8aaa7e265 Mon Sep 17 00:00:00 2001 From: amy <962239776@qq.com> Date: Tue, 13 Nov 2018 11:50:56 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 8619023..46d292d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -270,6 +270,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wareHouse.getCode(), "code", result); HqlPack.getStringLikerPack(wareHouse.getName(), "name", result); HqlPack.getNumEqualPack(wareHouse.getIsValid(), "isValid", result); + HqlPack.getStringEqualPack(wareHouse.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -288,6 +289,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result); HqlPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result); HqlPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result); + HqlPack.getStringEqualPack(basVendor.getOrganizeCode(), "organizeCode", result); if (basVendor.getIsAsn() != null) { HqlPack.getStringLikerPack(basVendor.getIsAsn().toString(), "isAsn", result); } @@ -310,6 +312,7 @@ public class WmsHqlPack { } HqlPack.getStringLikerPack(wmsOpType.getProCode(), "proCode", result); HqlPack.getNumEqualPack(wmsOpType.getIsValid(), "isValid", result); + HqlPack.getStringEqualPack(wmsOpType.getOrganizeCode(), "organizeCode", result); return result.toString(); } @@ -425,7 +428,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsASNMaster.getPoNo(),"poNo",result); //有效性 HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result); - + HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result); return result.toString(); }