From a6b5caaa9ddc9055e55228fdc9af86f68ee2f6f1 Mon Sep 17 00:00:00 2001 From: zzx <2651787250@qq.com> Date: Fri, 2 Feb 2024 02:39:09 +0800 Subject: [PATCH] fourth improve --- .../entity/{ => group}/GroupEntity.java | 2 +- .../{ => groupmember}/GroupMemberEntity.java | 2 +- .../console/entity/{ => log}/LogEntity.java | 5 ++-- .../entity/{ => topic}/TopicEntity.java | 2 +- .../dashboard/console/log/OprLog.java | 8 ++++--- .../console/mapper/group/OprGroupMapper.java | 5 ++-- .../groupmember/OprGroupMemberMapper.java | 17 ++++++------- .../console/mapper/log/OprLogMapper.java | 23 ++++++++++-------- .../console/mapper/topic/TopicMapper.java | 24 +++++++++++-------- 9 files changed, 49 insertions(+), 39 deletions(-) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/{ => group}/GroupEntity.java (95%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/{ => groupmember}/GroupMemberEntity.java (94%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/{ => log}/LogEntity.java (93%) rename eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/{ => topic}/TopicEntity.java (95%) diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/GroupEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/group/GroupEntity.java similarity index 95% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/GroupEntity.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/group/GroupEntity.java index 4b5d6c6a..c395bac3 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/GroupEntity.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/group/GroupEntity.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.entity; +package org.apache.eventmesh.dashboard.console.entity.group; import java.sql.Timestamp; diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/GroupMemberEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/groupmember/GroupMemberEntity.java similarity index 94% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/GroupMemberEntity.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/groupmember/GroupMemberEntity.java index 9433d6d0..dbadc1eb 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/GroupMemberEntity.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/groupmember/GroupMemberEntity.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.entity; +package org.apache.eventmesh.dashboard.console.entity.groupmember; import java.sql.Timestamp; diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/LogEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/log/LogEntity.java similarity index 93% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/LogEntity.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/log/LogEntity.java index c5ea1e21..49e3c236 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/LogEntity.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/log/LogEntity.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.entity; +package org.apache.eventmesh.dashboard.console.entity.log; import java.sql.Timestamp; @@ -34,7 +34,7 @@ public class LogEntity { private String operationType; - private String operationTarget; + private String targetType; private Integer status; @@ -47,4 +47,5 @@ public class LogEntity { private String operationUser; private String resultContent; + } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/TopicEntity.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/topic/TopicEntity.java similarity index 95% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/TopicEntity.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/topic/TopicEntity.java index 94f1de6c..6b4bd09c 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/TopicEntity.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/entity/topic/TopicEntity.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.entity; +package org.apache.eventmesh.dashboard.console.entity.topic; import java.sql.Timestamp; diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/log/OprLog.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/log/OprLog.java index db20f021..11762d24 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/log/OprLog.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/log/OprLog.java @@ -18,7 +18,7 @@ package org.apache.eventmesh.dashboard.console.log; import org.apache.eventmesh.dashboard.console.annotation.EmLog; -import org.apache.eventmesh.dashboard.console.entity.LogEntity; +import org.apache.eventmesh.dashboard.console.entity.log.LogEntity; import org.apache.eventmesh.dashboard.console.service.log.LogService; import java.lang.reflect.Field; @@ -67,8 +67,9 @@ public Object logStart(ProceedingJoinPoint joinPoint) throws Throwable { LogEntity logEntity = this.productLoEntity(declaredAnnotation, joinPoint); logService.addLog(logEntity); logEntity.setEndTime(new Timestamp(System.currentTimeMillis())); + Object proceed = null; try { - Object proceed = joinPoint.proceed(); + proceed = joinPoint.proceed(); logEntity.setStatus(2); logEntity.setResultContent(Objects.isNull(proceed) ? "" : proceed.toString()); return proceed; @@ -76,6 +77,7 @@ public Object logStart(ProceedingJoinPoint joinPoint) throws Throwable { logEntity.setStatus(3); throw new RuntimeException(e); } finally { + logEntity.setResultContent(proceed.toString()); logService.updateLog(logEntity); } @@ -94,7 +96,7 @@ public LogEntity productLoEntity(EmLog declaredAnnotation, ProceedingJoinPoint j logEntity.setClusterId(opClusterPhyId); logEntity.setDescription(model.toString()); logEntity.setOperationType(declaredAnnotation.OprType()); - logEntity.setOperationTarget(declaredAnnotation.OprTarget()); + logEntity.setTargetType(declaredAnnotation.OprTarget()); logEntity.setStatus(1); logEntity.setCreateTime(new Timestamp(System.currentTimeMillis())); return logEntity; diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/group/OprGroupMapper.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/group/OprGroupMapper.java index 2a2ae8e7..2c333cc2 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/group/OprGroupMapper.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/group/OprGroupMapper.java @@ -17,7 +17,7 @@ package org.apache.eventmesh.dashboard.console.mapper.group; -import org.apache.eventmesh.dashboard.console.entity.GroupEntity; +import org.apache.eventmesh.dashboard.console.entity.group.GroupEntity; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; @@ -36,8 +36,7 @@ public interface OprGroupMapper { @Insert("INSERT INTO `group` (cluster_id, name, member_count, members, type, state)" + "VALUE (#{clusterId},#{name},#{memberCount},#{members},#{type},#{state}) " - + "on duplicate key update is_delete=0" - ) + + "on duplicate key update is_delete=0") @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") void addGroup(GroupEntity groupEntity); diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/groupmember/OprGroupMemberMapper.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/groupmember/OprGroupMemberMapper.java index ff58ef07..43bc7102 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/groupmember/OprGroupMemberMapper.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/groupmember/OprGroupMemberMapper.java @@ -18,7 +18,7 @@ package org.apache.eventmesh.dashboard.console.mapper.groupmember; -import org.apache.eventmesh.dashboard.console.entity.GroupMemberEntity; +import org.apache.eventmesh.dashboard.console.entity.groupmember.GroupMemberEntity; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; @@ -39,24 +39,24 @@ public interface OprGroupMemberMapper { @Select("select * from group_member where cluster_id=#{clusterId} and is_delete=0") List getGroupByClusterId(GroupMemberEntity groupMemberEntity); - @Insert("insert into group_member (cluster_id, topic_name, group_name, eventmesh_user)" - + " VALUE (#{clusterId},#{topicName},#{groupName},#{eventMeshUser})" + @Insert("insert into group_member (cluster_id, topic_name, group_name, eventmesh_user,state)" + + " VALUE (#{clusterId},#{topicName},#{groupName},#{eventMeshUser},#{state})" + "on duplicate key update is_delete=0") @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") - GroupMemberEntity addGroupMember(GroupMemberEntity groupMemberEntity); + void addGroupMember(GroupMemberEntity groupMemberEntity); @Update("update group_member set state=#{state} where id=#{id}") @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") - GroupMemberEntity updateGroupMember(GroupMemberEntity groupMemberEntity); + void updateGroupMember(GroupMemberEntity groupMemberEntity); @Delete("update group_member set is_delete=1 where id=#{id} ") @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") GroupMemberEntity deleteGroupMember(GroupMemberEntity groupMemberEntity); - @Select("select * from group_member where cluster_id=#{clusterId} and group_name=#{groupName} and topic_name=#{topicName}") + @Select("select * from group_member where cluster_id=#{clusterId} and group_name=#{groupName} and topic_name=#{topicName} and is_delete=0") GroupMemberEntity selectGroupMemberByUnique(GroupMemberEntity groupMemberEntity); - @Select("select * from group_member where id=#{id}") + @Select("select * from group_member where id=#{id} and is_delete=0") GroupMemberEntity selectGroupMemberById(GroupMemberEntity groupMemberEntity); @Select("") List selectAllMemberByDynamic(GroupMemberEntity groupMemberEntity); @Update("update group_member set state=#{state} where topic_name=#{topicName}") - GroupMemberEntity updateMemberByTopic(GroupMemberEntity groupMemberEntity); + void updateMemberByTopic(GroupMemberEntity groupMemberEntity); } \ No newline at end of file diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/log/OprLogMapper.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/log/OprLogMapper.java index 240f85cd..d6c96f72 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/log/OprLogMapper.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/log/OprLogMapper.java @@ -17,7 +17,7 @@ package org.apache.eventmesh.dashboard.console.mapper.log; -import org.apache.eventmesh.dashboard.console.entity.LogEntity; +import org.apache.eventmesh.dashboard.console.entity.log.LogEntity; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; @@ -36,22 +36,25 @@ public interface OprLogMapper { @Select("") + + "" + + "and cluster_id=#{clusterId} " + + "" + + "and is_delete=0" + + "" + + "") List getLogList(LogEntity logEntity); - @Insert("insert into operation_log ( cluster_id, operation_type,operation_target, description,operation_user)" - + "VALUE (#{clusterId},#{operationType},#{operationTarget},#{description},#{operationUser})") + @Insert("insert into operation_log ( cluster_id, operation_type,target_Type, description,operation_user,result_content)" + + "VALUE (#{clusterId},#{operationType},#{targetType},#{description},#{operationUser},#{resultContent})") @SelectKey(keyColumn = "id", statement = {" select last_insert_id()"}, keyProperty = "id", before = false, resultType = Long.class) Long addLog(LogEntity logEntity); - @Update("update operation_log set status=#{status} where id=#{id}") + @Update("update operation_log set status=#{status} ,result_content=#{resultContent} where id=#{id}") Integer updateLog(LogEntity logEntity); } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/topic/TopicMapper.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/topic/TopicMapper.java index b56b815b..146a60d8 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/topic/TopicMapper.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapper/topic/TopicMapper.java @@ -18,11 +18,12 @@ package org.apache.eventmesh.dashboard.console.mapper.topic; -import org.apache.eventmesh.dashboard.console.entity.TopicEntity; +import org.apache.eventmesh.dashboard.console.entity.topic.TopicEntity; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Options; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; @@ -38,25 +39,28 @@ public interface TopicMapper { @Select("") - List getTopicListByClusterId(TopicEntity topicEntity); + List getTopicListByDynamic(TopicEntity topicEntity); @Insert("INSERT INTO topic (cluster_id, topic_name, runtime_id, storage_id, retention_ms, type, description) " - + "VALUE (#{clusterId},#{topicName},#{runtimeId},#{storageId},#{retentionMs},#{type},#{description})") - TopicEntity addTopic(TopicEntity topicEntity); + + "VALUE (#{clusterId},#{topicName},#{runtimeId},#{storageId},#{retentionMs},#{type},#{description})" + + "on duplicate key update is_delete = 0") + @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id") + void addTopic(TopicEntity topicEntity); @Update("update topic set type=#{type},description=#{description} where id=#{id}") - TopicEntity updateTopic(TopicEntity topicEntity); + void updateTopic(TopicEntity topicEntity); @Delete("update `topic` set is_delete=1 where id=#{id}") - TopicEntity deleteTopic(TopicEntity topicEntity); + void deleteTopic(TopicEntity topicEntity); @Select("select * from topic where cluster_id=#{clusterId} and topic_name=#{topicName}") TopicEntity selectTopicByUnique(TopicEntity topicEntity);