From 5e5aeb039a7069c982be50d2469263b65760cc18 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Mon, 24 Nov 2025 12:49:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/WorkTankController.java | 2 +- .../desk/basic/service/BAStartService.java | 21 +++ .../quality/constant/LiquidTankTaskConst.java | 1 + .../controller/CycleTestController.java | 170 +++++++++--------- .../desk/quality/package-info.java | 2 + .../desk/quality/service/QAStartService.java | 2 +- 6 files changed, 112 insertions(+), 86 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/BAStartService.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java index 3f6e42b..f8e1c37 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java @@ -39,7 +39,7 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/WorkTank") +@RequestMapping("/BA/WorkTank") @Tag(name = "[作业槽]", description = "[作业槽]接口") public class WorkTankController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/BAStartService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/BAStartService.java new file mode 100644 index 0000000..e5ee8c0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/BAStartService.java @@ -0,0 +1,21 @@ +package org.springblade.desk.basic.service; + +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.context.event.ApplicationReadyEvent; +import org.springframework.context.event.EventListener; +import org.springframework.stereotype.Service; + +@Service +@Data +@Slf4j +public class BAStartService { + + /** + * 应用启动后执行。 + */ + @EventListener(ApplicationReadyEvent.class) + public void start() { + log.info("====BA基础模块启动成功!===="); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java index 8c4a363..ee7ed48 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java @@ -64,6 +64,7 @@ public interface LiquidTankTaskConst { * 状态-已完成，正常结束 */ Integer STATE_FINISH_OK = 22; + /** * 首测 */ 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 83eb6bd..5540cd4 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,101 +39,103 @@ import java.util.Map; */ @RestController @AllArgsConstructor -@RequestMapping("/QA/cycleTest") +@RequestMapping("/QA/CycleTest") @Tag(name = "[周期试验]", description = "[周期试验]接口") public class CycleTestController extends BladeController { - private final ICycleTestGenService cycleTestGenService; + private final ICycleTestGenService cycleTestGenService; - /** - * [周期试验] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 1) - @Operation(summary = "详情", description = "传入cycleTest") - public R detail(CycleTest cycleTest) { - CycleTest detail = cycleTestGenService.getOne(Condition.getQueryWrapper(cycleTest)); - return R.data(CycleTestGenWrapper.build().entityVO(detail)); - } + /** + * [周期试验] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入cycleTest") + public R detail(CycleTest cycleTest) { + CycleTest detail = cycleTestGenService.getOne(Condition.getQueryWrapper(cycleTest)); + return R.data(CycleTestGenWrapper.build().entityVO(detail)); + } - /** - * [周期试验] 分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入cycleTest") - public R> list(@Parameter(hidden = true) @RequestParam Map cycleTest, Query query) { - IPage pages = cycleTestGenService.page(Condition.getPage(query), Condition.getQueryWrapper(cycleTest, CycleTest.class)); - return R.data(CycleTestGenWrapper.build().pageVO(pages)); - } + /** + * [周期试验] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入cycleTest") + public R> list(@Parameter(hidden = true) @RequestParam Map cycleTest, + Query query) { + IPage pages = cycleTestGenService.page(Condition.getPage(query), + Condition.getQueryWrapper(cycleTest, CycleTest.class)); + return R.data(CycleTestGenWrapper.build().pageVO(pages)); + } - /** - * [周期试验] 自定义分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 3) - @Operation(summary = "分页", description = "传入cycleTest") - public R> page(CycleTestGenVO cycleTest, Query query) { - IPage pages = cycleTestGenService.selectCycleTestPage(Condition.getPage(query), cycleTest); - return R.data(pages); - } + /** + * [周期试验] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入cycleTest") + public R> page(CycleTestGenVO cycleTest, Query query) { + IPage pages = cycleTestGenService.selectCycleTestPage(Condition.getPage(query), cycleTest); + return R.data(pages); + } - /** - * [周期试验] 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @Operation(summary = "新增", description = "传入cycleTest") - public R save(@Valid @RequestBody CycleTest cycleTest) { - return R.status(cycleTestGenService.save(cycleTest)); - } + /** + * [周期试验] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入cycleTest") + public R save(@Valid @RequestBody CycleTest cycleTest) { + return R.status(cycleTestGenService.save(cycleTest)); + } - /** - * [周期试验] 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @Operation(summary = "修改", description = "传入cycleTest") - public R update(@Valid @RequestBody CycleTest cycleTest) { - return R.status(cycleTestGenService.updateById(cycleTest)); - } + /** + * [周期试验] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入cycleTest") + public R update(@Valid @RequestBody CycleTest cycleTest) { + return R.status(cycleTestGenService.updateById(cycleTest)); + } - /** - * [周期试验] 新增或修改 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 6) - @Operation(summary = "新增或修改", description = "传入cycleTest") - public R submit(@Valid @RequestBody CycleTest cycleTest) { - return R.status(cycleTestGenService.saveOrUpdate(cycleTest)); - } + /** + * [周期试验] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入cycleTest") + public R submit(@Valid @RequestBody CycleTest cycleTest) { + return R.status(cycleTestGenService.saveOrUpdate(cycleTest)); + } - /** - * [周期试验] 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 7) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(cycleTestGenService.deleteLogic(Func.toLongList(ids))); - } + /** + * [周期试验] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(cycleTestGenService.deleteLogic(Func.toLongList(ids))); + } - /** - * 导出数据 - */ - @IsAdmin - @GetMapping("/export-cycleTest") - @ApiOperationSupport(order = 8) - @Operation(summary = "导出数据", description = "传入cycleTest") - public void exportCycleTest(@Parameter(hidden = true) @RequestParam Map cycleTest, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(cycleTest, CycleTest.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(CycleTest::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(CycleTestEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = cycleTestGenService.exportCycleTest(queryWrapper); - ExcelUtil.export(response, "[周期试验]数据" + DateUtil.time(), "[周期试验]数据表", list, CycleTestGenExcel.class); - } + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-cycleTest") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入cycleTest") + public void exportCycleTest(@Parameter(hidden = true) @RequestParam Map cycleTest, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(cycleTest, CycleTest.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(CycleTest::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(CycleTestEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = cycleTestGenService.exportCycleTest(queryWrapper); + ExcelUtil.export(response, "[周期试验]数据" + DateUtil.time(), "[周期试验]数据表", list, CycleTestGenExcel.class); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/package-info.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/package-info.java index be8b851..96e8a59 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/package-info.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/package-info.java @@ -47,5 +47,7 @@ * * TEMPERATURE * + * STANDARD + * */ package org.springblade.desk.quality; \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/QAStartService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/QAStartService.java index 25ea99a..dd98565 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/QAStartService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/QAStartService.java @@ -21,6 +21,6 @@ public class QAStartService { */ @EventListener(ApplicationReadyEvent.class) public void start() { - log.info("====QA模块启动成功!===="); + log.info("====QA质量模块启动成功!===="); } }