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

yun-zuoyi
汪云昊 6 years ago
commit 68c8c62542

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.andon.model;
import cn.estsh.i3plus.pojo.andon.bean.MesArea;
import io.swagger.annotations.ApiParam;
import javax.persistence.Transient;
import java.util.List;
public class SysOrganizeModel{
@Transient
@ApiParam(value ="父节点")
private Long parentId;
@Transient
@ApiParam(value ="名称")
private String name;
@Transient
@ApiParam(value ="子集列表")
private List<MesArea> childTreeList;
public List<MesArea> getChildTreeList() {
return childTreeList;
}
public void setChildTreeList(List<MesArea> childTreeList) {
this.childTreeList = childTreeList;
}
public Long getParentId() {
return parentId;
}
public void setParentId(Long parentId) {
this.parentId = parentId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
}

@ -173,6 +173,7 @@ public class AndonHqlPack {
DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getAndonOrderNo(), "andonOrderNo", result);
DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result);
DdlPreparedPack.getInPackArray(obj, "statusCode", result);
getStringBuilderPack(andonManageQueue, result);
@ -310,6 +311,26 @@ public class AndonHqlPack {
}
/**
* MES
* @param shift
* @return
*/
public static DdlPackBean getMesShift(MesShift shift, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(shift, organizeCode);
if (StringUtils.isNotEmpty(shift.getShiftCode())){
DdlPreparedPack.getStringEqualPack(shift.getShiftCode(), "shiftCode", packBean);
}
if (StringUtils.isNotEmpty(shift.getShiftName())){
DdlPreparedPack.getStringLikerPack(shift.getShiftName(), "shiftName", packBean);
}
if (StringUtils.isNotEmpty(shift.getWorkCenterCode())){
DdlPreparedPack.getStringEqualPack(shift.getWorkCenterCode(), "workCenterCode", packBean);
}
return packBean;
}
/**
*
* @param responseCfg
* @return

@ -9,10 +9,7 @@ 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 javax.persistence.*;
import java.util.List;
/**
@ -43,7 +40,8 @@ public class BfDataObject extends BaseBean {
@ApiParam(value ="数据表名")
private String objectTableName;
@Column(name="OBJECT_CONTENT",columnDefinition="TEXT")
@Lob
@Column(name="OBJECT_CONTENT")
@ApiParam(value ="数据内容")
private String objectContent;

@ -7,10 +7,9 @@ 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 org.hibernate.annotations.Type;
import javax.persistence.*;
import java.util.List;
/**
@ -60,7 +59,8 @@ public class BfLayout extends BaseBean {
@ApiParam(value = "引用报表数量")
private Integer layoutReportCount;
@Column(name = "LAYOUT_DESCRIPTION", columnDefinition = "TEXT")
@Lob
@Column(name = "LAYOUT_DESCRIPTION")
@ApiParam(value = "布局描述")
private String layoutDescription;

@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
@ -59,7 +60,8 @@ public class BfLayoutColumn extends BaseBean {
@ApiParam(value = "排序,降序")
private Integer columnSort;
@Column(name = "COLUMN_DESCRIPTION", columnDefinition = "TEXT")
@Lob
@Column(name = "COLUMN_DESCRIPTION")
@ApiParam(value = "列描述")
private String columnDescription;
}

@ -9,10 +9,9 @@ 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 org.hibernate.annotations.Type;
import javax.persistence.*;
import java.util.List;
/**
@ -44,7 +43,8 @@ public class BfLayoutRow extends BaseBean {
@ApiParam(value = "排序")
private Integer rowSort;
@Column(name = "ROW_STYLE", columnDefinition = "TEXT")
@Lob
@Column(name = "ROW_STYLE")
@ApiParam(value = "行样式")
private String rowStyle;

@ -10,6 +10,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.*;
import java.util.List;
@ -61,7 +62,8 @@ public class BfMenu extends BaseBean {
@ApiParam(value ="菜单图标")
private String menuIcon;
@Column(name="MENU_STYLE", columnDefinition = "TEXT")
@Lob
@Column(name="MENU_STYLE")
@ApiParam(value ="菜单样式")
private String menuStyle;

@ -32,6 +32,10 @@ public class MesPLCConfigure extends BaseBean {
@ApiParam("设备ip")
private String ipAddress;
@Column(name="CHANNEL_NAME")
@ApiParam("通道名称")
private String channelName;
@Column(name="DEVICE_NAME")
@ApiParam("设备地址")
private String deviceName;

@ -28,6 +28,7 @@ import javax.persistence.Table;
@Table(name="MES_TORQUE_DETAIL")
@Api("扭矩信息记录表")
public class MesTorqueDetail extends BaseBean {
@Column(name="SN")
@ApiParam("过程条码")
private String serialNumber;
@ -61,8 +62,8 @@ public class MesTorqueDetail extends BaseBean {
private String ok;
@Column(name="PART_NO")
@ApiParam("扭矩是否合格")
private String partNO;
@ApiParam("物料号")
private String partNo;
@Column(name="p_set")
@ApiParam("螺丝枪PSET设置值")
@ -79,4 +80,16 @@ public class MesTorqueDetail extends BaseBean {
@Column(name="FINALANGLE")
@ApiParam("最终扭矩")
private Integer finalAngle;
@Column(name="WORK_ORDER_NO")
@ApiParam("工单号")
private String workOrderNo;
@Column(name="KEY_DATA_CODE")
@ApiParam("关键数据代码")
private String keyDataCode;
@Column(name="RESULT_MSG")
@ApiParam("扭矩判定结果")
private String resultMsg;
}

@ -33,7 +33,7 @@ public class MesKeyData extends BaseBean {
@Column(name="KEY_DATA_NAME")
@ApiParam("关键数据名称")
private Integer keyDataName;
private String keyDataName;
@Column(name="UPPER_LIMIT")
@ApiParam("数据上限")

@ -0,0 +1,65 @@
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;
/**
* @Description:
* @Reference:
* @Author: yiming.gu
* @CreateDate:2019-05-21
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_KP_DATA")
@Api("物料关键数据关系")
public class MesKpData extends BaseBean {
@Column(name="PART_NO")
@ApiParam("物料号")
private String partNo;
@Column(name="KEY_DATA_CODE")
@ApiParam("关键数据代码")
private String keyDataCode;
@Column(name="KEY_DATA_NAME")
@ApiParam("关键数据名称")
private String keyDataName;
@Column(name="KEY_DATA_COUNT")
@ApiParam("关键数据数量")
private Integer keyDataCount;
@Column(name="UPPER_LIMIT")
@ApiParam("数据上限")
private Double upperLimit;
@Column(name="LOWER_LIMIT")
@ApiParam("数据下限")
private Double lowerLimit;
public double getKeyDataCountVal() {
return this.keyDataCount == null ? 0 : this.keyDataCount;
}
public double getUpperLimitVal() {
return this.upperLimit == null ? 0.0d : this.upperLimit;
}
public double getLowerLimitVal() {
return this.lowerLimit == null ? 0.0d : this.lowerLimit;
}
}

@ -0,0 +1,46 @@
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;
/**
* @Description :mes
* @Reference :
* @Author : yiming.gu
* @CreateDate : 2019-05-20
* @Modify:
**/
@Data
@Entity
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="MES_SHIFT_REST")
@Api("班次休息信息")
public class MesShiftRest extends BaseBean {
@Column(name="WORK_CENTER_CODE")
@ApiParam("工作中心代码")
private String workCenterCode;
@Column(name="SHIFT_CODE")
@ApiParam("班次代码")
private String shiftCode;
@Column(name="START_TIME")
@ApiParam("开始时间")
private String startTime;
@Column(name="REST_TIMES")
@ApiParam("休息时长")
private Double restTimes;
}

@ -7,10 +7,7 @@ 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 javax.persistence.*;
import javax.script.CompiledScript;
/**
@ -41,7 +38,8 @@ public class EngineScriptPersistence extends BaseBean {
@Column(name = "LANGUAGE_TYPE")
private int languageType;
// 脚本的具体内容
@Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
@Lob
@Column(name = "SCRIPT_CONTENT")
private String scriptContent;
// 脚本的描述,包含脚本的用法,参数说明等
@Column(name = "SCRIPT_REMARK", length = 2000)

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesKpData;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: yiming.gu
* @CreateDate:2019-05-21
* @Modify:
**/
@Repository
public interface MesKpDataRepository extends BaseRepository<MesKpData, Long> {
}

@ -0,0 +1,16 @@
package cn.estsh.i3plus.pojo.mes.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.mes.bean.MesShiftRest;
import org.springframework.stereotype.Repository;
/**
* @Description:
* @Reference:
* @Author: yiming.gu
* @CreateDate:2019-05-20
* @Modify:
**/
@Repository
public interface MesShiftRestRepository extends BaseRepository<MesShiftRest, Long> {
}

@ -303,6 +303,7 @@ public class MesHqlPack {
DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdRouteCfg, organizeCode);
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
packBean.setOrderByStr(mesProdRouteCfg.orderBy());
return packBean;
}
@ -328,6 +329,23 @@ public class MesHqlPack {
}
/**
* MES
* @param shiftRest
* @return
*/
public static DdlPackBean getMesShiftRest(MesShiftRest shiftRest, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(shiftRest, organizeCode);
if (StringUtils.isNotEmpty(shiftRest.getWorkCenterCode())){
DdlPreparedPack.getStringEqualPack(shiftRest.getWorkCenterCode(), "workCenterCode", packBean);
}
if (StringUtils.isNotEmpty(shiftRest.getShiftCode())){
DdlPreparedPack.getStringEqualPack(shiftRest.getShiftCode(), "shiftCode", packBean);
}
return packBean;
}
/**
* MES
* @param process
* @return
@ -357,6 +375,9 @@ public class MesHqlPack {
if (StringUtils.isNotEmpty(step.getStepName())){
DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean);
}
if (StringUtils.isNotEmpty(step.getStepType())){
DdlPreparedPack.getStringLikerPack(step.getStepType(), "stepType", packBean);
}
return packBean;
}
@ -425,6 +446,26 @@ public class MesHqlPack {
}
/**
* MESBOM
* @param processBom
* @return
*/
public static DdlPackBean getMesProcessBom(MesProcessBom processBom, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(processBom, organizeCode);
if (StringUtils.isNotEmpty(processBom.getPartNo())){
DdlPreparedPack.getStringEqualPack(processBom.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(processBom.getItemPartNo())){
DdlPreparedPack.getStringEqualPack(processBom.getItemPartNo(), "itemPartNo", packBean);
}
if (StringUtils.isNotEmpty(processBom.getProcessCode())){
DdlPreparedPack.getStringEqualPack(processBom.getProcessCode(), "processCode", packBean);
}
return packBean;
}
/**
* MES
* @param customer
* @return
@ -477,4 +518,118 @@ public class MesHqlPack {
return packBean;
}
/**
* MES
* @param keyData
* @return
*/
public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
if (StringUtils.isNotEmpty(keyData.getKeyDataCode())){
DdlPreparedPack.getStringEqualPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
}
if (StringUtils.isNotEmpty(keyData.getKeyDataName())){
DdlPreparedPack.getStringEqualPack(keyData.getKeyDataName(), "keyDataName", packBean);
}
return packBean;
}
/**
* MES
* @param kpData
* @return
*/
public static DdlPackBean getMesKpData(MesKpData kpData, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(kpData, organizeCode);
if (StringUtils.isNotEmpty(kpData.getPartNo())){
DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(kpData.getKeyDataCode())){
DdlPreparedPack.getStringEqualPack(kpData.getKeyDataCode(), "keyDataCode", packBean);
}
return packBean;
}
/**
* MES
* @param prodCfgType
* @return
*/
public static DdlPackBean getMesProdCfgType(MesProdCfgType prodCfgType, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgType, organizeCode);
if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeCode())){
DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
}
if (StringUtils.isNotEmpty(prodCfgType.getProdCfgTypeName())){
DdlPreparedPack.getStringEqualPack(prodCfgType.getProdCfgTypeName(), "prodCfgTypeName", packBean);
}
return packBean;
}
/**
* MES
* @param prodCfg
* @return
*/
public static DdlPackBean getMesProdCfg(MesProdCfg prodCfg, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfg, organizeCode);
if (StringUtils.isNotEmpty(prodCfg.getProdCfgCode())){
DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgCode(), "prodCfgCode", packBean);
}
if (StringUtils.isNotEmpty(prodCfg.getProdCfgName())){
DdlPreparedPack.getStringLikerPack(prodCfg.getProdCfgName(), "prodCfgName", packBean);
}
if (StringUtils.isNotEmpty(prodCfg.getProdCfgTypeCode())){
DdlPreparedPack.getStringEqualPack(prodCfg.getProdCfgTypeCode(), "prodCfgTypeCode", packBean);
}
return packBean;
}
/**
* MES
* @param prodCfgDetail
* @return
*/
public static DdlPackBean getMesProdCfgDetail(MesProdCfgDetail prodCfgDetail, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(prodCfgDetail, organizeCode);
if (StringUtils.isNotEmpty(prodCfgDetail.getProdCfgCode())){
DdlPreparedPack.getStringEqualPack(prodCfgDetail.getProdCfgCode(), "prodCfgCode", packBean);
}
if (StringUtils.isNotEmpty(prodCfgDetail.getPartNo())){
DdlPreparedPack.getStringEqualPack(prodCfgDetail.getPartNo(), "partNo", packBean);
}
return packBean;
}
/**
* MES
* @param part
* @return
*/
public static DdlPackBean getMesPart(MesPart part, String organizeCode) {
DdlPackBean packBean = getAllBaseDataByNormalPro(part, organizeCode);
if (StringUtils.isNotEmpty(part.getPartNo())){
DdlPreparedPack.getStringEqualPack(part.getPartNo(), "partNo", packBean);
}
if (StringUtils.isNotEmpty(part.getPartName())){
DdlPreparedPack.getStringLikerPack(part.getPartName(), "partName", packBean);
}
if (StringUtils.isNotEmpty(part.getCategoryCode1())){
DdlPreparedPack.getStringEqualPack(part.getCategoryCode1(), "categoryCode1", packBean);
}
if (StringUtils.isNotEmpty(part.getCategoryCode2())){
DdlPreparedPack.getStringEqualPack(part.getCategoryCode2(), "categoryCode2", packBean);
}
if (StringUtils.isNotEmpty(part.getCategoryCode3())){
DdlPreparedPack.getStringEqualPack(part.getCategoryCode3(), "categoryCode3", packBean);
}
return packBean;
}
}

@ -21,8 +21,6 @@ import java.util.List;
public class MesRouteModel implements Serializable {
@ApiParam("流程代码")
public String routeCode;
@ApiParam("工厂代码")
public String organizeCode;
@ApiParam("GOJS位置")
public String position;
@ApiParam("流程明细Model集合")

@ -25,6 +25,6 @@ public class MesRouteProcessModel {
public MesRouteProcess mesRouteProcess;
@ApiParam("流程工步参数配置表(根据Seq分组)")
public Map<String, List<MesRouteProcessStep>> mesRouteProcessStepMap;
@ApiParam("流程工步参数配置表(根据Seq分组)")
@ApiParam("产品流程参数配置表(根据Seq分组)")
public Map<String, List<MesProdRouteOptParam>> mesProdRouteOptParamMap;
}

@ -0,0 +1,28 @@
package cn.estsh.i3plus.pojo.model.test;
import cn.estsh.i3plus.pojo.platform.bean.TestTransUser;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
import org.aspectj.weaver.ast.Test;
import java.util.List;
/**
* @Description :
* @Reference :
* @Author : alwaysfrin
* @CreateDate : 2019-05-19 18:15
* @Modify:
**/
@Getter
@Setter
@ToString
public class TestConstructModel {
private long id;
private TestTransUser user;
private List<TestTransUser> userList;
}

@ -7,11 +7,9 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
/**
* @Description :
@ -37,7 +35,8 @@ public class SysLabelTemplate extends BaseBean {
@ApiParam(value ="模板名称")
private String templateName;
@Column(name="TEMPLATE_CONTENT", columnDefinition = "TEXT")
@Lob
@Column(name="TEMPLATE_CONTENT")
@ApiParam(value ="模板内容")
private String templateContent;

@ -9,11 +9,9 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
/**
* @Description :
@ -44,7 +42,8 @@ public class SysLabelTemplateParam extends BaseBean {
@ApiParam(value ="模板参数")
private String templateParam;
@Column(name="TEMPLATE_PARAM_TEXT", columnDefinition = "TEXT")
@Lob
@Column(name="TEMPLATE_PARAM_TEXT")
@ApiParam(value ="模板参数描述")
private String templateParamText;

@ -26,7 +26,6 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
//@Table(name="SYS_MENU",indexes = {@Index(name="索引名称",columnList = "列名1,列名2")})
@Table(name="SYS_MENU",indexes = {
@Index(name="index_sys_menu_parent_id",columnList = "PARENT_ID"),
})
@ -46,7 +45,7 @@ public class SysMenu extends BaseBean {
private String menuCode;
@Column(name="MENU_TYPE")
@ApiParam(value ="功能类型枚举1.模块2.菜单3.按钮)" , example ="-1")
@ApiParam(value ="功能类型" , example ="-1" ,access = "枚举1.模块2.菜单3.按钮")
private Integer menuType;
// 根节点-1
@ -88,7 +87,7 @@ public class SysMenu extends BaseBean {
private String menuDescription;
@Column(name="MENU_STATUS")
@ApiParam(value ="功能状态1.正常2.禁用)" , example ="1" , access ="功能状态1.正常2.禁用)",defaultValue="1")
@ApiParam(value ="功能状态" , example ="1" , access ="功能状态1.正常2.禁用)",defaultValue="1")
private Integer menuStatus;
@Transient

@ -12,10 +12,7 @@ import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Subselect;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -58,7 +55,8 @@ public class SysMessage extends BaseBean {
@ApiParam(value = "消息内容类型(枚举ImppEnumUtil.MESSAGE_TYPE_CONTENT)", example = "-1")
private Integer messageContentType;
@Column(name = "MESSAGE_CONTENT", columnDefinition = "TEXT")
@Lob
@Column(name = "MESSAGE_CONTENT")
@ApiParam(value = "消息内容", access = "消息内容")
private String messageContent;

@ -9,9 +9,11 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
@ -63,7 +65,8 @@ public class SysRole extends BaseBean {
@ApiParam(value ="权限功能数量" , example ="0" , access ="权限功能数量")
private Integer menuNumber;
@Column(name="MENU_NAMES_RDD",columnDefinition="TEXT")
@Lob
@Column(name="MENU_NAMES_RDD")
@ApiParam(value ="权限功能名称" , access ="权限功能名称")
private String menuNamesRdd;

@ -9,8 +9,11 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
@ -124,7 +127,8 @@ public class SysTaskPlan extends BaseBean {
@ApiParam(value = "通知方式", example = "1")
private Integer noticeMethod;
@Column(name = "NOTICE_CHANNEL", columnDefinition = "TEXT")
@Lob
@Column(name = "NOTICE_CHANNEL")
@ApiParam(value = "通知渠道")
private String noticeChannel;
}

@ -9,11 +9,9 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -104,15 +102,18 @@ public class SysUser extends BaseBean {
@ApiParam(value ="组织名称" , access ="组织名称")
private String organizeNameRdd;
@Column(name="ROLE_NAMES_RDD",columnDefinition = "TEXT")
@Lob
@Column(name="ROLE_NAMES_RDD")
@ApiParam(value ="角色名称集合")
private String roleNamesRdd;
@Column(name="DEPARTMENT_NAMES_RDD",columnDefinition = "TEXT")
@Lob
@Column(name="DEPARTMENT_NAMES_RDD")
@ApiParam(value ="部门名称集合")
private String departmentNamesRdd;
@Column(name="ORGANIZE_NAMES_RDD",columnDefinition = "TEXT")
@Lob
@Column(name="ORGANIZE_NAMES_RDD")
@ApiParam(value ="组织名称集合")
private String organizeNamesRdd;
@ -133,7 +134,7 @@ public class SysUser extends BaseBean {
@Transient
@ApiParam(value ="账号所有操作部门 Id 集合")
private List<String> departmentIdList;
@Transient
@ApiParam(value ="账号所有操作部门信息")
private List<SysDepartment> departmentList;
@ -147,7 +148,7 @@ public class SysUser extends BaseBean {
@ApiParam(value ="角色ID集合" , example = "0")
@JsonSerialize(using = ToStringSerializer.class)
private List<String> roleIdList;
@Transient
@ApiParam(value ="账号所有角色信息")
private List<SysRole> roleList;
@ -156,4 +157,14 @@ public class SysUser extends BaseBean {
@ApiParam(value ="账号所有操作权限信息")
private List<SysMenu> menuList;
/*** test ***/
// @Lob
// @Basic(fetch=FetchType.LAZY)
// @Column(name = "CONTENT", columnDefinition = "BLOB")
// private byte[] content;
//
// @Lob
// @Basic(fetch=FetchType.LAZY)
// @Column(name="REMARK", columnDefinition="CLOB")
// private String remark;
}

@ -10,9 +10,11 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
@ -62,15 +64,18 @@ public class WmsActionLogData extends BaseBean {
@ApiParam(value="结束执行时间",example = "2000-01-01 01:00:00")
private String endTime;
@Column(name = "IN_PARAMS", columnDefinition = "TEXT")
@Lob
@Column(name = "IN_PARAMS")
@ApiParam(value = "输入参数")
private String inParams;
@Column(name = "OUT_PARAMS", columnDefinition = "TEXT")
@Lob
@Column(name = "OUT_PARAMS")
@ApiParam(value = "输出参数")
private String outParams;
@Column(name = "OUT_RESULT", columnDefinition = "TEXT")
@Lob
@Column(name = "OUT_RESULT")
@ApiParam(value = "执行结果")
private String outResult;
}

@ -9,11 +9,9 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -57,7 +55,8 @@ public class BrElement extends BaseBean {
@ApiParam(value ="元素样式css")
private String elementStyle;
@Column(name="ELEMENT_HTML",columnDefinition = "TEXT")
@Lob
@Column(name="ELEMENT_HTML")
@ApiParam(value ="元素html")
private String elementHtml;
}

@ -7,11 +7,9 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -54,11 +52,13 @@ public class BrLayout extends BaseBean {
@ApiParam(value ="引用报表数量")
private Integer layoutReportCount;
@Column(name="LAYOUT_HTML",columnDefinition = "TEXT")
@Lob
@Column(name="LAYOUT_HTML")
@ApiParam(value ="布局html")
private String layoutHtml;
@Column(name = "LAYOUT_DESCRIPTION",columnDefinition = "TEXT")
@Lob
@Column(name = "LAYOUT_DESCRIPTION")
@ApiParam(value ="布局描述")
private String layoutDescription;

@ -9,11 +9,9 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -70,11 +68,13 @@ public class BrLayoutColumn extends BaseBean {
@ApiParam(value ="排序,降序")
private Integer columnSort;
@Column(name = "COLUMN_DESCRIPTION",columnDefinition = "TEXT")
@Lob
@Column(name = "COLUMN_DESCRIPTION")
@ApiParam(value ="列描述")
private String columnDescription;
@Column(name="COLUMN_HTML",columnDefinition = "TEXT")
@Lob
@Column(name="COLUMN_HTML")
@ApiParam(value ="列html")
private String columnHtml;
}

@ -9,11 +9,9 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -49,7 +47,8 @@ public class BrLayoutRow extends BaseBean {
@ApiParam(value ="排序")
private Integer rowSort;
@Column(name="ROW_STYLE",columnDefinition = "TEXT")
@Lob
@Column(name="ROW_STYLE")
@ApiParam(value ="行样式")
private String rowStyle;
@ -57,7 +56,8 @@ public class BrLayoutRow extends BaseBean {
@ApiParam(value ="行所关联列数")
private Integer rowColNum;
@Column(name="ROW_HTML",columnDefinition = "TEXT")
@Lob
@Column(name="ROW_HTML")
@ApiParam(value ="行html")
private String rowHtml;

@ -9,9 +9,11 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
@ -59,11 +61,13 @@ public class BrRefReportTypeset extends BaseBean {
/**
* html
*/
@Column(name = "REF_HTML",columnDefinition = "TEXT")
@Lob
@Column(name = "REF_HTML")
@ApiParam(value = "关联对象html")
private String refHtml;
@Column(name = "TYPESET_DESCRIPTION",columnDefinition = "TEXT")
@Lob
@Column(name = "TYPESET_DESCRIPTION")
@ApiParam(value ="排版描述")
private String typesetDescription;
}

@ -26,7 +26,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_REF_ROLE_MENU")
@Table(name="BR_REF_ROLE_MENU")
@Api(value="关系-角色目录",description = "关系-角色目录")
public class BrRefRoleMenu extends BaseBean {

@ -10,11 +10,9 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.List;
/**
@ -55,7 +53,8 @@ public class BrReport extends BaseBean {
@ApiParam(value ="布局名称")
private String layoutNameRdd;
@Column(name="LAYOUT_HTML",columnDefinition = "TEXT")
@Lob
@Column(name="LAYOUT_HTML")
@ApiParam(value ="报表html")
private String reportHtml;
@ -71,7 +70,8 @@ public class BrReport extends BaseBean {
@ApiParam(value ="元素数量")
private Integer elementNum;
@Column(name = "REPORT_DESCRIPTION",columnDefinition = "TEXT")
@Lob
@Column(name = "REPORT_DESCRIPTION")
@ApiParam(value ="报表描述")
private String reportDescription;

@ -7,11 +7,9 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import javax.persistence.*;
import java.util.ArrayList;
import java.util.List;
@ -47,7 +45,8 @@ public class BrTemplate extends BaseBean {
@ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
private Integer numPojo;
@Column(name="TEMPLATE_POJO_NAMES_RDD",columnDefinition = "TEXT")
@Lob
@Column(name="TEMPLATE_POJO_NAMES_RDD")
@ApiParam(value ="对象名称" , access ="对象名称")
private String templatePojoNamesRdd;
@ -55,11 +54,13 @@ public class BrTemplate extends BaseBean {
@ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
private Integer numServer;
@Column(name="TEMPLATE_SERVER_ID_LIST",columnDefinition = "TEXT")
@Lob
@Column(name="TEMPLATE_SERVER_ID_LIST")
@ApiParam(value ="数据服务ID集合" , access ="服务名称")
private String templateServerIdList;
@Column(name="TEMPLATE_SERVER_NAMES_RDD",columnDefinition = "TEXT")
@Lob
@Column(name="TEMPLATE_SERVER_NAMES_RDD")
@ApiParam(value ="服务名称" , access ="服务名称")
private String templateServerNamesRdd;
@ -67,7 +68,8 @@ public class BrTemplate extends BaseBean {
@ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
private Integer numTemplateAttrFilter;
@Column(name="template_attr_filter_list",columnDefinition = "TEXT")
@Lob
@Column(name="template_attr_filter_list")
@ApiParam(value ="模板查询条件" , access ="模板查询条件")
private String templateAttrFilterList;
@ -75,7 +77,8 @@ public class BrTemplate extends BaseBean {
@ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
private Integer numTemplateAttrFilterGroup;
@Column(name="TEMPLATE_ATTR_FILTER_GROUP_LIST",columnDefinition = "TEXT")
@Lob
@Column(name="TEMPLATE_ATTR_FILTER_GROUP_LIST")
@ApiParam(value ="模板分组条件" , access ="模板分組条件")
private String templateAttrFilterGroupList;
@ -83,7 +86,8 @@ public class BrTemplate extends BaseBean {
@ApiParam(value ="对象数量" , example ="0" , access ="对象数量")
private Integer numTemplateAttrShow;
@Column(name="TEMPLATE_ATTR_SHOW_LIST",columnDefinition = "TEXT")
@Lob
@Column(name="TEMPLATE_ATTR_SHOW_LIST")
@ApiParam(value ="模板显示属性" , access ="模板显示属性")
private String templateAttrShowList;
@ -91,7 +95,8 @@ public class BrTemplate extends BaseBean {
@ApiParam(value ="对象聚集数量" , example ="0" , access ="对象聚集数量")
private Integer numTemplateAggregation;
@Column(name="TEMPLATE_ATTR_AGGREGATION_LIST",columnDefinition = "TEXT")
@Lob
@Column(name="TEMPLATE_ATTR_AGGREGATION_LIST")
@ApiParam(value ="模板聚集属性" , access ="模板聚集属性")
private String templateAttrAggregationList;
@ -99,11 +104,13 @@ public class BrTemplate extends BaseBean {
@ApiParam(value ="模板描述" , access ="模板描述")
private String templateDescription;
@Column(name="TEMPLATE_HQL",columnDefinition = "TEXT")
@Lob
@Column(name="TEMPLATE_HQL")
@ApiParam(value ="模板执行HQL" , access ="模板执行HQL")
private String templateHql;
@Column(name="TEMPLATE_HTML",columnDefinition = "TEXT")
@Lob
@Column(name="TEMPLATE_HTML")
@ApiParam(value ="模板HTML" , access ="模板HTML")
private String templateHtml;

@ -9,9 +9,11 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
@ -39,7 +41,8 @@ public class BrTemplateCustomHql extends BaseBean {
@ApiParam(value ="自定义类型" , example ="-1")
private Integer dataType;
@Column(name="CUSTOM_CONTENT",columnDefinition="TEXT")
@Lob
@Column(name="CUSTOM_CONTENT")
@ApiParam(value ="自定义语句内容" , access ="自定义语句内容")
private String customContent;

@ -127,7 +127,7 @@ public class SwebHqlPack {
}
/**
* where sql
* where sql
* @param details
* @return
*/
@ -136,6 +136,7 @@ public class SwebHqlPack {
DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
DdlPreparedPack.getStringEqualPack(details.getVendorCode(), "vendorCode", result);
DdlPreparedPack.getNumEqualPack(details.getOrderType(), "orderType", result);
DdlPreparedPack.getNumEqualPack(SwebEnumUtil.ORDER_DETAILS_STATUS.CREATE.getValue(), "itemStatus", result);
return buildHql(details, result);
}

@ -12,6 +12,7 @@ import org.springframework.data.annotation.Transient;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
/**
@ -37,7 +38,8 @@ public class EngineRulePersistence extends BaseBean {
@Column(name = "RULE_NAME", length = 50)
private String ruleName;
// 规则的具体内容
@Column(name = "RULE_CONTENT", columnDefinition = "TEXT")
@Lob
@Column(name = "RULE_CONTENT")
private String ruleContent;
// 规则的描述,包含规则的用法,参数说明等
@Column(name = "RULE_REMARK", length = 2000)

@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.annotations.Type;
import javax.persistence.*;
import javax.script.CompiledScript;
@ -47,7 +48,8 @@ public class EngineScriptPersistence extends BaseBean {
private Integer languageType;
// 脚本的具体内容
@Column(name = "SCRIPT_CONTENT", columnDefinition = "TEXT")
@Lob
@Column(name = "SCRIPT_CONTENT")
private String scriptContent;
// 脚本的描述,包含脚本的用法,参数说明等

Loading…
Cancel
Save