From d7d56af1f778f5303413051fc3e1dae9e8715f60 Mon Sep 17 00:00:00 2001
From: fanghongchao <601470458@qq.com>
Date: Fri, 30 Nov 2018 16:23:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AD=97=E6=AE=B5=E8=AF=B4?=
 =?UTF-8?q?=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../settings/UISettingsController.java        |  2 +-
 .../omms/adminapi/elasticsearch/CommCode.java | 16 +++++---
 .../adminapi/elasticsearch/UserOptLog.java    | 39 +++++++++----------
 3 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java b/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
index ce0143d..f77bb33 100644
--- a/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
+++ b/src/main/java/com/gzzn/omms/adminapi/controller/settings/UISettingsController.java
@@ -111,7 +111,7 @@ public class UISettingsController {
 		Uisettings uisettings = uisettingsConvert.uisettingsDtoToUisettings(uisettingsDto);
 		
 		Uisettings oldUisettings = null;
-		Byte optType = CommCode.LOG_OPT_TYPE_ADD;
+		String optType = CommCode.LOG_OPT_TYPE_ADD;
 		String oldData = "无";
 		if(!StringUtils.isEmpty(uisettings.getId())){
 			oldUisettings = uisettingsDao.findById(uisettings.getId());
diff --git a/src/main/java/com/gzzn/omms/adminapi/elasticsearch/CommCode.java b/src/main/java/com/gzzn/omms/adminapi/elasticsearch/CommCode.java
index c06ccaf..dbf57a7 100644
--- a/src/main/java/com/gzzn/omms/adminapi/elasticsearch/CommCode.java
+++ b/src/main/java/com/gzzn/omms/adminapi/elasticsearch/CommCode.java
@@ -4,27 +4,31 @@ public class CommCode {
 	/**
 	 *	操作日志类别  新建
 	 */
-	public static final Byte LOG_OPT_TYPE_ADD =  0; 
+	public static final String LOG_OPT_TYPE_ADD =  "ADD"; 
 	/**
 	 *	操作日志类别  修改
 	 */
-	public static final Byte LOG_OPT_TYPE_UPDATE =  1; 
+	public static final String LOG_OPT_TYPE_UPDATE =  "UPDATE"; 
 	/**
 	 *	操作日志类别  删除
 	 */
-	public static final Byte LOG_OPT_TYPE_DELETE =  2; 
+	public static final String LOG_OPT_TYPE_DELETE =  "DELETE"; 
 	
 	
 	/**
 	 *	日志类别  登录
 	 */
-	public static final Byte LOG_TYPE_LOGIN =  1;
+	public static final String LOG_TYPE_LOGIN =  "LOGIN";
 	/**
 	 *	日志类别  登出
 	 */
-	public static final Byte LOG_TYPE_LOGOUT =  2;
+	public static final String LOG_TYPE_LOGOUT =  "LOGOUT";
 	/**
 	 *	日志类别  修改用户设置
 	 */
-	public static final Byte LOG_TYPE_UISETTING =  3;
+	public static final String LOG_TYPE_UISETTING =  "USER_UI_SET";
+	/**
+	 * 新增修改删除用户信息
+	 */
+	public static final String LOG_TYPE_USEROPT =  "USER_INFO_OPT";
 }
diff --git a/src/main/java/com/gzzn/omms/adminapi/elasticsearch/UserOptLog.java b/src/main/java/com/gzzn/omms/adminapi/elasticsearch/UserOptLog.java
index 7d3b19a..c249719 100644
--- a/src/main/java/com/gzzn/omms/adminapi/elasticsearch/UserOptLog.java
+++ b/src/main/java/com/gzzn/omms/adminapi/elasticsearch/UserOptLog.java
@@ -10,20 +10,20 @@ public class UserOptLog {
     /**
      * 模块名
      */
-    private String model_name = "adminapi";
+    private String model_name = "sysapi";
     /**
      * 日志详情
      */
     private String log_content;
     /**
-     * 业务类型  1:登录 2:退出 3:修改用户设置
+     * 业务类型  LOGIN:登录 LOGOUT:退出 USER_UI_SET:修改用户设置 USER_INFO_OPT:增删改用户信息
      * 
      */
-    private Byte log_type;
+    private String log_type;
     /**
-     * 操作类别  0:新增  1:修改  2：删除
+     * 操作类别  ADD:新增  UPDATE:修改  DELETE：删除
      */
-    private Byte opt_type;
+    private String opt_type;
     /**
      * 操作用户id
      */
@@ -103,22 +103,6 @@ public class UserOptLog {
 		this.log_content = log_content;
 	}
 
-	public Byte getLog_type() {
-		return log_type;
-	}
-
-	public void setLog_type(Byte log_type) {
-		this.log_type = log_type;
-	}
-
-	public Byte getOpt_type() {
-		return opt_type;
-	}
-
-	public void setOpt_type(Byte opt_type) {
-		this.opt_type = opt_type;
-	}
-
 	public String getUser_id() {
 		return user_id;
 	}
@@ -166,4 +150,17 @@ public class UserOptLog {
 	public void setLog_datetime(Long log_datetime) {
 		this.log_datetime = log_datetime;
 	}
+	public String getLog_type() {
+		return log_type;
+	}
+	public void setLog_type(String log_type) {
+		this.log_type = log_type;
+	}
+	public String getOpt_type() {
+		return opt_type;
+	}
+	public void setOpt_type(String opt_type) {
+		this.opt_type = opt_type;
+	}
+	
 }