|
@@ -12,35 +12,53 @@
|
|
|
*/
|
|
|
package vip.xiaonuo.coldchain.modular.monitornotice.service.impl;
|
|
|
|
|
|
+import cn.hutool.core.bean.BeanUtil;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import jakarta.annotation.Resource;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import vip.xiaonuo.coldchain.modular.monitornotice.entity.CountWithTime;
|
|
|
-import vip.xiaonuo.coldchain.modular.monitornotice.entity.NoticeByDate;
|
|
|
-import vip.xiaonuo.coldchain.modular.monitornotice.entity.MonitorNotice;
|
|
|
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
|
|
|
+import vip.xiaonuo.coldchain.core.bean.influxdb.SensorData;
|
|
|
+import vip.xiaonuo.coldchain.modular.app.param.AppDeviceQueryParams;
|
|
|
+import vip.xiaonuo.coldchain.modular.app.param.SensorEchartDataResult;
|
|
|
+import vip.xiaonuo.coldchain.modular.app.service.AppDeviceService;
|
|
|
+import vip.xiaonuo.coldchain.modular.monitordevice.entity.MonitorDevice;
|
|
|
+import vip.xiaonuo.coldchain.modular.monitordevice.service.MonitorDeviceService;
|
|
|
+import vip.xiaonuo.coldchain.modular.monitornotice.entity.*;
|
|
|
import vip.xiaonuo.coldchain.modular.monitornotice.enums.DateEnum;
|
|
|
import vip.xiaonuo.coldchain.modular.monitornotice.mapper.MonitorNoticeMapper;
|
|
|
+import vip.xiaonuo.coldchain.modular.monitornotice.param.RealtimeParam;
|
|
|
+import vip.xiaonuo.coldchain.modular.monitornotice.param.TrendParam;
|
|
|
import vip.xiaonuo.coldchain.modular.monitornotice.service.MonitorNoticeService;
|
|
|
+import vip.xiaonuo.coldchain.modular.monitortargetregion.entity.MonitorTargetRegion;
|
|
|
+import vip.xiaonuo.coldchain.modular.monitortargetregion.service.MonitorTargetRegionService;
|
|
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
import java.util.List;
|
|
|
|
|
|
/**
|
|
|
* 监控通知Service接口实现类
|
|
|
*
|
|
|
* @author 黄渊昊
|
|
|
- * @date 2024/11/25 10:58
|
|
|
+ * @date 2024/11/25 10:58
|
|
|
**/
|
|
|
@Service
|
|
|
public class MonitorNoticeServiceImpl extends ServiceImpl<MonitorNoticeMapper, MonitorNotice> implements MonitorNoticeService {
|
|
|
|
|
|
@Resource
|
|
|
private MonitorNoticeMapper monitorNoticeMapper;
|
|
|
+ @Resource
|
|
|
+ private MonitorDeviceService monitorDeviceService;
|
|
|
+ @Resource
|
|
|
+ private MonitorTargetRegionService monitorTargetRegionService;
|
|
|
+ @Resource
|
|
|
+ private AppDeviceService appDeviceService;
|
|
|
|
|
|
private static int STP = 3;
|
|
|
|
|
|
@Override
|
|
|
- public CountWithTime today() {
|
|
|
+ public CountWithTime today(String orgId) {
|
|
|
List<String> timePeriodList = new ArrayList<>();
|
|
|
List<Integer> countList = new ArrayList<>();
|
|
|
int timeFlag = 0;
|
|
@@ -49,7 +67,7 @@ public class MonitorNoticeServiceImpl extends ServiceImpl<MonitorNoticeMapper, M
|
|
|
timeFlag += STP;
|
|
|
String endTimeStr = getTimeStr(timeFlag);
|
|
|
timePeriodList.add(startTimeStr + "-" + endTimeStr);
|
|
|
- Integer toDay = monitorNoticeMapper.getToDay(startTimeStr, endTimeStr);
|
|
|
+ Integer toDay = monitorNoticeMapper.getToDay(startTimeStr, endTimeStr, orgId);
|
|
|
countList.add(toDay);
|
|
|
}
|
|
|
CountWithTime countWithTime = new CountWithTime();
|
|
@@ -60,7 +78,7 @@ public class MonitorNoticeServiceImpl extends ServiceImpl<MonitorNoticeMapper, M
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public CountWithTime yesterday() {
|
|
|
+ public CountWithTime yesterday(String orgId) {
|
|
|
List<NoticeByDate> yesterdayNoticeList = new ArrayList<>();
|
|
|
List<String> timePeriodList = new ArrayList<>();
|
|
|
List<Integer> countList = new ArrayList<>();
|
|
@@ -70,7 +88,7 @@ public class MonitorNoticeServiceImpl extends ServiceImpl<MonitorNoticeMapper, M
|
|
|
timeFlag += STP;
|
|
|
String endTimeStr = getTimeStr(timeFlag);
|
|
|
timePeriodList.add(startTimeStr + "-" + endTimeStr);
|
|
|
- Integer yesterday = monitorNoticeMapper.getYesterday(startTimeStr, endTimeStr);
|
|
|
+ Integer yesterday = monitorNoticeMapper.getYesterday(startTimeStr, endTimeStr, orgId);
|
|
|
countList.add(yesterday);
|
|
|
}
|
|
|
CountWithTime countWithTime = new CountWithTime();
|
|
@@ -81,7 +99,7 @@ public class MonitorNoticeServiceImpl extends ServiceImpl<MonitorNoticeMapper, M
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public CountWithTime dayBeforeYesterday() {
|
|
|
+ public CountWithTime dayBeforeYesterday(String orgId) {
|
|
|
List<NoticeByDate> yesterdayNoticeList = new ArrayList<>();
|
|
|
List<String> timePeriodList = new ArrayList<>();
|
|
|
List<Integer> countList = new ArrayList<>();
|
|
@@ -91,7 +109,7 @@ public class MonitorNoticeServiceImpl extends ServiceImpl<MonitorNoticeMapper, M
|
|
|
timeFlag += STP;
|
|
|
String endTimeStr = getTimeStr(timeFlag);
|
|
|
timePeriodList.add(startTimeStr + "-" + endTimeStr);
|
|
|
- Integer dayBeforeYesterday = monitorNoticeMapper.getDayBeforeYesterday(startTimeStr, endTimeStr);
|
|
|
+ Integer dayBeforeYesterday = monitorNoticeMapper.getDayBeforeYesterday(startTimeStr, endTimeStr, orgId);
|
|
|
countList.add(dayBeforeYesterday);
|
|
|
}
|
|
|
CountWithTime countWithTime = new CountWithTime();
|
|
@@ -103,11 +121,12 @@ public class MonitorNoticeServiceImpl extends ServiceImpl<MonitorNoticeMapper, M
|
|
|
|
|
|
@Override
|
|
|
public List<CountWithTime> getNoticeByDate() {
|
|
|
+ String orgId = StpLoginUserUtil.getLoginUser().getOrgId();
|
|
|
NoticeByDate noticeByDate = new NoticeByDate();
|
|
|
List<CountWithTime> countWithTimeList = new ArrayList<>();
|
|
|
- countWithTimeList.add(today());
|
|
|
- countWithTimeList.add(yesterday());
|
|
|
- countWithTimeList.add(dayBeforeYesterday());
|
|
|
+ countWithTimeList.add(today(orgId));
|
|
|
+ countWithTimeList.add(yesterday(orgId));
|
|
|
+ countWithTimeList.add(dayBeforeYesterday(orgId));
|
|
|
return countWithTimeList;
|
|
|
}
|
|
|
|
|
@@ -118,4 +137,35 @@ public class MonitorNoticeServiceImpl extends ServiceImpl<MonitorNoticeMapper, M
|
|
|
}
|
|
|
return timeStr;
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Trend getTrend(TrendParam trendParam) {
|
|
|
+ MonitorDevice monitorDevice = monitorDeviceService.getById(trendParam.getDeviceId());
|
|
|
+ MonitorTargetRegion oneByDeviceCodeAndSensorNo = monitorTargetRegionService.findOneByDeviceCodeAndSensorNo(monitorDevice.getDeviceCode(), trendParam.getRoads());
|
|
|
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ AppDeviceQueryParams appDeviceQueryParams = new AppDeviceQueryParams();
|
|
|
+ appDeviceQueryParams.setSensorCode(oneByDeviceCodeAndSensorNo.getSensorCode());
|
|
|
+ appDeviceQueryParams.setStartTime(format.format(trendParam.getStartTime()));
|
|
|
+ appDeviceQueryParams.setEndTime(format.format(trendParam.getEndTime()));
|
|
|
+ appDeviceQueryParams.setSensorRoute(trendParam.getRoads());
|
|
|
+ appDeviceQueryParams.setAggregationWindow(trendParam.getAggregationWindow());
|
|
|
+ SensorEchartDataResult sensorEchartDataResult = appDeviceService.queryDataByDeviceIdAndRoads(appDeviceQueryParams);
|
|
|
+ Trend trend = BeanUtil.copyProperties(oneByDeviceCodeAndSensorNo, Trend.class);
|
|
|
+ trend.setSensorEchartDataResult(sensorEchartDataResult);
|
|
|
+ return trend;
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public Realtime getRealtime(RealtimeParam realtimeParam) {
|
|
|
+ MonitorDevice monitorDevice = monitorDeviceService.getById(realtimeParam.getDeviceId());
|
|
|
+ SensorData sensorData = monitorDeviceService.queryLatestDataByDeviceIdAndRoads(realtimeParam.getDeviceId(), realtimeParam.getRoads());
|
|
|
+ Realtime realtime = new Realtime();
|
|
|
+ realtime.setSensorData(sensorData);
|
|
|
+ MonitorTargetRegion oneByDeviceCodeAndSensorNo = monitorTargetRegionService.findOneByDeviceCodeAndSensorNo(monitorDevice.getDeviceCode(), realtimeParam.getRoads());
|
|
|
+ realtime.setRegionName(oneByDeviceCodeAndSensorNo.getName());
|
|
|
+ Date date = new Date();
|
|
|
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
+ realtime.setUpdateTime(format.format(date));
|
|
|
+ return realtime;
|
|
|
+ }
|
|
|
}
|