update

distributed-print-task/src/main/java/com/qmth/distributed/print/task/templete/execute/AsyncUserImportTempleteService.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/AsyncUserImportTempleteService.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.task.templete.execute;
+package com.qmth.distributed.print.business.templete.execute;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,14 +11,14 @@ import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import com.qmth.distributed.print.business.enums.TaskResultEnum;
 import com.qmth.distributed.print.business.enums.TaskStatusEnum;
 import com.qmth.distributed.print.business.service.SysRoleService;
+import com.qmth.distributed.print.business.templete.importData.AsyncImportTaskTemplete;
+import com.qmth.distributed.print.business.templete.service.TaskLogicService;
 import com.qmth.distributed.print.business.util.ExcelUtil;
 import com.qmth.distributed.print.business.util.excel.ExcelError;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 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 com.qmth.distributed.print.task.templete.importData.AsyncImportTaskTemplete;
-import com.qmth.distributed.print.task.templete.service.TaskLogicService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

distributed-print-task/src/main/java/com/qmth/distributed/print/task/templete/execute/UserImportTempleteService.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/execute/UserImportTempleteService.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.task.templete.execute;
+package com.qmth.distributed.print.business.templete.execute;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -7,14 +7,14 @@ import com.qmth.distributed.print.business.bean.dto.excel.UserImportDto;
 import com.qmth.distributed.print.business.entity.SysRole;
 import com.qmth.distributed.print.business.enums.RoleTypeEnum;
 import com.qmth.distributed.print.business.service.SysRoleService;
+import com.qmth.distributed.print.business.templete.importData.SyncImportTaskTemplete;
+import com.qmth.distributed.print.business.templete.service.TaskLogicService;
 import com.qmth.distributed.print.business.util.ExcelUtil;
 import com.qmth.distributed.print.business.util.excel.ExcelError;
 import com.qmth.distributed.print.common.contant.SystemConstant;
 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 com.qmth.distributed.print.task.templete.importData.SyncImportTaskTemplete;
-import com.qmth.distributed.print.task.templete.service.TaskLogicService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

distributed-print-task/src/main/java/com/qmth/distributed/print/task/templete/export/AsyncExportTaskTemplete.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/export/AsyncExportTaskTemplete.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.task.templete.export;
+package com.qmth.distributed.print.business.templete.export;
 
 import com.qmth.distributed.print.common.util.Result;
 import org.springframework.scheduling.annotation.Async;

distributed-print-task/src/main/java/com/qmth/distributed/print/task/templete/export/SyncExportTaskTemplete.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/export/SyncExportTaskTemplete.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.task.templete.export;
+package com.qmth.distributed.print.business.templete.export;
 
 import com.qmth.distributed.print.common.util.Result;
 

distributed-print-task/src/main/java/com/qmth/distributed/print/task/templete/importData/AsyncImportTaskTemplete.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/importData/AsyncImportTaskTemplete.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.task.templete.importData;
+package com.qmth.distributed.print.business.templete.importData;
 
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;

distributed-print-task/src/main/java/com/qmth/distributed/print/task/templete/importData/SyncImportTaskTemplete.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/importData/SyncImportTaskTemplete.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.task.templete.importData;
+package com.qmth.distributed.print.business.templete.importData;
 
 import com.qmth.distributed.print.common.util.Result;
 

distributed-print-task/src/main/java/com/qmth/distributed/print/task/templete/service/TaskLogicService.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/TaskLogicService.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.task.templete.service;
+package com.qmth.distributed.print.business.templete.service;
 
 import org.springframework.util.LinkedMultiValueMap;
 

distributed-print-task/src/main/java/com/qmth/distributed/print/task/templete/service/impl/TaskLogicServiceImpl.java → distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -1,4 +1,4 @@
-package com.qmth.distributed.print.task.templete.service.impl;
+package com.qmth.distributed.print.business.templete.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -9,11 +9,11 @@ import com.qmth.distributed.print.business.entity.SysUser;
 import com.qmth.distributed.print.business.service.BasicSchoolService;
 import com.qmth.distributed.print.business.service.CommonService;
 import com.qmth.distributed.print.business.service.SysUserService;
+import com.qmth.distributed.print.business.templete.service.TaskLogicService;
 import com.qmth.distributed.print.business.util.ServletUtil;
 import com.qmth.distributed.print.business.util.excel.ExcelError;
 import com.qmth.distributed.print.common.enums.ExceptionResultEnum;
 import com.qmth.distributed.print.common.util.Base64Util;
-import com.qmth.distributed.print.task.templete.service.TaskLogicService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.LinkedMultiValueMap;

distributed-print/pom.xml

@@ -14,10 +14,6 @@
 	</parent>
 
 	<dependencies>
-		<dependency>
-			<groupId>com.qmth.distributed.print.business</groupId>
-			<artifactId>distributed-print-business</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>com.qmth.distributed.print.task</groupId>
 			<artifactId>distributed-print-task</artifactId>

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

@@ -1,6 +1,5 @@
 package com.qmth.distributed.print.api;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.boot.api.annotation.Aac;
 import com.qmth.boot.api.annotation.BOOL;
@@ -10,7 +9,6 @@ import com.qmth.distributed.print.business.bean.ApiUser;
 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.result.EditResult;
 import com.qmth.distributed.print.business.entity.BasicAttachment;
 import com.qmth.distributed.print.business.entity.SysUser;
@@ -20,6 +18,8 @@ import com.qmth.distributed.print.business.enums.UploadFileEnum;
 import com.qmth.distributed.print.business.service.BasicAttachmentService;
 import com.qmth.distributed.print.business.service.SysUserService;
 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;
@@ -27,8 +27,6 @@ import com.qmth.distributed.print.common.contant.SystemConstant;
 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 com.qmth.distributed.print.task.templete.execute.AsyncUserImportTempleteService;
-import com.qmth.distributed.print.task.templete.execute.UserImportTempleteService;
 import io.swagger.annotations.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;