系统操作日志，菜单列表问题修改

api-admin/src/main/java/com/glxp/api/admin/aspect/LogAspect.java

@@ -6,10 +6,12 @@ import cn.hutool.core.util.ObjectUtil;
 import com.glxp.api.admin.annotation.Log;
 import com.glxp.api.admin.constant.BusinessStatus;
 import com.glxp.api.admin.entity.monitor.OperLogDTO;
+import com.glxp.api.admin.exception.JsonException;
 import com.glxp.api.admin.service.monitor.OperLogService;
 import com.glxp.api.admin.util.JsonUtils;
 import com.glxp.api.admin.util.ServletUtils;
 import com.glxp.api.admin.util.SpringUtils;
+import com.glxp.api.common.enums.ResultEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.JoinPoint;
@@ -19,6 +21,8 @@ import org.aspectj.lang.annotation.Aspect;
 import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.HandlerMapping;
 
@@ -71,7 +75,14 @@ public class LogAspect {
             String ip = ServletUtils.getClientIP();
             operLog.setOperIp(ip);
             operLog.setOperUrl(StringUtils.substring(ServletUtils.getRequest().getRequestURI(), 0, 255));
-//            operLog.setOperName(LoginHelper.getUsername());
+
+            ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+            if (attributes == null) {
+                throw new JsonException(ResultEnum.NOT_NETWORK);
+            }
+            HttpServletRequest request = attributes.getRequest();
+            String id = request.getHeader("ADMIN_ID");
+            operLog.setOperName(id);
 
             if (e != null) {
                 operLog.setStatus(BusinessStatus.FAIL.ordinal());

api-admin/src/main/java/com/glxp/api/admin/controller/auth/SysMenuController.java

@@ -2,6 +2,7 @@ package com.glxp.api.admin.controller.auth;
 
 import cn.hutool.http.HttpUtil;
 import com.glxp.api.admin.constant.Constant;
+import com.glxp.api.admin.controller.BaseController;
 import com.glxp.api.admin.entity.auth.AuthAdmin;
 import com.glxp.api.admin.entity.auth.SysMenu;
 import com.glxp.api.admin.service.auth.CustomerService;
@@ -12,6 +13,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -23,7 +25,7 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("/system/menu")
-public class SysMenuController {
+public class SysMenuController extends BaseController {
 
     @Resource
     ISysMenuService menuService;
@@ -87,6 +89,8 @@ public class SysMenuController {
         } else if (Constant.YES_FRAME.equals(menu.getIsFrame()) && !HttpUtil.isHttp(menu.getPath())) {
             return ResultVOUtils.error(500, "新增菜单'" + menu.getMenuName() + "'失败，地址必须以http(s)://开头");
         }
+        menu.setCreateTime(new Date());
+        menu.setCreateBy(getUser().getEmployeeName());
         menuService.insertMenu(menu);
         return ResultVOUtils.success("修改成功！");
     }

api-admin/src/main/java/com/glxp/api/admin/dao/info/SysServerLogDao.java

@@ -0,0 +1,18 @@
+package com.glxp.api.admin.dao.info;
+
+import com.glxp.api.admin.entity.info.SetupEntity;
+import com.glxp.api.admin.entity.info.SysServerLogEntity;
+import com.glxp.api.admin.req.info.FilterSetupRequest;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface SysServerLogDao {
+
+
+    List<SysServerLogEntity> filterLog(FilterSetupRequest filterSetupRequest);
+
+    boolean insertLog(SysServerLogEntity sysServerLogEntity);
+
+}

api-admin/src/main/java/com/glxp/api/admin/entity/auth/DeptEntity.java

@@ -9,6 +9,7 @@ public class DeptEntity {
     private String code;
     private Integer id;
     private String name;
+    private String parentId;
     private String remark;
     private Integer flag;
     private Date updateTime;

api-admin/src/main/java/com/glxp/api/admin/entity/info/SysServerLogEntity.java

@@ -0,0 +1,13 @@
+package com.glxp.api.admin.entity.info;
+
+import lombok.Data;
+
+@Data
+public class SysServerLogEntity {
+    private Integer id;
+    private String genTime;
+    private String fileName;
+    private String filePath;
+    private String type;
+    private String remark;
+}

api-admin/src/main/java/com/glxp/api/admin/entity/monitor/SysOperLog.java

@@ -106,4 +106,6 @@ public class SysOperLog implements Serializable {
      */
     private Map<String, Object> params = new HashMap<>();
 
+    private String operUserName;
+
 }

api-admin/src/main/java/com/glxp/api/admin/req/auth/FilterDeptRequest.java

@@ -9,5 +9,6 @@ public class FilterDeptRequest extends ListPageRequest {
     private String name;
     private Integer flag;
     private String lastUpdateTime;
+    private String parentId;
 
 }

api-admin/src/main/java/com/glxp/api/admin/req/auth/SysRoleRequest.java

@@ -9,8 +9,7 @@ public class SysRoleRequest extends ListPageRequest {
     private Long roleId;
     private String roleName;
     private String roleKey;
-
+    private String status;
-
     private String neRoleName;
     private String neRoleKey;
     private Long neRoleId;

api-admin/src/main/java/com/glxp/api/admin/req/info/FilterSysLogRequest.java

@@ -0,0 +1,12 @@
+package com.glxp.api.admin.req.info;
+
+import com.glxp.api.admin.req.ListPageRequest;
+import lombok.Data;
+
+@Data
+public class FilterSysLogRequest extends ListPageRequest {
+    private String genTime;
+    private String fileName;
+    private String filePath;
+    private String type;
+}

api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/SysMenuServiceImpl.java

@@ -293,10 +293,10 @@ public class SysMenuServiceImpl implements ISysMenuService {
     @Override
     public String checkMenuNameUnique(SysMenu menu) {
 
-
         SysMenuRequest sysMenuRequest = new SysMenuRequest();
         sysMenuRequest.setParentId(menu.getParentId());
         sysMenuRequest.setMenuName(menu.getMenuName());
+        sysMenuRequest.setNeMenuId(menu.getMenuId() + "");
         List<SysMenu> menuList = sysMenuDao.selectMenuList(sysMenuRequest);
         if (CollUtil.isEmpty(menuList)) {
             return Constant.UNIQUE;

api-admin/src/main/java/com/glxp/api/admin/service/info/SysServerLogService.java

@@ -0,0 +1,6 @@
+package com.glxp.api.admin.service.info;
+
+import org.springframework.stereotype.Service;
+
+public interface SysServerLogService {
+}

api-admin/src/main/java/com/glxp/api/admin/service/info/impl/SysServerLogServiceImpl.java

@@ -0,0 +1,8 @@
+package com.glxp.api.admin.service.info.impl;
+
+import com.glxp.api.admin.service.info.SysServerLogService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SysServerLogServiceImpl implements SysServerLogService {
+}

api-admin/src/main/resources/application-dev.properties

@@ -1,8 +1,8 @@
 server.port=9991
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.jdbc-url=jdbc:mysql://192.168.0.66:3364/udiwms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
+spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_ph1?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
 spring.datasource.username=root
-spring.datasource.password=Glxp@6066
+spring.datasource.password=123456
 spring.datasource.hikari.connection-timeout=60000
 spring.datasource.hikari.maximum-pool-size=60
 spring.datasource.hikari.minimum-idle=10

api-admin/src/main/resources/mybatis/mapper/auth/DeptDao.xml

@@ -11,6 +11,9 @@
             <if test="flag != null and flag != ''">
                 and flag = #{flag}
             </if>
+            <if test="parentId != null and parentId != ''">
+                and parentId = #{parentId}
+            </if>
             <if test="name != null and '' != name">
                 AND `name` LIKE CONCAT('%',#{name},'%')
             </if>
@@ -22,10 +25,10 @@
 
 
     <insert id="insertDept" keyProperty="id" parameterType="com.glxp.api.admin.entity.auth.DeptEntity">
-        INSERT INTO auth_dept(`name`, `flag`, `remark`, updateTime, code)
+        INSERT INTO auth_dept(`name`, `flag`, `remark`, updateTime, code, parentId)
         values (#{name},
                 #{flag},
-                #{remark}, #{updateTime}, #{code})
+                #{remark}, #{updateTime}, #{code}, #{parentId})
     </insert>
 
     <update id="updateDept" parameterType="com.glxp.api.admin.entity.auth.DeptEntity">
@@ -36,6 +39,7 @@
             <if test="remark != null">remark=#{remark},</if>
             <if test="code != null">code=#{code},</if>
             <if test="updateTime != null">updateTime=#{updateTime},</if>
+            <if test="parentId != null">parentId=#{parentId},</if>
         </trim>
         WHERE id=#{id}
     </update>

api-admin/src/main/resources/mybatis/mapper/auth/SysMenuDao.xml

@@ -84,6 +84,7 @@
 
         select *
         FROM sys_menu
+        order by order_num
     </select>
 
 
@@ -96,8 +97,9 @@
             <if test="menuId != null ">
                 and menu_id = #{menuId}
             </if>
+
             <if test="menuName != null and menuName != '' ">
-                AND `menu_name` = #{menuName}
+                AND menu_name LIKE CONCAT('%',#{menuName},'%')
             </if>
             <if test="parentName != null and parentName != '' ">
                 AND `parent_name` = #{parentName}
@@ -108,13 +110,11 @@
             <if test="orderNum != null  ">
                 AND `order_num` = #{orderNum}
             </if>
-
             <if test="neMenuId != null ">
                 and menu_id  <![CDATA[ <> ]]>  #{neMenuId}
             </if>
-
-
         </where>
+        order by order_num
     </select>
 
 

api-admin/src/main/resources/mybatis/mapper/auth/SysRoleMapper.xml

@@ -105,11 +105,14 @@
                 and role_id = #{roleId}
             </if>
             <if test="roleName != null and  roleName != ''">
-                AND `role_name` = #{roleName}
+                AND role_name LIKE CONCAT('%',#{roleName},'%')
             </if>
             <if test="roleKey != null and  roleKey != ''">
                 AND `role_key` = #{roleKey}
             </if>
+            <if test="status != null and  status != ''">
+                AND `status` = #{status}
+            </if>
             <if test="neRoleName != null and  neRoleName != ''">
                 AND `role_name` <![CDATA[ <> ]]> #{neRoleName}
             </if>
@@ -119,8 +122,8 @@
             <if test="neRoleId != null ">
                 AND `role_id` <![CDATA[ <> ]]> #{neRoleId}
             </if>
-
         </where>
+        order by role_sort
     </select>
 
     <select id="selectRolePermissionByUserId" parameterType="Long" resultMap="SysRoleResult">

api-admin/src/main/resources/mybatis/mapper/info/SysServerLogDao.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+
+<mapper namespace="com.glxp.api.admin.dao.info.SysServerLogDao">
+
+
+    <select id="filterLog" parameterType="com.glxp.api.admin.req.info.FilterSysLogRequest"
+            resultType="com.glxp.api.admin.entity.info.SysServerLogEntity">
+        SELECT * FROM sys_server_log
+        <where>
+            <if test="type != '' and type != null">
+                AND `type` = #{type}
+            </if>
+
+            <if test="fileName != '' and fileName != null">
+                AND fileName = #{fileName}
+            </if>
+
+        </where>
+    </select>
+
+
+    <insert id="insertLog" parameterType="com.glxp.api.admin.entity.info.SysServerLogEntity">
+        insert
+        INTO sys_server_log(genTime,
+                            fileName,
+                            filePath,
+                            `type`,
+                            remark)
+        values (#{genTime},
+                #{fileName},
+                #{companyName},
+                #{filePath},
+                #{type},
+                #{remark})
+    </insert>
+
+
+</mapper>

api-admin/src/main/resources/mybatis/mapper/monitor/SysOperLogMapper.xml

@@ -21,14 +21,17 @@
         <result property="status" column="status"/>
         <result property="errorMsg" column="error_msg"/>
         <result property="operTime" column="oper_time"/>
+        <result property="operUserName" column="operUserName"/>
     </resultMap>
 
 
     <select id="selectList" parameterType="com.glxp.api.admin.req.monitor.SysOperLogRequest"
             resultMap="SysOperLogResult">
 
-        select *
+        select sys_oper_log.*,auth_user.employeeName operUserName
         FROM sys_oper_log
+        left join auth_user
+        on sys_oper_log.oper_name = auth_user.id
         <where>
             <if test="operId != null ">
                 and oper_id = #{operId}

api-admin/src/main/resources/schemas/schema_v2.1.sql

@@ -5,6 +5,8 @@ CALL Pro_Temp_ColumnWork ('io_order','wzUploadStatus','varchar(255) ', 1);
 CALL Pro_Temp_ColumnWork ('io_order','wzUploadResult','varchar(255) ', 1);
 
 
+CALL Pro_Temp_ColumnWork ('auth_dept','parentId','varchar(255) ', 1);
+
 
 -- 创建表时必须  create table if not exists 表名