feat: 天然气实时参数数据

This commit is contained in:
2024-04-09 10:37:17 +08:00
parent e97b216eb8
commit 83409c683e
4 changed files with 28 additions and 8 deletions
@@ -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);
}
@@ -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());
}
}
@@ -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);
}
@@ -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;
}
}