From dc9b3f8cb8f35f18699cab2262d4d03e24635234 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 24 Sep 2021 13:47:32 +0800
Subject: [PATCH] screen-api 更改获取国控站数据接口，添加参数因子code
---
screen-api/src/main/java/com/moral/api/controller/GovMonitorPointController.java | 8 ++++----
screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java | 9 ++++++---
screen-api/src/main/java/com/moral/api/service/GovMonitorPointService.java | 4 ++--
3 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/GovMonitorPointController.java b/screen-api/src/main/java/com/moral/api/controller/GovMonitorPointController.java
index 565a897..2cba59e 100644
--- a/screen-api/src/main/java/com/moral/api/controller/GovMonitorPointController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/GovMonitorPointController.java
@@ -33,16 +33,16 @@
/**
- * @Description: ���������������������
- * @Param: [regionCode]
+ * @Description: ���������������������������������������
+ * @Param: [regionCode,sensorCode]
* @return: com.moral.constant.ResultMessage
* @Author: ���������
* @Date: 2021/9/9
*/
@GetMapping("queryStateControlStation")
- public ResultMessage queryStateControlStation(Integer regionCode) {
+ public ResultMessage queryStateControlStation(Integer regionCode,String sensorCode) {
- List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.queryGovMonitorPointAndDataByRegionCode(regionCode);
+ List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.queryGovMonitorPointAndDataByRegionCode(regionCode,sensorCode);
return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), govMonitorPoints);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/GovMonitorPointService.java b/screen-api/src/main/java/com/moral/api/service/GovMonitorPointService.java
index 31add71..0eddc16 100644
--- a/screen-api/src/main/java/com/moral/api/service/GovMonitorPointService.java
+++ b/screen-api/src/main/java/com/moral/api/service/GovMonitorPointService.java
@@ -17,10 +17,10 @@
/**
* @Description: ���������������������������������������������������
- * @Param: [regionCode]
+ * @Param: [regionCode,sensorCode]
* @return: java.util.List<com.moral.api.entity.GovMonitorPoint>
* @Author: ���������
* @Date: 2021/9/24
*/
- List<GovMonitorPoint> queryGovMonitorPointAndDataByRegionCode(Integer regionCode);
+ List<GovMonitorPoint> queryGovMonitorPointAndDataByRegionCode(Integer regionCode,String sensorCode);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
index e7d58e4..273408b 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
@@ -1,5 +1,6 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.entity.GovMonitorPoint;
import com.moral.api.mapper.GovMonitorPointMapper;
@@ -13,6 +14,7 @@
import org.springframework.stereotype.Service;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -31,7 +33,7 @@
RedisTemplate redisTemplate;
@Override
- public List<GovMonitorPoint> queryGovMonitorPointAndDataByRegionCode(Integer regionCode) {
+ public List<GovMonitorPoint> queryGovMonitorPointAndDataByRegionCode(Integer regionCode,String sensorCode) {
String regionCodeStr = RegionCodeUtils.regionCodeConvertToName(regionCode);
QueryWrapper<GovMonitorPoint> wrapper = new QueryWrapper<>();
wrapper.eq(regionCodeStr,regionCode);
@@ -40,8 +42,9 @@
List<GovMonitorPoint> govMonitorPoints = govMonitorPointMapper.selectList(wrapper);
for (GovMonitorPoint govMonitorPoint : govMonitorPoints) {
Object data = redisTemplate.opsForHash().get(RedisConstants.AQI_DATA, govMonitorPoint.getGuid());
- if(data!=null)
- govMonitorPoint.setData(String.valueOf(data));
+ Map<String,Object> dataMap = (Map<String, Object>) data;
+ if(data!=null&&dataMap.get(sensorCode)!=null)
+ govMonitorPoint.setData(String.valueOf(dataMap.get(sensorCode)));
}
return govMonitorPoints;
}
--
Gitblit v1.8.0