Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-common/pom.xml

@@ -63,6 +63,5 @@
 			<groupId>com.vdurmont</groupId>
 			<artifactId>emoji-java</artifactId>
 		</dependency>
-
 	</dependencies>
 </project>

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

@@ -1,9 +1,13 @@
 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.dao.EmployeeDao;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
+import com.yonge.cooleshow.biz.dal.support.PageUtil;
+import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
@@ -16,11 +20,7 @@ import java.util.Date;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import com.yonge.cooleshow.biz.dal.entity.Employee;
 import com.yonge.cooleshow.biz.dal.service.EmployeeService;
@@ -37,20 +37,26 @@ public class EmployeeController extends BaseController {
     @Autowired
     private EmployeeDao employeeDao;
 
-    @GetMapping("/detail/{userId}")
+    @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入student")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "userId", value = "userId", paramType = "path", dataType = "long", required = true),
+            @ApiImplicitParam(name = "id", value = "id", paramType = "path", dataType = "long", required = true),
     })
-    public HttpResponseResult<Employee> detail(Long userId){
-        Employee detail = employeeService.detail(userId);
+    public HttpResponseResult<Employee> detail(@PathVariable("id") Long id){
+        Employee detail = employeeService.detail(id);
         return succeed(detail);
     }
 
-    @PostMapping("/page")
+    /**
+     * 查询分页
+     */
     @ApiOperation(value = "查询分页", notes = "传入student")
+    @PostMapping("/page")
+    @PreAuthorize("@pcs.hasPermissions('employee/page')")
     public HttpResponseResult<PageInfo<Employee>> page(@RequestBody EmployeeSearch query) {
-        return succeed(employeeService.selectPage(query, query));
+        query.setSort("id_");
+        IPage<Employee> pages = employeeService.selectPage(PageUtil.getPage(query), query);
+        return succeed(PageUtil.pageInfo(pages));
     }
 
     @ApiOperation(value = "新增员工")
@@ -72,13 +78,6 @@ public class EmployeeController extends BaseController {
         return succeed();
     }
 
-    /*@ApiOperation(value = "获取所有员工")
-    @GetMapping("/findAll")
-    @PreAuthorize("@pcs.hasPermissions('employee/findAll')")
-    public Object findAll() {
-        return succeed(employeeService.findAll(null));
-    }*/
-
     @ApiOperation(value = "获取用户信息")
     @GetMapping("/queryUserInfo")
     public Object apiQueryUserInfo() {

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

@@ -18,9 +18,7 @@ import org.springframework.web.bind.annotation.*;
 public class StudentController extends BaseController {
     @Autowired
     private StudentService studentService;
-	/**
-     * 查询单条
-     */
+
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入id")
     @ApiImplicitParams({
@@ -31,11 +29,8 @@ public class StudentController extends BaseController {
 		return succeed(detail);
 	}
 
-    /**
-     * 查询分页
-     */
     @PostMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入student")
+    @ApiOperation(value = "查询分页", notes = "传入StudentSearch")
     public HttpResponseResult<PageInfo<StudentVo>> page(@RequestBody StudentSearch query) {
 		IPage<StudentVo> pages = studentService.selectPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(pages));

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

@@ -27,9 +27,6 @@ public class TeacherAuthEntryRecordController extends BaseController {
     @Autowired
     private SysUserFeignService sysUserFeignService;
 
-    /**
-     * 查询单条详情
-     */
     @GetMapping("/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入id")
     @ApiImplicitParams({
@@ -40,11 +37,8 @@ public class TeacherAuthEntryRecordController extends BaseController {
         return succeed(detail);
     }
 
-    /**
-     * 查询分页
-     */
     @PostMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入teacherAuthEntryRecord")
+    @ApiOperation(value = "查询分页", notes = "传入AuthEntryRecordSearch")
     public HttpResponseResult<PageInfo<TeacherAuthEntryRecordVo>> page(@RequestBody AuthEntryRecordSearch search) {
         IPage<TeacherAuthEntryRecordVo> pages = teacherAuthEntryRecordService.selectPage(PageUtil.getPage(search), search);
         return succeed(PageUtil.pageInfo(pages));
@@ -57,9 +51,6 @@ public class TeacherAuthEntryRecordController extends BaseController {
         return teacherAuthEntryRecordService.doAuth(authOperaReq, sysUser);
     }
 
-    /**
-     * 删除
-     */
     @PostMapping("/remove")
     @ApiOperation(value = "删除", notes = "传入ids")
     public HttpResponseResult remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {

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

@@ -5,6 +5,8 @@ import java.util.List;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
+import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import org.apache.ibatis.annotations.Param;
 
 import com.yonge.cooleshow.auth.api.entity.SysRole;
@@ -20,16 +22,16 @@ public interface EmployeeDao extends BaseDAO<Long, Employee> {
      * @updateTime 2022/3/25 13:36
      * @return: com.yonge.cooleshow.biz.dal.entity.Employee
      */
-    Employee detail(@Param("userId") Long userId);
-
+    Employee detail(@Param("id") Long id);
     /***
      * 平台用户管理分页查询
      * @author liweifan
-     * @param: userId
-     * @updateTime 2022/3/25 13:36
-     * @return: com.yonge.cooleshow.biz.dal.entity.Employee
+     * @param: page
+     * @param: employeeSearch
+     * @updateTime 2022/4/6 13:58
+     * @return: java.util.List<com.yonge.cooleshow.biz.dal.entity.Employee>
      */
-    IPage<Employee> queryPage(Page<Employee> pageInfo, @Param("param") EmployeeSearch employeeSearch);
+    List<Employee> selectPage(@Param("page") IPage page, @Param("param") EmployeeSearch employeeSearch);
 
     /***
      * 插入用户表

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

@@ -15,7 +15,7 @@ public interface TeacherAuthEntryRecordDao extends BaseMapper<TeacherAuthEntryRe
 	/**
 	 * 自定义分页
 	 */
-	List<TeacherAuthEntryRecordVo> selectPage(IPage page,@Param("param") AuthEntryRecordSearch search);
+	List<TeacherAuthEntryRecordVo> selectPage(@Param("page")IPage page,@Param("param") AuthEntryRecordSearch search);
 
 	/***
 	 * 修改用户实名信息

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/AuthEntryRecordSearch.java

@@ -27,7 +27,7 @@ public class AuthEntryRecordSearch extends QueryInfo{
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
-    @ApiModelProperty(value = "审核状态  0、未申请 1、审核中 2、通过 3、不通过")
+    @ApiModelProperty(value = "审核状态  UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
     private AuthStatusEnum authStatus;
 
     public String getSearch() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Teacher.java

@@ -1,13 +1,11 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.yonge.cooleshow.biz.dal.enums.TeacherTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TeacherAuthEntryRecord.java

@@ -13,6 +13,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.springframework.format.annotation.DateTimeFormat;
 
 /**
@@ -95,6 +96,7 @@ public class TeacherAuthEntryRecord implements Serializable {
     @ApiModelProperty("审核理由 ")
 	@TableField(value = "reason_")
     private String reason;
+
 	@TableField(value = "create_time_")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
@@ -219,22 +221,6 @@ public class TeacherAuthEntryRecord implements Serializable {
 
     @Override
     public String toString() {
-        return "TeacherAuthEntryRecord{" +
-				"id=" + id +
-						",userId='" + userId + "'" + 
-						",subjectId='" + subjectId + "'" + 
-						",introduction='" + introduction + "'" + 
-						",graduateSchool='" + graduateSchool + "'" + 
-						",subject='" + subject + "'" + 
-						",gradCertificate='" + gradCertificate + "'" + 
-						",degreeCertificate='" + degreeCertificate + "'" + 
-						",teacherCertificate='" + teacherCertificate + "'" + 
-						",teacherAuthStatus='" + teacherAuthStatus + "'" + 
-						",verifyUserId='" + verifyUserId + "'" + 
-						",reason='" + reason + "'" + 
-						",createTime='" + createTime + "'" + 
-						",updateTime='" + updateTime + "'" + 
-		                '}';
-    }
-	
+        return ToStringBuilder.reflectionToString(this);
+    }
 }

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

@@ -9,28 +9,34 @@ import com.yonge.cooleshow.common.enums.BaseEnum;
  * @Author: liweifan
  * @Data: 2022/3/16 10:19
  */
-public enum AuthStatusEnum implements BaseEnum<Integer, AuthStatusEnum> {
-    UNPAALY(0,"未申请"),
-    DOING(1, "审核中"),
-    PASS(2, "通过"),
-    UNPASS(3, "不通过");
+public enum AuthStatusEnum implements BaseEnum<String, AuthStatusEnum> {
+    UNPAALY("未申请"),
+    DOING("审核中"),
+    PASS("通过"),
+    UNPASS("不通过");
     @EnumValue
-    private Integer code;
-
+    private String code;
     private String msg;
 
-    AuthStatusEnum(Integer code, String msg) {
-        this.code = code;
+    AuthStatusEnum(String msg) {
+        this.code = getCode();
         this.msg = msg;
     }
 
+    @Override
+    public String getCode() {
+        return this.name();
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
     public String getMsg() {
         return msg;
     }
 
-    @Override
-    public Integer getCode() {
-        return this.code;
+    public void setMsg(String msg) {
+        this.msg = msg;
     }
-
 }

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

@@ -2,10 +2,13 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.auth.api.entity.SysRole;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
 import com.yonge.cooleshow.biz.dal.entity.Employee;
+import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.cooleshow.common.service.BaseService;
@@ -18,16 +21,16 @@ public interface EmployeeService extends BaseService<Long, Employee> {
      * @updateTime 2022/3/25 11:52
      * @return: com.yonge.cooleshow.biz.dal.entity.Employee
      */
-    Employee detail(Long userId);
+    Employee detail(Long id);
     /***
-     * 分页擦查询
+     * 分页查询
      * @author liweifan
      * @param: page
      * @param: employeeSearch
-     * @updateTime 2022/3/25 13:44
+     * @updateTime 2022/4/6 13:56
      * @return: com.baomidou.mybatisplus.core.metadata.IPage<com.yonge.cooleshow.biz.dal.entity.Employee>
      */
-    PageInfo<Employee> selectPage(QueryInfo page, EmployeeSearch employeeSearch);
+    IPage<Employee> selectPage(IPage<Employee> page, EmployeeSearch employeeSearch);
     /**
      * 新增员工
      * @param employee

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

@@ -2,11 +2,14 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.enums.SysUserType;
 import com.yonge.cooleshow.biz.dal.dto.search.EmployeeSearch;
+import com.yonge.cooleshow.biz.dal.dto.search.StudentSearch;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
+import com.yonge.cooleshow.biz.dal.vo.StudentVo;
 import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.common.page.PageInfo;
 import org.apache.commons.beanutils.BeanUtils;
@@ -35,15 +38,13 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Long, Employee> impleme
     }
 
     @Override
-    public Employee detail(Long userId) {
-        return employeeDao.detail(userId);
+    public Employee detail(Long id) {
+        return employeeDao.detail(id);
     }
 
     @Override
-    public PageInfo<Employee> selectPage(QueryInfo page, EmployeeSearch employeeSearch) {
-        Page<Employee> pageInfo = PageUtil.getPage(page.getPage(), page.getRows());
-        pageInfo.setDesc("id_");
-        return PageUtil.pageInfo(employeeDao.queryPage(pageInfo,employeeSearch));
+    public IPage<Employee> selectPage(IPage<Employee> page, EmployeeSearch employeeSearch) {
+        return page.setRecords(employeeDao.selectPage(page, employeeSearch));
     }
 
     @Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/support/PageUtil.java

@@ -36,10 +36,10 @@ public class PageUtil {
     public static <T> IPage<T> getPage(QueryInfo query) {
         Page<T> page = new Page<T>(toInt(query.getPage(),1), toInt(query.getRows(),10));
         if(ASC.equals(query.getOrder()) && !StringUtil.isEmpty(query.getSort())){
-            page.setAsc(StringUtil.toStrArray(SqlKeyword.filter(query.getOrder())));
+            page.setAsc(StringUtil.toStrArray(SqlKeyword.filter(query.getSort())));
         }
         if(DESC.equals(query.getOrder()) && !StringUtil.isEmpty(query.getSort())){
-            page.setDesc(StringUtil.toStrArray(SqlKeyword.filter(query.getOrder())));
+            page.setDesc(StringUtil.toStrArray(SqlKeyword.filter(query.getSort())));
         }
         return page;
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/TeacherAuthEntryRecordVo.java

@@ -1,6 +1,7 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.TeacherAuthEntryRecord;
+import com.yonge.cooleshow.biz.dal.enums.GenderEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -10,6 +11,7 @@ import io.swagger.annotations.ApiModelProperty;
  */
 @ApiModel(value = "TeacherAuthEntryRecordVo对象", description = "老师入驻审核详情")
 public class TeacherAuthEntryRecordVo extends TeacherAuthEntryRecord {
+    private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "真实姓名")
     private String realName;
@@ -17,8 +19,8 @@ public class TeacherAuthEntryRecordVo extends TeacherAuthEntryRecord {
     @ApiModelProperty(value = "身份证号")
     private String idCardNo;
 
-    @ApiModelProperty(value = "性别（0，女  1，男）")
-    private Integer gender;
+    @ApiModelProperty(value = "性别 0女 1男")
+    private GenderEnum gender;
 
     @ApiModelProperty("手机号 ")
     private String phone;
@@ -45,11 +47,11 @@ public class TeacherAuthEntryRecordVo extends TeacherAuthEntryRecord {
         this.idCardNo = idCardNo;
     }
 
-    public Integer getGender() {
+    public GenderEnum getGender() {
         return gender;
     }
 
-    public void setGender(Integer gender) {
+    public void setGender(GenderEnum gender) {
         this.gender = gender;
     }
 

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

@@ -68,17 +68,17 @@
             gender_ as gender
         FROM employee t
         left join sys_user u on t.user_id_ = u.id_
-        where t.user_id_ = #{userId}
+        where t.user_id_ = #{id}
     </select>
 
-    <select id="queryPage" resultType="com.yonge.cooleshow.biz.dal.entity.Employee">
+    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.entity.Employee">
         SELECT
             <include refid="baseColumns" />,
-            username_ as username,
-            phone_ as phone,
-            gender_ as gender,
-            lock_flag_ as lockFlag
-        FROM employee
+            u.username_ as username,
+            u.phone_ as phone,
+            u.gender_ as gender,
+            u.lock_flag_ as lockFlag
+        FROM employee t
         left join sys_user u on t.user_id_ = u.id_
         <where>
             <if test="null != param.search and '' != param.search">
@@ -101,8 +101,6 @@
                 <![CDATA[AND t.create_time_ <= #{param.endTime} ]]>
             </if>
         </where>
-        ORDER BY user_id_
-        <include refid="global.limit"/>
     </select>
 
     <insert id="insertSysUser" parameterType="com.yonge.cooleshow.auth.api.entity.SysUser" useGeneratedKeys="true" keyColumn="id"