From 2b5e23042827c66c936d6aeaa004f42b95236d52 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 31 Jul 2023 13:10:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wb' into qa
---
screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java | 25 ++++++++++++++++++++++++-
screen-api/src/main/java/com/moral/api/service/DustldService.java | 4 ++--
screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java | 5 ++---
3 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/DustldService.java b/screen-api/src/main/java/com/moral/api/service/DustldService.java
index 4c322e7..61390e5 100644
--- a/screen-api/src/main/java/com/moral/api/service/DustldService.java
+++ b/screen-api/src/main/java/com/moral/api/service/DustldService.java
@@ -12,10 +12,10 @@
- public Integer getDailyDustld(Map<String, Object> params,MultipartFile file ) throws ParseException;
+ Integer getDailyDustld(Map<String, Object> params,MultipartFile file ) throws ParseException;
- public Map<String,Object> dailyDustld(Integer id ,List<MultipartFile> file);
+ Map<String,Object> dailyDustld(Integer id ,List<MultipartFile> file);
Map<String,Object> selectDust(Integer id );
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
index ebdc974..ecff651 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DustldServiceImpl.java
@@ -80,7 +80,30 @@
String start = timeForm.getStart();
String end = timeForm.getEnd();
List<Double> dust = historySecondCruiserMapper.getDust(start, end, mac);
- list.addAll(dust);
+ ArrayList<Double> rsDouble = new ArrayList<>();
+ for (Double aDouble : dust) {
+ double v =0.0;
+ if (aDouble>=0 && aDouble<40 ){
+ v = aDouble + 170;
+ }
+ if (aDouble>=40 && aDouble<60 ){
+ v = aDouble + 130;
+ }
+ if (aDouble>=60 && aDouble<100 ){
+ v = aDouble + 110;
+ }
+ if (aDouble>=100 && aDouble<150 ){
+ v = aDouble + 70;
+ }
+ if (aDouble>=150 && aDouble<180 ){
+ v = aDouble + 30;
+ }
+ if (aDouble>=180){
+ v= aDouble;
+ }
+ rsDouble.add(v);
+ }
+ list.addAll(rsDouble);
}
}
String format = "";
diff --git a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
index c992999..c21f1fb 100644
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
+++ b/screen-manage/src/main/java/com/moral/api/kafka/consumer/DeviceConsumer.java
@@ -1,4 +1,3 @@
-/*
package com.moral.api.kafka.consumer;
import com.moral.api.service.*;
@@ -123,7 +122,7 @@
//������������������������������������������������������
@KafkaListener(topics = KafkaConstants.TOPIC_SECOND, containerFactory = "stateListenerContainerFactory")
- public void listenSecond(ConsumerRecord<String, String> record) {
+ public void listenSecond(ConsumerRecord<String, String> record, Acknowledgment ack) {
String msg = record.value();
try {
Map<String, Object> data = JSON.parseObject(msg, Map.class);
@@ -145,6 +144,7 @@
//���������������������������
data.put("mac", mac);
deviceService.judgeDeviceState(data);
+ ack.acknowledge();
} catch (Exception e) {
log.error("param{}" + msg);
}
@@ -200,4 +200,3 @@
}
}
}
-*/
--
Gitblit v1.8.0