出入校记录保存逻辑修改

applications/device/device-server/src/main/java/com/usoftchina/smartschool/device/mapper/StudentInfoMapper.java

@@ -12,7 +12,9 @@ import java.util.List;
  */
 @Mapper
 public interface StudentInfoMapper {
-    List<StudentInfo> selectInfoByCardNo(String cardNo);
+    List<StudentInfo> selectInfoByCardNoWithOpenId(String cardNo);
+
+    List<StudentInfo> selectInfoByCardNoWithoutOpenId(String cardNo);
 
     void updatePhoto(@Param("photo") String photo, @Param("stuId") Long stuId);
 }

applications/device/device-server/src/main/java/com/usoftchina/smartschool/device/service/impl/AccessControlServiceImpl.java

@@ -68,7 +68,7 @@ public class AccessControlServiceImpl implements AccessControlService{
         /**
          * 查询人员信息
          */
-        List<StudentInfo> information = studentInfoMapper.selectInfoByCardNo(cardNo);
+        List<StudentInfo> information = studentInfoMapper.selectInfoByCardNoWithoutOpenId(cardNo);
         if (null == information || information.size() == 0) {
             logger.error("学生信息不存在");
             return;
@@ -121,6 +121,7 @@ public class AccessControlServiceImpl implements AccessControlService{
         }
         //支持发送多个人员
         List<MessageInfoDTO> msgs = new ArrayList<>();
+        information = studentInfoMapper.selectInfoByCardNoWithOpenId(cardNo);
         information.forEach(data -> {
             MessageInfoDTO msg = new MessageInfoDTO();
             msg.setUrl(wechatBaseUrl + "/accessnoticedetail/" + record.getRecord_id());

applications/device/device-server/src/main/resources/mapper/StudentInfoMapper.xml

@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.usoftchina.smartschool.device.mapper.StudentInfoMapper" >
-    <select id="selectInfoByCardNo" parameterType="string" resultMap="studentInfo">
+    <select id="selectInfoByCardNoWithOpenId" parameterType="string" resultMap="studentInfo">
         select school_appid,school_secret,sys_parents.openid,sys_student.stu_name,sys_student.stu_id,sys_school.school_id,
          stu_number,sys_student.clazz_id,stu_class,stu_grade,stu_classnickname,stu_sex,stu_photo from sys_student left join sys_school on sys_student.school_id=sys_school.school_id
         left join sys_parents_stu on sys_student.stu_id=sys_parents_stu.stu_id left join sys_parents on sys_parents.parent_id =
         sys_parents_stu.parent_id where stu_cardNo = #{cardNo} and  ifnull(openid,'') != ''
     </select>
 
+    <select id="selectInfoByCardNoWithoutOpenId" parameterType="string" resultMap="studentInfo">
+      select school_appid,school_secret,sys_parents.openid,sys_student.stu_name,sys_student.stu_id,sys_school.school_id,
+      stu_number,sys_student.clazz_id,stu_class,stu_grade,stu_classnickname,stu_sex,stu_photo from sys_student left join sys_school on sys_student.school_id=sys_school.school_id
+      left join sys_parents_stu on sys_student.stu_id=sys_parents_stu.stu_id left join sys_parents on sys_parents.parent_id =
+      sys_parents_stu.parent_id where stu_cardNo = #{cardNo}
+    </select>
+
     <update id="updatePhoto">
       update sys_student set stu_photo = #{photo} where stu_id = #{stuId}
     </update>