最新代码

src/main/java/com/template/api/SmartClassControllerAPI.java

@@ -53,4 +53,9 @@ public interface SmartClassControllerAPI {
     @ApiOperation(value = "获取班级", notes = "获取班级", httpMethod = "GET")
     CommonResult getSchoolClasses(@RequestParam int schoolClass,String className);
 
+    @GetMapping(value = "/getClassId")
+    @ApiOperation(value = "获取班级", notes = "获取班级", httpMethod = "GET")
+    CommonResult getClassId(@RequestParam int schoolClass);
+
+
 }

src/main/java/com/template/api/SmartFaceDiscernControllerAPI.java

@@ -1,6 +1,7 @@
 package com.template.api;
 
 import com.template.model.result.CommonResult;
+import com.tencentcloudapi.tci.v20190318.models.Face;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -35,4 +36,9 @@ public interface SmartFaceDiscernControllerAPI {
     @ApiOperation(value = "轨迹查询", notes = "轨迹查询", httpMethod = "GET")
     CommonResult selectTrack(@RequestParam Integer userId, @RequestParam String startTime,@RequestParam String endTime);
 
+    @GetMapping(value = "/faceManagement")
+    @ApiOperation(value = "人脸管理记录", notes = "人脸管理记录", httpMethod = "GET")
+    CommonResult faceManagement(@RequestParam int currentPage, @RequestParam int pageCount,String keyWord,String gradeId,String classId,String startTime,String endTime);
+
+
 }

src/main/java/com/template/controller/SmartAccessController.java

@@ -29,7 +29,7 @@ public class SmartAccessController implements SmartAccessControllerAPI {
     SmartAccessService smartAccessService;
 
     @Override
-    @DESRespondSecret(validated = false)
+    @DESRespondSecret(validated = true)
     public CommonResult getPage(Integer currentPage, Integer pageCount, String keyWord,Integer gradeId, Integer classId, Integer departmentId, Integer openType, Integer resultStatus,String startTime,String endTime) {
         PageUtils<SmartAccessVo> pageUtils=smartAccessService.getPage(currentPage,pageCount,keyWord,gradeId,classId,departmentId,openType,resultStatus,startTime,endTime);
         return CommonResult.ok(pageUtils);

src/main/java/com/template/controller/SmartClassController.java

@@ -474,5 +474,12 @@ public class SmartClassController implements SmartClassControllerAPI {
         SmartClassVo vo = smartClassService.getSchoolClassId(schoolClass,className);
         return CommonResult.ok(vo);
     }
+
+    @Override
+    @DESRespondSecret(validated = true)
+    public CommonResult getClassId(int schoolClass) {
+        SchoolClassVo vo = smartClassService.getClassId(schoolClass);
+        return CommonResult.ok(vo);
+    }
 }
 

src/main/java/com/template/controller/SmartFaceDiscernController.java

@@ -14,6 +14,9 @@ import com.template.common.utils.*;
 import com.template.config.ControlConfig;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
+import com.template.model.result.PageUtils;
+import com.template.model.vo.AskForLeaveScreenVo;
+import com.template.model.vo.FaceManagementVo;
 import com.template.model.vo.LastSevenDaysTrackVo;
 import com.template.services.*;
 import org.slf4j.Logger;
@@ -535,6 +538,14 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
         return CommonResult.ok(vos);
     }
 
+    @Override
+    @DESRespondSecret(validated = true)
+    public CommonResult faceManagement(int currentPage, int pageCount, String keyWord,String gradeId,String classId,String startTime,String endTime) {
+        PageUtils<FaceManagementVo> result= smartFaceDiscernService.faceManagement(currentPage,pageCount,keyWord,gradeId,classId,startTime,endTime);
+
+        return CommonResult.ok(result);
+    }
+
 
     public static JSONObject getDate(Integer date) {
         JSONObject jsonObject = new JSONObject();

src/main/java/com/template/controller/SmartVisitorController.java

@@ -606,7 +606,7 @@ public class SmartVisitorController implements SmartVisitorControllerAPI {
     }
 
     @Override
-    @DESRespondSecret(validated = false)
+    @DESRespondSecret(validated = true)
     public CommonResult getPage(int currentPage, int pageCount, Integer type, String keyWord, Integer status, String startTime, String endTime, String visitorStartTime, String visitorEndTime) {
         PageUtils<SmartVisitor> page = smartVisitorService.getPage(currentPage, pageCount, type, keyWord, status, startTime, endTime, visitorStartTime, visitorEndTime);
 

src/main/java/com/template/mapper/SmartClassMapper.java

@@ -2,6 +2,7 @@ package com.template.mapper;
 
 import com.template.model.pojo.SmartClass;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.template.model.vo.SchoolClassVo;
 import com.template.model.vo.SmartClassVo;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -23,4 +24,6 @@ public interface SmartClassMapper extends BaseMapper<SmartClass> {
     List<SmartClassVo> getSchoolClassIdList(@Param("className") String className);
 
     SmartClassVo getSchoolClassId(@Param("schoolClass") int schoolClass,@Param("className") String className);
+
+    SchoolClassVo getClassId(@Param("schoolClass") int schoolClass);
 }

src/main/java/com/template/mapper/SmartFaceDiscernMapper.java

@@ -1,8 +1,12 @@
 package com.template.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.model.pojo.SmartFaceDiscern;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.template.model.vo.FaceManagementVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -16,4 +20,5 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface SmartFaceDiscernMapper extends BaseMapper<SmartFaceDiscern> {
 
+    IPage<FaceManagementVo> faceManagement(Page<FaceManagementVo> page,@Param("keyWord") String keyWord,@Param("gradeId") String gradeId,@Param("classId") String classId,@Param("startTime") String startTime,@Param("endTime") String endTime);
 }

src/main/java/com/template/model/vo/FaceManagementVo.java

@@ -0,0 +1,24 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+@Data
+public class FaceManagementVo {
+    private Integer id;
+
+    private String name;
+
+    private String className;
+
+    private String gradeName;
+
+    private String type;
+
+    private String location;
+
+    private String image;
+
+    private String dateTime;
+
+
+}

src/main/java/com/template/model/vo/SchoolClassVo.java

@@ -0,0 +1,11 @@
+package com.template.model.vo;
+
+import lombok.Data;
+
+@Data
+public class SchoolClassVo {
+    private String classId;
+    private String className;
+    private String gradeId;
+    private String gradeName;
+}

src/main/java/com/template/services/SmartClassService.java

@@ -4,6 +4,7 @@ import com.template.model.pojo.SmartBuild;
 import com.template.model.pojo.SmartClass;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.SchoolClassVo;
 import com.template.model.vo.SmartClassVo;
 
 import java.util.List;
@@ -38,4 +39,7 @@ public interface SmartClassService extends IService<SmartClass> {
     List<SmartClassVo> getSchoolClassIdList(String className);
 
     SmartClassVo getSchoolClassId(int schoolClass,String className);
+
+    SchoolClassVo getClassId(int schoolClass);
+
 }

src/main/java/com/template/services/SmartFaceDiscernService.java

@@ -11,6 +11,8 @@ import com.template.common.utils.TimeExchange;
 import com.template.model.pojo.SmartFaceDiscern;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.pojo.SmartUser;
+import com.template.model.result.PageUtils;
+import com.template.model.vo.FaceManagementVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
@@ -36,4 +38,6 @@ public interface SmartFaceDiscernService extends IService<SmartFaceDiscern> {
 
 
     List<SmartFaceDiscern> track(String stateTime, String endTime, Integer id);
+
+    PageUtils<FaceManagementVo> faceManagement(int currentPage, int pageCount, String keyWord,String gradeId,String classId,String startTime,String endTime);
 }

src/main/java/com/template/services/impl/SmartClassServiceImpl.java

@@ -10,6 +10,7 @@ import com.template.model.pojo.SmartClass;
 import com.template.model.pojo.SmartGrade;
 import com.template.model.pojo.SmartSchool;
 import com.template.model.result.PageUtils;
+import com.template.model.vo.SchoolClassVo;
 import com.template.model.vo.SmartClassVo;
 import com.template.services.SmartClassService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -110,4 +111,10 @@ public class SmartClassServiceImpl extends ServiceImpl<SmartClassMapper, SmartCl
         SmartClassVo vo = smartClassMapper.getSchoolClassId(schoolClass,className);
         return vo;
     }
+
+    @Override
+    public SchoolClassVo getClassId(int schoolClass) {
+        SchoolClassVo vo = smartClassMapper.getClassId(schoolClass);
+        return vo;
+    }
 }

src/main/java/com/template/services/impl/SmartFaceDiscernServiceImpl.java

@@ -3,13 +3,18 @@ package com.template.services.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.common.utils.*;
 import com.template.config.ScheduleConfig;
 import com.template.model.pojo.SmartFaceDiscern;
 import com.template.mapper.SmartFaceDiscernMapper;
 import com.template.model.pojo.SmartNotification;
 import com.template.model.pojo.SmartUser;
+import com.template.model.result.PageUtils;
+import com.template.model.vo.AskForLeaveScreenVo;
+import com.template.model.vo.FaceManagementVo;
 import com.template.services.SmartFaceDiscernService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.template.services.SmartNotificationService;
@@ -50,6 +55,9 @@ public class SmartFaceDiscernServiceImpl extends ServiceImpl<SmartFaceDiscernMap
     @Resource
     private ScheduleConfig scheduleConfig;
 
+    @Autowired
+    SmartFaceDiscernMapper smartFaceDiscernMapper;
+
 
     //    static String appid = "sc5efc60f2bd373df9";
     static String appid = "sc1eb792c1ea3237e9";
@@ -289,4 +297,11 @@ public class SmartFaceDiscernServiceImpl extends ServiceImpl<SmartFaceDiscernMap
 
         return list;
     }
+
+    @Override
+    public PageUtils<FaceManagementVo> faceManagement(int currentPage, int pageCount, String keyWord,String gradeId,String classId,String startTime,String endTime) {
+        Page<FaceManagementVo> page = new Page<>(currentPage,pageCount);
+        IPage<FaceManagementVo> datas = smartFaceDiscernMapper.faceManagement(page,keyWord,gradeId,classId,startTime,endTime);
+        return new PageUtils(datas);
+    }
 }

src/main/resources/mapper/template/SmartClassMapper.xml

@@ -25,5 +25,14 @@
             AND sc.`name` like '%' #{className} '%'
         </if>
     </select>
+    <select id="getClassId" resultType="com.template.model.vo.SchoolClassVo">
+        SELECT sc.id     as classId,
+               sc.name   as className,
+               sg.id   as gradeId,
+               sg.`name` as gradeName
+        FROM `smart_class` sc
+                 LEFT JOIN smart_grade sg ON sc.grade_id = sg.id
+        WHERE sc.id = #{schoolClass} and sc.deleted=0
+    </select>
 
 </mapper>

src/main/resources/mapper/template/SmartFaceDiscernMapper.xml

@@ -20,7 +20,16 @@
         WHERE
             sfd.deleted =0
         <if test="keyWord != null and keyWord != ''">
-            and sfd.location like '%' #{keyWord} '%'
+            and (sfd.`name` like '%' #{keyWord} '%'  or sfd.location like '%' #{keyWord} '%')
+        </if>
+        <if test="gradeId != null and gradeId != ''">
+            and sc.grade_id= #{gradeId}
+        </if>
+        <if test="classId != null and classId != ''">
+            and su.school_class= #{classId}
+        </if>
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            and sfd.date_time &gt;= #{startTime} and sfd.date_time &lt;= #{endTime}
         </if>
         ORDER BY sfd.date_time desc
     </select>