screen-api 更改获取国控站数据接口，添加参数因子code

kaiyu

2021-09-24 dc9b3f8cb8f35f18699cab2262d4d03e24635234

screen-api
             更改获取国控站数据接口，添加参数因子code

 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);
    }

 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);
}

 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;
    }