From 8e9a6b3013b877faa78bff87954dabe873e4eac7 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 24 Sep 2021 10:44:33 +0800
Subject: [PATCH] screen-api 增加获取国控站接口
---
/dev/null | 36 ------------
screen-api/src/main/java/com/moral/api/entity/GovMonitorPoint.java | 9 +-
screen-api/src/main/java/com/moral/api/service/MonitorPointService.java | 9 --
screen-api/src/main/java/com/moral/api/service/OrganizationService.java | 8 --
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 9 ---
screen-api/src/main/java/com/moral/api/controller/GovMonitorPointController.java | 49 ++++++++++++++++
screen-api/src/main/java/com/moral/api/service/impl/GovMonitorPointServiceImpl.java | 28 +++++++++
screen-api/src/main/java/com/moral/api/service/GovMonitorPointService.java | 10 +++
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 11 ---
9 files changed, 93 insertions(+), 76 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
new file mode 100644
index 0000000..565a897
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/controller/GovMonitorPointController.java
@@ -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);
+ }
+}
diff --git a/screen-api/src/main/java/com/moral/api/entity/GovMonitorPoint.java b/screen-api/src/main/java/com/moral/api/entity/GovMonitorPoint.java
index 62024c1..914fa40 100644
--- a/screen-api/src/main/java/com/moral/api/entity/GovMonitorPoint.java
+++ b/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;
+
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/monitorPoint/StateControllerStationVO.java b/screen-api/src/main/java/com/moral/api/pojo/vo/monitorPoint/StateControllerStationVO.java
deleted file mode 100644
index ecb5dd5..0000000
--- a/screen-api/src/main/java/com/moral/api/pojo/vo/monitorPoint/StateControllerStationVO.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.moral.api.pojo.vo.monitorPoint;
-
-import com.moral.api.entity.Device;
-import com.moral.api.entity.MonitorPoint;
-import com.moral.api.pojo.vo.device.DeviceVO;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @ClassName StateControllerStationVO
- * @Description TODO
- * @Author ���������
- * @Date 2021/7/16 13:52
- * @Version TODO
- **/
-@Data
-public class StateControllerStationVO {
-
- private List<MonitorPointVO> stateControllerStations;
-
- public static StateControllerStationVO convert(List<MonitorPoint> monitorPoints){
- StateControllerStationVO stateControllerStationVO = new StateControllerStationVO();
- List<MonitorPointVO> stateControllerStations = new ArrayList<>();
- for (MonitorPoint monitorPoint : monitorPoints) {
- MonitorPointVO monitorPointVO = new MonitorPointVO();
- monitorPointVO.setName(monitorPoint.getName());
- monitorPointVO.setLatitude(monitorPoint.getLatitude());
- monitorPointVO.setLongitude(monitorPoint.getLongitude());
- stateControllerStations.add(monitorPointVO);
- }
- stateControllerStationVO.setStateControllerStations(stateControllerStations);
- return stateControllerStationVO;
- }
-}
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 0231239..31add71 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
@@ -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);
}
diff --git a/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java b/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java
index 9195454..7ffe237 100644
--- a/screen-api/src/main/java/com/moral/api/service/MonitorPointService.java
+++ b/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);
+
}
diff --git a/screen-api/src/main/java/com/moral/api/service/OrganizationService.java b/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
index a200795..ddb13eb 100644
--- a/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
+++ b/screen-api/src/main/java/com/moral/api/service/OrganizationService.java
@@ -24,12 +24,4 @@
*/
List<Organization> getChildrenOrganizationsById(Integer id);
- /**
- * @Description: ���������������������
- * @Param: []
- * @return: com.moral.api.entity.Organization
- * @Author: ���������
- * @Date: 2021/7/16
- */
- Organization getStateControlStation();
}
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 7ad0cbe..e7d58e4 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,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;
+ }
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
index 8de6dc0..2222d8a 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java
+++ b/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);
- }
}
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 0d730ba..ca4669a 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -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���
--
Gitblit v1.8.0