代码优化GET

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

@@ -18,5 +18,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface BasicCardRuleMapper extends BaseMapper<BasicCardRule> {
 
-    IPage<CardRuleDto> listPage(Page<CardRuleDto> page, @Param("param") CardRuleParam param);
+    IPage<CardRuleDto> listPage(Page<CardRuleDto> page, @Param("schoolId") Long schoolId, @Param("enable") Boolean enable, @Param("name") String name, @Param("createTime") Long createTime);
 }

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

@@ -21,5 +21,5 @@ public interface BasicCourseMapper extends BaseMapper<BasicCourse> {
 
     List<BasicCourse> listCoursesByUserId(Long id);
 
-    IPage<BasicCourse> listPage(Page<BasicCourse> page, @Param("param") CourseParam param);
+    IPage<BasicCourse> listPage(Page<BasicCourse> page, @Param("schoolId") Long schoolId, @Param("code") String code, @Param("name") String name);
 }

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

@@ -18,5 +18,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface BasicTemplateMapper extends BaseMapper<BasicTemplate> {
 
-    IPage<TemplateDto> listPage(Page<TemplateDto> page, @Param("param") TemplateParam param);
+    IPage<TemplateDto> listPage(Page<TemplateDto> page, @Param("schoolId") Long schoolId, @Param("enable") Boolean enable, @Param("type") String type, @Param("name") String name, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
 }

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

@@ -22,7 +22,7 @@ import java.util.List;
  */
 public interface ExamTaskMapper extends BaseMapper<ExamTask> {
 
-    IPage<ExamTaskDto> listPage(Page<ExamTaskDto> page, @Param("param") ExamTaskParam param);
+    IPage<ExamTaskDto> listPage(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("enable") Boolean enable, @Param("status") String status, @Param("cardRuleId") Long cardRuleId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
 
-    List<BlurryUserDto> listUser(@Param("param") BlurryParam param);
+    List<BlurryUserDto> listUser(@Param("schoolId") Long schoolId, @Param("param") String param);
 }

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

@@ -21,5 +21,5 @@ public interface SysRoleMapper extends BaseMapper<SysRole> {
 
     List<SysRole> listRolesByUserId(Long id);
 
-    IPage<SysRole> listPage(Page<SysRole> page, @Param("param") RoleParam param);
+    IPage<SysRole> listPage(Page<SysRole> page, @Param("schoolId") Long schoolId, @Param("name") String name, @Param("enable") Boolean enable);
 }

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

@@ -3,8 +3,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.dto.CardRuleDto;
-import com.qmth.distributed.print.business.bean.query.BlurryParam;
-import com.qmth.distributed.print.business.bean.query.CardRuleParam;
 import com.qmth.distributed.print.business.entity.BasicCardRule;
 
 import java.util.List;
@@ -19,9 +17,9 @@ import java.util.List;
  */
 public interface BasicCardRuleService extends IService<BasicCardRule> {
 
-    IPage<CardRuleDto> list(CardRuleParam param);
+    IPage<CardRuleDto> list(Long schoolId, Boolean enable, String name, Long createTime, Integer pageNumber, Integer pageSize);
 
-    List<BasicCardRule> list(BlurryParam param);
+    List<BasicCardRule> list(Long schoolId, 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(CourseParam param);
+    IPage<BasicCourse> list(Long schoolId, String code, String name, Integer pageNumber, Integer pageSize);
 
-    List<BasicCourse> list(BlurryParam param);
+    List<BasicCourse> list(Long schoolId, String param);
 
     boolean saveCourse(BasicCourse course);
 

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(TemplateParam param);
+    IPage<TemplateDto> list(Long schoolId, 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/ExamTaskReviewLogService.java

@@ -16,5 +16,5 @@ import java.util.List;
  */
 public interface ExamTaskReviewLogService extends IService<ExamTaskReviewLog> {
 
-    List<ReviewLogDto> list(ExamTaskReviewLog reviewLog);
+    List<ReviewLogDto> list(Long examTaskId);
 }

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

@@ -25,11 +25,11 @@ public interface ExamTaskService extends IService<ExamTask> {
 
     List<ExamTask> listByCourseCode(Long schoolId, String code);
 
-    IPage<ExamTaskDto> list(ExamTaskParam param);
+    IPage<ExamTaskDto> list(Long schoolId, Boolean enable, String status, Long cardRuleId, String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize);
 
-    List<String> listPaperNumber(BlurryParam param);
+    List<String> listPaperNumber(Long schoolId, String param);
 
-    List<BlurryUserDto> listUser(BlurryParam param);
+    List<BlurryUserDto> listUser(Long schoolId, String param);
 
     boolean assignUser(ExamTask examTask);
 

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(RoleParam param);
+    IPage<SysRole> list(Long schoolId, String name, Boolean enable, Integer pageNumber, Integer pageSize);
 
     boolean saveRole(SysRole role);
 

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

@@ -6,15 +6,13 @@ 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.CardRuleDto;
-import com.qmth.distributed.print.business.bean.query.BlurryParam;
-import com.qmth.distributed.print.business.bean.query.CardRuleParam;
 import com.qmth.distributed.print.business.entity.BasicCardRule;
 import com.qmth.distributed.print.business.entity.SysOrg;
+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.common.enums.ExceptionResultEnum;
-import com.qmth.distributed.print.business.enums.TemplateTypeEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,10 +34,11 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
     @Autowired
     private BasicTemplateOrgService basicTemplateOrgService;
 
+
     @Override
-    public IPage<CardRuleDto> list(CardRuleParam param) {
-        Page<CardRuleDto> page = new Page<>(param.getPageNumber(), param.getPageSize());
-        IPage<CardRuleDto> cardRuleDtoIPage = this.baseMapper.listPage(page, param);
+    public IPage<CardRuleDto> list(Long schoolId, Boolean enable, String name, Long createTime, Integer pageNumber, Integer pageSize) {
+        Page<CardRuleDto> page = new Page<>(pageNumber, pageSize);
+        IPage<CardRuleDto> cardRuleDtoIPage = this.baseMapper.listPage(page, schoolId, enable, name, createTime);
         if (cardRuleDtoIPage.getRecords().size() > 0) {
             cardRuleDtoIPage.getRecords().forEach(m -> {
                 //查询适用学院
@@ -51,9 +50,9 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
     }
 
     @Override
-    public List<BasicCardRule> list(BlurryParam param) {
+    public List<BasicCardRule> list(Long schoolId, String param) {
         QueryWrapper<BasicCardRule> queryWrapper = new QueryWrapper<>();
-        queryWrapper.lambda().eq(BasicCardRule::getSchoolId, param.getSchoolId()).like(BasicCardRule::getName, param.getParam());
+        queryWrapper.lambda().eq(BasicCardRule::getSchoolId, schoolId).like(BasicCardRule::getName, param);
         return this.list(queryWrapper);
     }
 
@@ -100,4 +99,6 @@ public class BasicCardRuleServiceImpl extends ServiceImpl<BasicCardRuleMapper, B
 
         return isSuccess;
     }
+
+
 }

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

@@ -34,18 +34,18 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
     private ExamTaskService examTaskService;
 
     @Override
-    public IPage<BasicCourse> list(CourseParam param) {
-        Page<BasicCourse> page = new Page<>(param.getPageNumber(), param.getPageSize());
-        IPage<BasicCourse> courseIPage = this.baseMapper.listPage(page, param);
+    public IPage<BasicCourse> list(Long schoolId, String code, String name, Integer pageNumber, Integer pageSize) {
+        Page<BasicCourse> page = new Page<>(pageNumber, pageSize);
+        IPage<BasicCourse> courseIPage = this.baseMapper.listPage(page, schoolId, code, name);
         return courseIPage;
     }
 
     @Override
-    public List<BasicCourse> list(BlurryParam param) {
+    public List<BasicCourse> list(Long schoolId, String param) {
         QueryWrapper<BasicCourse> queryWrapper = new QueryWrapper<>();
-        if (StringUtils.isNotBlank(param.getParam())) {
-            queryWrapper.lambda().eq(BasicCourse::getSchoolId, param.getSchoolId())
-                    .and(i -> i.like(BasicCourse::getCode, param.getParam()).or().like(BasicCourse::getName, param.getParam()));
+        if (StringUtils.isNotBlank(param)) {
+            queryWrapper.lambda().eq(BasicCourse::getSchoolId, schoolId)
+                    .and(i -> i.like(BasicCourse::getCode, param).or().like(BasicCourse::getName, param));
         }
         return this.list(queryWrapper);
     }

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

@@ -34,13 +34,13 @@ public class BasicTemplateServiceImpl extends ServiceImpl<BasicTemplateMapper, B
     private BasicTemplateOrgService basicTemplateOrgService;
 
     @Override
-    public IPage<TemplateDto> list(TemplateParam param) {
-        Page<TemplateDto> page = new Page<>(param.getPageNumber(), param.getPageSize());
-        IPage<TemplateDto> templateDtoIPage = this.baseMapper.listPage(page, param);
+    public IPage<TemplateDto> list(Long schoolId, Boolean enable, String type, String name, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+        Page<TemplateDto> page = new Page<>(pageNumber, pageSize);
+        IPage<TemplateDto> templateDtoIPage = this.baseMapper.listPage(page, schoolId, enable, type, name, startTime, endTime);
         if (templateDtoIPage.getRecords().size() > 0) {
             templateDtoIPage.getRecords().forEach(m -> {
                 //查询适用学院
-                List<SysOrg> sysOrgs = basicTemplateOrgService.listByTypeAndTemplateId(param.getType(), Long.valueOf(m.getId()));
+                List<SysOrg> sysOrgs = basicTemplateOrgService.listByTypeAndTemplateId(type, Long.valueOf(m.getId()));
                 m.setOrgs(sysOrgs);
             });
         }

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

@@ -21,8 +21,8 @@ import java.util.List;
 public class ExamTaskReviewLogServiceImpl extends ServiceImpl<ExamTaskReviewLogMapper, ExamTaskReviewLog> implements ExamTaskReviewLogService {
 
     @Override
-    public List<ReviewLogDto> list(ExamTaskReviewLog reviewLog) {
-        List<ReviewLogDto> list = this.baseMapper.list(reviewLog.getExamTaskId());
+    public List<ReviewLogDto> list(Long examTaskId) {
+        List<ReviewLogDto> list = this.baseMapper.list(examTaskId);
         return list;
     }
 }

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

@@ -10,13 +10,12 @@ import com.qmth.distributed.print.business.bean.dto.BlurryUserDto;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskDto;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskImportDto;
 import com.qmth.distributed.print.business.bean.query.BlurryParam;
-import com.qmth.distributed.print.business.bean.query.ExamTaskParam;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.entity.ExamTaskTemp;
+import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.distributed.print.business.mapper.ExamTaskMapper;
 import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.distributed.print.business.service.ExamTaskTempService;
-import com.qmth.distributed.print.business.enums.ExamStatusEnum;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,19 +48,19 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public IPage<ExamTaskDto> list(ExamTaskParam param) {
-        Page<ExamTaskDto> page = new Page<>(param.getPageNumber(), param.getPageSize());
-        IPage<ExamTaskDto> examTaskDtoIPage = this.baseMapper.listPage(page, param);
+    public IPage<ExamTaskDto> list(Long schoolId, Boolean enable, String status, Long cardRuleId, String courseCode, String paperNumber, Long startTime, Long endTime, Integer pageNumber, Integer pageSize) {
+        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(BlurryParam param) {
+    public List<String> listPaperNumber(Long schoolId, String param) {
         QueryWrapper<ExamTask> queryWrapper = new QueryWrapper<>();
         List<String> list = new ArrayList<>();
-        if (StringUtils.isNotBlank(param.getParam())) {
-            queryWrapper.lambda().eq(ExamTask::getSchoolId, param.getSchoolId())
-                    .and(i -> i.like(ExamTask::getCourseCode, param.getParam()).or().like(ExamTask::getCourseName, param.getParam()));
+        if (StringUtils.isNotBlank(param)) {
+            queryWrapper.lambda().eq(ExamTask::getSchoolId, schoolId)
+                    .and(i -> i.like(ExamTask::getCourseCode, param).or().like(ExamTask::getCourseName, param));
         }
         List<ExamTask> examTasks = this.list(queryWrapper);
         if (examTasks != null && examTasks.size() > 0) {
@@ -71,8 +70,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     }
 
     @Override
-    public List<BlurryUserDto> listUser(BlurryParam param) {
-        return this.baseMapper.listUser(param);
+    public List<BlurryUserDto> listUser(Long schoolId, String param) {
+        return this.baseMapper.listUser(schoolId, param);
     }
 
     @Override
@@ -103,13 +102,13 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 
     @Override
     public boolean saveBatch(ExamTask task) {
-        if(StringUtils.isBlank(task.getBatchNo())){
+        if (StringUtils.isBlank(task.getBatchNo())) {
             throw ExceptionResultEnum.ERROR.exception("batchNo不能为空");
         }
         QueryWrapper<ExamTaskTemp> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(ExamTaskTemp::getBatchNo, task.getBatchNo());
         List<ExamTaskTemp> examTaskTemps = examTaskTempService.list(queryWrapper);
-        if(examTaskTemps.isEmpty()){
+        if (examTaskTemps.isEmpty()) {
             throw ExceptionResultEnum.ERROR.exception("没有可保存数据");
         }
         List<ExamTask> list = new ArrayList<>();
@@ -127,13 +126,13 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             examTask.setBatchNo(task.getBatchNo());
             examTask.setCreateId(task.getCreateId());
             examTask.setCreateTime(System.currentTimeMillis());
-            String userId = task.getUsers().stream().map(m->{
+            String userId = task.getUsers().stream().map(m -> {
                 if (examTaskTemp.getCourseCode().equals(m.get("courseCode"))) {
                     return m.get("userId");
                 }
                 return "";
             }).findFirst().get();
-            if(StringUtils.isNotBlank(userId)){
+            if (StringUtils.isNotBlank(userId)) {
                 examTask.setUserId(Long.valueOf(userId));
             }
             list.add(examTask);

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

@@ -44,9 +44,9 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
     private SysRoleCourseService sysRoleCourseService;
 
     @Override
-    public IPage<SysRole> list(RoleParam param) {
-        Page<SysRole> page = new Page<>(param.getPageNumber(), param.getPageSize());
-        IPage<SysRole> roleIPage = this.baseMapper.listPage(page, param);
+    public IPage<SysRole> list(Long schoolId, String name, Boolean enable, Integer pageNumber, Integer pageSize) {
+        Page<SysRole> page = new Page<>(pageNumber, pageSize);
+        IPage<SysRole> roleIPage = this.baseMapper.listPage(page, schoolId, name, enable);
         return roleIPage;
     }
 

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

@@ -32,17 +32,17 @@
     <select id="listPage" resultType="com.qmth.distributed.print.business.bean.dto.CardRuleDto">
         <include refid="Base_Column_List"></include>
         <where>
-            <if test="param.schoolId != null and param.schoolId != ''">
-                and school_id = #{param.schoolId}
+            <if test="schoolId != null and schoolId != ''">
+                and school_id = #{schoolId}
             </if>
-            <if test="param.enable != null">
-                and enable = #{param.enable}
+            <if test="enable != null">
+                and enable = #{enable}
             </if>
-            <if test="param.name != null and param.name != ''">
-                and name like concat('%',#{param.name},'%')
+            <if test="name != null and name != ''">
+                and name like concat('%',#{name},'%')
             </if>
-            <if test="param.createTime != null and param.createTime != ''">
-                and create_time = #{param.createTime}
+            <if test="createTime != null and createTime != ''">
+                and create_time = #{createTime}
             </if>
         </where>
     </select>

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

@@ -31,14 +31,14 @@
     <select id="listPage" resultMap="BaseResultMap">
         <include refid="Base_Column_List"></include>
         <where>
-            <if test="param.schoolId != null and param.schoolId != ''">
-                and school_id = #{param.schoolId}
+            <if test="schoolId != null and schoolId != ''">
+                and school_id = #{schoolId}
             </if>
-            <if test="param.code != null and param.code != ''">
-                and code like concat('%',#{param.code} ,'%')
+            <if test="code != null and code != ''">
+                and code like concat('%',#{code} ,'%')
             </if>
-            <if test="param.name != null and param.name != ''">
-                and name like concat('%',#{param.name} ,'%')
+            <if test="name != null and name != ''">
+                and name like concat('%',#{name} ,'%')
             </if>
         </where>
     </select>

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

@@ -38,23 +38,23 @@
         FROM
             basic_template
         <where>
-            <if test="param.schoolId != null and param.schoolId != ''">
-                and school_id = #{param.schoolId}
+            <if test="schoolId != null and schoolId != ''">
+                and school_id = #{schoolId}
             </if>
-            <if test="param.type != null and param.type != ''">
-                and type = #{param.type}
+            <if test="type != null and type != ''">
+                and type = #{type}
             </if>
-            <if test="param.name != null and param.name != ''">
-                and name like concat('%',#{param.name}, '%')
+            <if test="name != null and name != ''">
+                and name like concat('%',#{name}, '%')
             </if>
-            <if test="param.enable != null">
-                and enable = #{param.enable}
+            <if test="enable != null">
+                and enable = #{enable}
             </if>
-            <if test="param.startTime != null and param.startTime != ''">
-                and create_time &gt;= #{param.startTime}
+            <if test="startTime != null and startTime != ''">
+                and create_time &gt;= #{startTime}
             </if>
-            <if test="param.endTime != null and param.endTime != ''">
-                and create_time &lt;= #{param.endTime}
+            <if test="endTime != null and endTime != ''">
+                and create_time &lt;= #{endTime}
             </if>
         </where>
     </select>

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

@@ -54,29 +54,29 @@
                 LEFT JOIN
             sys_user c ON a.user_id = c.id
         <where>
-            <if test="param.schoolId != null and param.schoolId != ''">
-                and a.school_id = #{param.schoolId}
+            <if test="schoolId != null and schoolId != ''">
+                and a.school_id = #{schoolId}
             </if>
-            <if test="param.enable != null">
-                and a.enable = #{param.enable}
+            <if test="enable != null">
+                and a.enable = #{enable}
             </if>
-            <if test="param.status != null and param.status != ''">
-                and a.status = #{param.status}
+            <if test="status != null and status != ''">
+                and a.status = #{status}
             </if>
-            <if test="param.cardRuleId != null and param.cardRuleId != ''">
-                and a.card_rule_id = #{param.cardRuleId}
+            <if test="cardRuleId != null and cardRuleId != ''">
+                and a.card_rule_id = #{cardRuleId}
             </if>
-            <if test="param.courseCode != null and param.courseCode != ''">
-                and a.course_code = #{param.courseCode}
+            <if test="courseCode != null and courseCode != ''">
+                and a.course_code = #{courseCode}
             </if>
-            <if test="param.paperNumber != null and param.paperNumber != ''">
-                and a.paper_number = #{param.paperNumber}
+            <if test="paperNumber != null and paperNumber != ''">
+                and a.paper_number = #{paperNumber}
             </if>
-            <if test="param.startTime != null and param.startTime != ''">
-                and a.start_time &gt;= #{param.startTime}
+            <if test="startTime != null and startTime != ''">
+                and a.start_time &gt;= #{startTime}
             </if>
-            <if test="param.endTime != null and param.endTime != ''">
-                and a.start_time &lt;= #{param.endTime}
+            <if test="endTime != null and endTime != ''">
+                and a.start_time &lt;= #{endTime}
             </if>
         </where>
     </select>
@@ -88,6 +88,9 @@
                 LEFT JOIN
             sys_user b ON a.user_id = b.id
         <where>
+            <if test="schoolId != null and schoolId != ''">
+                and b.school_id = #{schoolId}
+            </if>
             <if test="param != null and param != ''">
                 and b.real_name like concat('%', #{param}, '%')
             </if>

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

@@ -34,11 +34,14 @@
     <select id="listPage" resultMap="BaseResultMap">
         <include refid="Base_Column_List"></include>
         <where>
-            <if test="param.name != null and param.name != ''">
-                and name like concat('%', #{param.name}, '%')
+            <if test="schoolId != null and schoolId != ''">
+                and school_id = #{schoolId}
             </if>
-            <if test="param.enable != null">
-                and enable = #{param.enable}
+            <if test="name != null and name != ''">
+                and name like concat('%', #{name}, '%')
+            </if>
+            <if test="enable != null">
+                and enable = #{enable}
             </if>
         </where>
     </select>

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

@@ -15,6 +15,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
 
@@ -57,8 +58,8 @@ public class BasicAttachmentController {
      * @return
      */
     @ApiOperation(value = "文件查询")
-    @RequestMapping(value = "/get_one", method = RequestMethod.GET)
-    public Result getOne(Long id) {
+    @RequestMapping(value = "/get_one", method = RequestMethod.POST)
+    public Result getOne(@RequestParam(required = true) Long id) {
         BasicAttachment attachment = basicAttachmentService.getById(id);
         return ResultUtil.ok(attachment);
     }

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

@@ -7,8 +7,6 @@ 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.bean.query.BlurryParam;
-import com.qmth.distributed.print.business.bean.query.CardRuleParam;
 import com.qmth.distributed.print.business.entity.BasicCardRule;
 import com.qmth.distributed.print.business.service.BasicCardRuleService;
 import com.qmth.distributed.print.business.util.RequestUtils;
@@ -17,10 +15,7 @@ import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 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 org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -46,15 +41,23 @@ public class BasicCardRuleController {
      * 查询
      *
      * @param request
-     * @param param
+     * @param enable
+     * @param name
+     * @param createTime
+     * @param pageNumber
+     * @param pageSize
      * @return
      */
     @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public Result list(HttpServletRequest request, CardRuleParam param) {
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Result list(HttpServletRequest request,
+                       @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);
-        param.setSchoolId(apiUser.getSchoolId());
-        IPage<CardRuleDto> cardRuleDtoIPage = basicCardRuleService.list(param);
+        IPage<CardRuleDto> cardRuleDtoIPage = basicCardRuleService.list(apiUser.getSchoolId(), enable, name, createTime, pageNumber, pageSize);
         return ResultUtil.ok(cardRuleDtoIPage);
     }
 
@@ -66,11 +69,11 @@ public class BasicCardRuleController {
      * @return
      */
     @ApiOperation(value = "模糊查询")
-    @RequestMapping(value = "/query", method = RequestMethod.GET)
-    public Result list(HttpServletRequest request, BlurryParam param) {
+    @RequestMapping(value = "/query", method = RequestMethod.POST)
+    public Result list(HttpServletRequest request,
+                       @RequestParam("param") String param) {
         ApiUser apiUser = RequestUtils.getApiUser(request);
-        param.setSchoolId(apiUser.getSchoolId());
-        List<BasicCardRule> cardRules = basicCardRuleService.list(param);
+        List<BasicCardRule> cardRules = basicCardRuleService.list(apiUser.getSchoolId(), param);
         return ResultUtil.ok(cardRules);
     }
 
@@ -81,21 +84,22 @@ public class BasicCardRuleController {
      * @return
      */
     @ApiOperation(value = "查询单个")
-    @RequestMapping(value = "/get_one", method = RequestMethod.GET)
-    public Result getOne(Long id) {
+    @RequestMapping(value = "/get_one", method = RequestMethod.POST)
+    public Result getOne(@RequestParam(value = "id", required = true) Long id) {
         BasicCardRule cardRule = basicCardRuleService.getById(id);
         return ResultUtil.ok(cardRule);
     }
 
     /**
      * 新增/修改
+     *
      * @param request
      * @param cardRule
      * @return
      */
     @ApiOperation(value = "新增/修改")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(HttpServletRequest request, @RequestBody BasicCardRule cardRule){
+    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);

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

@@ -7,7 +7,6 @@ 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.query.BlurryParam;
-import com.qmth.distributed.print.business.bean.query.CourseParam;
 import com.qmth.distributed.print.business.entity.BasicCourse;
 import com.qmth.distributed.print.business.service.BasicCourseService;
 import com.qmth.distributed.print.business.util.RequestUtils;
@@ -16,11 +15,7 @@ import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 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 org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -44,15 +39,22 @@ public class BasicCourseController {
 
     /**
      * 查询
-     * @param param
+     * @param request
+     * @param code
+     * @param name
+     * @param pageNumber
+     * @param pageSize
      * @return
      */
     @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public Result list(HttpServletRequest request, CourseParam param){
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Result list(HttpServletRequest request,
+                       @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);
-        param.setSchoolId(apiUser.getSchoolId());
-        IPage<BasicCourse> userDtos = basicCourseService.list(param);
+        IPage<BasicCourse> userDtos = basicCourseService.list(apiUser.getSchoolId(), code, name, pageNumber, pageSize);
         return ResultUtil.ok(userDtos);
     }
 
@@ -62,11 +64,11 @@ public class BasicCourseController {
      * @return
      */
     @ApiOperation(value = "模糊查询")
-    @RequestMapping(value = "/query", method = RequestMethod.GET)
-    public Result query(HttpServletRequest request, BlurryParam param){
+    @RequestMapping(value = "/query", method = RequestMethod.POST)
+    public Result query(HttpServletRequest request,
+                        @RequestParam(value = "param", required = false) String param){
         ApiUser apiUser = RequestUtils.getApiUser(request);
-        param.setSchoolId(apiUser.getSchoolId());
-        List<BasicCourse> userDtos = basicCourseService.list(param);
+        List<BasicCourse> userDtos = basicCourseService.list(apiUser.getSchoolId(), param);
         return ResultUtil.ok(userDtos);
     }
 

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

@@ -45,7 +45,7 @@ public class BasicExamRuleController {
      * @return
      */
     @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list(HttpServletRequest request) {
         ApiUser apiUser = RequestUtils.getApiUser(request);
         BasicExamRule examRule = basicExamRuleService.getBySchoolId(apiUser.getSchoolId());

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

@@ -7,7 +7,6 @@ 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.bean.query.TemplateParam;
 import com.qmth.distributed.print.business.entity.BasicTemplate;
 import com.qmth.distributed.print.business.service.BasicTemplateService;
 import com.qmth.distributed.print.business.util.RequestUtils;
@@ -16,11 +15,7 @@ import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 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 org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -43,28 +38,42 @@ public class BasicTemplateController {
 
     /**
      * 查询
+     *
      * @param request
-     * @param param
+     * @param enable
+     * @param type
+     * @param name
+     * @param startTime
+     * @param endTime
+     * @param pageNumber
+     * @param pageSize
      * @return
      */
     @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public Result list(HttpServletRequest request, TemplateParam param) {
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Result list(HttpServletRequest request,
+                       @RequestParam Boolean enable,
+                       @RequestParam String type,
+                       @RequestParam String name,
+                       @RequestParam Long startTime,
+                       @RequestParam Long endTime,
+                       @RequestParam Integer pageNumber,
+                       @RequestParam Integer pageSize) {
         ApiUser apiUser = RequestUtils.getApiUser(request);
-        param.setSchoolId(apiUser.getSchoolId());
-        IPage<TemplateDto> templateDtoIPage = basicTemplateService.list(param);
+        IPage<TemplateDto> templateDtoIPage = basicTemplateService.list(apiUser.getSchoolId(), 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){
+    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);

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

@@ -4,14 +4,15 @@ 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.enums.*;
-import com.qmth.distributed.print.common.enums.*;
 import com.qmth.distributed.print.business.enums.result.EnumResult;
+import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import com.qmth.distributed.print.common.util.Result;
 import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
 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 java.util.List;
@@ -33,8 +34,8 @@ public class EnumsController {
      * @param type
      * @return
      */
-    @RequestMapping(method = RequestMethod.GET)
-    public Result list(String type) {
+    @RequestMapping(method = RequestMethod.POST)
+    public Result list(@RequestParam(value = "type", required = true) String type) {
         if (StringUtils.isBlank(type)) {
             throw ExceptionResultEnum.ERROR.exception("类型不能为空");
         }

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

@@ -10,10 +10,7 @@ import com.qmth.distributed.print.business.bean.dto.BlurryUserDto;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskDto;
 import com.qmth.distributed.print.business.bean.dto.ExamTaskImportDto;
 import com.qmth.distributed.print.business.bean.dto.ReviewLogDto;
-import com.qmth.distributed.print.business.bean.query.BlurryParam;
-import com.qmth.distributed.print.business.bean.query.ExamTaskParam;
 import com.qmth.distributed.print.business.entity.ExamTask;
-import com.qmth.distributed.print.business.entity.ExamTaskReviewLog;
 import com.qmth.distributed.print.business.service.ExamTaskReviewLogService;
 import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.distributed.print.business.util.RequestUtils;
@@ -22,11 +19,7 @@ import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 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 org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
@@ -54,82 +47,104 @@ public class ExamTaskController {
 
     /**
      * 查询
+     *
      * @param request
-     * @param param
+     * @param enable
+     * @param status
+     * @param cardRuleId
+     * @param courseCode
+     * @param paperNumber
+     * @param startTime
+     * @param endTime
+     * @param pageNumber
+     * @param pageSize
      * @return
      */
     @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public Result list(HttpServletRequest request, ExamTaskParam param){
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Result list(HttpServletRequest request,
+                       @RequestParam Boolean enable,
+                       @RequestParam String status,
+                       @RequestParam Long cardRuleId,
+                       @RequestParam String courseCode,
+                       @RequestParam String paperNumber,
+                       @RequestParam Long startTime,
+                       @RequestParam Long endTime,
+                       @RequestParam Integer pageNumber,
+                       @RequestParam Integer pageSize) {
         ApiUser apiUser = RequestUtils.getApiUser(request);
-        param.setSchoolId(apiUser.getSchoolId());
-        IPage<ExamTaskDto> examTasks = examTaskService.list(param);
+        IPage<ExamTaskDto> examTasks = examTaskService.list(apiUser.getSchoolId(), enable, status, cardRuleId, courseCode, paperNumber, startTime, endTime, pageNumber, pageSize);
         return ResultUtil.ok(examTasks);
     }
 
     /**
      * 试卷编号模糊查询
+     *
      * @param param
      * @return
      */
     @ApiOperation(value = "试卷编号模糊查询")
-    @RequestMapping(value = "/paper_number_query", method = RequestMethod.GET)
-    public Result paperNumberQuery(HttpServletRequest request, BlurryParam param){
+    @RequestMapping(value = "/paper_number_query", method = RequestMethod.POST)
+    public Result paperNumberQuery(HttpServletRequest request,
+                                   @RequestParam("param") String param) {
         ApiUser apiUser = RequestUtils.getApiUser(request);
-        param.setSchoolId(apiUser.getSchoolId());
-        List<String> list = examTaskService.listPaperNumber(param);
+        List<String> list = examTaskService.listPaperNumber(apiUser.getSchoolId(), param);
         return ResultUtil.ok(list);
     }
 
     /**
      * 命题老师模糊查询
+     *
      * @param param
      * @return
      */
     @ApiOperation(value = "命题老师模糊查询")
-    @RequestMapping(value = "/user_query", method = RequestMethod.GET)
-    public Result userQuery(HttpServletRequest request, BlurryParam param){
+    @RequestMapping(value = "/user_query", method = RequestMethod.POST)
+    public Result userQuery(HttpServletRequest request,
+                            @RequestParam("param") String param) {
         ApiUser apiUser = RequestUtils.getApiUser(request);
-        param.setSchoolId(apiUser.getSchoolId());
-        List<BlurryUserDto> list = examTaskService.listUser(param);
+        List<BlurryUserDto> list = examTaskService.listUser(apiUser.getSchoolId(), 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(HttpServletRequest request, @RequestBody ExamTask examTask) {
         boolean isSuccess = examTaskService.assignUser(examTask);
         return ResultUtil.ok(isSuccess);
     }
 
     /**
      * 启用/禁用
+     *
      * @param request
      * @param examTask
      * @return
      */
     @ApiOperation(value = "启用/禁用")
     @RequestMapping(value = "/enable", method = RequestMethod.POST)
-    public Result enable(HttpServletRequest request, @RequestBody ExamTask examTask){
+    public Result enable(HttpServletRequest request, @RequestBody ExamTask examTask) {
         boolean isSuccess = examTaskService.enable(examTask);
         return ResultUtil.ok(isSuccess);
     }
 
     /**
      * 新建
+     *
      * @param request
      * @param examTask
      * @return
      */
     @ApiOperation(value = "新建")
     @RequestMapping(value = "/save", method = RequestMethod.POST)
-    public Result save(HttpServletRequest request, @RequestBody ExamTask examTask){
+    public Result save(HttpServletRequest request, @RequestBody ExamTask examTask) {
         ApiUser apiUser = RequestUtils.getApiUser(request);
         examTask.setSchoolId(apiUser.getSchoolId());
         examTask.setCreateId(apiUser.getUserData().getId());
@@ -140,6 +155,7 @@ public class ExamTaskController {
 
     /**
      * 文件导入
+     *
      * @param request
      * @param file
      * @param md5
@@ -147,7 +163,7 @@ public class ExamTaskController {
      */
     @ApiOperation(value = "文件导入")
     @RequestMapping(value = "/import", method = RequestMethod.POST)
-    public Result importFile(HttpServletRequest request, MultipartFile file, String md5){
+    public Result importFile(HttpServletRequest request, MultipartFile file, String md5) {
         ApiUser apiUser = RequestUtils.getApiUser(request);
         List<ExamTaskImportDto> list = examTaskService.importFile(file, md5, apiUser);
         return ResultUtil.ok(list);
@@ -155,13 +171,14 @@ public class ExamTaskController {
 
     /**
      * 批量保存
+     *
      * @param request
      * @param task
      * @return
      */
     @ApiOperation(value = "批量保存")
     @RequestMapping(value = "/save_batch", method = RequestMethod.POST)
-    public Result saveBatch(HttpServletRequest request, ExamTask task){
+    public Result saveBatch(HttpServletRequest request, ExamTask task) {
         ApiUser apiUser = RequestUtils.getApiUser(request);
         task.setSchoolId(apiUser.getSchoolId());
         task.setCreateId(apiUser.getUserData().getId());
@@ -170,10 +187,17 @@ public class ExamTaskController {
     }
 
 
+    /**
+     * 审核历史
+     * @param request
+     * @param examTaskId
+     * @return
+     */
     @ApiOperation(value = "审核历史")
-    @RequestMapping(value = "/review_list", method = RequestMethod.GET)
-    public Result reviewList(HttpServletRequest request, ExamTaskReviewLog reviewLog){
-        List<ReviewLogDto> list = examTaskReviewLogService.list(reviewLog);
+    @RequestMapping(value = "/review_list", method = RequestMethod.POST)
+    public Result reviewList(HttpServletRequest request,
+                             @RequestParam("examTaskId") Long examTaskId) {
+        List<ReviewLogDto> list = examTaskReviewLogService.list(examTaskId);
         return ResultUtil.ok(list);
     }
 }

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

@@ -11,6 +11,8 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
 
 /**
@@ -31,8 +33,8 @@ public class SysConfigController {
     private SysConfigService sysConfigService;
 
     @ApiOperation(value = "根据key查询")
-    @RequestMapping("/get_one")
-    public Result getOne(String key) {
+    @RequestMapping(value = "/get_one",method = RequestMethod.POST)
+    public Result getOne(@RequestParam(value = "key", required = false) String key) {
         String value = sysConfigService.getByKey(key);
         return ResultUtil.ok(value);
     }

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

@@ -45,7 +45,7 @@ public class SysOrgController {
      * @return
      */
     @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list(HttpServletRequest request) {
         ApiUser apiUser = RequestUtils.getApiUser(request);
         List<OrgDto> orgDtoList = sysOrgService.listOrgTree(apiUser.getSchoolId());

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

@@ -14,10 +14,7 @@ import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 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 org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -46,7 +43,7 @@ public class SysPrivilegeController {
      * @return
      */
     @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
     public Result list(HttpServletRequest request) {
         ApiUser apiUser = RequestUtils.getApiUser(request);
         List<PrivilegeDto> privilegeDtoList = sysPrivilegeService.listOrgTree(apiUser.getSchoolId());
@@ -91,8 +88,8 @@ public class SysPrivilegeController {
      * @return
      */
     @ApiOperation(value = "角色已绑定权限列表")
-    @RequestMapping(value = "/get_role_privileges", method = RequestMethod.GET)
-    public Result getRolePrivileges(Long roleId) {
+    @RequestMapping(value = "/get_role_privileges", method = RequestMethod.POST)
+    public Result getRolePrivileges(@RequestParam(value = "roleId", required = true) Long roleId) {
         List<Long> list = sysPrivilegeService.getRolePrivileges(roleId);
         return ResultUtil.ok(list);
     }

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

@@ -6,7 +6,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.distributed.print.business.bean.ApiUser;
-import com.qmth.distributed.print.business.bean.query.RoleParam;
 import com.qmth.distributed.print.business.entity.SysRole;
 import com.qmth.distributed.print.business.service.SysRoleService;
 import com.qmth.distributed.print.business.util.RequestUtils;
@@ -15,10 +14,7 @@ import com.qmth.distributed.print.common.util.ResultUtil;
 import io.swagger.annotations.Api;
 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 org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -44,15 +40,21 @@ public class SysRoleController {
      * 查询
      *
      * @param request
-     * @param param
+     * @param name
+     * @param enable
+     * @param pageNumber
+     * @param pageSize
      * @return
      */
     @ApiOperation(value = "查询")
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public Result list(HttpServletRequest request, RoleParam param) {
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Result list(HttpServletRequest request,
+                       @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);
-        param.setSchoolId(apiUser.getSchoolId());
-        IPage<SysRole> userDtos = sysRoleService.list(param);
+        IPage<SysRole> userDtos = sysRoleService.list(apiUser.getSchoolId(), name, enable, pageNumber, pageSize);
         return ResultUtil.ok(userDtos);
     }
 
@@ -103,13 +105,15 @@ public class SysRoleController {
 
     /**
      * 用户已绑定角色列表
+     *
      * @param request
      * @param userId
      * @return
      */
     @ApiOperation(value = "用户已绑定角色列表")
-    @RequestMapping(value = "/get_user_roles", method = RequestMethod.GET)
-    public Result getUserRoles(HttpServletRequest request, Long userId) {
+    @RequestMapping(value = "/get_user_roles", method = RequestMethod.POST)
+    public Result getUserRoles(HttpServletRequest request,
+                               @RequestParam(value = "userId", required = true) Long userId) {
         List<Long> list = sysRoleService.getUserRoles(userId);
         return ResultUtil.ok(list);
     }