统计入参校验

src/main/java/com/diagbot/vo/FilterPageVO.java

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -16,6 +18,7 @@ public class FilterPageVO extends Page {
     /**
      * 统计维度 1-本月，2-本年
      */
+    @NotNull(message = "请输入本年或本月")
     private Integer type;
     /**
      * 时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年
@@ -52,4 +55,4 @@ public class FilterPageVO extends Page {
      * 模块id：243=病案首页
      */
     private Long casesId;
-}
+}

src/main/java/com/diagbot/vo/FilterVO.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -15,6 +17,7 @@ public class FilterVO {
     /**
      * 统计维度 1-本月，2-本年
      */
+    @NotNull(message = "请输入本年或本月")
     private Integer type;
     /**
      * 起始时间

src/main/java/com/diagbot/web/ConsoleByDeptController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -40,7 +41,7 @@ public class ConsoleByDeptController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/leaveHosCountByDept")
     @SysLogger("leaveHosCountByDept")
-    public RespDTO<Map<String, Object>> leaveHosCountByDept(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> leaveHosCountByDept(@RequestBody @Valid FilterVO filterVO) {
         Map<String, Object> data = consoleByDeptFacade.leaveHosCountByDept(filterVO);
         return RespDTO.onSuc(data);
     }
@@ -49,7 +50,7 @@ public class ConsoleByDeptController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/mrCountByDept")
     @SysLogger("mrCountByDept")
-    public RespDTO<Map<String, Object>> mrCountByDept(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> mrCountByDept(@RequestBody @Valid FilterVO filterVO) {
         Map<String, Object> data = consoleByDeptFacade.mrCountByDept(filterVO);
         return RespDTO.onSuc(data);
     }
@@ -58,7 +59,7 @@ public class ConsoleByDeptController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/entryCountGroupByCaseAndDept")
     @SysLogger("entryCountGroupByCaseAndDept")
-    public RespDTO<Map<String, Object>> entryCountGroupByCaseAndDept(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> entryCountGroupByCaseAndDept(@RequestBody @Valid FilterVO filterVO) {
         Map<String, Object> data = consoleByDeptFacade.entryCountGroupByCaseAndDept(filterVO);
         return RespDTO.onSuc(data);
     }
@@ -67,7 +68,7 @@ public class ConsoleByDeptController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/entryCountGroupByEntryAndDept")
     @SysLogger("entryCountGroupByEntryAndDept")
-    public RespDTO<Map<String, Object>> entryCountGroupByEntryAndDept(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> entryCountGroupByEntryAndDept(@RequestBody @Valid FilterVO filterVO) {
         Map<String, Object> data = consoleByDeptFacade.entryCountGroupByEntryAndDept(filterVO);
         return RespDTO.onSuc(data);
     }
@@ -87,7 +88,7 @@ public class ConsoleByDeptController {
                     "desc： 排序（降序） <br>")
     @PostMapping("/homePageLevelByDeptLimit")
     @SysLogger("homePageLevelByDeptLimit")
-    public RespDTO<List<LevelStatisticsDTO>> homePageLevelByDeptLimit(@RequestBody FilterOrderByDeptVO filterOrderByDeptVO) {
+    public RespDTO<List<LevelStatisticsDTO>> homePageLevelByDeptLimit(@RequestBody @Valid FilterOrderByDeptVO filterOrderByDeptVO) {
         return RespDTO.onSuc(consoleByDeptFacade.homePageLevelByDeptLimit(filterOrderByDeptVO));
     }
     //endregion -----------------------首页接口结束------------------------------
@@ -108,7 +109,7 @@ public class ConsoleByDeptController {
                     "deptName： 科室名称(必填)<br>")
     @PostMapping("/entryCountGroupByCaseAndDeptPage")
     @SysLogger("entryCountGroupByCaseAndDeptPage")
-    public RespDTO<IPage<DeptNumDTO>> entryCountGroupByCaseAndDeptPage(@RequestBody FilterPageByDeptVO filterPageByDeptVO) {
+    public RespDTO<IPage<DeptNumDTO>> entryCountGroupByCaseAndDeptPage(@RequestBody @Valid FilterPageByDeptVO filterPageByDeptVO) {
         IPage<DeptNumDTO> data = consoleByDeptFacade.entryCountGroupByCaseAndDeptPage(filterPageByDeptVO);
         return RespDTO.onSuc(data);
     }
@@ -120,7 +121,7 @@ public class ConsoleByDeptController {
                     "casesId： 模块id：243=病案首页 <br>")
     @PostMapping("/entryCountGroupByEntryAndDeptPage")
     @SysLogger("entryCountGroupByEntryAndDeptPage")
-    public RespDTO<IPage<DeptNumDTO>> entryCountGroupByEntryAndDeptPage(@RequestBody FilterPageByDeptVO filterPageByDeptVO) {
+    public RespDTO<IPage<DeptNumDTO>> entryCountGroupByEntryAndDeptPage(@RequestBody @Valid FilterPageByDeptVO filterPageByDeptVO) {
         IPage<DeptNumDTO> data = consoleByDeptFacade.entryCountGroupByEntryAndDeptPage(filterPageByDeptVO);
         return RespDTO.onSuc(data);
     }
@@ -133,7 +134,7 @@ public class ConsoleByDeptController {
     @PostMapping("/resultStatisticsByDeptAndDoctorPage")
     @SysLogger("resultStatisticsByDeptAndDoctorPage")
     @ApiIgnore
-    public RespDTO<IPage<DeptNumDTO>> resultStatisticsByDeptAndDoctorPage(@RequestBody FilterPageByDeptVO filterPageByDeptVO) {
+    public RespDTO<IPage<DeptNumDTO>> resultStatisticsByDeptAndDoctorPage(@RequestBody @Valid FilterPageByDeptVO filterPageByDeptVO) {
         IPage<DeptNumDTO> data = consoleByDeptFacade.resultStatisticsByDeptAndDoctorPage(filterPageByDeptVO);
         return RespDTO.onSuc(data);
     }
@@ -153,7 +154,7 @@ public class ConsoleByDeptController {
                     "desc： 排序（降序） <br>")
     @PostMapping("/levelStatisticsByDept")
     @SysLogger("levelStatisticsByDept")
-    public RespDTO<List<LevelStatisticsDTO>> levelStatisticsByDept(@RequestBody FilterOrderByDeptVO filterOrderByDeptVO) {
+    public RespDTO<List<LevelStatisticsDTO>> levelStatisticsByDept(@RequestBody @Valid FilterOrderByDeptVO filterOrderByDeptVO) {
         return RespDTO.onSuc(consoleByDeptFacade.levelStatisticsByDept(filterOrderByDeptVO));
     }
 
@@ -172,10 +173,9 @@ public class ConsoleByDeptController {
                     "desc： 排序（降序） <br>")
     @PostMapping("/homePageLevelStatisticsByDept")
     @SysLogger("homePageLevelStatisticsByDept")
-    public RespDTO<List<LevelStatisticsDTO>> homePageLevelStatisticsByDept(@RequestBody FilterOrderByDeptVO filterOrderByDeptVO) {
+    public RespDTO<List<LevelStatisticsDTO>> homePageLevelStatisticsByDept(@RequestBody @Valid FilterOrderByDeptVO filterOrderByDeptVO) {
         return RespDTO.onSuc(consoleByDeptFacade.homePageLevelStatisticsByDept(filterOrderByDeptVO));
     }
 
     //endregion -----------------------内页接口结束------------------------------
-
 }

src/main/java/com/diagbot/web/ConsoleController.java

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 
@@ -43,7 +44,7 @@ public class ConsoleController {
     @PostMapping("/mrStatistics")
     @SysLogger("mrStatistics")
     @ApiIgnore
-    public RespDTO<Map<String, Object>> mrStatistics(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> mrStatistics(@RequestBody @Valid FilterVO filterVO) {
         Map<String, Object> data = consoleFacade.mrStatistics(filterVO);
         return RespDTO.onSuc(data);
     }
@@ -53,7 +54,7 @@ public class ConsoleController {
     @PostMapping("/resultStatistics")
     @SysLogger("resultStatistics")
     @ApiIgnore
-    public RespDTO<Map<String, Object>> resultStatistics(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> resultStatistics(@RequestBody @Valid FilterVO filterVO) {
         Map<String, Object> data = consoleFacade.resultStatistics(filterVO);
         return RespDTO.onSuc(data);
     }
@@ -63,7 +64,7 @@ public class ConsoleController {
     @PostMapping("/averageStatistics")
     @SysLogger("averageStatistics")
     @ApiIgnore
-    public RespDTO<Map<String, Object>> averageStatistics(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> averageStatistics(@RequestBody @Valid FilterVO filterVO) {
         Map<String, Object> data = consoleFacade.averageStatistics(filterVO);
         return RespDTO.onSuc(data);
     }
@@ -81,7 +82,7 @@ public class ConsoleController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/getAverageDayNum")
     @SysLogger("getAverageDayNum")
-    public RespDTO<Map<String, Object>> getAverageDayNum(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> getAverageDayNum(@RequestBody @Valid FilterVO filterVO) {
         return RespDTO.onSuc(consoleFacade.getAverageDayNum(filterVO));
     }
 
@@ -95,7 +96,7 @@ public class ConsoleController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/getAverageFee")
     @SysLogger("getAverageFee")
-    public RespDTO<Map<String, Object>> getAverageFee(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> getAverageFee(@RequestBody @Valid FilterVO filterVO) {
         return RespDTO.onSuc(consoleFacade.getAverageFee(filterVO));
     }
 
@@ -109,7 +110,7 @@ public class ConsoleController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/getAverageScore")
     @SysLogger("getAverageScore")
-    public RespDTO<Map<String, Object>> getAverageScore(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> getAverageScore(@RequestBody @Valid FilterVO filterVO) {
         return RespDTO.onSuc(consoleFacade.getAverageScore(filterVO));
     }
 
@@ -123,7 +124,7 @@ public class ConsoleController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/getLevelResultDept")
     @SysLogger("getLevelResultDept")
-    public RespDTO<Map<String, Object>> getLevelResultDept(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> getLevelResultDept(@RequestBody @Valid FilterVO filterVO) {
         return RespDTO.onSuc(consoleFacade.getLevelResultDept(filterVO));
     }
 
@@ -137,7 +138,7 @@ public class ConsoleController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/leaveHosCount")
     @SysLogger("leaveHosCount")
-    public RespDTO<Map<String, Object>> leaveHosCount(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> leaveHosCount(@RequestBody @Valid FilterVO filterVO) {
         return RespDTO.onSuc(consoleFacade.leaveHosCount(filterVO));
     }
 
@@ -151,7 +152,7 @@ public class ConsoleController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/mrCount")
     @SysLogger("mrCount")
-    public RespDTO<Map<String, Object>> mrCount(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> mrCount(@RequestBody @Valid FilterVO filterVO) {
         return RespDTO.onSuc(consoleFacade.mrCount(filterVO));
     }
 
@@ -165,7 +166,7 @@ public class ConsoleController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/entryCountGroupByCase")
     @SysLogger("entryCountGroupByCase")
-    public RespDTO<Map<String, Object>> entryCountGroupByCase(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> entryCountGroupByCase(@RequestBody @Valid FilterVO filterVO) {
         return RespDTO.onSuc(consoleFacade.entryCountGroupByCase(filterVO));
     }
 
@@ -179,7 +180,7 @@ public class ConsoleController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/entryCountGroupByEntry")
     @SysLogger("entryCountGroupByEntry")
-    public RespDTO<Map<String, Object>> entryCountGroupByEntry(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> entryCountGroupByEntry(@RequestBody @Valid FilterVO filterVO) {
         return RespDTO.onSuc(consoleFacade.entryCountGroupByEntry(filterVO));
     }
 
@@ -193,7 +194,7 @@ public class ConsoleController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/entryByDept")
     @SysLogger("entryByDept")
-    public RespDTO<Map<String, Object>> entryByDept(@RequestBody FilterVO filterVO) {
+    public RespDTO<Map<String, Object>> entryByDept(@RequestBody @Valid FilterVO filterVO) {
         return RespDTO.onSuc(consoleFacade.entryByDept(filterVO));
     }
     //endregion-----------------------单独接口结束-------------------------------
@@ -210,7 +211,7 @@ public class ConsoleController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/entryCountGroupByCasePage")
     @SysLogger("entryCountGroupByCasePage")
-    public RespDTO<IPage<NumDTO>> entryCountGroupByCasePage(@RequestBody FilterPageVO filterPageVO) {
+    public RespDTO<IPage<NumDTO>> entryCountGroupByCasePage(@RequestBody @Valid FilterPageVO filterPageVO) {
         return RespDTO.onSuc(consoleFacade.entryCountGroupByCasePage(filterPageVO));
     }
 
@@ -221,12 +222,12 @@ public class ConsoleController {
      * @return
      */
     @ApiOperation(value = "条目缺陷占比（分页）[by:zhaops]",
-            notes = "type： 统计维度 1-本月，2-本年(必填)<br>"+
-                    "deptName： 科室名称 <br>"+
+            notes = "type： 统计维度 1-本月，2-本年(必填)<br>" +
+                    "deptName： 科室名称 <br>" +
                     "casesId： 模块id：243=病案首页 <br>")
     @PostMapping("/entryCountGroupByEntryPage")
     @SysLogger("entryCountGroupByEntryPage")
-    public RespDTO<IPage<NumDTO>> entryCountGroupByEntryPage(@RequestBody FilterPageVO filterPageVO) {
+    public RespDTO<IPage<NumDTO>> entryCountGroupByEntryPage(@RequestBody @Valid FilterPageVO filterPageVO) {
         return RespDTO.onSuc(consoleFacade.entryCountGroupByEntryPage(filterPageVO));
     }
 
@@ -241,7 +242,7 @@ public class ConsoleController {
                     "dateType： 时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年<br>")
     @PostMapping("/getAverageDayNumPage")
     @SysLogger("getAverageDayNumPage")
-    public RespDTO<IPage<AverageStatisticsDTO>> getAverageDayNumPage(@RequestBody FilterPageByAverageVO filterPageByAverageVO) {
+    public RespDTO<IPage<AverageStatisticsDTO>> getAverageDayNumPage(@RequestBody @Valid FilterPageByAverageVO filterPageByAverageVO) {
         return RespDTO.onSuc(consoleFacade.getAverageDayNumPage(filterPageByAverageVO));
     }
 
@@ -256,7 +257,7 @@ public class ConsoleController {
                     "dateType： 时间类型 1-本月/本年，2-上月/去年，3-去年本月/去年<br>")
     @PostMapping("/getAverageFeePage")
     @SysLogger("getAverageFeePage")
-    public RespDTO<IPage<AverageStatisticsDTO>> getAverageFeePage(@RequestBody FilterPageByAverageVO filterPageByAverageVO) {
+    public RespDTO<IPage<AverageStatisticsDTO>> getAverageFeePage(@RequestBody @Valid FilterPageByAverageVO filterPageByAverageVO) {
         return RespDTO.onSuc(consoleFacade.getAverageFeePage(filterPageByAverageVO));
     }
 
@@ -270,7 +271,7 @@ public class ConsoleController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/getAverageScoreByDeptPage")
     @SysLogger("getAverageScoreByDeptPage")
-    public RespDTO<IPage<AverageStatisticsDTO>> getAverageScoreByDeptPage(@RequestBody FilterPageVO filterPageVO) {
+    public RespDTO<IPage<AverageStatisticsDTO>> getAverageScoreByDeptPage(@RequestBody @Valid FilterPageVO filterPageVO) {
         return RespDTO.onSuc(consoleFacade.getAverageScoreByDeptPage(filterPageVO));
     }
 
@@ -284,7 +285,7 @@ public class ConsoleController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/resultStatisticsByDeptPage")
     @SysLogger("resultStatisticsByDeptPage")
-    public RespDTO<IPage<NumDTO>> resultStatisticsByDeptPage(@RequestBody FilterPageVO filterPageVO) {
+    public RespDTO<IPage<NumDTO>> resultStatisticsByDeptPage(@RequestBody @Valid FilterPageVO filterPageVO) {
         return RespDTO.onSuc(consoleFacade.resultStatisticsByDeptPage(filterPageVO));
     }
 
@@ -298,7 +299,7 @@ public class ConsoleController {
             notes = "type： 统计维度 1-本月，2-本年(必填)<br>")
     @PostMapping("/levelPercentGroupByDeptPage")
     @SysLogger("levelPercentGroupByDeptPage")
-    public RespDTO<IPage<NumDTO>> levelPercentGroupByDeptPage(@RequestBody FilterPageVO filterPageVO) {
+    public RespDTO<IPage<NumDTO>> levelPercentGroupByDeptPage(@RequestBody @Valid FilterPageVO filterPageVO) {
         return RespDTO.onSuc(consoleFacade.levelPercentGroupByDeptPage(filterPageVO));
     }
 
@@ -318,7 +319,7 @@ public class ConsoleController {
                     "desc： 排序（降序） <br>")
     @PostMapping("/levelStatistics")
     @SysLogger("levelStatistics")
-    public RespDTO<List<LevelStatisticsDTO>> levelStatistics(@RequestBody FilterOrderVO filterOrderVO) {
+    public RespDTO<List<LevelStatisticsDTO>> levelStatistics(@RequestBody @Valid FilterOrderVO filterOrderVO) {
         return RespDTO.onSuc(consoleFacade.levelStatistics(filterOrderVO));
     }
 
@@ -336,7 +337,7 @@ public class ConsoleController {
                     "desc： 排序（降序） <br>")
     @PostMapping("/homePageLevelStatistics")
     @SysLogger("homePageLevelStatistics")
-    public RespDTO<List<LevelStatisticsDTO>> homePageLevelStatistics(@RequestBody FilterOrderVO filterOrderVO) {
+    public RespDTO<List<LevelStatisticsDTO>> homePageLevelStatistics(@RequestBody @Valid FilterOrderVO filterOrderVO) {
         return RespDTO.onSuc(consoleFacade.homePageLevelStatistics(filterOrderVO));
     }
 
@@ -354,7 +355,7 @@ public class ConsoleController {
                     "desc： 排序（降序） <br>")
     @PostMapping("/homePageLevelLimit")
     @SysLogger("homePageLevelLimit")
-    public RespDTO<List<LevelStatisticsDTO>> homePageLevelLimit(@RequestBody FilterOrderVO filterOrderVO) {
+    public RespDTO<List<LevelStatisticsDTO>> homePageLevelLimit(@RequestBody @Valid FilterOrderVO filterOrderVO) {
         return RespDTO.onSuc(consoleFacade.homePageLevelLimit(filterOrderVO));
     }
 }