yun-zuoyi
宋军超 5 years ago
commit 912ef81271

@ -31,6 +31,8 @@ import java.io.Serializable;
//@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换
public abstract class BaseBean implements Serializable {
private static final long serialVersionUID = 1L;
//此处使用hibernate的主键策略方式
//手动设置,使用iplus-platform-common中的idtool生成
//将Long类型系列化成String避免精度丢失
@ -141,6 +143,14 @@ public abstract class BaseBean implements Serializable {
//CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc
public transient Integer ascOrDesc = 1;
public int getIsValidVal() {
return this.isValid == null ? 0 : this.isValid.intValue();
}
public int getIsDeletedVal() {
return this.isDeleted == null ? 0 : this.isDeleted.intValue();
}
//排序方式
public String orderBy(){
String result = "";

@ -67,6 +67,22 @@ public class DdlPackBean {
return result;
}
/**
*
* @param organizeCode
* @param isValid
* @return
*/
public static DdlPackBean getDdlPackBean(String organizeCode, int isValid){
DdlPackBean result = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",result);
DdlPreparedPack.getNumEqualPack(isValid,"isValid",result);
DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result);
return result;
}
public static DdlPackBean getDdlPackBean(){
DdlPackBean result = new DdlPackBean();

@ -39,6 +39,8 @@ public class CommonEnumUtil {
LAC(26, 8600, 13, "lac", "连接适配器"),
ANDON(27, 8500, 14, "andon", "安灯"),
APS(28, 8400, 15, "i3aps", "高级计划与排产"),
MDM(29, 8150, 22, "i3mdm", "数据中心MDM"),
CENTER(99, 8000, 1, "icloud-server", "注册中心"),
SURFACE(98, 0, 0, "i3surface", "对外服务"),
CLOUD(97, 0, 0, "i3cloud", "微服务"),
@ -2212,6 +2214,16 @@ public class CommonEnumUtil {
return tmp;
}
public static int descriptionOfValue(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static FIELD_TYPE codeOf(Integer value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
@ -2325,7 +2337,7 @@ public class CommonEnumUtil {
return tmp;
}
public static Integer valueOfDescription(String desc) {
public static Integer descriptionOfValue(String desc) {
Integer tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
@ -2391,7 +2403,7 @@ public class CommonEnumUtil {
}
public static Integer valueOfDescription(String desc) {
public static Integer descriptionOfValue(String desc) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {

@ -16,12 +16,11 @@ public class ImppEnumUtil {
* 1.2.3.
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ORGANIZE_YTPE{
public enum ORGANIZE_YTPE {
TYPE_GROUP(1,"集团","集团"),
TYPE_COMPANY(2,"公司","公司"),
TYPE_FACTORY(3,"工厂","工厂"),
;
TYPE_GROUP(1, "集团", "集团"),
TYPE_COMPANY(2, "公司", "公司"),
TYPE_FACTORY(3, "工厂", "工厂");
private int value;
private String name;
@ -86,8 +85,8 @@ public class ImppEnumUtil {
* 3.CODE
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TASK_METHOD_TYPE{
CLASS_METHOD(1,"类方法","Java Class 方法");
public enum TASK_METHOD_TYPE {
CLASS_METHOD(1, "类方法", "Java Class 方法");
// TYPE_COMPANY(2,"链接","Http URL"),
// TYPE_FACTORY(3,"权限CODE","权限CODE");
@ -148,7 +147,7 @@ public class ImppEnumUtil {
}
/**
*
*
* 1.DEBUG
* 2.INFO
* 3.WARN
@ -156,13 +155,13 @@ public class ImppEnumUtil {
* 5.FATAL
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOG_LEVEL{
public enum LOG_LEVEL {
DEBUG(1,"DEBUG","调试"),
INFO(2,"INFO","信息"),
WARN(3,"WARN","注意"),
ERROR(4,"ERROR","错误"),
FATAL(5,"FATAL","严重");
DEBUG(1, "DEBUG", "调试"),
INFO(2, "INFO", "信息"),
WARN(3, "WARN", "注意"),
ERROR(4, "ERROR", "错误"),
FATAL(5, "FATAL", "严重");
private int value;
private String name;
@ -238,13 +237,13 @@ public class ImppEnumUtil {
* 4.SELECT
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OPERATE_TYPE{
public enum OPERATE_TYPE {
INSERT(1,"post","新增"), //POST
DELETE(2,"put","修改"), //PUT
UPDATE(3,"delete","删除"), //DELETE
SELECT(4,"get","查询"), //GET
BUSI(5,"busi","处理");
INSERT(1, "post", "新增"), //POST
DELETE(2, "put", "修改"), //PUT
UPDATE(3, "delete", "删除"), //DELETE
SELECT(4, "get", "查询"), //GET
BUSI(5, "busi", "处理");
private int value;
private String name;
@ -317,9 +316,9 @@ public class ImppEnumUtil {
* 1.PC
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum OPERATE_TERMINAL{
public enum OPERATE_TERMINAL {
PC(1,"电脑端"),PDA(2,"PDA"),MOBILE(3,"手机");
PC(1, "电脑端"), PDA(2, "PDA"), MOBILE(3, "手机");
private int value;
private String description;
@ -360,8 +359,8 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MESSAGE_STATUS {
READ(1,"已读","fa cell-fa fa-file-text"),
UNREAD(2,"未读","fa cell-fa fa-file-o");
READ(1, "已读", "fa cell-fa fa-file-text"),
UNREAD(2, "未读", "fa cell-fa fa-file-o");
private int value;
private String name;
@ -428,10 +427,10 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MESSAGE_TYPE {
MAIL(1,"邮件","邮件"),
LETTER(2,"站内信","站内信"),
SWEB_NOTICE(3,"SWEB通知","SWEB通知"),
SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告");
MAIL(1, "邮件", "邮件"),
LETTER(2, "站内信", "站内信"),
SWEB_NOTICE(3, "SWEB通知", "SWEB通知"),
SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告");
private int value;
private String name;
@ -498,13 +497,13 @@ public class ImppEnumUtil {
* 5.MIDDLE_TABLE
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TOOL_CONN_TYPE{
public enum TOOL_CONN_TYPE {
SERIAL_PORT(1,"串口","串口"),
NETWORK_PORT(2,"网口","网口"),
OPC(3,"OPC","OPC"),
USB(4,"USB","USB"),
MIDDLE_TABLE(5,"中间表","中间表");
SERIAL_PORT(1, "串口", "串口"),
NETWORK_PORT(2, "网口", "网口"),
OPC(3, "OPC", "OPC"),
USB(4, "USB", "USB"),
MIDDLE_TABLE(5, "中间表", "中间表");
private int value;
private String name;
private String description;
@ -568,11 +567,11 @@ public class ImppEnumUtil {
* 3.BINARY_PACKET
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TOOL_DATA_TYPE{
public enum TOOL_DATA_TYPE {
STRING(1,"字符串","字符串"),
TABLE(2,"数据表","数据表"),
BINARY_PACKET(3,"二进制数据包","二进制数据包");
STRING(1, "字符串", "字符串"),
TABLE(2, "数据表", "数据表"),
BINARY_PACKET(3, "二进制数据包", "二进制数据包");
private int value;
private String name;
@ -635,9 +634,9 @@ public class ImppEnumUtil {
* 1.SYSTEM
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYS_CONFIG_TYPE{
public enum SYS_CONFIG_TYPE {
SYSTEM(1,"系统参数","系统参数");
SYSTEM(1, "系统参数", "系统参数");
private int value;
private String name;
@ -702,8 +701,8 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MESSAGE_TYPE_CONTENT {
HTML(1,"HTML","text/html;charset=UTF-8"),
TEXT(2,"TEXT","text/plain;charset=UTF-8");
HTML(1, "HTML", "text/html;charset=UTF-8"),
TEXT(2, "TEXT", "text/plain;charset=UTF-8");
private int value;
private String name;
@ -770,9 +769,9 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DYN_TABLE_CELL_TYPE {
STRING(1,"String","字符串类型"),
NUMBER(2,"Number","数字类型"),
DATE(3,"Date","时间类型");
STRING(1, "String", "字符串类型"),
NUMBER(2, "Number", "数字类型"),
DATE(3, "Date", "时间类型");
private int value;
private String name;
@ -829,6 +828,7 @@ public class ImppEnumUtil {
return tmp;
}
}
/**
*
* 1. String
@ -838,12 +838,12 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYS_VALUE_TYPE {
STRING(1,"text","文本"),
NUMBER(2,"number","数字"),
DATE(3,"date","时间"),
SWITCH(4,"switch","布尔"),
SELECT(5,"select","选择"),
FILE(6,"select","选择");
STRING(1, "text", "文本"),
NUMBER(2, "number", "数字"),
DATE(3, "date", "时间"),
SWITCH(4, "switch", "布尔"),
SELECT(5, "select", "选择"),
FILE(6, "select", "选择");
private int value;
private String name;
@ -910,7 +910,7 @@ public class ImppEnumUtil {
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum SYS_CACHE_TYPE {
REDIS(1,"Redis","Redis 缓存方式");
REDIS(1, "Redis", "Redis 缓存方式");
private int value;
private String name;
@ -1054,6 +1054,7 @@ public class ImppEnumUtil {
}
}
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum MESSAGE_RECEIVER_TYPE {
INTERNAL(1, "内部人员"),
@ -1095,10 +1096,10 @@ public class ImppEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FILE_ATTACH_SOURCE {
MAIL(1,"邮件","邮件"),
LETTER(2,"站内信","站内信"),
SWEB_NOTICE(3,"SWEB通知","SWEB通知"),
SWEB_PUBLIC_NOTICE(4,"SWEB公告","SWEB公告");
MAIL(1, "邮件", "邮件"),
LETTER(2, "站内信", "站内信"),
SWEB_NOTICE(3, "SWEB通知", "SWEB通知"),
SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告");
private int value;
private String name;

@ -538,6 +538,14 @@ public class WmsEnumUtil {
return code;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -873,7 +881,7 @@ public class WmsEnumUtil {
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
@ -1085,6 +1093,10 @@ public class WmsEnumUtil {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
@ -1250,6 +1262,9 @@ public class WmsEnumUtil {
return tmp;
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
@ -2816,7 +2831,7 @@ public class WmsEnumUtil {
// 根据枚举编号获取语言代码
public static String getCodeByIndex(Integer index) {
for (LANGUAGE_TYPE languageType : LANGUAGE_TYPE.values()) {
if (languageType.getValue() == index.intValue()) {
if (languageType.getValue() == index) {
return languageType.getDescription();
}
}
@ -3283,7 +3298,7 @@ public class WmsEnumUtil {
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
@ -3325,6 +3340,17 @@ public class WmsEnumUtil {
}
return tmp;
}
public static String descriptionOfValue(String desc) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -3355,7 +3381,7 @@ public class WmsEnumUtil {
}
public static Map<String, Object> getEnumByName(String enumName) throws Exception {
Class innerClazz[] = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
Class[] innerClazz = WmsEnumUtil.class.getDeclaredClasses();// 获取常量类中的所有内部类
Class<Enum> clazz;
Enum[] enumConstants;
@ -3453,7 +3479,7 @@ public class WmsEnumUtil {
public static String getDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == code) {
if (values()[i].value.equals(code)) {
tmp = values()[i].description;
}
}
@ -3576,8 +3602,7 @@ public class WmsEnumUtil {
public enum WMS_STOCK_TYPE {
SOURCE(10, "实物条码"),
TARGET(20, "虚拟条码"),
CUST_SN(30, "客户条码"),
FIRST_MIDDLE_LAST(40, "首中末件");
CUST_SN(30, "客户条码");
private int value;
private String description;
@ -3702,7 +3727,7 @@ public class WmsEnumUtil {
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
@ -3742,7 +3767,7 @@ public class WmsEnumUtil {
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
@ -3876,7 +3901,7 @@ public class WmsEnumUtil {
public static String getDes(String val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
if (values()[i].value.equals(val)) {
tmp = values()[i].description;
}
}
@ -4802,6 +4827,17 @@ public class WmsEnumUtil {
}
return tmp;
}
public static int descriptionOfValue(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
}
/**
@ -6575,4 +6611,299 @@ public class WmsEnumUtil {
return valueOf(val);
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRANSPORT_TYPE {
LONG_HAUL(10, "长途运输"),
SHORT_DISTANCE(20, "短途运输");
private int value;
private String description;
TRANSPORT_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static TRANSPORT_TYPE codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum LOGISTICS_PROVIDER_TYPE {
VENDOR(10, "承运商");
private int value;
private String description;
LOGISTICS_PROVIDER_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public static LOGISTICS_PROVIDER_TYPE codeOf(int value) {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
return null;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
}
/**
* BatchHold
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BH_PART_CHECK_STD {
NUMBER(1, "NORMAL", "合格"),
TEXT(2, "ABNORMAL", "不合格");
private int value;
private String code;
private String description;
BH_PART_CHECK_STD(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
}
/**
* BH RepairOrPick
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BH_TEST_RESULT_TYPE {
PICK(10, "NORMAL", "挑选"), REPAIR(20, "ABNORMAL", "返修");
private int value;
private String code;
private String description;
BH_TEST_RESULT_TYPE(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static BH_TEST_RESULT_TYPE codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
/**
* BH
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum BH_TEST_RESULT_STATUS {
NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格");
private int value;
private String code;
private String description;
BH_TEST_RESULT_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getDescription() {
return description;
}
public String getCode() {
return code;
}
public static String valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].description;
}
}
return tmp;
}
public static String valueOfDescription(int val) {
return valueOf(val);
}
public static int descriptionOfValue(String desc) {
return descOf(desc);
}
public static int descOf(String desc) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].description.equals(desc)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static BH_TEST_RESULT_STATUS codeOf(Integer value) {
if (value == null) {
return null;
} else {
for (int i = 0; i < values().length; i++) {
if (values()[i].value == value) {
return values()[i];
}
}
}
return null;
}
}
}

@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api(value = "表单按钮", description = "表单按钮")
public class BfButton extends BaseBean {
private static final long serialVersionUID = -1675967061983417558L;
@Column(name = "BUTTON_NAME")
@ApiParam(value = "按钮名称")
private String buttonName;

@ -33,6 +33,7 @@ import java.util.List;
@Api(value="级联元素",description = "级联元素")
public class BfCascade extends BaseBean {
private static final long serialVersionUID = -2114224803602089395L;
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value="级联元素明细",description = "级联元素")
public class BfCascadeDetail extends BaseBean {
private static final long serialVersionUID = -8365699249398175846L;
@Column(name = "CASCADE_ID")
@ApiParam(value = "级联ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

@ -30,6 +30,7 @@ import java.util.List;
@Api(value="数据对象",description = "原数据对象,最原始数据")
public class BfDataObject extends BaseBean {
private static final long serialVersionUID = -6450328805517462673L;
@Column(name = "DATA_SOURCE_ID")
@ApiParam(value = "数据源ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

@ -33,6 +33,7 @@ import java.util.List;
@Api(value = "数据对象属性表", description = "数据对象的属性明细表")
public class BfDataObjectProperty extends BaseBean {
private static final long serialVersionUID = 2607149135728621568L;
//外键关联数据对象主键
@Column(name = "DATA_OBJECT_ID")
@ApiParam(value = "数据对象ID", example = "-1")

@ -29,6 +29,7 @@ import java.util.List;
@Api(value="数据对象",description = "原数据对象,最原始数据")
public class BfDataSource extends BaseBean {
private static final long serialVersionUID = -749606489129498769L;
@Column(name="SOURCE_NAME")
@ApiParam(value ="数据源名称")
private String sourceName;

@ -33,6 +33,7 @@ import java.util.List;
@Api(value = "对象元素基础", description = "元素基础表")
public class BfElement extends BaseBean {
private static final long serialVersionUID = -3309080566388373068L;
//外键关联数据对象主键
@Column(name = "ELEMENT_INFO_ID")
@ApiParam(value = "对象元素明细ID", example = "-1")

@ -33,6 +33,7 @@ import javax.persistence.Table;
@Api(value = "元素约束", description = "元素约束")
public class BfElementConstraint extends BaseBean {
private static final long serialVersionUID = 6951083749548881908L;
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

@ -32,6 +32,7 @@ import javax.persistence.Table;
@Api(value = "对象元素表格", description = "对象元素表格")
public class BfElementGrid extends BaseBean {
private static final long serialVersionUID = -3730288075103132153L;
//外键关联数据对象主键
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")

@ -32,6 +32,7 @@ import javax.persistence.Transient;
@Api(value="对象元素属性",description = "对象元素属性 相当于数据对象属性的扩展")
public class BfElementProperty extends BaseBean {
private static final long serialVersionUID = 8391877375302721425L;
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

@ -30,6 +30,7 @@ import java.util.List;
@Api(value="对象元素虚拟属性",description = "对象元素虚拟属性")
public class BfElementPropertyVirtual extends BaseBean {
private static final long serialVersionUID = -8746243539245788738L;
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

@ -31,6 +31,7 @@ import javax.persistence.Transient;
@Api(value = "对象元素基础", description = "元素基础表")
public class BfElementTree extends BaseBean {
private static final long serialVersionUID = -6173269177770192337L;
//外键关联数据对象主键
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")

@ -1,8 +1,6 @@
package cn.estsh.i3plus.pojo.form.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.Data;
@ -30,6 +28,7 @@ import javax.persistence.Table;
@Api(value="拦截器主体")
public class BfIntercept extends BaseBean {
private static final long serialVersionUID = -7880837699871138830L;
@Column(name="INTERCEPT_NAME")
@ApiParam(value ="拦截器名称")
private String interceptName;

@ -31,6 +31,7 @@ import javax.persistence.Transient;
@Api(value="拦截器明细")
public class BfInterceptDetail extends BaseBean {
private static final long serialVersionUID = -2813973524088674573L;
@Column(name="INTERCEPT_ID")
@ApiParam(value ="拦截器id")
@JsonSerialize(using = ToStringSerializer.class)

@ -7,7 +7,6 @@ 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;
@ -28,6 +27,7 @@ import java.util.List;
@Api(value = "自定义表单布局")
public class BfLayout extends BaseBean {
private static final long serialVersionUID = 4951428858633293563L;
@Column(name = "LAYOUT_NAME")
@ApiParam(value = "名称")
private String layoutName;

@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value = "自定义表单布局-列")
public class BfLayoutColumn extends BaseBean {
private static final long serialVersionUID = -8711414349182712011L;
@Column(name = "LAYOUT_ID")
@ApiParam(value = "布局主键")
@JsonSerialize(using = ToStringSerializer.class)

@ -9,7 +9,6 @@ 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;
@ -30,6 +29,7 @@ import java.util.List;
@Api(value = "自定义表单布局-行")
public class BfLayoutRow extends BaseBean {
private static final long serialVersionUID = -3327441937912038000L;
@Column(name = "LAYOUT_ID")
@ApiParam(value = "布局主键")
@JsonSerialize(using = ToStringSerializer.class)

@ -32,6 +32,7 @@ import java.util.List;
@Api(value="表单菜单目录",description = "表单菜单目录")
public class BfMenu extends BaseBean {
private static final long serialVersionUID = 6559248298739431579L;
@Column(name="MENU_NAME")
@ApiParam(value ="菜单名称")
private String menuName;

@ -32,6 +32,7 @@ import java.util.List;
@Api(value="表单功能",description = "表单功能")
public class BfMethod extends BaseBean {
private static final long serialVersionUID = 6976569600026342045L;
@Column(name="METHOD_NAME")
@ApiParam(value ="功能名称")
private String methodName;

@ -32,6 +32,7 @@ import java.util.List;
@Api(value="表单功能明细",description = "表单功能明细")
public class BfMethodDetail extends BaseBean {
private static final long serialVersionUID = 3982619673130000003L;
@Column(name="METHOD_ID")
@ApiParam(value ="功能id")
@JsonSerialize(using = ToStringSerializer.class)

@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
public class BfMethodDetailProperty extends BaseBean {
private static final long serialVersionUID = -7541677357317732343L;
@Column(name="METHOD_ID")
@ApiParam(value ="功能id")
@JsonSerialize(using = ToStringSerializer.class)

@ -31,6 +31,7 @@ import javax.persistence.Transient;
@Api(value="按钮功能关系",description = "按钮功能关系")
public class BfRefButtonMethod extends BaseBean {
private static final long serialVersionUID = 1145541515189800147L;
@Column(name="BUTTON_ID")
@ApiParam(value ="按钮id")
@JsonSerialize(using = ToStringSerializer.class)

@ -30,6 +30,7 @@ import javax.persistence.Table;
@Api(value="对象元素虚拟属性",description = "对象元素虚拟属性")
public class BfRefElementPropertyVirtualDetail extends BaseBean {
private static final long serialVersionUID = 3315763374468711786L;
@Column(name = "ELEMENT_ID")
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api(value = "功能角色关系", description = "功能角色关系")
public class BfRefMethodRole extends BaseBean {
private static final long serialVersionUID = 8134565165534099843L;
@Column(name = "METHOD_ID")
@ApiParam(value = "表单功能id")
@JsonSerialize(using = ToStringSerializer.class)

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.ics.bean;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
@ -13,8 +14,9 @@ import java.util.List;
* @Modify:
**/
@Data
public class IcsActuatorMetrics {
public class IcsActuatorMetrics implements Serializable {
private static final long serialVersionUID = 4341201186821752353L;
private String name;
private List<Measurements> measurements;
private List<AvailableTags> availableTags;

@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
@ -16,8 +17,9 @@ import java.util.List;
**/
@Data
@ApiModel("应用信息")
public class IcsApplication {
public class IcsApplication implements Serializable {
private static final long serialVersionUID = -1923997516217683087L;
@ApiModelProperty("应用名称")
private String appName;

@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -14,8 +16,9 @@ import lombok.Data;
**/
@Data
@ApiModel("实例信息")
public class IcsInstance {
public class IcsInstance implements Serializable {
private static final long serialVersionUID = 2648298051066693374L;
@ApiModelProperty("实例id")
private String instanceId;
@ -31,7 +34,7 @@ public class IcsInstance {
@ApiModelProperty("状态时间")
private String statusTimeStampStr;
public String getInstanceStatusTxt(){
return instanceStatus == null ?"无": CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus);
public String getInstanceStatusTxt() {
return instanceStatus == null ? "无" : CommonEnumUtil.CLOUD_APP_STATUS.valueOfDescription(instanceStatus);
}
}

@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -13,8 +15,9 @@ import lombok.Data;
**/
@Data
@ApiModel("实例明细")
public class IcsInstanceDetail {
public class IcsInstanceDetail implements Serializable {
private static final long serialVersionUID = -348649782622051827L;
@ApiModelProperty("pid")
private String pid;

@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -13,8 +15,9 @@ import lombok.Data;
**/
@Data
@ApiModel("实例堆内存")
public class IcsInstanceMemoryHeap {
public class IcsInstanceMemoryHeap implements Serializable {
private static final long serialVersionUID = -5982536759101768884L;
@ApiModelProperty("堆使用的内存")
private double heapMemoryUsed;

@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -13,8 +15,9 @@ import lombok.Data;
**/
@Data
@ApiModel("实例堆非内存")
public class IcsInstanceMemoryNonHeap {
public class IcsInstanceMemoryNonHeap implements Serializable {
private static final long serialVersionUID = 5457399972284816473L;
@ApiModelProperty("非堆内存元空间")
private double nonHeapMemoryMetaspace;

@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* @Description : 线
* @Reference :
@ -13,8 +15,9 @@ import lombok.Data;
**/
@Data
@ApiModel("实例线程信息")
public class IcsInstanceThread {
public class IcsInstanceThread implements Serializable {
private static final long serialVersionUID = -272358532317411617L;
@ApiModelProperty("实时线程")
private double threadLive;

@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
@ -15,8 +16,9 @@ import java.util.List;
**/
@Data
@ApiModel("注册中心")
public class IcsRegist {
public class IcsRegist implements Serializable {
private static final long serialVersionUID = -5624347440991960286L;
@ApiModelProperty("环境")
private String environment;

@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -15,25 +17,27 @@ import lombok.Data;
**/
@Data
@ApiModel("指令操作")
public class LacCommandOperate {
public class LacCommandOperate implements Serializable {
@ApiParam(value ="指令集记录id" , example = "-1")
private static final long serialVersionUID = 2877359322522442241L;
@ApiParam(value = "指令集记录id", example = "-1")
private Long operateObjId;
@ApiParam(value ="操作对象类型" , example = "-1")
@ApiParam(value = "操作对象类型", example = "-1")
@AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_OBJ_TYPE.class)
private Integer operateObjType;
@ApiParam(value ="操作" , example = "-1")
@ApiParam(value = "操作", example = "-1")
@AnnoOutputColumn(refClass = LacEnumUtil.OPERATE_COMMAND.class)
private Integer operateCommand;
public LacCommandOperate(){}
public LacCommandOperate() {
}
public LacCommandOperate(Long operateObjId,Integer operate){
public LacCommandOperate(Long operateObjId, Integer operate) {
this.operateObjId = operateObjId;
LacEnumUtil.OPERATE_COMMAND operate_command = LacEnumUtil.OPERATE_COMMAND.valueOf(operate);
if(operate_command!=null) {
if (operate_command != null) {
this.operateCommand = operate_command.getValue();
this.operateObjType = operate_command.getOperateObjType().getValue();
}

@ -52,6 +52,7 @@ import java.util.List;
@Api(value="指令集步骤",description = "指令集步骤")
public class LacCommandStackStep extends BaseBean {
private static final long serialVersionUID = 4053765920069631323L;
@Column(name="TEMPLATE_ID")
@ApiParam(value ="模板ID")
@JsonSerialize(using = ToStringSerializer.class)

@ -55,6 +55,7 @@ import javax.persistence.Transient;
@Api(value="步骤任务",description = "步骤任务信息")
public class LacCommandStackStepTask extends BaseBean {
private static final long serialVersionUID = 7432247591995852126L;
@Column(name="TEMPLATE_ID")
@ApiParam(value ="模板ID")
@JsonSerialize(using = ToStringSerializer.class)

@ -49,6 +49,7 @@ import java.util.List;
@Api(value="指令集模板",description = "指令集模板信息")
public class LacCommandStackTemplate extends BaseBean {
private static final long serialVersionUID = 4884527553767334910L;
@Column(name="TEMPLATE_NAME")
@ApiParam(value ="模板名称")
private String templateName;

@ -24,21 +24,22 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="LAC_COMMAND_STACK_TYPE")
@Api(value="指令集类型",description = "指令集类型")
@Table(name = "LAC_COMMAND_STACK_TYPE")
@Api(value = "指令集类型", description = "指令集类型")
public class LacCommandStackType extends BaseBean {
@Column(name="TYPE_NAME")
@ApiParam(value ="类型名称")
private static final long serialVersionUID = -2699452452325728351L;
@Column(name = "TYPE_NAME")
@ApiParam(value = "类型名称")
private String typeName;
@Column(name="TYPE_REF_NUM")
@ApiParam(value ="适配器使用数量")
@Column(name = "TYPE_REF_NUM")
@ApiParam(value = "适配器使用数量")
private Integer typeRefNum;
@Column(name="TYPE_DESCRIPTION")
@ApiParam(value ="类型描述")
@Column(name = "TYPE_DESCRIPTION")
@ApiParam(value = "类型描述")
private String typeDescription;
}

@ -57,17 +57,18 @@ import javax.persistence.Table;
@Api(value="适配器",description = "适配器信息")
public class LacSuitCase extends BaseBean {
@Column(name="SUTI_CASE_NAME_RDD")
private static final long serialVersionUID = 6325924633917664579L;
@Column(name="SUIT_CASE_NAME_RDD")
@ApiParam(value ="适配器名称")
private String sutiCaseNameRdd;
private String suitCaseNameRdd;
@Column(name="SUIT_CASE_CODE_RDD")
@ApiParam(value ="适配器代码")
private String suitCaseCodeRdd;
@Column(name="SUTI_TYPE")
@Column(name="SUIT_TYPE")
@ApiParam(value ="适配器类型")
private Integer sutiType;
private Integer suitType;
@Column(name="HARDWARE_TYPE")
@ApiParam(value ="硬件类型")

@ -61,6 +61,7 @@ import java.util.List;
@Api(value="调度任务",description = "调度任务信息")
public class LacSuitTask extends BaseBean {
private static final long serialVersionUID = -6592851798133225109L;
@Column(name="TASK_NAME")
@ApiParam(value ="适配器名称")
private String taskName;

@ -54,6 +54,7 @@ import javax.persistence.Transient;
@Api(value="调度任务参数",description = "调度任务参数信息")
public class LacSuitTaskParam extends BaseBean {
private static final long serialVersionUID = 3521650869017242460L;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID")
@JsonSerialize(using = ToStringSerializer.class)

@ -55,6 +55,7 @@ import javax.persistence.Table;
@Api(value="调度任务参数转换",description = "调度任务参数转换信息")
public class LacSuitTaskParamAdapter extends BaseBean {
private static final long serialVersionUID = -4049358225863293288L;
@Column(name="TASK_ID")
@ApiParam(value ="任务ID")
@JsonSerialize(using = ToStringSerializer.class)

@ -33,6 +33,7 @@ import javax.persistence.Transient;
@Api(value="任务检查",description = "任务检查")
public class LacTaskCheck extends BaseBean {
private static final long serialVersionUID = -4157772560831884634L;
@Column(name="COMMAND_STACK_TEMPLATE_ID")
@ApiParam(value ="指令集模板ID")
@JsonSerialize(using = ToStringSerializer.class)

@ -28,6 +28,7 @@ import javax.persistence.Table;
@Api(value="任务类型",description = "任务类型")
public class LacTaskType extends BaseBean {
private static final long serialVersionUID = 7596608775083338503L;
@Column(name="TYPE_NAME")
@ApiParam(value ="类型名称")
private String typeName;

@ -65,6 +65,7 @@ public class LacHqlPack {
DdlPreparedPack.getNumEqualPack(bean.getCommandStackRecordId(), "commandStackRecordId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getTaskStatus(), "taskStatus", ddlPackBean);
return ddlPackBean;
}
@ -165,6 +166,8 @@ public class LacHqlPack {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean();
DdlPreparedPack.getNumEqualPack(bean.getStackStatus(), "stackStatus", ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getCommandStackId(), "commandStackId", ddlPackBean);
DdlPreparedPack.getStringLikerPack(bean.getCommandStackNameRdd(), "commandStackNameRdd", ddlPackBean);
DdlPreparedPack.timeBuilder(bean.getStackStartTime(), "stackStartTime", ddlPackBean,false, true);
@ -199,9 +202,9 @@ public class LacHqlPack {
public static DdlPackBean packHqlLacSuitCase(LacSuitCase bean) {
DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(bean);
DdlPreparedPack.getStringLikerPack(bean.getSutiCaseNameRdd(),"sutiCaseNameRdd",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bean.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
DdlPreparedPack.getStringLikerPack(bean.getSuitCaseCodeRdd(),"suitCaseCodeRdd",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getSutiType(),"id",ddlPackBean);
DdlPreparedPack.getNumEqualPack(bean.getSuitType(),"suitType",ddlPackBean);
return ddlPackBean;
}

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>i3plus-pojo</artifactId>
<groupId>i3plus.pojo</groupId>
<version>1.0-DEV-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>i3plus-pojo-mdm</artifactId>
<dependencies>
<dependency>
<groupId>i3plus.pojo</groupId>
<artifactId>i3plus-pojo-base</artifactId>
</dependency>
</dependencies>
</project>

@ -0,0 +1,46 @@
package cn.estsh.i3plus.pojo.mdm.bean.base;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Transient;
/**
* @Description : MDMbean
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-12 17:30
* @Modify:
**/
@Data
@ApiModel("MDM基础bean")
public class BaseMdmBean extends BaseBean {
private static final long serialVersionUID = 3957595289035947441L;
@Transient
@ApiModelProperty("是否主数据")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Integer isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
@ApiModelProperty("mdm数据版本")
private Long mdmVersion;
public long getMdmVersion() {
return mdmVersion == null ? 0 : mdmVersion;
}
// 版本递增
public long nextMdmVersion() {
return mdmVersion = getMdmVersion() + 1;
}
@ApiModelProperty("是否发布")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
private Integer isPublished;
}

@ -0,0 +1,30 @@
package cn.estsh.i3plus.pojo.mdm.bean.base;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Transient;
/**
* @Description : MDMbean
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-12 17:30
* @Modify:
**/
@Data
@ApiModel("MDM业务基础bean")
public class BaseMdmExtdBean extends BaseMdmBean {
private static final long serialVersionUID = 4267453020130810967L;
@Transient
@ApiModelProperty("软件模块")
@AnnoOutputColumn(refClass = CommonEnumUtil.TRUE_OR_FALSE.class)
public static Integer mdmSoftType;
}

@ -0,0 +1,31 @@
package cn.estsh.i3plus.pojo.mdm.bean.busi.core;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmExtdBean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Description : 齿-
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-12 18:09
* @Modify:
**/
@Data
@ApiModel("主数据齿轮-平台扩展")
public class MdmGearCoreExtd extends BaseMdmExtdBean {
private static final long serialVersionUID = -3535174942277452194L;
// 初始化数据
static {
isMdmMaster = CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue();
mdmSoftType = CommonEnumUtil.SOFT_TYPE.CORE.getValue();
}
@ApiModelProperty("核心数量")
public String coreNum;
}

@ -0,0 +1,27 @@
package cn.estsh.i3plus.pojo.mdm.bean.master;
import cn.estsh.i3plus.pojo.mdm.bean.base.BaseMdmBean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Description : 齿
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-12 18:09
* @Modify:
**/
@Data
@ApiModel("主数据齿轮")
public class MdmGear extends BaseMdmBean {
private static final long serialVersionUID = -7580444601811207793L;
@ApiModelProperty("齿轮名称")
private String name;
@ApiModelProperty("齿轮规格")
private String gearModel;
}

@ -0,0 +1,19 @@
package cn.estsh.i3plus.pojo.mdm.bean.model.core;
import cn.estsh.i3plus.pojo.mdm.bean.busi.core.MdmGearCoreExtd;
import cn.estsh.i3plus.pojo.mdm.bean.master.MdmGear;
/**
* @Description : 齿-model
* @Reference :
* @Author : yunhao
* @CreateDate : 2020-05-12 18:09
* @Modify:
**/
public class MdmGearCoreModel {
private MdmGear mdmGear;
private MdmGearCoreExtd mdmGearCoreExtd;
}

@ -2706,7 +2706,12 @@ public class MesHqlPack {
}
public static DdlPackBean getDataAuthCondition(MesDataAuth dataAuth, String organizeCode) {
DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
DdlPackBean packBean;
if(dataAuth.getIsValidVal() == 0) {
packBean = DdlPackBean.getDdlPackBean(organizeCode);
} else {
packBean = DdlPackBean.getDdlPackBean(organizeCode, dataAuth.getIsValidVal());
}
if (!StringUtils.isEmpty(dataAuth.getDataObject())) {
DdlPreparedPack.getStringLikerPack(dataAuth.getDataObject(), "dataObject", packBean);
}

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.common.Pager;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -12,8 +14,9 @@ import lombok.Data;
* @Modify:
**/
@Data
public class CloudPagerModel<T> {
public class CloudPagerModel<T> implements Serializable {
private static final long serialVersionUID = 3091924006138375461L;
@ApiParam("查询对象")
private T obj;

@ -2,19 +2,19 @@ package cn.estsh.i3plus.pojo.model.dynamic.table;
import lombok.Data;
import java.util.Date;
import java.io.Serializable;
/**
* @Description :
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2018-12-11 15:37
* @Modify:
* Table
* @Modify: Table
**/
@Data
public class DynTableCell {
public class DynTableCell implements Serializable {
private static final long serialVersionUID = 3798664031371975269L;
// 单元格名称
private String cellKey;
// 排序

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.dynamic.table;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@ -12,12 +13,12 @@ import java.util.Map;
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2018-12-11 15:37
* @Modify:
* Table Row
* @Modify: Table Row
**/
@Data
public class DynTableRow {
public class DynTableRow implements Serializable {
private static final long serialVersionUID = 2012638500620164166L;
// 是否选中
private boolean isChecked;
@ -31,11 +32,11 @@ public class DynTableRow {
private Integer cellSize = 0;
// 行数据
private Map<String,DynTableCell> cellMap = new HashMap<>();
private Map<String, DynTableCell> cellMap = new HashMap<>();
public DynTableRow putCell(DynTableCell cell){
this.cellMap.put(cell.getCellKey(),cell);
public DynTableRow putCell(DynTableCell cell) {
this.cellMap.put(cell.getCellKey(), cell);
return this;
}
@ -45,8 +46,10 @@ public class DynTableRow {
/**
* Size
*
* @param cellSize
*/
private void setCellSize(Integer cellSize) { }
private void setCellSize(Integer cellSize) {
}
}

@ -2,9 +2,8 @@ package cn.estsh.i3plus.pojo.model.dynamic.table;
import lombok.Data;
import java.util.ArrayList;
import java.io.Serializable;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
@ -12,14 +11,14 @@ import java.util.Map;
* @Reference :
* @Author : Adair Peng
* @CreateDate : 2018-12-11 15:37
* @Modify:
* Table Row
* @Modify: Table Row
**/
@Data
public class ImppDynTable {
public class ImppDynTable implements Serializable {
private static final long serialVersionUID = 6634878862426951453L;
// 行数据
private Map<String,DynTableRow> table = new HashMap<>();
private Map<String, DynTableRow> table = new HashMap<>();
// 表单标题
private String tableTitle;

@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
@ -19,8 +20,9 @@ import java.util.Map;
**/
@Data
@ApiModel("按钮操作数据模型")
public class BfButtonOperateDataModel {
public class BfButtonOperateDataModel implements Serializable {
private static final long serialVersionUID = 5592739471208814372L;
@ApiModelProperty("按钮id")
private Long buttonId;
@ -28,7 +30,7 @@ public class BfButtonOperateDataModel {
private Long elementId;
@ApiModelProperty("操作数据")
private List<Map<String,Object>> operateData;
private List<Map<String, Object>> operateData;
@ApiModelProperty("按钮功能关系信息")
private BfRefButtonMethod bfRefButtonMethod;

@ -3,10 +3,9 @@ package cn.estsh.i3plus.pojo.model.form;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.form.bean.BfDataObject;
import cn.estsh.i3plus.pojo.form.bean.BfDataObjectProperty;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
@ -18,8 +17,9 @@ import java.util.Map;
* @Modify:
**/
@Data
public class CloudFormModel {
public class CloudFormModel implements Serializable {
private static final long serialVersionUID = -4880909594223592633L;
private BfDataObject dataObject;
// 数据源编码
@ -28,38 +28,38 @@ public class CloudFormModel {
private String dataObjectCode; // 任何操作必填 必须真实
// 单条插入
private Map<String,Object> insert;
private Map<String, Object> insert;
// 单条修改
private Map<String,Object> update;
private Map<String, Object> update;
// 新增数据
private List<Map<String,Object>> insertList;
private List<Map<String, Object>> insertList;
// 修改条件
// private List<BfDataObjectProperty> updateConditionList;
// 修改数据
private List<Map<String,Object>> updateList;
private List<Map<String, Object>> updateList;
// 查询数据
private List<BfDataObjectProperty> selectList;
// 删除数据
private List<Map<String,Object>> deleteList;
private List<Map<String, Object>> deleteList;
private Map<String,Object> delete;
private Map<String, Object> delete;
public String orderByParam;
public Integer ascOrDesc = 1;
public String orderBy(){
public String orderBy() {
String result = "";
if (orderByParam!=null&&orderByParam.trim().length()>0) {
if (orderByParam != null && orderByParam.trim().length() > 0) {
result = " order by " + orderByParam;
if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
if (ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
result += " asc";
}else{
} else {
result += " desc";
}
}

@ -5,6 +5,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description : Model
* @Reference :
@ -13,8 +15,9 @@ import lombok.Data;
* @Modify:
**/
@Data
public class ElementFormModel {
public class ElementFormModel implements Serializable {
private static final long serialVersionUID = 3215723235918474591L;
//外键关联数据对象主键
@ApiParam(value = "元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)

@ -1,6 +1,5 @@
package cn.estsh.i3plus.pojo.model.form;
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.form.bean.*;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@ -8,8 +7,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import javax.persistence.Column;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
/**
@ -20,8 +18,9 @@ import java.util.List;
* @Modify:
**/
@Data
public class ElementModel{
public class ElementModel implements Serializable {
private static final long serialVersionUID = -8009888251366822835L;
//外键关联数据对象主键
@ApiParam(value = "对象元素ID", example = "-1")
@JsonSerialize(using = ToStringSerializer.class)
@ -64,7 +63,7 @@ public class ElementModel{
public String orderByParam;
//CommonEnumUtil.ASC_OR_DESC 1 asc,2 desc
@ApiParam(value = "排序类型1 正序2 倒序",example = "1")
@ApiParam(value = "排序类型1 正序2 倒序", example = "1")
public Integer ascOrDesc = 1;
}

@ -4,16 +4,17 @@ import cn.estsh.i3plus.pojo.form.bean.*;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @Description :
* <per>
* <br/>
* <br/>
* <br/>
* <br/>
* <br/>
* <br/>
* <br/>
* <br/>
* <br/>
* <br/>
* </per>
* @Reference :
* @Author : Adair Peng
@ -21,8 +22,9 @@ import java.util.List;
* @Modify:
**/
@Data
public class FormModel {
public class FormModel implements Serializable {
private static final long serialVersionUID = 146034689646326300L;
// 表单功能
@ApiParam(value = "表单功能")
private BfMethod method;

@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
@ -20,8 +21,9 @@ import java.util.Map;
@Data
@ApiModel("表单操作数据模型")
@NoArgsConstructor
public class FormOperateDataModel {
public class FormOperateDataModel implements Serializable {
private static final long serialVersionUID = 7674678844523192310L;
@ApiModelProperty("关联标识")
private String refId;
@ -36,6 +38,6 @@ public class FormOperateDataModel {
private String sourceName;
@ApiModelProperty("操作数据集合")
private List<Map<String,Object>> operateDataList;
private List<Map<String, Object>> operateDataList;
}

@ -1,10 +1,11 @@
package cn.estsh.i3plus.pojo.model.form;
import cn.estsh.i3plus.pojo.base.enumutil.BlockFormEnumUtil;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -13,8 +14,9 @@ import lombok.Data;
* @Modify:
**/
@Data
public class SqlColumnModel {
// isAutoIncrement true isNullable 0 isSigned true getColumnDisplaySize 11 getColumnLabel id getColumnName id getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer
public class SqlColumnModel implements Serializable {
private static final long serialVersionUID = -8437573966195980847L;
// isAutoIncrement true isNullable 0 isSigned true getColumnDisplaySize 11 getColumnLabel id getColumnName id getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer
// isAutoIncrement false isNullable 1 isSigned false getColumnDisplaySize 50 getColumnLabel name getColumnName name getSchemaName getPrecision 50 getScale 0 getTableName interceptor getColumnType 12 getColumnTypeName VARCHAR getColumnClassName java.lang.String
// isAutoIncrement false isNullable 1 isSigned true getColumnDisplaySize 11 getColumnLabel age getColumnName age getSchemaName getPrecision 11 getScale 0 getTableName interceptor getColumnType 4 getColumnTypeName INT getColumnClassName java.lang.Integer
// isAutoIncrement false isNullable 1 isSigned false getColumnDisplaySize 19 getColumnLabel date_time getColumnName date_time getSchemaName getPrecision 19 getScale 0 getTableName interceptor getColumnType 93 getColumnTypeName TIMESTAMP getColumnClassName java.sql.Timestamp

@ -1,12 +1,9 @@
package cn.estsh.i3plus.pojo.model.form;
import cn.estsh.i3plus.pojo.form.bean.BfDataObject;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import java.io.Serializable;
import java.util.List;
import java.util.Objects;
/**
* @Description :
@ -16,8 +13,9 @@ import java.util.Objects;
* @Modify:
**/
@Data
public class SqlCreateDllModel {
public class SqlCreateDllModel implements Serializable {
private static final long serialVersionUID = -1294648161172538340L;
private String tableCat;
private String tableSchem;
private String tableName;
@ -29,6 +27,6 @@ public class SqlCreateDllModel {
private String selfReferencingColName;
private String refGeneration;
List<SqlColumnModel> columnlist ;
List<SqlColumnModel> columnlist;
}

@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
@ -16,14 +17,15 @@ import java.util.List;
* @Modify:
**/
@Data
public class SqlScriptModel {
public class SqlScriptModel implements Serializable {
private static final long serialVersionUID = 512077813851983749L;
@ApiParam(value = "对象元素ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long elementId;
@ApiParam(value = "元素内容")
private String elementContent ;
private String elementContent;
@ApiParam(value = "动态对象Class")
private Class dynClass;

@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.model.form;
import cn.estsh.i3plus.pojo.wms.bean.WmsPackage;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
@ -13,8 +14,9 @@ import java.util.List;
* @Modify:
**/
@Data
public class WmsPackageModel {
public class WmsPackageModel implements Serializable {
private static final long serialVersionUID = -6308064202329492679L;
List<WmsPackage> wmsPackageList;
}

@ -5,6 +5,8 @@ import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask;
import lombok.Data;
import org.slf4j.LoggerFactory;
import java.io.Serializable;
/**
* @Description : lacmodel
* @Reference :
@ -13,8 +15,9 @@ import org.slf4j.LoggerFactory;
* @Modify:
**/
@Data
public class LacCommandStackModel {
public class LacCommandStackModel implements Serializable {
private static final long serialVersionUID = -8453748548383071954L;
/**
* id
*/
@ -46,17 +49,17 @@ public class LacCommandStackModel {
private Exception exception;
public void setException(Exception exception){
LoggerFactory.getLogger("YYYY").error("异常信息:{}",exception);
public void setException(Exception exception) {
LoggerFactory.getLogger("YYYY").error("异常信息:{}", exception);
this.exception = exception;
}
public void setCommandStackRecord(LacCommandStackRecord commandStackRecord){
public void setCommandStackRecord(LacCommandStackRecord commandStackRecord) {
this.commandStackRecord = commandStackRecord;
this.recordId = commandStackRecord.getId();
}
public Object getTaskRequestParam(LacCommandStackStepTask stepTask){
public Object getTaskRequestParam(LacCommandStackStepTask stepTask) {
for (Task task : this.getRequest().getTaskList()) {
// 步骤代码为空时匹配所有任务参数
if (task.getStepCode() == null && task.getCode().equals(stepTask.getTaskCodeRdd())) {
@ -69,8 +72,8 @@ public class LacCommandStackModel {
return null;
}
public Long getRecordId(){
if(recordId == null &&this.commandStackRecord !=null){
public Long getRecordId() {
if (recordId == null && this.commandStackRecord != null) {
this.recordId = this.commandStackRecord.getId();
}
return recordId;

@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.lac;
import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
@ -14,8 +16,9 @@ import java.util.List;
**/
@Data
@XStreamAlias("request")
public class LacSuitRequest {
public class LacSuitRequest implements Serializable {
private static final long serialVersionUID = 9078681515190902399L;
/**
*
*/

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
import java.io.Serializable;
/**
* @Description : lac
* @Reference :
@ -13,8 +15,9 @@ import lombok.Data;
**/
@Data
@XStreamAlias("response")
public class LacSuitResponse {
public class LacSuitResponse implements Serializable {
private static final long serialVersionUID = -4119301611637726729L;
/**
*
*/
@ -35,7 +38,7 @@ public class LacSuitResponse {
*/
private Object result;
public LacSuitResponse(){
public LacSuitResponse() {
this.success = true;
this.code = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
this.message = ResourceEnumUtil.MESSAGE.SUCCESS.getDescription();

@ -4,6 +4,8 @@ import cn.estsh.i3plus.pojo.base.annotation.XStreamCDATA;
import com.thoughtworks.xstream.annotations.XStreamAlias;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -13,8 +15,9 @@ import lombok.Data;
**/
@Data
@XStreamAlias("task")
public class Task {
public class Task implements Serializable {
private static final long serialVersionUID = 1504165068471696209L;
private String code;
private String stepCode;

@ -5,6 +5,8 @@ import com.thoughtworks.xstream.annotations.XStreamConverter;
import com.thoughtworks.xstream.converters.extended.ToAttributedValueConverter;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -14,9 +16,10 @@ import lombok.Data;
**/
@Data
@XStreamAlias("param")
@XStreamConverter(value= ToAttributedValueConverter.class, strings={"value"})
public class TaskParam {
@XStreamConverter(value = ToAttributedValueConverter.class, strings = {"value"})
public class TaskParam implements Serializable {
private static final long serialVersionUID = 749532390986966416L;
private String name;
private String value;

@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.model.license;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -10,9 +12,10 @@ import lombok.Data;
* @Modify:
**/
@Data
public class ImppLicenseSenseshield {
public class ImppLicenseSenseshield implements Serializable {
private static final long serialVersionUID = 3227502901235303725L;
/**
* license_id : 170817
* enable : true

@ -21,6 +21,7 @@ import java.util.List;
@Api("mes导入结果model")
public class ExcelImportModel<T> implements Serializable {
private static final long serialVersionUID = 3075276018074690913L;
@ApiParam("结果")
private boolean result;

@ -20,6 +20,7 @@ import java.io.Serializable;
@Api("mes导入异常结果model")
public class ImportErrorModel implements Serializable {
private static final long serialVersionUID = 1212013821950324792L;
@ApiParam("错误的行号")
private int rowNum;

@ -4,36 +4,39 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* 使使
* 使使
* @Reference :
* @Author : wei.peng
* @CreateDate : 19-12-5 4:02
* @Modify:
**/
@Data
public class BrDataSourceModel {
public class BrDataSourceModel implements Serializable {
/**
*
*/
public static final BrDataSourceModel DEFAULT_DATA_SOURCE = new BrDataSourceModel("默认数据源", "DEFAULT",
CommonEnumUtil.DATA_SOURCE_TYPE.SOURCE_MARIA_DB.getValue(), null, "使用默认数据源");
private static final long serialVersionUID = -5137576929473857749L;
@ApiParam(value ="数据源名称")
@ApiParam(value = "数据源名称")
private String sourceName;
@ApiParam(value ="数据源编码")
@ApiParam(value = "数据源编码")
private String sourceCode;
@ApiParam(value ="数据源类型",name = "BlockFormEnumUtil.DATA_SOURCE_TYPE")
@ApiParam(value = "数据源类型", name = "BlockFormEnumUtil.DATA_SOURCE_TYPE")
private Integer sourceType;
@ApiParam(value ="数据库名称")
@ApiParam(value = "数据库名称")
private String sourceDataBaseName;
@ApiParam(value ="数据源描述")
@ApiParam(value = "数据源描述")
private String sourceDescription;
public BrDataSourceModel() {

@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.report.bean.BrReport;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
@ -17,21 +18,22 @@ import java.util.List;
* @Modify:
**/
@Data
public class BrDynamicPageModel {
public class BrDynamicPageModel implements Serializable {
@ApiParam(value ="报表信息")
private static final long serialVersionUID = -5054183081964783780L;
@ApiParam(value = "报表信息")
private BrReport report;
@ApiParam(value ="布局信息")
@ApiParam(value = "布局信息")
private BrLayout layout;
@ApiParam(value = "报表排版关系")
private List<BrRefReport> refReportList;
@ApiParam(value ="页面元素内容")
@ApiParam(value = "页面元素内容")
private List<BrElement> elementList;
@ApiParam(value ="页面元素内容")
@ApiParam(value = "页面元素内容")
private List<TemplateModel> templateModelList;
}

@ -23,17 +23,17 @@ import java.util.Map;
public class TemplateModel implements Serializable {
private static final long serialVersionUID = -6385070202088819367L;
@ApiParam(value ="视图ID")
@ApiParam(value = "视图ID")
@JsonSerialize(using = ToStringSerializer.class)
private Long viewId;
@ApiParam(value ="视图类型")
@ApiParam(value = "视图类型")
private Integer viewType;
@ApiParam(value ="视图名称")
@ApiParam(value = "视图名称")
private String viewName;
@ApiParam(value ="返回信息")
@ApiParam(value = "返回信息")
private String resultMessage;
@ApiParam(value = "查询对象")
@ -76,7 +76,7 @@ public class TemplateModel implements Serializable {
private Pager pager;
@ApiParam(value = "页面查询条件")
private Map<String,Object> findParam;
private Map<String, Object> findParam;
@ApiParam("执行 HQL ")
private String selectSql;

@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.model.softswitch;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -10,7 +12,8 @@ import lombok.Data;
* @Modify:
**/
@Data
public class SoftswitchIocModel {
public class SoftswitchIocModel implements Serializable {
private static final long serialVersionUID = 8945557825392215914L;
/* Spring Ioc Bean 名称 */
private String beanName;
/* Spring Ioc 需要管理的Bean */

@ -11,6 +11,8 @@ import com.thoughtworks.xstream.annotations.XStreamOmitField;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -20,8 +22,9 @@ import lombok.Data;
**/
@Data
@XStreamAlias("client")
public class SuitClientModel {
public class SuitClientModel implements Serializable {
private static final long serialVersionUID = -1073627855304303961L;
/**
*
*/
@ -62,12 +65,13 @@ public class SuitClientModel {
*/
private Integer suitMethodId;
public int getSuitMethodIdVal(){
if(suitMethodId == null){
public int getSuitMethodIdVal() {
if (suitMethodId == null) {
return -1;
}
return suitMethodId.intValue();
}
/**
*
*/
@ -98,7 +102,7 @@ public class SuitClientModel {
public SuitClientModel() {
}
public SuitClientModel(Integer requestSource,BsSuitCaseModel suitCaseModel) {
public SuitClientModel(Integer requestSource, BsSuitCaseModel suitCaseModel) {
this.requestSource = requestSource;
this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId();
@ -114,7 +118,7 @@ public class SuitClientModel {
this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
}
public SuitClientModel(Integer requestSource,Integer suitMethodId,BsSuitCaseModel suitCaseModel) {
public SuitClientModel(Integer requestSource, Integer suitMethodId, BsSuitCaseModel suitCaseModel) {
this.requestSource = requestSource;
this.suitMethodId = suitMethodId;

@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.model.softswitch;
import io.swagger.annotations.ApiParam;
import lombok.Data;
import java.io.Serializable;
/**
* @Description :
* @Reference :
@ -11,8 +13,9 @@ import lombok.Data;
* @Modify:
**/
@Data
public class SuitImppCloudModel {
public class SuitImppCloudModel implements Serializable {
private static final long serialVersionUID = -8731173690394189107L;
@ApiParam(value = "适配器信息")
private BsSuitCaseModel model;

@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.model.softswitch;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
@ -13,8 +14,9 @@ import java.util.Map;
* @Modify:
**/
@Data
public class SuitParamModel {
public class SuitParamModel implements Serializable {
private static final long serialVersionUID = -1695550139368764444L;
/* 标签名称 */
private String tagName;
/* 标签 Class Path */
@ -36,7 +38,7 @@ public class SuitParamModel {
private String type;
/* 标签属性 */
private Map<String,String> attr;
private Map<String, String> attr;
/* 父节点 */
private SuitParamModel parent;
/* 标签子集 */

@ -12,6 +12,7 @@ import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
@ -24,10 +25,11 @@ import java.util.Map;
**/
@Data
@XStreamAlias("server")
@XmlRootElement(name ="server")
@XmlRootElement(name = "server")
@XmlAccessorType(XmlAccessType.NONE)
public class SuitServerModel {
public class SuitServerModel implements Serializable {
private static final long serialVersionUID = 3501193688956575386L;
// 执行方法命令
@XmlElement
@ApiParam(value = "适配器code")
@ -43,7 +45,7 @@ public class SuitServerModel {
// 传输集合
private List list;
// 传输键值对
private Map<String,Object> map;
private Map<String, Object> map;
// 传输 JSON 数据
private String json;
@ -91,13 +93,13 @@ public class SuitServerModel {
// @XStreamImplicit
private Integer suitMethodId;
public int getSuitMethodIdVal(){
if(suitMethodId == null){
public int getSuitMethodIdVal() {
if (suitMethodId == null) {
return -1;
}
return suitMethodId.intValue();
}
// @XStreamImplicit
// @XStreamImplicit
private String analyzeMessage;
}

@ -4,8 +4,8 @@ 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.io.Serializable;
import java.util.List;
/**
@ -18,8 +18,9 @@ import java.util.List;
@Getter
@Setter
@ToString
public class TestConstructModel {
public class TestConstructModel implements Serializable {
private static final long serialVersionUID = 3347578209875237950L;
private long id;
private TestTransUser user;

@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
@Api("导入结果model")
public class ExcelImportModel implements Serializable {
private static final long serialVersionUID = 1444427447244864339L;
@ApiParam("结果")
private boolean result;

@ -7,6 +7,7 @@ import java.io.Serializable;
@Data
public class WmsCSOrderDetailsModel implements Serializable {
private static final long serialVersionUID = 1035157716685531017L;
@ApiParam("工厂代码")
public String organizeCode;

@ -19,6 +19,7 @@ import java.util.List;
@Api("WMS列表菜单model")
public class WmsListElementModel extends BaseBean {
private static final long serialVersionUID = -4040701771244617270L;
@ApiParam(value = "功能菜单ID")
private Long functionId;

@ -19,6 +19,7 @@ import java.util.List;
@Api("WMS列表搜索model")
public class WmsSearchElementModel extends BaseBean {
private static final long serialVersionUID = -5429148439603308698L;
@ApiParam(value = "功能菜单ID")
private Long functionId;

@ -1,7 +1,6 @@
package cn.estsh.i3plus.pojo.platform.platbean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.Api;
@ -49,9 +48,9 @@ public class SysLogConsole extends BaseBean {
@ApiParam(value ="应用端口")
private Integer logPort;
@Column(name="LOG_GORP")
@Column(name="LOG_GROUP")
@ApiParam(value ="日志分组(控制台日志,操作日志,系统日志,定任务日志)")
private String logGorp;
private String logGroup;
@Column(name="LOG_LEVEL")
@ApiParam(value ="日志等级(OFF > FATAL > ERROR > WARN > INFO > DEBUG > TRACE > ALL)")

@ -67,6 +67,19 @@ public class CoreHqlPack {
return ddlPackBean;
}
/**
* In
* @param columnName
* @return
*/
public static DdlPackBean packHqlIn(String columnName, List params){
DdlPackBean ddlPackBean = new DdlPackBean();
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(),"isValid",ddlPackBean);
DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),"isDeleted",ddlPackBean);
DdlPreparedPack.getInPack(params, columnName, ddlPackBean);
return ddlPackBean;
}
/**
*

@ -27,6 +27,7 @@ import javax.persistence.Table;
@Api(value = "数据源管理", description = "数据源管理")
public class BsDataSource extends BaseBean {
private static final long serialVersionUID = 2763423692635373368L;
@Column(name = "DATA_SOURCE_NAME")
@ApiParam(value = "数据源名称")
private String dataSourceName;

@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api(value = "MQ管理", description = "MQ管理")
public class BsMessageQueue extends BaseBean {
private static final long serialVersionUID = -1130706382023544729L;
@Column(name = "MESSAGE_QUEUE_NAME")
@ApiParam(value = "消息队列名称")
private String messageQueueName;

@ -29,6 +29,7 @@ import javax.persistence.Table;
@Api(value = "数据适配转换", description = "数据适配转换")
public class BsParamAdapter extends BaseBean {
private static final long serialVersionUID = -6238745304002006776L;
@Column(name = "SUIT_CASE_ID")
@ApiParam(value = "适配套件id")
@JsonSerialize(using = ToStringSerializer.class)

@ -7,11 +7,10 @@ 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.util.List;
/**
* @Description : socket
@ -29,6 +28,7 @@ import java.util.List;
@Api(value = "socket套件", description = "socket套件")
public class BsSocketSuitCase extends BaseBean {
private static final long serialVersionUID = -1491505137380808987L;
@Column(name = "SOCKET_TYPE_ID")
@ApiParam(value = "socket类型枚举")
private Integer socketTypeId;

@ -31,6 +31,7 @@ import java.util.List;
@Api(value = "适配认证", description = "适配认证")
public class BsSslKey extends BaseBean {
private static final long serialVersionUID = 3934205467948800784L;
@Column(name = "KEY_NAME")
@ApiParam(value = "证书名称")
private String keyName;

@ -32,6 +32,7 @@ import javax.persistence.Table;
@XStreamAlias("BsSslKeyParam")
public class BsSslKeyParam extends BaseBean {
private static final long serialVersionUID = 3521715129533450992L;
@Column(name = "SSL_KEY_ID")
@ApiParam(value = "证书id")
@JsonSerialize(using = ToStringSerializer.class)

@ -33,6 +33,7 @@ import java.util.List;
@Api(value = "适配套件", description = "适配套件")
public class BsSuitCase extends BaseBean {
private static final long serialVersionUID = -281224716754866835L;
@Column(name = "SUIT_CASE_NAME")
@ApiParam(value = "套件名称")
private String suitCaseName;

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save