diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/model/vo/audit/SqlAuditVO.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/model/vo/audit/SqlAuditVO.java index 0a888a085..3b0eb912d 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/model/vo/audit/SqlAuditVO.java +++ b/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; diff --git a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/service/audit/SqlAuditServiceImpl.java b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/service/audit/SqlAuditServiceImpl.java index e4dbe330c..8c3207d94 100644 --- a/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/service/audit/SqlAuditServiceImpl.java +++ b/backend/clouddm-platform/cgdm-console/src/main/java/com/clougence/clouddm/console/web/service/audit/SqlAuditServiceImpl.java @@ -17,7 +17,10 @@ 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; @@ -25,6 +28,8 @@ 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 queryUserAllAudit(String puid, String uid, SecQueryKind return new ArrayList<>(); } - return auditDOs.stream().map(SqlAuditVO::convertFromDO).collect(Collectors.toList()); + Map 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()); } } diff --git a/frontend/src/store/actions.js b/frontend/src/store/actions.js index 0e5e6d0bd..b794f998b 100644 --- a/frontend/src/store/actions.js +++ b/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); } diff --git a/frontend/src/views/system/SqlLog.vue b/frontend/src/views/system/SqlLog.vue index c0353ba29..d0b5c4553 100644 --- a/frontend/src/views/system/SqlLog.vue +++ b/frontend/src/views/system/SqlLog.vue @@ -101,6 +101,15 @@
{{ formatUid(row.uid) }}
+