From dea78470f9f412f26b887827e94e46afc5d7bdbc Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 06 Aug 2021 14:37:47 +0800
Subject: [PATCH] 账号存在返回信息修改
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 47 ++++-------------------------------------------
1 files changed, 4 insertions(+), 43 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
index 0d5044e..fb62517 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java
@@ -16,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import java.util.ArrayList;
@@ -48,12 +49,13 @@
private HistoryHourlyService historyHourlyService;
@Override
+ @Transactional
public void insertHistoryDaily() {
String format = DateUtils.yyyy_MM_dd_EN;
Date now = new Date();
- //������������
+ //���������������������
Date start = DateUtils.dataToTimeStampTime(DateUtils.getDateOfDay(now, -1), format);
- //������������
+ //���������������������
Date end = DateUtils.dataToTimeStampTime(now, format);
//������
QueryWrapper<Sensor> sensorQueryWrapper = new QueryWrapper<>();
@@ -123,46 +125,5 @@
//���������������
historyDailyMapper.insertHistoryDaily(insertData);
- }
-
-
- public static void main(String[] args) {
- List<Integer> list = new ArrayList<>();
- list.add(8);//1���
- list.add(12);//2
- list.add(10);//3
- list.add(18);//4
- list.add(16);//5
- list.add(22);//6
- list.add(4);//7
- list.add(12);
- list.add(28);
- list.add(26);
- list.add(25);
- list.add(21);
- list.add(6);
- list.add(18);
- list.add(28);
- list.add(18);
- list.add(16);
- list.add(15);
- list.add(12);
- list.add(14);
- list.add(12);
- list.add(10);
- list.add(5);
- list.add(88);//24
- Integer max = 0;
- for (int i = 7; i < list.size(); i++) {
- Integer sum = 0;
- for (int j = i - 7; j <= i; j++) {
- Integer b = list.get(j);
- sum = sum + b;
- }
- if (sum > max) {
- max = sum;
- }
- }
- System.out.println((max / 8F));
}
}
--
Gitblit v1.8.0