|
@@ -1,15 +1,12 @@
|
|
package com.qmth.distributed.print.business.templete.execute;
|
|
package com.qmth.distributed.print.business.templete.execute;
|
|
|
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
import cn.hutool.core.date.DateUtil;
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
|
import com.qmth.boot.api.exception.ApiException;
|
|
import com.qmth.boot.api.exception.ApiException;
|
|
-import com.qmth.distributed.print.business.service.CloudUserPushService;
|
|
|
|
import com.qmth.distributed.print.business.templete.importData.AsyncImportTaskTemplete;
|
|
import com.qmth.distributed.print.business.templete.importData.AsyncImportTaskTemplete;
|
|
import com.qmth.distributed.print.business.templete.service.TaskLogicService;
|
|
import com.qmth.distributed.print.business.templete.service.TaskLogicService;
|
|
import com.qmth.teachcloud.common.bean.dto.excel.export.BasicStudentErrorExportDto;
|
|
import com.qmth.teachcloud.common.bean.dto.excel.export.BasicStudentErrorExportDto;
|
|
import com.qmth.teachcloud.common.contant.SpringContextHolder;
|
|
import com.qmth.teachcloud.common.contant.SpringContextHolder;
|
|
import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
import com.qmth.teachcloud.common.contant.SystemConstant;
|
|
-import com.qmth.teachcloud.common.entity.SysUser;
|
|
|
|
import com.qmth.teachcloud.common.entity.TBTask;
|
|
import com.qmth.teachcloud.common.entity.TBTask;
|
|
import com.qmth.teachcloud.common.enums.TaskResultEnum;
|
|
import com.qmth.teachcloud.common.enums.TaskResultEnum;
|
|
import com.qmth.teachcloud.common.enums.TaskStatusEnum;
|
|
import com.qmth.teachcloud.common.enums.TaskStatusEnum;
|
|
@@ -20,7 +17,6 @@ import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
-import javax.annotation.Resource;
|
|
|
|
import java.io.InputStream;
|
|
import java.io.InputStream;
|
|
import java.text.MessageFormat;
|
|
import java.text.MessageFormat;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
@@ -39,8 +35,8 @@ public class AsyncSysUserDataImportService extends AsyncImportTaskTemplete {
|
|
|
|
|
|
public static final String OBJ_TITLE = "用户基本信息";
|
|
public static final String OBJ_TITLE = "用户基本信息";
|
|
|
|
|
|
- @Resource
|
|
|
|
- private CloudUserPushService cloudUserPushService;
|
|
|
|
|
|
+// @Resource
|
|
|
|
+// private CloudUserPushService cloudUserPushService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Result importTask(Map<String, Object> map) throws Exception {
|
|
public Result importTask(Map<String, Object> map) throws Exception {
|
|
@@ -65,12 +61,12 @@ public class AsyncSysUserDataImportService extends AsyncImportTaskTemplete {
|
|
super.createErrorFile(tbTask, BasicStudentErrorExportDto.class, errorDataList);
|
|
super.createErrorFile(tbTask, BasicStudentErrorExportDto.class, errorDataList);
|
|
}
|
|
}
|
|
|
|
|
|
- // 执行用户同步数据
|
|
|
|
- SysUser sysUser = (SysUser) map.get(SystemConstant.SYS_USER);
|
|
|
|
- List<Long> userIdList = JSON.parseArray(String.valueOf(result.get("userIdList")), Long.class);
|
|
|
|
- if (userIdList != null && userIdList.size() > 0) {
|
|
|
|
- cloudUserPushService.pushCloudUser(userIdList, sysUser);
|
|
|
|
- }
|
|
|
|
|
|
+// // 执行用户同步数据
|
|
|
|
+// SysUser sysUser = (SysUser) map.get(SystemConstant.SYS_USER);
|
|
|
|
+// List<Long> userIdList = JSON.parseArray(String.valueOf(result.get("userIdList")), Long.class);
|
|
|
|
+// if (userIdList != null && userIdList.size() > 0) {
|
|
|
|
+// cloudUserPushService.pushCloudUser(userIdList, sysUser);
|
|
|
|
+// }
|
|
|
|
|
|
stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}{4}{5}{6}{7}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), FINISH_TITLE, Long.valueOf(String.valueOf(result.get(SystemConstant.DATA_COUNT))), FINISH_TOTAL_SIZE, Long.valueOf(String.valueOf(result.get(SystemConstant.SUCCESS_DATA_COUNT))), FINISH_SUCCESS_SIZE, Long.valueOf(String.valueOf(result.get(SystemConstant.ERROR_DATA_COUNT))), FINISH_ERROR_SIZE));
|
|
stringJoinerSummary.add(MessageFormat.format("{0}{1}{2}{3}{4}{5}{6}{7}", DateUtil.format(new Date(), SystemConstant.DEFAULT_DATE_PATTERN), FINISH_TITLE, Long.valueOf(String.valueOf(result.get(SystemConstant.DATA_COUNT))), FINISH_TOTAL_SIZE, Long.valueOf(String.valueOf(result.get(SystemConstant.SUCCESS_DATA_COUNT))), FINISH_SUCCESS_SIZE, Long.valueOf(String.valueOf(result.get(SystemConstant.ERROR_DATA_COUNT))), FINISH_ERROR_SIZE));
|
|
tbTask.setResult(TaskResultEnum.SUCCESS);
|
|
tbTask.setResult(TaskResultEnum.SUCCESS);
|