老师认证接口修改

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysUserMapper.xml

@@ -143,7 +143,7 @@
         </set>
         WHERE id_ = #{id}
     </update>
-    <update id="updatePassword">
+    <update id="updatePasswordReq">
         UPDATE sys_user SET password_ = #{password} WHERE phone_ = #{mobile}
     </update>
     <update id="refreshImToken">

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TeacherAuthEntryRecordController.java

@@ -0,0 +1,77 @@
+package com.yonge.cooleshow.admin.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
+import com.yonge.cooleshow.biz.dal.dto.req.RealnameAuthReq;
+import com.yonge.cooleshow.biz.dal.dto.req.TeacherApplyDetailReq;
+import com.yonge.cooleshow.biz.dal.dto.search.TeacherAuthEntryRecordSearch;
+import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
+import com.yonge.cooleshow.biz.dal.support.Condition;
+import com.yonge.cooleshow.biz.dal.support.Query;
+import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.toolset.thirdparty.user.realname.RealnameAuthenticationPlugin;
+import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
+import com.yonge.toolset.utils.idcard.IdcardValidator;
+import com.yonge.toolset.utils.string.StringUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+@RestController
+@RequestMapping("/TeacherAuthEntryRecord")
+@Api(value = "老师入驻审核表", tags = "老师入驻审核表")
+public class TeacherAuthEntryRecordController extends BaseController {
+    @Autowired
+    private TeacherAuthEntryRecordService teacherAuthEntryRecordService;
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    /**
+     * 查询分页
+     */
+    @GetMapping("/page")
+    @ApiOperation(value = "查询分页", notes = "传入teacherAuthEntryRecord")
+    public HttpResponseResult<PageInfo<TeacherAuthEntryRecordVo>> page(TeacherAuthEntryRecordSearch search, Query query) {
+        IPage<TeacherAuthEntryRecordVo> pages = teacherAuthEntryRecordService.selectPage(Condition.getPage(query), search);
+        return succeed(Condition.pageInfo(pages));
+    }
+
+    /**
+     * 查询单条详情
+     */
+    @GetMapping("/detail")
+    @ApiOperation(value = "详情", notes = "传入teacherAuthEntryRecord")
+    public HttpResponseResult<TeacherAuthEntryRecordVo> detail(@ApiParam(value = "主键", required = true) @RequestParam Long id) {
+        TeacherAuthEntryRecordVo detail = teacherAuthEntryRecordService.detail(id);
+        return succeed(detail);
+    }
+
+
+    @PostMapping("/doAuth")
+    @ApiOperation(value = "审核", notes = "传入authOperaDto")
+    public HttpResponseResult<Boolean> doAuth(@Valid @RequestBody AuthOperaReq authOperaReq) throws Exception {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        return teacherAuthEntryRecordService.doAuth(authOperaReq, sysUser);
+    }
+
+    /**
+     * 删除
+     */
+    @PostMapping("/remove")
+    @ApiOperation(value = "逻辑删除", notes = "传入ids")
+    public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+        if (StringUtil.isEmpty(ids)) {
+            return failed("参数不能为空");
+        }
+        return status(teacherAuthEntryRecordService.removeByIds(StringUtil.toLongList(ids)));
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/TeacherAuthEntryRecordDao.java

@@ -4,11 +4,10 @@ import java.util.List;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yonge.cooleshow.biz.dal.dto.TeacherApplyDetailDto;
-import com.yonge.cooleshow.biz.dal.dto.req.TeacherAuthEntryRecordSearch;
+import com.yonge.cooleshow.biz.dal.dto.req.TeacherApplyDetailReq;
+import com.yonge.cooleshow.biz.dal.dto.search.TeacherAuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
-import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.Param;
 
 public interface TeacherAuthEntryRecordDao extends BaseMapper<TeacherAuthEntryRecord>{
@@ -25,7 +24,7 @@ public interface TeacherAuthEntryRecordDao extends BaseMapper<TeacherAuthEntryRe
 	 * @updateTime 2022/3/18 15:57
 	 * @return: java.lang.Integer
 	 */
-	Integer updateUserCard(@Param("param") TeacherApplyDetailDto teacherApplyDetailDto);
+	Integer updateUserCard(@Param("param") TeacherApplyDetailReq teacherApplyDetailDto);
 	/***
 	 * 根据老师id查询详情
 	 * @author liweifan

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/AuthOperaDto.java → cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/AuthOperaReq.java

@@ -1,9 +1,10 @@
-package com.yonge.cooleshow.biz.dal.dto;
+package com.yonge.cooleshow.biz.dal.dto.req;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * 审核操作对象
@@ -11,12 +12,12 @@ import javax.validation.constraints.NotBlank;
  * @Author: liweifan
  * @Data: 2022/3/18 15:04
  */
-@ApiModel(value = "AuthOperaDto", description = "审核操作对象")
-public class AuthOperaDto {
-    @NotBlank(message = "审核单id不能为空")
+@ApiModel(value = "AuthOperaReq", description = "审核操作对象")
+public class AuthOperaReq {
+    @NotNull(message = "审核单id不能为空")
     @ApiModelProperty(value = "审核单id", required = true)
     private Long id;
-    @NotBlank(message = "请说明审核是否通过")
+    @NotNull(message = "请说明审核是否通过")
     @ApiModelProperty(value = "审核是否通过", required = true)
     private Boolean isPass;
     @NotBlank(message = "请说明审核理由")

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/RealnameAuthDto.java → cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/RealnameAuthReq.java

@@ -1,9 +1,10 @@
-package com.yonge.cooleshow.biz.dal.dto;
+package com.yonge.cooleshow.biz.dal.dto.req;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
 
 /**
  * 实名认证请求对象
@@ -11,8 +12,8 @@ import javax.validation.constraints.NotBlank;
  * @Author: liweifan
  * @Data: 2022/3/18 15:04
  */
-@ApiModel(value = "RealnameAuthDto对象", description = "实名认证请求对象")
-public class RealnameAuthDto {
+@ApiModel(value = "RealnameAuthReq对象", description = "实名认证请求对象")
+public class RealnameAuthReq implements Serializable {
 
     @NotBlank(message = "用户真实姓名不能为空")
     @ApiModelProperty(value = "用户真实姓名", required = true)

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/TeacherApplyDetailDto.java → cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherApplyDetailReq.java

@@ -1,11 +1,13 @@
-package com.yonge.cooleshow.biz.dal.dto;
+package com.yonge.cooleshow.biz.dal.dto.req;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.dto.req.RealnameAuthReq;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -13,21 +15,13 @@ import java.util.Date;
  * @Author: liweifan
  * @Data: 2022/3/18 14:56
  */
-@ApiModel(value = "TeacherApplyDetailDto对象", description = "老师入驻申请信息")
-public class TeacherApplyDetailDto implements Serializable {
+@ApiModel(value = "TeacherApplyDetailReq对象", description = "老师入驻申请信息")
+public class TeacherApplyDetailReq extends RealnameAuthReq implements Serializable {
 
     @ApiModelProperty(value = "用户id")
     private Long userId;
 
-    @NotBlank(message = "用户真实姓名不能为空")
-    @ApiModelProperty(value = "真实姓名", required = true)
-    private String realName;
-
-    @NotBlank(message = "身份证号不能为空")
-    @ApiModelProperty(value = "身份证号", required = true)
-    private String idCardNo;
-
-    @NotBlank(message = "性别不能为空")
+    @NotNull(message = "性别不能为空")
     @ApiModelProperty(value = "性别（0，女  1，男）", required = true)
     private Integer gender;
 
@@ -67,22 +61,6 @@ public class TeacherApplyDetailDto implements Serializable {
         this.userId = userId;
     }
 
-    public String getRealName() {
-        return realName;
-    }
-
-    public void setRealName(String realName) {
-        this.realName = realName;
-    }
-
-    public String getIdCardNo() {
-        return idCardNo;
-    }
-
-    public void setIdCardNo(String idCardNo) {
-        this.idCardNo = idCardNo;
-    }
-
     public Integer getGender() {
         return gender;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/UpdatePassword.java

@@ -1,18 +0,0 @@
-package com.yonge.cooleshow.biz.dal.dto.req;
-
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-
-/**
- * @Author: liweifan
- * @Data: 2022/3/22 11:20
- */
-@ApiModel(value = "UpdatePassword对象", description = "用户修改密码")
-public class UpdatePassword {
-    @ApiModelProperty("旧密码")
-    private String oldPassword;
-    @ApiModelProperty("新密码")
-    private String newPasswordFirst;
-    @ApiModelProperty(value = "新密码")
-    private String newPasswordSecond;
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/UpdatePasswordReq.java

@@ -0,0 +1,42 @@
+package com.yonge.cooleshow.biz.dal.dto.req;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * @Author: liweifan
+ * @Data: 2022/3/22 11:20
+ */
+@ApiModel(value = "UpdatePasswordReq对象", description = "用户修改密码(修改密码 传入旧密码和新密码 重置密码传入新密码 )")
+public class UpdatePasswordReq {
+    @ApiModelProperty("旧密码")
+    private String oldPassword;
+    @ApiModelProperty("新密码1")
+    private String newPasswordFirst;
+    @ApiModelProperty(value = "新密码2")
+    private String newPasswordSecond;
+
+    public String getOldPassword() {
+        return oldPassword;
+    }
+
+    public void setOldPassword(String oldPassword) {
+        this.oldPassword = oldPassword;
+    }
+
+    public String getNewPasswordFirst() {
+        return newPasswordFirst;
+    }
+
+    public void setNewPasswordFirst(String newPasswordFirst) {
+        this.newPasswordFirst = newPasswordFirst;
+    }
+
+    public String getNewPasswordSecond() {
+        return newPasswordSecond;
+    }
+
+    public void setNewPasswordSecond(String newPasswordSecond) {
+        this.newPasswordSecond = newPasswordSecond;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherAuthEntryRecordSearch.java → cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/TeacherAuthEntryRecordSearch.java

@@ -1,4 +1,4 @@
-package com.yonge.cooleshow.biz.dal.dto.req;
+package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AuthStatusEnum.java

@@ -28,6 +28,7 @@ public enum AuthStatusEnum implements BaseEnum<Integer, AuthStatusEnum> {
 
     @Override
     public Integer getCode() {
-        return null;
+        return this.code;
     }
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TeacherAuthEntryRecordService.java

@@ -3,9 +3,9 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.dto.AuthOperaDto;
-import com.yonge.cooleshow.biz.dal.dto.TeacherApplyDetailDto;
-import com.yonge.cooleshow.biz.dal.dto.req.TeacherAuthEntryRecordSearch;
+import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
+import com.yonge.cooleshow.biz.dal.dto.req.TeacherApplyDetailReq;
+import com.yonge.cooleshow.biz.dal.dto.search.TeacherAuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -30,7 +30,7 @@ public interface TeacherAuthEntryRecordService extends IService<TeacherAuthEntry
      * @updateTime 2022/3/18 15:38
      * @return: java.lang.Boolean
      */
-    HttpResponseResult<Boolean> doApply(TeacherApplyDetailDto teacherApplyDetailDto, SysUser sysUser) throws Exception;
+    HttpResponseResult<Boolean> doApply(TeacherApplyDetailReq teacherApplyDetailDto, SysUser sysUser) throws Exception;
     /***
      * 根据老师id查询审批单详情
      * @author liweifan
@@ -47,5 +47,5 @@ public interface TeacherAuthEntryRecordService extends IService<TeacherAuthEntry
      * @updateTime 2022/3/21 14:21
      * @return: com.yonge.cooleshow.common.entity.HttpResponseResult<java.lang.Boolean>
      */
-    HttpResponseResult<Boolean> doAuth(AuthOperaDto authOperaDto, SysUser sysUser);
+    HttpResponseResult<Boolean> doAuth(AuthOperaReq authOperaReq, SysUser sysUser);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherAuthEntryRecordServiceImpl.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.TeacherDao;
-import com.yonge.cooleshow.biz.dal.dto.AuthOperaDto;
-import com.yonge.cooleshow.biz.dal.dto.TeacherApplyDetailDto;
-import com.yonge.cooleshow.biz.dal.dto.req.TeacherAuthEntryRecordSearch;
+import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
+import com.yonge.cooleshow.biz.dal.dto.req.TeacherApplyDetailReq;
+import com.yonge.cooleshow.biz.dal.dto.search.TeacherAuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
@@ -36,7 +36,7 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public HttpResponseResult<Boolean> doApply(TeacherApplyDetailDto teacherApplyDetailDto, SysUser sysUser) throws Exception {
+    public HttpResponseResult<Boolean> doApply(TeacherApplyDetailReq teacherApplyDetailDto, SysUser sysUser) throws Exception {
         teacherApplyDetailDto.setUserId(sysUser.getId());
         //判断用户是否已经提交申请
         if (hasApply(sysUser.getId())) {
@@ -62,11 +62,11 @@ public class TeacherAuthEntryRecordServiceImpl extends ServiceImpl<TeacherAuthEn
     }
 
     @Override
-    public HttpResponseResult<Boolean> doAuth(AuthOperaDto authOperaDto, SysUser sysUser) {
+    public HttpResponseResult<Boolean> doAuth(AuthOperaReq authOperaReq, SysUser sysUser) {
         TeacherAuthEntryRecord build = new TeacherAuthEntryRecord();
-        build.setId(authOperaDto.getId());
-        build.setTeacherAuthStatus(authOperaDto.getPass() ? AuthStatusEnum.PASS.getCode() : AuthStatusEnum.UNPASS.getCode());
-        build.setReason(authOperaDto.getReason());
+        build.setId(authOperaReq.getId());
+        build.setTeacherAuthStatus(authOperaReq.getPass() ? AuthStatusEnum.PASS.getCode() : AuthStatusEnum.UNPASS.getCode());
+        build.setReason(authOperaReq.getReason());
         return HttpResponseResult.succeed(baseMapper.updateById(build) > 0);
     }
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/EmployeeMapper.xml

@@ -171,7 +171,7 @@
         WHERE user_id_ = #{userId} and tenant_id_ = #{tenantId}
     </update>
 
-    <update id="updatePassword">
+    <update id="updatePasswordReq">
         UPDATE sys_user SET password_ = #{password} WHERE id_ = #{userID}
     </update>
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/TeacherAuthEntryRecordMapper.xml

@@ -58,7 +58,7 @@
     <!-- 分页查询 -->
     <select id="selectPage" resultType = "com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo">
         SELECT
-            <include refid="baseColumns"/>
+            <include refid="baseColumns"/>,
             u.real_name_ as realName,
             u.id_card_no_ as idCardNo,
             u.phone_ as phone
@@ -90,7 +90,7 @@
 
     <select id="detail" resultType="com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo">
         select
-        	<include refid="baseColumns"/>
+        	<include refid="baseColumns"/>,
 			u.real_name_ as realName,
 			u.id_card_no_ as idCardNo,
 			u.gender_ as gender,

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherAuthEntryRecordController.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.dto.AuthOperaDto;
-import com.yonge.cooleshow.biz.dal.dto.RealnameAuthDto;
-import com.yonge.cooleshow.biz.dal.dto.TeacherApplyDetailDto;
-import com.yonge.cooleshow.biz.dal.dto.req.TeacherAuthEntryRecordSearch;
+import com.yonge.cooleshow.biz.dal.dto.req.AuthOperaReq;
+import com.yonge.cooleshow.biz.dal.dto.req.RealnameAuthReq;
+import com.yonge.cooleshow.biz.dal.dto.req.TeacherApplyDetailReq;
+import com.yonge.cooleshow.biz.dal.dto.search.TeacherAuthEntryRecordSearch;
 import com.yonge.cooleshow.biz.dal.support.Condition;
 import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.biz.dal.vo.TeacherAuthEntryRecordVo;
@@ -17,11 +17,10 @@ import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.thirdparty.user.realname.RealnameAuthenticationPlugin;
 import com.yonge.toolset.utils.idcard.IdcardInfoExtractor;
 import com.yonge.toolset.utils.idcard.IdcardValidator;
-import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
 
 import com.yonge.cooleshow.biz.dal.service.TeacherAuthEntryRecordService;
@@ -42,7 +41,11 @@ public class TeacherAuthEntryRecordController extends BaseController {
     @PostMapping("/realNameAuth")
     @ApiOperation(value = "实名认证", notes = "传入realNameAuthDto")
     @ResponseBody
-    public HttpResponseResult<IdcardInfoExtractor> realNameAuth(@Valid @RequestBody RealnameAuthDto realNameAuthDto) {
+    public HttpResponseResult<IdcardInfoExtractor> realNameAuth(@Valid @RequestBody RealnameAuthReq realNameAuthDto) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
         IdcardValidator idcardValidator = new IdcardValidator();
         //验证身份证号合法性
         boolean validatedAllIdcard = idcardValidator.isValidatedAllIdcard(realNameAuthDto.getIdCardNo());
@@ -61,51 +64,12 @@ public class TeacherAuthEntryRecordController extends BaseController {
 
     @PostMapping("/doApply")
     @ApiOperation(value = "提交申请", notes = "传入teacherAuthEntryRecord")
-    public HttpResponseResult<Boolean> doApply(@Valid @RequestBody TeacherApplyDetailDto teacherApplyDetailDto) throws Exception {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        //处理老师申请逻辑
-        return teacherAuthEntryRecordService.doApply(teacherApplyDetailDto, sysUser);
-    }
-
-    /**
-     * 查询分页
-     */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入teacherAuthEntryRecord")
-    public HttpResponseResult<PageInfo<TeacherAuthEntryRecordVo>> page(TeacherAuthEntryRecordSearch search, Query query) {
-        IPage<TeacherAuthEntryRecordVo> pages = teacherAuthEntryRecordService.selectPage(Condition.getPage(query), search);
-        return succeed(Condition.pageInfo(pages));
-    }
-
-    /**
-     * 查询单条详情
-     */
-    @GetMapping("/detail")
-    @ApiOperation(value = "详情", notes = "传入teacherAuthEntryRecord")
-    public HttpResponseResult<TeacherAuthEntryRecordVo> detail(@ApiParam(value = "主键", required = true) @RequestParam Long id) {
-        TeacherAuthEntryRecordVo detail = teacherAuthEntryRecordService.detail(id);
-        return succeed(detail);
-    }
-
-
-    @PostMapping("/doAuth")
-    @ApiOperation(value = "审核", notes = "传入authOperaDto")
-    public HttpResponseResult<Boolean> doAuth(@Valid AuthOperaDto authOperaDto) throws Exception {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        return teacherAuthEntryRecordService.doAuth(authOperaDto, sysUser);
-    }
-
-    /**
-     * 删除
-     */
-    @PostMapping("/remove")
-    @ApiOperation(value = "逻辑删除", notes = "传入ids")
-    public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
-        if (StringUtil.isEmpty(ids)) {
-            return failed("参数不能为空");
+    public HttpResponseResult<Boolean> doApply(@Valid @RequestBody TeacherApplyDetailReq teacherApplyDetailDto) throws Exception {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        return status(teacherAuthEntryRecordService.removeByIds(StringUtil.toLongList(ids)));
+        //处理老师申请逻辑
+        return teacherAuthEntryRecordService.doApply(teacherApplyDetailDto, user);
     }
-
-
 }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherAuthMusicianRecordController.java

@@ -5,9 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.biz.dal.dto.TeacherApplyDetailDto;
-import com.yonge.cooleshow.biz.dal.entity.Teacher;
-import com.yonge.cooleshow.biz.dal.service.TeacherService;
 import com.yonge.cooleshow.biz.dal.support.Condition;
 import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.cooleshow.common.controller.BaseController;

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherController.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.teacher.controller;
 
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherSetReq;
+import com.yonge.cooleshow.biz.dal.dto.req.UpdatePasswordReq;
 import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import io.swagger.annotations.Api;
@@ -86,15 +87,24 @@ public class TeacherController extends BaseController {
 
     @PostMapping("/updatePassword")
     @ApiOperation(value = "修改密码", notes = "传入teacher")
-    public HttpResponseResult<TeacherVo> updatePassword(@RequestBody TeacherSetReq setReq) {
+    public HttpResponseResult<Boolean> updatePassword(@RequestBody UpdatePasswordReq updatePasswordReq) {
         SysUser user = sysUserFeignService.queryUserInfo();
         if (user == null) {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
-        //设置
-        teacherService.submitSetDetail(setReq,user.getId());
+        //todo 修改密码
+        return succeed(true);
+    }
 
-        return succeed(teacherService.getSetDetail(user.getId()));
+    @PostMapping("/resetPassword")
+    @ApiOperation(value = "修改密码", notes = "传入teacher")
+    public HttpResponseResult<Boolean> resetPassword(@RequestBody UpdatePasswordReq updatePasswordReq) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        //todo 重置密码
+        return succeed(true);
     }
 
 }

cooleshow-user/user-teacher/src/main/resources/bootstrap-dev.yml

@@ -1,6 +1,4 @@
 spring:
-  application:
-    name: teacher-server
   cloud:
     nacos:
       config: