1

wisdomcar/pom.xml

@@ -26,6 +26,12 @@
             <groupId>com.ccsens</groupId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <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

@@ -1,55 +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 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();
-            }
-        });
-    }
-
-}
+//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();
+//            }
+//        });
+//    }
+//
+//}

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/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/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">