From dcc531e761e896b7b6560ffc2b4d79115630b70a Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Tue, 15 Dec 2020 14:51:12 +0800
Subject: [PATCH] 20201215v1.3

---
 .../java/com/ccsens/util/WebConstant.java     |   2 +-
 .../wisdomcar/rabbitMQ/RabbitController.java  | 112 +++++++++---------
 .../wisdomcar/service/RecordService.java      |   2 +-
 .../wisdomcar/service/StatisticsService.java  |   1 -
 4 files changed, 57 insertions(+), 60 deletions(-)

diff --git a/util/src/main/java/com/ccsens/util/WebConstant.java b/util/src/main/java/com/ccsens/util/WebConstant.java
index 20fe3106..e1c58536 100644
--- a/util/src/main/java/com/ccsens/util/WebConstant.java
+++ b/util/src/main/java/com/ccsens/util/WebConstant.java
@@ -663,7 +663,7 @@ public class WebConstant {
             }
         }
         public static Message_Ack_Event phaseOf(String phase) {    //    手写的从String到enum的转换函数
-            if(phase.equalsIgnoreCase("Ack")) {
+            if("Ack".equalsIgnoreCase(phase)) {
                 return Ack;
             } else {
                 return null;
diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java
index 89d029af..89d1be72 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java
@@ -1,57 +1,55 @@
-//package com.ccsens.wisdomcar.rabbitMQ;
-//
-//import cn.hutool.core.collection.CollectionUtil;
-//import cn.hutool.core.util.ObjectUtil;
-//import com.alibaba.fastjson.JSONObject;
-//import com.ccsens.util.bean.message.common.OutMessage;
-//import com.ccsens.util.bean.message.common.OutMessageSet;
-//import com.ccsens.util.config.RabbitMQConfig;
-//import com.ccsens.wisdomcar.bean.dto.Message.CarRecordMessageDto;
-//import com.ccsens.wisdomcar.service.IRecordService;
-//import com.ccsens.wisdomcar.service.RecordService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-//import org.springframework.amqp.rabbit.annotation.RabbitListener;
-//import org.springframework.stereotype.Component;
-//
-//import javax.annotation.Resource;
-//import java.util.List;
-//import java.util.Set;
-//
-//@Slf4j
-//@Component
-//@RabbitListener(queues = RabbitMQConfig.WISDOM_CAR)
-//public class RabbitController {
-//    @Resource
-//    private IRecordService recordService;
-//
-//    private Logger logger = LoggerFactory.getLogger(RabbitController.class);
-//
-//    @RabbitHandler
-//    public void process(String messageJson) {
-//        logger.info("平车上传消息数据: {}",messageJson);
-//        OutMessageSet outMessageSet = JSONObject.parseObject(messageJson,OutMessageSet.class);
-//        if(ObjectUtil.isNull(outMessageSet)){
-//            return;
-//        }
-//        Set<OutMessage> messageSet = outMessageSet.getMessageSet();
-//        if (CollectionUtil.isEmpty(messageSet)) {
-//            return;
-//        }
-//        messageSet.forEach(outMessage -> {
-//            CarRecordMessageDto carRecordMessageDto = JSONObject.parseObject(outMessage.getData(),CarRecordMessageDto.class);
-//            if(ObjectUtil.isNull(carRecordMessageDto)){
-//                return;
-//            }
-//            try {
-//                recordService.disposeMessage(carRecordMessageDto);
-//            } catch (Exception e) {
-//                log.error("处理平车信息异常",e);
-//                e.printStackTrace();
-//            }
-//        });
-//    }
-//
-//}
+package com.ccsens.wisdomcar.rabbitMQ;
+
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.ccsens.util.bean.message.common.OutMessage;
+import com.ccsens.util.bean.message.common.OutMessageSet;
+import com.ccsens.util.config.RabbitMQConfig;
+import com.ccsens.wisdomcar.bean.dto.Message.CarRecordMessageDto;
+import com.ccsens.wisdomcar.service.IRecordService;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Set;
+
+@Slf4j
+@Component
+@RabbitListener(queues = RabbitMQConfig.WISDOM_CAR)
+public class RabbitController {
+    @Resource
+    private IRecordService recordService;
+
+    private Logger logger = LoggerFactory.getLogger(RabbitController.class);
+
+    @RabbitHandler
+    public void process(String messageJson) {
+        logger.info("平车上传消息数据: {}",messageJson);
+        OutMessageSet outMessageSet = JSONObject.parseObject(messageJson,OutMessageSet.class);
+        if(ObjectUtil.isNull(outMessageSet)){
+            return;
+        }
+        Set<OutMessage> messageSet = outMessageSet.getMessageSet();
+        if (CollectionUtil.isEmpty(messageSet)) {
+            return;
+        }
+        messageSet.forEach(outMessage -> {
+            CarRecordMessageDto carRecordMessageDto = JSONObject.parseObject(outMessage.getData(),CarRecordMessageDto.class);
+            if(ObjectUtil.isNull(carRecordMessageDto)){
+                return;
+            }
+            try {
+                recordService.disposeMessage(carRecordMessageDto);
+            } catch (Exception e) {
+                log.error("处理平车信息异常",e);
+                e.printStackTrace();
+            }
+        });
+    }
+
+}
diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java
index 29ee248b..80e8a0e7 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java
@@ -164,7 +164,7 @@ public class RecordService implements IRecordService{
         //震动传感器
         CarRecordMessageDto shakeMessage = new CarRecordMessageDto();
         BeanUtil.copyProperties(carRecordMessageDto,shakeMessage);
-        shakeMessage.setType(Constant.WEIGHT_SENSOR_4);
+        shakeMessage.setType(Constant.SHAKE_SENSOR);
         shakeMessage.setValue(shakeX + "," + shakeY + "," + shakeZ);
         //发送消息
         sendRecordMessage(shakeMessage,userIdSet);
diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java
index 0d3f2eef..5464592a 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java
@@ -10,7 +10,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 
 import javax.annotation.Resource;
-import java.security.PrivateKey;
 import java.util.ArrayList;
 
 import java.util.List;