diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/ConnectionController.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/ConnectionController.java index 1fd36661..f1f492f3 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/ConnectionController.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/ConnectionController.java @@ -69,7 +69,6 @@ public AddConnectionDTO showCreateConnectionMessage() { public String createConnection(@Validated @RequestBody CreateConnectionDTO createConnectionDTO) { try { connectionDataService.createConnection(createConnectionDTO); - } catch (Exception e) { return e.getMessage(); } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/cluster/ClusterController.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/cluster/ClusterController.java index 35566305..863655b0 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/cluster/ClusterController.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/cluster/ClusterController.java @@ -43,12 +43,9 @@ public class ClusterController { @Autowired ClusterService clusterService; - - - @GetMapping("queryHomeClusterData") public GetClusterBaseMessageVO queryHomeClusterData(@RequestBody @Validated ClusterIdDTO clusterIdDTO) { - return clusterService.selectClusterBaseMessage(clusterIdDTO); + return clusterService.selectClusterBaseMessage(clusterIdDTO.getClusterId()); } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/function/ConfigController.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/function/ConfigController.java index c9ddb1d7..31c36e33 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/function/ConfigController.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/function/ConfigController.java @@ -18,6 +18,7 @@ package org.apache.eventmesh.dashboard.console.controller.function; import org.apache.eventmesh.dashboard.console.entity.function.ConfigEntity; +import org.apache.eventmesh.dashboard.console.mapstruct.config.ConfigControllerMapper; import org.apache.eventmesh.dashboard.console.modle.dto.config.DetailConfigsVO; import org.apache.eventmesh.dashboard.console.modle.dto.config.GetConfigsListDTO; import org.apache.eventmesh.dashboard.console.modle.dto.config.UpdateConfigDTO; @@ -45,7 +46,7 @@ public class ConfigController { public String updateConfigsByTypeAndId(@Validated @RequestBody UpdateConfigDTO updateConfigDTO) { try { configService.updateConfigsByInstanceId(updateConfigDTO.getUsername(), updateConfigDTO.getClusterId(), updateConfigDTO.getInstanceType(), - updateConfigDTO.getInstanceId(), updateConfigDTO.getChangeConfigDTOS()); + updateConfigDTO.getInstanceId(), updateConfigDTO.getChangeConfigEntities()); } catch (Exception e) { return e.getMessage(); } @@ -55,10 +56,8 @@ public String updateConfigsByTypeAndId(@Validated @RequestBody UpdateConfigDTO u @PostMapping("/getInstanceDetailConfigs") public List getInstanceDetailConfigs(@Validated @RequestBody GetConfigsListDTO getConfigsListDTO) { - List configEntityList = configService.selectToFront(getConfigsListDTO.getInstanceId(), - getConfigsListDTO.getInstanceType(), getConfigsListDTO); - Map stringStringConcurrentHashMap = configService.selectDefaultConfig(getConfigsListDTO.getBusinessType(), - getConfigsListDTO.getInstanceId(), getConfigsListDTO.getInstanceType()); + List configEntityList = configService.selectToFront(ConfigControllerMapper.INSTANCE.queryEntityByConfig(getConfigsListDTO)); + Map stringStringConcurrentHashMap = configService.selectDefaultConfig(getConfigsListDTO.getBusinessType()); ArrayList showDetailConfigsVOS = new ArrayList<>(); configEntityList.forEach(n -> { DetailConfigsVO showDetailConfigsVO = new DetailConfigsVO(); diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/function/LogController.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/function/LogController.java index 6249e4ea..36ec3d09 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/function/LogController.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/controller/function/LogController.java @@ -18,6 +18,7 @@ package org.apache.eventmesh.dashboard.console.controller.function; import org.apache.eventmesh.dashboard.console.entity.function.LogEntity; +import org.apache.eventmesh.dashboard.console.mapstruct.log.LogControllerMapper; import org.apache.eventmesh.dashboard.console.modle.dto.log.GetLogListDTO; import org.apache.eventmesh.dashboard.console.service.function.LogService; @@ -39,7 +40,7 @@ public class LogController { @PostMapping("/getList") public List getLogLIstToFront(@Validated @RequestBody GetLogListDTO getLogListDTO) { - return logService.selectLogListByCluster(getLogListDTO); + return logService.selectLogListByCluster(LogControllerMapper.INSTANCE.queryEntityByLog(getLogListDTO)); } } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapstruct/config/ConfigControllerMapper.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapstruct/config/ConfigControllerMapper.java new file mode 100644 index 00000000..d0f92828 --- /dev/null +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapstruct/config/ConfigControllerMapper.java @@ -0,0 +1,39 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.eventmesh.dashboard.console.mapstruct.config; + + +import org.apache.eventmesh.dashboard.console.entity.function.ConfigEntity; +import org.apache.eventmesh.dashboard.console.entity.function.LogEntity; +import org.apache.eventmesh.dashboard.console.modle.dto.config.GetConfigsListDTO; +import org.apache.eventmesh.dashboard.console.modle.dto.log.GetLogListDTO; + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * + */ + +@Mapper +public interface ConfigControllerMapper { + + ConfigControllerMapper INSTANCE = Mappers.getMapper(ConfigControllerMapper.class); + + public ConfigEntity queryEntityByConfig(GetConfigsListDTO getConfigsListDTO); +} diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapstruct/log/LogControllerMapper.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapstruct/log/LogControllerMapper.java new file mode 100644 index 00000000..03c5302a --- /dev/null +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/mapstruct/log/LogControllerMapper.java @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.eventmesh.dashboard.console.mapstruct.log; + +import org.apache.eventmesh.dashboard.console.entity.function.LogEntity; +import org.apache.eventmesh.dashboard.console.modle.dto.log.GetLogListDTO; + + +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * + */ +@Mapper +public interface LogControllerMapper { + + LogControllerMapper INSTANCE = Mappers.getMapper(LogControllerMapper.class); + + + LogEntity queryEntityByLog(GetLogListDTO getLogListDTO); + +} diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/cluster/runtime/QueryRuntimeListByClusterIdDTO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/cluster/runtime/QueryRuntimeListByClusterIdDTO.java index 0e6eab28..5cccc897 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/cluster/runtime/QueryRuntimeListByClusterIdDTO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/cluster/runtime/QueryRuntimeListByClusterIdDTO.java @@ -19,12 +19,8 @@ import org.apache.eventmesh.dashboard.console.modle.ClusterIdDTO; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class QueryRuntimeListByClusterIdDTO extends ClusterIdDTO { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/ChangeConfigDTO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/config/ChangeConfigEntity.java similarity index 82% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/ChangeConfigDTO.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/config/ChangeConfigEntity.java index d0bdc23c..bf167b1e 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/ChangeConfigDTO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/config/ChangeConfigEntity.java @@ -15,16 +15,12 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.modle.dto.config; +package org.apache.eventmesh.dashboard.console.modle.config; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data -public class ChangeConfigDTO { +public class ChangeConfigEntity { private String configName; diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/UpdateConfigsLog.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/config/UpdateConfigsLog.java similarity index 85% rename from eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/UpdateConfigsLog.java rename to eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/config/UpdateConfigsLog.java index 9619c7f1..6dafeef6 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/UpdateConfigsLog.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/config/UpdateConfigsLog.java @@ -15,15 +15,11 @@ * limitations under the License. */ -package org.apache.eventmesh.dashboard.console.modle.dto.config; +package org.apache.eventmesh.dashboard.console.modle.config; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class UpdateConfigsLog { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/DetailConfigsVO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/DetailConfigsVO.java index bda02fa5..1796fa53 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/DetailConfigsVO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/DetailConfigsVO.java @@ -17,12 +17,8 @@ package org.apache.eventmesh.dashboard.console.modle.dto.config; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class DetailConfigsVO { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/GetConfigsListDTO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/GetConfigsListDTO.java index 478b1acf..e1420a24 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/GetConfigsListDTO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/GetConfigsListDTO.java @@ -17,12 +17,8 @@ package org.apache.eventmesh.dashboard.console.modle.dto.config; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class GetConfigsListDTO { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/UpdateConfigDTO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/UpdateConfigDTO.java index 8c273b81..69232c0f 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/UpdateConfigDTO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/config/UpdateConfigDTO.java @@ -17,20 +17,18 @@ package org.apache.eventmesh.dashboard.console.modle.dto.config; +import org.apache.eventmesh.dashboard.console.modle.config.ChangeConfigEntity; + import java.util.List; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class UpdateConfigDTO { private Long clusterId; - private List changeConfigDTOS; + private List changeConfigEntities; private String username; diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/AddConnectionDTO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/AddConnectionDTO.java index 0a7c23e2..63438145 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/AddConnectionDTO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/AddConnectionDTO.java @@ -17,12 +17,8 @@ package org.apache.eventmesh.dashboard.console.modle.dto.connection; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class AddConnectionDTO { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/AddConnectorConfigDTO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/AddConnectorConfigDTO.java index 8ffc2cec..aa6801cf 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/AddConnectorConfigDTO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/AddConnectorConfigDTO.java @@ -25,8 +25,6 @@ import lombok.Data; import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class AddConnectorConfigDTO { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/CreateConnectionDTO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/CreateConnectionDTO.java index 1a63e0a7..6352038f 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/CreateConnectionDTO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/CreateConnectionDTO.java @@ -17,12 +17,8 @@ package org.apache.eventmesh.dashboard.console.modle.dto.connection; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class CreateConnectionDTO { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/GetConnectionListDTO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/GetConnectionListDTO.java index 63a97d27..ea5936d0 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/GetConnectionListDTO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/connection/GetConnectionListDTO.java @@ -17,12 +17,8 @@ package org.apache.eventmesh.dashboard.console.modle.dto.connection; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class GetConnectionListDTO { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/log/GetLogListDTO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/log/GetLogListDTO.java index 63ae0f7a..cd086ba9 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/log/GetLogListDTO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/log/GetLogListDTO.java @@ -17,12 +17,8 @@ package org.apache.eventmesh.dashboard.console.modle.dto.log; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class GetLogListDTO { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/meta/NewMetaDTO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/meta/NewMetaDTO.java index 7ce8c37f..ff0888c2 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/meta/NewMetaDTO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/meta/NewMetaDTO.java @@ -17,12 +17,8 @@ package org.apache.eventmesh.dashboard.console.modle.dto.meta; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class NewMetaDTO { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/topic/GetTopicListDTO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/topic/GetTopicListDTO.java index 169b9bc9..b3652781 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/topic/GetTopicListDTO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/dto/topic/GetTopicListDTO.java @@ -18,12 +18,8 @@ package org.apache.eventmesh.dashboard.console.modle.dto.topic; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class GetTopicListDTO { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/cluster/GetClusterBaseMessageVO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/cluster/GetClusterBaseMessageVO.java index 3c4c9f72..fde7d2ef 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/cluster/GetClusterBaseMessageVO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/cluster/GetClusterBaseMessageVO.java @@ -17,12 +17,8 @@ package org.apache.eventmesh.dashboard.console.modle.vo.cluster; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class GetClusterBaseMessageVO { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/cluster/ResourceNumVO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/cluster/ResourceNumVO.java index 13794078..95deb96e 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/cluster/ResourceNumVO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/cluster/ResourceNumVO.java @@ -17,12 +17,8 @@ package org.apache.eventmesh.dashboard.console.modle.vo.cluster; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class ResourceNumVO { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/connection/ConnectionListVO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/connection/ConnectionListVO.java index a9b40829..61846b9d 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/connection/ConnectionListVO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/connection/ConnectionListVO.java @@ -17,13 +17,9 @@ package org.apache.eventmesh.dashboard.console.modle.vo.connection; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; @Data -@AllArgsConstructor -@NoArgsConstructor public class ConnectionListVO { private Long sinkConnectorId; diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/health/InstanceLiveProportionVo.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/health/InstanceLiveProportionVo.java index 2277c10c..9abd0d26 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/health/InstanceLiveProportionVo.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/health/InstanceLiveProportionVo.java @@ -17,12 +17,8 @@ package org.apache.eventmesh.dashboard.console.modle.vo.health; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class InstanceLiveProportionVo { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/topic/TopicDetailGroupVO.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/topic/TopicDetailGroupVO.java index aebeb7a4..10581e5e 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/topic/TopicDetailGroupVO.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/modle/vo/topic/TopicDetailGroupVO.java @@ -19,12 +19,8 @@ import java.util.List; -import lombok.AllArgsConstructor; import lombok.Data; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@AllArgsConstructor @Data public class TopicDetailGroupVO { diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/OverviewService.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/OverviewService.java index e966e280..cf919fd7 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/OverviewService.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/OverviewService.java @@ -17,7 +17,7 @@ package org.apache.eventmesh.dashboard.console.service; -import org.apache.eventmesh.dashboard.console.modle.function.OverviewDTO; +import org.apache.eventmesh.dashboard.console.modle.function.OverviewType; /** * @@ -25,5 +25,5 @@ public interface OverviewService { - Object overview(OverviewDTO overviewDTO); + Object overview(OverviewType overviewType); } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/ClusterService.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/ClusterService.java index 0c5cf67e..66ecfb6e 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/ClusterService.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/ClusterService.java @@ -18,7 +18,6 @@ package org.apache.eventmesh.dashboard.console.service.cluster; import org.apache.eventmesh.dashboard.console.entity.cluster.ClusterEntity; -import org.apache.eventmesh.dashboard.console.modle.ClusterIdDTO; import org.apache.eventmesh.dashboard.console.modle.vo.cluster.GetClusterBaseMessageVO; import java.util.List; @@ -32,10 +31,10 @@ public interface ClusterService { void createCluster(ClusterEntity clusterEntity); - GetClusterBaseMessageVO selectClusterBaseMessage(ClusterIdDTO clusterIdDTO); + GetClusterBaseMessageVO selectClusterBaseMessage(Long clusterId); - Map queryHomeClusterData(ClusterIdDTO clusterIdDTO); + Map queryHomeClusterData(Long clusterId); Integer batchInsert(List clusterEntities); diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/impl/ClusterServiceImpl.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/impl/ClusterServiceImpl.java index 5b4f8421..3756faa4 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/impl/ClusterServiceImpl.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/cluster/impl/ClusterServiceImpl.java @@ -27,8 +27,7 @@ import org.apache.eventmesh.dashboard.console.mapper.cluster.RuntimeMapper; import org.apache.eventmesh.dashboard.console.mapper.message.OprGroupMapper; import org.apache.eventmesh.dashboard.console.mapper.message.TopicMapper; -import org.apache.eventmesh.dashboard.console.modle.ClusterIdDTO; -import org.apache.eventmesh.dashboard.console.modle.function.OverviewDTO; +import org.apache.eventmesh.dashboard.console.modle.function.OverviewType; import org.apache.eventmesh.dashboard.console.modle.vo.cluster.GetClusterBaseMessageVO; import org.apache.eventmesh.dashboard.console.service.OverviewService; import org.apache.eventmesh.dashboard.console.service.cluster.ClusterService; @@ -65,8 +64,7 @@ public void createCluster(ClusterEntity clusterEntity) { } @Override - public GetClusterBaseMessageVO selectClusterBaseMessage(ClusterIdDTO clusterIdDTO) { - Long clusterId = clusterIdDTO.getClusterId(); + public GetClusterBaseMessageVO selectClusterBaseMessage(Long clusterId) { GetClusterBaseMessageVO getClusterBaseMessageVO = new GetClusterBaseMessageVO(); TopicEntity topicEntity = new TopicEntity(); topicEntity.setClusterId(clusterId); @@ -84,7 +82,7 @@ public GetClusterBaseMessageVO selectClusterBaseMessage(ClusterIdDTO clusterIdDT } @Override - public Map queryHomeClusterData(ClusterIdDTO clusterIdDTO) { + public Map queryHomeClusterData(Long clusterId) { return null; } @@ -131,7 +129,7 @@ public Integer deactivate(ClusterEntity cluster) { } @Override - public Object overview(OverviewDTO overviewDTO) { + public Object overview(OverviewType overviewtype) { return null; } } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/ConfigService.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/ConfigService.java index 9f3ca75e..7c53e34c 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/ConfigService.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/ConfigService.java @@ -19,8 +19,7 @@ import org.apache.eventmesh.dashboard.console.entity.function.ConfigEntity; -import org.apache.eventmesh.dashboard.console.modle.dto.config.ChangeConfigDTO; -import org.apache.eventmesh.dashboard.console.modle.dto.config.GetConfigsListDTO; +import org.apache.eventmesh.dashboard.console.modle.config.ChangeConfigEntity; import java.util.List; import java.util.Map; @@ -31,9 +30,9 @@ */ public interface ConfigService { - List selectToFront(Long instanceId, Integer type, GetConfigsListDTO getConfigsListDTO); + List selectToFront(ConfigEntity configEntity); - void updateConfigsByInstanceId(String name, Long clusterId, Integer instanceType, Long instanceId, List changeConfigDTOList); + void updateConfigsByInstanceId(String name, Long clusterId, Integer instanceType, Long instanceId, List changeConfigEntityList); List selectAll(); @@ -51,7 +50,7 @@ public interface ConfigService { List selectByInstanceIdAndType(Long instanceId, Integer type); - Map selectDefaultConfig(String version, Long instanceId, Integer instanceType); + Map selectDefaultConfig(String businessType); } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/Impl/ConfigServiceImpl.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/Impl/ConfigServiceImpl.java index 1c31b47b..b6b42c1d 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/Impl/ConfigServiceImpl.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/Impl/ConfigServiceImpl.java @@ -21,9 +21,8 @@ import org.apache.eventmesh.dashboard.console.entity.DefaultConfigKey; import org.apache.eventmesh.dashboard.console.entity.function.ConfigEntity; import org.apache.eventmesh.dashboard.console.mapper.function.ConfigMapper; -import org.apache.eventmesh.dashboard.console.modle.dto.config.ChangeConfigDTO; -import org.apache.eventmesh.dashboard.console.modle.dto.config.GetConfigsListDTO; -import org.apache.eventmesh.dashboard.console.modle.dto.config.UpdateConfigsLog; +import org.apache.eventmesh.dashboard.console.modle.config.ChangeConfigEntity; +import org.apache.eventmesh.dashboard.console.modle.config.UpdateConfigsLog; import org.apache.eventmesh.dashboard.console.service.function.ConfigService; import java.util.Arrays; @@ -49,8 +48,8 @@ public class ConfigServiceImpl implements ConfigService { @EmLog(OprTarget = "Runtime", OprType = "UpdateConfigs") - public void logUpdateRuntimeConfigs(UpdateConfigsLog updateConfigsLog, List changeConfigDTOList) { - changeConfigDTOList.forEach(n -> { + public void logUpdateRuntimeConfigs(UpdateConfigsLog updateConfigsLog, List changeConfigEntityList) { + changeConfigEntityList.forEach(n -> { ConfigEntity config = new ConfigEntity(); config.setInstanceType(0); config.setInstanceId(updateConfigsLog.getInstanceId()); @@ -63,8 +62,8 @@ public void logUpdateRuntimeConfigs(UpdateConfigsLog updateConfigsLog, List changeConfigDTOList) { - changeConfigDTOList.forEach(n -> { + public void logUpdateStoreConfigs(UpdateConfigsLog updateConfigsLog, List changeConfigEntityList) { + changeConfigEntityList.forEach(n -> { ConfigEntity config = new ConfigEntity(); config.setInstanceType(1); config.setInstanceId(updateConfigsLog.getInstanceId()); @@ -77,8 +76,8 @@ public void logUpdateStoreConfigs(UpdateConfigsLog updateConfigsLog, List changeConfigDTOList) { - changeConfigDTOList.forEach(n -> { + public void logUpdateConnectorConfigs(UpdateConfigsLog updateConfigsLog, List changeConfigEntityList) { + changeConfigEntityList.forEach(n -> { ConfigEntity config = new ConfigEntity(); config.setInstanceType(2); config.setInstanceId(updateConfigsLog.getInstanceId()); @@ -91,8 +90,8 @@ public void logUpdateConnectorConfigs(UpdateConfigsLog updateConfigsLog, List changeConfigDTOList) { - changeConfigDTOList.forEach(n -> { + public void logUpdateTopicConfigs(UpdateConfigsLog updateConfigsLog, List changeConfigEntityList) { + changeConfigEntityList.forEach(n -> { ConfigEntity config = new ConfigEntity(); config.setInstanceType(3); config.setInstanceId(updateConfigsLog.getInstanceId()); @@ -105,22 +104,25 @@ public void logUpdateTopicConfigs(UpdateConfigsLog updateConfigsLog, List changeConfigDTOList) { + List changeConfigEntityList) { ConcurrentHashMap stringStringConcurrentHashMap = new ConcurrentHashMap<>(); - changeConfigDTOList.forEach(n -> { + changeConfigEntityList.forEach(n -> { stringStringConcurrentHashMap.put(n.getConfigName(), n.getConfigValue()); }); - UpdateConfigsLog updateConfigsLog = - new UpdateConfigsLog(instanceId, clusterId, name, this.mapToProperties(stringStringConcurrentHashMap)); + UpdateConfigsLog updateConfigsLog = new UpdateConfigsLog(); + updateConfigsLog.setInstanceId(instanceId); + updateConfigsLog.setClusterId(clusterId); + updateConfigsLog.setName(name); + updateConfigsLog.setConfigProperties(this.mapToProperties(stringStringConcurrentHashMap)); ConfigServiceImpl service = (ConfigServiceImpl) AopContext.currentProxy(); if (instanceType == 0) { - service.logUpdateRuntimeConfigs(updateConfigsLog, changeConfigDTOList); + service.logUpdateRuntimeConfigs(updateConfigsLog, changeConfigEntityList); } else if (instanceType == 1) { - service.logUpdateStoreConfigs(updateConfigsLog, changeConfigDTOList); + service.logUpdateStoreConfigs(updateConfigsLog, changeConfigEntityList); } else if (instanceType == 2) { - service.logUpdateConnectorConfigs(updateConfigsLog, changeConfigDTOList); + service.logUpdateConnectorConfigs(updateConfigsLog, changeConfigEntityList); } else if (instanceType == 3) { - service.logUpdateTopicConfigs(updateConfigsLog, changeConfigDTOList); + service.logUpdateTopicConfigs(updateConfigsLog, changeConfigEntityList); } } @@ -181,27 +183,9 @@ public List selectByInstanceIdAndType(Long instanceId, Integer typ return configMapper.selectByInstanceId(config); } - public ConfigEntity buildSearchCriteria(GetConfigsListDTO getConfigsListDTO, ConfigEntity configEntity) { - if (getConfigsListDTO != null) { - if (getConfigsListDTO.getConfigName() != null) { - configEntity.setConfigName(getConfigsListDTO.getConfigName()); - } - if (getConfigsListDTO.getIsModify() != null) { - configEntity.setIsModify(getConfigsListDTO.getIsModify()); - } - if (getConfigsListDTO.getAlreadyUpdate() != null) { - configEntity.setAlreadyUpdate(getConfigsListDTO.getAlreadyUpdate()); - } - } - return configEntity; - } @Override - public List selectToFront(Long instanceId, Integer type, GetConfigsListDTO getConfigsListDTO) { - ConfigEntity config = new ConfigEntity(); - config.setInstanceId(instanceId); - config.setInstanceType(type); - config = this.buildSearchCriteria(getConfigsListDTO, config); + public List selectToFront(ConfigEntity config) { return configMapper.selectConfigsToFrontWithDynamic(config); } @@ -217,7 +201,7 @@ public void insertDefaultConfigToCache() { } @Override - public Map selectDefaultConfig(String businessType, Long instanceId, Integer instanceType) { + public Map selectDefaultConfig(String businessType) { if (defaultConfigCache.size() == 0) { this.insertDefaultConfigToCache(); } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/Impl/LogServiceImpl.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/Impl/LogServiceImpl.java index 14a87bee..cc4ea338 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/Impl/LogServiceImpl.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/Impl/LogServiceImpl.java @@ -19,7 +19,6 @@ import org.apache.eventmesh.dashboard.console.entity.function.LogEntity; import org.apache.eventmesh.dashboard.console.mapper.function.OprLogMapper; -import org.apache.eventmesh.dashboard.console.modle.dto.log.GetLogListDTO; import org.apache.eventmesh.dashboard.console.service.function.LogService; import java.util.List; @@ -34,13 +33,7 @@ public class LogServiceImpl implements LogService { OprLogMapper oprLogMapper; @Override - public List selectLogListByCluster(GetLogListDTO getLogListDTO) { - LogEntity logEntity = new LogEntity(); - logEntity.setClusterId(getLogListDTO.getClusterId()); - logEntity.setTargetType(getLogListDTO.getTargetType()); - logEntity.setOperationType(getLogListDTO.getOperationType()); - logEntity.setState(getLogListDTO.getState()); - logEntity.setOperationUser(getLogListDTO.getOperationUser()); + public List selectLogListByCluster(LogEntity logEntity) { return oprLogMapper.selectLogListToFront(logEntity); } diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/LogService.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/LogService.java index 0ed0d79e..dd9b993f 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/LogService.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/function/LogService.java @@ -18,7 +18,7 @@ package org.apache.eventmesh.dashboard.console.service.function; import org.apache.eventmesh.dashboard.console.entity.function.LogEntity; -import org.apache.eventmesh.dashboard.console.modle.dto.log.GetLogListDTO; + import java.util.List; @@ -31,7 +31,7 @@ @Service public interface LogService { - List selectLogListByCluster(GetLogListDTO getLogListDTO); + List selectLogListByCluster(LogEntity logEntity); void insertLog(LogEntity logEntity); diff --git a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/message/impl/TopicServiceImpl.java b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/message/impl/TopicServiceImpl.java index 0d3b0cb3..45f5c4cc 100644 --- a/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/message/impl/TopicServiceImpl.java +++ b/eventmesh-dashboard-console/src/main/java/org/apache/eventmesh/dashboard/console/service/message/impl/TopicServiceImpl.java @@ -30,7 +30,6 @@ import org.apache.eventmesh.dashboard.console.mapper.message.OprGroupMemberMapper; import org.apache.eventmesh.dashboard.console.mapper.message.TopicMapper; import org.apache.eventmesh.dashboard.console.mapper.storage.StoreMapper; -import org.apache.eventmesh.dashboard.console.modle.dto.topic.GetTopicListDTO; import org.apache.eventmesh.dashboard.console.modle.vo.topic.TopicDetailGroupVO; import org.apache.eventmesh.dashboard.console.service.message.TopicService; @@ -146,12 +145,6 @@ public List selectTopiByCluster(TopicEntity topicEntity) { return topicMapper.selectTopicByCluster(topicEntity); } - - public TopicEntity buildSearchCriteria(GetTopicListDTO getTopicListDTO, TopicEntity topicEntity) { - topicEntity.setTopicName(getTopicListDTO.getTopicName()); - return topicEntity; - } - @Override public List selectTopicListToFront(TopicEntity topicEntity) { List topicEntityList = topicMapper.queryTopicsToFrontByClusterId(topicEntity);