Просмотр исходного кода

修改轨迹查询的用户下拉列表

liu 2 лет назад
Родитель
Сommit
48c2d8d95c

+ 1 - 1
src/main/java/com/template/api/SmartUserControllerAPI.java

@@ -250,7 +250,7 @@ public interface SmartUserControllerAPI {
 
     @GetMapping(value = "/getPage")
     @ApiOperation(value = "轨迹查询——用户下拉列表", notes = "轨迹查询——用户下拉列表", httpMethod = "GET")
-    CommonResult getPage(@RequestParam int currentPage, @RequestParam int pageCount,String keyWord);
+    CommonResult getPage(@RequestParam int currentPage, @RequestParam int pageCount,String keyWord,String schoolClass);
 
     @GetMapping(value = "/studentSelect")
     @ApiOperation(value = "保安端——学生查询", notes = "保安端——学生查询", httpMethod = "GET")

+ 1 - 0
src/main/java/com/template/controller/SmartFaceDiscernController.java

@@ -491,6 +491,7 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
     }
 
     @Override
+    @DESRespondSecret(validated = true)
     public CommonResult selectTrack(Integer userId, String startTime, String endTime) {
         ArrayList<LastSevenDaysTrackVo> vos = new ArrayList<>();
         //        人脸抓拍

+ 3 - 1
src/main/java/com/template/controller/SmartUserController.java

@@ -4873,9 +4873,11 @@ public class SmartUserController implements SmartUserControllerAPI {
 
     @Override
     @DESRespondSecret(validated = true)
-    public CommonResult getPage(int currentPage, int pageCount, String keyWord) {
+    public CommonResult getPage(int currentPage, int pageCount, String keyWord,String schoolClass) {
         LambdaQueryWrapper<SmartUser> wrapper = new LambdaQueryWrapper<>();
         wrapper.like(ObjectUtils.isNotEmpty(keyWord), SmartUser::getName, keyWord);
+        wrapper.eq(ObjectUtils.isNotEmpty(schoolClass),SmartUser::getSchoolClass,schoolClass);
+        wrapper.eq(SmartUser::getIdentityId,2);
         IPage<SmartUser> page = smartUserService.page(new Page<>(currentPage, pageCount), wrapper);
 
         return CommonResult.ok(page);