From 7637db3c93ffacfb506ff98c515124bf0f9cc202 Mon Sep 17 00:00:00 2001
From: Grain-Yu <justbeafreeman@outlook.com>
Date: Thu, 23 Nov 2023 14:46:18 +0800
Subject: [PATCH 01/10] =?UTF-8?q?draft:=20=E6=B7=BB=E5=8A=A0sql=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=AF=A6=E6=83=85=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/models.py                |  1 +
 sql/slowlog.py               |  6 ++++--
 sql/templates/slowquery.html | 36 ++++++++++++++++++++++++++++++++++++
 sql/urls.py                  |  1 +
 sql/views.py                 |  4 ++++
 5 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/sql/models.py b/sql/models.py
index 16aaef6..815d60f 100644
--- a/sql/models.py
+++ b/sql/models.py
@@ -921,6 +921,7 @@ class SlowQuery(models.Model):
     reviewed_by = models.CharField(max_length=20, blank=True, null=True)
     reviewed_on = models.DateTimeField(blank=True, null=True)
     comments = models.TextField(blank=True, null=True)
+    reviewed_status = models.CharField(max_length=24, blank=True, null=True)
 
     class Meta:
         managed = False
diff --git a/sql/slowlog.py b/sql/slowlog.py
index 624520b..94bffbf 100644
--- a/sql/slowlog.py
+++ b/sql/slowlog.py
@@ -67,8 +67,8 @@ def slowquery_review(request):
                 fingerprint__icontains=search,
                 **filter_kwargs
             )
-            .annotate(SQLText=F("fingerprint"), SQLId=F("checksum"))
-            .values("SQLText", "SQLId")
+            .annotate(SQLText=F("fingerprint"), SQLId=F("checksum"), ReviewedBy=F("reviedwd_by"), ReviewedOn=F("reviewed_on"), Comments=F("comments"), ReviewedStatus=F("reviewed_status"))
+            .values("SQLText", "SQLId", "ReviewedBy", "ReviewedOn", "Comments", "ReviewedStatus")
             .annotate(
                 CreateTime=Max("slowqueryhistory__ts_max"),
                 DBName=Max("slowqueryhistory__db_max"),  # 数据库
@@ -157,6 +157,7 @@ def slowquery_review_history(request):
             sample__icontains=search,
             **filter_kwargs
         ).annotate(
+            SQLChecksum=F("checksum"),  # SQL语句校验和
             ExecutionStartTime=F("ts_min"),  # 本次统计(每5分钟一次)该类型sql语句出现的最小时间
             DBName=F("db_max"),  # 数据库名
             HostAddress=Concat(
@@ -175,6 +176,7 @@ def slowquery_review_history(request):
         slow_sql_record_list = slow_sql_record_obj.order_by(
             "-" + sortName if "desc".__eq__(sortOrder) else sortName
         )[offset:limit].values(
+            "SQLChecksum",
             "ExecutionStartTime",
             "DBName",
             "HostAddress",
diff --git a/sql/templates/slowquery.html b/sql/templates/slowquery.html
index 0219c89..5d01e27 100644
--- a/sql/templates/slowquery.html
+++ b/sql/templates/slowquery.html
@@ -4,6 +4,7 @@
     <!-- 自定义操作按钮-->
     <div id="sqladvisor-toolbar" class="btn-group right" style="display:none;">
         <button id=sqladvisor class="btn btn-default" style="" type="button">获取优化建议</button>
+        <button id=sqlreview class="btn btn-default" style="" type="button">编辑优化详情</button>
     </div>
     <!-- Nav tabs -->
     <ul id="nav-tabs" class="nav nav-tabs" role="tablist">
@@ -269,6 +270,25 @@
                 }
             });
         });
+
+        //点击编辑按钮编辑优化详情
+        $(function () {
+            $("#sqlreview").click(function () {
+                if ($("#slowsqlinfo-list").bootstrapTable('getSelections')[0]) {
+                    var review_sql_content = $("#slowsqlinfo-list").bootstrapTable('getSelections')[0]['SQLText'] + ';';
+                    var review_db_name = $("#slowsqlinfo-list").bootstrapTable('getSelections')[0]['DBName'];
+                    var review_instance_name = $("#instance_name").val();
+                    var review_checksum = $("#slowsqlinfo-list").bootstrapTable('getSelections')[0]['SQLChecksum']
+                    sessionStorage.setItem('review_sql_content ', review_sql_content );
+                    sessionStorage.setItem('review_db_name', review_db_name);
+                    sessionStorage.setItem('review_instance_name', review_instance_name);
+                    sessionStorage.setItem('review_checksum', review_checksum);
+                    location.href = '/slowquery_review/';
+                } else {
+                    alert("请先选择需要优化的sql")
+                }
+            });
+        });
     </script>
     <!-- 获取列表数据 -->
     <script>
@@ -427,6 +447,22 @@
                         title: '平均返回行数',
                         field: 'ReturnRowAvg',
                         sortable:true
+                    }, {
+                        title: '优化人',
+                        field: 'ReviewedBy',
+                        sortable:true
+                    }, {
+                        title: '优化日期',
+                        field: 'ReviewedOn',
+                        sortable:true
+                    }, {
+                        title: '优化详情',
+                        field: 'Comments',
+                        sortable:true
+                    }, {
+                        title: '优化状态',
+                        field: 'ReviewedStatus',
+                        sortable:true
                     }],
                     locale: 'zh-CN',
                     onLoadError: onLoadErrorCallback,
diff --git a/sql/urls.py b/sql/urls.py
index e2511c7..c371937 100644
--- a/sql/urls.py
+++ b/sql/urls.py
@@ -50,6 +50,7 @@
     path("sqlquery/", views.sqlquery),
     path("slowquery/", views.slowquery),
     path("sqladvisor/", views.sqladvisor),
+    path("sqlreview/", views.sqlreview),
     path("slowquery_advisor/", views.sqladvisor),
     path("queryapplylist/", views.queryapplylist),
     path(
diff --git a/sql/views.py b/sql/views.py
index 6c40e29..f62b304 100644
--- a/sql/views.py
+++ b/sql/views.py
@@ -400,6 +400,10 @@ def slowquery(request):
     """SQL慢日志页面"""
     return render(request, "slowquery.html")
 
+@permission_required("sql.menu_sqlreview", raise_exception=True)
+def sqlreview(request):
+    """SQL优化详情页面"""
+    return render(request, "sqlreview.html")
 
 @permission_required("sql.menu_instance", raise_exception=True)
 def instance(request):

From 6c596724907ea0160170340eac8ee64b2a194de3 Mon Sep 17 00:00:00 2001
From: Grain-Yu <justbeafreeman@outlook.com>
Date: Fri, 24 Nov 2023 09:14:45 +0800
Subject: [PATCH 02/10] draft

---
 sql/manual_review.py         |  116 ++++
 sql/templates/sqlreview.html | 1024 ++++++++++++++++++++++++++++++++++
 2 files changed, 1140 insertions(+)
 create mode 100644 sql/manual_review.py
 create mode 100644 sql/templates/sqlreview.html

diff --git a/sql/manual_review.py b/sql/manual_review.py
new file mode 100644
index 0000000..a88e907
--- /dev/null
+++ b/sql/manual_review.py
@@ -0,0 +1,116 @@
+# -*- coding: UTF-8 -*-
+import logging
+import traceback
+import MySQLdb
+import pymysql
+import re
+
+import schemaobject
+import sqlparse
+from MySQLdb.constants import FIELD_TYPE
+from schemaobject.connection import build_database_url
+
+from sql.engines.goinception import GoInceptionEngine
+from sql.utils.sql_utils import get_syntax_type, remove_comments
+from . import EngineBase
+from .models import ResultSet, ReviewResult, ReviewSet
+from sql.utils.data_masking import data_masking
+from common.config import SysConfig
+
+# -*- coding: UTF-8 -*-
+import MySQLdb
+import simplejson as json
+from django.contrib.auth.decorators import permission_required
+from django.contrib.auth.password_validation import validate_password
+from django.core.exceptions import ValidationError
+
+from django.http import HttpResponse, JsonResponse
+from sql.utils.instance_management import (
+    SUPPORTED_MANAGEMENT_DB_TYPE,
+    get_instanceaccount_unique_value,
+    get_instanceaccount_unique_key,
+)
+from common.utils.extend_json_encoder import ExtendJSONEncoder
+from sql.engines import get_engine, ResultSet
+from sql.utils.resource_group import user_instances
+from .models import Instance, InstanceAccount
+
+@permission_required("sql.menu_instance_account", raise_exception=True)
+def sqllist(request):
+    """获取优化详情列表"""
+    checksum = request.POST.get("review_checksum")
+
+    if not checksum:
+        return JsonResponse({"status": 0, "msg": "", "data": []})
+    try:
+        instance = user_instances(
+            request.user, db_type=SUPPORTED_MANAGEMENT_DB_TYPE
+        ).get(instance_name='archery')
+    except Instance.DoesNotExist:
+        return JsonResponse({"status": 1, "msg": "你所在组未关联该实例", "data": []})
+    
+
+
+
+    
+
+    # 获取已录入用户
+    cnf_users = dict()
+    for user in InstanceAccount.objects.filter(instance=instance).values(
+        "id", "user", "host", "db_name", "remark"
+    ):
+        user["saved"] = True
+        cnf_users[get_instanceaccount_unique_value(instance.db_type, user)] = user
+    # 获取所有用户
+    query_engine = get_engine(instance=instance)
+    query_result = query_engine.get_instance_users_summary()
+    if not query_result.error:
+        rows = []
+        key = get_instanceaccount_unique_key(db_type=instance.db_type)
+        for row in query_result.rows:
+            # 合并数据
+            if row[key] in cnf_users.keys():
+                row = dict(row, **cnf_users[row[key]])
+            rows.append(row)
+        # 过滤参数
+        if saved:
+            rows = [row for row in rows if row["saved"]]
+
+        result = {"status": 0, "msg": "ok", "rows": rows}
+    else:
+        result = {"status": 1, "msg": query_result.error}
+
+    # 关闭连接
+    query_engine.close()
+    return HttpResponse(
+        json.dumps(result, cls=ExtendJSONEncoder, bigint_as_string=True),
+        content_type="application/json",
+    )
+
+def create_instance_user(self, **kwargs):
+        """实例账号管理功能，创建实例账号"""
+        # escape
+        user = self.escape_string(kwargs.get("user", ""))
+        host = self.escape_string(kwargs.get("host", ""))
+        password1 = self.escape_string(kwargs.get("password1", ""))
+        remark = kwargs.get("remark", "")
+        # 在一个事务内执行
+        hosts = host.split("|")
+        create_user_cmd = ""
+        accounts = []
+        for host in hosts:
+            create_user_cmd += (
+                f"create user '{user}'@'{host}' identified by '{password1}';"
+            )
+            accounts.append(
+                {
+                    "instance": self.instance,
+                    "user": user,
+                    "host": host,
+                    "password": password1,
+                    "remark": remark,
+                }
+            )
+        exec_result = self.execute(db_name="mysql", sql=create_user_cmd)
+        exec_result.rows = accounts
+        return exec_result
\ No newline at end of file
diff --git a/sql/templates/sqlreview.html b/sql/templates/sqlreview.html
new file mode 100644
index 0000000..8c5b85e
--- /dev/null
+++ b/sql/templates/sqlreview.html
@@ -0,0 +1,1024 @@
+{% extends "base.html" %}
+
+
+
+{% block content %}
+
+    <!-- 表格-->
+    <div class="table-responsive">
+        <table id="user-list" data-toggle="table" class="table table-striped table-hover"
+               style="table-layout:inherit;overflow:hidden;text-overflow:ellipsis;">
+        </table>
+    </div>
+    <!-- 创建账号模态框 -->
+    <div class="modal fade" id="create-account" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title">创建账号</h4>
+                    <h6 style="color:red">注：新创建的账号无权限，需要使用授权功能授予相关权限</h6>
+                </div>
+                <div class="modal-body form-group">
+                    <!-- 数据库名称 -->
+                    <div class="form-group row" id="db-name1-row">
+                        <label for="db_name1" class="col-sm-3 col-form-label">
+                            <span style="color:red">*</span>数据库</label>
+                        <div class="col-sm-9">
+                            <select id="db_name1" class="form-control selectpicker" name="db_name1"
+                                    title="请选择数据库"
+                                    data-live-search="true">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="user" class="col-sm-3 col-form-label">
+                            <span style="color:red">*</span>数据库账号</label>
+                        <div class="col-sm-9">
+                            <input type="text" id="user" class="form-control" autocomplete="off"
+                                   aria-describedby="userHelpBlock"
+                                   placeholder="请输入账号名称">
+                            <small id="userHelpBlock" class="form-text text-muted">
+                                帐号名需要1-16个字符，由字母、数字和特殊字符组成；
+                            </small>
+                        </div>
+                    </div>
+                    <div class="form-group row" id="host-row">
+                        <label for="host" class="col-sm-3 col-form-label">
+                            <span style="color:red">*</span>主机</label>
+                        <div class="col-sm-9">
+                            <input type="text" id="host" class="form-control" autocomplete="new-password"
+                                   aria-describedby="hostHelpBlock"
+                                   placeholder="请输入主机">
+                            <small id="hostHelpBlock" class="form-text text-muted">
+                                1. IP形式，支持填入% <br>
+                                2. 多个主机以|分隔符分隔
+                            </small>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="password1" class="col-sm-3 col-form-label">
+                            <span style="color:red">*</span>密码</label>
+                        <div class="col-sm-9">
+                            <input type="password" id="password1" class="form-control" autocomplete="new-password"
+                                   aria-describedby="passwordHelpBlock"
+                                   placeholder="请输入密码">
+                            <small id="passwordHelpBlock" class="form-text text-muted">
+                                密码需要8-32个字符，至少包含英文、数字和特殊符号
+                            </small>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="password2" class="col-sm-3 col-form-label">
+                            <span style="color:red">*</span>确认密码</label>
+                        <div class="col-sm-9">
+                            <input type="password" id="password2" class="form-control"
+                                   autocomplete="new-password"
+                                   placeholder="请再次输入密码">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="remark" class="col-sm-3 col-form-label">备注</label>
+                        <div class="col-sm-9">
+                            <input type="text" id="remark" class="form-control"
+                                   autocomplete="off"
+                                   placeholder="请输入备注">
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+                    <button type="button" class="btn btn-primary" onclick="create_account()">创建</button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- 修改账号模态框 -->
+    <div class="modal fade" id="edit-account" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title">修改/录入账号 </h4>
+                    <h6 style="color:red">注：此操作不会修改账号密码，仅将相关信息录入平台进行管理，如需修改密码请使用改密功能</h6>
+                </div>
+                <div class="modal-body form-group">
+                    <!-- 数据库名称 -->
+                    <div class="form-group row" id="edit-db-name1-row">
+                        <label for="edit-db-name1" class="col-sm-3 col-form-label">
+                            <span style="color:red">*</span>数据库</label>
+                        <div class="col-sm-9">
+                            <select id="edit-db-name1" class="form-control selectpicker" name="edit_db_name1"
+                                    title="请选择数据库" disabled
+                                    data-live-search="true">
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="edit-user" class="col-sm-3 col-form-label">
+                            <span style="color:red">*</span>数据库账号</label>
+                        <div class="col-sm-9">
+                            <input type="text" id="edit-user" class="form-control" autocomplete="off"
+                                   readonly="readonly"
+                                   placeholder="请输入账号名称">
+                        </div>
+                    </div>
+                    <div class="form-group row" id="edit-host-row">
+                        <label for="edit-host" class="col-sm-3 col-form-label">
+                            <span style="color:red">*</span>主机</label>
+                        <div class="col-sm-9">
+                            <input type="text" id="edit-host" class="form-control" autocomplete="off"
+                                   readonly="readonly"
+                                   placeholder="请输入主机">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="edit-password1" class="col-sm-3 col-form-label">
+                            <span style="color:red">*</span>密码</label>
+                        <div class="col-sm-9">
+                            <input type="password" id="edit-password" class="form-control" autocomplete="new-password"
+                                   placeholder="请输入密码，留空则不修改录入信息">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="edit-remark" class="col-sm-3 col-form-label">备注</label>
+                        <div class="col-sm-9">
+                            <input type="text" id="edit-remark" class="form-control"
+                                   autocomplete="off"
+                                   placeholder="请输入备注">
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+                    <button type="button" class="btn btn-primary" id="resetEditBtn">修改/录入</button>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!-- 修改密码模态框 -->
+    <div class="modal fade" id="reset-pwd" tabindex="-1" role="dialog">
+        <div class="modal-dialog" role="document">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                            aria-hidden="true">&times;</span></button>
+                    <h4 class="modal-title">修改密码
+                        实例: <span id="reset-instance" style="color: red"></span>
+                        账号: <span id="reset-user" style="color: red"></span></h4>
+                    <h6 style="color:red">注：此操作会修改账号密码，同时变更平台录入信息，请谨慎操作</h6>
+                </div>
+                <div class="modal-body form-group">
+                    <div class="form-group row">
+                        <label for="password1" class="col-sm-3 col-form-label">
+                            <span style="color:red">*</span>密码</label>
+                        <div class="col-sm-9">
+                            <input type="password" id="reset-pwd1" class="form-control" autocomplete="new-password"
+                                   aria-describedby="resetpwdHelpBlock"
+                                   placeholder="请输入密码">
+                            <small id="resetpwdHelpBlock" class="form-text text-muted">
+                                密码需要8-32个字符，至少包含英文、数字和特殊符号
+                            </small>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <label for="password2" class="col-sm-3 col-form-label">
+                            <span style="color:red">*</span>确认密码</label>
+                        <div class="col-sm-9">
+                            <input type="password" id="reset-pwd2" class="form-control"
+                                   autocomplete="new-password"
+                                   placeholder="请再次输入密码">
+                        </div>
+                    </div>
+                </div>
+                <div class="modal-footer">
+                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
+                    <button type="button" class="btn btn-danger" id="resetPwdBtn">修改</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
+{% endblock content %}
+{% block js %}
+    {% load static %}
+    <script src="{% static 'bootstrap-table/js/bootstrap-table-export.min.js' %}"></script>
+    <script src="{% static 'bootstrap-table/js/tableExport.min.js' %}"></script>
+    <script>
+        function get_db_type() {
+            // 获取选中的数据库实例的类型
+            let db_type = "";
+            if ($("#instance").val()) {
+                db_type = $("#instance")[0].options[$("#instance")[0].selectedIndex].getAttribute("instance-type");
+            }
+            return db_type;
+        }
+
+        // 打开创建modal
+        function show_create_modal() {
+            const db_type = get_db_type();
+            // 根据数据库类型显示不同的form row
+            if (db_type === 'mysql') {
+                $("#db-name1-row").hide();
+                $("#host-row").show();
+            } else if (db_type === 'mongo') {
+                $("#db-name1-row").show();
+                $("#host-row").hide();
+            }
+            $("#create-account").modal('show');
+        }
+
+        //权限切换
+        $("#priv-type").change(function () {
+            let priv_type = $("#priv-type").val();
+            let db_name = $("#db_name");
+            let tb_name = $("#tb_name");
+            let col_name = $("#col_name");
+            if (priv_type === '0') {
+                $("#div-global-priv").show();
+                $("#div-db-priv").hide();
+                $("#div-tb-priv").hide();
+                $("#div-col-priv").hide();
+                $("#div-db").hide();
+                $("#div-tb").hide();
+                $("#div-col").hide();
+            } else if (priv_type === '1') {
+                $("#div-global-priv").hide();
+                $("#div-db-priv").show();
+                $("#div-tb-priv").hide();
+                $("#div-col-priv").hide();
+                $("#div-db").show();
+                $("#div-tb").hide();
+                $("#div-col").hide();
+                // 库多选
+                db_name.attr("multiple", "true");
+                db_name.selectpicker('destroy');
+                db_name.val('');
+                db_name.selectpicker({
+                    actionsBox: true, //在下拉选项添加选中所有和取消选中的按钮
+                    countSelectedText: "已选中{0}项",
+                    selectedTextFormat: "count > 3"
+                }, 'refresh');
+            } else if (priv_type === '2') {
+                $("#div-global-priv").hide();
+                $("#div-db-priv").hide();
+                $("#div-tb-priv").show();
+                $("#div-col-priv").hide();
+                $("#div-db").show();
+                $("#div-tb").show();
+                $("#div-col").hide();
+                // 库单选
+                db_name.removeAttr("multiple");
+                db_name.selectpicker('destroy');
+                db_name.val('');
+                db_name.selectpicker('refresh');
+                // 表多选
+                tb_name.attr("multiple", "true");
+                tb_name.selectpicker('destroy');
+                tb_name.val('');
+                tb_name.selectpicker({
+                    actionsBox: true, //在下拉选项添加选中所有和取消选中的按钮
+                    countSelectedText: "已选中{0}项",
+                    selectedTextFormat: "count > 3"
+                }, 'refresh');
+            } else if (priv_type === '3') {
+                $("#div-global-priv").hide();
+                $("#div-db-priv").hide();
+                $("#div-tb-priv").hide();
+                $("#div-col-priv").show();
+                $("#div-db").show();
+                $("#div-tb").show();
+                $("#div-col").show();
+                // 库单选
+                db_name.removeAttr("multiple");
+                db_name.selectpicker('destroy');
+                db_name.val('');
+                db_name.selectpicker('refresh');
+                // 表单选
+                tb_name.removeAttr("multiple");
+                tb_name.selectpicker('destroy');
+                tb_name.val('');
+                tb_name.selectpicker('refresh');
+                // 列多选
+                col_name.attr("multiple", "true");
+                col_name.selectpicker('destroy');
+                col_name.val('');
+                col_name.selectpicker({
+                    actionsBox: true, //在下拉选项添加选中所有和取消选中的按钮
+                    countSelectedText: "已选中{0}项",
+                    selectedTextFormat: "count > 3"
+                }, 'refresh');
+            }
+        });
+
+        // 根据数据库类型获取显示的字段
+        function get_db_columns(db_type) {
+            switch (db_type) {
+                case 'mysql':
+                    return [
+                        {
+                            title: '账号',
+                            field: 'user_host',
+                            formatter: function (value, row, index) {
+                                if (row.saved) {
+                                    return "<a target=\"_blank\" href=\"/admin/sql/instanceaccount/" + row.id + "/change/\">" + value + "</a>"
+                                } else {
+                                    return value
+                                }
+                            }
+                        }, {
+                            title: '帐号名',
+                            field: 'user',
+                            visible: false
+                        }, {
+                            title: '主机',
+                            field: 'host',
+                            visible: false
+                        }, {
+                            title: '权限',
+                            field: 'privileges',
+                            formatter: function (value, row, index) {
+                                var priv = '';
+                                for (var i = 0; i < value.length; i++) {
+                                    priv = priv + value[i] + ';</br>'
+                                }
+                                return priv
+                            },
+                            width: "60",
+                            widthUnit: "%",
+                        }, {
+                            title: '备注',
+                            field: 'remark'
+                        }, {
+                            title: '操作',
+                            field: '',
+                            formatter: function (value, row, index) {
+                                let btn_edit = "<button class=\"btn btn-info btn-xs\" user_host=\"" + row.user_host + "\" onclick=\"show_edit_modal(this)" + "\">编辑</button>\n";
+                                let btn_modify_grants = "<button class=\"btn btn-primary btn-xs\" user_host=\"" + row.user_host + "\" onclick=\"show_grants_modal(this)" + "\">授权</button>\n";
+                                let btn_reset_passwd = "<button class=\"btn btn-warning btn-xs\" user_host=\"" + row.user_host + "\" onclick=\"show_reset_modal(this)" + "\">改密</button>\n";
+                                let btn_del_account = "<button class=\"btn btn-danger btn-xs\" user_host=\"" + row.user_host + "\" onclick=\"show_delete_modal(this)" + "\">删除</button>\n";
+                                let btn_lock_account = "";
+                                if (row.is_locked === 'N') {
+                                    btn_lock_account = "<button class=\"btn btn-danger btn-xs\" user_host=\"" + row.user_host + "\" is_locked=\"" + row.is_locked + "\" onclick=\"show_lock_modal(this)" + "\">锁定</button>\n";
+                                } else if (row.is_locked === 'Y') {
+                                    btn_lock_account = "<button class=\"btn btn-success btn-xs\" user_host=\"" + row.user_host + "\" is_locked=\"" + row.is_locked + "\"  onclick=\"show_lock_modal(this)" + "\">解锁</button>\n";
+                                }
+                                return btn_edit + btn_modify_grants + btn_reset_passwd + btn_lock_account + btn_del_account
+                            }
+                        }]
+                case 'mongo':
+                    return [
+                        {
+                            title: '数据库名',
+                            field: 'db_name'
+                        }, {
+                            title: '账号',
+                            field: 'user',
+                            formatter: function (value, row, index) {
+                                if (row.saved) {
+                                    return "<a target=\"_blank\" href=\"/admin/sql/instanceaccount/" + row.id + "/change/\">" + value + "</a>"
+                                } else {
+                                    return value
+                                }
+                            }
+                        }, {
+                            title: '角色',
+                            field: 'roles',
+                            formatter: function (value, row, index) {
+                                return value.join(',')
+                            }
+                        }, {
+                            title: '备注',
+                            field: 'remark'
+                        }, {
+                            title: '操作',
+                            field: '',
+                            formatter: function (value, row, index) {
+                                let btn_edit = "<button class=\"btn btn-info btn-xs\" db_name_user=\"" + row.db_name_user + "\" onclick=\"show_edit_modal(this)" + "\">编辑</button>\n";
+                                let btn_modify_grants = "<button class=\"btn btn-primary btn-xs\" db_name_user=\"" + row.db_name_user + "\" onclick=\"show_grants_modal(this)" + "\">授权</button>\n";
+                                let btn_reset_passwd = "<button class=\"btn btn-warning btn-xs\" db_name_user=\"" + row.db_name_user + "\" onclick=\"show_reset_modal(this)" + "\">改密</button>\n";
+                                let btn_del_account = "<button class=\"btn btn-danger btn-xs\" db_name_user=\"" + row.db_name_user + "\" onclick=\"show_delete_modal(this)" + "\">删除</button>\n";
+                                return btn_edit + btn_modify_grants + btn_reset_passwd + btn_del_account
+                            }
+                        }
+                    ]
+                default:
+                    return []
+            }
+        }
+
+        //获取账号列表
+        function user_list() {
+            const db_type = get_db_type();
+            let uniqueId;
+            if (db_type === 'mysql') {
+                uniqueId = 'user_host';
+            } else if (db_type === 'mongo') {
+                uniqueId = 'db_name_user';
+            }
+            //初始化table
+            $('#user-list').bootstrapTable('destroy').bootstrapTable({
+                escape: false,
+                method: 'post',
+                contentType: "application/x-www-form-urlencoded",
+                url: "/instance/user/list",
+                striped: true,                      //是否显示行间隔色
+                cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
+                pagination: true,                   //是否显示分页（*）
+                sortable: true,                     //是否启用排序
+                sortOrder: "asc",                   //排序方式
+                sidePagination: "client",           //分页方式：client客户端分页，server服务端分页（*）
+                pageNumber: 1,                      //初始化加载第一页，默认第一页,并记录
+                pageSize: 14,                     //每页的记录行数（*）
+                pageList: [20, 30, 50, 100],       //可供选择的每页的行数（*）
+                showExport: true,                   //是否显示导出按钮
+                exportOptions: {
+                    fileName: 'instance_user'  //文件名称设置
+                },
+                search: true,                      //是否显示表格搜索
+                strictSearch: false,                //是否全匹配搜索
+                showColumns: true,                  //是否显示所有的列（选择显示的列）
+                showRefresh: true,                  //是否显示刷新按钮
+                minimumCountColumns: 2,             //最少允许的列数
+                clickToSelect: true,                //是否启用点击选中行
+                uniqueId: uniqueId,               //每一行的唯一标识，一般为主键列
+                showToggle: true,                   //是否显示详细视图和列表视图的切换按钮
+                cardView: false,                    //是否显示详细视图
+                detailView: false,                  //是否显示父子表
+                locale: 'zh-CN',                    //本地化
+                toolbar: "#toolbar",               //指明自定义的toolbar
+                queryParamsType: 'limit',
+                //请求服务数据时所传参数
+                queryParams:
+                    function (params) {
+                        if ($("#instance").val()) {
+                            return {
+                                search: params.search,
+                                instance_id: $("#instance").val(),
+                                saved: $("#saved").val()
+                            }
+                        }
+                    },
+                columns: get_db_columns(db_type),
+                onLoadSuccess: function (data) {
+                    if (data.status !== 0) {
+                        alert("数据加载失败！" + data.msg);
+                        $('#btn-create-account').addClass('disabled');
+                        $('#btn-create-account').prop('disabled', true);
+                    } else if ($("#instance").val()) {
+                        $("#btn-create-account").removeClass('disabled');
+                        $("#btn-create-account").prop('disabled', false);
+
+                    }
+                },
+                onLoadError: onLoadErrorCallback,
+                onSearch: function (e) {
+                    //传搜索参数给服务器
+                    queryParams(e)
+                }
+            });
+
+        }
+
+        //获取实例数据库
+        function db_list() {
+            $.ajax({
+                type: "get",
+                url: "/instance/instance_resource/",
+                dataType: "json",
+                data: {
+                    instance_id: $("#instance").val(),
+                    resource_type: "database"
+                },
+                complete: function () {
+                },
+                success: function (data) {
+                    if (data.status === 0) {
+                        let result = data.data;
+                        let db_name = $("#db_name");
+                        let db_name1 = $("#db_name1");
+                        let edit_db_name1 = $("#edit-db-name1");
+                        db_name.empty();
+                        db_name1.empty();
+                        edit_db_name1.empty();
+                        for (var i = 0; i < result.length; i++) {
+                            var name = "<option value=\"" + result[i] + "\">" + result[i] + "</option>";
+                            db_name.append(name);
+                            db_name1.append(name);
+                            edit_db_name1.append(name);
+                        }
+                        db_name.val('');
+                        db_name.selectpicker('render');
+                        db_name.selectpicker('refresh');
+                        db_name1.val('');
+                        db_name1.selectpicker('render');
+                        db_name1.selectpicker('refresh');
+                        edit_db_name1.val('');
+                        edit_db_name1.selectpicker('render');
+                        edit_db_name1.selectpicker('refresh');
+                    } else {
+                        alert(data.msg);
+                    }
+                },
+                error: function (XMLHttpRequest, textStatus, errorThrown) {
+                    alert(errorThrown);
+                }
+            });
+        }
+
+        //获取表
+        function tb_list() {
+            $.ajax({
+                type: "get",
+                url: "/instance/instance_resource/",
+                dataType: "json",
+                data: {
+                    instance_id: $("#instance").val(),
+                    db_name: $("#db_name").val(),
+                    resource_type: "table"
+                },
+                complete: function () {
+                },
+                success: function (data) {
+                    if (data.status === 0) {
+                        let result = data.data;
+                        let tb_name = $("#tb_name");
+                        tb_name.empty();
+                        for (var i = 0; i < result.length; i++) {
+                            var name = "<option value=\"" + result[i] + "\">" + result[i] + "</option>";
+                            tb_name.append(name);
+                        }
+                        tb_name.val('');
+                        tb_name.selectpicker('render');
+                        tb_name.selectpicker('refresh');
+                    } else {
+                        alert(data.msg);
+                    }
+                },
+                error: function (XMLHttpRequest, textStatus, errorThrown) {
+                    alert(errorThrown);
+                }
+            });
+        }
+
+        //获取表
+        function col_list() {
+            $.ajax({
+                type: "get",
+                url: "/instance/instance_resource/",
+                dataType: "json",
+                data: {
+                    instance_id: $("#instance").val(),
+                    db_name: $("#db_name").val(),
+                    tb_name: $("#tb_name").val(),
+                    resource_type: "column"
+                },
+                complete: function () {
+                },
+                success: function (data) {
+                    if (data.status === 0) {
+                        let result = data.data;
+                        let col_name = $("#col_name");
+                        col_name.empty();
+                        for (var i = 0; i < result.length; i++) {
+                            var name = "<option value=\"" + result[i] + "\">" + result[i] + "</option>";
+                            col_name.append(name);
+                        }
+                        col_name.val('');
+                        col_name.selectpicker('render');
+                        col_name.selectpicker('refresh');
+                    } else {
+                        alert(data.msg);
+                    }
+                },
+                error: function (XMLHttpRequest, textStatus, errorThrown) {
+                    alert(errorThrown);
+                }
+            });
+        }
+
+        // 选项变动
+        $("#saved").change(function () {
+            user_list();
+            if ($("#instance").val()) {
+                db_list();
+            }
+        });
+
+        //实例变动
+        $("#instance").change(function () {
+            user_list();
+            if ($("#instance").val()) {
+                let ins_name = $("#instance option:selected").text();
+                $("#modify-instance").text(ins_name);
+                $("#reset-instance").text(ins_name);
+                $("#lock-instance").text(ins_name);
+                $("#delete-instance").text(ins_name);
+                db_list();
+            }
+        });
+
+        //数据库变动
+        $("#db_name").change(function () {
+            let priv_type = $("#priv-type").val();
+            if (priv_type === '2' || priv_type === '3') {
+                tb_list();
+            }
+        });
+
+        //表变动
+        $("#tb_name").change(function () {
+            let priv_type = $("#priv-type").val();
+            if (priv_type === '3') {
+                col_list();
+            }
+        });
+
+        //创建账号
+        function create_account() {
+            if (!$("#instance").val()) {
+                alert("请选择实例！");
+            } else {
+                $.ajax({
+                    type: "post",
+                    url: "/instance/user/create/",
+                    dataType: "json",
+                    data: {
+                        instance_id: $("#instance").val(),
+                        db_name: $("#db_name1").val(),
+                        user: $("#user").val(),
+                        host: $("#host").val(),
+                        password1: $("#password1").val(),
+                        password2: $("#password2").val(),
+                        remark: $("#remark").val()
+                    },
+                    complete: function () {
+                    },
+                    success: function (data) {
+                        if (data.status === 0) {
+                            $('#create-account').modal('hide');
+                            $("#create-account input").val("");
+                            user_list()
+                        } else {
+                            alert(data.msg);
+                        }
+                    },
+                    error: function (XMLHttpRequest, textStatus, errorThrown) {
+                        alert(errorThrown);
+                    }
+                });
+            }
+
+        }
+
+        //编辑、录入账号
+        function show_edit_modal(obj) {
+            const db_type = get_db_type();
+            let user_host;
+            let db_name_user;
+            let row_data;
+            if (db_type === 'mysql') {
+                user_host = $(obj).attr("user_host");
+                row_data = $('#user-list').bootstrapTable('getRowByUniqueId', user_host);
+                $("#edit-db-name1-row").hide();
+                $("#edit-host-row").show();
+            } else {
+                db_name_user = $(obj).attr("db_name_user");
+                row_data = $('#user-list').bootstrapTable('getRowByUniqueId', db_name_user);
+                $("#edit-db-name1-row").show();
+                $("#edit-host-row").hide();
+            }
+
+            let user = row_data['user'];
+            let db_name = row_data['db_name'];
+            let host = row_data['host'];
+            let remark = row_data['remark'];
+            $("#edit-db-name1").val(db_name);
+            $('#edit-db-name1').selectpicker('render').selectpicker('refresh');
+            $("#edit-user").val(user);
+            $("#edit-host").val(host);
+            $("#edit-remark").val(remark);
+            $("#edit-account").modal('show');
+
+            //变更密码
+            $("#resetEditBtn").unbind("click").click(function () {
+                $.ajax({
+                    type: "post",
+                    url: "/instance/user/edit/",
+                    dataType: "json",
+                    data: {
+                        instance_id: $("#instance").val(),
+                        user_host: user_host,
+                        user: user,
+                        host: host,
+                        db_name: db_name,
+                        db_name_user: db_name_user,
+                        password: $("#edit-password").val(),
+                        remark: $("#edit-remark").val()
+                    },
+                    complete: function () {
+                    },
+                    success: function (data) {
+                        if (data.status === 0) {
+                            $('#edit-account').modal('hide');
+                            $("#edit-account input").val("");
+                            user_list()
+                        } else {
+                            alert(data.msg);
+                        }
+                    },
+                    error: function (XMLHttpRequest, textStatus, errorThrown) {
+                        alert(errorThrown);
+                    }
+                });
+            });
+        }
+
+        //修改权限
+        function show_grants_modal(obj) {
+            const db_type = get_db_type();
+            let user_host;
+            let db_name_user;
+            if (db_type === 'mysql') {
+                $("#grants-modal").children().addClass("modal-lg");
+                $("#mysql-grant-content").show();
+                $("#mongo-grant-content").hide();
+                user_host = $(obj).attr("user_host");
+                $("#modify-user").text(user_host);
+            } else if (db_type === 'mongo') {
+                $("#grants-modal").children().removeClass("modal-lg");
+                $("#mongo-grant-content").show();
+                $("#mysql-grant-content").hide();
+                db_name_user = $(obj).attr("db_name_user");
+                $("#modify-user").text(db_name_user);
+                let row_data = $('#user-list').bootstrapTable('getRowByUniqueId', db_name_user);
+                $("#db-roles").val(row_data['roles']);
+                $("#db-roles").selectpicker('render').selectpicker('refresh');
+            }
+            $("#grants-modal").modal('show');
+
+            //变更账号权限
+            $("#grantsBtn").unbind("click").click(function () {
+                let data;
+                if (db_type == 'mysql') {
+                    let op_type = $("#op-type").val();
+                    let priv_type = $("#priv-type").val();
+                    let db_name = $("#db_name").val();
+                    let tb_name = $("#tb_name").val();
+                    let col_name = $("#col_name").val();
+                    let div_global_priv = $("#div-global-priv");
+                    let div_db_priv = $("#div-db-priv");
+                    let div_tb_priv = $("#div-tb-priv");
+                    let div_col_priv = $("#div-col-priv");
+                    let global_privs = [];
+                    let db_privs = [];
+                    let tb_privs = [];
+                    let col_privs = [];
+                    div_global_priv.find('input[type="checkbox"]:checked').each(
+                        function () {
+                            let priv_name = $(this).attr("name");
+                            global_privs.push(priv_name);
+                        }
+                    );
+                    div_db_priv.find('input[type="checkbox"]:checked').each(
+                        function () {
+                            let priv_name = $(this).attr("name");
+                            db_privs.push(priv_name);
+                        }
+                    );
+                    div_tb_priv.find('input[type="checkbox"]:checked').each(
+                        function () {
+                            let priv_name = $(this).attr("name");
+                            tb_privs.push(priv_name);
+                        }
+                    );
+                    div_col_priv.find('input[type="checkbox"]:checked').each(
+                        function () {
+                            let priv_name = $(this).attr("name");
+                            col_privs.push(priv_name);
+                        }
+                    );
+                    let privs = {
+                        "global_privs": global_privs,
+                        "db_privs": db_privs,
+                        "tb_privs": tb_privs,
+                        "col_privs": col_privs
+                    };
+                    data = {
+                        instance_id: $("#instance").val(),
+                        user_host: $("#modify-user").text(),
+                        op_type: op_type,
+                        priv_type: priv_type,
+                        privs: JSON.stringify(privs),
+                        db_name: db_name,
+                        tb_name: tb_name,
+                        col_name: col_name
+                    }
+                } else if (db_type == 'mongo') {
+                    data = {
+                        instance_id: $("#instance").val(),
+                        db_name_user: db_name_user,
+                        roles: $("#db-roles").val()
+                    }
+                }
+
+                $.ajax({
+                    type: "post",
+                    url: "/instance/user/grant/",
+                    dataType: "json",
+                    data: data,
+                    complete: function () {
+                    },
+                    success: function (data) {
+                        if (data.status === 0) {
+                            $('#grants-modal').modal('hide');
+                            $(":checkbox").each(function () {
+                                this.checked = false
+                            });
+                            $("#priv-type").val("0");
+                            $("#op-type").val("0");
+                            $("#priv-type").trigger("change");
+                            $("#op-type").trigger("change");
+                            user_list()
+                        } else {
+                            alert(data.msg);
+                        }
+                    },
+                    error: function (XMLHttpRequest, textStatus, errorThrown) {
+                        alert(errorThrown);
+                    }
+                });
+            });
+        }
+
+        //变更密码
+        function show_reset_modal(obj) {
+            const db_type = get_db_type();
+            let user_host;
+            let db_name_user;
+            let row_data;
+            if (db_type === 'mysql') {
+                user_host = $(obj).attr("user_host");
+                row_data = $('#user-list').bootstrapTable('getRowByUniqueId', user_host);
+                $("#reset-user").text(user_host);
+            } else {
+                db_name_user = $(obj).attr("db_name_user");
+                row_data = $('#user-list').bootstrapTable('getRowByUniqueId', db_name_user);
+                $("#reset-user").text(db_name_user);
+            }
+
+            $("#reset-pwd").modal('show');
+
+            //变更密码
+            $("#resetPwdBtn").unbind("click").click(function () {
+                $.ajax({
+                    type: "post",
+                    url: "/instance/user/reset_pwd/",
+                    dataType: "json",
+                    data: {
+                        instance_id: $("#instance").val(),
+                        ...row_data,
+                        reset_pwd1: $("#reset-pwd1").val(),
+                        reset_pwd2: $("#reset-pwd2").val(),
+                    },
+                    complete: function () {
+                    },
+                    success: function (data) {
+                        if (data.status === 0) {
+                            $('#reset-pwd').modal('hide');
+                            $("#reset-pwd input").val("");
+                            user_list()
+                        } else {
+                            alert(data.msg);
+                        }
+                    },
+                    error: function (XMLHttpRequest, textStatus, errorThrown) {
+                        alert(errorThrown);
+                    }
+                });
+            });
+        }
+
+        //锁定or解锁账号
+        function show_lock_modal(obj) {
+            let user_host = $(obj).attr("user_host");
+            let is_locked = $(obj).attr("is_locked");
+            let operation = $(obj).text();
+            $("#lock-user").text(user_host);
+            $("#lock-title").text(operation + "账号")
+            $("#lock-text").text("确认" + operation + "该账号？")
+            $("#lock-account").modal('show');
+
+            $("#lockBtn").unbind("click").click(function () {
+                $.ajax({
+                    type: "post",
+                    url: "/instance/user/lock/",
+                    dataType: "json",
+                    data: {
+                        instance_id: $("#instance").val(),
+                        user_host: user_host,
+                        is_locked: is_locked,
+                    },
+                    complete: function () {
+                    },
+                    success: function (data) {
+                        if (data.status === 0) {
+                            $('#lock-account').modal('hide');
+                            user_list()
+                        } else {
+                            alert(data.msg);
+                        }
+                    },
+                    error: function (XMLHttpRequest, textStatus, errorThrown) {
+                        alert(errorThrown);
+                    }
+                });
+            });
+        }
+
+        //删除账号
+        function show_delete_modal(obj) {
+            const db_type = get_db_type();
+            let user_host;
+            let db_name_user;
+            let row_data;
+            if (db_type === 'mysql') {
+                user_host = $(obj).attr("user_host");
+                row_data = $('#user-list').bootstrapTable('getRowByUniqueId', user_host);
+                $("#delete-user").text(user_host);
+            } else {
+                db_name_user = $(obj).attr("db_name_user");
+                row_data = $('#user-list').bootstrapTable('getRowByUniqueId', db_name_user);
+                $("#delete-user").text(db_name_user);
+            }
+
+            $("#delete-account").modal('show');
+
+            $("#deleteBtn").unbind("click").click(function () {
+                $.ajax({
+                    type: "post",
+                    url: "/instance/user/delete/",
+                    dataType: "json",
+                    data: {
+                        instance_id: $("#instance").val(),
+                        ...row_data,
+                    },
+                    complete: function () {
+                    },
+                    success: function (data) {
+                        if (data.status === 0) {
+                            $('#delete-account').modal('hide');
+                            user_list()
+                        } else {
+                            alert(data.msg);
+                        }
+                    },
+                    error: function (XMLHttpRequest, textStatus, errorThrown) {
+                        alert(errorThrown);
+                    }
+                });
+            });
+
+
+        }
+
+        //初始化数据
+        $(document).ready(function () {
+            user_list();
+            //获取账号实例列表
+            $(function () {
+                $.ajax({
+                    type: "get",
+                    url: "/group/user_all_instances/",
+                    dataType: "json",
+                    data: {
+                        db_type: ['mysql', 'mongo']
+                    },
+                    complete: function () {
+                    },
+                    success: function (data) {
+                        if (data.status === 0) {
+                            let result = data['data'];
+                            $("optgroup[id^='optgroup']").empty();
+                            const supportDb = ['mysql', 'mongo']
+                            for (let i of result) {
+                                let instance = "<option value=\"" + i.id + "\" instance-id=" + i.id + " instance-type=" + i.db_type + ">" + i.instance_name + "</option>";
+                                if (supportDb.indexOf(i.db_type) !== -1) {
+                                    $("#optgroup-" + i.db_type).append(instance);
+                                }
+                            }
+                            $('#instance').selectpicker('render').selectpicker('refresh');
+                        } else {
+                            alert(data.msg);
+                        }
+                    },
+                    error: function (XMLHttpRequest, textStatus, errorThrown) {
+                        alert(errorThrown);
+                    }
+                });
+            });
+        });
+    </script>
+{% endblock %}

From 864c490b7fd85cc9bc61b24116b7ce758b69dac9 Mon Sep 17 00:00:00 2001
From: Grain-Yu <justbeafreeman@outlook.com>
Date: Fri, 24 Nov 2023 17:35:15 +0800
Subject: [PATCH 03/10] draft.

---
 sql/engines/mysql.py         |  38 ++
 sql/manual_review.py         |  94 ++--
 sql/templates/slowquery.html |   2 +-
 sql/templates/sqlreview.html | 920 ++---------------------------------
 sql/urls.py                  |   3 +
 5 files changed, 120 insertions(+), 937 deletions(-)

diff --git a/sql/engines/mysql.py b/sql/engines/mysql.py
index 7ab5cfe..13898e5 100644
--- a/sql/engines/mysql.py
+++ b/sql/engines/mysql.py
@@ -872,3 +872,41 @@ def close(self):
         if self.conn:
             self.conn.close()
             self.conn = None
+
+    def get_review_status_summary(self, checksum):
+        """sql优化详情功能，获取checksum对应的sql优化详情"""
+        sql_review_summary = f"""select reviewed_by,reviewed_on,comments,reviewed_status from archery.mysql_slow_query_review where checksum='{checksum}';"""
+        query_result = self.query("mysql", sql_review_summary)
+        if not query_result.error:
+            review_summary = query_result.rows
+            rows = []
+            row = {
+                "checksum": checksum,
+                "reviewed_by": review_summary[0],
+                "reviewed_on": review_summary[1],
+                "comments": review_summary[2],
+                "reviewed_status": review_summary[3],
+            }
+            rows.append(row)
+        query_result.rows = rows
+        self.close()
+        return query_result
+
+    def set_review_details(self, checksum):
+        """sql优化详情功能，获取checksum对应的sql优化详情"""
+        sql_review_summary = f"""select reviewed_by,reviewed_on,comments,reviewed_status from archery.mysql_slow_query_review where checksum='{checksum}';"""
+        query_result = self.query("mysql", sql_review_summary)
+        if not query_result.error:
+            review_summary = query_result.rows
+            rows = []
+            row = {
+                "checksum": checksum,
+                "reviewed_by": review_summary[0],
+                "reviewed_on": review_summary[1],
+                "comments": review_summary[2],
+                "reviewed_status": review_summary[3],
+            }
+            rows.append(row)
+        query_result.rows = rows
+        self.close()
+        return query_result
\ No newline at end of file
diff --git a/sql/manual_review.py b/sql/manual_review.py
index a88e907..fbc2352 100644
--- a/sql/manual_review.py
+++ b/sql/manual_review.py
@@ -35,8 +35,11 @@
 from sql.utils.resource_group import user_instances
 from .models import Instance, InstanceAccount
 
+from sql.engines.mysql import get_review_status_summary
+from sql.engines.mysql import set_review_details
+
 @permission_required("sql.menu_instance_account", raise_exception=True)
-def sqllist(request):
+def listreview(request):
     """获取优化详情列表"""
     checksum = request.POST.get("review_checksum")
 
@@ -45,72 +48,49 @@ def sqllist(request):
     try:
         instance = user_instances(
             request.user, db_type=SUPPORTED_MANAGEMENT_DB_TYPE
-        ).get(instance_name='archery')
+        ).get(id=1)
     except Instance.DoesNotExist:
         return JsonResponse({"status": 1, "msg": "你所在组未关联该实例", "data": []})
-    
-
-
-
-    
 
-    # 获取已录入用户
-    cnf_users = dict()
-    for user in InstanceAccount.objects.filter(instance=instance).values(
-        "id", "user", "host", "db_name", "remark"
-    ):
-        user["saved"] = True
-        cnf_users[get_instanceaccount_unique_value(instance.db_type, user)] = user
-    # 获取所有用户
+    #获取checksum对应的优化详情
     query_engine = get_engine(instance=instance)
-    query_result = query_engine.get_instance_users_summary()
+    query_result = query_engine.get_review_status_summary(checksum)
     if not query_result.error:
-        rows = []
-        key = get_instanceaccount_unique_key(db_type=instance.db_type)
-        for row in query_result.rows:
-            # 合并数据
-            if row[key] in cnf_users.keys():
-                row = dict(row, **cnf_users[row[key]])
-            rows.append(row)
-        # 过滤参数
-        if saved:
-            rows = [row for row in rows if row["saved"]]
-
+        rows = query_result.rows
         result = {"status": 0, "msg": "ok", "rows": rows}
     else:
         result = {"status": 1, "msg": query_result.error}
-
-    # 关闭连接
-    query_engine.close()
     return HttpResponse(
         json.dumps(result, cls=ExtendJSONEncoder, bigint_as_string=True),
         content_type="application/json",
     )
 
-def create_instance_user(self, **kwargs):
-        """实例账号管理功能，创建实例账号"""
-        # escape
-        user = self.escape_string(kwargs.get("user", ""))
-        host = self.escape_string(kwargs.get("host", ""))
-        password1 = self.escape_string(kwargs.get("password1", ""))
-        remark = kwargs.get("remark", "")
-        # 在一个事务内执行
-        hosts = host.split("|")
-        create_user_cmd = ""
-        accounts = []
-        for host in hosts:
-            create_user_cmd += (
-                f"create user '{user}'@'{host}' identified by '{password1}';"
-            )
-            accounts.append(
-                {
-                    "instance": self.instance,
-                    "user": user,
-                    "host": host,
-                    "password": password1,
-                    "remark": remark,
-                }
-            )
-        exec_result = self.execute(db_name="mysql", sql=create_user_cmd)
-        exec_result.rows = accounts
-        return exec_result
\ No newline at end of file
+@permission_required("sql.instance_account_manage", raise_exception=True)
+def editreview(request):
+    """编辑优化详情"""
+    checksum = request.POST.get("checksum")
+    reviewed_by = request.POST.get("reviewed_by", "")
+    reviewed_on = request.POST.get("reviewed_on", "")
+    comments = request.POST.get("comments", "")
+    reviewed_status = request.POST.get("reviewed_status", "")
+
+    if (
+         not all([checksum, reviewed_by, reviewed_on, comments,reviewed_status])
+    ):
+        return JsonResponse({"status": 1, "msg": "参数不完整，请确认后提交", "data": []})
+
+    try:
+        instance = user_instances(
+            request.user, db_type=SUPPORTED_MANAGEMENT_DB_TYPE
+        ).get(id=1)
+    except Instance.DoesNotExist:
+        return JsonResponse({"status": 1, "msg": "你所在组未关联该实例", "data": []})
+    
+    exec_engine = get_engine(instance=instance)    
+    exec_result = exec_engine.set_review_details(
+        checksum=checksum, reviewed_by=reviewed_by, reviewed_on=reviewed_on,comments=comments,reviewed_status=reviewed_status
+    )
+    # 关闭连接
+    engine.close()
+
+    return JsonResponse({"status": 0, "msg": "", "data": []})
diff --git a/sql/templates/slowquery.html b/sql/templates/slowquery.html
index 5d01e27..2e89862 100644
--- a/sql/templates/slowquery.html
+++ b/sql/templates/slowquery.html
@@ -283,7 +283,7 @@
                     sessionStorage.setItem('review_db_name', review_db_name);
                     sessionStorage.setItem('review_instance_name', review_instance_name);
                     sessionStorage.setItem('review_checksum', review_checksum);
-                    location.href = '/slowquery_review/';
+                    location.href = '/sqlreview/';
                 } else {
                     alert("请先选择需要优化的sql")
                 }
diff --git a/sql/templates/sqlreview.html b/sql/templates/sqlreview.html
index 8c5b85e..bcb2fc9 100644
--- a/sql/templates/sqlreview.html
+++ b/sql/templates/sqlreview.html
@@ -10,154 +10,6 @@
                style="table-layout:inherit;overflow:hidden;text-overflow:ellipsis;">
         </table>
     </div>
-    <!-- 创建账号模态框 -->
-    <div class="modal fade" id="create-account" tabindex="-1" role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title">创建账号</h4>
-                    <h6 style="color:red">注：新创建的账号无权限，需要使用授权功能授予相关权限</h6>
-                </div>
-                <div class="modal-body form-group">
-                    <!-- 数据库名称 -->
-                    <div class="form-group row" id="db-name1-row">
-                        <label for="db_name1" class="col-sm-3 col-form-label">
-                            <span style="color:red">*</span>数据库</label>
-                        <div class="col-sm-9">
-                            <select id="db_name1" class="form-control selectpicker" name="db_name1"
-                                    title="请选择数据库"
-                                    data-live-search="true">
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label for="user" class="col-sm-3 col-form-label">
-                            <span style="color:red">*</span>数据库账号</label>
-                        <div class="col-sm-9">
-                            <input type="text" id="user" class="form-control" autocomplete="off"
-                                   aria-describedby="userHelpBlock"
-                                   placeholder="请输入账号名称">
-                            <small id="userHelpBlock" class="form-text text-muted">
-                                帐号名需要1-16个字符，由字母、数字和特殊字符组成；
-                            </small>
-                        </div>
-                    </div>
-                    <div class="form-group row" id="host-row">
-                        <label for="host" class="col-sm-3 col-form-label">
-                            <span style="color:red">*</span>主机</label>
-                        <div class="col-sm-9">
-                            <input type="text" id="host" class="form-control" autocomplete="new-password"
-                                   aria-describedby="hostHelpBlock"
-                                   placeholder="请输入主机">
-                            <small id="hostHelpBlock" class="form-text text-muted">
-                                1. IP形式，支持填入% <br>
-                                2. 多个主机以|分隔符分隔
-                            </small>
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label for="password1" class="col-sm-3 col-form-label">
-                            <span style="color:red">*</span>密码</label>
-                        <div class="col-sm-9">
-                            <input type="password" id="password1" class="form-control" autocomplete="new-password"
-                                   aria-describedby="passwordHelpBlock"
-                                   placeholder="请输入密码">
-                            <small id="passwordHelpBlock" class="form-text text-muted">
-                                密码需要8-32个字符，至少包含英文、数字和特殊符号
-                            </small>
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label for="password2" class="col-sm-3 col-form-label">
-                            <span style="color:red">*</span>确认密码</label>
-                        <div class="col-sm-9">
-                            <input type="password" id="password2" class="form-control"
-                                   autocomplete="new-password"
-                                   placeholder="请再次输入密码">
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label for="remark" class="col-sm-3 col-form-label">备注</label>
-                        <div class="col-sm-9">
-                            <input type="text" id="remark" class="form-control"
-                                   autocomplete="off"
-                                   placeholder="请输入备注">
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    <button type="button" class="btn btn-primary" onclick="create_account()">创建</button>
-                </div>
-            </div>
-        </div>
-    </div>
-    <!-- 修改账号模态框 -->
-    <div class="modal fade" id="edit-account" tabindex="-1" role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                            aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title">修改/录入账号 </h4>
-                    <h6 style="color:red">注：此操作不会修改账号密码，仅将相关信息录入平台进行管理，如需修改密码请使用改密功能</h6>
-                </div>
-                <div class="modal-body form-group">
-                    <!-- 数据库名称 -->
-                    <div class="form-group row" id="edit-db-name1-row">
-                        <label for="edit-db-name1" class="col-sm-3 col-form-label">
-                            <span style="color:red">*</span>数据库</label>
-                        <div class="col-sm-9">
-                            <select id="edit-db-name1" class="form-control selectpicker" name="edit_db_name1"
-                                    title="请选择数据库" disabled
-                                    data-live-search="true">
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label for="edit-user" class="col-sm-3 col-form-label">
-                            <span style="color:red">*</span>数据库账号</label>
-                        <div class="col-sm-9">
-                            <input type="text" id="edit-user" class="form-control" autocomplete="off"
-                                   readonly="readonly"
-                                   placeholder="请输入账号名称">
-                        </div>
-                    </div>
-                    <div class="form-group row" id="edit-host-row">
-                        <label for="edit-host" class="col-sm-3 col-form-label">
-                            <span style="color:red">*</span>主机</label>
-                        <div class="col-sm-9">
-                            <input type="text" id="edit-host" class="form-control" autocomplete="off"
-                                   readonly="readonly"
-                                   placeholder="请输入主机">
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label for="edit-password1" class="col-sm-3 col-form-label">
-                            <span style="color:red">*</span>密码</label>
-                        <div class="col-sm-9">
-                            <input type="password" id="edit-password" class="form-control" autocomplete="new-password"
-                                   placeholder="请输入密码，留空则不修改录入信息">
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <label for="edit-remark" class="col-sm-3 col-form-label">备注</label>
-                        <div class="col-sm-9">
-                            <input type="text" id="edit-remark" class="form-control"
-                                   autocomplete="off"
-                                   placeholder="请输入备注">
-                        </div>
-                    </div>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    <button type="button" class="btn btn-primary" id="resetEditBtn">修改/录入</button>
-                </div>
-            </div>
-        </div>
-    </div>
     <!-- 修改密码模态框 -->
     <div class="modal fade" id="reset-pwd" tabindex="-1" role="dialog">
         <div class="modal-dialog" role="document">
@@ -207,223 +59,18 @@ <h6 style="color:red">注：此操作会修改账号密码，同时变更平台
     <script src="{% static 'bootstrap-table/js/bootstrap-table-export.min.js' %}"></script>
     <script src="{% static 'bootstrap-table/js/tableExport.min.js' %}"></script>
     <script>
-        function get_db_type() {
-            // 获取选中的数据库实例的类型
-            let db_type = "";
-            if ($("#instance").val()) {
-                db_type = $("#instance")[0].options[$("#instance")[0].selectedIndex].getAttribute("instance-type");
-            }
-            return db_type;
-        }
-
-        // 打开创建modal
-        function show_create_modal() {
-            const db_type = get_db_type();
-            // 根据数据库类型显示不同的form row
-            if (db_type === 'mysql') {
-                $("#db-name1-row").hide();
-                $("#host-row").show();
-            } else if (db_type === 'mongo') {
-                $("#db-name1-row").show();
-                $("#host-row").hide();
-            }
-            $("#create-account").modal('show');
-        }
-
-        //权限切换
-        $("#priv-type").change(function () {
-            let priv_type = $("#priv-type").val();
-            let db_name = $("#db_name");
-            let tb_name = $("#tb_name");
-            let col_name = $("#col_name");
-            if (priv_type === '0') {
-                $("#div-global-priv").show();
-                $("#div-db-priv").hide();
-                $("#div-tb-priv").hide();
-                $("#div-col-priv").hide();
-                $("#div-db").hide();
-                $("#div-tb").hide();
-                $("#div-col").hide();
-            } else if (priv_type === '1') {
-                $("#div-global-priv").hide();
-                $("#div-db-priv").show();
-                $("#div-tb-priv").hide();
-                $("#div-col-priv").hide();
-                $("#div-db").show();
-                $("#div-tb").hide();
-                $("#div-col").hide();
-                // 库多选
-                db_name.attr("multiple", "true");
-                db_name.selectpicker('destroy');
-                db_name.val('');
-                db_name.selectpicker({
-                    actionsBox: true, //在下拉选项添加选中所有和取消选中的按钮
-                    countSelectedText: "已选中{0}项",
-                    selectedTextFormat: "count > 3"
-                }, 'refresh');
-            } else if (priv_type === '2') {
-                $("#div-global-priv").hide();
-                $("#div-db-priv").hide();
-                $("#div-tb-priv").show();
-                $("#div-col-priv").hide();
-                $("#div-db").show();
-                $("#div-tb").show();
-                $("#div-col").hide();
-                // 库单选
-                db_name.removeAttr("multiple");
-                db_name.selectpicker('destroy');
-                db_name.val('');
-                db_name.selectpicker('refresh');
-                // 表多选
-                tb_name.attr("multiple", "true");
-                tb_name.selectpicker('destroy');
-                tb_name.val('');
-                tb_name.selectpicker({
-                    actionsBox: true, //在下拉选项添加选中所有和取消选中的按钮
-                    countSelectedText: "已选中{0}项",
-                    selectedTextFormat: "count > 3"
-                }, 'refresh');
-            } else if (priv_type === '3') {
-                $("#div-global-priv").hide();
-                $("#div-db-priv").hide();
-                $("#div-tb-priv").hide();
-                $("#div-col-priv").show();
-                $("#div-db").show();
-                $("#div-tb").show();
-                $("#div-col").show();
-                // 库单选
-                db_name.removeAttr("multiple");
-                db_name.selectpicker('destroy');
-                db_name.val('');
-                db_name.selectpicker('refresh');
-                // 表单选
-                tb_name.removeAttr("multiple");
-                tb_name.selectpicker('destroy');
-                tb_name.val('');
-                tb_name.selectpicker('refresh');
-                // 列多选
-                col_name.attr("multiple", "true");
-                col_name.selectpicker('destroy');
-                col_name.val('');
-                col_name.selectpicker({
-                    actionsBox: true, //在下拉选项添加选中所有和取消选中的按钮
-                    countSelectedText: "已选中{0}项",
-                    selectedTextFormat: "count > 3"
-                }, 'refresh');
-            }
-        });
-
-        // 根据数据库类型获取显示的字段
-        function get_db_columns(db_type) {
-            switch (db_type) {
-                case 'mysql':
-                    return [
-                        {
-                            title: '账号',
-                            field: 'user_host',
-                            formatter: function (value, row, index) {
-                                if (row.saved) {
-                                    return "<a target=\"_blank\" href=\"/admin/sql/instanceaccount/" + row.id + "/change/\">" + value + "</a>"
-                                } else {
-                                    return value
-                                }
-                            }
-                        }, {
-                            title: '帐号名',
-                            field: 'user',
-                            visible: false
-                        }, {
-                            title: '主机',
-                            field: 'host',
-                            visible: false
-                        }, {
-                            title: '权限',
-                            field: 'privileges',
-                            formatter: function (value, row, index) {
-                                var priv = '';
-                                for (var i = 0; i < value.length; i++) {
-                                    priv = priv + value[i] + ';</br>'
-                                }
-                                return priv
-                            },
-                            width: "60",
-                            widthUnit: "%",
-                        }, {
-                            title: '备注',
-                            field: 'remark'
-                        }, {
-                            title: '操作',
-                            field: '',
-                            formatter: function (value, row, index) {
-                                let btn_edit = "<button class=\"btn btn-info btn-xs\" user_host=\"" + row.user_host + "\" onclick=\"show_edit_modal(this)" + "\">编辑</button>\n";
-                                let btn_modify_grants = "<button class=\"btn btn-primary btn-xs\" user_host=\"" + row.user_host + "\" onclick=\"show_grants_modal(this)" + "\">授权</button>\n";
-                                let btn_reset_passwd = "<button class=\"btn btn-warning btn-xs\" user_host=\"" + row.user_host + "\" onclick=\"show_reset_modal(this)" + "\">改密</button>\n";
-                                let btn_del_account = "<button class=\"btn btn-danger btn-xs\" user_host=\"" + row.user_host + "\" onclick=\"show_delete_modal(this)" + "\">删除</button>\n";
-                                let btn_lock_account = "";
-                                if (row.is_locked === 'N') {
-                                    btn_lock_account = "<button class=\"btn btn-danger btn-xs\" user_host=\"" + row.user_host + "\" is_locked=\"" + row.is_locked + "\" onclick=\"show_lock_modal(this)" + "\">锁定</button>\n";
-                                } else if (row.is_locked === 'Y') {
-                                    btn_lock_account = "<button class=\"btn btn-success btn-xs\" user_host=\"" + row.user_host + "\" is_locked=\"" + row.is_locked + "\"  onclick=\"show_lock_modal(this)" + "\">解锁</button>\n";
-                                }
-                                return btn_edit + btn_modify_grants + btn_reset_passwd + btn_lock_account + btn_del_account
-                            }
-                        }]
-                case 'mongo':
-                    return [
-                        {
-                            title: '数据库名',
-                            field: 'db_name'
-                        }, {
-                            title: '账号',
-                            field: 'user',
-                            formatter: function (value, row, index) {
-                                if (row.saved) {
-                                    return "<a target=\"_blank\" href=\"/admin/sql/instanceaccount/" + row.id + "/change/\">" + value + "</a>"
-                                } else {
-                                    return value
-                                }
-                            }
-                        }, {
-                            title: '角色',
-                            field: 'roles',
-                            formatter: function (value, row, index) {
-                                return value.join(',')
-                            }
-                        }, {
-                            title: '备注',
-                            field: 'remark'
-                        }, {
-                            title: '操作',
-                            field: '',
-                            formatter: function (value, row, index) {
-                                let btn_edit = "<button class=\"btn btn-info btn-xs\" db_name_user=\"" + row.db_name_user + "\" onclick=\"show_edit_modal(this)" + "\">编辑</button>\n";
-                                let btn_modify_grants = "<button class=\"btn btn-primary btn-xs\" db_name_user=\"" + row.db_name_user + "\" onclick=\"show_grants_modal(this)" + "\">授权</button>\n";
-                                let btn_reset_passwd = "<button class=\"btn btn-warning btn-xs\" db_name_user=\"" + row.db_name_user + "\" onclick=\"show_reset_modal(this)" + "\">改密</button>\n";
-                                let btn_del_account = "<button class=\"btn btn-danger btn-xs\" db_name_user=\"" + row.db_name_user + "\" onclick=\"show_delete_modal(this)" + "\">删除</button>\n";
-                                return btn_edit + btn_modify_grants + btn_reset_passwd + btn_del_account
-                            }
-                        }
-                    ]
-                default:
-                    return []
-            }
-        }
-
-        //获取账号列表
-        function user_list() {
-            const db_type = get_db_type();
-            let uniqueId;
-            if (db_type === 'mysql') {
-                uniqueId = 'user_host';
-            } else if (db_type === 'mongo') {
-                uniqueId = 'db_name_user';
-            }
+        //获取优化详情列表
+        function review_list() {
+            var pathname = window.location.pathname;
+            if (pathname == "/sqlreview/") {
+                var review_checksum = sessionStorage.getItem('review_checksum');
+                }
             //初始化table
             $('#user-list').bootstrapTable('destroy').bootstrapTable({
                 escape: false,
                 method: 'post',
                 contentType: "application/x-www-form-urlencoded",
-                url: "/instance/user/list",
+                url: "/sqlreview/list/",
                 striped: true,                      //是否显示行间隔色
                 cache: false,                       //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*）
                 pagination: true,                   //是否显示分页（*）
@@ -435,7 +82,7 @@ <h6 style="color:red">注：此操作会修改账号密码，同时变更平台
                 pageList: [20, 30, 50, 100],       //可供选择的每页的行数（*）
                 showExport: true,                   //是否显示导出按钮
                 exportOptions: {
-                    fileName: 'instance_user'  //文件名称设置
+                    fileName: 'checksum'  //文件名称设置
                 },
                 search: true,                      //是否显示表格搜索
                 strictSearch: false,                //是否全匹配搜索
@@ -443,7 +90,7 @@ <h6 style="color:red">注：此操作会修改账号密码，同时变更平台
                 showRefresh: true,                  //是否显示刷新按钮
                 minimumCountColumns: 2,             //最少允许的列数
                 clickToSelect: true,                //是否启用点击选中行
-                uniqueId: uniqueId,               //每一行的唯一标识，一般为主键列
+                uniqueId: 'checksum',               //每一行的唯一标识，一般为主键列
                 showToggle: true,                   //是否显示详细视图和列表视图的切换按钮
                 cardView: false,                    //是否显示详细视图
                 detailView: false,                  //是否显示父子表
@@ -453,15 +100,29 @@ <h6 style="color:red">注：此操作会修改账号密码，同时变更平台
                 //请求服务数据时所传参数
                 queryParams:
                     function (params) {
-                        if ($("#instance").val()) {
+                        if (review_checksum) {
                             return {
                                 search: params.search,
-                                instance_id: $("#instance").val(),
-                                saved: $("#saved").val()
+                                review_checksum: review_checksum
                             }
                         }
                     },
-                columns: get_db_columns(db_type),
+                columns: [{
+                    title: '校验和',
+                    field: 'checksum'
+                },{
+                    title: '提交人',
+                    field: 'reviewed_by'
+                },{
+                    title: '提交日期',
+                    field: 'reviewed_on'
+                },{
+                    title: '内容',
+                    field: 'comments'
+                },{
+                    title: '优化状态',
+                    field: 'reviewed_status'
+                }],
                 onLoadSuccess: function (data) {
                     if (data.status !== 0) {
                         alert("数据加载失败！" + data.msg);
@@ -482,406 +143,26 @@ <h6 style="color:red">注：此操作会修改账号密码，同时变更平台
 
         }
 
-        //获取实例数据库
-        function db_list() {
-            $.ajax({
-                type: "get",
-                url: "/instance/instance_resource/",
-                dataType: "json",
-                data: {
-                    instance_id: $("#instance").val(),
-                    resource_type: "database"
-                },
-                complete: function () {
-                },
-                success: function (data) {
-                    if (data.status === 0) {
-                        let result = data.data;
-                        let db_name = $("#db_name");
-                        let db_name1 = $("#db_name1");
-                        let edit_db_name1 = $("#edit-db-name1");
-                        db_name.empty();
-                        db_name1.empty();
-                        edit_db_name1.empty();
-                        for (var i = 0; i < result.length; i++) {
-                            var name = "<option value=\"" + result[i] + "\">" + result[i] + "</option>";
-                            db_name.append(name);
-                            db_name1.append(name);
-                            edit_db_name1.append(name);
-                        }
-                        db_name.val('');
-                        db_name.selectpicker('render');
-                        db_name.selectpicker('refresh');
-                        db_name1.val('');
-                        db_name1.selectpicker('render');
-                        db_name1.selectpicker('refresh');
-                        edit_db_name1.val('');
-                        edit_db_name1.selectpicker('render');
-                        edit_db_name1.selectpicker('refresh');
-                    } else {
-                        alert(data.msg);
-                    }
-                },
-                error: function (XMLHttpRequest, textStatus, errorThrown) {
-                    alert(errorThrown);
-                }
-            });
-        }
-
-        //获取表
-        function tb_list() {
-            $.ajax({
-                type: "get",
-                url: "/instance/instance_resource/",
-                dataType: "json",
-                data: {
-                    instance_id: $("#instance").val(),
-                    db_name: $("#db_name").val(),
-                    resource_type: "table"
-                },
-                complete: function () {
-                },
-                success: function (data) {
-                    if (data.status === 0) {
-                        let result = data.data;
-                        let tb_name = $("#tb_name");
-                        tb_name.empty();
-                        for (var i = 0; i < result.length; i++) {
-                            var name = "<option value=\"" + result[i] + "\">" + result[i] + "</option>";
-                            tb_name.append(name);
-                        }
-                        tb_name.val('');
-                        tb_name.selectpicker('render');
-                        tb_name.selectpicker('refresh');
-                    } else {
-                        alert(data.msg);
-                    }
-                },
-                error: function (XMLHttpRequest, textStatus, errorThrown) {
-                    alert(errorThrown);
-                }
-            });
-        }
-
-        //获取表
-        function col_list() {
-            $.ajax({
-                type: "get",
-                url: "/instance/instance_resource/",
-                dataType: "json",
-                data: {
-                    instance_id: $("#instance").val(),
-                    db_name: $("#db_name").val(),
-                    tb_name: $("#tb_name").val(),
-                    resource_type: "column"
-                },
-                complete: function () {
-                },
-                success: function (data) {
-                    if (data.status === 0) {
-                        let result = data.data;
-                        let col_name = $("#col_name");
-                        col_name.empty();
-                        for (var i = 0; i < result.length; i++) {
-                            var name = "<option value=\"" + result[i] + "\">" + result[i] + "</option>";
-                            col_name.append(name);
-                        }
-                        col_name.val('');
-                        col_name.selectpicker('render');
-                        col_name.selectpicker('refresh');
-                    } else {
-                        alert(data.msg);
-                    }
-                },
-                error: function (XMLHttpRequest, textStatus, errorThrown) {
-                    alert(errorThrown);
-                }
-            });
-        }
-
-        // 选项变动
-        $("#saved").change(function () {
-            user_list();
-            if ($("#instance").val()) {
-                db_list();
-            }
-        });
-
-        //实例变动
-        $("#instance").change(function () {
-            user_list();
-            if ($("#instance").val()) {
-                let ins_name = $("#instance option:selected").text();
-                $("#modify-instance").text(ins_name);
-                $("#reset-instance").text(ins_name);
-                $("#lock-instance").text(ins_name);
-                $("#delete-instance").text(ins_name);
-                db_list();
-            }
-        });
-
-        //数据库变动
-        $("#db_name").change(function () {
-            let priv_type = $("#priv-type").val();
-            if (priv_type === '2' || priv_type === '3') {
-                tb_list();
-            }
-        });
-
-        //表变动
-        $("#tb_name").change(function () {
-            let priv_type = $("#priv-type").val();
-            if (priv_type === '3') {
-                col_list();
-            }
-        });
-
-        //创建账号
-        function create_account() {
-            if (!$("#instance").val()) {
-                alert("请选择实例！");
-            } else {
-                $.ajax({
-                    type: "post",
-                    url: "/instance/user/create/",
-                    dataType: "json",
-                    data: {
-                        instance_id: $("#instance").val(),
-                        db_name: $("#db_name1").val(),
-                        user: $("#user").val(),
-                        host: $("#host").val(),
-                        password1: $("#password1").val(),
-                        password2: $("#password2").val(),
-                        remark: $("#remark").val()
-                    },
-                    complete: function () {
-                    },
-                    success: function (data) {
-                        if (data.status === 0) {
-                            $('#create-account').modal('hide');
-                            $("#create-account input").val("");
-                            user_list()
-                        } else {
-                            alert(data.msg);
-                        }
-                    },
-                    error: function (XMLHttpRequest, textStatus, errorThrown) {
-                        alert(errorThrown);
-                    }
-                });
-            }
-
-        }
-
-        //编辑、录入账号
-        function show_edit_modal(obj) {
-            const db_type = get_db_type();
-            let user_host;
-            let db_name_user;
-            let row_data;
-            if (db_type === 'mysql') {
-                user_host = $(obj).attr("user_host");
-                row_data = $('#user-list').bootstrapTable('getRowByUniqueId', user_host);
-                $("#edit-db-name1-row").hide();
-                $("#edit-host-row").show();
-            } else {
-                db_name_user = $(obj).attr("db_name_user");
-                row_data = $('#user-list').bootstrapTable('getRowByUniqueId', db_name_user);
-                $("#edit-db-name1-row").show();
-                $("#edit-host-row").hide();
-            }
-
-            let user = row_data['user'];
-            let db_name = row_data['db_name'];
-            let host = row_data['host'];
-            let remark = row_data['remark'];
-            $("#edit-db-name1").val(db_name);
-            $('#edit-db-name1').selectpicker('render').selectpicker('refresh');
-            $("#edit-user").val(user);
-            $("#edit-host").val(host);
-            $("#edit-remark").val(remark);
-            $("#edit-account").modal('show');
-
-            //变更密码
-            $("#resetEditBtn").unbind("click").click(function () {
-                $.ajax({
-                    type: "post",
-                    url: "/instance/user/edit/",
-                    dataType: "json",
-                    data: {
-                        instance_id: $("#instance").val(),
-                        user_host: user_host,
-                        user: user,
-                        host: host,
-                        db_name: db_name,
-                        db_name_user: db_name_user,
-                        password: $("#edit-password").val(),
-                        remark: $("#edit-remark").val()
-                    },
-                    complete: function () {
-                    },
-                    success: function (data) {
-                        if (data.status === 0) {
-                            $('#edit-account').modal('hide');
-                            $("#edit-account input").val("");
-                            user_list()
-                        } else {
-                            alert(data.msg);
-                        }
-                    },
-                    error: function (XMLHttpRequest, textStatus, errorThrown) {
-                        alert(errorThrown);
-                    }
-                });
-            });
-        }
-
-        //修改权限
-        function show_grants_modal(obj) {
-            const db_type = get_db_type();
-            let user_host;
-            let db_name_user;
-            if (db_type === 'mysql') {
-                $("#grants-modal").children().addClass("modal-lg");
-                $("#mysql-grant-content").show();
-                $("#mongo-grant-content").hide();
-                user_host = $(obj).attr("user_host");
-                $("#modify-user").text(user_host);
-            } else if (db_type === 'mongo') {
-                $("#grants-modal").children().removeClass("modal-lg");
-                $("#mongo-grant-content").show();
-                $("#mysql-grant-content").hide();
-                db_name_user = $(obj).attr("db_name_user");
-                $("#modify-user").text(db_name_user);
-                let row_data = $('#user-list').bootstrapTable('getRowByUniqueId', db_name_user);
-                $("#db-roles").val(row_data['roles']);
-                $("#db-roles").selectpicker('render').selectpicker('refresh');
-            }
-            $("#grants-modal").modal('show');
-
-            //变更账号权限
-            $("#grantsBtn").unbind("click").click(function () {
-                let data;
-                if (db_type == 'mysql') {
-                    let op_type = $("#op-type").val();
-                    let priv_type = $("#priv-type").val();
-                    let db_name = $("#db_name").val();
-                    let tb_name = $("#tb_name").val();
-                    let col_name = $("#col_name").val();
-                    let div_global_priv = $("#div-global-priv");
-                    let div_db_priv = $("#div-db-priv");
-                    let div_tb_priv = $("#div-tb-priv");
-                    let div_col_priv = $("#div-col-priv");
-                    let global_privs = [];
-                    let db_privs = [];
-                    let tb_privs = [];
-                    let col_privs = [];
-                    div_global_priv.find('input[type="checkbox"]:checked').each(
-                        function () {
-                            let priv_name = $(this).attr("name");
-                            global_privs.push(priv_name);
-                        }
-                    );
-                    div_db_priv.find('input[type="checkbox"]:checked').each(
-                        function () {
-                            let priv_name = $(this).attr("name");
-                            db_privs.push(priv_name);
-                        }
-                    );
-                    div_tb_priv.find('input[type="checkbox"]:checked').each(
-                        function () {
-                            let priv_name = $(this).attr("name");
-                            tb_privs.push(priv_name);
-                        }
-                    );
-                    div_col_priv.find('input[type="checkbox"]:checked').each(
-                        function () {
-                            let priv_name = $(this).attr("name");
-                            col_privs.push(priv_name);
-                        }
-                    );
-                    let privs = {
-                        "global_privs": global_privs,
-                        "db_privs": db_privs,
-                        "tb_privs": tb_privs,
-                        "col_privs": col_privs
-                    };
-                    data = {
-                        instance_id: $("#instance").val(),
-                        user_host: $("#modify-user").text(),
-                        op_type: op_type,
-                        priv_type: priv_type,
-                        privs: JSON.stringify(privs),
-                        db_name: db_name,
-                        tb_name: tb_name,
-                        col_name: col_name
-                    }
-                } else if (db_type == 'mongo') {
-                    data = {
-                        instance_id: $("#instance").val(),
-                        db_name_user: db_name_user,
-                        roles: $("#db-roles").val()
-                    }
-                }
-
-                $.ajax({
-                    type: "post",
-                    url: "/instance/user/grant/",
-                    dataType: "json",
-                    data: data,
-                    complete: function () {
-                    },
-                    success: function (data) {
-                        if (data.status === 0) {
-                            $('#grants-modal').modal('hide');
-                            $(":checkbox").each(function () {
-                                this.checked = false
-                            });
-                            $("#priv-type").val("0");
-                            $("#op-type").val("0");
-                            $("#priv-type").trigger("change");
-                            $("#op-type").trigger("change");
-                            user_list()
-                        } else {
-                            alert(data.msg);
-                        }
-                    },
-                    error: function (XMLHttpRequest, textStatus, errorThrown) {
-                        alert(errorThrown);
-                    }
-                });
-            });
-        }
-
-        //变更密码
-        function show_reset_modal(obj) {
-            const db_type = get_db_type();
-            let user_host;
-            let db_name_user;
-            let row_data;
-            if (db_type === 'mysql') {
-                user_host = $(obj).attr("user_host");
-                row_data = $('#user-list').bootstrapTable('getRowByUniqueId', user_host);
-                $("#reset-user").text(user_host);
-            } else {
-                db_name_user = $(obj).attr("db_name_user");
-                row_data = $('#user-list').bootstrapTable('getRowByUniqueId', db_name_user);
-                $("#reset-user").text(db_name_user);
-            }
-
+        //编辑页面
+        function review_edit(obj) {
+            var review_checksum = sessionStorage.getItem('review_checksum');
             $("#reset-pwd").modal('show');
-
-            //变更密码
+            //编辑详情
             $("#resetPwdBtn").unbind("click").click(function () {
+                var dt = new Date();
+                var date = dt.getDate();
+                var time = dt.getHours() + ":" + dt.getMinutes() + ":" + dt.getSeconds();
+                currenttime = date + time;
                 $.ajax({
                     type: "post",
-                    url: "/instance/user/reset_pwd/",
+                    url: "/sqlreview/edit/",
                     dataType: "json",
                     data: {
-                        instance_id: $("#instance").val(),
-                        ...row_data,
-                        reset_pwd1: $("#reset-pwd1").val(),
-                        reset_pwd2: $("#reset-pwd2").val(),
+                        checksum: review_checksum,
+                        reviewed_by: 'admin',
+                        reviewed_on: currenttime,
+                        comments: $("#comments").val(),
+                        reviewed_status: $("reviewed-status").val(),
                     },
                     complete: function () {
                     },
@@ -901,124 +182,5 @@ <h6 style="color:red">注：此操作会修改账号密码，同时变更平台
             });
         }
 
-        //锁定or解锁账号
-        function show_lock_modal(obj) {
-            let user_host = $(obj).attr("user_host");
-            let is_locked = $(obj).attr("is_locked");
-            let operation = $(obj).text();
-            $("#lock-user").text(user_host);
-            $("#lock-title").text(operation + "账号")
-            $("#lock-text").text("确认" + operation + "该账号？")
-            $("#lock-account").modal('show');
-
-            $("#lockBtn").unbind("click").click(function () {
-                $.ajax({
-                    type: "post",
-                    url: "/instance/user/lock/",
-                    dataType: "json",
-                    data: {
-                        instance_id: $("#instance").val(),
-                        user_host: user_host,
-                        is_locked: is_locked,
-                    },
-                    complete: function () {
-                    },
-                    success: function (data) {
-                        if (data.status === 0) {
-                            $('#lock-account').modal('hide');
-                            user_list()
-                        } else {
-                            alert(data.msg);
-                        }
-                    },
-                    error: function (XMLHttpRequest, textStatus, errorThrown) {
-                        alert(errorThrown);
-                    }
-                });
-            });
-        }
-
-        //删除账号
-        function show_delete_modal(obj) {
-            const db_type = get_db_type();
-            let user_host;
-            let db_name_user;
-            let row_data;
-            if (db_type === 'mysql') {
-                user_host = $(obj).attr("user_host");
-                row_data = $('#user-list').bootstrapTable('getRowByUniqueId', user_host);
-                $("#delete-user").text(user_host);
-            } else {
-                db_name_user = $(obj).attr("db_name_user");
-                row_data = $('#user-list').bootstrapTable('getRowByUniqueId', db_name_user);
-                $("#delete-user").text(db_name_user);
-            }
-
-            $("#delete-account").modal('show');
-
-            $("#deleteBtn").unbind("click").click(function () {
-                $.ajax({
-                    type: "post",
-                    url: "/instance/user/delete/",
-                    dataType: "json",
-                    data: {
-                        instance_id: $("#instance").val(),
-                        ...row_data,
-                    },
-                    complete: function () {
-                    },
-                    success: function (data) {
-                        if (data.status === 0) {
-                            $('#delete-account').modal('hide');
-                            user_list()
-                        } else {
-                            alert(data.msg);
-                        }
-                    },
-                    error: function (XMLHttpRequest, textStatus, errorThrown) {
-                        alert(errorThrown);
-                    }
-                });
-            });
-
-
-        }
-
-        //初始化数据
-        $(document).ready(function () {
-            user_list();
-            //获取账号实例列表
-            $(function () {
-                $.ajax({
-                    type: "get",
-                    url: "/group/user_all_instances/",
-                    dataType: "json",
-                    data: {
-                        db_type: ['mysql', 'mongo']
-                    },
-                    complete: function () {
-                    },
-                    success: function (data) {
-                        if (data.status === 0) {
-                            let result = data['data'];
-                            $("optgroup[id^='optgroup']").empty();
-                            const supportDb = ['mysql', 'mongo']
-                            for (let i of result) {
-                                let instance = "<option value=\"" + i.id + "\" instance-id=" + i.id + " instance-type=" + i.db_type + ">" + i.instance_name + "</option>";
-                                if (supportDb.indexOf(i.db_type) !== -1) {
-                                    $("#optgroup-" + i.db_type).append(instance);
-                                }
-                            }
-                            $('#instance').selectpicker('render').selectpicker('refresh');
-                        } else {
-                            alert(data.msg);
-                        }
-                    },
-                    error: function (XMLHttpRequest, textStatus, errorThrown) {
-                        alert(errorThrown);
-                    }
-                });
-            });
-        });
     </script>
 {% endblock %}
diff --git a/sql/urls.py b/sql/urls.py
index c371937..f778a09 100644
--- a/sql/urls.py
+++ b/sql/urls.py
@@ -23,6 +23,7 @@
     archiver,
     audit_log,
     user,
+    manual_review,
 )
 from sql.utils import tasks
 from common.utils import ding_api
@@ -51,6 +52,8 @@
     path("slowquery/", views.slowquery),
     path("sqladvisor/", views.sqladvisor),
     path("sqlreview/", views.sqlreview),
+    path("sqlreview/list/", manual_review.listreview),
+    path("sqlreview/edit/", manual_review.editreview),
     path("slowquery_advisor/", views.sqladvisor),
     path("queryapplylist/", views.queryapplylist),
     path(

From c240b2ac9caf13ebe496427bd5c85d5f41a565b8 Mon Sep 17 00:00:00 2001
From: Grain-Yu <justbeafreeman@outlook.com>
Date: Tue, 28 Nov 2023 15:10:04 +0800
Subject: [PATCH 04/10] draft

---
 sql/engines/mysql.py         | 20 +++--------
 sql/manual_review.py         |  3 --
 sql/templates/sqlreview.html | 67 ++++++++++++++++++------------------
 3 files changed, 38 insertions(+), 52 deletions(-)

diff --git a/sql/engines/mysql.py b/sql/engines/mysql.py
index 13898e5..e65298a 100644
--- a/sql/engines/mysql.py
+++ b/sql/engines/mysql.py
@@ -892,21 +892,9 @@ def get_review_status_summary(self, checksum):
         self.close()
         return query_result
 
-    def set_review_details(self, checksum):
+    def set_review_details(self, checksum, reviewed_by, reviewed_on, comments, reviewed_status):
         """sql优化详情功能，获取checksum对应的sql优化详情"""
-        sql_review_summary = f"""select reviewed_by,reviewed_on,comments,reviewed_status from archery.mysql_slow_query_review where checksum='{checksum}';"""
-        query_result = self.query("mysql", sql_review_summary)
-        if not query_result.error:
-            review_summary = query_result.rows
-            rows = []
-            row = {
-                "checksum": checksum,
-                "reviewed_by": review_summary[0],
-                "reviewed_on": review_summary[1],
-                "comments": review_summary[2],
-                "reviewed_status": review_summary[3],
-            }
-            rows.append(row)
-        query_result.rows = rows
+        sql_update_review = f"""update archery.mysql_slow_query_review set reviewed_by='{reviewed_by}',reviewed_on='{reviewed_on}',comments='{comments}',reviewed_status='{reviewed_status}' where checksum='{checksum}';"""
+        exec_result = self.query("mysql", sql_update_review)
         self.close()
-        return query_result
\ No newline at end of file
+        return exec_result
\ No newline at end of file
diff --git a/sql/manual_review.py b/sql/manual_review.py
index fbc2352..e3c955c 100644
--- a/sql/manual_review.py
+++ b/sql/manual_review.py
@@ -90,7 +90,4 @@ def editreview(request):
     exec_result = exec_engine.set_review_details(
         checksum=checksum, reviewed_by=reviewed_by, reviewed_on=reviewed_on,comments=comments,reviewed_status=reviewed_status
     )
-    # 关闭连接
-    engine.close()
-
     return JsonResponse({"status": 0, "msg": "", "data": []})
diff --git a/sql/templates/sqlreview.html b/sql/templates/sqlreview.html
index bcb2fc9..dfb6092 100644
--- a/sql/templates/sqlreview.html
+++ b/sql/templates/sqlreview.html
@@ -2,6 +2,7 @@
 
 
 
+
 {% block content %}
 
     <!-- 表格-->
@@ -11,43 +12,40 @@
         </table>
     </div>
     <!-- 修改密码模态框 -->
-    <div class="modal fade" id="reset-pwd" tabindex="-1" role="dialog">
+    <div class="modal fade" id="edit-review" tabindex="-1" role="dialog">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
                             aria-hidden="true">&times;</span></button>
-                    <h4 class="modal-title">修改密码
-                        实例: <span id="reset-instance" style="color: red"></span>
-                        账号: <span id="reset-user" style="color: red"></span></h4>
-                    <h6 style="color:red">注：此操作会修改账号密码，同时变更平台录入信息，请谨慎操作</h6>
+                    <h4 class="modal-title">编辑详情</h4>
                 </div>
                 <div class="modal-body form-group">
                     <div class="form-group row">
-                        <label for="password1" class="col-sm-3 col-form-label">
-                            <span style="color:red">*</span>密码</label>
+                        <label for="comments" class="col-sm-3 col-form-label">
+                            <span style="color:red">*</span>内容</label>
                         <div class="col-sm-9">
-                            <input type="password" id="reset-pwd1" class="form-control" autocomplete="new-password"
-                                   aria-describedby="resetpwdHelpBlock"
-                                   placeholder="请输入密码">
-                            <small id="resetpwdHelpBlock" class="form-text text-muted">
-                                密码需要8-32个字符，至少包含英文、数字和特殊符号
+                            <input type="text" id="comments" class="form-control"
+                                   placeholder="请填写详情">
                             </small>
                         </div>
                     </div>
                     <div class="form-group row">
-                        <label for="password2" class="col-sm-3 col-form-label">
-                            <span style="color:red">*</span>确认密码</label>
+                        <label for="reviewed-status" class="col-sm-3 col-form-label">
+                            <span style="color:red">*</span>优化状态</label>
                         <div class="col-sm-9">
-                            <input type="password" id="reset-pwd2" class="form-control"
-                                   autocomplete="new-password"
-                                   placeholder="请再次输入密码">
+                            <input type="text" id="reviewed-status" class="form-control"
+                                   aria-describedby="editrewHelpBlock"
+                                   placeholder="请填写优化状态">
+                            <small id="editrewHelpBlock" class="form-text text-muted">
+                                    请输入：open/resolved/pending/closed
+                            </small>
                         </div>
                     </div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">取消</button>
-                    <button type="button" class="btn btn-danger" id="resetPwdBtn">修改</button>
+                    <button type="button" class="btn btn-danger" id="editRevBtn">修改</button>
                 </div>
             </div>
         </div>
@@ -122,18 +120,18 @@ <h6 style="color:red">注：此操作会修改账号密码，同时变更平台
                 },{
                     title: '优化状态',
                     field: 'reviewed_status'
+                },{
+                    title: '操作',
+                    field: '',
+                    formatter: function (value, row, index) {
+                        let btn_edit_review = "<button class=\"btn btn-warning btn-xs\" review_checksum=\"" + row.checksum + "\" onclick=\"review_edit(this)" + "\">编辑</button>\n";
+                        return btn_edit_review
+                    }
                 }],
                 onLoadSuccess: function (data) {
                     if (data.status !== 0) {
                         alert("数据加载失败！" + data.msg);
-                        $('#btn-create-account').addClass('disabled');
-                        $('#btn-create-account').prop('disabled', true);
-                    } else if ($("#instance").val()) {
-                        $("#btn-create-account").removeClass('disabled');
-                        $("#btn-create-account").prop('disabled', false);
-
-                    }
-                },
+                }},
                 onLoadError: onLoadErrorCallback,
                 onSearch: function (e) {
                     //传搜索参数给服务器
@@ -145,10 +143,10 @@ <h6 style="color:red">注：此操作会修改账号密码，同时变更平台
 
         //编辑页面
         function review_edit(obj) {
-            var review_checksum = sessionStorage.getItem('review_checksum');
-            $("#reset-pwd").modal('show');
+            review_checksum = $(obj).attr("review_checksum");
+            $("#edit-review").modal('show');
             //编辑详情
-            $("#resetPwdBtn").unbind("click").click(function () {
+            $("#editRevBtn").unbind("click").click(function () {
                 var dt = new Date();
                 var date = dt.getDate();
                 var time = dt.getHours() + ":" + dt.getMinutes() + ":" + dt.getSeconds();
@@ -168,9 +166,9 @@ <h6 style="color:red">注：此操作会修改账号密码，同时变更平台
                     },
                     success: function (data) {
                         if (data.status === 0) {
-                            $('#reset-pwd').modal('hide');
-                            $("#reset-pwd input").val("");
-                            user_list()
+                            $('#edit-review').modal('hide');
+                            $("#edit-review input").val("");
+                            review_list()
                         } else {
                             alert(data.msg);
                         }
@@ -181,6 +179,9 @@ <h6 style="color:red">注：此操作会修改账号密码，同时变更平台
                 });
             });
         }
-
+        //初始化数据
+        $(document).ready(function () {
+            review_list();
+        });
     </script>
 {% endblock %}

From cd13e8433f3f94f332000de0873df12558b1aa44 Mon Sep 17 00:00:00 2001
From: Grain-Yu <justbeafreeman@outlook.com>
Date: Tue, 28 Nov 2023 16:07:16 +0800
Subject: [PATCH 05/10] draft

---
 sql/manual_review.py | 26 +++++++-------------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/sql/manual_review.py b/sql/manual_review.py
index e3c955c..b0ab990 100644
--- a/sql/manual_review.py
+++ b/sql/manual_review.py
@@ -5,38 +5,26 @@
 import pymysql
 import re
 
-import schemaobject
-import sqlparse
-from MySQLdb.constants import FIELD_TYPE
-from schemaobject.connection import build_database_url
 
-from sql.engines.goinception import GoInceptionEngine
-from sql.utils.sql_utils import get_syntax_type, remove_comments
-from . import EngineBase
-from .models import ResultSet, ReviewResult, ReviewSet
-from sql.utils.data_masking import data_masking
-from common.config import SysConfig
 
 # -*- coding: UTF-8 -*-
-import MySQLdb
+
 import simplejson as json
 from django.contrib.auth.decorators import permission_required
-from django.contrib.auth.password_validation import validate_password
-from django.core.exceptions import ValidationError
+
 
 from django.http import HttpResponse, JsonResponse
 from sql.utils.instance_management import (
     SUPPORTED_MANAGEMENT_DB_TYPE,
-    get_instanceaccount_unique_value,
-    get_instanceaccount_unique_key,
 )
 from common.utils.extend_json_encoder import ExtendJSONEncoder
 from sql.engines import get_engine, ResultSet
 from sql.utils.resource_group import user_instances
 from .models import Instance, InstanceAccount
 
-from sql.engines.mysql import get_review_status_summary
-from sql.engines.mysql import set_review_details
+from sql.engines.mysql import MysqlEngine
+
+
 
 @permission_required("sql.menu_instance_account", raise_exception=True)
 def listreview(request):
@@ -53,7 +41,7 @@ def listreview(request):
         return JsonResponse({"status": 1, "msg": "你所在组未关联该实例", "data": []})
 
     #获取checksum对应的优化详情
-    query_engine = get_engine(instance=instance)
+    query_engine = MysqlEngine(instance=instance)
     query_result = query_engine.get_review_status_summary(checksum)
     if not query_result.error:
         rows = query_result.rows
@@ -86,7 +74,7 @@ def editreview(request):
     except Instance.DoesNotExist:
         return JsonResponse({"status": 1, "msg": "你所在组未关联该实例", "data": []})
     
-    exec_engine = get_engine(instance=instance)    
+    exec_engine = MysqlEngine(instance=instance)    
     exec_result = exec_engine.set_review_details(
         checksum=checksum, reviewed_by=reviewed_by, reviewed_on=reviewed_on,comments=comments,reviewed_status=reviewed_status
     )

From 50a444d38de8054f37335b3cc42dc65fcf1e4237 Mon Sep 17 00:00:00 2001
From: Grain-Yu <justbeafreeman@outlook.com>
Date: Wed, 29 Nov 2023 15:10:42 +0800
Subject: [PATCH 06/10] draft

---
 sql/slowlog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/slowlog.py b/sql/slowlog.py
index 94bffbf..a651b61 100644
--- a/sql/slowlog.py
+++ b/sql/slowlog.py
@@ -67,7 +67,7 @@ def slowquery_review(request):
                 fingerprint__icontains=search,
                 **filter_kwargs
             )
-            .annotate(SQLText=F("fingerprint"), SQLId=F("checksum"), ReviewedBy=F("reviedwd_by"), ReviewedOn=F("reviewed_on"), Comments=F("comments"), ReviewedStatus=F("reviewed_status"))
+            .annotate(SQLText=F("fingerprint"), SQLId=F("checksum"), ReviewedBy=F("reviewed_by"), ReviewedOn=F("reviewed_on"), Comments=F("comments"), ReviewedStatus=F("reviewed_status"))
             .values("SQLText", "SQLId", "ReviewedBy", "ReviewedOn", "Comments", "ReviewedStatus")
             .annotate(
                 CreateTime=Max("slowqueryhistory__ts_max"),

From a1a7eb61d71462df4ac644a396f2c6c54cf144d3 Mon Sep 17 00:00:00 2001
From: Grain-Yu <justbeafreeman@outlook.com>
Date: Thu, 30 Nov 2023 10:54:17 +0800
Subject: [PATCH 07/10] draft

---
 sql/engines/mysql.py         | 8 ++++----
 sql/templates/sqlreview.html | 8 +++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/sql/engines/mysql.py b/sql/engines/mysql.py
index e65298a..266b609 100644
--- a/sql/engines/mysql.py
+++ b/sql/engines/mysql.py
@@ -882,10 +882,10 @@ def get_review_status_summary(self, checksum):
             rows = []
             row = {
                 "checksum": checksum,
-                "reviewed_by": review_summary[0],
-                "reviewed_on": review_summary[1],
-                "comments": review_summary[2],
-                "reviewed_status": review_summary[3],
+                "reviewed_by": review_summary[0][0],
+                "reviewed_on": review_summary[0][1],
+                "comments": review_summary[0][2],
+                "reviewed_status": review_summary[0][3],
             }
             rows.append(row)
         query_result.rows = rows
diff --git a/sql/templates/sqlreview.html b/sql/templates/sqlreview.html
index dfb6092..b7795b3 100644
--- a/sql/templates/sqlreview.html
+++ b/sql/templates/sqlreview.html
@@ -147,10 +147,8 @@ <h4 class="modal-title">编辑详情</h4>
             $("#edit-review").modal('show');
             //编辑详情
             $("#editRevBtn").unbind("click").click(function () {
-                var dt = new Date();
-                var date = dt.getDate();
-                var time = dt.getHours() + ":" + dt.getMinutes() + ":" + dt.getSeconds();
-                currenttime = date + time;
+                var dt = new Date(+new Date()+8*3600*1000);
+                currenttime = dt.toISOString().slice(0, 19).replace('T', ' ');
                 $.ajax({
                     type: "post",
                     url: "/sqlreview/edit/",
@@ -160,7 +158,7 @@ <h4 class="modal-title">编辑详情</h4>
                         reviewed_by: 'admin',
                         reviewed_on: currenttime,
                         comments: $("#comments").val(),
-                        reviewed_status: $("reviewed-status").val(),
+                        reviewed_status: $("#reviewed-status").val(),
                     },
                     complete: function () {
                     },

From 8b2028d8225e4400ae18299863d3b5005c26b18f Mon Sep 17 00:00:00 2001
From: Grain-Yu <justbeafreeman@outlook.com>
Date: Thu, 30 Nov 2023 12:48:11 +0800
Subject: [PATCH 08/10] draft

---
 sql/manual_review.py         |  4 ++--
 sql/templates/slowquery.html |  8 ++++----
 sql/templates/sqlreview.html | 14 ++++++++------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/sql/manual_review.py b/sql/manual_review.py
index b0ab990..bbb051b 100644
--- a/sql/manual_review.py
+++ b/sql/manual_review.py
@@ -26,7 +26,7 @@
 
 
 
-@permission_required("sql.menu_instance_account", raise_exception=True)
+@permission_required("sql.menu_slowquery", raise_exception=True)
 def listreview(request):
     """获取优化详情列表"""
     checksum = request.POST.get("review_checksum")
@@ -53,7 +53,7 @@ def listreview(request):
         content_type="application/json",
     )
 
-@permission_required("sql.instance_account_manage", raise_exception=True)
+@permission_required("sql.menu_slowquery", raise_exception=True)
 def editreview(request):
     """编辑优化详情"""
     checksum = request.POST.get("checksum")
diff --git a/sql/templates/slowquery.html b/sql/templates/slowquery.html
index 2e89862..3225390 100644
--- a/sql/templates/slowquery.html
+++ b/sql/templates/slowquery.html
@@ -448,19 +448,19 @@
                         field: 'ReturnRowAvg',
                         sortable:true
                     }, {
-                        title: '优化人',
+                        title: '优化-提交人',
                         field: 'ReviewedBy',
                         sortable:true
                     }, {
-                        title: '优化日期',
+                        title: '优化-更新日期',
                         field: 'ReviewedOn',
                         sortable:true
                     }, {
-                        title: '优化详情',
+                        title: '优化-内容',
                         field: 'Comments',
                         sortable:true
                     }, {
-                        title: '优化状态',
+                        title: '优化-状态',
                         field: 'ReviewedStatus',
                         sortable:true
                     }],
diff --git a/sql/templates/sqlreview.html b/sql/templates/sqlreview.html
index b7795b3..06da87f 100644
--- a/sql/templates/sqlreview.html
+++ b/sql/templates/sqlreview.html
@@ -32,11 +32,11 @@ <h4 class="modal-title">编辑详情</h4>
                     </div>
                     <div class="form-group row">
                         <label for="reviewed-status" class="col-sm-3 col-form-label">
-                            <span style="color:red">*</span>优化状态</label>
+                            <span style="color:red">*</span>状态</label>
                         <div class="col-sm-9">
                             <input type="text" id="reviewed-status" class="form-control"
                                    aria-describedby="editrewHelpBlock"
-                                   placeholder="请填写优化状态">
+                                   placeholder="请填写当前状态">
                             <small id="editrewHelpBlock" class="form-text text-muted">
                                     请输入：open/resolved/pending/closed
                             </small>
@@ -106,19 +106,21 @@ <h4 class="modal-title">编辑详情</h4>
                         }
                     },
                 columns: [{
-                    title: '校验和',
+                    title: 'SQLID',
                     field: 'checksum'
                 },{
                     title: '提交人',
                     field: 'reviewed_by'
                 },{
-                    title: '提交日期',
+                    title: '更新日期',
                     field: 'reviewed_on'
                 },{
                     title: '内容',
-                    field: 'comments'
+                    field: 'comments',
+                    width: "30",
+                    widthUnit: "%"
                 },{
-                    title: '优化状态',
+                    title: '状态',
                     field: 'reviewed_status'
                 },{
                     title: '操作',

From 0e5751a8a4436097e20c8fe4494a73b97808ac1b Mon Sep 17 00:00:00 2001
From: Grain-Yu <justbeafreeman@outlook.com>
Date: Thu, 30 Nov 2023 13:37:18 +0800
Subject: [PATCH 09/10] =?UTF-8?q?=E4=BC=98=E5=8C=96archery=E5=86=85?=
 =?UTF-8?q?=E7=BD=AE=E5=BA=93=E7=9A=84=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/manual_review.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sql/manual_review.py b/sql/manual_review.py
index bbb051b..312b12a 100644
--- a/sql/manual_review.py
+++ b/sql/manual_review.py
@@ -36,7 +36,7 @@ def listreview(request):
     try:
         instance = user_instances(
             request.user, db_type=SUPPORTED_MANAGEMENT_DB_TYPE
-        ).get(id=1)
+        ).get(instance_name="archery_internal")
     except Instance.DoesNotExist:
         return JsonResponse({"status": 1, "msg": "你所在组未关联该实例", "data": []})
 
@@ -70,7 +70,7 @@ def editreview(request):
     try:
         instance = user_instances(
             request.user, db_type=SUPPORTED_MANAGEMENT_DB_TYPE
-        ).get(id=1)
+        ).get(instance_name="archery_internal")
     except Instance.DoesNotExist:
         return JsonResponse({"status": 1, "msg": "你所在组未关联该实例", "data": []})
     

From e7833d47d7554d5413d6ffa91ec1032761cd2a3f Mon Sep 17 00:00:00 2001
From: Grain-Yu <justbeafreeman@outlook.com>
Date: Thu, 30 Nov 2023 13:41:30 +0800
Subject: [PATCH 10/10] draft

---
 sql/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/views.py b/sql/views.py
index f62b304..05a7364 100644
--- a/sql/views.py
+++ b/sql/views.py
@@ -400,7 +400,7 @@ def slowquery(request):
     """SQL慢日志页面"""
     return render(request, "slowquery.html")
 
-@permission_required("sql.menu_sqlreview", raise_exception=True)
+@permission_required("sql.menu_slowquery", raise_exception=True)
 def sqlreview(request):
     """SQL优化详情页面"""
     return render(request, "sqlreview.html")