From 3eb2744f6d96a9a1a2067a3575d4616d7a556cc0 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Mon, 14 Dec 2020 11:41:17 +0800 Subject: [PATCH 1/5] ll --- mt/src/main/resources/application.yml | 4 ++-- tall/src/main/resources/application.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mt/src/main/resources/application.yml b/mt/src/main/resources/application.yml index 1ac895fc..ac92adb9 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: test + include: common, util-test diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..ebc544af 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: test + include: util-test,common From f5b413d9c58d4d29cf060e1f711c2d20d20696d5 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Mon, 14 Dec 2020 16:53:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8B=89=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdomcar/api/ScreenController.java | 1 + .../wisdomcar/api/StatisticsController.java | 8 ++++++ .../wisdomcar/bean/dto/StatisticsDto.java | 25 +++++++++++++++++ .../wisdomcar/bean/vo/StatisticsVo.java | 28 +++++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java create mode 100644 wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java 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 109ef427..543d1cca 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java @@ -1,8 +1,16 @@ 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 io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; /** 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 new file mode 100644 index 00000000..3a1dc00b --- /dev/null +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/StatisticsDto.java @@ -0,0 +1,25 @@ +package com.ccsens.wisdomcar.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 1007 + */ +@Data +public class StatisticsDto { + @Data + @ApiModel("查询小车本年和往年使用次数") + public static class UseNum{ + @NotBlank + @ApiModelProperty("year") + private String year; + @NotNull + @ApiModelProperty("医院id") + private Long hospitalId; + } +} 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 new file mode 100644 index 00000000..38823a4f --- /dev/null +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/vo/StatisticsVo.java @@ -0,0 +1,28 @@ +package com.ccsens.wisdomcar.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.List; + +/** + * 1007 + */ +@Data +public class StatisticsVo { + @Data + @ApiModel("查询小车本年和往年使用次数") + public static class UseNumVo{ + @ApiModelProperty("本年单月") + private List sigleNow; + @ApiModelProperty("本年和") + private List sumNow; + @ApiModelProperty("去年单月") + private List sigleLast; + @ApiModelProperty("去年年和") + private List sumLast; + } +} From 6903b5cf95d90ad9562df795b3b042df5ea914df Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Mon, 14 Dec 2020 17:53:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdomcar/service/StatisticsService.java | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) 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 86df0861..33edf5d6 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java @@ -28,18 +28,33 @@ public class StatisticsService implements IStatisticsService{ public StatisticsVo.UseNumsVo selResult(StatisticsDto.UseNum param) { StatisticsVo.UseNumsVo useNumsVo=new StatisticsVo.UseNumsVo(); List useNumVoNow = statisticsDao.selResult(param); - List sumLast=new ArrayList(); + List sumNow=new ArrayList(); + sumNow.add(useNumVoNow.get(0)); + for (int i = 1; i < useNumVoNow.size(); i++) { + StatisticsVo.UseNumVo useNumVo=new StatisticsVo.UseNumVo(); + useNumVo.setName(useNumVoNow.get(i).getName()); + useNumVo.setNum(useNumVoNow.get(i).getNum()+useNumVoNow.get(i-1).getNum()); + sumNow.add(useNumVo); + } useNumsVo.setSigleNow(useNumVoNow); - useNumsVo.setSumNow(useNumVoNow); + useNumsVo.setSumNow(sumNow); + + //往年得 + Integer yaer=Integer.valueOf(param.getYear()); yaer=yaer-1; param.setYear(String.valueOf(yaer)); List useNumVosLast = statisticsDao.selResult(param); + List sumLast = new ArrayList(); + sumLast.add(useNumVosLast.get(0)); + for (int i = 1; i < useNumVosLast.size(); i++) { + StatisticsVo.UseNumVo useNumVo=new StatisticsVo.UseNumVo(); + useNumVo.setName(useNumVosLast.get(i).getName()); + useNumVo.setNum(useNumVosLast.get(i).getNum()+useNumVosLast.get(i-1).getNum()); + sumLast.add(useNumVo); + } useNumsVo.setSigleLast(useNumVosLast); - useNumsVo.setSumLast(useNumVosLast); - - - + useNumsVo.setSumLast(sumLast); return useNumsVo; } } From 6c31b40fb38ef08636bc2d20b75615fb411fc31c Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Mon, 14 Dec 2020 18:01:00 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=8C=E6=95=B4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ccsens/wisdomcar/api/StatisticsController.java | 4 ++-- .../java/com/ccsens/wisdomcar/service/StatisticsService.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) 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 1c7106e2..359eb368 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/api/StatisticsController.java @@ -38,8 +38,8 @@ public class StatisticsController { 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) { + @RequestMapping(value = "/get/selResult", 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("查看测评结果"); 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 33edf5d6..b932659a 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java @@ -33,7 +33,7 @@ public class StatisticsService implements IStatisticsService{ for (int i = 1; i < useNumVoNow.size(); i++) { StatisticsVo.UseNumVo useNumVo=new StatisticsVo.UseNumVo(); useNumVo.setName(useNumVoNow.get(i).getName()); - useNumVo.setNum(useNumVoNow.get(i).getNum()+useNumVoNow.get(i-1).getNum()); + useNumVo.setNum(useNumVoNow.get(i).getNum()+sumNow.get(i-1).getNum()); sumNow.add(useNumVo); } useNumsVo.setSigleNow(useNumVoNow); @@ -50,7 +50,7 @@ public class StatisticsService implements IStatisticsService{ for (int i = 1; i < useNumVosLast.size(); i++) { StatisticsVo.UseNumVo useNumVo=new StatisticsVo.UseNumVo(); useNumVo.setName(useNumVosLast.get(i).getName()); - useNumVo.setNum(useNumVosLast.get(i).getNum()+useNumVosLast.get(i-1).getNum()); + useNumVo.setNum(useNumVosLast.get(i).getNum()+sumLast.get(i-1).getNum()); sumLast.add(useNumVo); } useNumsVo.setSigleLast(useNumVosLast); From 006ffecd48c7b35923aa0d0c8642e0ded944c188 Mon Sep 17 00:00:00 2001 From: wang0018 <1007152140@qq.com> Date: Mon, 14 Dec 2020 18:15:14 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wisdomcar/bean/vo/StatisticsVo.java | 17 +++++------------ .../wisdomcar/persist/dao/StatisticsDao.java | 2 +- .../wisdomcar/service/StatisticsService.java | 19 ++++++------------- .../resources/mapper_dao/StatisticsDao.xml | 4 ++-- 4 files changed, 14 insertions(+), 28 deletions(-) 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 cacc9f8d..afdfeb4f 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 @@ -14,23 +14,16 @@ public class StatisticsVo { @ApiModel("查询小车本年和往年使用次数") public static class UseNumsVo { @ApiModelProperty("本年单月") - private List sigleNow; + private List sigleNow; @ApiModelProperty("本年和") - private List sumNow; + private List sumNow; @ApiModelProperty("去年单月") - private List sigleLast; + private List sigleLast; @ApiModelProperty("去年年和") - private List sumLast; - } - @Data - @ApiModel("一次查询出来得结果") - public static class UseNumVo { - @ApiModelProperty("年份") - private String name; - @ApiModelProperty("数量") - private Integer num; + private List sumLast; } + @Data @ApiModel("医院id") public static class FastEdResult{ 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 d07196f2..eadd46fd 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,5 @@ import org.apache.ibatis.annotations.Param; import java.util.List; public interface StatisticsDao extends FirstAidMapper { - public List selResult(@Param("param")StatisticsDto.UseNum param); + public List selResult(@Param("param")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 b932659a..339e17c9 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/StatisticsService.java @@ -27,31 +27,24 @@ public class StatisticsService implements IStatisticsService{ @Override public StatisticsVo.UseNumsVo selResult(StatisticsDto.UseNum param) { StatisticsVo.UseNumsVo useNumsVo=new StatisticsVo.UseNumsVo(); - List useNumVoNow = statisticsDao.selResult(param); - List sumNow=new ArrayList(); + List useNumVoNow = statisticsDao.selResult(param); + List sumNow=new ArrayList(); sumNow.add(useNumVoNow.get(0)); for (int i = 1; i < useNumVoNow.size(); i++) { - StatisticsVo.UseNumVo useNumVo=new StatisticsVo.UseNumVo(); - useNumVo.setName(useNumVoNow.get(i).getName()); - useNumVo.setNum(useNumVoNow.get(i).getNum()+sumNow.get(i-1).getNum()); - sumNow.add(useNumVo); + sumNow.add(useNumVoNow.get(i)+sumNow.get(i-1)); } useNumsVo.setSigleNow(useNumVoNow); useNumsVo.setSumNow(sumNow); //往年得 - Integer yaer=Integer.valueOf(param.getYear()); yaer=yaer-1; param.setYear(String.valueOf(yaer)); - List useNumVosLast = statisticsDao.selResult(param); - List sumLast = new ArrayList(); + List useNumVosLast = statisticsDao.selResult(param); + List sumLast = new ArrayList(); sumLast.add(useNumVosLast.get(0)); for (int i = 1; i < useNumVosLast.size(); i++) { - StatisticsVo.UseNumVo useNumVo=new StatisticsVo.UseNumVo(); - useNumVo.setName(useNumVosLast.get(i).getName()); - useNumVo.setNum(useNumVosLast.get(i).getNum()+sumLast.get(i-1).getNum()); - sumLast.add(useNumVo); + sumLast.add(useNumVosLast.get(i)+sumLast.get(i-1)); } useNumsVo.setSigleLast(useNumVosLast); useNumsVo.setSumLast(sumLast); diff --git a/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml index d2242678..8a316a51 100644 --- a/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml +++ b/wisdomcar/src/main/resources/mapper_dao/StatisticsDao.xml @@ -2,8 +2,8 @@ - + select if(tfa.num is NULL,0,tfa.num) as num FROM (SELECT concat( #{param.year}, `name` ) AS `name` FROM