feat(audit): improve operation audit list and export (#70) flow

backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/model/vo/audit/SqlAuditVO.java

@@ -33,7 +33,7 @@ public class SqlAuditVO {
 
     private Long           id;
 
-    //    private String    uid;
+    private String         uid;
     private String         userName;
     private String         primaryUid;
 
@@ -53,6 +53,8 @@ public class SqlAuditVO {
 
     private Long           dsId;
     private String         dsDesc;
+    private String         dsResourceId;
+    private String         dsRemark;
     private DataSourceType dataSourceType;
     private String         message;
 
@@ -68,7 +70,8 @@ public static SqlAuditVO convertFromDO(DmExecSqlAuditDO auditDO) {
         }
 
         vo.setDataSourceType(auditDO.getDataSourceType());
-        vo.setUserName(auditDO.getUserName() + "(" + auditDO.getUid() + ")");
+        vo.setUid(auditDO.getUid());
+        vo.setUserName(auditDO.getUserName());
         vo.setPrimaryUid(auditDO.getPrimaryUid());
         vo.setOperateTime(auditDO.getOperateTime());
         vo.setExecSql(auditDO.getExecSql());
@@ -86,6 +89,7 @@ public static SqlAuditVO convertFromDO(DmExecSqlAuditDO auditDO) {
 
         vo.setDsId(auditDO.getDsId());
         vo.setDsDesc(auditDO.getDsDesc());
+        vo.setDsResourceId(auditDO.getDsDesc());
         vo.setMessage(auditDO.getMessage());
 
         return vo;

backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/service/audit/SqlAuditServiceImpl.java

@@ -17,14 +17,19 @@
 
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 
 import com.clougence.clouddm.api.console.sqlaudit.SqlStatus;
 import com.clougence.clouddm.console.web.model.vo.audit.SqlAuditVO;
 import com.clougence.clouddm.platform.dal.access.ExecutionDal;
+import com.clougence.clouddm.platform.dal.access.ObjectCacheDao;
+import com.clougence.clouddm.platform.dal.access.entry.DsCacheEntry;
 import com.clougence.clouddm.platform.dal.model.execution.DmExecSqlAuditDO;
 import com.clougence.clouddm.sdk.security.auth.SecQueryKind;
 import com.clougence.clouddm.sdk.service.secrules.Requester;
@@ -38,6 +43,9 @@ public class SqlAuditServiceImpl implements SqlAuditService {
     @Resource
     private ExecutionDal executionDal;
 
+    @Resource
+    private ObjectCacheDao objectCacheDao;
+
     private final int    DEFAULT_PAGE_SIZE = 20;
     private final int    MAX_PAGE_SIZE     = 60;
 
@@ -55,6 +63,17 @@ public List<SqlAuditVO> queryUserAllAudit(String puid, String uid, SecQueryKind
             return new ArrayList<>();
         }
 
-        return auditDOs.stream().map(SqlAuditVO::convertFromDO).collect(Collectors.toList());
+        Map<Long, DsCacheEntry> dsCacheById = new HashMap<>();
+        auditDOs.stream().map(DmExecSqlAuditDO::getDsId).filter(Objects::nonNull).distinct().forEach(id -> dsCacheById.put(id, objectCacheDao.queryByDsId(id)));
+
+        return auditDOs.stream().map(auditDO -> {
+            SqlAuditVO vo = SqlAuditVO.convertFromDO(auditDO);
+            DsCacheEntry dsCache = dsCacheById.get(auditDO.getDsId());
+            if (dsCache != null) {
+                vo.setDsResourceId(dsCache.getDsInstId());
+                vo.setDsRemark(dsCache.getDsInstDesc());
+            }
+            return vo;
+        }).collect(Collectors.toList());
     }
 }

frontend/src/store/actions.js

@@ -171,8 +171,7 @@ export default {
     // }
   },
   async getClusterList({ commit }, deployEnvType) {
-    const data = deployEnvType ? { cloudOrIdcName: deployEnvType } : {};
-    const res = await services.dmClusterListByCondition({ data });
+    const res = await services.dmConstantListCluster({ data: { deployEnvType } });
     if (res.success) {
       commit(UPDATE_CLUSTER_LIST, res.data);
     }

frontend/src/views/system/SqlLog.vue

@@ -101,6 +101,15 @@
                   <div class="operator-uid">{{ formatUid(row.uid) }}</div>
                 </div>
               </template>
+              <template #datasource="{ row }">
+                <div class="datasource-cell">
+                  <div class="datasource-id">
+                    <CustomIcon :type="row.dataSourceType" />
+                    <span>{{ row.dsResourceId }}</span>
+                  </div>
+                  <div class="datasource-desc">{{ formatDsRemark(row.dsRemark) }}</div>
+                </div>
+              </template>
               <template #resource="{ row }">
                 <Tooltip :content="row.resource" placement="top" transfer>
                   <span class="sql-log-resource-cell">
@@ -243,15 +252,8 @@ export default {
         },
         {
           title: this.$t('shu-ju-yuan'),
-          key: 'dsDesc',
-          width: 300,
-          render: (_, params) => {
-            const row = params.row || params;
-            return h('div', { style: { display: 'flex', alignItems: 'center' } }, [
-              h(resolveComponent('CustomIcon'), { type: row.dataSourceType }),
-              h('span', { style: { marginLeft: '6px' } }, row.dsDesc)
-            ]);
-          }
+          slot: 'datasource',
+          width: 300
         },
         {
           title: this.$t('cao-zuo-zi-yuan'),
@@ -472,6 +474,10 @@ export default {
       return `UID: ${uid || ''}`;
     },
 
+    formatDsRemark(dsRemark) {
+      return `备注: ${dsRemark || ''}`;
+    },
+
     showSqlDetail(row) {
       this.selectedRow = row;
       this.showSqlModal = true;
@@ -500,6 +506,21 @@ export default {
     }
   }
 
+  .datasource-cell {
+    line-height: 20px;
+
+    .datasource-id {
+      display: flex;
+      align-items: center;
+      gap: 6px;
+    }
+
+    .datasource-desc {
+      color: #9ea7b4;
+      font-size: 12px;
+    }
+  }
+
   .sql-content {
     .sql-text {
       display: inline-block;