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/2] 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/2] =?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<Integer> sigleNow;
+        @ApiModelProperty("本年和")
+        private List<Integer> sumNow;
+        @ApiModelProperty("去年单月")
+        private List<Integer> sigleLast;
+        @ApiModelProperty("去年年和")
+        private List<Integer> sumLast;
+    }
+}