Browse Source

适配器修改

xujuanning 5 months ago
parent
commit
fb3e722808

+ 8 - 3
data-adapter/src/main/java/com/gyee/dataadapter/controller/AdapterController.java

@@ -37,8 +37,13 @@ public class AdapterController {
         return dataClient.getLatestData(paths);
     }
 
-    @GetMapping("/latest")
-    public Map<String, PointData> getLatest(@RequestParam("keys") String keys) {
+//    @GetMapping("/latest")
+//    public Map<String, PointData> getLatest(@RequestParam("keys") String keys) {
+//        return tsDataService.getLatest(keys);
+//    }
+
+    @PostMapping("/latest")
+    public Map<String, PointData> getLatest(@RequestBody List<String> keys) {
         return tsDataService.getLatest(keys);
     }
 
@@ -90,7 +95,7 @@ public class AdapterController {
         return tsDataService.writeLatest(PointDataList);
     }
 
-    @PostMapping("/latest")
+    @PostMapping("/latest/save")
     public boolean writeLatest(@RequestBody PointData PointData) {
         return writeLatestBatch(Collections.singletonList(PointData));
     }

+ 4 - 4
data-adapter/src/main/java/com/gyee/dataadapter/service/impl/AdapterServiceImpl.java

@@ -137,14 +137,14 @@ public class AdapterServiceImpl implements IAdapterService {
     /**
      * 请求实时数据
      *
-     * @param paths 根据逗号隔开的测点
+     * @param tagNames 根据逗号隔开的测点
      * @return 测点的实时数据
      */
     @Override
-    public Map<String, PointData> getLatestData2(String... paths) {
+    public Map<String, PointData> getLatestData2(List<String> tagNames) {
         Map<String, PointData> map = new HashMap<>();
-        if (paths == null) return map;
-        for (String path : paths) {
+        if (tagNames == null||tagNames.isEmpty()) return map;
+        for (String path : tagNames) {
             PointData pd = MqttCache.subData2.get(path);
             map.put(path, pd);
         }