|
@@ -257,6 +257,31 @@ public class QualityTaskController extends BaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * 获取调度
|
|
|
+ *
|
|
|
+ * @param cronJob
|
|
|
+ * @param request
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @ApiOperation(value = "getDispatch")
|
|
|
+ @GetMapping(value = "/getDispatch/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
|
|
|
+ public ResponseEntity getDispatch(@PathVariable Long id, @ApiIgnore BindingResult bindingResult, @ApiIgnore @CurrentUser User user, HttpServletRequest request) {
|
|
|
+
|
|
|
+ if (bindingResult.hasErrors()) {
|
|
|
+ ResultMap resultMap = new ResultMap(tokenUtils).failAndRefreshToken(request).message(bindingResult.getFieldErrors().get(0).getDefaultMessage());
|
|
|
+ return ResponseEntity.status(resultMap.getCode()).body(resultMap);
|
|
|
+ }
|
|
|
+
|
|
|
+ QualityTask qualityTask = qualityTaskService.getQualityTask(id);
|
|
|
+ CronJob cronJob = null;
|
|
|
+ if (null != qualityTask) {
|
|
|
+ cronJob = cronJobService.getCronJob(qualityTask.getCronJobId(),user);
|
|
|
+ }
|
|
|
+
|
|
|
+ return ResponseEntity.ok(new ResultMap(tokenUtils).successAndRefreshToken(request).payload(cronJob));
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 质量报告
|
|
|
*
|
|
|
* @param user
|
|
@@ -277,7 +302,7 @@ public class QualityTaskController extends BaseController {
|
|
|
|
|
|
List<QualityAuditor> qualityAuditorList = qualityAuditorService.getQualityAuditorListByTaskId(qualityTaskDto.getId(), starTime, endTime);
|
|
|
|
|
|
- if(null == qualityAuditorList || qualityAuditorList.size() == 0){
|
|
|
+ if (null == qualityAuditorList || qualityAuditorList.size() == 0) {
|
|
|
continue;
|
|
|
}
|
|
|
|
|
@@ -288,10 +313,10 @@ public class QualityTaskController extends BaseController {
|
|
|
double averagingIntegrityError = qualityAuditorList.stream().collect(Collectors.averagingInt(QualityAuditor::getIntegrityError));
|
|
|
qualityTaskDto.setIntegrityCorrect(averagingIntegrityCorrect);
|
|
|
qualityTaskDto.setIntegrityError(averagingIntegrityError);
|
|
|
- if((averagingIntegrityCorrect + averagingIntegrityError) == 0){
|
|
|
+ if ((averagingIntegrityCorrect + averagingIntegrityError) == 0) {
|
|
|
qualityTaskDto.setIntegrityCorrectProbability("0%");
|
|
|
qualityTaskDto.setIntegrityErrorProbability("0%");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
qualityTaskDto.setIntegrityCorrectProbability(df.format((float) averagingIntegrityCorrect / (averagingIntegrityCorrect + averagingIntegrityError)));
|
|
|
qualityTaskDto.setIntegrityErrorProbability(df.format((float) averagingIntegrityError / (averagingIntegrityCorrect + averagingIntegrityError)));
|
|
|
}
|
|
@@ -301,10 +326,10 @@ public class QualityTaskController extends BaseController {
|
|
|
double averagingUniformityError = qualityAuditorList.stream().collect(Collectors.averagingInt(QualityAuditor::getUniformityError));
|
|
|
qualityTaskDto.setUniformityCorrect(averagingUniformityCorrect);
|
|
|
qualityTaskDto.setUniformityError(averagingUniformityError);
|
|
|
- if((averagingUniformityCorrect + averagingUniformityError) == 0){
|
|
|
+ if ((averagingUniformityCorrect + averagingUniformityError) == 0) {
|
|
|
qualityTaskDto.setUniformityCorrectProbability("0%");
|
|
|
qualityTaskDto.setUniformityErrorProbability("0%");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
qualityTaskDto.setUniformityCorrectProbability(df.format((float) averagingUniformityCorrect / (averagingUniformityCorrect + averagingUniformityError)));
|
|
|
qualityTaskDto.setUniformityErrorProbability(df.format((float) averagingUniformityError / (averagingUniformityCorrect + averagingUniformityError)));
|
|
|
}
|
|
@@ -313,10 +338,10 @@ public class QualityTaskController extends BaseController {
|
|
|
double averagingNormativeError = qualityAuditorList.stream().collect(Collectors.averagingInt(QualityAuditor::getNormativeError));
|
|
|
qualityTaskDto.setNormativeCorrect(averagingNormativeCorrect);
|
|
|
qualityTaskDto.setNormativeError(averagingNormativeError);
|
|
|
- if((averagingNormativeCorrect + averagingNormativeError) == 0){
|
|
|
+ if ((averagingNormativeCorrect + averagingNormativeError) == 0) {
|
|
|
qualityTaskDto.setNormativeCorrectProbability("0%");
|
|
|
qualityTaskDto.setNormativeErrorProbability("0%");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
qualityTaskDto.setNormativeCorrectProbability(df.format((float) averagingNormativeCorrect / (averagingNormativeCorrect + averagingNormativeError)));
|
|
|
qualityTaskDto.setNormativeErrorProbability(df.format((float) averagingNormativeError / (averagingNormativeCorrect + averagingNormativeError)));
|
|
|
}
|
|
@@ -325,10 +350,10 @@ public class QualityTaskController extends BaseController {
|
|
|
double averagingAccuracyError = qualityAuditorList.stream().collect(Collectors.averagingInt(QualityAuditor::getAccuracyError));
|
|
|
qualityTaskDto.setAccuracyCorrect(averagingAccuracyCorrect);
|
|
|
qualityTaskDto.setAccuracyError(averagingAccuracyError);
|
|
|
- if((averagingAccuracyCorrect + averagingAccuracyError) == 0){
|
|
|
+ if ((averagingAccuracyCorrect + averagingAccuracyError) == 0) {
|
|
|
qualityTaskDto.setAccuracyCorrectProbability("0%");
|
|
|
qualityTaskDto.setAccuracyErrorProbability("0%");
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
qualityTaskDto.setAccuracyCorrectProbability(df.format((float) averagingAccuracyCorrect / (averagingAccuracyCorrect + averagingAccuracyError)));
|
|
|
qualityTaskDto.setAccuracyErrorProbability(df.format((float) averagingAccuracyError / (averagingAccuracyCorrect + averagingAccuracyError)));
|
|
|
}
|