Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/BaseMonitor

base-common/src/main/java/com/ozs/common/core/domain/BaseEntityExp.java

@@ -0,0 +1,38 @@
+package com.ozs.common.core.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author wyy
+ * @subject
+ * @creat 2023/3/15
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BaseEntityExp implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /** 请求参数 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist = false)
+    private Map<String, Object> params;
+
+
+    public Map<String, Object> getParams()
+    {
+        if (params == null)
+        {
+            params = new HashMap<>();
+        }
+        return params;
+    }
+}

base-common/src/main/java/com/ozs/common/core/domain/vo/SysOperlogVo.java

@@ -47,21 +47,22 @@ public class SysOperlogVo extends PageVo implements Serializable {
      * 操作类别
      */
     private Integer operatorType;
-    @Excel(
-            name = "操作人员"
-    )
+
     /**
      * 操作人员
      */
     private String userId;
 
+    /**
+     * 操作人员
+     */
+    private String userName;
+
     /**
      * 部门名称
      */
     private String deptName;
-    @Excel(
-            name = "请求地址"
-    )
+
     /**
      * 请求地址
      */

base-system/src/main/java/com/ozs/system/domain/SysLoginInfo.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.annotation.Excel.ColumnType;
 import com.ozs.common.core.domain.BaseEntity;
+import com.ozs.common.core.domain.BaseEntityExp;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -20,7 +21,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class SysLoginInfo extends BaseEntity {
+public class SysLoginInfo extends BaseEntityExp {
 
     /**
      * ID

base-system/src/main/java/com/ozs/system/domain/SysOperLog.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.annotation.Excel.ColumnType;
 import com.ozs.common.core.domain.BaseEntity;
+import com.ozs.common.core.domain.BaseEntityExp;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -20,7 +21,7 @@ import lombok.NoArgsConstructor;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-public class SysOperLog extends BaseEntity {
+public class SysOperLog extends BaseEntityExp {
 
     /**
      * 日志主键
@@ -43,7 +44,7 @@ public class SysOperLog extends BaseEntity {
     /**
      * 业务类型数组
      */
-    private Integer[] businessTypes;
+   // private Integer[] businessTypes;
 
     /**
      * 请求方法

base-system/src/main/java/com/ozs/system/mapper/SysLoginInfoMapper.java

@@ -44,4 +44,6 @@ public interface SysLoginInfoMapper extends JoinBaseMapper<SysLoginInfo> {
      * @return 结果
      */
     public int cleanLogininfor();
+
+    SysLoginInfo selectLoginLogById (Long infoId);
 }

base-system/src/main/java/com/ozs/system/service/ISysLoginInfoService.java

@@ -39,4 +39,11 @@ public interface ISysLoginInfoService extends JoinIService<SysLoginInfo> {
      * 清空系统登录日志
      */
     public void cleanLogininfor();
+    /**
+     * 查询登录日志详细
+     *
+     * @param infoId 日志ID
+     * @return 登录日志对象
+     */
+    public SysLoginInfo selectLoginLogById (Long infoId);
 }

base-system/src/main/java/com/ozs/system/service/impl/SysLoginInfoServiceImpl.java

@@ -61,4 +61,15 @@ public class SysLoginInfoServiceImpl extends JoinServiceImpl<SysLoginInfoMapper,
     public void cleanLogininfor() {
         logininforMapper.cleanLogininfor();
     }
+
+    /**
+     * 查询登录日志详细
+     *
+     * @param infoId 日志ID
+     * @return 登录日志对象
+     */
+    @Override
+    public SysLoginInfo selectLoginLogById(Long infoId) {
+        return logininforMapper.selectLoginLogById(infoId);
+    }
 }

base-system/src/main/resources/mapper/system/SysLogininforMapper.xml

@@ -53,5 +53,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <update id="cleanLogininfor">
 		truncate table sys_login_info
 	</update>
-
+	<select id="selectLoginLogById" parameterType="Long" resultMap="SysLoginInfoesult">
+		select info_id, user_name, ipaddr, login_location, browser, os, status, msg, login_time from sys_login_info
+		where info_id = #{infoId}
+	</select>
 </mapper>

base-system/src/main/resources/mapper/system/SysOperLogMapper.xml

@@ -42,12 +42,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="businessType != null">
 				AND business_type = #{businessType}
 			</if>
-			<if test="businessTypes != null and businessTypes.length > 0">
-			    AND business_type in
-			    <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
-		 			#{businessType}
-		        </foreach>
-			</if>
+<!--			<if test="businessTypes != null and businessTypes.length > 0">-->
+<!--			    AND business_type in-->
+<!--			    <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">-->
+<!--		 			#{businessType}-->
+<!--		        </foreach>-->
+<!--			</if>-->
 			<if test="status != null">
 				AND status = #{status}
 			</if>