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

Merge branch 'test'

Browse Source
yun-zuoyi
peter.pan 6 years ago
parent f4613c2f5c 53d34096f7
commit 24f7ae3471
12 changed files with 242 additions and 45 deletions
Show Stats Download Patch File Download Diff File

20
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonManageQueue.java
Unescape Escape View File

@ -7,10 +7,13 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.beanutils.BeanUtils;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
/**
@ -394,4 +397,21 @@ public class AndonManageQueue extends BaseBean {
public AndonManageQueue() {
}
public static void main(String[] args) {
try {
List ds = new ArrayList();
ds.add(new AndonManageQueue());
System.out.println(BeanUtils.describe(ds));
} catch (IllegalAccessException e) {
e.printStackTrace();
} catch (InvocationTargetException e) {
e.printStackTrace();
} catch (NoSuchMethodException e) {
e.printStackTrace();
}
}
}

7
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/bean/AndonPLC.java
Unescape Escape View File

@ -75,4 +75,11 @@ public class AndonPLC extends BaseBean {
@Column(name = "IS_ALARM_STATUS")
@ApiParam(value = "是否按灯状态", example = "1")
private Integer isAlarmStatus;
public int getIsAlarmStatusVal(){
if(isAlarmStatus == null){
return 0;
}
return isAlarmStatus.intValue();
}
}

27
modules/i3plus-pojo-andon/src/main/java/cn.estsh.i3plus.pojo.andon/sqlpack/AndonHqlPack.java
Unescape Escape View File

@ -196,15 +196,15 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result);
DdlPreparedPack.getInPackArray(obj, "statusCode", result);
getStringBuilderPack(andonManageQueue, result);
if(andonManageQueue.getCallTimeStart() != null || andonManageQueue.getCallTimeEnd() != null){
if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){
DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
}
getStringBuilderPack(andonManageQueue, result);
// 根据优先级倒序，序号升序排序
DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
new String[]{"priorityLevel", "seq"}, result);
// DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
// new String[]{"priorityLevel", "seq"}, result);
result.setOrderByStr(andonManageQueue.orderBy());
return result;
}
@ -418,6 +418,23 @@ public class AndonHqlPack {
return result;
}
/**
* 模糊查询安灯子类型信息
* @param andonAlarmDetailType
* @return
*/
public static DdlPackBean packAndonAlarmDetailTypeLike(AndonAlarmDetailType andonAlarmDetailType) {
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getStringEqualPack(andonAlarmDetailType.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringLikerPack(andonAlarmDetailType.getAlarmDetailCode(), "alarmDetailCode", result);
DdlPreparedPack.getStringLikerPack(andonAlarmDetailType.getAlarmDetailName(), "alarmDetailName", result);
getStringBuilderPack(andonAlarmDetailType, result);
return result;
}
//
// /**
// * 安灯类型查询条件封装

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

@ -247,7 +247,9 @@ public class CommonEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum USER_TYPE {
USER(1, "user", "普通用户"), ADMIN(2, "admin", "系统管理员"), SA(3, "sa", "超级管理员");
USER(1, "user", "普通用户"),
ADMIN(2, "admin", "系统管理员"),
SA(3, "sa", "超级管理员");
private int value;
private String code;
@ -281,6 +283,26 @@ public class CommonEnumUtil {
return tmp;
}
public static USER_TYPE valueOfCode(String code) {
USER_TYPE tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i];
}
}
return tmp;
}
public static USER_TYPE valueOfDescription(String description) {
USER_TYPE tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(description)) {
tmp = values()[i];
}
}
return tmp;
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {

65
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/BsonPackTool.java
Unescape Escape View File

@ -109,7 +109,6 @@ public class BsonPackTool {
return list;
}
/**
* 封装日期
* @param startDate 开始日期
@ -161,7 +160,7 @@ public class BsonPackTool {
* @param showToday 如果没有开始时间和结束时间，是否查询当天时间，还是查询所有时间。true:查询当天时间，false:查询所有
* @param isShowTime 是否包含时分秒
*/
public static Bson timeBuilder( String date, String columnName, Bson bson, Boolean showToday,boolean isShowTime) {
public static Bson timeBuilder( String date, String columnName, Bson bson, boolean showToday,boolean isShowTime) {
if(date != null && !"null".equals(date) && date.trim().length() > 0){
date = getSafeParam(date);
@ -249,6 +248,68 @@ public class BsonPackTool {
}
/**
* 大于日期
* @param dateTime 日期
* @param columnName HQL里对应的时间字段
* @param bson 封装的bson
* @param isShowTime 是否包含时分秒
*/
public static Bson timeMore( String dateTime, String columnName, Bson bson, boolean isShowTime) {
if (dateTime == null || dateTime.trim().length() == 0) {
dateTime = "1900-01-01";
} else {
dateTime = getSafeParam(dateTime);
dateTime = dateTime.trim();
}
if (isShowTime && dateTime.trim().length()<=11) {
dateTime+= " 00:00:00";
}
if(bson == null) {
bson = Filters.and(
Filters.gte(columnName, dateTime) //大于等于开始日期
);
}else{
bson = Filters.and(
bson,
Filters.gte(columnName, dateTime) //大于等于开始日期
);
}
return bson;
}
/**
* 小于日期
* @param dateTime 日期
* @param columnName HQL里对应的时间字段
* @param bson 封装的bson
* @param isShowTime 是否包含时分秒
*/
public static Bson timeLess( String dateTime, String columnName, Bson bson, boolean isShowTime) {
if (dateTime == null || dateTime.trim().length() == 0) {
dateTime = "2100-01-01";
} else {
dateTime = getSafeParam(dateTime);
dateTime = dateTime.trim();
}
if (isShowTime&& dateTime.trim().length()<=11) {
dateTime+= " 23:59:59";
}
if(bson == null) {
bson = Filters.and(
Filters.lte(columnName, dateTime) //小于等于结束日期
);
}else{
bson = Filters.and(
bson,
Filters.lte(columnName, dateTime) //小于等于结束日期
);
}
return bson;
}
/**
* 封装String对象成like语句
* @param str 对象值
* @param columnName 列名

9
modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/util/BaseRedis.java
Unescape Escape View File

@ -50,6 +50,15 @@ public interface BaseRedis {
Object getObject(Object key);
/**
* 普通缓存获取
* @param key 键
* @param start 开始
* @param end 结束 0 到 -1代表所有值
* @return 值
*/
Object getObject(Object key, long start, long end);
/**
* 普通缓存放入
* @param key 键
* @param value 值

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

@ -9,6 +9,7 @@ import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.Transient;
@ -55,7 +56,8 @@ public class SysLocaleResource extends BaseBean {
@ApiParam(value = "资源KEY",example = "格式A.B，全部大写，参考命名规范开发文档")
private String resourceKey;
@Column(name="resource_value",columnDefinition="TEXT")
@Lob
@Column(name="resource_value")
@ApiParam(value = "资源Value",example = "通过resourceType，languageId和key获取")
private String resourceValue;

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

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.platform.sqlpack;
import cn.estsh.i3plus.pojo.base.tool.BsonPackTool;
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogException;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogOperate;
import cn.estsh.i3plus.pojo.platform.platbean.SysLogSystem;
@ -19,82 +20,97 @@ public class CoreBsonPack {
/**
* 日志复杂查询
*
* @param logSystem
* @return
*/
public static Bson packBsonByLogSystem(SysLogSystem logSystem){
public static Bson packBsonByLogSystem(SysLogSystem 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);
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;
}
/**
* 系统操作日志
*
* @param logOperate
* @return
*/
public static Bson packBsonByLogOperate(SysLogOperate logOperate){
public static Bson packBsonByLogOperate(SysLogOperate logOperate) {
Bson bson = new BasicDBObject();
bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(),"operateType",bson);
bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(),"operateModule",bson);
bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(),"createDatetime",bson,false,false);
bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(),"remoteIp",bson);
bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(),"operateMessage",bson);
bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(),"createUser",bson);
bson = BsonPackTool.getNumEqualPack(logOperate.getOperateType(), "operateType", bson);
bson = BsonPackTool.getNumEqualPack(logOperate.getOperateModule(), "operateModule", bson);
bson = BsonPackTool.timeBuilder(logOperate.getCreateDatetime(), "createDatetime", bson, false, false);
bson = BsonPackTool.getStringLikerPack(logOperate.getRemoteIp(), "remoteIp", bson);
bson = BsonPackTool.getStringLikerPack(logOperate.getOperateMessage(), "operateMessage", bson);
bson = BsonPackTool.getStringLikerPack(logOperate.getCreateUser(), "createUser", bson);
return bson;
}
/**
* 系统异常日志复杂查询
*
* @param sysLogException
* @return
*/
public static Bson packBsonBySysLogException(SysLogException sysLogException){
public static Bson packBsonBySysLogException(SysLogException sysLogException) {
Bson bson = new BasicDBObject();
bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(),"excModule",bson);
bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(),"excMessage",bson);
bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(),"createDatetime",bson,false,false);
bson = BsonPackTool.getNumEqualPack(sysLogException.getExcModule(), "excModule", bson);
bson = BsonPackTool.getStringLikerPack(sysLogException.getExcMessage(), "excMessage", bson);
bson = BsonPackTool.timeBuilder(sysLogException.getCreateDatetime(), "createDatetime", bson, false, false);
return bson;
}
/**
* 定时任务日志复杂查询
*
* @param sysLogTaskTime
* @return
*/
public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime){
public static Bson packBsonByLogTaskTime(SysLogTaskTime sysLogTaskTime) {
Bson bson = new BasicDBObject();
bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(),"name",bson);
bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(),"groupName",bson);
bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(),"createDatetime",bson,false,false);
bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getName(), "name", bson);
bson = BsonPackTool.getStringLikerPack(sysLogTaskTime.getGroupName(), "groupName", bson);
bson = BsonPackTool.timeBuilder(sysLogTaskTime.getCreateDatetime(), "createDatetime", bson, false, false);
return bson;
}
/**
* 区间
*
* @param colName
* @param min
* @param max
* @return
*/
public static Bson packBsonByInterval(String colName,Object min,Object max){
public static Bson packBsonByInterval(String colName, Object min, Object max) {
Bson bson = new BasicDBObject();
bson = BsonPackTool.getNumBiggerPack(min,colName,bson);
bson = BsonPackTool.getNumSmallerPack(max,colName,bson);
bson = BsonPackTool.getNumBiggerPack(min, colName, bson);
bson = BsonPackTool.getNumSmallerPack(max, colName, bson);
return bson;
}}
}
/**
* 指定日期之后
* @param dateTime 日期
* @return
*/
public static Bson packBsonByDateTimeAfter(String dateTime){
return BsonPackTool.timeLess(dateTime, "createDatetime", null, true);
}
}

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

@ -98,14 +98,19 @@ public class CoreHqlPack {
* @return
*/
public static DdlPackBean packHqlSysPosition(SysPosition position){
DdlPackBean result = new DdlPackBean();
return packHqlSysPosition(position,null);
}
public static DdlPackBean packHqlSysPosition(SysPosition position,List<Long> idList){
DdlPackBean result = new DdlPackBean();
// 查询参数封装
DdlPreparedPack.getNumEqualPack(position.getParentId(),"parentId",result);
DdlPreparedPack.getStringEqualPack(position.getName(),"name",result);
DdlPreparedPack.getStringEqualPack(position.getPositionCode(),"positionCode",result);
DdlPreparedPack.getStringEqualPack(position.getOrganizeCode(),"organizeCode",result);
// String Like
DdlPreparedPack.getStringLikerPack(position.getName(),"name",result);
DdlPreparedPack.getStringLikerPack(position.getPositionCode(),"positionCode",result);
// In
DdlPreparedPack.getInPackList(idList,"id",result);
return result;
}
@ -217,6 +222,7 @@ public class CoreHqlPack {
* @param role
* @return
*/
@Deprecated
public static String packHqlSysRole(SysRole role){
StringBuffer result = new StringBuffer();
@ -231,6 +237,27 @@ public class CoreHqlPack {
}
/**
* 系统角色复杂查询
* @param role
* @return
*/
public static DdlPackBean packDdlBeanSysRole(SysRole role){
return packDdlBeanSysRole(role,null);
}
public static DdlPackBean packDdlBeanSysRole(SysRole role,List<Long> idList){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
DdlPreparedPack.getNumEqualPack(role.getRoleStatus(),"roleStatus",result);
DdlPreparedPack.getStringLikerPack(role.getName(),"name",result);
DdlPreparedPack.getInPackList(idList,"id",result);
return result;
}
/**
* 系统参数复杂查询
* @param config
* @return
@ -797,6 +824,19 @@ public class CoreHqlPack {
return ddlPackBean;
}
public static DdlPackBean packDdlBeanSysRefUserRole(SysRefUserRole ref){
DdlPackBean result = new DdlPackBean();
// Number Eq
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(),"isValid",result);
DdlPreparedPack.getNumEqualPack(ref.getUserId(),"userId",result);
// String Eq
DdlPreparedPack.getStringEqualPack(ref.getOrganizeCode(),"organizeCode",result);
return result;
}
/**
* 查询当前用户所有组织数据
* @param sysRefUserDepartments

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

@ -42,19 +42,19 @@ public class SapCyco extends SapBase{
@ApiParam(value = "库存状态")
@AnnoOutputColumn
private String zstat;
private String zstat="";
@ApiParam(value = "特殊库存标识")
@AnnoOutputColumn
private String sobkz;
private String sobkz="";
@ApiParam(value = "项目号")
@AnnoOutputColumn
private String zxm;
private String zxm="";
@ApiParam(value = "库存账冻结标志")
@AnnoOutputColumn
private String zdjbs;
private String zdjbs="";
@ApiParam(value = "删除标识")
@AnnoOutputColumn

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

@ -141,7 +141,7 @@ public class WmsPart extends BaseBean {
@Column(name = "OUT_CLOSE_FLAG")
@ApiParam("項目结算标识")
private String outCloseFlag;
private String outCloseFlag = "2";
@Transient
@ApiParam("总数量")
@ -153,7 +153,7 @@ public class WmsPart extends BaseBean {
@Column(name = "IS_PROD_LOT")
@ApiParam(value = "是否录入生产批次", example = "1")
private Integer isProdLot;
private Integer isProdLot = 2;
public int getIqcValue(){
return this.iqc == null ? 0 : this.iqc.intValue();

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

@ -807,6 +807,9 @@ public class WmsHqlPack {
DdlPreparedPack.getStringEqualPack(wmsStockSn.getSn(), "sn", result);
DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
DdlPreparedPack.getNumEqualPack(wmsStockSn.getQcStatus(), "qcStatus", result);
getStringBuilderPack(wmsStockSn, result);
return result;

Write Preview
Loading…
Cancel
Save