3.4.0 update

distributed-print/install/mysql/upgrade/3.4.0.sql

@@ -24,17 +24,17 @@ ADD INDEX `operation_log_idx` USING BTREE (`school_id`, `user_id`, `privilege_id
 update basic_operation_log t set t.operation_type = 'SAVE' where t.operation_type = 'EDIT';
 update basic_operation_log t set t.operation_type = 'OTHER' where t.operation_type = 'UN_KNOW';
 
-drop table if exists exam_detail_course_paper_type;
-drop table basic_template_org;
-drop table cloud_user_push_status;
-drop table exam_card_detail;
-drop table exam_paper_class_marker;
-drop table exam_paper_group;
-drop table exam_paper_group_marker;
-drop table exam_paper_structure;
-drop table exam_task_sync;
-drop table t_sync_exam_log;
-drop table t_sync_stmms_exam;
+-- drop table if exists exam_detail_course_paper_type;
+-- drop table if exists basic_template_org;
+-- drop table if exists cloud_user_push_status;
+-- drop table if exists exam_card_detail;
+-- drop table if exists exam_paper_class_marker;
+-- drop table if exists exam_paper_group;
+-- drop table if exists exam_paper_group_marker;
+-- drop table if exists exam_paper_structure;
+-- drop table if exists exam_task_sync;
+-- drop table if exists t_sync_exam_log;
+-- drop table if exists t_sync_stmms_exam;
 
 -- delete脚本需要加上新增的表
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/result/BasicOperationLogResult.java

@@ -33,6 +33,8 @@ public class BasicOperationLogResult implements Serializable {
     @ApiModelProperty("IP")
     private String ip;
 
+    @ApiModelProperty("菜单名称")
+    private String privilegeName;
     @ApiModelProperty("自定义操作类型")
     private OperationTypeEnum operationType;
 
@@ -94,6 +96,14 @@ public class BasicOperationLogResult implements Serializable {
         this.ip = ip;
     }
 
+    public String getPrivilegeName() {
+        return privilegeName;
+    }
+
+    public void setPrivilegeName(String privilegeName) {
+        this.privilegeName = privilegeName;
+    }
+
     public OperationTypeEnum getOperationType() {
         return operationType;
     }

teachcloud-common/src/main/resources/mapper/BasicOperationLogMapper.xml

@@ -12,10 +12,12 @@
             su.real_name realName,
             bol.ip,
             bol.operation_type AS operationType,
-            bol.create_time AS createTime
+            bol.create_time AS createTime,
+            sp.name operationTypeName
         FROM
             basic_operation_log  bol
                 left join sys_user su on bol.user_id = su.id
+                left join sys_privilege sp on bol.privilege_id = sp.id
         <where>
             <if test="schoolId != null">
                 AND bol.school_id = #{schoolId}