From 544e143e98e50b5fca85c48e2ee244354a66e60e Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Sun, 19 May 2024 21:54:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- .../controller/DataCollectorController.java | 29 ++++++++++++++++-- .../dto/DeleteLocalStatusRequest.java | 4 +++ .../dto/GetLocalStatusRequest.java | 2 ++ .../dataCollector/dto/UpdateLocalStatus.java | 5 ++++ .../service/DataCollectorService.java | 30 +++++++++---------- 6 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 src/main/java/cn/lihongjie/coal/dataCollector/dto/DeleteLocalStatusRequest.java create mode 100644 src/main/java/cn/lihongjie/coal/dataCollector/dto/GetLocalStatusRequest.java create mode 100644 src/main/java/cn/lihongjie/coal/dataCollector/dto/UpdateLocalStatus.java diff --git a/README.md b/README.md index cd8465fc..1b82ce95 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ rabbitmq add_vhost /coal docker compose exec -it rabbitmq bash rabbitmqctl add_user datacollector datacollector -rabbitmqctl set_permissions --vhost /coal/test datacollector '' 'sysExchange' 'pms\.client\.*|dataCollector\.*' +rabbitmqctl set_permissions --vhost /coal/test datacollector '' 'sysExchange|amq.default' 'pms\.client\.*|dataCollector\.*' ``` diff --git a/src/main/java/cn/lihongjie/coal/dataCollector/controller/DataCollectorController.java b/src/main/java/cn/lihongjie/coal/dataCollector/controller/DataCollectorController.java index 820f4334..74fc2cf9 100644 --- a/src/main/java/cn/lihongjie/coal/dataCollector/controller/DataCollectorController.java +++ b/src/main/java/cn/lihongjie/coal/dataCollector/controller/DataCollectorController.java @@ -4,9 +4,7 @@ import cn.lihongjie.coal.annotation.OrgScope; import cn.lihongjie.coal.annotation.SysLog; import cn.lihongjie.coal.base.dto.CommonQuery; import cn.lihongjie.coal.base.dto.IdRequest; -import cn.lihongjie.coal.dataCollector.dto.CreateDataCollectorDto; -import cn.lihongjie.coal.dataCollector.dto.DataCollectorDto; -import cn.lihongjie.coal.dataCollector.dto.UpdateDataCollectorDto; +import cn.lihongjie.coal.dataCollector.dto.*; import cn.lihongjie.coal.dataCollector.service.DataCollectorService; import lombok.extern.slf4j.Slf4j; @@ -60,4 +58,29 @@ public class DataCollectorController { public Page list(@RequestBody CommonQuery request) { return this.service.list(request); } + + + + + + @PostMapping("/deleteLocalStatus") + public Object deleteLocalStatus(@RequestBody DeleteLocalStatusRequest request) { + return this.service.deleteLocalStatus(request); + } + + + @PostMapping("/updateLocalStatus") + public Object updateLocalStatus(@RequestBody UpdateLocalStatus request) { + return this.service.updateLocalStatus(request); + } + + + @PostMapping("/getLocalStatus") + public Object getLocalStatus(@RequestBody GetLocalStatusRequest request) { + return this.service.getLocalStatus(request); + } + + + + } diff --git a/src/main/java/cn/lihongjie/coal/dataCollector/dto/DeleteLocalStatusRequest.java b/src/main/java/cn/lihongjie/coal/dataCollector/dto/DeleteLocalStatusRequest.java new file mode 100644 index 00000000..5a7ff52c --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/dataCollector/dto/DeleteLocalStatusRequest.java @@ -0,0 +1,4 @@ +package cn.lihongjie.coal.dataCollector.dto; +import java.util.List; + +public record DeleteLocalStatusRequest(String appKey, List keys){} \ No newline at end of file diff --git a/src/main/java/cn/lihongjie/coal/dataCollector/dto/GetLocalStatusRequest.java b/src/main/java/cn/lihongjie/coal/dataCollector/dto/GetLocalStatusRequest.java new file mode 100644 index 00000000..d44d615a --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/dataCollector/dto/GetLocalStatusRequest.java @@ -0,0 +1,2 @@ +package cn.lihongjie.coal.dataCollector.dto; +public record GetLocalStatusRequest(String appKey){} \ No newline at end of file diff --git a/src/main/java/cn/lihongjie/coal/dataCollector/dto/UpdateLocalStatus.java b/src/main/java/cn/lihongjie/coal/dataCollector/dto/UpdateLocalStatus.java new file mode 100644 index 00000000..bccdfe20 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/dataCollector/dto/UpdateLocalStatus.java @@ -0,0 +1,5 @@ +package cn.lihongjie.coal.dataCollector.dto; +import java.util.List; +import java.util.Map; + +public record UpdateLocalStatus(String appKey, List> status){} \ No newline at end of file diff --git a/src/main/java/cn/lihongjie/coal/dataCollector/service/DataCollectorService.java b/src/main/java/cn/lihongjie/coal/dataCollector/service/DataCollectorService.java index 3069343a..7cf22822 100644 --- a/src/main/java/cn/lihongjie/coal/dataCollector/service/DataCollectorService.java +++ b/src/main/java/cn/lihongjie/coal/dataCollector/service/DataCollectorService.java @@ -3,9 +3,7 @@ package cn.lihongjie.coal.dataCollector.service; import cn.lihongjie.coal.base.dto.CommonQuery; import cn.lihongjie.coal.base.dto.IdRequest; import cn.lihongjie.coal.base.service.BaseService; -import cn.lihongjie.coal.dataCollector.dto.CreateDataCollectorDto; -import cn.lihongjie.coal.dataCollector.dto.DataCollectorDto; -import cn.lihongjie.coal.dataCollector.dto.UpdateDataCollectorDto; +import cn.lihongjie.coal.dataCollector.dto.*; import cn.lihongjie.coal.dataCollector.entity.DataCollectorEntity; import cn.lihongjie.coal.dataCollector.mapper.DataCollectorMapper; import cn.lihongjie.coal.dataCollector.repository.DataCollectorRepository; @@ -34,7 +32,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.UUID; @@ -77,28 +74,31 @@ public class DataCollectorService } @Autowired private RabbitMQService rabbitMQService; - public Object getLocalStatus(String appKey) { + public Object getLocalStatus(GetLocalStatusRequest getLocalStatusRequest) { var o = rabbitTemplate.convertSendAndReceive( - "dataCollector." + appKey, Map.of("action", "getLocalStatus")); - new CorrelationData(UUID.randomUUID().toString()); + "dataCollector." + getLocalStatusRequest.appKey(), + Map.of("action", "getLocalStatus") + ); return o; } - public void updateLocalStatus(String appKey, List> status) { + public Object updateLocalStatus(UpdateLocalStatus updateLocalStatus) { - rabbitTemplate.convertSendAndReceive( - "dataCollector." + appKey, Map.of("action", "updateLocalStatus", "data", status)); - new CorrelationData(UUID.randomUUID().toString()); + return rabbitTemplate.convertSendAndReceive( + "dataCollector." + updateLocalStatus.appKey(), + Map.of("action", "updateLocalStatus", "data", updateLocalStatus.status()) + ); } - public void deleteLocalStatus(String appKey, List keys) { + public Object deleteLocalStatus(DeleteLocalStatusRequest deleteLocalStatusRequest) { + + return rabbitTemplate.convertSendAndReceive( + "dataCollector." + deleteLocalStatusRequest.appKey(), Map.of("action", "deleteLocalStatus", "data", deleteLocalStatusRequest.keys()) + ); - rabbitTemplate.convertSendAndReceive( - "dataCollector." + appKey, Map.of("action", "deleteLocalStatus", "data", keys)); - new CorrelationData(UUID.randomUUID().toString()); } public Object sendMsg(String id, String action, Object data, Map headers) {