develop-QA
Tom Li 3 weeks ago
parent ff91dfcc7d
commit 5e5aeb039a
  1. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java
  2. 21
      blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/BAStartService.java
  3. 1
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java
  4. 170
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java
  5. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/package-info.java
  6. 2
      blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/QAStartService.java

@ -39,7 +39,7 @@ import java.util.Map;
*/ */
@RestController @RestController
@AllArgsConstructor @AllArgsConstructor
@RequestMapping("/WorkTank") @RequestMapping("/BA/WorkTank")
@Tag(name = "[作业槽]", description = "[作业槽]接口") @Tag(name = "[作业槽]", description = "[作业槽]接口")
public class WorkTankController extends BladeController { public class WorkTankController extends BladeController {

@ -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基础模块启动成功!====");
}
}

@ -64,6 +64,7 @@ public interface LiquidTankTaskConst {
* 状态-已完成正常结束 * 状态-已完成正常结束
*/ */
Integer STATE_FINISH_OK = 22; Integer STATE_FINISH_OK = 22;
/** /**
* 首测 * 首测
*/ */

@ -39,101 +39,103 @@ import java.util.Map;
*/ */
@RestController @RestController
@AllArgsConstructor @AllArgsConstructor
@RequestMapping("/QA/cycleTest") @RequestMapping("/QA/CycleTest")
@Tag(name = "[周期试验]", description = "[周期试验]接口") @Tag(name = "[周期试验]", description = "[周期试验]接口")
public class CycleTestController extends BladeController { public class CycleTestController extends BladeController {
private final ICycleTestGenService cycleTestGenService; private final ICycleTestGenService cycleTestGenService;
/** /**
* [周期试验] 详情 * [周期试验] 详情
*/ */
@GetMapping("/detail") @GetMapping("/detail")
@ApiOperationSupport(order = 1) @ApiOperationSupport(order = 1)
@Operation(summary = "详情", description = "传入cycleTest") @Operation(summary = "详情", description = "传入cycleTest")
public R<CycleTestGenVO> detail(CycleTest cycleTest) { public R<CycleTestGenVO> detail(CycleTest cycleTest) {
CycleTest detail = cycleTestGenService.getOne(Condition.getQueryWrapper(cycleTest)); CycleTest detail = cycleTestGenService.getOne(Condition.getQueryWrapper(cycleTest));
return R.data(CycleTestGenWrapper.build().entityVO(detail)); return R.data(CycleTestGenWrapper.build().entityVO(detail));
} }
/** /**
* [周期试验] 分页 * [周期试验] 分页
*/ */
@GetMapping("/list") @GetMapping("/list")
@ApiOperationSupport(order = 2) @ApiOperationSupport(order = 2)
@Operation(summary = "分页", description = "传入cycleTest") @Operation(summary = "分页", description = "传入cycleTest")
public R<IPage<CycleTestGenVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> cycleTest, Query query) { public R<IPage<CycleTestGenVO>> list(@Parameter(hidden = true) @RequestParam Map<String, Object> cycleTest,
IPage<CycleTest> pages = cycleTestGenService.page(Condition.getPage(query), Condition.getQueryWrapper(cycleTest, CycleTest.class)); Query query) {
return R.data(CycleTestGenWrapper.build().pageVO(pages)); IPage<CycleTest> pages = cycleTestGenService.page(Condition.getPage(query),
} Condition.getQueryWrapper(cycleTest, CycleTest.class));
return R.data(CycleTestGenWrapper.build().pageVO(pages));
}
/** /**
* [周期试验] 自定义分页 * [周期试验] 自定义分页
*/ */
@GetMapping("/page") @GetMapping("/page")
@ApiOperationSupport(order = 3) @ApiOperationSupport(order = 3)
@Operation(summary = "分页", description = "传入cycleTest") @Operation(summary = "分页", description = "传入cycleTest")
public R<IPage<CycleTestGenVO>> page(CycleTestGenVO cycleTest, Query query) { public R<IPage<CycleTestGenVO>> page(CycleTestGenVO cycleTest, Query query) {
IPage<CycleTestGenVO> pages = cycleTestGenService.selectCycleTestPage(Condition.getPage(query), cycleTest); IPage<CycleTestGenVO> pages = cycleTestGenService.selectCycleTestPage(Condition.getPage(query), cycleTest);
return R.data(pages); return R.data(pages);
} }
/** /**
* [周期试验] 新增 * [周期试验] 新增
*/ */
@PostMapping("/save") @PostMapping("/save")
@ApiOperationSupport(order = 4) @ApiOperationSupport(order = 4)
@Operation(summary = "新增", description = "传入cycleTest") @Operation(summary = "新增", description = "传入cycleTest")
public R save(@Valid @RequestBody CycleTest cycleTest) { public R save(@Valid @RequestBody CycleTest cycleTest) {
return R.status(cycleTestGenService.save(cycleTest)); return R.status(cycleTestGenService.save(cycleTest));
} }
/** /**
* [周期试验] 修改 * [周期试验] 修改
*/ */
@PostMapping("/update") @PostMapping("/update")
@ApiOperationSupport(order = 5) @ApiOperationSupport(order = 5)
@Operation(summary = "修改", description = "传入cycleTest") @Operation(summary = "修改", description = "传入cycleTest")
public R update(@Valid @RequestBody CycleTest cycleTest) { public R update(@Valid @RequestBody CycleTest cycleTest) {
return R.status(cycleTestGenService.updateById(cycleTest)); return R.status(cycleTestGenService.updateById(cycleTest));
} }
/** /**
* [周期试验] 新增或修改 * [周期试验] 新增或修改
*/ */
@PostMapping("/submit") @PostMapping("/submit")
@ApiOperationSupport(order = 6) @ApiOperationSupport(order = 6)
@Operation(summary = "新增或修改", description = "传入cycleTest") @Operation(summary = "新增或修改", description = "传入cycleTest")
public R submit(@Valid @RequestBody CycleTest cycleTest) { public R submit(@Valid @RequestBody CycleTest cycleTest) {
return R.status(cycleTestGenService.saveOrUpdate(cycleTest)); return R.status(cycleTestGenService.saveOrUpdate(cycleTest));
} }
/** /**
* [周期试验] 删除 * [周期试验] 删除
*/ */
@PostMapping("/remove") @PostMapping("/remove")
@ApiOperationSupport(order = 7) @ApiOperationSupport(order = 7)
@Operation(summary = "逻辑删除", description = "传入ids") @Operation(summary = "逻辑删除", description = "传入ids")
public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) {
return R.status(cycleTestGenService.deleteLogic(Func.toLongList(ids))); return R.status(cycleTestGenService.deleteLogic(Func.toLongList(ids)));
} }
/** /**
* 导出数据 * 导出数据
*/ */
@IsAdmin @IsAdmin
@GetMapping("/export-cycleTest") @GetMapping("/export-cycleTest")
@ApiOperationSupport(order = 8) @ApiOperationSupport(order = 8)
@Operation(summary = "导出数据", description = "传入cycleTest") @Operation(summary = "导出数据", description = "传入cycleTest")
public void exportCycleTest(@Parameter(hidden = true) @RequestParam Map<String, Object> cycleTest, BladeUser bladeUser, HttpServletResponse response) { public void exportCycleTest(@Parameter(hidden = true) @RequestParam Map<String, Object> cycleTest, BladeUser bladeUser, HttpServletResponse response) {
QueryWrapper<CycleTest> queryWrapper = Condition.getQueryWrapper(cycleTest, CycleTest.class); QueryWrapper<CycleTest> queryWrapper = Condition.getQueryWrapper(cycleTest, CycleTest.class);
//if (!AuthUtil.isAdministrator()) { //if (!AuthUtil.isAdministrator()) {
// queryWrapper.lambda().eq(CycleTest::getTenantId, bladeUser.getTenantId()); // queryWrapper.lambda().eq(CycleTest::getTenantId, bladeUser.getTenantId());
//} //}
//queryWrapper.lambda().eq(CycleTestEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); //queryWrapper.lambda().eq(CycleTestEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<CycleTestGenExcel> list = cycleTestGenService.exportCycleTest(queryWrapper); List<CycleTestGenExcel> list = cycleTestGenService.exportCycleTest(queryWrapper);
ExcelUtil.export(response, "[周期试验]数据" + DateUtil.time(), "[周期试验]数据表", list, CycleTestGenExcel.class); ExcelUtil.export(response, "[周期试验]数据" + DateUtil.time(), "[周期试验]数据表", list, CycleTestGenExcel.class);
} }
} }

@ -47,5 +47,7 @@
* *
* TEMPERATURE * TEMPERATURE
* *
* STANDARD
*
*/ */
package org.springblade.desk.quality; package org.springblade.desk.quality;

@ -21,6 +21,6 @@ public class QAStartService {
*/ */
@EventListener(ApplicationReadyEvent.class) @EventListener(ApplicationReadyEvent.class)
public void start() { public void start() {
log.info("====QA模块启动成功!===="); log.info("====QA质量模块启动成功!====");
} }
} }

Loading…
Cancel
Save