brealinxx 1 рік тому
батько
коміт
45a930baa5

+ 2 - 3
src/main/java/com/xjrsoft/module/hikvision/util/FaceImportUtil.java

@@ -1,7 +1,6 @@
 package com.xjrsoft.module.hikvision.util;
 
 import com.google.gson.JsonObject;
-import com.xjrsoft.module.personnel.entity.TeacherFaceProcess;
 import com.xjrsoft.module.teacher.mapper.FaceImportMapper;
 
 import java.io.ByteArrayOutputStream;
@@ -19,7 +18,7 @@ public class FaceImportUtil {
 
     public static String ImportTeacherFace(Long id) {
         JsonObject paramJson = new JsonObject();
-        paramJson.addProperty("personId", faceImportMapper.GetTeacherHikvisionIdById(id));
+        paramJson.addProperty("personId", faceImportMapper.GetTeacherUserIdById(id));
         paramJson.addProperty("faceData", ImageToBase64(faceImportMapper.GetTeacherHikvisionImgById(id)));
 
         Map<String, String> querys = new HashMap<>();
@@ -33,7 +32,7 @@ public class FaceImportUtil {
 
     public static String ImportStudentFace(Long id) {
         JsonObject paramJson = new JsonObject();
-        paramJson.addProperty("personId", faceImportMapper.GetStudentHikvisionIdById(id));
+        paramJson.addProperty("personId", faceImportMapper.GetStudentUserIdById(id));
         paramJson.addProperty("faceData", ImageToBase64(faceImportMapper.GetStudentHikvisionImgById(id)));
 
         Map<String, String> querys = new HashMap<>();

+ 2 - 2
src/main/java/com/xjrsoft/module/teacher/mapper/FaceImportMapper.java

@@ -6,10 +6,10 @@ import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface FaceImportMapper {
-    String GetTeacherHikvisionIdById(@Param("id") Long id);
+    String GetTeacherUserIdById(@Param("id") Long id);
     String GetTeacherHikvisionImgById(@Param("id") Long id);
 
-    String GetStudentHikvisionIdById(@Param("id") Long id);
+    String GetStudentUserIdById(@Param("id") Long id);
     String GetStudentHikvisionImgById(@Param("id") Long id);
 }
 

+ 4 - 4
src/main/resources/mapper/teacher/TeacherFaceImportMapper.xml

@@ -3,8 +3,8 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.teacher.mapper.FaceImportMapper">
-    <select id="GetTeacherHikvisionIdById" parameterType="long" resultType="java.lang.String">
-        select t.id
+    <select id="GetTeacherUserIdById" parameterType="long" resultType="java.lang.String">
+        select t.user_id
         from teacher_face_process t
         <if test="id != null">
             where t.id = #{id}
@@ -22,8 +22,8 @@
         and t.status = 1
     </select>
 
-    <select id="GetStudentHikvisionIdById" parameterType="long" resultType="java.lang.String">
-        select t1.id
+    <select id="GetStudentUserIdById" parameterType="long" resultType="java.lang.String">
+        select t1.user_id
         from stundent_face_process t
         <if test="id != null">
             where t.id = #{id}