Merge remote-tracking branch 'remotes/origin/dev' into test

yun-zuoyi
汪云昊 5 years ago
commit 39d6609a5f

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -59,4 +59,8 @@ public class AndonAlarmType extends BaseBean implements Serializable {
@ApiParam("安灯类型名称")
private String description;
@Transient
@ApiParam("工作中心")
private String workCenterCode;
}

@ -0,0 +1,41 @@
package cn.estsh.i3plus.pojo.andon.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author wangjie
* @date 2020/2/12 17:41
* @desc
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@Table(name = "ANDON_AREA_ALARM_TYPE")
@EqualsAndHashCode(callSuper = true)
@Api("区域安灯类型")
public class AndonAreaAlarmType extends BaseBean implements Serializable {
private static final long serialVersionUID = -6551224785612729594L;
@Column(name = "AREA_CODE")
@ApiParam("区域代码")
private String areaCode;
@Column(name = "ALARM_CODE")
@ApiParam("安灯类型代码")
private String alarmCode;
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.andon.repository;
import cn.estsh.i3plus.pojo.andon.bean.AndonAreaAlarmType;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import org.springframework.stereotype.Repository;
/**
* @Description :
* @Reference :
* @Author : wangjie
* @CreateDate : 2019-05-30 11:05
* @Modify:
**/
@Repository
public interface IAndonAreaAlarmTypeRepository extends BaseRepository<AndonAreaAlarmType, Long> {
}

@ -1090,4 +1090,11 @@ public class AndonHqlPack {
DdlPreparedPack.getNumEqualPack(routeStatusErrorRecord.getHandleStatus(), "handleStatus", packBean);
return packBean;
}
public static DdlPackBean getAndonAreaAlarmType(AndonAreaAlarmType areaAlarmType, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(areaAlarmType, organizeCode);
DdlPreparedPack.getStringLikerPack(areaAlarmType.getAreaCode(), "areaCode", packBean);
DdlPreparedPack.getStringLikerPack(areaAlarmType.getAlarmCode(), "alarmCode", packBean);
return packBean;
}
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -1006,7 +1006,7 @@ public class CommonEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum USER_LOGIN_STATUS {
LOGIN_SUCCESS(1, "登录成功", "登录成功"),
WRONG_PASSWORD(3, "密码错误", "Linux 密码错误"),
WRONG_PASSWORD(3, "密码错误", "用户密码错误"),
WRONG_USERNAME_OR_PASSWORD(2, "用户名或密码错误", "用户名或密码错误"),
USER_LOGIN_LOCKING(4, "账号已锁定", "账号已锁定"),
USER_INFO_NULL(5, "用户信息不存在", "用户信息不存在"),

@ -843,7 +843,8 @@ public class ImppEnumUtil {
DATE(3, "date", "时间"),
SWITCH(4, "switch", "布尔"),
SELECT(5, "select", "选择"),
FILE(6, "select", "选择");
FILE(6, "select", "选择"),
ARRAY(7, "array", "数组");
private int value;
private String name;

@ -3264,7 +3264,11 @@ public class MesEnumUtil {
JIT_ORDER(50, "JIT工单"),
STOCK_ORDER(60, "库存工单"),
REPAIR(70, "返修插单"),
FICTIVE(80, "虚拟工单");
EMERGENCY_ORDER(80, "紧急插单"),
FICTIVE(90, "虚拟工单"),
SPARE_PART_PRODUCTION(100, "备件生产"),
REPRODUCTION_RMS(110, "重新生产-报功"),
REPRODUCTION_NOT_RMS(120, "重新生产-不报功");
private int value;
private String description;
@ -6486,18 +6490,17 @@ public class MesEnumUtil {
}
/**
* JIT
* JIT
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum QUEUE_JIT_PLAN_WORK_ORDER_TYPE {
SPARE_PART_PRODUCTION(10, "备件生产"),
REPRODUCTION_RMS(20, "重新生产-报功"),
REPRODUCTION_NOT_RMS(30, "重新生产-不报功");
public enum JIT_ISSUE_CFG_TYPE {
ORDER_CACHE(10, "订单池"),
LOCK_CACHE(20, "锁定池");
private Integer value;
private String description;
QUEUE_JIT_PLAN_WORK_ORDER_TYPE(Integer value, String description) {
JIT_ISSUE_CFG_TYPE(Integer value, String description) {
this.value = value;
this.description = description;
}
@ -6513,7 +6516,79 @@ public class MesEnumUtil {
public static String valueOfDescription(Integer value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
if (values()[i].value == value) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* JIT
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum JIT_ORDER_CACHE_STATUS {
CREATE(10, "创建"),
COMPLETE(20, "完成"),
CANCEL(30, "取消");
private Integer value;
private String description;
JIT_ORDER_CACHE_STATUS(Integer value, String description) {
this.value = value;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(Integer value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* JIT
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum JIT_LOCK_CACHE_STATUS {
CREATE(10, "创建"),
RELEASE(20, "下达"),
ONLINE_COMPLETE(30, "上线完成");
private Integer value;
private String description;
JIT_LOCK_CACHE_STATUS(Integer value, String description) {
this.value = value;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getDescription() {
return description;
}
public static String valueOfDescription(Integer value) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
tmp = values()[i].description;
}
}

@ -1787,7 +1787,8 @@ public class MesPcnEnumUtil {
PAUSE(40, "暂停"),
CANCEL(50, "取消"),
CLOSE(60, "关闭"),
COMPLETE(70, "完成");
COMPLETE(70, "完成"),
FICTIVE(80, "虚拟工单");
private int value;
private String description;
@ -1829,7 +1830,11 @@ public class MesPcnEnumUtil {
JIT_ORDER(50, "JIT工单"),
STOCK_ORDER(60, "库存工单"),
REPAIR(70, "返修插单"),
EMERGENCY_ORDER(80, "紧急插单");
EMERGENCY_ORDER(80, "紧急插单"),
FICTIVE(90, "虚拟工单"),
SPARE_PART_PRODUCTION(100, "备件生产"),
REPRODUCTION_RMS(110, "重新生产-报功"),
REPRODUCTION_NOT_RMS(120, "重新生产-不报功");
private int value;
private String description;

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -55,8 +55,9 @@ public class LacHqlPack {
}
public static DdlPackBean packHqlLacLogTaskDetail(LacLogTaskDetail bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
DdlPreparedPack.getNumEqualPack(bean.getLogTaskId(),"logTaskId",ddlPackBean);
return ddlPackBean;
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -125,8 +125,8 @@ public class IfQueueShipping extends BaseBean implements Serializable {
private String itemUnit;
@Column(name = "JIT_SEQ")
@ApiParam("jit排序号")
private Double jitSeq;
@ApiParam("JIT排序号")
private String jitSeq;
@Column(name = "JIT_TYPE_FLAG")
@ApiParam("JIT类型标识")

@ -31,6 +31,11 @@ import java.io.Serializable;
@Api("工位投料信息")
public class MesCellFeed extends BaseBean implements Serializable {
private static final long serialVersionUID = 1947971369479107782L;
@Column(name = "ORDER_NO")
@ApiParam("工单号")
private String orderNo;
@Column(name = "WORK_CENTER_CODE")
@ApiParam("工作中心")
private String workCenterCode;
@ -68,10 +73,6 @@ public class MesCellFeed extends BaseBean implements Serializable {
private String supplierCode;
@Transient
@ApiParam("工单号")
private String orderNo;
@Transient
@ApiParam(value = "原料类型名称")
private String rawTypeName;

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/7/3 5:06
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_JIT_ISSUE_CFG")
@Api("MES_客户JIT队列下达配置")
public class MesJitIssueCfg extends BaseBean implements Serializable {
private static final long serialVersionUID = 1475207048628221791L;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户工厂代码")
private String custPlantCode;
@Column(name = "QTY")
@ApiParam("数量")
private Integer qty;
@Column(name = "THRESHOLD_QTY")
@ApiParam("触发阈值")
private Integer thresholdQty;
@Column(name = "CFG_TYPE")
@ApiParam("缓存类型")
private Integer cfgType;
@Transient
@ApiParam("当前JIT缓存数")
private Integer currentJitCacheNum;
@Transient
@ApiParam("其他工单数")
private Integer otherWorkNum = 0;
}

@ -0,0 +1,52 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/7/3 5:14
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_JIT_LOCK_CACHE")
@Api("MES_JIT队列锁定池")
public class MesJitLockCache extends BaseBean implements Serializable {
private static final long serialVersionUID = -308930683558229105L;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户工厂代码")
private String custPlantCode;
@Column(name = "JIT_ACTUAL_NO")
@ApiParam("队列编号")
private String jitActualNo;
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "WO_TYPE")
@ApiParam("工单类型")
private Integer woType;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
}

@ -0,0 +1,55 @@
package cn.estsh.i3plus.pojo.mes.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/7/3 5:11
* @Modify:
*/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name = "MES_JIT_ORDER_CACHE")
@Api("MES_JIT队列订单池")
public class MesJitOrderCache extends BaseBean implements Serializable {
private static final long serialVersionUID = -613326904053045367L;
@Column(name = "CUST_PLANT_CODE")
@ApiParam("客户工厂代码")
private String custPlantCode;
@Column(name = "JIT_ACTUAL_NO")
@ApiParam("队列编号")
private String jitActualNo;
@Column(name = "VIN_CODE")
@ApiParam("vin")
private String vinCode;
@Column(name = "WO_TYPE")
@ApiParam("工单类型")
private Integer woType;
@Column(name = "STATUS")
@ApiParam("状态")
private Integer status;
@Column(name = "SEQ")
@ApiParam("序号")
private Integer seq;
}

@ -126,6 +126,10 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
@ApiParam("锁定标识")
private Integer isLock;
@Column(name = "WO_TYPE")
@ApiParam("工单类型")
private Integer woType;
@Transient
@ApiParam("客户需求开始时间")
private String custPointStartDate;

@ -96,4 +96,8 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable {
@Column(name = "ASSY_NO")
@ApiParam("组件编号")
private String assyNo;
@Transient
@ApiParam("工单类型")
private Integer woType;
}

@ -65,6 +65,14 @@ public class MesScrapRecord extends BaseBean implements Serializable {
@ApiParam("工位")
private String workCellCode;
@Column(name = "WORK_ORDER_NO")
@ApiParam("工单编号")
private String workOrderNo;
@Column(name = "QTY")
@ApiParam("数量")
private Double qty;
@Column(name = "MEMO")
@ApiParam("备注")
private String memo;

@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.*;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @Description:

@ -55,7 +55,4 @@ public class ButtonComponentReqModel {
@ApiParam("用户信息")
private String userInfo;
@ApiParam("json数据")
private String data;
}

@ -21,12 +21,18 @@ public class InjectionProductionControlModel {
@ApiParam("当前合格数量")
private String standardQtyCur;
@ApiParam("当前合格数量")
@ApiParam("总完成数量")
private String completeQty;
@ApiParam("总不合格数量")
private String scrapQty;
@ApiParam("已打包数量")
private String packageQty;
@ApiParam("未打包数量")
private String unPackageQty;
@ApiParam("包装编号")
private String packageNo;
@ -39,4 +45,7 @@ public class InjectionProductionControlModel {
@ApiParam("箱条码状态")
private String printStatusName;
@ApiParam("序号")
private Integer index;
}

@ -0,0 +1,32 @@
package cn.estsh.i3plus.pojo.mes.model;
import io.swagger.annotations.ApiParam;
import lombok.Data;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/7/4 10:26
* @Modify:
*/
@Data
public class JitIssueCfgModel {
@ApiParam("客户工厂代码")
private String custPlantCode;
@ApiParam("数量")
private Integer qty;
@ApiParam("触发阈值")
private Integer thresholdQty;
@ApiParam("当前JIT缓存数")
private Integer currentJitCacheNum;
@ApiParam("其他工单数")
private Integer otherWorkNum = 0;
@ApiParam("缓存类型")
private String cfgType;
}

@ -53,4 +53,7 @@ public class PaintCheckModel {
@ApiParam("界面组件参数数据")
List<MesWindowModuleParam> windowModuleParamList;
private String defectType;
private String defectDesc;
}

@ -61,4 +61,6 @@ public class PaintWorkOrderSnModel extends BaseBean {
private String parentPartName;
private List<ProdPackModel> prodPackageList;
private String partNameRdd;
}

@ -250,12 +250,14 @@ public class QueueOrderModel implements Serializable {
this.produceCategoryCode = produceCategoryCode;
}
public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode) {
// getQueueOrderBySerialNumber
public QueueOrderModel(Long id, String queueGroupNo,String jitLotNo,String vinCode, String organizeCode, String produceCategoryCode, String workType) {
this.id = id;
this.queueGroupNo = queueGroupNo;
this.jitLotNo = jitLotNo;
this.vinCode = vinCode;
this.organizeCode = organizeCode;
this.produceCategoryCode = produceCategoryCode;
this.workType = workType;
}
}

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesJitIssueCfg;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/7/3 5:21
* @Modify:
*/
public interface MesJitIssueCfgRepository extends BaseRepository<MesJitIssueCfg, Long> {
}

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesJitLockCache;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/7/3 5:23
* @Modify:
*/
public interface MesJitLockCacheRepository extends BaseRepository<MesJitLockCache, Long> {
}

@ -0,0 +1,13 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesJitOrderCache;
/**
* @Description:
* @Author: jokelin
* @Date: 2020/7/3 5:22
* @Modify:
*/
public interface MesJitOrderCacheRepository extends BaseRepository<MesJitOrderCache, Long> {
}

@ -3198,4 +3198,21 @@ public class MesHqlPack {
}
return packBean;
}
/**
* JIT
* @param jitIssueCfg
* @param organizeCode
* @return
*/
public static DdlPackBean getMesJitIssueCfg(MesJitIssueCfg jitIssueCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(jitIssueCfg, organizeCode);
if (!StringUtils.isEmpty(jitIssueCfg.getCustPlantCode())) {
DdlPreparedPack.getStringLikerPack(jitIssueCfg.getCustPlantCode(), "custPlantCode", packBean);
}
if (jitIssueCfg.getCfgType() != null) {
DdlPreparedPack.getNumEqualPack(jitIssueCfg.getCfgType(), "cfgType", packBean);
}
return packBean;
}
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -1,6 +1,5 @@
package cn.estsh.i3plus.pojo.model.lac;
import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
@ -29,10 +28,4 @@ public class LacSuitRequest implements Serializable {
*/
private List<Task> taskList;
/**
*
*/
@XStreamCDATA
private String paramList;
}

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.platform.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -10,7 +9,6 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Subselect;
import javax.persistence.*;
import java.util.List;
@ -32,6 +30,7 @@ import java.util.List;
public class SysMessage extends BaseBean {
private static final long serialVersionUID = -6090909263221993356L;
@Column(name = "MESSAGE_TITLE")
@ApiParam(value = "消息标题", access = "消息标题")
private String messageTitle;
@ -45,7 +44,7 @@ public class SysMessage extends BaseBean {
private Integer messageType;
public int getMessageTypeValue() {
if(this.messageType == null){
if (this.messageType == null) {
return 0;
} else {
return this.messageType.intValue();

@ -13,7 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.text.DecimalFormat;
import javax.persistence.Transient;
import java.util.List;
/**
* @Description : -
@ -50,10 +51,18 @@ public class SysRefRoleMenu extends BaseBean {
@JsonSerialize(using = ToStringSerializer.class)
private Long roleId;
@Column(name="SOFT_TYPE")
@ApiParam(value ="产品类型")
private Integer softType;
@Column(name="ROLE_NAME_Rdd")
@ApiParam(value ="角色名称" , access ="角色名称")
private String roleNameRdd;
@Transient
@ApiParam(value ="权限ID列表" , access ="权限ID列表")
private List<Long> menuIdList;
public SysRefRoleMenu() {
}

@ -587,10 +587,11 @@ public class CoreHqlPack {
DdlPreparedPack.getNumEqualPack(user.getUserStatus(), "userStatus", result);
// DdlPreparedPack.getNumEqualPack(user.getDepartmentId(),"departmentId",result);
DdlPreparedPack.getStringLikerPack(user.getUserLoginName(), "userLoginName", result);
DdlPreparedPack.getStringLikerPack(user.getUserName(), "userName", result);
DdlPreparedPack.getStringLikerPack(user.getUserEmail(), "userEmail", result);
DdlPreparedPack.getStringLikerPack(user.getUserPhone(), "userPhone", result);
DdlPreparedPack.getStringLikerPack(user.getUserLoginName(),"userLoginName",result);
DdlPreparedPack.getStringLikerPack(user.getUserName(),"userName",result);
DdlPreparedPack.getStringLikerPack(user.getUserEmail(),"userEmail",result);
DdlPreparedPack.getStringLikerPack(user.getUserPhone(),"userPhone",result);
DdlPreparedPack.getStringLikerPack(user.getUserEmpNo(),"userEmpNo",result);
// DdlPreparedPack.getStringEqualPack(user.getOrganizeCode(),"organizeCode",result);
DdlPreparedPack.getInPackList(idList, "id", result);

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
@ -34,6 +35,7 @@ public class BrCssStyle extends BaseBean {
@ApiParam(value ="样式编码")
private String styleCode;
@Lob
@Column(name="STYLE_CONTENT")
@ApiParam(value ="样式内容")
private String styleContent;

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -5,7 +5,7 @@
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -15,7 +15,7 @@
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo</artifactId>
<packaging>pom</packaging>
<version>1.0-TEST-SNAPSHOT</version>
<version>1.0-DEV-SNAPSHOT</version>
<modules>
<module>modules/i3plus-pojo-base</module>
<module>modules/i3plus-pojo-platform</module>

Loading…
Cancel
Save