diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 1ac895fc..a47f2a7b 100644 --- a/mt/src/main/resources/application.yml +++ b/mt/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: prod - include: common, util-prod + active: dev + include: common, util-dev diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ScreenController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ScreenController.java index a878f66e..4775e555 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ScreenController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ScreenController.java @@ -13,4 +13,5 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/screen") public class ScreenController { + } 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 21eb77a0..ca195aee 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java @@ -2,6 +2,7 @@ package com.ccsens.wisdomcar.api; import com.ccsens.util.JsonResponse; import com.ccsens.util.bean.dto.QueryDto; +import com.ccsens.wisdomcar.bean.dto.RfidDto; import com.ccsens.wisdomcar.bean.dto.StatisticsDto; import com.ccsens.wisdomcar.bean.vo.StatisticsVo; import com.ccsens.wisdomcar.service.IStatisticsService; @@ -36,4 +37,23 @@ public class StatisticsController { log.info("查看测评结果"); return JsonResponse.newInstance().ok(fastEdResult); } + @ApiOperation(value = "统计医院中小车得使用情况", notes = "") + @RequestMapping(value = "/get/result", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse selResult(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查看测评结果：{}",params); + StatisticsVo.UseNumsVo selResult = statisticsService.selResult(params.getParam()); + 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 2845fa81..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 @@ -4,11 +4,24 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + /** - * @author 逗 + * 1007 */ @Data public class StatisticsDto { + @Data + @ApiModel("查询小车本年和往年使用次数") + public static class UseNum{ + @NotBlank + @ApiModelProperty("year,比如直接传入 2020 即可") + private String year; + @NotNull + @ApiModelProperty("医院id") + private Long hospitalId; + } @Data @ApiModel("医院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 24f239e1..f19cc215 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 @@ -3,13 +3,33 @@ package com.ccsens.wisdomcar.bean.vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; /** - * @author 逗 + * 1007 */ @Data public class StatisticsVo { - + @Data + @ApiModel("查询小车本年和往年使用次数") + public static class UseNumsVo { + @ApiModelProperty("本年单月") + private List sigleNow; + @ApiModelProperty("本年和") + private List sumNow; + @ApiModelProperty("去年单月") + private List sigleLast; + @ApiModelProperty("去年年和") + private List sumLast; + } + @Data + @ApiModel("一次查询出来得结果") + public static class UseNumVo { + @ApiModelProperty("年份") + private String name; + @ApiModelProperty("数量") + private Integer num; + } @Data @ApiModel("医院id") @@ -28,4 +48,16 @@ public class StatisticsVo { @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 new file mode 100644 index 00000000..28029a73 --- /dev/null +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StatisticsDao.java @@ -0,0 +1,18 @@ +package com.ccsens.wisdomcar.persist.dao; + +import com.ccsens.wisdomcar.bean.dto.StatisticsDto; +import com.ccsens.wisdomcar.bean.vo.StatisticsVo; +import com.ccsens.wisdomcar.persist.mapper.FirstAidMapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface StatisticsDao extends FirstAidMapper { + public List selResult(@Param("param")StatisticsDto.UseNum param); + + List getPointTimeCurrent(@Param("id") Long id); + + List getPointTimeHospital(@Param("id") Long id); + + List getPointTimeInternation(@Param("id") Long id); +} 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 85655c99..95b08c30 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IStatisticsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/IStatisticsService.java @@ -14,7 +14,15 @@ public interface IStatisticsService { StatisticsVo.FastEdResult getResult(StatisticsDto.Hospital param); /** +<<<<<<< HEAD * 急救时长分析（各个节点） */ - List getPointTime(StatisticsDto.Hospital param); + 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 65121ba6..71ca0020 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java @@ -2,25 +2,70 @@ package com.ccsens.wisdomcar.service; import com.ccsens.wisdomcar.bean.dto.StatisticsDto; import com.ccsens.wisdomcar.bean.vo.StatisticsVo; +import com.ccsens.wisdomcar.persist.dao.StatisticsDao; import lombok.extern.slf4j.Slf4j; 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 @Service @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) public class StatisticsService implements IStatisticsService{ + @Resource + private StatisticsDao statisticsDao; @Override public StatisticsVo.FastEdResult getResult(StatisticsDto.Hospital param) { return null; } + @Override - public List getPointTime(StatisticsDto.Hospital param) { - // - return null; + public StatisticsVo.UseNumsVo selResult(StatisticsDto.UseNum param) { + StatisticsVo.UseNumsVo useNumsVo=new StatisticsVo.UseNumsVo(); + List useNumVoNow = statisticsDao.selResult(param); + List sumLast=new ArrayList(); + useNumsVo.setSigleNow(useNumVoNow); + useNumsVo.setSumNow(useNumVoNow); + Integer yaer=Integer.valueOf(param.getYear()); + yaer=yaer-1; + param.setYear(String.valueOf(yaer)); + List useNumVosLast = statisticsDao.selResult(param); + useNumsVo.setSigleLast(useNumVosLast); + useNumsVo.setSumLast(useNumVosLast); + + + + 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/mapper_dao/StatisticsDao.xml b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml new file mode 100644 index 00000000..56fad526 --- /dev/null +++ b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + \ No newline at end of file