From d0505ca9743a55f8a1d2333573c30a99b7b7141f Mon Sep 17 00:00:00 2001 From: "Lihong@123456" <1090591095@qq.com> Date: Wed, 16 Dec 2020 14:38:29 +0800 Subject: [PATCH] 1 --- wisdomcar/pom.xml | 6 + .../wisdomcar/rabbitMQ/RabbitController.java | 110 +++++++++--------- .../wisdomcar/service/IStatisticsService.java | 10 +- .../wisdomcar/service/StatisticsService.java | 9 +- .../resources/mapper_dao/StatisticsDao.xml | 6 +- 5 files changed, 71 insertions(+), 70 deletions(-) diff --git a/wisdomcar/pom.xml b/wisdomcar/pom.xml index 48202585..fb225521 100644 --- a/wisdomcar/pom.xml +++ b/wisdomcar/pom.xml @@ -26,6 +26,12 @@ com.ccsens 1.0-SNAPSHOT + + 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 89d1be72..aa027600 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java +++ b/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 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 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/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/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/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