From 83409c683e3888aa540b3be3c6fb6215c47573a0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 9 Apr 2024 10:37:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=A9=E7=84=B6=E6=B0=94=E5=AE=9E?=
 =?UTF-8?q?=E6=97=B6=E5=8F=82=E6=95=B0=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/KhNgRealtimeDataController.java  |  5 +++--
 .../jero/modules/entity/KhNgRealtimeData.java   | 12 ++++++++++++
 .../service/IKhNgRealtimeDataService.java       |  2 +-
 .../impl/KhNgRealtimeDataServiceImpl.java       | 17 ++++++++++++-----
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/kh-modules/src/main/java/com/jero/modules/controller/KhNgRealtimeDataController.java b/kh-modules/src/main/java/com/jero/modules/controller/KhNgRealtimeDataController.java
index 0f46266b..ba4216cb 100644
--- a/kh-modules/src/main/java/com/jero/modules/controller/KhNgRealtimeDataController.java
+++ b/kh-modules/src/main/java/com/jero/modules/controller/KhNgRealtimeDataController.java
@@ -1,5 +1,6 @@
 package com.jero.modules.controller;
 
+import java.util.List;
 import java.util.Map;
 
 import com.jero.common.api.vo.Results;
@@ -54,11 +55,11 @@ public class KhNgRealtimeDataController extends JeroController<KhNgRealtimeData,
     @AutoLog(value = "天然气数据远传终端实时数据-返回动态数据")
     @ApiOperation(value = "天然气数据远传终端实时数据-返回动态数据", notes = "油井实时数据-返回动态数据")
     @GetMapping(value = "/realtimeDataResults")
-    public Results<Map<String, Object>> realtimeDataResults(@RequestParam(name = "id", required = true) String id) {
+    public Results<Map<String, List<KhNgRealtimeData>>> realtimeDataResults(@RequestParam(name = "id", required = true) String id) {
         if (!id.equals("default")) {
             return Results.error("未找到对应数据");
         }
-        Map<String, Object> khOilRealtimeData = khNgRealtimeDataService.realtimeDataResults(id);
+        Map<String, List<KhNgRealtimeData>> khOilRealtimeData = khNgRealtimeDataService.realtimeDataResults(id);
         return Results.OK(khOilRealtimeData);
     }
 
diff --git a/kh-modules/src/main/java/com/jero/modules/entity/KhNgRealtimeData.java b/kh-modules/src/main/java/com/jero/modules/entity/KhNgRealtimeData.java
index 5f2b8183..5f11a741 100644
--- a/kh-modules/src/main/java/com/jero/modules/entity/KhNgRealtimeData.java
+++ b/kh-modules/src/main/java/com/jero/modules/entity/KhNgRealtimeData.java
@@ -5,6 +5,7 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.jero.modules.utils.RandomNumberUtil;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -82,4 +83,15 @@ public class KhNgRealtimeData implements Serializable {
     @DateTimeFormat(pattern="yyyy-MM-dd")
     @ApiModelProperty(value = "同步时间")
     private Date syncDate;
+
+    public void mockKhOilRealtimeData() {
+        this.setId("default");
+        this.setDeviceNo("default");
+        this.setRealTimeTemp(RandomNumberUtil.getRandomDouble());
+        this.setRealTimePressure(RandomNumberUtil.getRandomDouble());
+        this.setCumulativeFlow(RandomNumberUtil.getRandomDouble());
+        this.setRealTimePressure(RandomNumberUtil.getRandomDouble());
+        this.setStdInstant(RandomNumberUtil.getRandomDouble());
+        this.setOperationalInstant(RandomNumberUtil.getRandomDouble());
+    }
 }
diff --git a/kh-modules/src/main/java/com/jero/modules/service/IKhNgRealtimeDataService.java b/kh-modules/src/main/java/com/jero/modules/service/IKhNgRealtimeDataService.java
index 1644cde3..79ad1415 100644
--- a/kh-modules/src/main/java/com/jero/modules/service/IKhNgRealtimeDataService.java
+++ b/kh-modules/src/main/java/com/jero/modules/service/IKhNgRealtimeDataService.java
@@ -36,5 +36,5 @@ public interface IKhNgRealtimeDataService extends IService<KhNgRealtimeData> {
 	 * @param id
 	 * @return
 	 */
-	Map<String, Object> realtimeDataResults(String id);
+	Map<String, List<KhNgRealtimeData>> realtimeDataResults(String id);
 }
diff --git a/kh-modules/src/main/java/com/jero/modules/service/impl/KhNgRealtimeDataServiceImpl.java b/kh-modules/src/main/java/com/jero/modules/service/impl/KhNgRealtimeDataServiceImpl.java
index 927e0123..a61d6dc4 100644
--- a/kh-modules/src/main/java/com/jero/modules/service/impl/KhNgRealtimeDataServiceImpl.java
+++ b/kh-modules/src/main/java/com/jero/modules/service/impl/KhNgRealtimeDataServiceImpl.java
@@ -2,14 +2,15 @@ package com.jero.modules.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.jero.modules.entity.KhNgRealtimeData;
+import com.jero.modules.entity.KhOilRealtimeData;
 import com.jero.modules.mapper.KhNgRealtimeDataMapper;
 import com.jero.modules.service.IKhNgRealtimeDataService;
+import com.jero.modules.utils.RandomNumberUtil;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.jero.common.exception.JeroBootException;
-import java.util.List;
-import java.util.Date;
-import java.util.Map;
+
+import java.util.*;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.system.query.QueryGenerator;
@@ -52,7 +53,13 @@ public class KhNgRealtimeDataServiceImpl extends ServiceImpl<KhNgRealtimeDataMap
     }
 
 	@Override
-	public Map<String, Object> realtimeDataResults(String id) {
-		return null;
+	public Map<String, List<KhNgRealtimeData>> realtimeDataResults(String id) {
+		Map<String, List<KhNgRealtimeData>> result = new HashMap<>();
+		List<KhNgRealtimeData> dataList = new ArrayList<>();
+		KhNgRealtimeData khNgRealtimeData = new KhNgRealtimeData();
+		khNgRealtimeData.mockKhOilRealtimeData();
+		dataList.add(khNgRealtimeData);
+		result.put("实时运行参数", dataList);
+		return result;
 	}
 }