From 6d34ba6d0d3394c6677e3828e72b0eb8b1ac3997 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Thu, 17 Dec 2020 18:53:35 +0800
Subject: [PATCH] =?UTF-8?q?20201217=E4=BF=AE=E6=94=B9=E6=80=A5=E6=95=91?=
 =?UTF-8?q?=E6=97=B6=E9=95=BF=E5=88=86=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/wisdomcar/rabbitMQ/RabbitController.java  |  1 +
 .../com/ccsens/wisdomcar/service/RecordService.java  | 12 ++++++++++--
 wisdomcar/src/main/resources/application-dev.yml     |  2 +-
 wisdomcar/src/main/resources/application.yml         |  4 ++--
 4 files changed, 14 insertions(+), 5 deletions(-)

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 b0c1211b..93cbf606 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java
@@ -36,6 +36,7 @@ public class RabbitController {
     @RabbitHandler
     public void process(String messageJson) {
         logger.info("平车上传消息数据: {}",messageJson);
+//        return;
         OutMessageSet outMessageSet = JSONObject.parseObject(messageJson,OutMessageSet.class);
         if(ObjectUtil.isNull(outMessageSet)){
             return;
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 7dc794bb..bf1a04e4 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java
@@ -155,8 +155,13 @@ public class RecordService implements IRecordService{
             BigDecimal aveWeight = weightInt.divide(BigDecimal.valueOf(4),3,BigDecimal.ROUND_HALF_DOWN);
             if(aveWeight.compareTo(BigDecimal.valueOf(5000)) < 1){
                 BigDecimal divide = aveWeight.multiply(BigDecimal.valueOf(1000)).divide(BigDecimal.valueOf(3), 2, BigDecimal.ROUND_HALF_DOWN);
-                randomWeight1 = BigDecimal.valueOf(random.nextInt(divide.intValue())).divide(BigDecimal.valueOf(1000),2,BigDecimal.ROUND_HALF_DOWN);
-                randomWeight2 = BigDecimal.valueOf(random.nextInt(divide.intValue())).divide(BigDecimal.valueOf(1000),2,BigDecimal.ROUND_HALF_DOWN);
+                if(divide.equals(BigDecimal.valueOf(0))){
+                    randomWeight1 = BigDecimal.valueOf(0);
+                    randomWeight2 = BigDecimal.valueOf(0);
+                }else {
+                    randomWeight1 = BigDecimal.valueOf(random.nextInt(divide.intValue())).divide(BigDecimal.valueOf(1000), 2, BigDecimal.ROUND_HALF_DOWN);
+                    randomWeight2 = BigDecimal.valueOf(random.nextInt(divide.intValue())).divide(BigDecimal.valueOf(1000), 2, BigDecimal.ROUND_HALF_DOWN);
+                }
             }
 
             sensor1 = aveWeight.subtract(randomWeight1);
@@ -223,6 +228,7 @@ public class RecordService implements IRecordService{
     private void saveAidRecord(CarRecordMessageDto carRecordMessageDto, Long wisdomCarId, StepVo.Step step) {
         // 如果是开始信息，新建一条急救表数据
         String key = Constant.FIRST_AID + wisdomCarId;
+        log.info("急救表的key:{}",key);
         if(carRecordMessageDto.getType() == Constant.CAR_RECORD_START){
             //新建急救信息
             FirstAid firstAid = new FirstAid();
@@ -243,9 +249,11 @@ public class RecordService implements IRecordService{
         //redis查询急救表
         Long firstAidId = null;
         Object o = redisUtil.get(key);
+        log.info("redis内的急救表的数据：{}",o);
         if(ObjectUtil.isNull(o)){
             FirstAidExample firstAidExample = new FirstAidExample();
             firstAidExample.createCriteria().andCarIdEqualTo(wisdomCarId);
+            firstAidExample.setOrderByClause("begin_time DESC limit 1");
             List<FirstAid> firstAids = firstAidMapper.selectByExample(firstAidExample);
             if(CollectionUtil.isNotEmpty(firstAids)) {
                 firstAidId = firstAids.get(0).getId();
diff --git a/wisdomcar/src/main/resources/application-dev.yml b/wisdomcar/src/main/resources/application-dev.yml
index 7f500c44..dbdb9aee 100644
--- a/wisdomcar/src/main/resources/application-dev.yml
+++ b/wisdomcar/src/main/resources/application-dev.yml
@@ -8,7 +8,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
-    host: 192.168.0.99
+    host: 192.144.182.42
     password: 111111
     port: 5672
     username: admin
diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml
index 1ac895fc..a47f2a7b 100644
--- a/wisdomcar/src/main/resources/application.yml
+++ b/wisdomcar/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
-    include: common, util-prod
+    active: dev
+    include: common, util-dev