feat(用户登录日志):用户登录日志查询及导出功能

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java

@@ -1047,6 +1047,9 @@ public class CommonEnumUtil {
             }
             return tmp;
         }
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
 
         public static int descOf(String desc) {
             int tmp = -1;

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysLogUserLogin.java

@@ -1,8 +1,10 @@
 package cn.estsh.i3plus.pojo.platform.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import io.swagger.annotations.Api;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
-import io.swagger.annotations.ApiParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
@@ -25,36 +27,39 @@ import javax.persistence.Table;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name="SYS_LOG_USER_LOGIN")
-@Api(value="用户登录记录",description = "用户登录记录")
+@ApiModel(value="用户登录记录",description = "用户登录记录")
 public class SysLogUserLogin extends BaseBean {
 
     private static final long serialVersionUID = 4665598896654312569L;
     @Column(name="USER_ID")
-    @ApiParam(value ="用户ID" , access ="用户ID")
+    @ApiModelProperty(value ="用户ID" , access ="用户ID")
+    @AnnoOutputColumn(hidden = true)
     private Long userId;
 
     @Column(name="LOG_LOGIN_NAME")
-    @ApiParam(value ="登录名称" , access ="登录名称")
+    @ApiModelProperty(value ="登录名称" , access ="登录名称")
     private String logLoginName;
 
     @Column(name="LOG_LOGIN_STATUS")
-    @ApiParam(value ="登录状态（枚举：1.成功，2.失败，3锁定）" , example ="1")
+    @ApiModelProperty(value ="登录状态（枚举：1.成功，2.失败，3锁定）" , example ="1")
+    @AnnoOutputColumn(refClass = CommonEnumUtil.USER_LOGIN_STATUS.class)
     private Integer logLoginStatus;
 
     @Column(name="LOG_LOGIN_PLATFORM")
-    @ApiParam(value ="登录平台ID（枚举）" , example ="1")
+    @ApiModelProperty(value ="登录平台ID（枚举）" , example ="1")
+    @AnnoOutputColumn(hidden = true)
     private Integer logLoginPlatform;
 
     @Column(name="LOG_LOGIN_HOST")
-    @ApiParam(value ="登录IP" , access ="登录IP")
+    @ApiModelProperty(value ="登录IP" , access ="登录IP")
     private String logLoginHost;
 
     @Column(name="LOG_LOGIN_BROWSER")
-    @ApiParam(value ="登录浏览器" , access ="登录的浏览器")
+    @ApiModelProperty(value ="登录浏览器" , access ="登录的浏览器")
     private String logLoginBrowser;
 
     @Column(name="LOG_LOGIN_DATE_TIME")
-    @ApiParam(value ="登录时间" , access ="登录时间")
+    @ApiModelProperty(value ="登录时间" , access ="登录时间")
     private String logLoginDateTime;
 
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUserInfo.java

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.platform.bean;
 import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.BaseConstWords;
+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;
@@ -140,7 +141,7 @@ public class  SysUserInfo extends BaseBean {
 
     @Column(name="USER_INFO_STATUS")
     @ApiParam(value ="用户状态" , example ="-1")
-    @AnnoOutputColumn(hidden = true)
+    @AnnoOutputColumn(refClass = CommonEnumUtil.USER_STATUS.class)
     private Integer userInfoStatus;
 
     @Column(name="USER_LOGIN_NUM")

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -1169,4 +1169,17 @@ public class CoreHqlPack {
 
         return ddlPackBean;
     }
+
+    public static DdlPackBean packHqlQuerySysLogUserLogin(SysLogUserLogin sysLogUserLogin){
+        DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(sysLogUserLogin);
+
+        DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginStatus(),"logLoginStatus",ddlPackBean);
+        DdlPreparedPack.getNumEqualPack(sysLogUserLogin.getLogLoginPlatform(),"logLoginPlatform",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginName(),"logLoginName",ddlPackBean);
+        DdlPreparedPack.getStringLikerPack(sysLogUserLogin.getLogLoginHost(), "logLoginHost", ddlPackBean);
+        DdlPreparedPack.timeBuilder(sysLogUserLogin.getLogLoginDateTime(), "logLoginDateTime", ddlPackBean, false, true);
+
+        return ddlPackBean;
+    }
+
 }