从request取信息优化

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

@@ -1,36 +0,0 @@
-package com.qmth.distributed.print.business.bean;
-
-import com.qmth.distributed.print.business.entity.BasicSchool;
-import com.qmth.distributed.print.business.entity.SysUser;
-
-public class ApiUser {
-
-    private Long schoolId;
-
-    private SysUser userData;
-
-    private BasicSchool schoolData;
-
-    public ApiUser(BasicSchool school) {
-        schoolData = school;
-        schoolId = school.getId();
-    }
-
-    public ApiUser(SysUser user) {
-        userData = user;
-        schoolId = user.getSchoolId();
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public SysUser getUserData() {
-        return userData;
-    }
-
-    public BasicSchool getSchoolData() {
-        return schoolData;
-    }
-
-}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/CardDetailDto.java

@@ -0,0 +1,44 @@
+package com.qmth.distributed.print.business.bean.dto;
+
+/**
+ * @Date: 2021/3/29.
+ */
+public class CardDetailDto {
+
+    private String cardId;
+    private String title;
+    private String makeMethod;
+    private String content;
+
+    public String getCardId() {
+        return cardId;
+    }
+
+    public void setCardId(String cardId) {
+        this.cardId = cardId;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getMakeMethod() {
+        return makeMethod;
+    }
+
+    public void setMakeMethod(String makeMethod) {
+        this.makeMethod = makeMethod;
+    }
+
+    public String getContent() {
+        return content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+}

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamCardMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.distributed.print.business.bean.dto.CardCustDto;
+import com.qmth.distributed.print.business.bean.dto.CardDetailDto;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.entity.ExamCard;
 import org.apache.ibatis.annotations.Param;
@@ -21,4 +22,6 @@ import java.util.Map;
 public interface ExamCardMapper extends BaseMapper<ExamCard> {
 
     IPage<CardCustDto> listCardCust(Page<CardCustDto> page, @Param("status") String status, @Param("paperNumber") String paperNumber, @Param("userId") String userId, @Param("applyStartTime") Long applyStartTime, @Param("applyEndTime") Long applyEndTime, @Param("finishStartTime") Long finishStartTime, @Param("finishEndTime") Long finishEndTime);
+
+    CardDetailDto getCardDetail(Long cardId);
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamDetailMapper.java

@@ -19,7 +19,7 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ExamDetailMapper extends BaseMapper<ExamDetail> {
 
-    IPage<ExamTaskDetailDto> listPrintTask(Long schoolId, String printPlanName, String status, String courseCode, String paperNumber, String examPlace, Long examStartTime, Long examEndTime);
+    IPage<ExamTaskDetailDto> listPrintTask(Page<ExamTaskDetailDto> page, @Param("schoolId") Long schoolId, @Param("printPlanName") String printPlanName, @Param("status") String status, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("examPlace") String examPlace, @Param("examStartTime") Long examStartTime, @Param("examEndTime") Long examEndTime);
 
     IPage<ExaminationResult> findBriefPage(@Param("page") Page<ExaminationResult> page,
                                            @Param("schoolId") Long schoolId,

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

@@ -15,7 +15,7 @@ import org.springframework.web.multipart.MultipartFile;
  */
 public interface BasicAttachmentService extends IService<BasicAttachment> {
 
-    BasicAttachment save(MultipartFile file, String md5, Long schoolId, Long userId);
+    BasicAttachment save(MultipartFile file, String md5, Long userId);
 
     /**
      * 保存附件

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

@@ -17,9 +17,9 @@ import java.util.List;
  */
 public interface BasicCardRuleService extends IService<BasicCardRule> {
 
-    IPage<CardRuleDto> list(Long schoolId, Boolean enable, String name, Long createTime, Integer pageNumber, Integer pageSize);
+    IPage<CardRuleDto> list(Boolean enable, String name, Long createTime, Integer pageNumber, Integer pageSize);
 
-    List<BasicCardRule> list(Long schoolId, String param);
+    List<BasicCardRule> list(String param);
 
     boolean enable(BasicCardRule cardRule);
 

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

@@ -18,9 +18,9 @@ import java.util.List;
  */
 public interface BasicCourseService extends IService<BasicCourse> {
 
-    IPage<BasicCourse> list(Long schoolId, String code, String name, Integer pageNumber, Integer pageSize);
+    IPage<BasicCourse> list(String code, String name, Integer pageNumber, Integer pageSize);
 
-    List<BasicCourse> list(Long schoolId, String param);
+    List<BasicCourse> list(String param);
 
     boolean saveCourse(BasicCourse course);
 

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

@@ -13,7 +13,7 @@ import com.qmth.distributed.print.business.entity.BasicExamRule;
  */
 public interface BasicExamRuleService extends IService<BasicExamRule> {
 
-    BasicExamRule getBySchoolId(Long schoolId);
+    BasicExamRule getBySchoolId();
 
     boolean saveExamRule(BasicExamRule examRule);
 }

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

@@ -16,7 +16,7 @@ import com.qmth.distributed.print.business.entity.BasicTemplate;
  */
 public interface BasicTemplateService extends IService<BasicTemplate> {
 
-    IPage<TemplateDto> list(Long schoolId, Boolean enable, String type, String name, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
+    IPage<TemplateDto> list(Boolean enable, String type, String name, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
 
     boolean saveTemplate(BasicTemplate template);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/ExamCardService.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.dto.CardCustDto;
+import com.qmth.distributed.print.business.bean.dto.CardDetailDto;
 import com.qmth.distributed.print.business.bean.params.ExamCardParams;
 import com.qmth.distributed.print.business.entity.ExamCard;
 
@@ -21,4 +22,6 @@ public interface ExamCardService extends IService<ExamCard> {
     IPage<CardCustDto> listCardCust(String status, String paperNumber, String userId, Long applyStartTime, Long applyEndTime, Long finishStartTime, Long finishEndTime, Integer pageNumber, Integer pageSize);
 
     String saveExamCardCust(ExamCardParams examCardParams);
+
+    CardDetailDto getCardDetail(Long cardId);
 }

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

@@ -36,7 +36,7 @@ public interface ExamDetailService extends IService<ExamDetail> {
      */
     double calculateTotalPackages(Long printPlanId);
 
-    IPage<ExamTaskDetailDto> listPrintTask(Long schoolId, String printPlanName, String status, String courseCode, String paperNumber, String examPlace, Long examStartTime, Long examEndTime, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDetailDto> listPrintTask(String printPlanName, String status, String courseCode, String paperNumber, String examPlace, Long examStartTime, Long examEndTime, Integer pageNumber, Integer pageSize);
 
     Map<String, Object> taskTotalData(String printPlanName, String status, String courseCode, String paperNumber, String examPlace, Long examStartTime, Long examEndTime);
 

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

@@ -23,7 +23,7 @@ public interface ExamTaskDetailService extends IService<ExamTaskDetail> {
 
     boolean updatePaper(Map<String, String> map);
 
-    IPage<ExamTaskDetailDto> list(Long schoolId, String relateType, Long printPlanId, String courseCode, String paperNumber, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDetailDto> list(String relateType, Long printPlanId, String courseCode, String paperNumber, Integer pageNumber, Integer pageSize);
 
     List<ExamTaskDetail> listByCardId(Long cardId);
 

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

@@ -2,7 +2,6 @@ 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.ApiUser;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.entity.ExamTask;
@@ -26,11 +25,11 @@ public interface ExamTaskService extends IService<ExamTask> {
 
     List<ExamTask> listByCourseCode(Long schoolId, String code);
 
-    IPage<ExamTaskDto> list(Long schoolId, Boolean enable, String status, Long cardRuleId, String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDto> list(Boolean enable, String status, Long cardRuleId, String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
 
-    List<String> listPaperNumber(Long schoolId, String param);
+    List<String> listPaperNumber(String param);
 
-    List<BlurryUserDto> listUser(Long schoolId, String param);
+    List<BlurryUserDto> listUser(String param);
 
     boolean assignUser(ExamTask examTask);
 
@@ -38,23 +37,23 @@ public interface ExamTaskService extends IService<ExamTask> {
 
     boolean saveExamTask(ExamTask examTask);
 
-    List<ExamTaskImportDto> importFile(MultipartFile file, String md5, ApiUser apiUser);
+    List<ExamTaskImportDto> importFile(MultipartFile file, String md5);
 
     boolean saveBatch(ExamTask task);
 
-    IPage<ExamTaskDto> listTaskApply(Long schoolId, String auditStatus, String reviewStatus, Long cardRuleId, String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDto> listTaskApply(String auditStatus, String reviewStatus, Long cardRuleId, String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
 
-    IPage<ExamTaskDto> listTaskReviewUnaudited(Long schoolId, String courseCode, String paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDto> listTaskReviewUnaudited(String courseCode, String paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
 
-    IPage<ExamTaskDto> listTaskReviewAudited(Long schoolId, String reviewStatus, String courseCode, String paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDto> listTaskReviewAudited(String reviewStatus, String courseCode, String paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
 
     boolean taskReviewSave(ExamTaskReviewLog taskReviewLog);
 
     boolean taskReviewSaveBatch(ExamTaskReviewLog taskReviewLog);
 
-    IPage<ExamTaskDetailDto> listTaskPaper(Long schoolId, String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
+    IPage<ExamTaskDetailDto> listTaskPaper(String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
 
-    List<RelatePaperDto> listPaperTypes(Long schoolId, String courseCode);
+    List<RelatePaperDto> listPaperTypes(String courseCode);
 
     boolean saveExamTaskDetail(ExamTaskDetail examTaskDetail);
 

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

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface SysOrgService extends IService<SysOrg> {
 
-    List<OrgDto> listOrgTree(Long schoolId);
+    List<OrgDto> listOrgTree();
 
     boolean saveOrg(SysOrg org);
 

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

@@ -16,7 +16,7 @@ import java.util.List;
  */
 public interface SysPrivilegeService extends IService<SysPrivilege> {
 
-    List<PrivilegeDto> listOrgTree(Long schoolId);
+    List<PrivilegeDto> listPrivilegeTree();
 
     boolean savePrivilege(SysPrivilege privilege);
 

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

@@ -17,7 +17,7 @@ import java.util.List;
  */
 public interface SysRoleService extends IService<SysRole> {
 
-    IPage<SysRole> list(Long schoolId, String name, Boolean enable, Integer pageNumber, Integer pageSize);
+    IPage<SysRole> list(String name, Boolean enable, Integer pageNumber, Integer pageSize);
 
     boolean saveRole(SysRole role);
 

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

@@ -22,7 +22,7 @@ import java.util.List;
  */
 public interface SysUserService extends IService<SysUser> {
 
-    IPage<UserDto> list(Long schoolId, String realName, String roleId, Boolean enable, Integer pageNumber, Integer pageSize);
+    IPage<UserDto> list(String realName, String roleId, Boolean enable, Integer pageNumber, Integer pageSize);
 
     boolean saveUser(SysUser user);
 
@@ -44,5 +44,5 @@ public interface SysUserService extends IService<SysUser> {
      */
     public List<UserExportDto> queryByExport(ArraysParams arraysParams);
 
-    List<BlurryUserDto> listUser(Long schoolId, String courseCode, String param);
+    List<BlurryUserDto> listUser(String courseCode, String param);
 }

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

@@ -55,7 +55,8 @@ public class BasicAttachmentServiceImpl extends ServiceImpl<BasicAttachmentMappe
     private DictionaryConfig dictionaryConfig;
 
     @Override
-    public BasicAttachment save(MultipartFile file, String md5, Long schoolId, Long userId) {
+    public BasicAttachment save(MultipartFile file, String md5, Long userId) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         try {
             if (file == null) {
                 throw ExceptionResultEnum.ERROR.exception("文件为空");

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

@@ -8,10 +8,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.CardRuleDto;
 import com.qmth.distributed.print.business.entity.BasicCardRule;
 import com.qmth.distributed.print.business.entity.SysOrg;
+import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import com.qmth.distributed.print.business.mapper.BasicCardRuleMapper;
 import com.qmth.distributed.print.business.service.BasicCardRuleService;
 import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
+import com.qmth.distributed.print.business.util.ServletUtil;
+import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,7 +40,8 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
 
 
     @Override
-    public IPage<CardRuleDto> list(Long schoolId, Boolean enable, String name, Long createTime, Integer pageNumber, Integer pageSize) {
+    public IPage<CardRuleDto> list(Boolean enable, String name, Long createTime, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<CardRuleDto> page = new Page<>(pageNumber, pageSize);
         IPage<CardRuleDto> cardRuleDtoIPage = this.baseMapper.listPage(page, schoolId, enable, name, createTime);
         if (cardRuleDtoIPage.getRecords().size() > 0) {
@@ -51,7 +55,8 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
     }
 
     @Override
-    public List<BasicCardRule> list(Long schoolId, String param) {
+    public List<BasicCardRule> list(String param) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         QueryWrapper<BasicCardRule> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(BasicCardRule::getSchoolId, schoolId);
         if(StringUtils.isNotBlank(param)){
@@ -71,6 +76,10 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
     @Transactional
     @Override
     public boolean saveCardRule(BasicCardRule cardRule) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        cardRule.setSchoolId(schoolId);
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+
         // todo 校验是否有必选字段已使用
         QueryWrapper<BasicCardRule> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(BasicCardRule::getSchoolId, cardRule.getSchoolId()).eq(BasicCardRule::getName, cardRule.getName());
@@ -81,6 +90,8 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
             if (basicCardRule != null) {
                 throw ExceptionResultEnum.ERROR.exception("题卡规则名称已存在");
             }
+            cardRule.setId(SystemConstant.getDbUuid());
+            cardRule.setCreateId(sysUser.getId());
             cardRule.setCreateTime(System.currentTimeMillis());
             isSuccess = this.save(cardRule);
         }
@@ -90,6 +101,7 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
                 throw ExceptionResultEnum.ERROR.exception("题卡规则名称已存在");
             }
 
+            cardRule.setUpdateId(sysUser.getId());
             cardRule.setUpdateTime(System.currentTimeMillis());
 
             //删除权限

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

@@ -4,13 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.BlurryParam;
-import com.qmth.distributed.print.business.bean.params.CourseParam;
 import com.qmth.distributed.print.business.entity.BasicCourse;
 import com.qmth.distributed.print.business.entity.ExamTask;
+import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.mapper.BasicCourseMapper;
 import com.qmth.distributed.print.business.service.BasicCourseService;
 import com.qmth.distributed.print.business.service.ExamTaskService;
+import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
@@ -35,14 +35,16 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
     private ExamTaskService examTaskService;
 
     @Override
-    public IPage<BasicCourse> list(Long schoolId, String code, String name, Integer pageNumber, Integer pageSize) {
+    public IPage<BasicCourse> list(String code, String name, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<BasicCourse> page = new Page<>(pageNumber, pageSize);
         IPage<BasicCourse> courseIPage = this.baseMapper.listPage(page, schoolId, code, name);
         return courseIPage;
     }
 
     @Override
-    public List<BasicCourse> list(Long schoolId, String param) {
+    public List<BasicCourse> list(String param) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         QueryWrapper<BasicCourse> queryWrapper = new QueryWrapper<>();
         if (StringUtils.isNotBlank(param)) {
             queryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId)
@@ -53,6 +55,10 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
 
     @Override
     public boolean saveCourse(BasicCourse course) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        course.setSchoolId(schoolId);
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+
         QueryWrapper<BasicCourse> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(BasicCourse::getSchoolId, course.getSchoolId()).eq(BasicCourse::getCode, course.getCode());
         BasicCourse basicCourse = this.getOne(queryWrapper);
@@ -63,7 +69,8 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                 throw ExceptionResultEnum.ERROR.exception("课程已存在");
             }
             course.setId(SystemConstant.getDbUuid());
-             course.setCreateTime(System.currentTimeMillis());
+            course.setCreateId(sysUser.getId());
+            course.setCreateTime(System.currentTimeMillis());
         }
         // 修改
         else {
@@ -74,9 +81,10 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
             // 旧code是否已有命题任务
             BasicCourse oldCourse = this.getById(course.getId());
             List<ExamTask> taskList = examTaskService.listByCourseCode(oldCourse.getSchoolId(), oldCourse.getCode());
-            if(taskList != null && taskList.size() > 0){
+            if (taskList != null && taskList.size() > 0) {
                 throw ExceptionResultEnum.ERROR.exception("课程绑定命题任务，不能修改");
             }
+            course.setUpdateId(sysUser.getId());
             course.setUpdateTime(System.currentTimeMillis());
         }
         return this.saveOrUpdate(course);
@@ -87,7 +95,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
         // code是否已有命题任务
         BasicCourse course = this.baseMapper.selectById(id);
         List<ExamTask> taskList = examTaskService.listByCourseCode(course.getSchoolId(), course.getCode());
-        if(taskList != null && taskList.size() > 0){
+        if (taskList != null && taskList.size() > 0) {
             throw ExceptionResultEnum.ERROR.exception("课程绑定命题任务，不能删除");
         }
         return this.removeById(id);

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

@@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.entity.BasicExamRule;
 import com.qmth.distributed.print.business.entity.ExamPrintPlan;
+import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.distributed.print.business.mapper.BasicExamRuleMapper;
 import com.qmth.distributed.print.business.service.BasicExamRuleService;
 import com.qmth.distributed.print.business.service.ExamPrintPlanService;
+import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import com.qmth.distributed.print.common.util.JacksonUtil;
@@ -33,7 +35,8 @@ public class BasicExamRuleServiceImpl extends ServiceImpl<BasicExamRuleMapper, B
     private ExamPrintPlanService examPrintPlanService;
 
     @Override
-    public BasicExamRule getBySchoolId(Long schoolId) {
+    public BasicExamRule getBySchoolId() {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         QueryWrapper<BasicExamRule> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(BasicExamRule::getSchoolId, schoolId);
         return this.getOne(queryWrapper);
@@ -41,10 +44,16 @@ public class BasicExamRuleServiceImpl extends ServiceImpl<BasicExamRuleMapper, B
 
     @Override
     public boolean saveExamRule(BasicExamRule examRule) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        examRule.setSchoolId(schoolId);
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+
         // 已开始新建印刷计划，不能新增、删除扩展字段
         // 新增
         if (examRule.getId() == null){
             examRule.setId(SystemConstant.getDbUuid());
+            examRule.setCreateId(sysUser.getId());
+            examRule.setCreateTime(System.currentTimeMillis());
             return this.save(examRule);
         }
         // 修改
@@ -82,6 +91,8 @@ public class BasicExamRuleServiceImpl extends ServiceImpl<BasicExamRuleMapper, B
                     }
                 }
             }
+            examRule.setUpdateId(sysUser.getId());
+            examRule.setUpdateTime(System.currentTimeMillis());
 
             return this.updateById(examRule);
         }

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

@@ -9,9 +9,11 @@ import com.qmth.distributed.print.business.bean.dto.TemplateDto;
 import com.qmth.distributed.print.business.bean.params.TemplateParam;
 import com.qmth.distributed.print.business.entity.BasicTemplate;
 import com.qmth.distributed.print.business.entity.SysOrg;
+import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.mapper.BasicTemplateMapper;
 import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
 import com.qmth.distributed.print.business.service.BasicTemplateService;
+import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +22,8 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 import java.util.Objects;
 
+import static com.qmth.distributed.print.business.util.ServletUtil.getRequestUser;
+
 /**
  * <p>
  * 通用模板 服务实现类
@@ -35,8 +39,9 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
     private BasicTemplateOrgService basicTemplateOrgService;
 
     @Override
-    public IPage<TemplateDto> list(Long schoolId, Boolean enable, String type, String name, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+    public IPage<TemplateDto> list(Boolean enable, String type, String name, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
         Page<TemplateDto> page = new Page<>(pageNumber, pageSize);
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         IPage<TemplateDto> templateDtoIPage = this.baseMapper.listPage(page, schoolId, enable, type, name, startTime, endTime);
         if (templateDtoIPage.getRecords().size() > 0) {
             templateDtoIPage.getRecords().forEach(m -> {
@@ -50,6 +55,9 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
 
     @Override
     public boolean saveTemplate(BasicTemplate template) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        template.setSchoolId(schoolId);
         // todo 校验是否有必选字段已使用
         QueryWrapper<BasicTemplate> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(BasicTemplate::getSchoolId, template.getSchoolId()).eq(BasicTemplate::getName, template.getName());
@@ -61,6 +69,7 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
                 throw ExceptionResultEnum.ERROR.exception("模板名称已存在");
             }
             template.setId(SystemConstant.getDbUuid());
+            template.setCreateId(sysUser.getId());
             template.setCreateTime(System.currentTimeMillis());
             isSuccess = this.save(template);
         }
@@ -70,6 +79,7 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
                 throw ExceptionResultEnum.ERROR.exception("模板名称已存在");
             }
 
+            template.setUpdateId(sysUser.getId());
             template.setUpdateTime(System.currentTimeMillis());
 
             //删除权限

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

@@ -4,6 +4,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.dto.CardCustDto;
+import com.qmth.distributed.print.business.bean.dto.CardDetailDto;
 import com.qmth.distributed.print.business.bean.params.ExamCardParams;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.enums.MakeMethodEnum;
@@ -134,6 +135,7 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
         examCard.setCourseCode(examCardParams.getCourseCode());
         examCard.setCourseName(examCardParams.getCourseName());
         examCard.setMakeMethod(examCardParams.getMakeMethod());
+        examCard.setTitle(examCardParams.getTitle());
         examCard.setStatus(examCardParams.getStatus());
         examCard.setCreateId(user.getId());
         examCard.setCreateTime(System.currentTimeMillis());
@@ -153,6 +155,11 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
         return String.valueOf(examCard.getId());
     }
 
+    @Override
+    public CardDetailDto getCardDetail(Long cardId) {
+        return this.baseMapper.getCardDetail(cardId);
+    }
+
 
     /**
      * 数据验证
@@ -160,7 +167,7 @@ public class ExamCardServiceImpl extends ServiceImpl<ExamCardMapper, ExamCard> i
      * @param examCardParams
      */
     private void validateCardData(ExamCardParams examCardParams, Long schoolId) {
-        BasicExamRule basicExamRule = basicExamRuleService.getBySchoolId(schoolId);
+        BasicExamRule basicExamRule = basicExamRuleService.getBySchoolId();
         if (basicExamRule == null) {
             throw ExceptionResultEnum.ERROR.exception("通用规则未设置");
         }

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

@@ -20,6 +20,7 @@ import com.qmth.distributed.print.business.mapper.ExamDetailMapper;
 import com.qmth.distributed.print.business.service.BasicExamRuleService;
 import com.qmth.distributed.print.business.service.ExamDetailCourseService;
 import com.qmth.distributed.print.business.service.ExamDetailService;
+import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import org.springframework.stereotype.Service;
@@ -69,9 +70,10 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
     }
 
     @Override
-    public IPage<ExamTaskDetailDto> listPrintTask(Long schoolId, String printPlanName, String status, String courseCode, String paperNumber, String examPlace, Long examStartTime, Long examEndTime, Integer pageNumber, Integer pageSize) {
+    public IPage<ExamTaskDetailDto> listPrintTask(String printPlanName, String status, String courseCode, String paperNumber, String examPlace, Long examStartTime, Long examEndTime, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<ExamTaskDetailDto> page = new Page<>(pageNumber, pageSize);
-        IPage<ExamTaskDetailDto> examTaskDetailDtoIPage = this.baseMapper.listPrintTask(schoolId, printPlanName,status, courseCode, paperNumber, examPlace, examStartTime, examEndTime);
+        IPage<ExamTaskDetailDto> examTaskDetailDtoIPage = this.baseMapper.listPrintTask(page, schoolId, printPlanName,status, courseCode, paperNumber, examPlace, examStartTime, examEndTime);
         return examTaskDetailDtoIPage;
     }
 
@@ -88,7 +90,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
     @Transactional(rollbackFor = Exception.class)
     @Override
     public List<FieldsDto> findExaminationFields(Long schoolId) {
-        BasicExamRule basicExamRule = basicExamRuleService.getBySchoolId(schoolId);
+        BasicExamRule basicExamRule = basicExamRuleService.getBySchoolId();
         if (basicExamRule == null){
             throw ExceptionResultEnum.ERROR.exception("找不到该学校考务字段信息 + schoolId" + schoolId);
         }
@@ -124,7 +126,7 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
     @Transactional(rollbackFor = Exception.class)
     @Override
     public boolean downLoadExaminationTemplate(Long schoolId) {
-        BasicExamRule basicExamRule = basicExamRuleService.getBySchoolId(schoolId);
+        BasicExamRule basicExamRule = basicExamRuleService.getBySchoolId();
         if (basicExamRule == null){
             throw ExceptionResultEnum.ERROR.exception("找不到该学校考务字段信息 + schoolId" + schoolId);
         }

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

@@ -12,6 +12,7 @@ import com.qmth.distributed.print.business.entity.ExamTaskDetail;
 import com.qmth.distributed.print.business.mapper.ExamTaskDetailMapper;
 import com.qmth.distributed.print.business.service.ExamTaskDetailService;
 import com.qmth.distributed.print.business.service.ExamTaskService;
+import com.qmth.distributed.print.business.util.ServletUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -58,7 +59,8 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
     }
 
     @Override
-    public IPage<ExamTaskDetailDto> list(Long schoolId, String relateType, Long printPlanId, String courseCode, String paperNumber, Integer pageNumber, Integer pageSize) {
+    public IPage<ExamTaskDetailDto> list(String relateType, Long printPlanId, String courseCode, String paperNumber, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<ExamTaskDetailDto> page = new Page<>(pageNumber, pageSize);
         IPage<ExamTaskDetailDto> examDetailDtoIPage = this.baseMapper.listPage(page, schoolId, relateType, printPlanId, courseCode, paperNumber);
         return examDetailDtoIPage;

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.ApiUser;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
 import com.qmth.distributed.print.business.entity.*;
@@ -13,6 +12,7 @@ import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.distributed.print.business.enums.ReviewStatusEnum;
 import com.qmth.distributed.print.business.mapper.ExamTaskMapper;
 import com.qmth.distributed.print.business.service.*;
+import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,14 +58,16 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public IPage<ExamTaskDto> list(Long schoolId, Boolean enable, String status, Long cardRuleId, String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+    public IPage<ExamTaskDto> list(Boolean enable, String status, Long cardRuleId, String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<ExamTaskDto> page = new Page<>(pageNumber, pageSize);
         IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listPage(page, schoolId, enable, status, cardRuleId, courseCode, paperNumber, startTime, endTime);
         return examTaskDtoIPage;
     }
 
     @Override
-    public List<String> listPaperNumber(Long schoolId, String param) {
+    public List<String> listPaperNumber(String param) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         QueryWrapper<ExamTask> queryWrapper = new QueryWrapper<>();
         List<String> list = new ArrayList<>();
         if (StringUtils.isNotBlank(param)) {
@@ -80,7 +82,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public List<BlurryUserDto> listUser(Long schoolId, String param) {
+    public List<BlurryUserDto> listUser(String param) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         return this.baseMapper.listUser(schoolId, param);
     }
 
@@ -134,6 +137,10 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
     @Override
     public boolean saveExamTask(ExamTask examTask) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        examTask.setSchoolId(schoolId);
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+
         // todo paperNumber生成问题， 必填字段校验
         QueryWrapper<BasicExamRule> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(BasicExamRule::getSchoolId, examTask.getSchoolId());
@@ -141,19 +148,29 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         if (basicExamRule == null) {
             throw ExceptionResultEnum.ERROR.exception("通用规则未设置");
         }
-        examTask.setStatus(ExamStatusEnum.NEW);
+        if (examTask.getUserId() == null) {
+            examTask.setStatus(ExamStatusEnum.NEW);
+        } else {
+            examTask.setStatus(ExamStatusEnum.READY);
+        }
+        examTask.setCreateId(sysUser.getId());
+        examTask.setCreateTime(System.currentTimeMillis());
         examTask.setReview(basicExamRule.getReview());
         return this.save(examTask);
     }
 
     @Override
-    public List<ExamTaskImportDto> importFile(MultipartFile file, String md5, ApiUser apiUser) {
+    public List<ExamTaskImportDto> importFile(MultipartFile file, String md5) {
         // 导入文件
         return null;
     }
 
     @Override
     public boolean saveBatch(ExamTask task) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        task.setSchoolId(schoolId);
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+
         if (StringUtils.isBlank(task.getBatchNo())) {
             throw ExceptionResultEnum.ERROR.exception("batchNo不能为空");
         }
@@ -176,7 +193,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             examTask.setCardRuleId(task.getCardRuleId());
             examTask.setStatus(ExamStatusEnum.NEW);
             examTask.setBatchNo(task.getBatchNo());
-            examTask.setCreateId(task.getCreateId());
+            examTask.setCreateId(sysUser.getId());
             examTask.setCreateTime(System.currentTimeMillis());
             String userId = task.getUsers().stream().map(m -> {
                 if (examTaskTemp.getCourseCode().equals(m.get("courseCode"))) {
@@ -193,7 +210,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public IPage<ExamTaskDto> listTaskApply(Long schoolId, String auditStatus, String reviewStatus, Long cardRuleId, String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+    public IPage<ExamTaskDto> listTaskApply(String auditStatus, String reviewStatus, Long cardRuleId, String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<ExamTaskDto> page = new Page<>(pageNumber, pageSize);
         String[] strings = new String[]{ExamStatusEnum.NEW.name(), ExamStatusEnum.FINISH.name()};
         IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskApply(page, schoolId, auditStatus, reviewStatus, cardRuleId, courseCode, paperNumber, startTime, endTime, strings);
@@ -201,14 +219,16 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public IPage<ExamTaskDto> listTaskReviewUnaudited(Long schoolId, String courseCode, String paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+    public IPage<ExamTaskDto> listTaskReviewUnaudited(String courseCode, String paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<ExamTaskDto> page = new Page<>(pageNumber, pageSize);
         IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskReviewUnaudited(page, schoolId, courseCode, paperNumber, userId, cardRuleId, startTime, endTime);
         return examTaskDtoIPage;
     }
 
     @Override
-    public IPage<ExamTaskDto> listTaskReviewAudited(Long schoolId, String reviewStatus, String courseCode, String paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+    public IPage<ExamTaskDto> listTaskReviewAudited(String reviewStatus, String courseCode, String paperNumber, Long userId, Long cardRuleId, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<ExamTaskDto> page = new Page<>(pageNumber, pageSize);
         IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listTaskReviewAudited(page, schoolId, reviewStatus, courseCode, paperNumber, userId, cardRuleId, startTime, endTime);
         return examTaskDtoIPage;
@@ -217,12 +237,16 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Transactional
     @Override
     public boolean taskReviewSave(ExamTaskReviewLog taskReviewLog) {
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+
+        taskReviewLog.setOperateId(sysUser.getId());
+        taskReviewLog.setOperateTime(System.currentTimeMillis());
         // 审核日志
         examTaskReviewLogService.save(taskReviewLog);
 
         // 更新命题任务状态
         UpdateWrapper<ExamTask> updateWrapper = new UpdateWrapper<>();
-        ExamStatusEnum statusEnum = null;
+        ExamStatusEnum statusEnum;
         if (taskReviewLog.getReviewStatus().name().equals(ReviewStatusEnum.PASS.name())) {
             statusEnum = ExamStatusEnum.FINISH;
         } else {
@@ -235,7 +259,9 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Transactional
     @Override
     public boolean taskReviewSaveBatch(ExamTaskReviewLog taskReviewLog) {
-        ExamStatusEnum statusEnum = null;
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+
+        ExamStatusEnum statusEnum;
         if (taskReviewLog.getReviewStatus().name().equals(ReviewStatusEnum.PASS.name())) {
             statusEnum = ExamStatusEnum.FINISH;
         } else {
@@ -243,6 +269,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         }
         for (Long examTaskId : taskReviewLog.getExamTaskIds()) {
             // 审核日志
+            taskReviewLog.setOperateId(sysUser.getId());
+            taskReviewLog.setOperateTime(System.currentTimeMillis());
             taskReviewLog.setExamTaskId(examTaskId);
             examTaskReviewLogService.save(taskReviewLog);
 
@@ -255,14 +283,16 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public IPage<ExamTaskDetailDto> listTaskPaper(Long schoolId, String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+    public IPage<ExamTaskDetailDto> listTaskPaper(String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<ExamTaskDetailDto> page = new Page<>(pageNumber, pageSize);
         IPage<ExamTaskDetailDto> examTaskDtoIPage = this.baseMapper.listTaskPaper(page, schoolId, courseCode, paperNumber, startTime, endTime);
         return examTaskDtoIPage;
     }
 
     @Override
-    public List<RelatePaperDto> listPaperTypes(Long schoolId, String courseCode) {
+    public List<RelatePaperDto> listPaperTypes(String courseCode) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         List<RelatePaperDto> list = this.baseMapper.listPaperNumbers(schoolId, courseCode);
         for (RelatePaperDto relatePaperDto : list) {
             QueryWrapper<ExamTaskDetail> queryWrapper = new QueryWrapper<>();

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

@@ -6,9 +6,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.OrgDto;
 import com.qmth.distributed.print.business.entity.BasicTemplateOrg;
 import com.qmth.distributed.print.business.entity.SysOrg;
+import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.mapper.SysOrgMapper;
 import com.qmth.distributed.print.business.service.BasicTemplateOrgService;
 import com.qmth.distributed.print.business.service.SysOrgService;
+import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +33,8 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     private BasicTemplateOrgService basicTemplateOrgService;
 
     @Override
-    public List<OrgDto> listOrgTree(Long schoolId) {
+    public List<OrgDto> listOrgTree() {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(SysOrg::getSchoolId, schoolId).orderByAsc(SysOrg::getParentId, SysOrg::getCode);
         List<SysOrg> orgList = this.list(queryWrapper);
@@ -65,31 +68,35 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
 
     @Override
     public boolean saveOrg(SysOrg org) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        org.setSchoolId(schoolId);
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+
         QueryWrapper<SysOrg> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(SysOrg::getSchoolId, org.getSchoolId()).eq(SysOrg::getParentId, org.getParentId()).eq(SysOrg::getCode, org.getCode());
         SysOrg sysOrg = this.getOne(queryWrapper);
 
-        boolean isSuccess;
-
         // 新增
         if (org.getId() == null) {
             if (sysOrg != null) {
                 throw ExceptionResultEnum.ERROR.exception("机构代码已存在");
             }
             org.setId(SystemConstant.getDbUuid());
+            org.setCreateId(sysUser.getId());
+            org.setCreateTime(System.currentTimeMillis());
             org.setCreateTime(System.currentTimeMillis());
-            isSuccess = this.save(org);
+            return this.save(org);
         }
         // 修改
         else {
             if (sysOrg != null && org.getId() != sysOrg.getId()) {
                 throw ExceptionResultEnum.ERROR.exception("机构代码已存在");
             }
+            org.setUpdateId(sysUser.getId());
             org.setUpdateTime(System.currentTimeMillis());
-            isSuccess = this.updateById(org);
+            return this.updateById(org);
         }
 
-        return isSuccess;
     }
 
     @Override

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

@@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.PrivilegeDto;
 import com.qmth.distributed.print.business.entity.SysPrivilege;
 import com.qmth.distributed.print.business.entity.SysRolePrivilege;
+import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.mapper.SysPrivilegeMapper;
 import com.qmth.distributed.print.business.service.SysPrivilegeService;
 import com.qmth.distributed.print.business.service.SysRolePrivilegeService;
+import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,7 +33,7 @@ public class SysPrivilegeServiceImpl extends ServiceImpl<SysPrivilegeMapper, Sys
     private SysRolePrivilegeService sysRolePrivilegeService;
 
     @Override
-    public List<PrivilegeDto> listOrgTree(Long schoolId) {
+    public List<PrivilegeDto> listPrivilegeTree() {
         QueryWrapper<SysPrivilege> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().orderByAsc(SysPrivilege::getParentId, SysPrivilege::getSequence);
         List<SysPrivilege> orgList = this.list(queryWrapper);
@@ -69,8 +71,6 @@ public class SysPrivilegeServiceImpl extends ServiceImpl<SysPrivilegeMapper, Sys
         queryWrapper.lambda().eq(SysPrivilege::getParentId, privilege.getParentId()).eq(SysPrivilege::getName, privilege.getName());
         SysPrivilege sysPrivilege = this.getOne(queryWrapper);
 
-        boolean isSuccess;
-
         // 新增
         if (privilege.getId() == null) {
             if (sysPrivilege != null) {
@@ -78,17 +78,15 @@ public class SysPrivilegeServiceImpl extends ServiceImpl<SysPrivilegeMapper, Sys
             }
             privilege.setId(SystemConstant.getDbUuid());
             privilege.setCreateTime(System.currentTimeMillis());
-            isSuccess = this.save(privilege);
+            return this.save(privilege);
         }
         // 修改
         else {
             if (sysPrivilege != null && !Objects.equals(privilege.getId(), sysPrivilege.getId())) {
                 throw ExceptionResultEnum.ERROR.exception("名称已存在");
             }
-            isSuccess = this.updateById(privilege);
+            return this.updateById(privilege);
         }
-
-        return isSuccess;
     }
 
     @Override

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

@@ -5,17 +5,17 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.RoleParam;
 import com.qmth.distributed.print.business.entity.SysRole;
+import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.entity.SysUserRole;
+import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import com.qmth.distributed.print.business.mapper.SysRoleMapper;
-import com.qmth.distributed.print.business.service.SysRoleCourseService;
 import com.qmth.distributed.print.business.service.SysRolePrivilegeService;
 import com.qmth.distributed.print.business.service.SysRoleService;
 import com.qmth.distributed.print.business.service.SysUserRoleService;
+import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,11 +41,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Autowired
     private SysRolePrivilegeService sysRolePrivilegeService;
 
-    @Autowired
-    private SysRoleCourseService sysRoleCourseService;
-
     @Override
-    public IPage<SysRole> list(Long schoolId, String name, Boolean enable, Integer pageNumber, Integer pageSize) {
+    public IPage<SysRole> list(String name, Boolean enable, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<SysRole> page = new Page<>(pageNumber, pageSize);
         IPage<SysRole> roleIPage = this.baseMapper.listPage(page, schoolId, name, enable);
         return roleIPage;
@@ -54,6 +52,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     @Transactional
     @Override
     public boolean saveRole(SysRole role) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        role.setSchoolId(schoolId);
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+
         QueryWrapper<SysRole> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(SysRole::getSchoolId, role.getSchoolId()).eq(SysRole::getName, role.getName());
         SysRole sysRole = this.getOne(queryWrapper);
@@ -64,6 +66,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
                 throw ExceptionResultEnum.ERROR.exception("角色已存在");
             }
             role.setId(SystemConstant.getDbUuid());
+            role.setCreateId(sysUser.getId());
             role.setCreateTime(System.currentTimeMillis());
             isSuccess = this.save(role);
         }
@@ -73,9 +76,10 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
                 throw ExceptionResultEnum.ERROR.exception("角色已存在");
             }
 
+            role.setUpdateId(sysUser.getId());
             role.setUpdateTime(System.currentTimeMillis());
 
-            if(RoleTypeEnum.CUSTOM.equals(role.getType())) {
+            if (RoleTypeEnum.CUSTOM.equals(role.getType())) {
                 //删除权限
                 sysRolePrivilegeService.removeByRoleId(role.getId());
             }
@@ -83,7 +87,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
 
         }
 
-        if(RoleTypeEnum.CUSTOM.equals(role.getType())) {
+        if (RoleTypeEnum.CUSTOM.equals(role.getType())) {
             // 新增权限
             sysRolePrivilegeService.saveBatch(role);
         }

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

@@ -13,6 +13,7 @@ import com.qmth.distributed.print.business.bean.params.ArraysParams;
 import com.qmth.distributed.print.business.entity.*;
 import com.qmth.distributed.print.business.mapper.SysUserMapper;
 import com.qmth.distributed.print.business.service.*;
+import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.business.util.security.Md5Utils;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
@@ -59,7 +60,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     SysUserMapper sysUserMapper;
 
     @Override
-    public IPage<UserDto> list(Long schoolId, String realName, String roleId, Boolean enable, Integer pageNumber, Integer pageSize) {
+    public IPage<UserDto> list(String realName, String roleId, Boolean enable, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+
         Page<UserDto> page = new Page<>(pageNumber, pageSize);
         IPage<UserDto> userDtoIPage = this.baseMapper.listPage(page, schoolId, realName, roleId, enable);
         if (userDtoIPage.getRecords().size() > 0) {
@@ -80,6 +83,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Transactional
     @Override
     public boolean saveUser(SysUser user) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        user.setSchoolId(schoolId);
+        SysUser sysUser1 = (SysUser) ServletUtil.getRequestUser();
+
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(SysUser::getLoginName, user.getLoginName());
         SysUser sysUser = this.getOne(queryWrapper);
@@ -92,6 +99,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysConfig sysConfig = sysConfigService.getByKey("sys.user.initPassword");
             user.setPassword(Md5Utils.toMd5Hex(StringUtils.isNoneBlank(sysConfig.getConfigValue()) ? sysConfig.getConfigValue() : "123456"));
             user.setId(SystemConstant.getDbUuid());
+            user.setCreateId(sysUser1.getId());
             user.setCreateTime(System.currentTimeMillis());
             isSuccess = this.save(user);
         }
@@ -103,6 +111,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             sysUser.setRealName(user.getRealName());
             sysUser.setMobileNumber(user.getMobileNumber());
             sysUser.setOrgId(user.getOrgId());
+            sysUser.setUpdateId(sysUser1.getId());
             sysUser.setUpdateTime(System.currentTimeMillis());
             isSuccess = this.updateById(sysUser);
 
@@ -230,7 +239,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public List<BlurryUserDto> listUser(Long schoolId, String courseCode, String param) {
+    public List<BlurryUserDto> listUser(String courseCode, String param) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         return this.baseMapper.listUser(schoolId, RoleTypeEnum.QUESTION_TEACHER.name(), courseCode, param);
     }
 }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/RequestUtils.java

@@ -1,123 +0,0 @@
-package com.qmth.distributed.print.business.util;
-
-import com.qmth.distributed.print.business.bean.ApiUser;
-import com.qmth.distributed.print.business.entity.SysUser;
-
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-
-/**
- * request临时参数存取
- */
-public class RequestUtils {
-
-    private static final String REQUEST_API_USER_KEY = "api_user";
-
-    private static final String REQUEST_OPERATION_LOG_KEY = "operation_log";
-
-
-    public static ApiUser getApiUser(HttpServletRequest request) {
-        Object obj = request.getAttribute(REQUEST_API_USER_KEY);
-        if (obj != null && obj instanceof ApiUser) {
-            return (ApiUser) obj;
-        } else {
-            SysUser sysUser = new SysUser();
-            sysUser.setId(1L);
-            sysUser.setSchoolId(101L);
-            ApiUser apiUser = new ApiUser(sysUser);
-            return apiUser;
-//            return null;
-        }
-    }
-
-    public static void setApiUser(HttpServletRequest request, ApiUser user) {
-        request.setAttribute(REQUEST_API_USER_KEY, user);
-    }
-
-    /**
-     * 设置 Cookie
-     *
-     * @param name   名称
-     * @param value  值
-     * @param maxAge 生存时间（单位秒）
-     */
-    public static void setCookie(HttpServletResponse response, String name, String value, int maxAge) {
-        Cookie cookie = new Cookie(name, null);
-        cookie.setPath("/");
-        cookie.setMaxAge(maxAge);
-        try {
-            cookie.setValue(URLEncoder.encode(value, "utf-8"));
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        response.addCookie(cookie);
-    }
-
-    /**
-     * 获得指定Cookie的值
-     *
-     * @param name 名称
-     * @return 值
-     */
-    public static String getCookie(HttpServletRequest request, String name) {
-        return getCookie(request, null, name, false);
-    }
-
-    /**
-     * 获得指定Cookie的值，并删除。
-     *
-     * @param name 名称
-     * @return 值
-     */
-    public static String getCookie(HttpServletRequest request, HttpServletResponse response, String name) {
-        return getCookie(request, response, name, true);
-    }
-
-    /**
-     * 获得指定Cookie的值
-     *
-     * @param request  请求对象
-     * @param response 响应对象
-     * @param name     名字
-     * @param isRemove 是否移除
-     * @return 值
-     */
-    public static String getCookie(HttpServletRequest request, HttpServletResponse response, String name,
-                                   boolean isRemove) {
-        String value = null;
-        Cookie[] cookies = request.getCookies();
-        if (cookies != null) {
-            for (Cookie cookie : cookies) {
-                if (cookie.getName().equals(name)) {
-                    try {
-                        value = URLDecoder.decode(cookie.getValue(), "utf-8");
-                    } catch (UnsupportedEncodingException e) {
-                        e.printStackTrace();
-                    }
-                    if (isRemove) {
-                        cookie.setMaxAge(0);
-                        response.addCookie(cookie);
-                    }
-                }
-            }
-        }
-        return value;
-    }
-
-    public static String getLog(HttpServletRequest request) {
-        Object obj = request.getAttribute(REQUEST_OPERATION_LOG_KEY);
-        if (obj != null && obj instanceof String) {
-            return (String) obj;
-        } else {
-            return "";
-        }
-    }
-
-    public static void setLog(HttpServletRequest request, String content) {
-        request.setAttribute(REQUEST_OPERATION_LOG_KEY, content);
-    }
-}

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

@@ -53,6 +53,7 @@
                 LEFT JOIN
             sys_user g ON a.create_id = g.id
         <where>
+            a.make_method = 'CUST'
             <if test="status != null and status != ''">
                 and a.status = #{status}
             </if>
@@ -76,4 +77,7 @@
             </if>
         </where>
     </select>
+    <select id="getCardDetail" resultType="com.qmth.distributed.print.business.bean.dto.CardDetailDto">
+        select a.id cardId, a.title, a.make_method makeMethod, b.content from exam_card a left join exam_card_detail b on a.id = b.card_id
+    </select>
 </mapper>

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

@@ -4,10 +4,8 @@ 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.ApiUser;
 import com.qmth.distributed.print.business.entity.BasicAttachment;
 import com.qmth.distributed.print.business.service.BasicAttachmentService;
-import com.qmth.distributed.print.business.util.RequestUtils;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
@@ -17,9 +15,6 @@ 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.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
 
 /**
  * <p>
@@ -38,21 +33,6 @@ public class BasicAttachmentController {
     @Autowired
     private BasicAttachmentService basicAttachmentService;
 
-    /**
-     * 文件上传
-     * @param request
-     * @param file
-     * @param md5
-     * @return
-     */
-    @ApiOperation(value = "文件上传")
-    @RequestMapping(value = "/upload1", method = RequestMethod.POST)
-    public Result upload(HttpServletRequest request, MultipartFile file, String md5) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        BasicAttachment attachment = basicAttachmentService.save(file, md5, apiUser.getSchoolId(), apiUser.getUserData().getId());
-        return ResultUtil.ok(attachment);
-    }
-
     /**
      * 文件查询
      * @return

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

@@ -5,11 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.ApiUser;
 import com.qmth.distributed.print.business.bean.dto.CardRuleDto;
 import com.qmth.distributed.print.business.entity.BasicCardRule;
 import com.qmth.distributed.print.business.service.BasicCardRuleService;
-import com.qmth.distributed.print.business.util.RequestUtils;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
@@ -17,7 +15,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -40,7 +37,6 @@ public class BasicCardRuleController {
     /**
      * 查询
      *
-     * @param request
      * @param enable
      * @param name
      * @param createTime
@@ -50,30 +46,25 @@ public class BasicCardRuleController {
      */
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(HttpServletRequest request,
-                       @RequestParam(value = "enable", required = false) Boolean enable,
+    public Result list(@RequestParam(value = "enable", required = false) Boolean enable,
                        @RequestParam(value = "name", required = false) String name,
                        @RequestParam(value = "createTime", required = false) Long createTime,
                        @RequestParam("pageNumber") Integer pageNumber,
                        @RequestParam("pageSize") Integer pageSize) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        IPage<CardRuleDto> cardRuleDtoIPage = basicCardRuleService.list(apiUser.getSchoolId(), enable, name, createTime, pageNumber, pageSize);
+        IPage<CardRuleDto> cardRuleDtoIPage = basicCardRuleService.list(enable, name, createTime, pageNumber, pageSize);
         return ResultUtil.ok(cardRuleDtoIPage);
     }
 
     /**
      * 模糊查询
      *
-     * @param request
      * @param param
      * @return
      */
     @ApiOperation(value = "模糊查询")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
-    public Result list(HttpServletRequest request,
-                       @RequestParam(value = "param", required = false) String param) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        List<BasicCardRule> cardRules = basicCardRuleService.list(apiUser.getSchoolId(), param);
+    public Result list(@RequestParam(value = "param", required = false) String param) {
+        List<BasicCardRule> cardRules = basicCardRuleService.list(param);
         return ResultUtil.ok(cardRules);
     }
 
@@ -93,17 +84,12 @@ public class BasicCardRuleController {
     /**
      * 新增/修改
      *
-     * @param request
      * @param cardRule
      * @return
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(HttpServletRequest request, @RequestBody BasicCardRule cardRule) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        cardRule.setSchoolId(apiUser.getSchoolId());
-        cardRule.setCreateId(cardRule.getId() == null ? apiUser.getUserData().getId() : null);
-        cardRule.setUpdateId(cardRule.getId() != null ? apiUser.getUserData().getId() : null);
+    public Result save(@RequestBody BasicCardRule cardRule) {
         boolean isSuccess = basicCardRuleService.saveCardRule(cardRule);
         return ResultUtil.ok(isSuccess);
     }

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

@@ -5,11 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.ApiUser;
-import com.qmth.distributed.print.business.bean.params.BlurryParam;
 import com.qmth.distributed.print.business.entity.BasicCourse;
 import com.qmth.distributed.print.business.service.BasicCourseService;
-import com.qmth.distributed.print.business.util.RequestUtils;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
@@ -17,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -39,7 +35,6 @@ public class BasicCourseController {
 
     /**
      * 查询
-     * @param request
      * @param code
      * @param name
      * @param pageNumber
@@ -48,13 +43,11 @@ public class BasicCourseController {
      */
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(HttpServletRequest request,
-                       @RequestParam(value = "code", required = false) String code,
+    public Result list(@RequestParam(value = "code", required = false) String code,
                        @RequestParam(value = "name", required = false) String name,
                        @RequestParam Integer pageNumber,
                        @RequestParam Integer pageSize){
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        IPage<BasicCourse> userDtos = basicCourseService.list(apiUser.getSchoolId(), code, name, pageNumber, pageSize);
+        IPage<BasicCourse> userDtos = basicCourseService.list(code, name, pageNumber, pageSize);
         return ResultUtil.ok(userDtos);
     }
 
@@ -65,26 +58,19 @@ public class BasicCourseController {
      */
     @ApiOperation(value = "模糊查询")
     @RequestMapping(value = "/query", method = RequestMethod.POST)
-    public Result query(HttpServletRequest request,
-                        @RequestParam(value = "param", required = false) String param){
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        List<BasicCourse> userDtos = basicCourseService.list(apiUser.getSchoolId(), param);
+    public Result query(@RequestParam(value = "param", required = false) String param){
+        List<BasicCourse> userDtos = basicCourseService.list(param);
         return ResultUtil.ok(userDtos);
     }
 
     /**
      * 新增/修改
-     * @param request
      * @param course
      * @return
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(HttpServletRequest request, @RequestBody BasicCourse course){
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        course.setSchoolId(apiUser.getSchoolId());
-        course.setCreateId(course.getId() == null ? apiUser.getSchoolId() : null);
-        course.setUpdateId(course.getId() != null ? apiUser.getSchoolId() : null);
+    public Result save(@RequestBody BasicCourse course){
         boolean isSuccess = basicCourseService.saveCourse(course);
         return ResultUtil.ok(isSuccess);
     }

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

@@ -4,11 +4,8 @@ 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.ApiUser;
 import com.qmth.distributed.print.business.entity.BasicExamRule;
 import com.qmth.distributed.print.business.service.BasicExamRuleService;
-import com.qmth.distributed.print.business.util.RequestUtils;
-import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
@@ -16,12 +13,9 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * <p>
  * 考务规则 前端控制器
@@ -42,31 +36,24 @@ public class BasicExamRuleController {
     /**
      * 查询
      *
-     * @param request
      * @return
      */
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(HttpServletRequest request) {
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        BasicExamRule examRule = basicExamRuleService.getBySchoolId(schoolId);
+    public Result list() {
+        BasicExamRule examRule = basicExamRuleService.getBySchoolId();
         return ResultUtil.ok(examRule);
     }
 
     /**
      * 新增/修改
      *
-     * @param request
      * @param examRule
      * @return
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(HttpServletRequest request, @RequestBody BasicExamRule examRule) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        examRule.setSchoolId(apiUser.getSchoolId());
-        examRule.setCreateId(examRule.getId() == null ? apiUser.getUserData().getId() : null);
-        examRule.setUpdateId(examRule.getId() != null ? apiUser.getUserData().getId() : null);
+    public Result save(@RequestBody BasicExamRule examRule) {
         boolean isSuccess = basicExamRuleService.saveExamRule(examRule);
         return ResultUtil.ok(isSuccess);
     }

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

@@ -35,9 +35,13 @@ public class BasicSchoolController {
     @Autowired
     private BasicSchoolService basicSchoolService;
 
+    /**
+     * 学校查询
+     * @return
+     */
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(HttpServletRequest request) {
+    public Result list() {
         List<SchoolDto> list = basicSchoolService.listSchool();
         return ResultUtil.ok(list);
     }

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

@@ -5,11 +5,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.ApiUser;
 import com.qmth.distributed.print.business.bean.dto.TemplateDto;
 import com.qmth.distributed.print.business.entity.BasicTemplate;
 import com.qmth.distributed.print.business.service.BasicTemplateService;
-import com.qmth.distributed.print.business.util.RequestUtils;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
@@ -17,8 +15,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * <p>
  * 通用模板 前端控制器
@@ -39,7 +35,6 @@ public class BasicTemplateController {
     /**
      * 查询
      *
-     * @param request
      * @param enable
      * @param type
      * @param name
@@ -51,33 +46,26 @@ public class BasicTemplateController {
      */
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(HttpServletRequest request,
-                       @RequestParam(value = "enable",required = false) Boolean enable,
+    public Result list(@RequestParam(value = "enable",required = false) Boolean enable,
                        @RequestParam(value = "type", required = false) String type,
                        @RequestParam(value = "name", required = false) String name,
                        @RequestParam(value = "startTime", required = false) Long startTime,
                        @RequestParam(value = "endTime", required = false) Long endTime,
                        @RequestParam Integer pageNumber,
                        @RequestParam Integer pageSize) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        IPage<TemplateDto> templateDtoIPage = basicTemplateService.list(apiUser.getSchoolId(), enable, type, name, startTime, endTime, pageNumber, pageSize);
+        IPage<TemplateDto> templateDtoIPage = basicTemplateService.list(enable, type, name, startTime, endTime, pageNumber, pageSize);
         return ResultUtil.ok(templateDtoIPage);
     }
 
     /**
      * 新增/修改
      *
-     * @param request
      * @param template
      * @return
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(HttpServletRequest request, @RequestBody BasicTemplate template) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        template.setSchoolId(apiUser.getSchoolId());
-        template.setCreateId(template.getId() == null ? apiUser.getUserData().getId() : null);
-        template.setUpdateId(template.getId() != null ? apiUser.getUserData().getId() : null);
+    public Result save(@RequestBody BasicTemplate template) {
         boolean isSuccess = basicTemplateService.saveTemplate(template);
         return ResultUtil.ok(isSuccess);
     }

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

@@ -6,6 +6,7 @@ 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.dto.CardCustDto;
+import com.qmth.distributed.print.business.bean.dto.CardDetailDto;
 import com.qmth.distributed.print.business.bean.params.ExamCardParams;
 import com.qmth.distributed.print.business.service.ExamCardService;
 import com.qmth.distributed.print.common.util.Result;
@@ -85,5 +86,16 @@ public class ExamCardController {
         return ResultUtil.ok(cardCustDtoIPage);
     }
 
-}
+    /**
+     * 根据ID获取题卡详情
+     * @param cardId
+     * @return
+     */
+    @ApiOperation(value = "根据ID获取题卡详情")
+    @RequestMapping(value = "/get_one", method = RequestMethod.POST)
+     public Result getOne(@RequestParam("cardId") Long cardId){
+         CardDetailDto cardDetailDto = examCardService.getCardDetail(cardId);
+         return ResultUtil.ok(cardDetailDto);
+     }
 
+}

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.ApiUser;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskDetailDto;
 import com.qmth.distributed.print.business.bean.dto.RelatePaperDto;
 import com.qmth.distributed.print.business.bean.params.DeleteParams;
@@ -16,7 +15,6 @@ import com.qmth.distributed.print.business.service.ExamDetailService;
 import com.qmth.distributed.print.business.service.ExamPrintPlanService;
 import com.qmth.distributed.print.business.service.ExamTaskDetailService;
 import com.qmth.distributed.print.business.service.ExamTaskService;
-import com.qmth.distributed.print.business.util.RequestUtils;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
@@ -109,7 +107,6 @@ public class ExamPrintPlanController {
     /**
      * 关联试卷管理-查询
      *
-     * @param request
      * @param relateType
      * @param printPlanId
      * @param courseCode
@@ -120,15 +117,13 @@ public class ExamPrintPlanController {
      */
     @ApiOperation(value = "关联试卷管理-查询")
     @RequestMapping(value = "/relate_list", method = RequestMethod.POST)
-    public Result relateList(HttpServletRequest request,
-                             @RequestParam String relateType,
+    public Result relateList(@RequestParam String relateType,
                              @RequestParam Long printPlanId,
                              @RequestParam String courseCode,
                              @RequestParam String paperNumber,
                              @RequestParam Integer pageNumber,
                              @RequestParam Integer pageSize) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        IPage<ExamTaskDetailDto> examTasks = examTaskDetailService.list(apiUser.getSchoolId(), relateType, printPlanId, courseCode, paperNumber, pageNumber, pageSize);
+        IPage<ExamTaskDetailDto> examTasks = examTaskDetailService.list(relateType, printPlanId, courseCode, paperNumber, pageNumber, pageSize);
         return ResultUtil.ok(examTasks);
     }
 
@@ -148,21 +143,18 @@ public class ExamPrintPlanController {
     /**
      * 查询所有试卷编号/关联卷型
      *
-     * @param request
      * @param courseCode
      * @return
      */
     @RequestMapping(value = "/relate_get_paper_numbers", method = RequestMethod.POST)
-    public Result relateGetPaperNumbers(HttpServletRequest request, @RequestParam(value = "courseCode", required = true) String courseCode) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        List<RelatePaperDto> list = examTaskService.listPaperTypes(apiUser.getSchoolId(), courseCode);
+    public Result relateGetPaperNumbers(@RequestParam(value = "courseCode", required = true) String courseCode) {
+        List<RelatePaperDto> list = examTaskService.listPaperTypes(courseCode);
         return ResultUtil.ok(list);
     }
 
     /**
      * 印刷任务管理-查询
      *
-     * @param request
      * @param printPlanName
      * @param status
      * @param courseCode
@@ -176,8 +168,7 @@ public class ExamPrintPlanController {
      */
     @ApiOperation(value = "印刷任务管理-查询")
     @RequestMapping(value = "/task_list", method = RequestMethod.POST)
-    public Result taskList(HttpServletRequest request,
-                           @RequestParam String printPlanName,
+    public Result taskList(@RequestParam String printPlanName,
                            @RequestParam String status,
                            @RequestParam String courseCode,
                            @RequestParam String paperNumber,
@@ -186,39 +177,35 @@ public class ExamPrintPlanController {
                            @RequestParam Long examEndTime,
                            @RequestParam Integer pageNumber,
                            @RequestParam Integer pageSize) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        IPage<ExamTaskDetailDto> examTasks = examDetailService.listPrintTask(apiUser.getSchoolId(), printPlanName, status, courseCode, paperNumber, examPlace, examStartTime, examEndTime, pageNumber, pageSize);
+        IPage<ExamTaskDetailDto> examTasks = examDetailService.listPrintTask(printPlanName, status, courseCode, paperNumber, examPlace, examStartTime, examEndTime, pageNumber, pageSize);
         return ResultUtil.ok(examTasks);
     }
 
     /**
-     * @param request
      * @param examPrintPlan
      * @return
      */
     @ApiOperation(value = "印刷任务管理-提交印刷")
     @RequestMapping(value = "/task_submit", method = RequestMethod.POST)
-    public Result taskSubmit(HttpServletRequest request,
-                             @RequestBody ExamPrintPlan examPrintPlan) {
+    public Result taskSubmit(@RequestBody ExamPrintPlan examPrintPlan) {
         boolean isSuccess = examPrintPlanService.submitTask(examPrintPlan);
         return ResultUtil.ok(isSuccess);
     }
 
     /**
-     * @param request
      * @param examPrintPlan
      * @return
      */
     @ApiOperation(value = "印刷任务管理-撤回提交")
     @RequestMapping(value = "/task_cancel", method = RequestMethod.POST)
-    public Result taskCancel(HttpServletRequest request,
-                             @RequestBody ExamPrintPlan examPrintPlan) {
+    public Result taskCancel(@RequestBody ExamPrintPlan examPrintPlan) {
         boolean isSuccess = examPrintPlanService.taskCancel(examPrintPlan);
         return ResultUtil.ok(isSuccess);
     }
 
     /**
      * 印刷任务管理-汇总数据查询
+     *
      * @param request
      * @param printPlanName
      * @param status
@@ -245,6 +232,7 @@ public class ExamPrintPlanController {
 
     /**
      * 印刷任务管理-查看PDF
+     *
      * @param request
      * @param id
      * @return
@@ -252,7 +240,7 @@ public class ExamPrintPlanController {
     @ApiOperation(value = "印刷任务管理-查看PDF")
     @RequestMapping(value = "/task_view_pdf", method = RequestMethod.POST)
     public Result taskViewPDF(HttpServletRequest request,
-                                @RequestParam Long id) {
+                              @RequestParam Long id) {
         String path = examDetailService.taskViewPDF(id);
         return ResultUtil.ok(path);
     }

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.ApiUser;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.entity.ExamTaskDetail;
@@ -13,7 +12,6 @@ import com.qmth.distributed.print.business.entity.ExamTaskReviewLog;
 import com.qmth.distributed.print.business.service.ExamTaskDetailService;
 import com.qmth.distributed.print.business.service.ExamTaskReviewLogService;
 import com.qmth.distributed.print.business.service.ExamTaskService;
-import com.qmth.distributed.print.business.util.RequestUtils;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
@@ -51,7 +49,6 @@ public class ExamTaskController {
     /**
      * 查询
      *
-     * @param request
      * @param enable
      * @param status
      * @param cardRuleId
@@ -65,8 +62,7 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(HttpServletRequest request,
-                       @RequestParam(required = false) Boolean enable,
+    public Result list(@RequestParam(required = false) Boolean enable,
                        @RequestParam(required = false) String status,
                        @RequestParam(required = false) Long cardRuleId,
                        @RequestParam(required = false) String courseCode,
@@ -75,8 +71,7 @@ public class ExamTaskController {
                        @RequestParam(required = false) Long endTime,
                        @RequestParam Integer pageNumber,
                        @RequestParam Integer pageSize) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        IPage<ExamTaskDto> examTasks = examTaskService.list(apiUser.getSchoolId(), enable, status, cardRuleId, courseCode, paperNumber, startTime, endTime, pageNumber, pageSize);
+        IPage<ExamTaskDto> examTasks = examTaskService.list(enable, status, cardRuleId, courseCode, paperNumber, startTime, endTime, pageNumber, pageSize);
         return ResultUtil.ok(examTasks);
     }
 
@@ -88,10 +83,8 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "试卷编号模糊查询")
     @RequestMapping(value = "/paper_number_query", method = RequestMethod.POST)
-    public Result paperNumberQuery(HttpServletRequest request,
-                                   @RequestParam(value = "param", required = false) String param) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        List<String> list = examTaskService.listPaperNumber(apiUser.getSchoolId(), param);
+    public Result paperNumberQuery(@RequestParam(value = "param", required = false) String param) {
+        List<String> list = examTaskService.listPaperNumber(param);
         return ResultUtil.ok(list);
     }
 
@@ -103,23 +96,20 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "命题老师模糊查询")
     @RequestMapping(value = "/user_query", method = RequestMethod.POST)
-    public Result userQuery(HttpServletRequest request,
-                            @RequestParam(value = "param", required = false) String param) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        List<BlurryUserDto> list = examTaskService.listUser(apiUser.getSchoolId(), param);
+    public Result userQuery(@RequestParam(value = "param", required = false) String param) {
+        List<BlurryUserDto> list = examTaskService.listUser(param);
         return ResultUtil.ok(list);
     }
 
     /**
      * 更改/指派命题老师
      *
-     * @param request
      * @param examTask
      * @return
      */
     @ApiOperation(value = "更改/指派命题老师")
     @RequestMapping(value = "/assign_user", method = RequestMethod.POST)
-    public Result assignUser(HttpServletRequest request, @RequestBody ExamTask examTask) {
+    public Result assignUser(@RequestBody ExamTask examTask) {
         boolean isSuccess = examTaskService.assignUser(examTask);
         return ResultUtil.ok(isSuccess);
     }
@@ -127,13 +117,12 @@ public class ExamTaskController {
     /**
      * 启用/禁用
      *
-     * @param request
      * @param examTask
      * @return
      */
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    public Result enable(HttpServletRequest request, @RequestBody ExamTask examTask) {
+    public Result enable(@RequestBody ExamTask examTask) {
         boolean isSuccess = examTaskService.enable(examTask);
         return ResultUtil.ok(isSuccess);
     }
@@ -141,17 +130,12 @@ public class ExamTaskController {
     /**
      * 新建
      *
-     * @param request
      * @param examTask
      * @return
      */
     @ApiOperation(value = "新建")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(HttpServletRequest request, @RequestBody ExamTask examTask) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        examTask.setSchoolId(apiUser.getSchoolId());
-        examTask.setCreateId(apiUser.getUserData().getId());
-        examTask.setCreateTime(System.currentTimeMillis());
+    public Result save(@RequestBody ExamTask examTask) {
         boolean isSuccess = examTaskService.saveExamTask(examTask);
         return ResultUtil.ok(isSuccess);
     }
@@ -159,32 +143,26 @@ public class ExamTaskController {
     /**
      * 文件导入
      *
-     * @param request
      * @param file
      * @param md5
      * @return
      */
     @ApiOperation(value = "文件导入")
     @RequestMapping(value = "/import", method = RequestMethod.POST)
-    public Result importFile(HttpServletRequest request, MultipartFile file, String md5) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        List<ExamTaskImportDto> list = examTaskService.importFile(file, md5, apiUser);
+    public Result importFile(MultipartFile file, String md5) {
+        List<ExamTaskImportDto> list = examTaskService.importFile(file, md5);
         return ResultUtil.ok(list);
     }
 
     /**
      * 批量保存
      *
-     * @param request
      * @param task
      * @return
      */
     @ApiOperation(value = "批量保存")
     @RequestMapping(value = "/save_batch", method = RequestMethod.POST)
-    public Result saveBatch(HttpServletRequest request, ExamTask task) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        task.setSchoolId(apiUser.getSchoolId());
-        task.setCreateId(apiUser.getUserData().getId());
+    public Result saveBatch(ExamTask task) {
         boolean isSuccess = examTaskService.saveBatch(task);
         return ResultUtil.ok(isSuccess);
     }
@@ -208,7 +186,6 @@ public class ExamTaskController {
     /**
      * 入库申请查询
      *
-     * @param request
      * @param auditStatus
      * @param reviewStatus
      * @param cardRuleId
@@ -222,8 +199,7 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "入库申请查询")
     @RequestMapping(value = "/apply_list", method = RequestMethod.POST)
-    public Result taskApplyList(HttpServletRequest request,
-                                @RequestParam(value = "auditStatus", required = false) String auditStatus,
+    public Result taskApplyList(@RequestParam(value = "auditStatus", required = false) String auditStatus,
                                 @RequestParam(value = "reviewStatus", required = false) String reviewStatus,
                                 @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
                                 @RequestParam(value = "courseCode", required = false) String courseCode,
@@ -232,8 +208,7 @@ public class ExamTaskController {
                                 @RequestParam(value = "endTime", required = false) Long endTime,
                                 @RequestParam("pageNumber") Integer pageNumber,
                                 @RequestParam("pageSize") Integer pageSize) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        IPage<ExamTaskDto> list = examTaskService.listTaskApply(apiUser.getSchoolId(), auditStatus, reviewStatus, cardRuleId, courseCode, paperNumber, startTime, endTime, pageNumber, pageSize);
+        IPage<ExamTaskDto> list = examTaskService.listTaskApply(auditStatus, reviewStatus, cardRuleId, courseCode, paperNumber, startTime, endTime, pageNumber, pageSize);
         return ResultUtil.ok(list);
     }
 
@@ -281,7 +256,6 @@ public class ExamTaskController {
     /**
      * 入库审核查询-未审核
      *
-     * @param request
      * @param courseCode
      * @param paperNumber
      * @param userId
@@ -294,8 +268,7 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "入库审核查询-未审核")
     @RequestMapping(value = "/review_list_unaudited", method = RequestMethod.POST)
-    public Result taskReviewListUnaudited(HttpServletRequest request,
-                                          @RequestParam(value = "courseCode", required = false) String courseCode,
+    public Result taskReviewListUnaudited(@RequestParam(value = "courseCode", required = false) String courseCode,
                                           @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                           @RequestParam(value = "userId", required = false) Long userId,
                                           @RequestParam(value = "cardRuleId", required = false) Long cardRuleId,
@@ -303,15 +276,13 @@ public class ExamTaskController {
                                           @RequestParam(value = "endTime", required = false) Long endTime,
                                           @RequestParam("pageNumber") Integer pageNumber,
                                           @RequestParam("pageSize") Integer pageSize) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        IPage<ExamTaskDto> examTaskDtoIPage = examTaskService.listTaskReviewUnaudited(apiUser.getSchoolId(), courseCode, paperNumber, userId, cardRuleId, startTime, endTime, pageNumber, pageSize);
+        IPage<ExamTaskDto> examTaskDtoIPage = examTaskService.listTaskReviewUnaudited(courseCode, paperNumber, userId, cardRuleId, startTime, endTime, pageNumber, pageSize);
         return ResultUtil.ok(examTaskDtoIPage);
     }
 
     /**
      * 入库审核查询-未审核
      *
-     * @param request
      * @param courseCode
      * @param paperNumber
      * @param userId
@@ -324,8 +295,7 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "入库审核查询-已审核")
     @RequestMapping(value = "/review_list_audited", method = RequestMethod.POST)
-    public Result taskReviewListAudited(HttpServletRequest request,
-                                        @RequestParam(value = "reviewStatus", required = false) String reviewStatus,
+    public Result taskReviewListAudited(@RequestParam(value = "reviewStatus", required = false) String reviewStatus,
                                         @RequestParam(value = "courseCode", required = false) String courseCode,
                                         @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                         @RequestParam(value = "userId", required = false) Long userId,
@@ -334,25 +304,19 @@ public class ExamTaskController {
                                         @RequestParam(value = "endTime", required = false) Long endTime,
                                         @RequestParam("pageNumber") Integer pageNumber,
                                         @RequestParam("pageSize") Integer pageSize) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        IPage<ExamTaskDto> examTaskDtoIPage = examTaskService.listTaskReviewAudited(apiUser.getSchoolId(), reviewStatus, courseCode, paperNumber, userId, cardRuleId, startTime, endTime, pageNumber, pageSize);
+        IPage<ExamTaskDto> examTaskDtoIPage = examTaskService.listTaskReviewAudited(reviewStatus, courseCode, paperNumber, userId, cardRuleId, startTime, endTime, pageNumber, pageSize);
         return ResultUtil.ok(examTaskDtoIPage);
     }
 
     /**
      * 审核
      *
-     * @param request
      * @param taskReviewLog
      * @return
      */
     @ApiOperation(value = "审核")
     @RequestMapping(value = "/review_save", method = RequestMethod.POST)
-    public Result taskReviewSave(HttpServletRequest request,
-                                 @RequestBody ExamTaskReviewLog taskReviewLog) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        taskReviewLog.setOperateId(apiUser.getUserData().getId());
-        taskReviewLog.setOperateTime(System.currentTimeMillis());
+    public Result taskReviewSave(@RequestBody ExamTaskReviewLog taskReviewLog) {
         boolean isSuccess = examTaskService.taskReviewSave(taskReviewLog);
         return ResultUtil.ok(isSuccess);
     }
@@ -368,9 +332,6 @@ public class ExamTaskController {
     @RequestMapping(value = "/review_save_batch", method = RequestMethod.POST)
     public Result taskReviewSaveBatch(HttpServletRequest request,
                                       @RequestBody ExamTaskReviewLog taskReviewLog) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        taskReviewLog.setOperateId(apiUser.getUserData().getId());
-        taskReviewLog.setOperateTime(System.currentTimeMillis());
         boolean isSuccess = examTaskService.taskReviewSaveBatch(taskReviewLog);
         return ResultUtil.ok(isSuccess);
     }
@@ -387,7 +348,6 @@ public class ExamTaskController {
     /**
      * 卷库查询
      *
-     * @param request
      * @param courseCode
      * @param paperNumber
      * @param startTime
@@ -398,15 +358,13 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "卷库查询")
     @RequestMapping(value = "/paper_list", method = RequestMethod.POST)
-    public Result taskPaperList(HttpServletRequest request,
-                                @RequestParam(value = "courseCode", required = false) String courseCode,
+    public Result taskPaperList(@RequestParam(value = "courseCode", required = false) String courseCode,
                                 @RequestParam(value = "paperNumber", required = false) String paperNumber,
                                 @RequestParam(value = "startTime", required = false) Long startTime,
                                 @RequestParam(value = "endTime", required = false) Long endTime,
                                 @RequestParam("pageNumber") Integer pageNumber,
                                 @RequestParam("pageSize") Integer pageSize) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        IPage<ExamTaskDetailDto> examTaskDtoIPage = examTaskService.listTaskPaper(apiUser.getSchoolId(), courseCode, paperNumber, startTime, endTime, pageNumber, pageSize);
+        IPage<ExamTaskDetailDto> examTaskDtoIPage = examTaskService.listTaskPaper(courseCode, paperNumber, startTime, endTime, pageNumber, pageSize);
         return ResultUtil.ok(examTaskDtoIPage);
     }
 

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

@@ -62,9 +62,6 @@ public class SysController {
     @Autowired
     private BasicVerifyCodeService basicVerifyCodeService;
 
-    @Autowired
-    private SysConfigService sysConfigService;
-
     @Autowired
     private DictionaryConfig dictionaryConfig;
 

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

@@ -4,11 +4,9 @@ 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.ApiUser;
 import com.qmth.distributed.print.business.bean.dto.OrgDto;
 import com.qmth.distributed.print.business.entity.SysOrg;
 import com.qmth.distributed.print.business.service.SysOrgService;
-import com.qmth.distributed.print.business.util.RequestUtils;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
@@ -19,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -41,30 +38,23 @@ public class SysOrgController {
 
     /**
      * 查询机构树
-     * @param request
      * @return
      */
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(HttpServletRequest request) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        List<OrgDto> orgDtoList = sysOrgService.listOrgTree(apiUser.getSchoolId());
+    public Result list() {
+        List<OrgDto> orgDtoList = sysOrgService.listOrgTree();
         return ResultUtil.ok(orgDtoList);
     }
 
     /**
      * 新增/修改
-     * @param request
      * @param org
      * @return
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(HttpServletRequest request, @RequestBody SysOrg org) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        org.setSchoolId(apiUser.getSchoolId());
-        org.setCreateId(org.getId() == null ? apiUser.getUserData().getId() : null);
-        org.setUpdateId(org.getId() != null ? apiUser.getUserData().getId() : null);
+    public Result save(@RequestBody SysOrg org) {
         boolean isSuccess = sysOrgService.saveOrg(org);
         return ResultUtil.ok(isSuccess);
     }

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

@@ -4,11 +4,9 @@ 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.ApiUser;
 import com.qmth.distributed.print.business.bean.dto.PrivilegeDto;
 import com.qmth.distributed.print.business.entity.SysPrivilege;
 import com.qmth.distributed.print.business.service.SysPrivilegeService;
-import com.qmth.distributed.print.business.util.RequestUtils;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
@@ -16,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -39,28 +36,24 @@ public class SysPrivilegeController {
     /**
      * 查询
      *
-     * @param request
      * @return
      */
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(HttpServletRequest request) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        List<PrivilegeDto> privilegeDtoList = sysPrivilegeService.listOrgTree(apiUser.getSchoolId());
+    public Result list() {
+        List<PrivilegeDto> privilegeDtoList = sysPrivilegeService.listPrivilegeTree();
         return ResultUtil.ok(privilegeDtoList);
     }
 
     /**
      * 新增/修改
      *
-     * @param request
      * @param privilege
      * @return
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(HttpServletRequest request, @RequestBody SysPrivilege privilege) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
+    public Result save( @RequestBody SysPrivilege privilege) {
         boolean isSuccess = sysPrivilegeService.savePrivilege(privilege);
         return ResultUtil.ok(isSuccess);
     }

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

@@ -5,10 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.ApiUser;
 import com.qmth.distributed.print.business.entity.SysRole;
 import com.qmth.distributed.print.business.service.SysRoleService;
-import com.qmth.distributed.print.business.util.RequestUtils;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
@@ -16,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
@@ -39,7 +36,6 @@ public class SysRoleController {
     /**
      * 查询
      *
-     * @param request
      * @param name
      * @param enable
      * @param pageNumber
@@ -48,30 +44,23 @@ public class SysRoleController {
      */
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(HttpServletRequest request,
-                       @RequestParam(value = "name", required = false) String name,
+    public Result list(@RequestParam(value = "name", required = false) String name,
                        @RequestParam(value = "enable", required = false) Boolean enable,
                        @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
                        @RequestParam(value = "pageSize", required = true) Integer pageSize) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        IPage<SysRole> userDtos = sysRoleService.list(apiUser.getSchoolId(), name, enable, pageNumber, pageSize);
+        IPage<SysRole> userDtos = sysRoleService.list(name, enable, pageNumber, pageSize);
         return ResultUtil.ok(userDtos);
     }
 
     /**
      * 新增/修改
      *
-     * @param request
      * @param role
      * @return
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(HttpServletRequest request, @RequestBody SysRole role) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        role.setSchoolId(apiUser.getSchoolId());
-        role.setCreateId(role.getId() == null ? apiUser.getUserData().getId() : null);
-        role.setUpdateId(role.getId() != null ? apiUser.getUserData().getId() : null);
+    public Result save(@RequestBody SysRole role) {
         boolean isSuccess = sysRoleService.saveRole(role);
         return ResultUtil.ok(isSuccess);
     }
@@ -92,13 +81,12 @@ public class SysRoleController {
     /**
      * 删除
      *
-     * @param request
      * @param id
      * @return
      */
     @ApiOperation(value = "删除")
     @RequestMapping(value = "/remove", method = RequestMethod.POST)
-    public Result remove(HttpServletRequest request, Long id) {
+    public Result remove(Long id) {
         boolean isSuccess = sysRoleService.remove(id);
         return ResultUtil.ok(isSuccess);
     }
@@ -106,14 +94,12 @@ public class SysRoleController {
     /**
      * 用户已绑定角色列表
      *
-     * @param request
      * @param userId
      * @return
      */
     @ApiOperation(value = "用户已绑定角色列表")
     @RequestMapping(value = "/get_user_roles", method = RequestMethod.POST)
-    public Result getUserRoles(HttpServletRequest request,
-                               @RequestParam(value = "userId", required = true) Long userId) {
+    public Result getUserRoles(@RequestParam(value = "userId", required = true) Long userId) {
         List<Long> list = sysRoleService.getUserRoles(userId);
         return ResultUtil.ok(list);
     }

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

@@ -5,7 +5,6 @@ import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
-import com.qmth.distributed.print.business.bean.ApiUser;
 import com.qmth.distributed.print.business.bean.dto.BlurryUserDto;
 import com.qmth.distributed.print.business.bean.dto.UserDto;
 import com.qmth.distributed.print.business.bean.dto.excel.UserExportDto;
@@ -22,7 +21,6 @@ import com.qmth.distributed.print.business.service.TBTaskService;
 import com.qmth.distributed.print.business.templete.execute.AsyncUserImportTempleteService;
 import com.qmth.distributed.print.business.templete.execute.UserImportTempleteService;
 import com.qmth.distributed.print.business.util.ExcelUtil;
-import com.qmth.distributed.print.business.util.RequestUtils;
 import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
@@ -38,7 +36,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
 import javax.validation.Valid;
 import java.io.IOException;
 import java.util.Collections;
@@ -78,7 +75,7 @@ public class SysUserController {
 
     /**
      * 查询
-     * @param request
+     *
      * @param realName
      * @param roleId
      * @param enable
@@ -86,96 +83,92 @@ public class SysUserController {
      */
     @ApiOperation(value = "查询")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public Result list(HttpServletRequest request,
-                       @RequestParam(value = "realName", required = false) String realName,
+    public Result list(@RequestParam(value = "realName", required = false) String realName,
                        @RequestParam(value = "roleId", required = false) String roleId,
                        @RequestParam(value = "enable", required = false) Boolean enable,
                        @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
-                       @RequestParam(value = "pageSize", required = true) Integer pageSize){
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        IPage<UserDto> userDtos = sysUserService.list(apiUser.getSchoolId(), realName, roleId, enable, pageNumber, pageSize);
+                       @RequestParam(value = "pageSize", required = true) Integer pageSize) {
+        IPage<UserDto> userDtos = sysUserService.list(realName, roleId, enable, pageNumber, pageSize);
         return ResultUtil.ok(userDtos);
     }
 
     /**
      * 根据科目查询命题老师
-     * @param request
+     *
      * @param courseCode
      * @param param
      * @return
      */
     @ApiOperation(value = "根据科目查询命题老师")
     @RequestMapping(value = "/user_list", method = RequestMethod.POST)
-    public Result userQuery(HttpServletRequest request,
-                            @RequestParam(value = "courseCode", required = false) String courseCode,
+    public Result userQuery(@RequestParam(value = "courseCode", required = false) String courseCode,
                             @RequestParam(value = "param", required = false) String param) {
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        List<BlurryUserDto> list = sysUserService.listUser(apiUser.getSchoolId(),courseCode, param);
+        List<BlurryUserDto> list = sysUserService.listUser(courseCode, param);
         return ResultUtil.ok(list);
     }
 
     /**
      * 新增/修改
+     *
      * @param user
      * @return
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(HttpServletRequest request, @RequestBody SysUser user){
-        ApiUser apiUser = RequestUtils.getApiUser(request);
-        user.setSchoolId(apiUser.getSchoolId());
-        user.setCreateId(user.getId() == null ? apiUser.getUserData().getId() : null);
-        user.setUpdateId(user.getId() != null ? apiUser.getUserData().getId() : null);
+    public Result save(@RequestBody SysUser user) {
         boolean isSuccess = sysUserService.saveUser(user);
         return ResultUtil.ok(isSuccess);
     }
 
     /**
      * 启用/禁用
+     *
      * @param user
      * @return
      */
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    public Result enable(@RequestBody SysUser user){
+    public Result enable(@RequestBody SysUser user) {
         boolean isSuccess = sysUserService.enable(user);
         return ResultUtil.ok(isSuccess);
     }
 
     /**
      * 重置密码
+     *
      * @param user
      * @return
      */
     @ApiOperation(value = "重置密码")
     @RequestMapping(value = "/reset_password", method = RequestMethod.POST)
-    public Result resetPassword(@RequestBody SysUser user){
+    public Result resetPassword(@RequestBody SysUser user) {
         boolean isSuccess = sysUserService.resetPassword(user.getId());
         return ResultUtil.ok(isSuccess);
     }
 
     /**
      * 修改密码
+     *
      * @return
      */
     @ApiOperation(value = "修改密码")
     @RequestMapping(value = "/update_password", method = RequestMethod.POST)
-    public Result updatePassword(@RequestBody Map<String, Object> user){
-        Long id = Long.valueOf(user.get("id").toString());
-        String oldPassword = user.get("oldPassword").toString();
-        String password = user.get("password").toString();
+    public Result updatePassword(@RequestParam(value = "id") Long id,
+                                 @RequestParam(value = "oldPassword") String oldPassword,
+                                 @RequestParam(value = "password") String password) {
         boolean isSuccess = sysUserService.updatePassword(id, oldPassword, password);
         return ResultUtil.ok(isSuccess);
     }
 
     /**
      * 绑定角色
+     *
      * @param sysUser
      * @return
      */
     @ApiOperation(value = "绑定角色")
     @RequestMapping(value = "/bind_roles", method = RequestMethod.POST)
-    public Result bindRoles(@RequestBody SysUser sysUser){
+    public Result bindRoles(@RequestBody SysUser sysUser) {
         boolean isSuccess = sysUserService.bindRoles(sysUser);
         return ResultUtil.ok(isSuccess);
     }