From 04459f5c7e79f149a4d19e2572d686d60b80664c Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Thu, 10 Jun 2021 16:53:47 +0800
Subject: [PATCH] screen-manage 更新打包错误代码
---
/dev/null | 97 ------------------------------------------------
screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java | 1
screen-manage/src/main/java/com/moral/api/service/HistoryMinutelyService.java | 2 -
screen-manage/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java | 2 -
4 files changed, 0 insertions(+), 102 deletions(-)
diff --git a/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaReceiver.java b/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaReceiver.java
deleted file mode 100644
index 8119640..0000000
--- a/screen-manage/src/main/java/com/moral/api/kafka/consumer/KafkaReceiver.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.moral.api.kafka.consumer;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.kafka.annotation.KafkaListener;
-import org.springframework.kafka.support.Acknowledgment;
-import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import com.alibaba.fastjson.JSON;
-import com.moral.api.service.DeviceService;
-import com.moral.api.service.HistoryHourlyService;
-import com.moral.api.service.HistoryMinutelyService;
-import com.moral.constant.KafkaConstants;
-
-/*@Slf4j
-@Component
-public class KafkaReceiver {
-
- @Autowired
- private HistoryMinutelyService historyMinutelyService;
-
- @Autowired
- private HistoryHourlyService historyHourlyService;
-
- @Autowired
- private DeviceService deviceService;
-
- //������������
- @KafkaListener(topics = KafkaConstants.TOPIC_MINUTE, groupId = KafkaConstants.GROUP_ID, containerFactory = "kafkaListenerContainerFactory")
- public void listenMinute(ConsumerRecord<String, String> record, Acknowledgment ack) {
- String msg = record.value();
- try {
- Map<String, Object> data = JSON.parseObject(msg, HashMap.class);
- System.out.println(data);
- Object mac = data.get("mac");
- Object time = data.get("DataTime");
- Object ver = data.get("ver");
- if (StringUtils.isEmpty(ver) || StringUtils.isEmpty(time) || StringUtils.isEmpty(mac)) {
- log.warn("some properties is null, param[0] message:" + msg);
- return;
- }
- Map<String, Object> deviceInfo = deviceService.getDeviceByMac(mac.toString());
- if (deviceInfo == null) {
- String deviceRealState = "null or deleted";
- log.warn("device record is " + deviceRealState + ", param[0] message:" + msg);
- return;
- }
- //���������������������������
- data.put("DataTime", Math.round(new Double((Long) time) / 1000) * 1000);
-
- //���������������
- historyMinutelyService.insertHistoryMinutely(data);
-
-
- ack.acknowledge();
- } catch (Exception e) {
- log.error("param[0] message:" + msg);
- }
- }
-
- //������������
- @KafkaListener(topics = KafkaConstants.TOPIC_HOUR, groupId = KafkaConstants.GROUP_ID, containerFactory = "kafkaListenerContainerFactory")
- public void listenHour(ConsumerRecord<String, String> record, Acknowledgment ack) {
- String msg = record.value();
- try {
- Map<String, Object> data = JSON.parseObject(msg, HashMap.class);
- System.out.println(data);
- Object mac = data.get("mac");
- Object time = data.get("DataTime");
- Object ver = data.get("ver");
- if (StringUtils.isEmpty(ver) || StringUtils.isEmpty(time) || StringUtils.isEmpty(mac)) {
- log.warn("some properties is null, param[0] message:" + msg);
- return;
- }
- Map<String, Object> deviceInfo = deviceService.getDeviceByMac(mac.toString());
- if (deviceInfo == null) {
- String deviceRealState = "null or deleted";
- log.warn("device record is " + deviceRealState + ", param[0] message:" + msg);
- return;
- }
- //���������������������������
- data.put("DataTime", Math.round(new Double((Long) time) / 1000) * 1000);
-
- //���������������
- historyHourlyService.insertHistoryHourly(data);
-
- ack.acknowledge();
- } catch (Exception e) {
- log.error("param[0] message:" + msg);
- }
- }
-}*/
diff --git a/screen-manage/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java b/screen-manage/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java
index ce88532..3cf3d71 100644
--- a/screen-manage/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java
+++ b/screen-manage/src/main/java/com/moral/api/mapper/HistoryMinutelyMapper.java
@@ -2,8 +2,6 @@
import java.util.Map;
-import com.moral.api.entity.HistoryHourly;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* <p>
diff --git a/screen-manage/src/main/java/com/moral/api/service/HistoryMinutelyService.java b/screen-manage/src/main/java/com/moral/api/service/HistoryMinutelyService.java
index 8d2994c..4834d08 100644
--- a/screen-manage/src/main/java/com/moral/api/service/HistoryMinutelyService.java
+++ b/screen-manage/src/main/java/com/moral/api/service/HistoryMinutelyService.java
@@ -2,8 +2,6 @@
import java.util.Map;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.moral.api.entity.HistoryHourly;
/**
* <p>
diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
index 7cb06d8..204f902 100644
--- a/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
+++ b/screen-manage/src/main/java/com/moral/api/service/impl/MenuServiceImpl.java
@@ -19,7 +19,6 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
import com.moral.constant.ResponseCodeEnum;
-import com.sun.corba.se.spi.presentation.rmi.IDLNameTranslator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
--
Gitblit v1.8.0