20201216加日志

wisdomcar/pom.xml

@@ -21,10 +21,12 @@
             <version>1.0-SNAPSHOT</version>
         </dependency>
         <!--util 工具类-->
+
         <dependency>
-            <artifactId>util</artifactId>
             <groupId>com.ccsens</groupId>
+            <artifactId>util</artifactId>
             <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
 
     </dependencies>

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();
             }

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);
 
 }

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);
         }
         //新建急救表存储信息

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<Long> pointTimeCurrent1 =  new ArrayList<>();
         //当前数据
         List<Long> pointTimeCurrent = statisticsDao.getPointTimeCurrent(param.getId());
-        for (int i = 0; i <pointTimeCurrent.size() ; i++) {
-            if (i<6){
-                pointTimeCurrent1.add(pointTimeCurrent.get(i+1)-pointTimeCurrent.get(i));
-            }
-        }
+
         //医院数据
         List<Long> pointTimeHospital = statisticsDao.getPointTimeHospital(param.getId());
         //国际数据
         List<Long> 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;

wisdomcar/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev
-    include: common, util-dev
+    active: test
+    include: common, util-test
 
 

wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml

@@ -38,8 +38,10 @@ FROM
 	<select id="getPointTimeCurrent" parameterType="java.util.Map" resultType="Long">
 		select tfar.begin_time/1000 as time
 		from
-		t_first_aid_record tfar ,(select id from t_first_aid tfa  where tfa.hospital_id=#{id} and tfa.rec_status=0 ORDER BY tfa.begin_time) t
-		where  tfar.rec_status=0  and t.id = tfar.first_aid_id
+		t_step ts LEFT JOIN  t_first_aid_record tfar on ts.id = tfar.step_id ,
+		(select id from t_first_aid tfa  where tfa.hospital_id =#{id} and tfa.rec_status=0 ORDER BY tfa.begin_time) t
+		where  tfar.rec_status=0  and t.id = tfar.first_aid_id  and ts.rec_status = 0  and ts.step_type = 1
+		ORDER BY ts.sequence asc
 	</select>
 
 	<select id="getPointTimeHospital" parameterType="java.util.Map" resultType="Long">