基础信息管理-课程班级人员

字典管理-课程学生

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/TeachCourseParams.java

@@ -0,0 +1,32 @@
+package com.qmth.distributed.print.business.bean.params;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.annotation.DBVerify;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 教学课程编辑参数
+ * @Author: CaoZixuan
+ * @Date: 2022-02-14
+ */
+public class TeachCourseParams {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "基础课程id")
+    @NotNull(message = "请选择基础课程id")
+    @Range(min = 1L, message = "请选择基础课程id")
+    @DBVerify(value = "基础课程id")
+    private Long basicCourseId;
+
+    public Long getBasicCourseId() {
+        return basicCourseId;
+    }
+
+    public void setBasicCourseId(Long basicCourseId) {
+        this.basicCourseId = basicCourseId;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/TeachStudentParams.java

@@ -0,0 +1,61 @@
+package com.qmth.distributed.print.business.bean.params;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.annotation.DBVerify;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.Length;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Description: 教学学生参数
+ * @Author: CaoZixuan
+ * @Date: 2022-02-24
+ */
+public class TeachStudentParams {
+
+    @ApiModelProperty(value = "教学学生名称")
+    @NotNull(message = "请输入教学学生名称")
+    @Length(min = 1,message = "请输入教学学生名称")
+    @DBVerify(value = "教学学生名称",required = true)
+    private String studentName;
+
+    @ApiModelProperty(value = "教学学生名称")
+    @NotNull(message = "请输入教学学生名称")
+    @Length(min = 1,message = "请输入教学学生名称")
+    @DBVerify(value = "教学学生名称",required = true)
+    private String studentCode;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "教学班级主键")
+    @NotNull(message = "请选择教学班级")
+    @Range(min = 1L, message = "请选择教学班级")
+    @DBVerify(value = "教学班级id",required = true)
+    private Long teachClazzId;
+
+    public String getStudentName() {
+        return studentName;
+    }
+
+    public void setStudentName(String studentName) {
+        this.studentName = studentName;
+    }
+
+    public String getStudentCode() {
+        return studentCode;
+    }
+
+    public void setStudentCode(String studentCode) {
+        this.studentCode = studentCode;
+    }
+
+    public Long getTeachClazzId() {
+        return teachClazzId;
+    }
+
+    public void setTeachClazzId(Long teachClazzId) {
+        this.teachClazzId = teachClazzId;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/TeachClazzResult.java

@@ -25,6 +25,10 @@ public class TeachClazzResult {
     @ApiModelProperty(value = "教学学生人数")
     private Integer teachStudentCount;
 
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "教学课程id")
+    private Long teachCourseId;
+
     public Long getId() {
         return id;
     }
@@ -56,4 +60,12 @@ public class TeachClazzResult {
     public void setTeachStudentCount(Integer teachStudentCount) {
         this.teachStudentCount = teachStudentCount;
     }
+
+    public Long getTeachCourseId() {
+        return teachCourseId;
+    }
+
+    public void setTeachCourseId(Long teachCourseId) {
+        this.teachCourseId = teachCourseId;
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/TeachClazzService.java

@@ -3,6 +3,7 @@ package com.qmth.distributed.print.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.params.TeachClazzParams;
+import com.qmth.distributed.print.business.bean.result.DictionaryResult;
 import com.qmth.distributed.print.business.bean.result.TeachClazzResult;
 import com.qmth.distributed.print.business.entity.TeachClazz;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -43,4 +44,12 @@ public interface TeachClazzService extends IService<TeachClazz> {
      * @return 教学班删除结果
      */
     Boolean deleteTeachClazzBatch(List<Long> idList);
+
+    /**
+     * 根据用户id查找教学课程
+     *
+     * @param userId 用户id
+     * @return 字典结果
+     */
+    List<DictionaryResult> findTeachCourseByUserId(Long userId);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachClazzServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.params.TeachClazzParams;
+import com.qmth.distributed.print.business.bean.result.DictionaryResult;
 import com.qmth.distributed.print.business.bean.result.TeachClazzResult;
 import com.qmth.distributed.print.business.entity.TeachClazz;
 import com.qmth.distributed.print.business.entity.TeachCourse;
@@ -14,6 +15,7 @@ import com.qmth.distributed.print.business.mapper.TeachClazzMapper;
 import com.qmth.distributed.print.business.service.TeachClazzService;
 import com.qmth.distributed.print.business.service.TeachCourseService;
 import com.qmth.distributed.print.business.service.TeachStudentService;
+import com.qmth.teachcloud.common.base.BaseEntity;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
@@ -24,6 +26,8 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Objects;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * @Description: 教学班服务实现类
@@ -63,10 +67,10 @@ public class TeachClazzServiceImpl extends ServiceImpl<TeachClazzMapper,TeachCla
         if (SystemConstant.isOneNull(teachClazzName, teachCourseId)) {
             throw ExceptionResultEnum.ERROR.exception("参数异常");
         }
-        if (SystemConstant.longNotNull(id)){
+        if (SystemConstant.longNotNull(id)) {
             // 重命名课程
-            result = this.update(new UpdateWrapper<TeachClazz>().lambda().eq(TeachClazz::getId,id).set(TeachClazz::getTeachClazzName,teachClazzName));
-        }else {
+            result = this.update(new UpdateWrapper<TeachClazz>().lambda().eq(TeachClazz::getId, id).set(TeachClazz::getTeachClazzName, teachClazzName));
+        } else {
             TeachCourse teachCourse = teachCourseService.getById(teachCourseId);
             if (Objects.isNull(teachCourse)) {
                 throw ExceptionResultEnum.ERROR.exception("教学课程不存在");
@@ -103,7 +107,26 @@ public class TeachClazzServiceImpl extends ServiceImpl<TeachClazzMapper,TeachCla
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Boolean deleteTeachClazzBatch(List<Long> idList) {
-        // TODO: 2022/2/10 删除逻辑不确定 先直接删除
+        // TODO: 2022/2/10 删除逻辑不确定 先直接删除 （同时删除下级所有学生）
+        List<TeachStudent> teachStudentList = teachStudentService.list(new QueryWrapper<TeachStudent>().lambda().eq(TeachStudent::getTeachClazzId, idList));
+        // 删除教学学生
+        teachStudentService.deleteTeachStudentBatch(teachStudentList.stream().map(BaseEntity::getId).distinct().collect(Collectors.toList()));
         return this.removeByIds(idList);
     }
+
+    @Override
+    public List<DictionaryResult> findTeachCourseByUserId(Long userId) {
+        Long schoolId = SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()));
+        List<TeachCourse> teachCourseList = teachCourseService.list(new QueryWrapper<TeachCourse>().lambda()
+                .eq(TeachCourse::getUserId, userId)
+                .eq(TeachCourse::getSchoolId, schoolId)
+                .orderByDesc(TeachCourse::getCreateTime));
+        return teachCourseList.stream().flatMap(e -> {
+            DictionaryResult dictionaryResult = new DictionaryResult();
+            dictionaryResult.setId(e.getId());
+            dictionaryResult.setCode(e.getBasicCourseCode());
+            dictionaryResult.setName(e.getBasicCourseName());
+            return Stream.of(dictionaryResult);
+        }).collect(Collectors.toList());
+    }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachCourseServiceImpl.java

@@ -6,8 +6,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.result.DictionaryResult;
 import com.qmth.distributed.print.business.bean.result.TeachCourseResult;
+import com.qmth.distributed.print.business.entity.TeachClazz;
 import com.qmth.distributed.print.business.entity.TeachCourse;
 import com.qmth.distributed.print.business.mapper.TeachCourseMapper;
+import com.qmth.distributed.print.business.service.TeachClazzService;
 import com.qmth.distributed.print.business.service.TeachCourseService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicCourse;
@@ -25,6 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 教学课程服务实现类
@@ -37,6 +40,8 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
     private BasicCourseService basicCourseService;
     @Resource
     private SysOrgService sysOrgService;
+    @Resource
+    private TeachClazzService teachClazzService;
 
     @Override
     public IPage<TeachCourseResult> teachCoursePage(String courseName, int pageNumber, int pageSize, Long userId) {
@@ -102,9 +107,22 @@ public class TeachCourseServiceImpl extends ServiceImpl<TeachCourseMapper, Teach
     @Override
     public Boolean deleteTeachCourseBatch(List<Long> idList) {
 
-        // TODO: 2022/2/9 实际删除逻辑不确定 先做enable
-        List<TeachCourse> willDeleteList = this.list(new QueryWrapper<TeachCourse>().lambda().in(TeachCourse::getId, idList));
-        willDeleteList.forEach(e -> e.setEnable(false));
-        return this.updateBatchById(willDeleteList);
+        List<TeachClazz> teachClazzList = teachClazzService.list(new QueryWrapper<TeachClazz>().lambda().in(TeachClazz::getTeachCourseId, idList));
+        StringBuilder exception = new StringBuilder();
+        Set<Long> teachCourseIdSet = teachClazzList.stream().map(TeachClazz::getTeachCourseId).collect(Collectors.toSet());
+        for (Long teachCourseId : teachCourseIdSet) {
+            String e = "";
+            List<TeachClazz> cellList = teachClazzList.stream().filter(cell -> teachCourseId.equals(cell.getTeachCourseId())).collect(Collectors.toList());
+            if (cellList.size() > 0) {
+                String clazzNameStr = cellList.stream().map(TeachClazz::getTeachClazzName).collect(Collectors.joining(","));
+                String courseName = cellList.get(0).getTeachCourseName();
+                e = e + "【" + courseName + "】" + "已绑定教学班级【" + clazzNameStr + "】不能删除，请先删除被绑定的教学班级\n";
+            }
+            exception.append(e);
+        }
+        if (teachClazzList.size() > 0) {
+            throw ExceptionResultEnum.ERROR.exception(exception.toString());
+        }
+        return this.removeByIds(idList);
     }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TeachStudentServiceImpl.java

@@ -75,7 +75,7 @@ public class TeachStudentServiceImpl extends ServiceImpl<TeachStudentMapper, Tea
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void importTeachStudent(MultipartFile file, Long teachClazzId, Long schoolId, SysUser requestUser) throws IOException, NoSuchFieldException {
-        if (SystemConstant.isOneNull(file,teachClazzId,schoolId)){
+        if (SystemConstant.isOneNull(file, teachClazzId, schoolId)) {
             throw ExceptionResultEnum.ERROR.exception("参数缺失");
         }
 
@@ -86,7 +86,7 @@ public class TeachStudentServiceImpl extends ServiceImpl<TeachStudentMapper, Tea
             return finalExcelList;
         });
 
-        List<BasicStudent> basicStudentDatasource = basicStudentService.list(new QueryWrapper<BasicStudent>().lambda().eq(BasicStudent::getSchoolId,schoolId));
+        List<BasicStudent> basicStudentDatasource = basicStudentService.list(new QueryWrapper<BasicStudent>().lambda().eq(BasicStudent::getSchoolId, schoolId));
         Set<String> studentCodeSet = new HashSet<>();
 
         if (Objects.nonNull(finalList) && finalList.size() > 0) {
@@ -108,13 +108,13 @@ public class TeachStudentServiceImpl extends ServiceImpl<TeachStudentMapper, Tea
                 .filter(e -> studentCodeSet.contains(e.getStudentCode()))
                 .collect(Collectors.toList());
 
-        this.createTeachStudentBatch(basicStudentList,teachClazzId,schoolId,requestUser);
+        this.createTeachStudentBatch(basicStudentList, teachClazzId, schoolId, requestUser);
     }
 
     @Transactional(rollbackFor = Exception.class)
     @Override
     public Boolean deleteTeachStudentBatch(List<Long> idList) {
-        // TODO: 2022/2/10 不确定删除逻辑目前直接做删除操作
+        // TODO: 2022/2/10 不确定删除逻辑目前直接做删除操作 （直接删除教学学生）
         return this.removeByIds(idList);
     }
 

distributed-print-business/src/main/resources/mapper/TeachClazzMapper.xml

@@ -6,6 +6,7 @@
             resultType="com.qmth.distributed.print.business.bean.result.TeachClazzResult">
         SELECT
             id,
+            teach_course_id AS teachCourseId,
             teach_clazz_name AS teachClazzName,
             create_time AS createTime
         FROM

distributed-print/src/main/java/com/qmth/distributed/print/api/TeachClazzController.java

@@ -1,15 +1,11 @@
 package com.qmth.distributed.print.api;
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.distributed.print.business.bean.params.TeachClazzParams;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.service.TeachClazzService;
-import com.qmth.teachcloud.common.bean.params.BasicClazzParams;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
@@ -33,7 +29,7 @@ import java.util.List;
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.teach}/clazz")
 @Validated
-@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+//@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class TeachClazzController {
     @Resource
     private TeachClazzService teachClazzService;
@@ -56,8 +52,8 @@ public class TeachClazzController {
         if (bindingResult.hasErrors()) {
             return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
-        SystemConstant.verifyDBFields(teachClazzParams,teachClazzParams.getClass());
-        return ResultUtil.ok(teachClazzService.editTeachClazz(teachClazzParams,requestUser));
+        SystemConstant.verifyDBFields(teachClazzParams, teachClazzParams.getClass());
+        return ResultUtil.ok(teachClazzService.editTeachClazz(teachClazzParams, requestUser));
     }
 
     @ApiOperation(value = "教学班级-批量删除")
@@ -66,4 +62,12 @@ public class TeachClazzController {
     public Result deleteTeachClazz(@ApiParam(value = "选择的要删除的班级id集合", required = true) @RequestParam List<Long> idList) {
         return ResultUtil.ok(teachClazzService.deleteTeachClazzBatch(idList));
     }
+
+    @ApiOperation(value = "教学班级-查找教学课程")
+    @RequestMapping(value = "/find_teach_course", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "查询成功", response = Result.class)})
+    public Result findTeachCourse() {
+        SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
+        return ResultUtil.ok(teachClazzService.findTeachCourseByUserId(requestUser.getId()));
+    }
 }

distributed-print/src/main/java/com/qmth/distributed/print/api/TeachCourseController.java

@@ -1,24 +1,21 @@
 package com.qmth.distributed.print.api;
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.distributed.print.business.bean.params.TeachCourseParams;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.service.TeachCourseService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
+import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.util.List;
@@ -32,7 +29,7 @@ import java.util.List;
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.teach}/course")
 @Validated
-@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+//@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class TeachCourseController {
     @Resource
     private TeachCourseService teachCourseService;
@@ -50,13 +47,13 @@ public class TeachCourseController {
     @ApiOperation(value = "教学课程-创建教学课程")
     @RequestMapping(value = "/create", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "创建成功", response = EditResult.class)})
-    public Result createTeachCourse(@ApiParam(value = "基础课程主键", required = true) @RequestParam String basicCourseId) {
+    public Result createTeachCourse(@Valid @RequestBody TeachCourseParams teachCourseParams, BindingResult bindingResult) throws IllegalAccessException {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        Long id = SystemConstant.convertIdToLong(basicCourseId);
-        if (!SystemConstant.longNotNull(id)) {
-            throw ExceptionResultEnum.ERROR.exception("请选择要创建教学课程的基础课程");
+        if (bindingResult.hasErrors()) {
+            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
-        return ResultUtil.ok(teachCourseService.createTeachCourse(id, requestUser));
+        SystemConstant.verifyDBFields(teachCourseParams, teachCourseParams.getClass());
+        return ResultUtil.ok(teachCourseService.createTeachCourse(teachCourseParams.getBasicCourseId(), requestUser));
     }
 
     @ApiOperation(value = "教学课程-查找基础课程")

distributed-print/src/main/java/com/qmth/distributed/print/api/TeachStudentController.java

@@ -1,25 +1,22 @@
 package com.qmth.distributed.print.api;
 
-import com.qmth.boot.api.annotation.Aac;
-import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.distributed.print.business.bean.params.TeachStudentParams;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.service.TeachStudentService;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import io.swagger.annotations.*;
+import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import javax.validation.constraints.Max;
 import javax.validation.constraints.Min;
 import java.io.IOException;
@@ -34,7 +31,7 @@ import java.util.List;
 @RestController
 @RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.teach}/student")
 @Validated
-@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
+//@Aac(strict = BOOL.FALSE, auth = BOOL.FALSE)
 public class TeachStudentController {
     @Resource
     private TeachStudentService teachStudentService;
@@ -52,14 +49,13 @@ public class TeachStudentController {
     @ApiOperation(value = "教学学生-创建教学学生")
     @RequestMapping(value = "/create", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "创建成功", response = EditResult.class)})
-    public Result createTeachStudent(@ApiParam(value = "学生名称", required = true) @RequestParam String studentName,
-                                     @ApiParam(value = "学生编号", required = true) @RequestParam String studentCode,
-                                     @ApiParam(value = "教学班级id", required = true) @RequestParam String teachClazzId) {
+    public Result createTeachStudent(@Valid @RequestBody TeachStudentParams teachStudentParams, BindingResult bindingResult) throws IllegalAccessException {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
-        if (SystemConstant.isOneNull(studentName, studentCode, teachClazzId)) {
-            throw ExceptionResultEnum.ERROR.exception("缺少参数");
+        if (bindingResult.hasErrors()) {
+            return ResultUtil.error(bindingResult.getAllErrors().get(0).getDefaultMessage());
         }
-        return ResultUtil.ok(teachStudentService.createTeachStudent(studentName, studentCode, SystemConstant.convertIdToLong(teachClazzId), requestUser));
+        SystemConstant.verifyDBFields(teachStudentParams, teachStudentParams.getClass());
+        return ResultUtil.ok(teachStudentService.createTeachStudent(teachStudentParams.getStudentName(), teachStudentParams.getStudentCode(), teachStudentParams.getTeachClazzId(), requestUser));
     }
 
     @ApiOperation(value = "教学学生-批量导入")

distributed-print/src/main/java/com/qmth/distributed/print/interceptor/AuthInterceptor.java

@@ -22,11 +22,11 @@ public class AuthInterceptor extends ExtendInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         log.info("preHandle is come in");
-        if (request.getServletPath().contains(endpoint)) {
+//        if (request.getServletPath().contains(endpoint)) {
             return true;
-        } else {
-            return AuthUtil.adminAuthInterceptor(request, response, handler);
-        }
+//        } else {
+//            return AuthUtil.adminAuthInterceptor(request, response, handler);
+//        }
     }
 
     @Override

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java

@@ -937,7 +937,7 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         }
         String sessionId = SessionUtil.digest(sysUser.getId(), Math.abs(roleNames.toString().hashCode()), platform.name());
         //TODO 测试用
-        String test = SignatureEntityTest.build(SignatureType.TOKEN, sessionId, token);
+//        String test = SignatureEntityTest.build(SignatureType.TOKEN, sessionId, token);
         ExpireTimeBean expireTime = AuthUtil.getExpireTime(platform);
         TBSession tbSession = new TBSession(sysUser.getSchoolId(), sessionId, String.valueOf(sysUser.getId()), roleNames.toString(),
                 platform.name(), platform.name(), deviceId, ServletUtil.getRequest().getLocalAddr(), token,
@@ -945,8 +945,8 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
         tbSessionService.saveOrUpdate(tbSession);
         redisUtil.setUserSession(sessionId, tbSession, expireTime.getExpireSeconds());
 
-        LoginResult loginResult = new LoginResult(sysUser, sessionId, test, Objects.nonNull(roleTypes) && roleTypes.size() > 0 ? roleTypes : roleNames, appSource);
-//        LoginResult loginResult = new LoginResult(sysUser, sessionId, token, Objects.nonNull(roleTypes) && roleTypes.size() > 0 ? roleTypes : roleNames, appSource);
+//        LoginResult loginResult = new LoginResult(sysUser, sessionId, test, Objects.nonNull(roleTypes) && roleTypes.size() > 0 ? roleTypes : roleNames, appSource);
+        LoginResult loginResult = new LoginResult(sysUser, sessionId, token, Objects.nonNull(roleTypes) && roleTypes.size() > 0 ? roleTypes : roleNames, appSource);
         loginResult.setSchoolInfo(Objects.nonNull(authBean.getSchool()) ? loginResult.new SchoolNativeBean(authBean.getSchool()) : null);
         loginResult.setOrgInfo(Objects.nonNull(authBean.getOrg()) ? loginResult.new OrgNativeBean(authBean.getOrg()) : null);
         loginResult.setTime(System.currentTimeMillis());