diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index ac92adb9..a47f2a7b 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml index acfee8ae..e962f3c5 100644 --- a/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml +++ b/mt/src/main/resources/mapper_dao/CompeteProjectConfigDao.xml @@ -108,30 +108,30 @@ LEFT JOIN t_compete_group tcg on tcg.id = tcp.compete_group_id WHERE - - tcpro.id = #{projectId} - - - and tcg.id = #{groupId} - - - and tcc.id = #{companyId} - - - and tcp.name like concat('%',#{name, jdbcType=VARCHAR},'%') - - - and tcp.id_card = #{idCard} - - and tcpro.type=0 - and tcpro.`level` =2 - and tcpro.team=1 - and tcpro.rec_status = 0 - and tctm.rec_status = 0 - and tcp.rec_status = 0 - and tcc.rec_status = 0 - and tcg.rec_status = 0 - and tct.rec_status = 0 + + tcpro.id = #{projectId} + + + and tcg.id = #{groupId} + + + and tcc.id = #{companyId} + + + and tcp.name like concat('%',#{name, jdbcType=VARCHAR},'%') + + + and tcp.id_card = #{idCard} + + and tcpro.type=0 + and tcpro.`level` =2 + and tcpro.team=1 + and tcpro.rec_status = 0 + and tctm.rec_status = 0 + and tcp.rec_status = 0 + and tcc.rec_status = 0 + and tcg.rec_status = 0 + and tct.rec_status = 0 UNION SELECT diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java index 359eb368..2a200399 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java @@ -45,4 +45,15 @@ public class StatisticsController { log.info("查看测评结果"); return JsonResponse.newInstance().ok(selResult); } + + + + @ApiOperation(value = "急救各个节点时间统计", notes = "") + @RequestMapping(value = "/getPointTime", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse getPointTime(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("急救各个节点时间统计：{}",params); + StatisticsVo.PointTimeList pointTime = statisticsService.getPointTime(params.getParam()); + log.info("急救各个节点时间统计"); + return JsonResponse.newInstance().ok(pointTime); + } } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java index d50f441c..89a91716 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java @@ -30,4 +30,5 @@ public class StatisticsDto { private Long id; } + } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java index afdfeb4f..c3421426 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java @@ -30,4 +30,27 @@ public class StatisticsVo { @ApiModelProperty("医院id") private Long id; } + + + + @Data + @ApiModel("各个结点时长") + public static class PointTime{ + @ApiModelProperty("节点名") + private String name; + @ApiModelProperty("节点耗时") + private Long time; + } + + + @Data + @ApiModel("各个结点时长集合") + public static class PointTimeList{ + @ApiModelProperty("当前数据") + private List pointTimeCurrentList; + @ApiModelProperty("医院数据") + private List pointTimeHospital; + @ApiModelProperty("国际数据") + private List pointTimeInternation; + } } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java index eadd46fd..db790d82 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java @@ -8,5 +8,15 @@ import org.apache.ibatis.annotations.Param; import java.util.List; public interface StatisticsDao extends FirstAidMapper { + + + + List getPointTimeCurrent(@Param("id") Long id); + + List getPointTimeHospital(@Param("id") Long id); + + List getPointTimeInternation(@Param("id") Long id); + public List selResult(@Param("param")StatisticsDto.UseNum param); + } 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 386cea1f..95b08c30 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IStatisticsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IStatisticsService.java @@ -3,6 +3,8 @@ package com.ccsens.wisdomcar.service; import com.ccsens.wisdomcar.bean.dto.StatisticsDto; import com.ccsens.wisdomcar.bean.vo.StatisticsVo; +import java.util.List; + public interface IStatisticsService { /** * 查看FAST ED结果 @@ -12,9 +14,15 @@ public interface IStatisticsService { StatisticsVo.FastEdResult getResult(StatisticsDto.Hospital param); /** - * 查询医院得小车使用情况 - * @param param - * @return +<<<<<<< HEAD + * 急救时长分析（各个节点） */ + StatisticsVo.PointTimeList getPointTime(StatisticsDto.Hospital param); +// / +// * 查询医院得小车使用情况 +// * @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 339e17c9..3f9478cb 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java @@ -8,9 +8,11 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; + import javax.annotation.Resource; import java.security.PrivateKey; import java.util.ArrayList; + import java.util.List; @Slf4j @@ -24,6 +26,7 @@ public class StatisticsService implements IStatisticsService{ return null; } + @Override public StatisticsVo.UseNumsVo selResult(StatisticsDto.UseNum param) { StatisticsVo.UseNumsVo useNumsVo=new StatisticsVo.UseNumsVo(); @@ -49,5 +52,28 @@ public class StatisticsService implements IStatisticsService{ useNumsVo.setSigleLast(useNumVosLast); useNumsVo.setSumLast(sumLast); return useNumsVo; + + } + + + + @Override + public StatisticsVo.PointTimeList getPointTime(StatisticsDto.Hospital param) { + List pointTimeCurrent1 = new ArrayList<>(); + //当前数据 + List pointTimeCurrent = statisticsDao.getPointTimeCurrent(param.getId()); + for (int i = 0; i <7; i++) { + pointTimeCurrent1.add(pointTimeCurrent.get(i)); + } + //医院数据 + List pointTimeHospital = statisticsDao.getPointTimeHospital(param.getId()); + //国际数据 + List pointTimeInternation = statisticsDao.getPointTimeInternation(param.getId()); + + StatisticsVo.PointTimeList pointTimeList = new StatisticsVo.PointTimeList(); + pointTimeList.setPointTimeCurrentList(pointTimeCurrent1); + 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 ac92adb9..a47f2a7b 100644 --- a/wisdomcar/src/main/resources/application.yml +++ b/wisdomcar/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml index 8a316a51..983035b5 100644 --- a/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml @@ -31,4 +31,33 @@ FROM ) tfa on tsm.`name`=tfa.`da` + + + + + + + + \ No newline at end of file