diff --git a/wisdomcar/pom.xml b/wisdomcar/pom.xml
index 48202585..c030caee 100644
--- a/wisdomcar/pom.xml
+++ b/wisdomcar/pom.xml
@@ -21,10 +21,12 @@
1.0-SNAPSHOT
+
- util
com.ccsens
+ util
1.0-SNAPSHOT
+ compile
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 471b0a2c..713414d3 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java
@@ -79,7 +79,9 @@ public class RabbitController {
carRecordMessageDtoList.forEach(carRecordMessageDto -> {
try {
+ log.info("处理后的平车消息:{}",carRecordMessageDto);
recordService.disposeMessage(carRecordMessageDto);
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -112,4 +114,4 @@ public class RabbitController {
}
}
-}
+}
\ No newline at end of file
diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IStatisticsService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IStatisticsService.java
index 95b08c30..7c733c3c 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IStatisticsService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IStatisticsService.java
@@ -14,15 +14,13 @@ public interface IStatisticsService {
StatisticsVo.FastEdResult getResult(StatisticsDto.Hospital param);
/**
-<<<<<<< HEAD
* 急救时长分析(各个节点)
*/
StatisticsVo.PointTimeList getPointTime(StatisticsDto.Hospital param);
-// /
-// * 查询医院得小车使用情况
-// * @param param
-// * @return
-// */
+ /** 查询医院得小车使用情况
+ * @param param
+ * @return
+ */
StatisticsVo.UseNumsVo selResult(StatisticsDto.UseNum param);
}
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 a00d2d97..86f5c3ee 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java
@@ -69,6 +69,7 @@ public class RecordService implements IRecordService{
wisdomCar = wisdomCars.get(0);
}
if(ObjectUtil.isNull(wisdomCar)){
+ log.info("找不到平车id");
return;
}
WisdomCarRecord wisdomCarRecord = new WisdomCarRecord();
@@ -106,6 +107,7 @@ public class RecordService implements IRecordService{
//如果是称重信息,制造测试数据发送大屏
if(carRecordMessageDto.getType() == Constant.CAR_RECORD_WEIGHT){
+ log.info("处理称重信息");
doseAndSensorMessage(carRecordMessageDto, 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 5464592a..e4fb8d52 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java
@@ -58,21 +58,16 @@ public class StatisticsService implements IStatisticsService{
@Override
public StatisticsVo.PointTimeList getPointTime(StatisticsDto.Hospital param) {
- List pointTimeCurrent1 = new ArrayList<>();
//当前数据
List pointTimeCurrent = statisticsDao.getPointTimeCurrent(param.getId());
- for (int i = 0; i pointTimeHospital = statisticsDao.getPointTimeHospital(param.getId());
//国际数据
List pointTimeInternation = statisticsDao.getPointTimeInternation(param.getId());
StatisticsVo.PointTimeList pointTimeList = new StatisticsVo.PointTimeList();
- pointTimeList.setPointTimeCurrentList(pointTimeCurrent1);
+ pointTimeList.setPointTimeCurrentList(pointTimeCurrent);
pointTimeList.setPointTimeHospital(pointTimeHospital);
pointTimeList.setPointTimeInternation(pointTimeInternation);
return pointTimeList;
diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml
index a47f2a7b..ac92adb9 100644
--- a/wisdomcar/src/main/resources/application.yml
+++ b/wisdomcar/src/main/resources/application.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
- include: common, util-dev
+ active: test
+ include: common, util-test
diff --git a/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml
index 66094caa..e9239407 100644
--- a/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml
+++ b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml
@@ -38,8 +38,10 @@ FROM