From 3d665d84b1a4ffd6749ca9354247838ce0622f4b Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 13 Dec 2022 13:47:53 +0800
Subject: [PATCH] 修改sql语句问题
---
screen-api/src/main/java/com/moral/api/service/impl/MonitorPointServiceImpl.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 110 insertions(+), 10 deletions(-)
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 1b54467..261ee12 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
@@ -1,26 +1,34 @@
package com.moral.api.service.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.moral.api.entity.Device;
-import com.moral.api.entity.MonitorPoint;
-import com.moral.api.entity.Organization;
+import com.moral.api.entity.*;
+import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.MonitorPointMapper;
+import com.moral.api.mapper.SensorMapper;
import com.moral.api.pojo.form.device.MonitorPointQueryForm;
import com.moral.api.service.DeviceService;
+import com.moral.api.service.HistoryHourlyService;
import com.moral.api.service.MonitorPointService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.api.service.OrganizationService;
import com.moral.constant.Constants;
+import com.moral.util.DateUtils;
import com.moral.util.RegionCodeUtils;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.util.unit.DataUnit;
-import java.util.ArrayList;
-import java.util.List;
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.*;
/**
* <p>
- * ���������������
+ * ���������������
* </p>
*
* @author moral
@@ -36,12 +44,25 @@
@Autowired
DeviceService deviceService;
+ @Autowired
+ DeviceMapper deviceMapper;
+
+ @Autowired
+ SensorMapper sensorMapper;
+
+ @Autowired
+ HistoryHourlyService historyHourlyService;
+
@Override
- public List<MonitorPoint> query(MonitorPointQueryForm form) {
+ public List<MonitorPoint> queryByOrgIdAndRegionCode(MonitorPointQueryForm form) {
//������
Integer organizationId = form.getOrganizationId();
Integer regionCode = form.getRegionCode();
- String region = RegionCodeUtils.regionCodeConvertToName(regionCode);
+ String region = null;
+ if (regionCode != null) {
+ region = RegionCodeUtils.regionCodeConvertToName(regionCode);
+ }
+
//���������������
List<Organization> childrenOrganization = organizationService.getChildrenOrganizationsById(organizationId);
List<Integer> organizationIds = new ArrayList<>();
@@ -51,8 +72,13 @@
organizationIds.add(organizationId);
//������������
QueryWrapper<MonitorPoint> queryMonitorPointsWrapper = new QueryWrapper<>();
- queryMonitorPointsWrapper.eq(region,regionCode);
- queryMonitorPointsWrapper.in("organization_id",organizationIds);
+
+ //������region������������������������������������������������������������������������������
+ //������region���������������������������������������������������������
+ if (region != null){
+ queryMonitorPointsWrapper.eq(region, regionCode);
+ }
+ queryMonitorPointsWrapper.in("organization_id", organizationIds);
queryMonitorPointsWrapper.eq("is_delete", Constants.NOT_DELETE);
List<MonitorPoint> monitorPoints = monitorPointMapper.selectList(queryMonitorPointsWrapper);
//���������������������������
@@ -62,6 +88,80 @@
}
return monitorPoints;
}
+
+ @Override
+ public List<MonitorPoint> queryAllMonitorPoints(Integer organizationId) {
+ //���������������
+ List<Organization> childrenOrganization = organizationService.getChildrenOrganizationsById(organizationId);
+ List<Integer> organizationIds = new ArrayList<>();
+ for (Organization organization : childrenOrganization) {
+ organizationIds.add(organization.getId());
+ }
+ organizationIds.add(organizationId);
+ //������������
+ QueryWrapper<MonitorPoint> queryMonitorPointsWrapper = new QueryWrapper<>();
+ queryMonitorPointsWrapper.select("id","name");
+ queryMonitorPointsWrapper.in("organization_id",organizationIds);
+ queryMonitorPointsWrapper.eq("is_delete", Constants.NOT_DELETE);
+ List<MonitorPoint> monitorPoints = monitorPointMapper.selectList(queryMonitorPointsWrapper);
+ return monitorPoints;
+ }
+
+ @Override
+ public List<Map<String, Object>> getHourlyDataByMonitorPoint(Map map) {
+ int monitorPointId = Integer.parseInt(map.get("monitorPointId").toString());
+ QueryWrapper<MonitorPoint> monitorPointQueryWrapper = new QueryWrapper<>();
+ monitorPointQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ monitorPointQueryWrapper.eq("id",monitorPointId);
+ MonitorPoint monitorPoint = monitorPointMapper.selectOne(monitorPointQueryWrapper);
+ QueryWrapper<Device> deviceQueryWrapper = new QueryWrapper<>();
+ deviceQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ deviceQueryWrapper.eq("monitor_point_id",monitorPointId);
+ List<Device> devices = deviceMapper.selectList(deviceQueryWrapper);
+ if (devices.size()<=0){
+ return null;
+ }
+ String[] sensors = map.remove("sensors").toString().split(",");
+ List<String> sensorsList = Arrays.asList(sensors);
+ String startTime = map.get("startTime").toString();
+ String endTime = map.get("endTime").toString();
+ Date startDate = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_EN);
+ Date endDate = DateUtils.getDate(endTime,DateUtils.yyyy_MM_dd_HH_EN);
+ List<Map<String,Object>> resultList = new ArrayList<>();
+ for (Device device:devices) {
+ List<HistoryHourly> hourlies = historyHourlyService.getValueByMacAndTime(device.getMac(), DateUtils.getDate(map.get("startTime").toString(), DateUtils.yyyy_MM_dd_HH_EN), DateUtils.getDate(map.get("endTime").toString(), DateUtils.yyyy_MM_dd_HH_EN));
+ for (String sensor:sensorsList) {
+ Map<String, Object> timeValueMap = new LinkedHashMap<>();//key���time���value������������json
+ timeValueMap.put("������������",monitorPoint.getName());
+ timeValueMap.put("name",device.getName());
+ QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
+ sensorQueryWrapper.eq("is_delete",Constants.NOT_DELETE);
+ sensorQueryWrapper.eq("code",sensor);
+ Sensor sensorEntity = sensorMapper.selectOne(sensorQueryWrapper);
+ timeValueMap.put("sensor",sensorEntity.getName());
+ for (HistoryHourly historyHourly : hourlies) {
+ Date time = historyHourly.getTime();
+ String dateStr = DateUtils.dateToDateString(time, "yyyy-MM-dd HH");
+ String value = historyHourly.getValue();
+ JSONObject jsonObject = JSONObject.parseObject(value);
+ if (jsonObject.containsKey(sensor)){
+ timeValueMap.put(dateStr, jsonObject.get(sensor).toString());
+ }
+ }
+ //���������������������
+ Date middleDate = startDate;
+ while (DateUtils.compareDateStr(DateUtils.dateToDateString(endDate,DateUtils.yyyy_MM_dd_HH_EN),DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN),DateUtils.yyyy_MM_dd_HH_EN)<=0){
+ if (timeValueMap.get(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN)) == null)
+ timeValueMap.put(DateUtils.dateToDateString(middleDate,DateUtils.yyyy_MM_dd_HH_EN), null);
+ middleDate = DateUtils.addHours(middleDate,1);
+ }
+ resultList.add(timeValueMap);
+ }
+ }
+ return resultList;
+ }
+
+
}
--
Gitblit v1.8.0