I3_YF_SEAT
/
i3plus-pojo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into test

Browse Source
yun-zuoyi
wei.peng 6 years ago
parent a1e69d404d af3cd73af4
commit 38be37aad0
15 changed files with 134 additions and 70 deletions
Show Stats Download Patch File Download Diff File

2
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
Unescape Escape View File

@ -390,7 +390,7 @@ public class WmsEnumUtil {
public enum LOCATE_TYPE {
COLLECT_LOCATE(10, "I", "收货库"),
BASICS_LOCATE(20, "P", "基础库"),
maneuver_LOCATE(30, "R", "机动库"),
MANEUVER_LOCATE(30, "R", "机动库"),
COMBINATION_LOCATE(40, "D", "组合库"),
LINE_LOCATE(50, "L", "线边库"),
NC_LOCATE(60, "N", "NC库");

63
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java
Unescape Escape View File

@ -1027,17 +1027,18 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public double findSumByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) {
if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
StringBuffer sb = new StringBuffer("select sum(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 ");
appendQL(sb,paramName,paramValue);
sb.append(" group by :groupByName");
StringBuffer sb = new StringBuffer("select sum(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 ");
appendQL(sb, paramName, paramValue);
sb.append(" group by model." + groupByName);
Query query = entityManager.createQuery(sb.toString());
query.setParameter(":sumPropertyName", sumPropertyName);
setParameter(query,paramName,paramValue);
query.setParameter(":groupByName", groupByName);
Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult();
return sumResult == null ? 0.0 : sumResult.doubleValue();
double sumResult = 0.0;
List<?> objList = query.getResultList();
if(objList.size() > 0){
sumResult = Double.parseDouble(objList.iterator().next().toString());
}
return sumResult;
}else{
throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
}
@ -1051,17 +1052,19 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public double findAvgByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) {
if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
StringBuffer sb = new StringBuffer("select avg(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 ");
StringBuffer sb = new StringBuffer("select avg(model."+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 ");
appendQL(sb,paramName,paramValue);
sb.append(" group by :groupByName");
sb.append(" group by model." + groupByName);
Query query = entityManager.createQuery(sb.toString());
query.setParameter(":sumPropertyName", sumPropertyName);
setParameter(query,paramName,paramValue);
query.setParameter(":groupByName", groupByName);
Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult();
return sumResult == null ? 0.0 : sumResult.doubleValue();
double sumResult = 0.0;
List<?> objList = query.getResultList();
if(objList.size() > 0){
sumResult = Double.parseDouble(objList.iterator().next().toString());
}
return sumResult;
}else{
throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
}
@ -1075,17 +1078,19 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public double findMaxByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) {
if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
StringBuffer sb = new StringBuffer("select max(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 ");
appendQL(sb,paramName,paramValue);
sb.append(" group by :groupByName");
StringBuffer sb = new StringBuffer("select max(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 ");
appendQL(sb, paramName, paramValue);
sb.append(" group by model." + groupByName);
Query query = entityManager.createQuery(sb.toString());
query.setParameter(":sumPropertyName", sumPropertyName);
setParameter(query,paramName,paramValue);
query.setParameter(":groupByName", groupByName);
Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult();
return sumResult == null ? 0.0 : sumResult.doubleValue();
double sumResult = 0.0;
List<?> objList = query.getResultList();
if(objList.size() > 0){
sumResult = Double.parseDouble(objList.iterator().next().toString());
}
return sumResult;
}else{
throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
}
@ -1099,17 +1104,19 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
@Override
public double findMinByProperties(String sumPropertyName, String groupByName, String[] paramName, Object[] paramValue) {
if ((paramName != null) && (paramName.length > 0) && (paramValue != null) && (paramValue.length > 0)) {
StringBuffer sb = new StringBuffer("select min(:"+sumPropertyName+") from " + persistentClass.getName() + " model where 1=1 ");
appendQL(sb,paramName,paramValue);
sb.append(" group by :groupByName");
StringBuffer sb = new StringBuffer("select min(model." + sumPropertyName + ") from " + persistentClass.getName() + " model where 1=1 ");
appendQL(sb, paramName, paramValue);
sb.append(" group by model." + groupByName);
Query query = entityManager.createQuery(sb.toString());
query.setParameter(":sumPropertyName", sumPropertyName);
setParameter(query,paramName,paramValue);
query.setParameter(":groupByName", groupByName);
Double sumResult = entityManager.createQuery(query.toString(),Double.class).getSingleResult();
return sumResult == null ? 0.0 : sumResult.doubleValue();
double sumResult = 0.0;
List<?> objList = query.getResultList();
if(objList.size() > 0){
sumResult = Double.parseDouble(objList.iterator().next().toString());
}
return sumResult;
}else{
throw new IllegalArgumentException("sum查询错误!paramName:" + paramName + ",paramValue:" + paramValue);
}

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java
Unescape Escape View File

@ -37,6 +37,10 @@ public class SysMenu extends BaseBean {
@ApiParam(value ="功能名称")
private String name;
@Column(name="NAME_ZH_SHORTENING")
@ApiParam(value ="功能名称中文简写")
private String nameZhShortening;
@Column(name="MENU_CODE")
@ApiParam(value ="功能代码")
private String menuCode;
@ -65,7 +69,7 @@ public class SysMenu extends BaseBean {
@Column(name="MENU_SORT")
@ApiParam(value ="资源排序", example = "0")
private String menuSort;
private Integer menuSort;
@Column(name="MENU_URL")
@ApiParam(value ="资源 url" , access ="资源 url")

10
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysRefUserDepartment.java
Unescape Escape View File

@ -45,11 +45,19 @@ public class SysRefUserDepartment extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long departmentId;
@Column(name="DEPARTMENT_NAME_RDD")
@ApiParam(value ="部门名称")
private String departmentNameRdd;
@Column(name="ORGANIZE_ID")
@ApiParam(value ="组织ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long organizeId;
@Column(name="ORGANIZE_NAME_RDD")
@ApiParam(value ="组织名称")
private String organizeNameRdd;
public SysRefUserDepartment() {
}

6
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java
Unescape Escape View File

@ -122,7 +122,7 @@ public class SysUserInfo extends BaseBean {
private List<SysDepartment> departmentList;
@Transient
@ApiParam("用户的部门ID信息")
@ApiParam("用户的部门ID信息集合")
private List<String> departmentIdList;
@Transient
@ -138,6 +138,10 @@ public class SysUserInfo extends BaseBean {
private List<SysOrganize> organizeList;
@Transient
@ApiParam("用户的组织ID信息集合")
private List<String> organizeIdList;
@Transient
@ApiParam(value ="用户岗位信息")
private SysDepartment department;

51
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysTaskTimeRecording.java → modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platbean/SysLogTaskTime.java
Unescape Escape View File

@ -1,4 +1,4 @@
package cn.estsh.i3plus.pojo.platform.bean;
package cn.estsh.i3plus.pojo.platform.platbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@ -26,46 +26,41 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_TASK_TIME_RECORDING")
@Api(value="定时任务执行记录",description = "定时任务执行记录")
public class SysTaskTimeRecording extends BaseBean {
@Table(name="SYS_LOG_TASK_TIME")
@Api(value="定时任务执行日志",description = "定时任务执行记录")
public class SysLogTaskTime extends BaseBean {
@Column(name="NAME")
@ApiParam(value ="任务名称")
private String name;
@Column(name="GROUP_NAME")
@ApiParam(value ="任务组名称")
private String groupName;
@Column(name="TIME_TASK_ID")
@ApiParam(value ="任务编号" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long timeTaskId;
@Column(name="TIME_ID")
@ApiParam(value ="时间表达式ID" , example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
private Long timeId;
@Column(name="TIME_EXPRESSION_NAME_Rdd")
@ApiParam(value ="时间表达式名称")
private String timeExpressionNameRdd;
@Column(name="TIME_EXPRESSION_RDD")
@Column(name="TIME_EXPRESSION_CONTENT_RDD")
@ApiParam(value ="时间表达式")
private String timeExpressionRdd;
@Column(name="TASK_START_DATE_TIME")
@ApiParam(value ="任务开始时间")
private String taskStartDateTime;
@Column(name="TASK_END_DATE_TIME")
@ApiParam(value ="任务结束时间")
private String taskEndDateTime;
@Column(name="TASK_STATUS_ID")
private String timeExpressionContentRdd;
@Column(name="EXECUTE_TIME")
@ApiParam(value ="执行耗时")
@JsonSerialize(using = ToStringSerializer.class)
private Long executeTime;
@Column(name="TASK_STATUS")
@ApiParam(value ="任务完成情况(枚举：1正常，2失败)")
private Integer taskStatusId;
@Column(name="TASK_LOG")
@ApiParam(value ="任务日志")
private String taskLog;
private Integer taskStatus;
@Column(name="TASK_LOG_ERROR")
@ApiParam(value ="任务异常日志")
private String taskLogError;
}

14
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/platrepositorymongo/SysLogTaskTimeRepository.java
Unescape Escape View File

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.platform.platrepositorymongo;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseMongoRepository;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
/**
* @Description :
* @Reference :
* @Author : yunhao
* @CreateDate : 2018-12-20 22:35
* @Modify:
**/
public interface SysLogTaskTimeRepository extends BaseMongoRepository<SysLogTaskTime, Long> {
}

4
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/SysTaskTimeRecordingRepository.java
Unescape Escape View File

@ -1,7 +1,7 @@
package cn.estsh.i3plus.pojo.platform.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeRecording;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
/**
* @Description : 定时任务执行记录
@ -10,5 +10,5 @@ import cn.estsh.i3plus.pojo.platform.bean.SysTaskTimeRecording;
* @Date : 2018-10-22 12:03:01.409
* @Modify :
**/
public interface SysTaskTimeRecordingRepository extends BaseRepository<SysTaskTimeRecording, Long> {
public interface SysTaskTimeRecordingRepository extends BaseRepository<SysLogTaskTime, Long> {
}

29
modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java
Unescape Escape View File

@ -133,12 +133,12 @@ public class CoreHqlPack {
public static String packHqlSysDepartment(SysDepartment department){
StringBuffer result = new StringBuffer();
if(department.getOrganizeId() != null && department.getOrganizeId() > 0){
department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
}
// if(department.getOrganizeId() != null && department.getOrganizeId() > 0){
// department.setParentId(CommonEnumUtil.PARENT.DEFAULT.getValue());
// }
HqlPack.getNumEqualPack(department.getParentId(),"parentId",result);
HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result);
// HqlPack.getNumEqualPack(department.getOrganizeId(),"organizeId",result);
HqlPack.getStringLikerPack(department.getName(),"name",result);
HqlPack.getStringLikerPack(department.getDepartmentCode(),"departmentCode",result);
@ -390,6 +390,27 @@ public class CoreHqlPack {
}
/**
* 用户信息 复杂查询拼接
* @param userInfo
* @return
*/
public static String packHqlSysUserInfo(SysUserInfo userInfo,List<Long> idList){
StringBuffer result = new StringBuffer();
// And
HqlPack.getNumEqualPack(userInfo.getUserInfoStatus(),"userInfoStatus",result);
if(idList != null && idList.size() > 0){
HqlPack.getInPack(StringUtils.join(idList, ","), "id", result);
}
// Like
HqlPack.getStringLikerPack(userInfo.getName(),"name",result);
HqlPack.getStringLikerPack(userInfo.getUserEmpNo(),"userEmpNo",result);
return result.toString();
}
/**
* 查询语言代码是否重复
* @param localeLanguage
* @return

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java
Unescape Escape View File

@ -69,4 +69,9 @@ public class WmsActionGroupDetails extends BaseBean {
@ApiParam(value = "作业步骤名称")
private String asName;
@Transient
@ApiParam(value = "流程名称")
private String agName;
}

3
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogDetails.java
Unescape Escape View File

@ -105,7 +105,8 @@ public class WmsActionLogDetails extends BaseBean {
}
public WmsActionLogDetails(String createUser, Long id, Integer seq) {
public WmsActionLogDetails(Long amId,String createUser, Long id, Integer seq) {
this.asId = amId;
this.createUser = createUser;
this.id = id;
this.seq = seq;

5
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionResponseBean.java
Unescape Escape View File

@ -30,7 +30,7 @@ public class WmsActionResponseBean<Obj> {
public Map<String, Obj> barCode;
@ApiParam("进度")
public String percent;
public String percent ="0";
@ApiParam("当前步骤")
public Integer currentStep;
@ -71,6 +71,9 @@ public class WmsActionResponseBean<Obj> {
@ApiParam(value = "关键字段列名")
public String keyColumn;
@ApiParam(value = "是否完成流程操作")
public Boolean isComplete = false;
public WmsActionResponseBean(Boolean codeStatus, String message) {
this.codeStatus = codeStatus;
this.message = message;

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
Unescape Escape View File

@ -77,7 +77,7 @@ public class WmsMoveDetails extends BaseBean {
public String srcLocateNo;
@Column(name="DEST_WH_NO")
@ApiParam("目标库位代码")
@ApiParam("目标仓库代码")
public String destWhNo;
@Column(name="DEST_ZONE_NO")

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/WmsMoveDetailsRepository.java
Unescape Escape View File

@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.wms.bean.WmsMoveDetails;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;
import java.util.List;
/**
* @Description : 库存移动单明细信息
* @Reference :

2
modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
Unescape Escape View File

@ -1066,7 +1066,7 @@ public class WmsHqlPack {
//查询参数封装
HqlPack.getNumEqualPack(wmsActionModuleParam.getAmID(), "amID", result);
HqlPack.getNumEqualPack(wmsActionModuleParam.getParamType(), "paramType", result);
HqlPack.getNumNOEqualPack(wmsActionModuleParam.getParamType(), "paramType", result);
getStringBuilderPack(wmsActionModuleParam, result);
return result.toString();

Write Preview
Loading…
Cancel
Save