diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java index 7ccccfe..b759414 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java @@ -39,7 +39,7 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/cycleTest") +@RequestMapping("/qa/cycleTest") @Tag(name = "[周期试验]", description = "[周期试验]接口") public class CycleTestController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java index b88f217..4aa8da4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java @@ -39,7 +39,7 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/cycleTestItem") +@RequestMapping("/qa/cycleTestItem") @Tag(name = "[周期试验项目]", description = "[周期试验项目]接口") public class CycleTestItemController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java index ac595e0..2eddc49 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java @@ -39,7 +39,7 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/cycleTestTask") +@RequestMapping("/qa/cycleTestTask") @Tag(name = "[周期试验任务]", description = "[周期试验任务]接口") public class CycleTestTaskController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java index 528246c..a696fea 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java @@ -39,7 +39,7 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/inspectionItem") +@RequestMapping("/qa/inspectionItem") @Tag(name = "[检验项目]", description = "[检验项目]接口") public class InspectionItemController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java index 0f15ea0..3408fbd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java @@ -39,7 +39,7 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/inspectionResult") +@RequestMapping("/qa/inspectionResult") @Tag(name = "[检验结果]", description = "[检验结果]接口") public class InspectionResultController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index 2d9a28c..dfa7871 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -45,7 +45,7 @@ import java.util.Map; @RestController @Data @EqualsAndHashCode(callSuper = true) -@RequestMapping("/inspectionTask") +@RequestMapping("/qa/inspectionTask") @Tag(name = "[检验任务]", description = "[检验任务]接口") public class InspectionTaskController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java index 5e9db93..f1784bc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java @@ -39,7 +39,7 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/liquidTank") +@RequestMapping("/qa/liquidTank") @Tag(name = "[槽液]", description = "[槽液]接口") public class LiquidTankController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java index 2d6f19c..4ed7139 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java @@ -39,7 +39,7 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/liquidTankTask") +@RequestMapping("/qa/liquidTankTask") @Tag(name = "[槽液检测任务]", description = "[槽液检测任务]接口") public class LiquidTankTaskController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java index ab803e9..ad70f5d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -39,7 +39,7 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/ng") +@RequestMapping("/qa/ng") @Tag(name = "[缺陷]", description = "[缺陷]接口") public class NgController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java index 2e198b0..c4f6939 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java @@ -39,7 +39,7 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/standard") +@RequestMapping("/qa/standard") @Tag(name = "[质量标准]", description = "[质量标准]接口") public class StandardController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java index b67158a..a3be62c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java @@ -39,7 +39,7 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/standardParam") +@RequestMapping("/qa/standardParam") @Tag(name = "[质量标准参数]", description = "[质量标准参数]接口") public class StandardParamController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService.java index f15035d..a8f2b29 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService.java @@ -12,6 +12,7 @@ import org.springblade.desk.quality.mapper.gen.InspectionTaskGenMapper; import org.springblade.desk.quality.pojo.entity.InspectionItem; import org.springblade.desk.quality.pojo.entity.InspectionResult; import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.request.InspectionTaskStart; import org.springframework.stereotype.Service; @@ -58,4 +59,17 @@ public class InspectionTaskService { rFinal.setData(taskNew); return rFinal; } + + public R> searchListPage(InspectionTaskSearch search) { + List list = genMapper.selectList( + new QueryWrapper() + .like("CODE", search.getCode()) + .eq("INSPECTION_TASK_TYPE", search.getInspectionTaskType()) + .orderByDesc(ColBase.ID) + ); + R> rFinal = R.success(""); + rFinal.setData(list); + return rFinal; + } + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/scheduled/LiquidTankTaskScheduledService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/scheduled/LiquidTankTaskScheduledService.java index 0aa7ea2..a19f885 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/scheduled/LiquidTankTaskScheduledService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/scheduled/LiquidTankTaskScheduledService.java @@ -1,31 +1,13 @@ package org.springblade.desk.quality.service.scheduled; -//import org.springframework.stereotype.Component; -//import tech.powerjob.worker.annotation.PowerJobHandler; -//import tech.powerjob.worker.core.processor.TaskContext; -//import tech.powerjob.worker.log.OmsLogger; - import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.List; @Service @Data @Slf4j public class LiquidTankTaskScheduledService { -// /** -// * -// * @return -// */ -// @PowerJobHandler(name = "testEvery2Min") -// public String testEvery2Min(TaskContext tc) { -// OmsLogger l = tc.getOmsLogger(); -// l.debug("test5Min debug level log ok!"); -// l.info("test5Min debug level log ok!"); -// return "test5Min OK."; -// } }