Merge branch 'dev' into test

yun-zuoyi
wynne1005 4 years ago
commit 69d872be7e

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

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

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

@ -105,43 +105,6 @@ public class ScreenEnumUtil {
}
}
public enum ACTION_TYPE {
FRONT(10, "FRONT", "前端"),
BACKEND(20, "BACKEND", "后端");
private Integer value;
private String code;
private String description;
ACTION_TYPE(Integer value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
public enum NULLABLE {
YES(10, "YES", "允许为空"),
NO(20, "NO", "不允许为空");
@ -266,6 +229,43 @@ public class ScreenEnumUtil {
}
}
public enum ACTION_TYPE {
FRONT(10, "FRONT", "前端动作"),
BACK(20, "BACK", "后端动作");
private Integer value;
private String code;
private String description;
ACTION_TYPE(Integer value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public Integer getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String codeOfDescription(String code) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].description;
}
}
return tmp;
}
}
public enum LAYOUT_TYPE {
SCREEN(10, "SCREEN", "Screen布局"),
PANEL(20, "PANEL", "Panel布局");
@ -486,7 +486,8 @@ public class ScreenEnumUtil {
public enum MODEL_TYPE {
DATA_OBJECT(10, "DATA_OBJECT", "数据库对应类型"),
INNER_MODEL(20, "INNER_MODEL", "程序内部对应类型");
INNER_MODEL(20, "INNER_MODEL", "程序内部对应类型"),
CUSTOMIZE(30, "CUSTOMIZE", "程序内部对应类型");
private Integer value;
private String code;
@ -715,7 +716,78 @@ public class ScreenEnumUtil {
}
return tmp;
}
public static Class clazzOfEnum(Class clazz) {
Class tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].clazz.equals(clazz)) {
tmp = values()[i].clazz;
}
}
return tmp;
}
}
public enum JAVA_TYPES {
BOOLEAN(10, "Boolean", Boolean.class),
BYTE(20, "Byte", Byte.class),
BYTE_ARR(30, "Byte[]", Byte[].class),
SHORT(40, "Short", Short.class),
INTEGER(50, "Integer", Integer.class),
LONG(60, "Long", Long.class),
DOUBLE(70, "Double", Double.class),
FLOAT(80, "Float", Float.class),
BIG_DECIMAL(90, "BigDecimal", BigDecimal.class),
STRING(100, "String", BigDecimal.class),
DATE(110, "Date", Date.class),
TIME(120, "Time", Time.class),
TIMESTAMP(130, "Timestamp", Timestamp.class),
ARRAY(140, "Array", Array.class);
private Integer value;
private String code;
private Class clazz;
JAVA_TYPES(Integer value, String code, Class clazz) {
this.value = value;
this.code = code;
this.clazz = clazz;
}
public Integer getValue() {
return value;
}
public String getCode() {
return code;
}
public Class getClazz() {
return clazz;
}
public static Integer valueOfCode(String code) {
Integer tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static JAVA_TYPES valueOfEnum(Integer value) {
JAVA_TYPES tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value.equals(value)) {
tmp = values()[i];
}
}
return tmp;
}
}
}

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

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

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

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

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

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

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

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

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

@ -0,0 +1,21 @@
package cn.estsh.i3plus.pojo.model.common;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/6/8 18:33
* @desc
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ImppCustomizeMessage implements Serializable {
private static final long serialVersionUID = -4090213916925922596L;
private String uuid;
}

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

@ -9,6 +9,7 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.Transient;
@ -25,7 +26,10 @@ import javax.persistence.Transient;
@Entity
@Data
@EqualsAndHashCode(callSuper = true)
@Table(name="sys_locale_resource")
@Table(name="sys_locale_resource",indexes = {
@Index(columnList = "resource_key"),
@Index(columnList = "language_code")
})
@Api(value="系统资源",description = "对按钮、功能、信息提示等进行转换。")
public class SysLocaleResource extends BaseBean {

@ -98,7 +98,8 @@ public class CoreHqlPack {
DdlPreparedPack.getNumEqualPack(resource.getResourceType(), "resourceType", result);
// 是否多类型查询
if (StringUtils.isNotBlank(resource.getResourceTypes())) {
DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result); }
DdlPreparedPack.getInPackArray((Integer[]) ConvertUtils.convert(resource.getResourceTypes().split(","), Integer.class), "resourceType", result);
}
DdlPreparedPack.getNumEqualPack(resource.getSoftType(), "softType", result);
DdlPreparedPack.getNumEqualPack(resource.getIsSystem(), "isSystem", result);

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

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

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

@ -2,10 +2,8 @@ package cn.estsh.i3plus.pojo.screen.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import cn.estsh.i3plus.pojo.base.enumutil.ScreenEnumUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

@ -37,7 +37,7 @@ public class ScrComponent extends BaseBean implements Serializable {
private String componentCode;
@Column(name = "COMPONENT_TYPE")
@ApiModelProperty(value = "组件代码")
@ApiModelProperty(value = "组件类型")
private String componentType;
@Column(name = "MODEL_CODE")

@ -0,0 +1,52 @@
package cn.estsh.i3plus.pojo.screen.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/5/20 17:51
* @desc
*/
@Entity
@Table(name = "SCR_COMPONENT_PARAM")
@Data
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@ApiModel("组件参数")
public class ScrComponentParam extends BaseBean implements Serializable {
private static final long serialVersionUID = -3232417792617757722L;
@Column(name = "COMPONENT_TYPE")
@ApiModelProperty(value = "组件类型")
private String componentType;
@Column(name = "PARAM_NAME")
@ApiModelProperty(value = "参数名")
private String paramName;
@Column(name = "SEARCH_NAME")
@ApiModelProperty(value = "搜索名称")
private String searchName;
@Lob
@Column(name = "SEARCH_WHERE")
@ApiModelProperty(value = "搜索条件")
private String searchWhere;
}

@ -0,0 +1,47 @@
package cn.estsh.i3plus.pojo.screen.bean;
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Lob;
import javax.persistence.Table;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/5/20 17:51
* @desc
*/
@Entity
@Table(name = "SCR_COMPONENT_PARAM_DETAIL")
@Data
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@ApiModel("组件参数配置")
public class ScrComponentParamDetail extends BaseBean implements Serializable {
private static final long serialVersionUID = 4771034700299839870L;
@Column(name = "COMPONENT_CODE")
@ApiModelProperty(value = "组件代码")
private String componentCode;
@Column(name = "COMPONENT_TYPE")
@ApiModelProperty(value = "组件类型")
private String componentType;
@Lob
@Column(name = "COMPONENT_PARAM_DETAIL")
@ApiModelProperty(value = "组件参数信息")
private String componentParamDetail;
}

@ -57,10 +57,14 @@ public class ScrDataObject extends BaseBean implements Serializable {
@ApiModelProperty(value = "字段代码")
private String fieldCode;
@Column(name = "FIELD_NAME")
@ApiModelProperty(value = "字段名称")
private String fieldName;
@Column(name = "FIELD_TYPE")
@ApiModelProperty(value = "字段类型")
@Enumerated(EnumType.STRING)
private ScreenEnumUtil.JDBC_TYPES fieldType;
private String fieldType;
@Column(name = "FIELD_SIZE")
@ApiModelProperty(value = "字段长度")

@ -31,14 +31,6 @@ import java.io.Serializable;
public class ScrEventAction extends BaseBean implements Serializable {
private static final long serialVersionUID = -6217007706865821613L;
@Column(name = "EVENT_ACTION_CODE")
@ApiModelProperty("事件动作CODE")
private String eventActionCode;
@Column(name = "EVENT_ACTION_NAME")
@ApiModelProperty("事件动作名称")
private String eventActionName;
@Column(name = "EVENT_CODE")
@ApiModelProperty("事件代码")
private String eventCode;

@ -0,0 +1,108 @@
package cn.estsh.i3plus.pojo.screen.bean;
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;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.DynamicInsert;
import org.hibernate.annotations.DynamicUpdate;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Index;
import javax.persistence.Lob;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2021/5/19 15:15
* @desc
*/
@Entity
@Data
@Table(name = "SCR_MENU")
@EqualsAndHashCode(callSuper = true)
@NoArgsConstructor
@AllArgsConstructor
@Builder
@ApiModel("通用界面-功能目录")
public class ScrMenu extends BaseBean implements Serializable {
private static final long serialVersionUID = 5910610229414359976L;
@Column(name = "MENU_NAME")
@ApiParam(value = "菜单名称")
private String menuName;
@Column(name = "MENU_CODE")
@ApiParam(value = "功能代码(唯一校验,路径跳转使用)")
private String menuCode;
@Column(name = "PARENT_ID")
@ApiParam(value = "父级菜单id")
@JsonSerialize(using = ToStringSerializer.class)
private Long parentId;
public long getParentIdVal() {
if (parentId == null) {
return CommonEnumUtil.PARENT.DEFAULT.getValue().longValue();
} else {
return parentId.longValue();
}
}
@Column(name = "PARENT_NAME_RDD")
@ApiParam(value = "父级菜单名称")
private String parentNameRdd;
@Column(name = "MENU_SORT")
@ApiParam(value = "菜单排序")
private Integer menuSort;
@Column(name = "MENU_ICON")
@ApiParam(value = "菜单图标")
private String menuIcon;
@Lob
@Column(name = "MENU_STYLE")
@ApiParam(value = "菜单样式")
private String menuStyle;
@Column(name = "MENU_TYPE")
@ApiParam(value = "菜单类型")
private Integer menuType;
@Column(name = "MENU_URL")
@ApiParam(value = "菜单url")
private String menuUrl;
@Column(name = "SCREEN_CODE")
@ApiParam(value = "页面代码")
private String screenCode;
@Column(name = "SCREEN_NAME")
@ApiParam(value = "页面名称")
private String screenName;
@Column(name = "SOFT_TYPE")
@ApiParam(value = "所属模块")
private Integer softType;
@Column(name = "MENU_STATUS")
@ApiParam(value = "菜单状态")
private Integer menuStatus;
@Transient
@ApiParam(value = "菜单子集")
private List<ScrMenu> menuList;
}

@ -44,44 +44,40 @@ public class ScrModelField extends BaseBean implements Serializable {
private String fieldCode;
@Column(name = "DISPLAY_NAME")
@ApiModelProperty("字段名称")
@ApiModelProperty("显示名称")
private String displayName;
@Column(name = "FIELD_NAME")
@ApiModelProperty("字段名称")
private String fieldName;
@Column(name = "FIELD_TYPE")
@ApiModelProperty(value = "字段类型")
private String fieldType;
@Column(name = "IS_FUZZY_SEARCH")
@ApiModelProperty("是否支持模糊查询")
private Boolean isFuzzySearch;
private Boolean isFuzzySearch = false;
@Column(name = "IS_SHOW_IN_NEW")
@ApiModelProperty("是否在新增时展示")
private Boolean isShowInNew;
private Boolean isShowInNew = true;
@Column(name = "IS_SHOW_IN_EDIT")
@ApiModelProperty("是否在编辑时展示")
private Boolean isShowInEdit;
private Boolean isShowInEdit = true;
@Column(name = "IS_ALLOW_SORT")
@ApiModelProperty("是否支持排序")
private Boolean isAllowSort;
private Boolean isAllowSort = false;
@Column(name = "IS_REQUIRED")
@ApiModelProperty("是否必填")
private Boolean isRequired;
private Boolean isRequired = false;
@Column(name = "FORM_SEQ")
@Column(name = "SEQ")
@ApiModelProperty("表单顺序")
private Integer formSeq;
@Column(name = "TABLE_SEQ")
@ApiModelProperty("表格顺序")
private Integer tableSeq;
@Column(name = "EXPORT_SEQ")
@ApiModelProperty("导出顺序")
private Integer exportSeq;
private Integer seq;
@Column(name = "VALIDATION")
@ApiModelProperty("校验")

@ -0,0 +1,35 @@
package cn.estsh.i3plus.pojo.screen.model;
import cn.estsh.i3plus.pojo.screen.bean.ScrModel;
import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldIndex;
import cn.estsh.i3plus.pojo.screen.bean.ScrModelFieldVirtual;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2021/5/27 13:30
* @desc
*/
@Data
@ApiModel("模型 模型字段 模型虚拟属性 模型索引")
public class ScrModelFieldVirtualIndexModel implements Serializable {
private static final long serialVersionUID = 8024395604541668081L;
@ApiModelProperty("模型")
private ScrModel model;
@ApiModelProperty("模型字段")
private List<ScrModelField> modelFields;
@ApiModelProperty("模型虚拟字段")
private List<ScrModelFieldVirtual> modelFieldVirtuals;
@ApiModelProperty("模型索引")
private List<ScrModelFieldIndex> modelFieldIndices;
}

@ -10,6 +10,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
* @author Wynne.Lu
@ -68,4 +69,18 @@ public class ScrRequestModel implements Serializable {
@ApiModelProperty("模型字段")
private List<ScrModelField> modelFields;
@ApiModelProperty("父代码")
private String parentCode;
@ApiModelProperty("父id")
private Long parentId;
@ApiModelProperty("where条件补充")
private String whereAppender;
@ApiModelProperty("调用接口参数")
private Map<String,Object> param;
}

@ -0,0 +1,42 @@
package cn.estsh.i3plus.pojo.screen.model;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
import cn.estsh.i3plus.pojo.screen.bean.ScrModelField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Builder;
import lombok.Data;
import org.springframework.web.multipart.MultipartFile;
import java.io.Serializable;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2021/5/14 09:58
* @desc
*/
@Data
@Builder
@ApiModel("响应Model")
public class ScrResponseModel implements Serializable {
private static final long serialVersionUID = 3032944214160845525L;
@ApiModelProperty("模型代码")
private String modelCode;
@ApiModelProperty("动作代码")
private String actionCode;
@ApiModelProperty("分页")
private Pager pager;
@ApiModelProperty("模型字段")
private List<ScrModelField> modelFields;
@ApiModelProperty("数据")
private List<Object> data;
}

@ -1,6 +1,7 @@
package cn.estsh.i3plus.pojo.screen.model;
import cn.estsh.i3plus.pojo.base.common.Pager;
import cn.estsh.i3plus.pojo.screen.bean.ScrDataAuth;
import cn.estsh.i3plus.pojo.screen.bean.ScrDatasource;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ -65,5 +66,11 @@ public class ScrSqlDmlModel implements Serializable {
@ApiModelProperty("主键")
private Map<String, Object> primaryKeys;
@ApiModelProperty("where条件补充")
private String whereAppender;
@ApiModelProperty("权限")
private ScrDataAuth auth;
}

@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.screen.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.screen.bean.ScrDataAuth;
import cn.estsh.i3plus.pojo.screen.bean.ScrDataObject;
/**
* @Description :

@ -0,0 +1,14 @@
package cn.estsh.i3plus.pojo.screen.repository;
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
import cn.estsh.i3plus.pojo.screen.bean.ScrMenu;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @CreateDate : 20-5-28 3:39
* @Modify:
**/
public interface ScrMenuRepository extends BaseRepository<ScrMenu, Long> {
}

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

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

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

@ -16,10 +16,7 @@ import org.hibernate.annotations.ColumnDefault;
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.*;
/**
* @Description :
@ -30,7 +27,9 @@ import javax.persistence.Transient;
**/
@Data
@Entity
@Table(name = "WMS_BOM")
@Table(name = "WMS_BOM", indexes = {
@Index(columnList = "PART_NO"),
@Index(columnList = "ITEM_PART_NO")})
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)

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

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

@ -7,7 +7,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
sonar.projectName=i3plus-pojo
# defaults to 'not provided'
sonar.projectVersion=1.0-TEST-SNAPSHOT
sonar.projectVersion=1.0-DEV-SNAPSHOT
# Path is relative to the sonar-project.properties file. Defaults to .
#sonar.sources=./

Loading…
Cancel
Save