From a0341d4100c15c57fb645fd1f23225563e306712 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Wed, 28 Feb 2018 10:55:55 +0800
Subject: [PATCH] 设备和监控点 两模块修改，同步reids里的信息。数据字典功能添加
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index d2b440c..939b22b 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -1,15 +1,13 @@
package com.moral.service.impl;
import static com.moral.common.bean.Constants.NULL_VALUE;
-import static org.apache.commons.lang3.time.DateUtils.addDays;
-import static org.apache.commons.lang3.time.DateUtils.addMonths;
-import static org.apache.commons.lang3.time.DateUtils.truncate;
import static org.springframework.util.ObjectUtils.isEmpty;
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
-import java.util.Calendar;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
@@ -30,19 +28,15 @@
import javax.annotation.Resource;
import org.apache.commons.lang3.time.DateUtils;
-import org.springframework.data.mongodb.core.aggregation.Aggregation;
-import org.springframework.data.mongodb.core.aggregation.AggregationResults;
-import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
-import com.mongodb.BasicDBObject;
import com.moral.common.util.CalculateUtils;
import com.moral.common.util.ResourceUtil;
import com.moral.common.util.ValidateUtil;
import com.moral.entity.Device;
-import com.moral.mapper.HistoryMinutelyMapper;
import com.moral.mapper.DeviceMapper;
+import com.moral.mapper.HistoryMinutelyMapper;
import com.moral.mapper.SensorMapper;
import com.moral.service.HistoryMinutelyService;
@@ -63,11 +57,12 @@
@Override
public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {
ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
- Date date = new Date();
+ LocalDate localDate = LocalDate.now();
// ������00:00:00
- parameters.put("start", truncate(addDays(date, -1), Calendar.DATE));
+ parameters.put("start", localDate.minusDays(1));
+
// ������00:00:00
- parameters.put("end", truncate(date, Calendar.DATE));
+ parameters.put("end", localDate);
String[] macKeys = { "e1", "e2", "e10", "e11", "e15", "e16" };
String sensorKeyColumn = "";
for (int i = 0; i < macKeys.length; i++) {
@@ -383,19 +378,17 @@
ValidateUtil.notNull(parameters.get("mac"), "param.is.null");
ValidateUtil.notNull(parameters.get("macKey"), "param.is.null");
Map<String, Object> result = new HashMap<String, Object>();
- Date date = new Date();
- Date end = truncate(date, Calendar.DATE), start;
+ LocalDate end = LocalDate.now(),start;
// ���������������������������������������
- if (1 == Calendar.getInstance().get(Calendar.DAY_OF_MONTH)) {
+ if (1 == end.getDayOfMonth()) {
// ���������1���00:00:00
- start = truncate(addMonths(date, -1), Calendar.MONTH);
+ start = end.plusDays(-1).with(TemporalAdjusters.firstDayOfMonth());
} else {
// ���������1���00:00:00
- start = truncate(date, Calendar.MONTH);
+ start = end.with(TemporalAdjusters.firstDayOfMonth());
}
parameters.put("start", start);
parameters.put("end", end);
-
String sensorKey = (String) parameters.get("macKey");
String sensorKeyColumn = "AVG(json -> '$." + sensorKey + "[0]') " + sensorKey;
parameters.put("sensorKeyColumn", sensorKeyColumn);
--
Gitblit v1.8.0