账户登录增加teacher_id

base-servers/account/account-api/src/main/java/com/usoftchina/smartschool/account/api/AccountApi.java

@@ -24,6 +24,9 @@ public interface AccountApi {
     @GetMapping("/account/getUsername")
     Result<String> getUsername(@RequestParam(value = "schoolId") Long schoolId, @RequestParam(value = "userId") Long userId);
 
+    @GetMapping("/account/getTeacherId")
+    Result<Long> getTeacherId(@RequestParam(value = "schoolId") Long schoolId, @RequestParam(value = "userId") Long userId);
+
     @GetMapping("/account/register")
     Result<Long> register(@RequestBody AccountRegDTO accountRegDTO);
 

base-servers/account/account-dto/src/main/java/com/usoftchina/smartschool/account/dto/AccountDTO.java

@@ -11,6 +11,7 @@ import java.util.List;
 public class AccountDTO implements Serializable {
 
     private Long id;
+    private Long teacher_id;
     private String user_phone;
     private String user_code;
     private String salt;
@@ -18,6 +19,14 @@ public class AccountDTO implements Serializable {
     private Long school_id;
     private String username;
 
+    public Long getTeacher_id() {
+        return teacher_id;
+    }
+
+    public void setTeacher_id(Long teacher_id) {
+        this.teacher_id = teacher_id;
+    }
+
     public String getUsername() {
         return username;
     }

base-servers/account/account-server/src/main/java/com/usoftchina/smartschool/account/controller/AccountController.java

@@ -87,6 +87,16 @@ public class AccountController {
         return Result.success(accountService.getUsername(schoolId, userId));
     }
 
+    /**
+     * 查询教师表,获取教师ID
+     * @param schoolId
+     * @param userId
+     * @return
+     */
+    @GetMapping("/getTeacherId")
+    public Result<Long> getTeacherId(Long schoolId, Long userId){
+        return Result.success(accountService.getTeacherId(schoolId, userId));
+    }
     /**
      * 重置密码
      * @param password

base-servers/account/account-server/src/main/java/com/usoftchina/smartschool/account/mapper/AccountMapper.java

@@ -55,4 +55,12 @@ public interface AccountMapper {
      * @return
      */
     String selectTeacherName(@Param("schoolId") Long schoolId, @Param("userId") Long userId);
+
+    /**
+     * 查找教师ID
+     * @param schoolId
+     * @param userId
+     * @return
+     */
+    Long selectTeacherId(@Param("schoolId") Long schoolId, @Param("userId") Long userId);
 }

base-servers/account/account-server/src/main/java/com/usoftchina/smartschool/account/service/AccountService.java

@@ -63,4 +63,12 @@ public interface AccountService {
      * @return
      */
     String getUsername(Long schoolId, Long userId);
+
+    /**
+     * 获取教师ID
+     * @param schoolId
+     * @param userId
+     * @return
+     */
+    Long getTeacherId(Long schoolId, Long userId);
 }

base-servers/account/account-server/src/main/java/com/usoftchina/smartschool/account/service/impl/AccountServiceImpl.java

@@ -72,4 +72,9 @@ public class AccountServiceImpl implements AccountService {
     public String getUsername(Long schoolId, Long userId){
         return accountMapper.selectTeacherName(schoolId, userId);
     }
+
+    @Override
+    public Long getTeacherId(Long schoolId, Long userId){
+        return accountMapper.selectTeacherId(schoolId, userId);
+    }
 }

base-servers/account/account-server/src/main/resources/mapper/AccountMapper.xml

@@ -53,4 +53,8 @@
   <select id="selectTeacherName" resultType="string">
     select teacher_name from sys_teacher where school_id = #{schoolId} and user_id = #{userId}
   </select>
+
+  <select id="selectTeacherId" resultType="long">
+    select teacher_id from sys_teacher where school_id = #{schoolId} and user_id = #{userId}
+  </select>
 </mapper>

base-servers/auth/auth-server/src/main/java/com/usoftchina/smartschool/auth/controller/AuthController.java

@@ -51,8 +51,10 @@ public class AuthController {
         if (result.isSuccess()){
             AccountDTO accountDTO = result.getData();
             Long school_id = -1L;
+            Long teacherId = -1L;
             try {
                 school_id = accountDTO.getRoleMaps().stream().filter(roleDTO -> "教师".equals(roleDTO.getRole_name())).findFirst().get().getSchool_id();
+                teacherId = accountApi.getTeacherId(school_id, accountDTO.getId()).getData();
                 if (school_id == -1){
                     throw new BizException(ExceptionCode.USER_NOT_EXIST);
                 }
@@ -60,6 +62,7 @@ public class AuthController {
                 throw new BizException(ExceptionCode.USER_NOT_EXIST);
             }
             accountDTO.setSchool_id(school_id);
+            accountDTO.setTeacher_id(teacherId);
             String realName = accountApi.getUsername(school_id, accountDTO.getId()).getData();
             accountDTO.setUsername(realName);
             JwtInfo jwtInfo = new JwtInfo("school", school_id, accountDTO.getId(), StringUtils.isEmpty(realName) ? accountDTO.getUser_phone() : realName, accountDTO.getUser_phone());