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; + } +}