screen-api/src/main/java/com/moral/api/controller/GovMonitorPointController.java
New file @@ -0,0 +1,49 @@ package com.moral.api.controller; import com.moral.api.entity.GovMonitorPoint; import com.moral.api.service.GovMonitorPointService; import com.moral.constant.ResponseCodeEnum; import com.moral.constant.ResultMessage; import io.swagger.annotations.Api; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; /** * @ClassName * @Description TODO * @Author 陈凯裕 * @Date 2021/9/24 9:07 * @Version TODO **/ @Slf4j @Api(tags = {"国控站"}) @RestController @CrossOrigin(origins = "*", maxAge = 3600) @RequestMapping("/govMonitorPoint") public class GovMonitorPointController { @Autowired GovMonitorPointService govMonitorPointService; /** * @Description: 查询国控站接口 * @Param: [regionCode] * @return: com.moral.constant.ResultMessage * @Author: 陈凯裕 * @Date: 2021/9/9 */ @GetMapping("queryStateControlStation") public ResultMessage queryStateControlStation(Integer regionCode) { List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.queryGovMonitorPointAndDataByRegionCode(regionCode); return new ResultMessage(ResponseCodeEnum.SUCCESS.getCode(), ResponseCodeEnum.SUCCESS.getMsg(), govMonitorPoints); } } screen-api/src/main/java/com/moral/api/entity/GovMonitorPoint.java
@@ -1,10 +1,12 @@ package com.moral.api.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.annotation.TableId; import java.io.Serializable; import java.util.Date; import java.util.Map; import lombok.Data; import lombok.EqualsAndHashCode; @@ -90,9 +92,8 @@ private String desc; @Override protected Serializable pkVal() { return this.id; } @TableField(exist = false) private String data; } screen-api/src/main/java/com/moral/api/pojo/vo/monitorPoint/StateControllerStationVO.java
File was deleted screen-api/src/main/java/com/moral/api/service/GovMonitorPointService.java
@@ -3,6 +3,8 @@ import com.moral.api.entity.GovMonitorPoint; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** * <p> * 服务类 @@ -13,4 +15,12 @@ */ public interface GovMonitorPointService extends IService<GovMonitorPoint> { /** * @Description: 根据地区码查询国控站以及国控站数据 * @Param: [regionCode] * @return: java.util.List<com.moral.api.entity.GovMonitorPoint> * @Author: 陈凯裕 * @Date: 2021/9/24 */ List<GovMonitorPoint> queryGovMonitorPointAndDataByRegionCode(Integer regionCode); } screen-api/src/main/java/com/moral/api/service/MonitorPointService.java
@@ -25,13 +25,6 @@ */ List<MonitorPoint> queryByOrgIdAndRegionCode(MonitorPointQueryForm form); /** * @Description: 根据地区码查询国控站数据 * @Param: [regionCode] * @return: java.util.List<com.moral.api.entity.MonitorPoint> * @Author: 陈凯裕 * @Date: 2021/7/16 */ List<MonitorPoint> queryStateControlStationByRegionCode(Integer regionCode); }
@@ -24,12 +24,4 @@ */ List<Organization> getChildrenOrganizationsById(Integer id); /** * @Description: 获取国控站组织 * @Param: [] * @return: com.moral.api.entity.Organization * @Author: 陈凯裕 * @Date: 2021/7/16 */ Organization getStateControlStation(); } screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java
@@ -1,10 +1,18 @@ package com.moral.api.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.moral.api.entity.GovMonitorPoint; import com.moral.api.mapper.GovMonitorPointMapper; import com.moral.api.service.GovMonitorPointService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.moral.constant.Constants; import com.moral.constant.RedisConstants; import com.moral.util.RegionCodeUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; import java.util.List; /** * <p> @@ -17,4 +25,24 @@ @Service public class GovMonitorPointServiceImpl extends ServiceImpl<GovMonitorPointMapper, GovMonitorPoint> implements GovMonitorPointService { @Autowired GovMonitorPointMapper govMonitorPointMapper; @Autowired RedisTemplate redisTemplate; @Override public List<GovMonitorPoint> queryGovMonitorPointAndDataByRegionCode(Integer regionCode) { String regionCodeStr = RegionCodeUtils.regionCodeConvertToName(regionCode); QueryWrapper<GovMonitorPoint> wrapper = new QueryWrapper<>(); wrapper.eq(regionCodeStr,regionCode); wrapper.eq("is_delete", Constants.NOT_DELETE); wrapper.select("guid","name","longitude","latitude","station_level"); 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)); } return govMonitorPoints; } } screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
@@ -77,17 +77,6 @@ return monitorPoints; } @Override public List<MonitorPoint> queryStateControlStationByRegionCode(Integer regionCode) { //获取国控站组织 Organization stateControlStationOrganization = organizationService.getStateControlStation(); //获取国控站组织下的所有站点 QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("is_delete", Constants.NOT_DELETE); queryWrapper.eq("organization_id", stateControlStationOrganization.getId()); queryWrapper.eq(RegionCodeUtils.regionCodeConvertToName(regionCode), regionCode); return monitorPointMapper.selectList(queryWrapper); } }
@@ -35,15 +35,6 @@ return childrenOrganization; } @Override public Organization getStateControlStation() { QueryWrapper<Organization> wrapper = new QueryWrapper<>(); wrapper.select("id"); wrapper.eq("name","国控站"); wrapper.eq("is_delete",Constants.NOT_DELETE); Organization organization = organizationMapper.selectOne(wrapper); return organization; } /** * @Description: 通过父组织查询下面所有的子组织放到children中
