feat: SQL 单规则例外（客户基线）

packages/base/src/locale/en-US/dmsMenu.ts

@@ -54,6 +54,7 @@ export default {
     title: 'Global settings',
     userCenter: 'User center',
     reportStatistics: 'Report statistics',
+    sqlManagementRemediationReport: 'SQL management remediation report',
     viewRule: 'View rule',
     ruleManage: 'Rule management',
     system: 'System settings',

packages/base/src/locale/zh-CN/dmsMenu.ts

@@ -56,6 +56,7 @@ export default {
     title: '全局设置',
     userCenter: '用户中心',
     reportStatistics: '报表统计',
+    sqlManagementRemediationReport: 'SQL 管控整改报表',
     viewRule: '查看规则',
     ruleManage: '规则管理',
     system: '系统设置',

packages/base/src/page/Nav/SideMenu/UserMenu/components/GlobalSetting.tsx

@@ -14,7 +14,8 @@ import {
   // #if [sqle]
   ProfileSquareFilled,
   SignalFilled,
-  ProfileEditFilled
+  ProfileEditFilled,
+  ManagementFilled
   // #endif
 } from '@actiontech/icons';
 
@@ -91,6 +92,17 @@ const GlobalSetting: React.FC<{
                   {t('dmsMenu.globalSettings.reportStatistics')}
                 </span>
               </div>
+              <div
+                className="content-item"
+                onClick={() =>
+                  handleClickItem('/sqle/sql-management-remediation-report')
+                }
+              >
+                <ManagementFilled />
+                <span className="content-item-text">
+                  {t('dmsMenu.globalSettings.sqlManagementRemediationReport')}
+                </span>
+              </div>
               <div
                 className="content-item"
                 onClick={() => handleClickItem(`/sqle/rule`)}

packages/base/src/scripts/version.ts

@@ -1 +1 @@
-export const UI_VERSION = 'feature/add-make-command   ba9c9c5';
+export const UI_VERSION = 'zjrc_3.2408   a32b5993';

packages/shared/lib/api/sqle/service/SqlManage/index.d.ts

@@ -10,10 +10,12 @@ import {
   exportSqlManageV1FilterStatusEnum,
   exportSqlManageV1SortFieldEnum,
   exportSqlManageV1SortOrderEnum,
+  exportSqlManageRemediationV1ExportScopeEnum,
   GetSqlManageListV2FilterSourceEnum,
   GetSqlManageListV2FilterAuditLevelEnum,
   GetSqlManageListV2FilterStatusEnum,
   GetSqlManageListV2FilterPriorityEnum,
+  GetSqlManageListV2FilterRemediationStatusEnum,
   GetSqlManageListV2SortFieldEnum,
   GetSqlManageListV2SortOrderEnum
 } from './index.enum';
@@ -23,7 +25,9 @@ import {
   IBatchUpdateSqlManageReq,
   IBaseRes,
   IGetSqlManageRuleTipsResp,
-  IGetSqlManageSqlAnalysisResp
+  IGetSqlManageSqlAnalysisResp,
+  IGetSqlManageRemediationResp,
+  IGetSqlManageRemediationOverviewResp
 } from '../common.d';
 
 export interface IGetSqlManageListParams {
@@ -106,6 +110,20 @@ export interface IExportSqlManageV1Params {
   sort_order?: exportSqlManageV1SortOrderEnum;
 }
 
+export interface IExportGlobalSqlManageRemediationV1Params {}
+
+export interface IExportSqlManageRemediationV1Params {
+  project_name: string;
+
+  export_scope: exportSqlManageRemediationV1ExportScopeEnum;
+
+  filter_instance_id?: string;
+
+  instance_audit_plan_id?: number;
+
+  audit_plan_type?: string;
+}
+
 export interface IGetSqlManageRuleTipsParams {
   project_name: string;
 }
@@ -141,6 +159,8 @@ export interface IGetSqlManageListV2Params {
 
   filter_status?: GetSqlManageListV2FilterStatusEnum;
 
+  filter_remediation_status?: GetSqlManageListV2FilterRemediationStatusEnum;
+
   filter_rule_name?: string;
 
   filter_db_type?: string;
@@ -163,3 +183,23 @@ export interface IGetSqlManageListV2Params {
 }
 
 export interface IGetSqlManageListV2Return extends IGetSqlManageListResp {}
+
+export interface IGetSqlManageRemediationV1Params {
+  project_name: string;
+
+  sql_manage_id: string;
+}
+
+export interface IGetSqlManageRemediationV1Return
+  extends IGetSqlManageRemediationResp {}
+
+export interface IGetSqlManageRemediationOverviewV1Params {
+  project_name: string;
+
+  instance_audit_plan_id?: number;
+
+  audit_plan_type?: string;
+}
+
+export interface IGetSqlManageRemediationOverviewV1Return
+  extends IGetSqlManageRemediationOverviewResp {}

packages/shared/lib/api/sqle/service/SqlManage/index.enum.ts

@@ -86,6 +86,14 @@ export enum exportSqlManageV1SortOrderEnum {
   'desc' = 'desc'
 }
 
+export enum exportSqlManageRemediationV1ExportScopeEnum {
+  'project' = 'project',
+
+  'data_source' = 'data_source',
+
+  'scan_task' = 'scan_task'
+}
+
 export enum GetSqlManageListV2FilterSourceEnum {
   'audit_plan' = 'audit_plan',
 
@@ -118,6 +126,18 @@ export enum GetSqlManageListV2FilterPriorityEnum {
   'low' = 'low'
 }
 
+export enum GetSqlManageListV2FilterRemediationStatusEnum {
+  'resolved' = 'resolved',
+
+  'partially_fixed' = 'partially_fixed',
+
+  'unchanged' = 'unchanged',
+
+  'deteriorated' = 'deteriorated',
+
+  'newly_discovered' = 'newly_discovered'
+}
+
 export enum GetSqlManageListV2SortFieldEnum {
   'first_appear_timestamp' = 'first_appear_timestamp',
 

packages/shared/lib/api/sqle/service/SqlManage/index.ts

@@ -12,12 +12,18 @@ import {
   IBatchUpdateSqlManageParams,
   IBatchUpdateSqlManageReturn,
   IExportSqlManageV1Params,
+  IExportGlobalSqlManageRemediationV1Params,
+  IExportSqlManageRemediationV1Params,
   IGetSqlManageRuleTipsParams,
   IGetSqlManageRuleTipsReturn,
   IGetSqlManageSqlAnalysisV1Params,
   IGetSqlManageSqlAnalysisV1Return,
   IGetSqlManageListV2Params,
-  IGetSqlManageListV2Return
+  IGetSqlManageListV2Return,
+  IGetSqlManageRemediationV1Params,
+  IGetSqlManageRemediationV1Return,
+  IGetSqlManageRemediationOverviewV1Params,
+  IGetSqlManageRemediationOverviewV1Return
 } from './index.d';
 
 class SqlManageService extends ServiceBase {
@@ -66,6 +72,34 @@ class SqlManageService extends ServiceBase {
     );
   }
 
+  public exportGlobalSqlManageRemediationV1(
+    params: IExportGlobalSqlManageRemediationV1Params = {},
+    options?: AxiosRequestConfig
+  ) {
+    const paramsData = this.cloneDeep(params);
+
+    return this.get<any>(
+      `/v1/sql_manages/remediation_exports`,
+      paramsData,
+      options
+    );
+  }
+
+  public exportSqlManageRemediationV1(
+    params: IExportSqlManageRemediationV1Params,
+    options?: AxiosRequestConfig
+  ) {
+    const paramsData = this.cloneDeep(params);
+    const project_name = paramsData.project_name;
+    delete paramsData.project_name;
+
+    return this.get<any>(
+      `/v1/projects/${project_name}/sql_manages/remediation_exports`,
+      paramsData,
+      options
+    );
+  }
+
   public GetSqlManageRuleTips(
     params: IGetSqlManageRuleTipsParams,
     options?: AxiosRequestConfig
@@ -113,6 +147,39 @@ class SqlManageService extends ServiceBase {
       options
     );
   }
+
+  public GetSqlManageRemediationV1(
+    params: IGetSqlManageRemediationV1Params,
+    options?: AxiosRequestConfig
+  ) {
+    const paramsData = this.cloneDeep(params);
+    const project_name = paramsData.project_name;
+    delete paramsData.project_name;
+
+    const sql_manage_id = paramsData.sql_manage_id;
+    delete paramsData.sql_manage_id;
+
+    return this.get<IGetSqlManageRemediationV1Return>(
+      `/v1/projects/${project_name}/sql_manages/${sql_manage_id}/remediation`,
+      paramsData,
+      options
+    );
+  }
+
+  public getSqlManageRemediationOverviewV1(
+    params: IGetSqlManageRemediationOverviewV1Params,
+    options?: AxiosRequestConfig
+  ) {
+    const paramsData = this.cloneDeep(params);
+    const project_name = paramsData.project_name;
+    delete paramsData.project_name;
+
+    return this.get<IGetSqlManageRemediationOverviewV1Return>(
+      `/v1/projects/${project_name}/sql_manages/remediation_overview`,
+      paramsData,
+      options
+    );
+  }
 }
 
 export default new SqlManageService();

packages/shared/lib/api/sqle/service/audit_whitelist/index.d.ts

@@ -2,7 +2,10 @@ import {
   IGetAuditWhitelistResV1,
   ICreateAuditWhitelistReqV1,
   IBaseRes,
-  IUpdateAuditWhitelistReqV1
+  IUpdateAuditWhitelistReqV1,
+  ISQLRuleExceptionResV1,
+  ICreateSQLRuleExceptionReqV1,
+  IGetSQLRuleExceptionResV1
 } from '../common.d';
 
 export interface IGetAuditWhitelistV1Params {
@@ -42,3 +45,45 @@ export interface IUpdateAuditWhitelistByIdV1Params
 }
 
 export interface IUpdateAuditWhitelistByIdV1Return extends IBaseRes {}
+
+export interface ICreateSQLRuleExceptionV1Params
+  extends ICreateSQLRuleExceptionReqV1 {
+  project_name: string;
+}
+
+export interface ICreateSQLRuleExceptionV1Return extends IBaseRes {
+  data?: ISQLRuleExceptionResV1;
+}
+
+export interface IGetSQLRuleExceptionV1Params {
+  project_name: string;
+
+  fuzzy_search_value?: string;
+
+  filter_instance_id?: string;
+
+  filter_rule_name?: string;
+
+  filter_created_by?: string;
+
+  filter_created_time_from?: string;
+
+  filter_created_time_to?: string;
+
+  filter_sql_fingerprint?: string;
+
+  page_index: string;
+
+  page_size: string;
+}
+
+export interface IGetSQLRuleExceptionV1Return
+  extends IGetSQLRuleExceptionResV1 {}
+
+export interface IDeleteSQLRuleExceptionV1Params {
+  project_name: string;
+
+  sql_rule_exception_id: string;
+}
+
+export interface IDeleteSQLRuleExceptionV1Return extends IBaseRes {}