diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java index 6e44e58..c6d3f95 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java @@ -48,9 +48,9 @@ public abstract class BaseBean implements Serializable { } } - @Column(name="factory_code") - @ApiParam(value = "工厂代码") - public String factoryCode; + @Column(name="ORGANIZE_CODE") + @ApiParam(value ="组织代码") + private String organizeCode; @Column(name="is_valid") @ApiParam(value = "有效性",example = "1") diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 54b1d81..0bd8dae 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -50,6 +50,16 @@ public class CommonEnumUtil { 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++) { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index 33cc49f..174f829 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -89,8 +89,7 @@ public class ImppEnumUtil { public enum TASK_METHOD_TYPE{ TYPE_GROUP(1,"类方法","Java Class 方法"), TYPE_COMPANY(2,"链接","Http URL"), - TYPE_FACTORY(3,"权限CODE","权限CODE"), - ; + TYPE_FACTORY(3,"权限CODE","权限CODE"); private int value; private String name; @@ -229,21 +228,22 @@ public class ImppEnumUtil { * 4.SELECT:查询 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum LOG_TYPE{ + public enum OPERATE_TYPE{ - INSERT(1,"新增","新增"), - DELETE(2,"修改","修改"), - UPDATE(3,"删除","删除"), - SELECT(4,"查询","查询"); + 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; private String description; - LOG_TYPE() { + OPERATE_TYPE() { } - LOG_TYPE(int value, String name, String description) { + OPERATE_TYPE(int value, String name, String description) { this.value = value; this.name = name; this.description = description; @@ -281,6 +281,16 @@ public class ImppEnumUtil { return tmp; } + public static int codeOfValue(String code) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(code)) { + tmp = values()[i].value; + } + } + return tmp; + } + public static String codeOfDescription(String code) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -299,18 +309,16 @@ public class ImppEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum OPERATE_TERMINAL{ - PC(1,"个人计算机","个人计算机"); + PC(1,"电脑端"),PDA(2,"PDA"),MOBILE(3,"手机"); private int value; - private String name; private String description; OPERATE_TERMINAL() { } - OPERATE_TERMINAL(int value, String name, String description) { + OPERATE_TERMINAL(int value, String description) { this.value = value; - this.name = name; this.description = description; } @@ -318,24 +326,10 @@ public class ImppEnumUtil { return value; } - public String getName() { - return name; - } - 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].name; - } - } - return tmp; - } - public static String valueOfDescription(int val) { String tmp = null; for (int i = 0; i < values().length; i++) { @@ -346,15 +340,6 @@ public class ImppEnumUtil { return tmp; } - public static String codeOfDescription(String code) { - String tmp = null; - for (int i = 0; i < values().length; i++) { - if (values()[i].name.equals(code)) { - tmp = values()[i].description; - } - } - return tmp; - } } /** diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java index aeb04e5..da111f8 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogOperate.java @@ -13,7 +13,7 @@ import javax.persistence.Table; import java.text.DecimalFormat; /** - * @Description : 操作日志表 + * @Description : 用户操作日志表 * @Reference : * @Author : wei.peng * @Date : 2018-10-22 16:58:42.720 @@ -28,35 +28,16 @@ import java.text.DecimalFormat; public class LogOperate extends BaseBean { @Column(name="OPERATE_MODULE_ID") - @ApiParam(value ="操作模块(枚举)" , example = "-1") + @ApiParam(value ="系统模块(枚举)", example = "1") + //CommonEnumUtil.SOFT_TYPE private Integer operateModuleId; @Column(name="OPERATE_TYPE_ID(枚举)") + //ImppEnumUtil.OPERATE_TYPE @ApiParam(value ="操作类型" , example = "-1") private Integer operateTypeId; - - @Column(name="OPERATE_OBJECT") - @ApiParam(value ="操作对象" ) - private String operateObject; - - @Column(name="OPERATE_FIRST_DATA") - @ApiParam(value ="操作前数据") - private String operateFirstData; - - @Column(name="OPERATE_LAST_DATA") - @ApiParam(value ="操作后数据") - private String operateLastData; - - @Column(name="OPERATE_IP") - @ApiParam(value ="服务器IP") - private String operateIp; - - @Column(name="OPERATE_TERMINAL") - @ApiParam(value ="操作终端(枚举)" , example = "1") - private Integer operateTerminal; - - @Column(name="OPERATE_USER_NAME") - @ApiParam(value ="操作人名称" , access ="操作人名称") - private String operateUserName; + @Column(name="OPERATE_MESSAGE") + @ApiParam(value ="操作信息" , access ="操作信息") + private String operateMessage; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java index f868d5e..5086cab 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/LogSystem.java @@ -27,33 +27,58 @@ import java.text.DecimalFormat; @Api(value="系统日志表",description = "系统日志表") public class LogSystem extends BaseBean { + @Column(name="LOG_LEVEL") + @ApiParam(value ="日志级别" , example ="1") + //ImppEnumUtil.LOG_LEVEL + private Integer logLevel; @Column(name="LOG_MODULE_ID") @ApiParam(value ="系统模块(枚举)", example = "1") + //CommonEnumUtil.SOFT_TYPE private Integer logModuleId; - @Column(name="LOG_IP") - @ApiParam(value ="服务器IP" , access ="服务器IP") - private String logIp; - + @Column(name="REMOTE_IP") + @ApiParam(value ="请求IP" , access ="请求IP") + private String remoteIp; + + @Column(name="REQUEST_URL") + @ApiParam(value ="请求路径" , access ="请求路径") + private String requestUrl; + + @Column(name="HTTP_METHOD") + @ApiParam(value ="http请求方法" , access ="http请求方法") + private String httpMethod;; + @Column(name="LOG_CLASS") - @ApiParam(value ="触发路径" , access ="触发路径") + @ApiParam(value ="触发类路径" , access ="触发类路径") private String logClass; @Column(name="LOG_METHOD") @ApiParam(value ="触发方法" , access ="触发方法") private String logMethod; + + @Column(name="ARGS_COUNT") + @ApiParam(value ="入参数量" , access ="入参数量") + private Integer argsCount; + + @Column(name="LOG_ARGS") + @ApiParam(value ="方法入参" , access ="方法入参") + private String logArgs; - @Column(name="LOG_LEVEL_ID") - @ApiParam(value ="日志级别(1.DEBUG,2.INFO,3.ERROR)" , example ="1") - private Integer logLevelId; - - @Column(name="LOG_MESSAGE") - @ApiParam(value ="日志信息" , access ="日志信息") - private String logMessage; - - @Column(name="LOG_USER_NAME") - @ApiParam(value ="操作人名称" , access ="操作人名称") - private String logUserName; + @Column(name="LOG_TITLE") + @ApiParam(value ="日志标题") + private String logTitle; + + @Column(name="LOG_DETAIL") + @ApiParam(value ="日志详情") + private String logDetail; + + @Column(name="SERVER_HOST") + @ApiParam(value ="服务器") + //hostName + ip + private String serverHost; + @Column(name="EXECUTE_TIME") + @ApiParam(value ="执行耗时") + private long executeTime; }