导入导出bugfix

themis-business/src/main/java/com/qmth/themis/business/templete/TaskExportCommon.java

@@ -186,15 +186,14 @@ public class TaskExportCommon {
      * 异常处理
      *
      * @param min
-     * @param y
      * @param e
      * @param txtList
      * @return
      */
-    public List<String> exception(int min, int y, Exception e, List<String> txtList) {
+    public List<String> exception(int min, Exception e, List<String> txtList) {
         this.exception = true;
-        String exceptionStr = "数据导出到第" + (y == 0 ? y + 1 : y) + "条时发生异常，请联系系统管理员处理！";
-        txtList.add(DateUtil.format(new Date(), Constants.DEFAULT_DATE_PATTERN) + "->" + exceptionStr);
+        String exceptionStr = "数据导出到第" + (min == 0 ? min + 1 : min) + "条时发生异常，请联系系统管理员处理！";
+        txtList.add(DateUtil.format(new Date(), Constants.DEFAULT_DATE_PATTERN) + "->" + exceptionStr + "错误信息:[" + e.getMessage() + "]");
         this.tbTaskHistory.setSummary(exceptionStr);
         this.tbTaskHistory.setStatus(TaskStatusEnum.FINISH);
         return txtList;

themis-business/src/main/java/com/qmth/themis/business/templete/TaskImportCommon.java

@@ -180,7 +180,7 @@ public class TaskImportCommon {
     public List<String> exception(int min, Exception e, List<String> txtList) {
         this.exception = true;
         String exceptionStr = "数据处理到第" + (min == 0 ? min + 1 : min) + "条时发生异常，请联系系统管理员处理！";
-        txtList.add(DateUtil.format(new Date(), Constants.DEFAULT_DATE_PATTERN) + "->" + exceptionStr);
+        txtList.add(DateUtil.format(new Date(), Constants.DEFAULT_DATE_PATTERN) + "->" + exceptionStr + "错误信息:[" + e.getMessage() + "]");
         this.tbTaskHistory.setSummary(exceptionStr);
         this.tbTaskHistory.setStatus(TaskStatusEnum.FINISH);
         return txtList;

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskMarkResultSimpleExportTemplete.java

@@ -72,7 +72,7 @@ public class TaskMarkResultSimpleExportTemplete implements TaskExportTemplete {
         String excelFilePath = null;
         InputStream inputStream = null;
         ByteArrayOutputStream out = null;
-        int y = 0, min = 0;
+        int min = 0;
         try {
             taskExportCommon.getTxtList().add(DateUtil.format(new Date(), Constants.DEFAULT_DATE_PATTERN) + "->开始准备处理导出的成绩简版数据");
             Long examId = (Long) map.get("examId");
@@ -133,7 +133,7 @@ public class TaskMarkResultSimpleExportTemplete implements TaskExportTemplete {
             while (max <= size) {
                 List subList = markResultSimpleExportDtoList.subList(min, max);
                 //绘制数据
-                for (; y < subList.size(); y++) {
+                for (int y = 0; y < subList.size(); y++) {
                     MarkResultSimpleExportDto markResultSimpleExportDto = (MarkResultSimpleExportDto) subList.get(y);
                     int firstRow = y + 1;
                     cellIndex = 0;
@@ -170,7 +170,7 @@ public class TaskMarkResultSimpleExportTemplete implements TaskExportTemplete {
             log.info("导出成绩简版数据结束,============耗时============:{}秒", (end - start) / 1000);
         } catch (Exception e) {
             log.error("导出报错", e);
-            taskExportCommon.exception(min, y, e, taskExportCommon.getTxtList());
+            taskExportCommon.exception(min, e, taskExportCommon.getTxtList());
         } finally {
             //这里写入txt文件
             taskExportCommon.writeExportResultTxt(stringJoiner.toString(), taskExportCommon.getTxtList().toString(), excelFilePath);

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskMarkResultStandardExportTemplete.java

@@ -84,7 +84,7 @@ public class TaskMarkResultStandardExportTemplete implements TaskExportTemplete
         String excelFilePath = null;
         InputStream inputStream = null;
         ByteArrayOutputStream out = null;
-        int y = 0, min = 0;
+        int min = 0;
         try {
             taskExportCommon.getTxtList().add(DateUtil.format(new Date(), Constants.DEFAULT_DATE_PATTERN) + "->开始准备处理导出的成绩标准版数据");
             Long examId = (Long) map.get("examId");
@@ -231,7 +231,7 @@ public class TaskMarkResultStandardExportTemplete implements TaskExportTemplete
             while (max <= size) {
                 List subList = markResultStandardExportDtoList.subList(min, max);
                 //绘制数据
-                for (; y < subList.size(); y++) {
+                for (int y = 0; y < subList.size(); y++) {
                     MarkResultStandardExportDto markResultStandardExportDto = (MarkResultStandardExportDto) subList.get(y);
                     int firstRow = y + 1;
                     cellIndex = 0;
@@ -281,7 +281,7 @@ public class TaskMarkResultStandardExportTemplete implements TaskExportTemplete
             log.info("导出成绩标准版数据结束,============耗时============:{}秒", (end - start) / 1000);
         } catch (Exception e) {
             log.error("导出报错", e);
-            taskExportCommon.exception(min, y, e, taskExportCommon.getTxtList());
+            taskExportCommon.exception(min, e, taskExportCommon.getTxtList());
         } finally {
             //这里写入txt文件
             taskExportCommon.writeExportResultTxt(stringJoiner.toString(), taskExportCommon.getTxtList().toString(), excelFilePath);

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskRoomCodeExportTemplete.java

@@ -58,7 +58,7 @@ public class TaskRoomCodeExportTemplete implements TaskExportTemplete {
         String excelFilePath = null;
         InputStream inputStream = null;
         ByteArrayOutputStream out = null;
-        int y = 0, min = 0;
+        int min = 0;
         try {
             taskExportCommon.getTxtList().add(DateUtil.format(new Date(), Constants.DEFAULT_DATE_PATTERN) + "->开始准备处理导出的考场数据");
             Long examId = (Long) map.get("examId");
@@ -99,7 +99,7 @@ public class TaskRoomCodeExportTemplete implements TaskExportTemplete {
             while (max <= size) {
                 List subList = roomCodeExportDtoList.subList(min, max);
                 //绘制数据
-                for (; y < subList.size(); y++) {
+                for (int y = 0; y < subList.size(); y++) {
                     RoomCodeExportDto roomCodeExportDto = (RoomCodeExportDto) subList.get(y);
                     int firstRow = y + 1;
                     cellIndex = 0;
@@ -133,7 +133,7 @@ public class TaskRoomCodeExportTemplete implements TaskExportTemplete {
             log.info("导出考场数据结束,============耗时============:{}秒", (end - start) / 1000);
         } catch (Exception e) {
             log.error("导出报错", e);
-            taskExportCommon.exception(min, y, e, taskExportCommon.getTxtList());
+            taskExportCommon.exception(min, e, taskExportCommon.getTxtList());
         } finally {
             //这里写入txt文件
             taskExportCommon.writeExportResultTxt(stringJoiner.toString(), taskExportCommon.getTxtList().toString(), excelFilePath);

themis-mq/src/main/java/com/qmth/themis/mq/service/impl/MqLogicServiceImpl.java

@@ -204,7 +204,6 @@ public class MqLogicServiceImpl implements MqLogicService {
      * @param key
      */
     @Override
-    @Transactional
     public void execMqTaskLogic(MqDto mqDto, String key) {
         Gson gson = new Gson();
         Map<String, Object> map = (Map<String, Object>) mqDto.getBody();