wangliang пре 4 година
родитељ
комит
4480dd4080
28 измењених фајлова са 68 додато и 29 уклоњено
  1. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/ArraysParams.java
  2. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/BlurryParam.java
  3. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/CardRuleParam.java
  4. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/ChooseParams.java
  5. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/CourseParam.java
  6. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/ExamTaskParam.java
  7. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/LoginParam.java
  8. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/RoleParam.java
  9. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/TemplateParam.java
  10. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/UserParam.java
  11. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicCardRuleMapper.java
  12. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicCourseMapper.java
  13. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/BasicTemplateMapper.java
  14. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/SysRoleMapper.java
  15. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/SysUserMapper.java
  16. 2 2
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicCourseService.java
  17. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/BasicTemplateService.java
  18. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/SysRoleService.java
  19. 2 2
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/SysUserService.java
  20. 2 2
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicCourseServiceImpl.java
  21. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/BasicTemplateServiceImpl.java
  22. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SysRoleServiceImpl.java
  23. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/SysUserServiceImpl.java
  24. 1 1
      distributed-print/src/main/java/com/qmth/distributed/print/api/BasicCourseController.java
  25. 1 1
      distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java
  26. 1 1
      distributed-print/src/main/java/com/qmth/distributed/print/api/SysUserController.java
  27. 38 0
      distributed-print/src/main/java/com/qmth/distributed/print/api/WorkController.java
  28. 1 0
      distributed-print/src/main/resources/application.properties

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/query/ArraysParams.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/ArraysParams.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.query;
+package com.qmth.distributed.print.business.bean.params;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/query/BlurryParam.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/BlurryParam.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.query;
+package com.qmth.distributed.print.business.bean.params;
 
 /**
  * 模糊查询

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/query/CardRuleParam.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/CardRuleParam.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.query;
+package com.qmth.distributed.print.business.bean.params;
 
 import com.qmth.distributed.print.business.base.BasePage;
 

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/query/ChooseParams.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/ChooseParams.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.query;
+package com.qmth.distributed.print.business.bean.params;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/query/CourseParam.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/CourseParam.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.query;
+package com.qmth.distributed.print.business.bean.params;
 
 import com.qmth.distributed.print.business.base.BasePage;
 

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/query/ExamTaskParam.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/ExamTaskParam.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.query;
+package com.qmth.distributed.print.business.bean.params;
 
 import com.qmth.distributed.print.business.base.BasePage;
 

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/query/LoginParam.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/LoginParam.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.query;
+package com.qmth.distributed.print.business.bean.params;
 
 import io.swagger.annotations.ApiModelProperty;
 import org.hibernate.validator.constraints.Length;

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/query/RoleParam.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/RoleParam.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.query;
+package com.qmth.distributed.print.business.bean.params;
 
 import com.qmth.distributed.print.business.base.BasePage;
 

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/query/TemplateParam.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/TemplateParam.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.query;
+package com.qmth.distributed.print.business.bean.params;
 
 import com.qmth.distributed.print.business.base.BasePage;
 

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/query/UserParam.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/params/UserParam.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.business.bean.query;
+package com.qmth.distributed.print.business.bean.params;
 
 import com.qmth.distributed.print.business.base.BasePage;
 

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

@@ -4,7 +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.CardRuleDto;
-import com.qmth.distributed.print.business.bean.query.CardRuleParam;
+import com.qmth.distributed.print.business.bean.params.CardRuleParam;
 import com.qmth.distributed.print.business.entity.BasicCardRule;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.business.mapper;
 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.query.CourseParam;
+import com.qmth.distributed.print.business.bean.params.CourseParam;
 import com.qmth.distributed.print.business.entity.BasicCourse;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -4,7 +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.TemplateDto;
-import com.qmth.distributed.print.business.bean.query.TemplateParam;
+import com.qmth.distributed.print.business.bean.params.TemplateParam;
 import com.qmth.distributed.print.business.entity.BasicTemplate;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -3,7 +3,7 @@ package com.qmth.distributed.print.business.mapper;
 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.query.RoleParam;
+import com.qmth.distributed.print.business.bean.params.RoleParam;
 import com.qmth.distributed.print.business.entity.SysRole;
 import org.apache.ibatis.annotations.Param;
 

+ 1 - 1
distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/SysUserMapper.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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;
-import com.qmth.distributed.print.business.bean.query.ArraysParams;
+import com.qmth.distributed.print.business.bean.params.ArraysParams;
 import com.qmth.distributed.print.business.entity.SysUser;
 import org.apache.ibatis.annotations.Param;
 

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

@@ -2,8 +2,8 @@ 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.query.BlurryParam;
-import com.qmth.distributed.print.business.bean.query.CourseParam;
+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 java.util.List;

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

@@ -3,7 +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.TemplateDto;
-import com.qmth.distributed.print.business.bean.query.TemplateParam;
+import com.qmth.distributed.print.business.bean.params.TemplateParam;
 import com.qmth.distributed.print.business.entity.BasicTemplate;
 
 /**

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

@@ -2,7 +2,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.query.RoleParam;
+import com.qmth.distributed.print.business.bean.params.RoleParam;
 import com.qmth.distributed.print.business.entity.SysRole;
 
 import java.util.List;

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

@@ -6,8 +6,8 @@ import com.qmth.distributed.print.business.bean.dto.BlurryUserDto;
 import com.qmth.distributed.print.business.bean.dto.LoginDto;
 import com.qmth.distributed.print.business.bean.dto.UserDto;
 import com.qmth.distributed.print.business.bean.dto.excel.UserExportDto;
-import com.qmth.distributed.print.business.bean.query.ArraysParams;
-import com.qmth.distributed.print.business.bean.query.UserParam;
+import com.qmth.distributed.print.business.bean.params.ArraysParams;
+import com.qmth.distributed.print.business.bean.params.UserParam;
 import com.qmth.distributed.print.business.entity.SysUser;
 
 import java.util.List;

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

@@ -4,8 +4,8 @@ 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.query.BlurryParam;
-import com.qmth.distributed.print.business.bean.query.CourseParam;
+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.mapper.BasicCourseMapper;

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.distributed.print.business.bean.dto.TemplateDto;
-import com.qmth.distributed.print.business.bean.query.TemplateParam;
+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.mapper.BasicTemplateMapper;

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

@@ -5,7 +5,7 @@ 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.query.RoleParam;
+import com.qmth.distributed.print.business.bean.params.RoleParam;
 import com.qmth.distributed.print.business.entity.SysRole;
 import com.qmth.distributed.print.business.entity.SysUserRole;
 import com.qmth.distributed.print.business.mapper.SysRoleMapper;

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

@@ -9,7 +9,7 @@ import com.qmth.distributed.print.business.bean.dto.BlurryUserDto;
 import com.qmth.distributed.print.business.bean.dto.LoginDto;
 import com.qmth.distributed.print.business.bean.dto.UserDto;
 import com.qmth.distributed.print.business.bean.dto.excel.UserExportDto;
-import com.qmth.distributed.print.business.bean.query.ArraysParams;
+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.*;

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

@@ -6,7 +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.ApiUser;
-import com.qmth.distributed.print.business.bean.query.BlurryParam;
+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;

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

@@ -9,7 +9,7 @@ import com.qmth.boot.core.enums.Platform;
 import com.qmth.boot.tools.signature.SignatureType;
 import com.qmth.distributed.print.business.bean.auth.AuthBean;
 import com.qmth.distributed.print.business.bean.auth.ExpireTimeBean;
-import com.qmth.distributed.print.business.bean.query.LoginParam;
+import com.qmth.distributed.print.business.bean.params.LoginParam;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.bean.result.LoginResult;
 import com.qmth.distributed.print.business.config.DictionaryConfig;

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

@@ -9,7 +9,7 @@ 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;
-import com.qmth.distributed.print.business.bean.query.ArraysParams;
+import com.qmth.distributed.print.business.bean.params.ArraysParams;
 import com.qmth.distributed.print.business.bean.result.EditResult;
 import com.qmth.distributed.print.business.entity.BasicAttachment;
 import com.qmth.distributed.print.business.entity.SysUser;

+ 38 - 0
distributed-print/src/main/java/com/qmth/distributed/print/api/WorkController.java

@@ -0,0 +1,38 @@
+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.boot.core.enums.Platform;
+import com.qmth.distributed.print.business.bean.result.EditResult;
+import com.qmth.distributed.print.common.util.Result;
+import com.qmth.distributed.print.common.util.ResultUtil;
+import io.swagger.annotations.*;
+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;
+
+/**
+ * @Description: 工作台 前端控制器
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2021/4/8
+ */
+@Api(tags = "工作台Controller")
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.work}")
+@Aac(strict = BOOL.TRUE, platform = Platform.WEB)
+public class WorkController {
+
+    @ApiOperation(value = "命题待办接口")
+    @RequestMapping(value = "/exam/task/ready", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = EditResult.class)})
+    public Result examTaskReady(@ApiParam(value = "用户id", required = true) @RequestParam String userId,
+                                @RequestParam(value = "pageNumber", required = true) Integer pageNumber,
+                                @RequestParam(value = "pageSize", required = true) Integer pageSize) {
+        return ResultUtil.ok();
+    }
+}
+

+ 1 - 0
distributed-print/src/main/resources/application.properties

@@ -79,6 +79,7 @@ prefix.url.sys=admin/sys
 prefix.url.basic=admin/basic
 prefix.url.exam=admin/exam
 prefix.url.data=admin/data
+prefix.url.work=admin/work
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info