diff --git a/eladmin-system/src/main/java/me/zhengjie/common/ResponseCode.java b/eladmin-system/src/main/java/me/zhengjie/common/ResponseCode.java index 858127b..2ff3a30 100644 --- a/eladmin-system/src/main/java/me/zhengjie/common/ResponseCode.java +++ b/eladmin-system/src/main/java/me/zhengjie/common/ResponseCode.java @@ -20,6 +20,7 @@ public enum ResponseCode { // 请求结果性的错误 NODATA_ERROR(1,"查询结果为空"), TASK_BUILD_ERROR(1,"任务建立失败"), + NO_RELEVANT_CONTENT_WAS_FOUND(1,"未查询到相关内容"), DECRYPT_ERROR(1,"解密错误,请联系我"); diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/rest/TaskRecordController.java b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/rest/TaskRecordController.java index acf925c..064392d 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/rest/TaskRecordController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/taskrecord/rest/TaskRecordController.java @@ -21,6 +21,7 @@ import me.zhengjie.common.ResponseCode; import me.zhengjie.modules.abmessage.rest.vo.AbMessageVO; import me.zhengjie.modules.taskrecord.domain.TaskRecord; import me.zhengjie.modules.taskrecord.service.TaskRecordService; +import me.zhengjie.modules.taskrecord.service.dto.TaskRecordDto; import me.zhengjie.modules.taskrecord.service.dto.TaskRecordQueryCriteria; import me.zhengjie.task.SendRecordTask; import org.springframework.beans.factory.annotation.Autowired; @@ -115,6 +116,37 @@ public class TaskRecordController { return new ResponseEntity<>(HttpStatus.OK); } + /** + * 校验发送条数是否合规 + * + * @param sendTotal 本次发送总条数 + * @param id 要进行校验的发送任务包的Id + * @return + */ + @Log("发送课包数目校验") + @ApiOperation("发送课包数目校验") + @PreAuthorize("@el.check('taskRecord:list')") + @PostMapping(value = "/checkSendTotal") + public ResponseEntity checkSendTotal(@RequestParam(value = "sendTotal", defaultValue = "0") Integer sendTotal, + @RequestParam(value = "id")Integer id){ + if (sendTotal == null || id == null){ + return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.EMPTY_ARGUMENT), HttpStatus.OK); + } + + TaskRecordDto dto = taskRecordService.findById(id); + if (dto == null){ + return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.NO_RELEVANT_CONTENT_WAS_FOUND), HttpStatus.OK); + } + // (本次发送数目 + 最后一次发送数目) < 该任务课包总条数 + // TODO: 2020/9/9 0009 编写相关逻辑代码 + + + return new ResponseEntity<>(HttpStatus.OK); + } + + + + @Log("任务课包任务合并") @ApiOperation("任务课包任务合并") @PreAuthorize("@el.check('taskRecord:list')") diff --git a/eladmin-system/src/main/java/me/zhengjie/task/SendRecordTask.java b/eladmin-system/src/main/java/me/zhengjie/task/SendRecordTask.java index 3f3ad3a..0f1da8c 100644 --- a/eladmin-system/src/main/java/me/zhengjie/task/SendRecordTask.java +++ b/eladmin-system/src/main/java/me/zhengjie/task/SendRecordTask.java @@ -61,27 +61,15 @@ public class SendRecordTask { // 遍历所有的待发送路径进行发送 readySendTasks.forEach( task->{ + String localFilePath = task.getLocalFilePath(); try { - // 先查数据库从上次该课包的指定行数开始继续读取指定的行,默认每次发送指定发送条数的数据 - checkReadySendTotal(); - - - - List lines = Files.readAllLines(Paths.get(task)); + // 发送前已经通过前端接口进行发送数目合法性校验 + List lines = Files.readAllLines(Paths.get(localFilePath)); } catch (IOException e) { - log.error("read ready send file fail, send class is {}, ready send file path is {}", this.getClass().getName(), path, e); + log.error("read ready send file fail, send class is {}, ready send file path is {}", this.getClass().getName(), localFilePath, e); } } ); - - // - } - - /** - * 对发送前的 - */ - private void checkReadySendTotal(){ - } }