fix:日志新增修改

distributed-print-business/src/main/resources/db/3.2.3更新脚本-增量.sql

@@ -1260,4 +1260,13 @@ INSERT INTO `sys_privilege` (`id`, `name`, `url`, `type`, `parent_id`, `sequence
 
 UPDATE `sys_privilege` SET `url` = '/api/admin/teach/clazz/page' WHERE (`id` = '842');
 UPDATE `sys_privilege` SET `url` = 'Enable' WHERE (`id` = '559');
-UPDATE `sys_privilege` SET `related` = '77,842,843,844,845,846,847,848,849,850,851,852,853' WHERE (`id` = '841');
+UPDATE `sys_privilege` SET `related` = '77,842,843,844,845,846,847,848,849,850,851,852,853' WHERE (`id` = '841');
+
+ALTER TABLE `basic_operation_log`
+    ADD COLUMN `privilege_id` BIGINT NULL COMMENT '权限菜单id' AFTER `url`;
+ALTER TABLE `basic_operation_log`
+    ADD INDEX `operation_log_idx` (`school_id` ASC, `customized_operation_type` ASC, `org_id` ASC, `user_id` ASC , `create_time` ASC) VISIBLE;
+;
+ALTER TABLE `basic_role_data_permission`
+    ADD INDEX `role_data_permission_idx` (`role_id` ASC, `privilege_id` ASC) VISIBLE;
+;

teachcloud-common/src/main/java/com/qmth/teachcloud/common/aspect/LogAspect.java

@@ -109,6 +109,7 @@ public class LogAspect {
         String userName = requestUser.getRealName();
         HttpServletRequest request = ServletUtil.getRequest();
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+        Long privilegeId = ServletUtil.getCurrentPrivilegeId();
         String clazzName = signature.getDeclaringTypeName();
         String methodName = signature.getName();
         Object[] args = joinPoint.getArgs();
@@ -131,6 +132,7 @@ public class LogAspect {
         operationLog.setIp(ServletUtil.getIP());
         operationLog.setCreateTime(System.currentTimeMillis());
         operationLog.setOrgId(requestUser.getOrgId());
+        operationLog.setPrivilegeId(privilegeId);
 
         // 注解中的信息
         OperationLogDetail annotation = signature.getMethod().getAnnotation(OperationLogDetail.class);

teachcloud-common/src/main/java/com/qmth/teachcloud/common/entity/BasicOperationLog.java

@@ -50,6 +50,10 @@ public class BasicOperationLog implements Serializable {
     @ApiModelProperty(value = "请求地址url")
     private String url;
 
+    @ApiModelProperty(value = "父菜单权限id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long privilegeId;
+
     @ApiModelProperty(value = "类名称")
     private String clazzName;
 
@@ -163,6 +167,14 @@ public class BasicOperationLog implements Serializable {
         this.url = url;
     }
 
+    public Long getPrivilegeId() {
+        return privilegeId;
+    }
+
+    public void setPrivilegeId(Long privilegeId) {
+        this.privilegeId = privilegeId;
+    }
+
     public String getClazzName() {
         return clazzName;
     }