From 7179e1db8b382b9c92ef4060dbf48894dc89679e Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 11 Apr 2023 16:43:45 +0800
Subject: [PATCH] 修改监测因子对比趋势变化
---
screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java | 9 +++++++++
screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/SensorComparisonDisplayDTO.java | 2 ++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/SensorComparisonDisplayDTO.java b/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/SensorComparisonDisplayDTO.java
index 83d6574..04463cb 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/SensorComparisonDisplayDTO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/SensorComparisonDisplayDTO.java
@@ -17,6 +17,8 @@
private String sensorCode;
+ private String code;
+
/*
* map������time���value
* */
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
index b33e752..543886e 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
@@ -299,6 +299,15 @@
for (String sensor : sensors) {
SensorComparisonDisplayDTO dto = new SensorComparisonDisplayDTO();
List<Map<String, Object>> dtoTimeValueList = new ArrayList<>();
+ if(sensor.equals("a00e12") || sensor.equals("a00e03")){
+ dto.setCode("1");
+ }else if (sensor.equals("a01006")){
+ dto.setCode("2");
+ }else if (sensor.equals("a99054") || sensor.equals("a21005")){
+ dto.setCode("3");
+ }else {
+ dto.setCode("0");
+ }
dto.setSensorCode(sensor);
timeValueMap.forEach((time, valueJson) -> {
Map<String, Object> listMap = new HashMap<>();
--
Gitblit v1.8.0