feat(form): 动态表单新增跳转详情页枚举

yun-zuoyi
wynne1005 4 years ago
parent b635c10750
commit 6318ca6afc

@ -337,6 +337,7 @@ public class BlockFormEnumUtil {
return tmp;
}
}
/**
*
*/
@ -988,7 +989,6 @@ public class BlockFormEnumUtil {
}
/**
*
*/
@ -1209,19 +1209,19 @@ public class BlockFormEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROPERTY_VIRTUAL_OPERATE_TYPE {
STRING_SPLICE(10, "SPLICE", "字符串拼接",String.class),
NUM_ADD(20, "ADD", "加法计算",Double.class),
NUM_LESS(30, "MIN", "减法计算",Double.class),
NUM_MAKE(40, "MUL", "乘法计算",Double.class),
NUM_DIVISION(50, "DIVISION", "除法计算",Double.class),
JOIN_TABLE(60, "JOIN_TABLE", "连表查询",String.class);
STRING_SPLICE(10, "SPLICE", "字符串拼接", String.class),
NUM_ADD(20, "ADD", "加法计算", Double.class),
NUM_LESS(30, "MIN", "减法计算", Double.class),
NUM_MAKE(40, "MUL", "乘法计算", Double.class),
NUM_DIVISION(50, "DIVISION", "除法计算", Double.class),
JOIN_TABLE(60, "JOIN_TABLE", "连表查询", String.class);
private int value;
private String code;
private String description;
private Class clzFullName;
private PROPERTY_VIRTUAL_OPERATE_TYPE(int value, String code, String description,Class clzFullName) {
private PROPERTY_VIRTUAL_OPERATE_TYPE(int value, String code, String description, Class clzFullName) {
this.value = value;
this.code = code;
this.description = description;
@ -1298,23 +1298,23 @@ public class BlockFormEnumUtil {
return tmp;
}
public Object getPropertyVirtual(Object ... objs){
if(this.getValue() == STRING_SPLICE.getValue()){
public Object getPropertyVirtual(Object... objs) {
if (this.getValue() == STRING_SPLICE.getValue()) {
return getPropertyVirtualString(objs);
}else if(this.getValue() == NUM_ADD.getValue()){
} else if (this.getValue() == NUM_ADD.getValue()) {
return getPropertyVirtualDoubleAdd(objs);
}else if(this.getValue() == NUM_LESS.getValue()){
} else if (this.getValue() == NUM_LESS.getValue()) {
return getPropertyVirtualDoubleLess(objs);
}else if(this.getValue() == NUM_MAKE.getValue()){
} else if (this.getValue() == NUM_MAKE.getValue()) {
return getPropertyVirtualDoubleMake(objs);
}else if(this.getValue() == NUM_DIVISION.getValue()){
} else if (this.getValue() == NUM_DIVISION.getValue()) {
return getPropertyVirtualDoubleDivision(objs);
}
return objs;
}
private String getPropertyVirtualString(Object ... objs){
if(objs != null && objs.length > 0){
private String getPropertyVirtualString(Object... objs) {
if (objs != null && objs.length > 0) {
StringBuffer result = new StringBuffer();
for (Object o : objs) {
result.append(o == null ? "" : o.toString());
@ -1324,15 +1324,15 @@ public class BlockFormEnumUtil {
return null;
}
private Double getPropertyVirtualDoubleAdd(Object ... objs){
if(objs != null && objs.length > 0){
private Double getPropertyVirtualDoubleAdd(Object... objs) {
if (objs != null && objs.length > 0) {
Double result = Double.valueOf(0);
for (Object o : objs) {
try {
if(o != null){
if (o != null) {
result += Double.parseDouble(o.toString());
}
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
@ -1341,15 +1341,15 @@ public class BlockFormEnumUtil {
return null;
}
private Double getPropertyVirtualDoubleLess(Object ... objs){
if(objs != null && objs.length > 0){
private Double getPropertyVirtualDoubleLess(Object... objs) {
if (objs != null && objs.length > 0) {
Double result = Double.valueOf(0);
for (Object o : objs) {
try {
if(o != null){
if (o != null) {
result -= Double.parseDouble(o.toString());
}
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
@ -1358,15 +1358,15 @@ public class BlockFormEnumUtil {
return null;
}
private Double getPropertyVirtualDoubleMake(Object ... objs){
if(objs != null && objs.length > 0){
private Double getPropertyVirtualDoubleMake(Object... objs) {
if (objs != null && objs.length > 0) {
Double result = Double.valueOf(0);
for (Object o : objs) {
try {
if(o != null){
if (o != null) {
result *= Double.parseDouble(o.toString());
}
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
@ -1375,15 +1375,15 @@ public class BlockFormEnumUtil {
return null;
}
private Double getPropertyVirtualDoubleDivision(Object ... objs){
if(objs != null && objs.length > 0){
private Double getPropertyVirtualDoubleDivision(Object... objs) {
if (objs != null && objs.length > 0) {
Double result = Double.valueOf(0);
for (Object o : objs) {
try {
if(o != null){
if (o != null) {
result /= Double.parseDouble(o.toString());
}
}catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
@ -1394,7 +1394,6 @@ public class BlockFormEnumUtil {
}
/**
*
*/
@ -1751,8 +1750,8 @@ public class BlockFormEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRIGGER_EVENT {
CLICK(10, "CLICK", "单击");
// DB_LCLICK(20, "DB_LCLICK", "双击"),
CLICK(10, "CLICK", "单击"),
DOUBLE_CLICK(20, "DOUBLE_CLICK", "双击");
// MOUSE_OUT(30, "MOUSE_OUT", "鼠标指针移出"),
// MOUSE_OVER(40, "MOUSE_OVER", "鼠标指针移入");
@ -1830,6 +1829,88 @@ public class BlockFormEnumUtil {
}
/**
*
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum TRIGGER_ACTION {
REFRESH(10, "REFRESH", "刷新元素"),
SHOW_METHOD(20, "SHOW_METHOD", "展示其他功能明细");
private int value;
private String code;
private String description;
private TRIGGER_ACTION(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
}
public int getValue() {
return value;
}
public String getCode() {
return code;
}
public String getDescription() {
return description;
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
tmp = values()[i].code;
}
}
return tmp;
}
public static int codeOfValue(String code) {
int tmp = 1;
for (int i = 0; i < values().length; i++) {
if (values()[i].code.equals(code)) {
tmp = values()[i].value;
}
}
return tmp;
}
public static String valueOfDescription(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 TRIGGER_ACTION valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
return values()[i];
}
}
return null;
}
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;
}
}
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@ -1988,8 +2069,8 @@ public class BlockFormEnumUtil {
/**
*
* 1
* 2
* 1
* 2
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum DATA_STATUS {
@ -2105,7 +2186,7 @@ public class BlockFormEnumUtil {
private String code;
private String description;
private ELEMENT_TREE_DIRECTION (int value, String code, String description) {
private ELEMENT_TREE_DIRECTION(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -2153,7 +2234,7 @@ public class BlockFormEnumUtil {
return tmp;
}
public static ELEMENT_TREE_DIRECTION valueOf(int val) {
public static ELEMENT_TREE_DIRECTION valueOf(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
if (values()[i].value == val) {
@ -2185,7 +2266,7 @@ public class BlockFormEnumUtil {
private String code;
private String description;
private DATA_SOURCE_STATUS (int value, String code, String description) {
private DATA_SOURCE_STATUS(int value, String code, String description) {
this.value = value;
this.code = code;
this.description = description;
@ -2204,7 +2285,6 @@ public class BlockFormEnumUtil {
}
public static String valueOfCode(int val) {
String tmp = null;
for (int i = 0; i < values().length; i++) {
@ -2261,14 +2341,14 @@ public class BlockFormEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum ELEMENT_CONSTRAINT_TYPE {
UNIQUE(10, "唯一约束");
UNIQUE(10, "唯一约束");
// 后续扩展联合主键
// PRIMARY_KEY(20, "主键约束")
private int value;
private String description;
private ELEMENT_CONSTRAINT_TYPE (int value, String description) {
private ELEMENT_CONSTRAINT_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -2308,13 +2388,13 @@ public class BlockFormEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum FORM_TRIGGER_SOURCE {
INTERCEPTOR(10, "拦截器"),
BUTTON(20, "按钮");
INTERCEPTOR(10, "拦截器"),
BUTTON(20, "按钮");
private int value;
private String description;
private FORM_TRIGGER_SOURCE (int value, String description) {
private FORM_TRIGGER_SOURCE(int value, String description) {
this.value = value;
this.description = description;
}
@ -2354,16 +2434,16 @@ public class BlockFormEnumUtil {
*/
@JsonFormat(shape = JsonFormat.Shape.OBJECT)
public enum PROCEDURE_COL_TYPE {
IN_PARAM(1, "入参"),
INOUT_PARAM(2, "出入参"),
// ?(3, "按钮"),
OUT_PARAM(4, "出参"),
RETURN_PARAM(5, "返回值");
IN_PARAM(1, "入参"),
INOUT_PARAM(2, "出入参"),
// ?(3, "按钮"),
OUT_PARAM(4, "出参"),
RETURN_PARAM(5, "返回值");
private int value;
private String description;
private PROCEDURE_COL_TYPE (int value, String description) {
private PROCEDURE_COL_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -2405,19 +2485,18 @@ public class BlockFormEnumUtil {
* PROCEDURE_INOUT_PARAM30-sqlserver
* PROCEDURE_OUT_PARAM40-
* PROCEDURE_RETURN50-mysqlsqlserver
*
*/
public enum ORIGIN_PROPERTY_TYPE {
NORMAL_PROPERTY(10, "正常属性"),
PROCEDURE_IN_PARAM(20, "入参"),
PROCEDURE_INOUT_PARAM(30, "出入参"),
PROCEDURE_OUT_PARAM(40, "出参"),
PROCEDURE_RETURN(50, "返回值");
NORMAL_PROPERTY(10, "正常属性"),
PROCEDURE_IN_PARAM(20, "入参"),
PROCEDURE_INOUT_PARAM(30, "出入参"),
PROCEDURE_OUT_PARAM(40, "出参"),
PROCEDURE_RETURN(50, "返回值");
private final int value;
private final String description;
private ORIGIN_PROPERTY_TYPE (int value, String description) {
private ORIGIN_PROPERTY_TYPE(int value, String description) {
this.value = value;
this.description = description;
}
@ -2452,7 +2531,7 @@ public class BlockFormEnumUtil {
public static ORIGIN_PROPERTY_TYPE procColTypeValOf(int procColTypeVal) {
ORIGIN_PROPERTY_TYPE result = NORMAL_PROPERTY;
switch (Objects.requireNonNull(PROCEDURE_COL_TYPE.valueOf(procColTypeVal))){
switch (Objects.requireNonNull(PROCEDURE_COL_TYPE.valueOf(procColTypeVal))) {
case IN_PARAM:
result = PROCEDURE_IN_PARAM;
break;

@ -28,59 +28,64 @@ import java.util.List;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_METHOD_DETAIL_PROPERTY")
@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
@Table(name = "BF_METHOD_DETAIL_PROPERTY")
@Api(value = "表单功能明细关联属性", description = "表单功能明细关联属性")
public class BfMethodDetailProperty extends BaseBean {
private static final long serialVersionUID = -7541677357317732343L;
@Column(name="METHOD_ID")
@ApiParam(value ="功能id")
@Column(name = "METHOD_ID")
@ApiParam(value = "功能id")
@JsonSerialize(using = ToStringSerializer.class)
private Long methodId;
// 关联功能明细表id
@Column(name="PRI_METHOD_DETAIL_ID")
@ApiParam(value ="主功能明细id")
@Column(name = "PRI_METHOD_DETAIL_ID")
@ApiParam(value = "主功能明细id")
@JsonSerialize(using = ToStringSerializer.class)
private Long priMethodDetailId;
@Column(name="PRI_METHOD_DETAIL_NAME_RDD")
@ApiParam(value ="主功能明细名称")
@Column(name = "PRI_METHOD_DETAIL_NAME_RDD")
@ApiParam(value = "主功能明细名称")
private String priMethodDetailNameRdd;
@Column(name="PRI_ELEMENT_ID")
@ApiParam(value ="主对象元素id")
@Column(name = "PRI_ELEMENT_ID")
@ApiParam(value = "主对象元素id")
@JsonSerialize(using = ToStringSerializer.class)
private Long priElementId;
@Column(name="PRI_ELEMENT_NAME_RDD")
@ApiParam(value ="主对象元素名称")
@Column(name = "PRI_ELEMENT_NAME_RDD")
@ApiParam(value = "主对象元素名称")
private String priElementNameRdd;
// 枚举:BlockFormEnumUtil.TRIGGER_EVENT
@Column(name="PRI_ELEMENT_EVENT")
@ApiParam(value ="主对象元素事件")
@Column(name = "PRI_ELEMENT_EVENT")
@ApiParam(value = "主对象元素事件")
private Integer priElementEvent;
@Column(name="SEC_METHOD_DETAIL_ID")
@ApiParam(value ="关联功能明细id")
// 枚举:BlockFormEnumUtil.TRIGGER_ACTION
@Column(name = "PRI_ELEMENT_ACTION")
@ApiParam(value = "主对象元素动作")
private Integer priElementAction;
@Column(name = "SEC_METHOD_DETAIL_ID")
@ApiParam(value = "关联功能明细id")
@JsonSerialize(using = ToStringSerializer.class)
private Long secMethodDetailId;
@Column(name="SEC_METHOD_DETAIL_NAME_RDD")
@ApiParam(value ="关联功能明细名称")
@Column(name = "SEC_METHOD_DETAIL_NAME_RDD")
@ApiParam(value = "关联功能明细名称")
private String secMethodDetailNameRdd;
@Column(name="SEC_ELEMENT_ID")
@ApiParam(value ="关联对象元素id")
@Column(name = "SEC_ELEMENT_ID")
@ApiParam(value = "关联对象元素id")
@JsonSerialize(using = ToStringSerializer.class)
private Long secElementId;
@Column(name="SEC_ELEMENT_NAME_RDD")
@ApiParam(value ="关联对象元素名称")
@Column(name = "SEC_ELEMENT_NAME_RDD")
@ApiParam(value = "关联对象元素名称")
private String secElementNameRdd;
@Transient
@ApiParam(value ="表单功能明细关联属性")
@ApiParam(value = "表单功能明细关联属性")
private List<BfMethodDetailPropertyRef> refList;
}

@ -26,7 +26,7 @@ import javax.persistence.Table;
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="BF_METHOD_DETAIL_PROPERTY")
@Table(name="BF_METHOD_DETAIL_PROPERTY_REF")
@Api(value="表单功能明细关联属性",description = "表单功能明细关联属性")
public class BfMethodDetailPropertyRef extends BaseBean {

@ -0,0 +1,39 @@
package cn.estsh.i3plus.pojo.model.platform;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* @author Wynne.Lu
* @date 2021/2/20 4:39
* @desc
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Api("日志字段模型")
public class LogFieldModel implements Serializable {
private static final long serialVersionUID = 6303989757683476327L;
@ApiParam("日志时间")
private String time;
@ApiParam("线程")
private String thread;
@ApiParam("日志等级")
private String level;
@ApiParam("执行堆栈")
private String stack;
@ApiParam("日志信息")
private String message;
}

@ -0,0 +1,57 @@
package cn.estsh.i3plus.pojo.model.platform;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.List;
/**
* @author Wynne.Lu
* @date 2021/2/20 12:55
* @desc
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Api("系统日志模型")
public class SysLogModel implements Serializable {
private static final long serialVersionUID = -2982120258911167575L;
@ApiParam("查询日期")
private String queryDate;
@ApiParam("查询开始时间")
private String queryBeginTime;
@ApiParam("查询结束时间")
private String queryEndTime;
@ApiParam("索引名称")
private String indexName;
@ApiParam("索引类型")
private Integer indexType;
@ApiParam("聚合时间")
private Integer aggsDuration;
@ApiParam("日志等级")
private Integer level;
@ApiParam("执行线程")
private String thread;
@ApiParam("服务器环境变量HostId")
private String hostId;
@ApiParam("日志信息")
private List<LogFieldModel> logs;
}

@ -17,7 +17,7 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
@Api("系统登录模型")
public class SystemLoginModel {
public class SysLoginModel {
@ApiParam(value = "登录名")
private String loginName;

@ -17,55 +17,59 @@ import javax.persistence.Table;
/**
* @Description :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:42.720
* @Modify :
* @Reference :
* @Author : wei.peng
* @Date : 2018-10-22 16:58:42.720
* @Modify :
**/
@Data
@DynamicInsert
@DynamicUpdate
@EqualsAndHashCode(callSuper = true)
@Table(name="SYS_LOG_OPERATE")
@Api(value="操作日志表",description = "操作日志表")
@Table(name = "SYS_LOG_OPERATE")
@Api(value = "操作日志表", description = "操作日志表")
public class SysLogOperate extends BaseBean {
private static final long serialVersionUID = 1515035521283176727L;
@ApiParam(value ="系统模块(枚举)", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class,refForeignKey = "value",value = "description")
@ApiParam(value = "系统模块(枚举)", example = "1")
@AnnoOutputColumn(refClass = CommonEnumUtil.SOFT_TYPE.class, refForeignKey = "value", value = "description")
private Integer softType;
public String getSoftTypeTxt() {
return softType == null ? null : CommonEnumUtil.SOFT_TYPE.valueOfDescription(softType);
}
@ApiParam(value ="操作类型" , example = "-1")
@AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class,refForeignKey = "value",value = "description")
@ApiParam(value = "操作类型", example = "-1")
@AnnoOutputColumn(refClass = ImppEnumUtil.OPERATE_TYPE.class, refForeignKey = "value", value = "description")
private Integer operateType;
public String getOperateTypeTxt(){
public String getOperateTypeTxt() {
return operateType == null ? null : ImppEnumUtil.OPERATE_TYPE.valueOfDescription(operateType);
}
@ApiParam(value ="操作信息" , access ="操作信息")
@ApiParam(value = "操作信息", access = "操作信息")
private String operateMessage;
@ApiParam(value ="登录用户名称" , access ="登录用户名称")
@ApiParam(value = "登录用户名称", access = "登录用户名称")
private String userLoginName;
@ApiParam(value ="请求IP" , access ="请求IP")
@ApiParam(value = "请求IP", access = "请求IP")
private String remoteIp;
@ApiParam(value ="请求路径" , access ="请求路径")
@ApiParam(value = "本机名/Ip", access = "本机名/Ip")
private String serverHost;
@ApiParam(value = "请求路径", access = "请求路径")
private String requestUrl;
// @Column(name="HTTP_METHOD")
// @ApiParam(value ="http请求方法" , access ="http请求方法")
// private String httpMethod;
@ApiParam(value ="方法入参" , access ="方法入参")
@ApiParam(value = "方法入参", access = "方法入参")
private String logArgs;
@ApiParam(value ="执行耗时")
@ApiParam(value = "执行耗时")
@JsonSerialize(using = ToStringSerializer.class)
private Long executeTime;
}

Loading…
Cancel
Save