wangliang 3 роки тому
батько
коміт
d8a6ffed6b
13 змінених файлів з 38 додано та 76 видалено
  1. 0 64
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/flow/CustomFlowDto.java
  2. 1 1
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/DataSyncServiceImpl.java
  3. 2 0
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/GradePaperDimensionServiceImpl.java
  4. 2 0
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/TBSyncTaskServiceImpl.java
  5. 6 0
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java
  6. 2 0
      distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/SmsUtils.java
  7. 2 0
      distributed-print/src/main/java/com/qmth/distributed/print/api/GradePaperDimensionController.java
  8. 4 0
      distributed-print/src/main/java/com/qmth/distributed/print/api/SysController.java
  9. 0 4
      distributed-print/src/main/java/com/qmth/distributed/print/api/TSyncExamStudentScoreController.java
  10. 3 3
      teachcloud-common/src/main/java/com/qmth/teachcloud/common/aspect/LogAspect.java
  11. 2 0
      teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java
  12. 12 4
      teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/ConvertUtil.java
  13. 2 0
      teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/ExcelUtil.java

+ 0 - 64
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/flow/CustomFlowDto.java

@@ -69,68 +69,4 @@ public class CustomFlowDto extends CustomFlowCommonDto implements Serializable {
     public void setFlowTaskId(String flowTaskId) {
         this.flowTaskId = flowTaskId;
     }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public CustomFlowTypeEnum getType() {
-        return type;
-    }
-
-    public void setType(CustomFlowTypeEnum type) {
-        this.type = type;
-    }
-
-    public String getContent() {
-        return content;
-    }
-
-    public void setContent(String content) {
-        this.content = content;
-    }
-
-    public Double getW() {
-        return w;
-    }
-
-    public void setW(Double w) {
-        this.w = w;
-    }
-
-    public Double getH() {
-        return h;
-    }
-
-    public void setH(Double h) {
-        this.h = h;
-    }
-
-    public Double getX() {
-        return x;
-    }
-
-    public void setX(Double x) {
-        this.x = x;
-    }
-
-    public Double getY() {
-        return y;
-    }
-
-    public void setY(Double y) {
-        this.y = y;
-    }
-
-    public CustomFlowPropertyDto getProperty() {
-        return property;
-    }
-
-    public void setProperty(CustomFlowPropertyDto property) {
-        this.property = property;
-    }
 }

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

@@ -85,7 +85,7 @@ public class DataSyncServiceImpl implements DataSyncService {
     @Resource
     private CloudMarkingTaskUtils cloudMarkingTaskUtils;
 
-    ExecutorService executorService = Executors.newFixedThreadPool(5);
+//    ExecutorService executorService = Executors.newFixedThreadPool(5);
 
     @Resource
     DictionaryConfig dictionaryConfig;

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

@@ -172,6 +172,8 @@ public class GradePaperDimensionServiceImpl extends ServiceImpl<GradePaperDimens
                 aDatasource.add(aCell);
                 ExcelUtil.excelExport(courseName + "-能力维度导入模板", GradePaperDimensionAbilityDto.class, aDatasource, ServletUtil.getResponse());
                 break;
+            default:
+                break;
         }
     }
 

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

@@ -159,6 +159,8 @@ public class TBSyncTaskServiceImpl extends ServiceImpl<TBSyncTaskMapper, TBSyncT
             case CALCULATE:
                 asyncTeachCloudReportService.startCalc(gradeBatchService.getById(tbSyncTask.getObjectId()));
                 break;
+            default:
+                break;
         }
     }
 }

+ 6 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/templete/service/impl/TaskLogicServiceImpl.java

@@ -1712,6 +1712,8 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 case UNEXPOSED_PAPER: // 未曝光的
                     specialSuccessMessage = "所选择的命题任务中没有未曝光的试卷";
                     break;
+                default:
+                    break;
             }
         }
 
@@ -1828,6 +1830,8 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                             break;
                         case ALL_PAPER: // 全部试卷
                             break;
+                        default:
+                            break;
                     }
                 }
 
@@ -1912,6 +1916,8 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                             courseCount = 1;
                         }
                         break;
+                    default:
+                        break;
                 }
             }
             count = count + courseCount;

+ 2 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/SmsUtils.java

@@ -131,6 +131,8 @@ public class SmsUtils {
                 templateCode = dictionaryConfig.smsDomain().getAliyunSMSAuditCopyUserCode();
                 templateContent = messageEnum.getTemplate();
                 break;
+            default:
+                break;
         }
         result.put("templateContent", templateContent);
         result.put("templateCode", templateCode);

+ 2 - 0
distributed-print/src/main/java/com/qmth/distributed/print/api/GradePaperDimensionController.java

@@ -84,6 +84,8 @@ public class GradePaperDimensionController {
             case ABILITY:
                 gradePaperDimensionService.importGradePaperAbilityDimension(file, paperNumber, paperType, paperName, requestUser);
                 break;
+            default:
+                break;
         }
         return ResultUtil.ok();
     }

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

@@ -530,6 +530,8 @@ public class SysController {
                 case RESULT:
                     path = tbTask.getResultFilePath();
                     break;
+                default:
+                    break;
             }
         }
         if (Objects.isNull(path)) {
@@ -758,6 +760,8 @@ public class SysController {
                     return dictionaryResult;
                 }).collect(Collectors.toList());
                 break;
+            default:
+                break;
         }
         return ResultUtil.ok(dictionaryResultList);
     }

+ 0 - 4
distributed-print/src/main/java/com/qmth/distributed/print/api/TSyncExamStudentScoreController.java

@@ -12,7 +12,6 @@ import com.qmth.distributed.print.business.entity.TBSyncTask;
 import com.qmth.distributed.print.business.entity.TSyncExamStudentScore;
 import com.qmth.distributed.print.business.enums.ExamPrintPlanSyncStatusEnum;
 import com.qmth.distributed.print.business.enums.ImageTrajectoryEnum;
-import com.qmth.distributed.print.business.service.BasicExamService;
 import com.qmth.distributed.print.business.service.ExamPrintPlanService;
 import com.qmth.distributed.print.business.service.PrintCommonService;
 import com.qmth.distributed.print.business.service.TSyncExamStudentScoreService;
@@ -77,9 +76,6 @@ public class TSyncExamStudentScoreController {
     @Resource
     ExamPrintPlanService examPrintPlanService;
 
-    @Resource
-    BasicExamService basicExamService;
-
     @ApiOperation(value = "成绩归档查询列表")
     @ApiResponses({@ApiResponse(code = 200, message = "成绩查询信息", response = TSyncExamStudentScoreResult.class)})
     @RequestMapping(value = "/score/list", method = RequestMethod.POST)

+ 3 - 3
teachcloud-common/src/main/java/com/qmth/teachcloud/common/aspect/LogAspect.java

@@ -77,7 +77,7 @@ public class LogAspect {
         } finally {
             try {
                 //方法执行完成后增加日志
-                addOperationLog(joinPoint, res, endTime - beginTime,runStatus);
+                addOperationLog(joinPoint, res, endTime - beginTime, runStatus);
             } catch (Exception e) {
                 System.out.println("LogAspect 操作失败:" + e.getMessage());
                 e.printStackTrace();
@@ -94,7 +94,7 @@ public class LogAspect {
      * @param time      方法执行时间
      * @param runStatus 方法执行状态
      */
-    private void addOperationLog(JoinPoint joinPoint, Object res, long time,String runStatus) {
+    private void addOperationLog(JoinPoint joinPoint, Object res, long time, String runStatus) {
         SysUser requestUser = (SysUser) ServletUtil.getRequestUser();
         String userName = requestUser.getRealName();
         HttpServletRequest request = ServletUtil.getRequest();
@@ -117,7 +117,7 @@ public class LogAspect {
         operationLog.setReturnValue(JSON.toJSONString(res));
         operationLog.setUserId(requestUser.getId());
         operationLog.setUserName(userName);
-        operationLog.setCreateTime(new Date().getTime());
+        operationLog.setCreateTime(System.currentTimeMillis());
 
         // 注解中的信息
         OperationLogDetail annotation = signature.getMethod().getAnnotation(OperationLogDetail.class);

+ 2 - 0
teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/TeachcloudCommonServiceImpl.java

@@ -991,6 +991,8 @@ public class TeachcloudCommonServiceImpl implements TeachcloudCommonService {
                             .eq(BasicCourse::getCode, paperNumber)
                             .eq(BasicCourse::getSchoolId, schoolId));
                     break;
+                default:
+                    break;
             }
         } while (count > 0);
         return paperNumber;

+ 12 - 4
teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/ConvertUtil.java

@@ -395,10 +395,18 @@ public class ConvertUtil {
             e.printStackTrace();
             throw e;
         } finally {
-            if (doc != null) doc.close();
-            if (os != null) os.close();
-            if (stream != null) stream.close();
-            if (out != null) out.close();
+            if (doc != null) {
+                doc.close();
+            }
+            if (os != null) {
+                os.close();
+            }
+            if (stream != null) {
+                stream.close();
+            }
+            if (out != null) {
+                out.close();
+            }
         }
         return fileList;
     }

+ 2 - 0
teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/ExcelUtil.java

@@ -278,6 +278,8 @@ public class ExcelUtil {
                 return cell.getBooleanCellValue();
             case ERROR:
                 return cell.getErrorCellValue();
+            default:
+                break;
         }
         return null;
     }