diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java new file mode 100644 index 00000000..f815b196 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java @@ -0,0 +1,140 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import jakarta.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; +import org.springblade.desk.quality.excel.gen.CycleTestGenExcel; +import org.springblade.desk.quality.wrapper.gen.CycleTestGenWrapper; +import org.springblade.desk.quality.service.gen.ICycleTestGenService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import java.util.Map; +import java.util.List; +import jakarta.servlet.http.HttpServletResponse; + +/** + * [周期试验] 控制器 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/cycleTest") +@Tag(name = "[周期试验]", description = "[周期试验]接口") +public class CycleTestController extends BladeController { + + 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("/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); + } + + /** + * [周期试验] 新增 + */ + @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("/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))); + } + + /** + * 导出数据 + */ + @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-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java new file mode 100644 index 00000000..72e89a4c --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java @@ -0,0 +1,140 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import jakarta.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; +import org.springblade.desk.quality.excel.gen.CycleTestItemGenExcel; +import org.springblade.desk.quality.wrapper.gen.CycleTestItemGenWrapper; +import org.springblade.desk.quality.service.gen.ICycleTestItemGenService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import java.util.Map; +import java.util.List; +import jakarta.servlet.http.HttpServletResponse; + +/** + * [周期试验项目] 控制器 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/cycleTestItem") +@Tag(name = "[周期试验项目]", description = "[周期试验项目]接口") +public class CycleTestItemController extends BladeController { + + private final ICycleTestItemGenService cycleTestItemGenService; + + /** + * [周期试验项目] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入cycleTestItem") + public R detail(CycleTestItem cycleTestItem) { + CycleTestItem detail = cycleTestItemGenService.getOne(Condition.getQueryWrapper(cycleTestItem)); + return R.data(CycleTestItemGenWrapper.build().entityVO(detail)); + } + + /** + * [周期试验项目] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入cycleTestItem") + public R> list(@Parameter(hidden = true) @RequestParam Map cycleTestItem, Query query) { + IPage pages = cycleTestItemGenService.page(Condition.getPage(query), Condition.getQueryWrapper(cycleTestItem, CycleTestItem.class)); + return R.data(CycleTestItemGenWrapper.build().pageVO(pages)); + } + + + /** + * [周期试验项目] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入cycleTestItem") + public R> page(CycleTestItemGenVO cycleTestItem, Query query) { + IPage pages = cycleTestItemGenService.selectCycleTestItemPage(Condition.getPage(query), cycleTestItem); + return R.data(pages); + } + + /** + * [周期试验项目] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入cycleTestItem") + public R save(@Valid @RequestBody CycleTestItem cycleTestItem) { + return R.status(cycleTestItemGenService.save(cycleTestItem)); + } + + /** + * [周期试验项目] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入cycleTestItem") + public R update(@Valid @RequestBody CycleTestItem cycleTestItem) { + return R.status(cycleTestItemGenService.updateById(cycleTestItem)); + } + + /** + * [周期试验项目] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入cycleTestItem") + public R submit(@Valid @RequestBody CycleTestItem cycleTestItem) { + return R.status(cycleTestItemGenService.saveOrUpdate(cycleTestItem)); + } + + /** + * [周期试验项目] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(cycleTestItemGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-cycleTestItem") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入cycleTestItem") + public void exportCycleTestItem(@Parameter(hidden = true) @RequestParam Map cycleTestItem, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(cycleTestItem, CycleTestItem.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(CycleTestItem::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(CycleTestItemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = cycleTestItemGenService.exportCycleTestItem(queryWrapper); + ExcelUtil.export(response, "[周期试验项目]数据" + DateUtil.time(), "[周期试验项目]数据表", list, CycleTestItemGenExcel.class); + } + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java new file mode 100644 index 00000000..36eb4ad4 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java @@ -0,0 +1,140 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import lombok.AllArgsConstructor; +import jakarta.validation.Valid; + +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.Func; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; +import org.springblade.desk.quality.excel.gen.CycleTestTaskGenExcel; +import org.springblade.desk.quality.wrapper.gen.CycleTestTaskGenWrapper; +import org.springblade.desk.quality.service.gen.ICycleTestTaskGenService; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.tool.constant.BladeConstant; +import java.util.Map; +import java.util.List; +import jakarta.servlet.http.HttpServletResponse; + +/** + * [周期试验任务] 控制器 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/cycleTestTask") +@Tag(name = "[周期试验任务]", description = "[周期试验任务]接口") +public class CycleTestTaskController extends BladeController { + + private final ICycleTestTaskGenService cycleTestTaskGenService; + + /** + * [周期试验任务] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入cycleTestTask") + public R detail(CycleTestTask cycleTestTask) { + CycleTestTask detail = cycleTestTaskGenService.getOne(Condition.getQueryWrapper(cycleTestTask)); + return R.data(CycleTestTaskGenWrapper.build().entityVO(detail)); + } + + /** + * [周期试验任务] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入cycleTestTask") + public R> list(@Parameter(hidden = true) @RequestParam Map cycleTestTask, Query query) { + IPage pages = cycleTestTaskGenService.page(Condition.getPage(query), Condition.getQueryWrapper(cycleTestTask, CycleTestTask.class)); + return R.data(CycleTestTaskGenWrapper.build().pageVO(pages)); + } + + + /** + * [周期试验任务] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入cycleTestTask") + public R> page(CycleTestTaskGenVO cycleTestTask, Query query) { + IPage pages = cycleTestTaskGenService.selectCycleTestTaskPage(Condition.getPage(query), cycleTestTask); + return R.data(pages); + } + + /** + * [周期试验任务] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入cycleTestTask") + public R save(@Valid @RequestBody CycleTestTask cycleTestTask) { + return R.status(cycleTestTaskGenService.save(cycleTestTask)); + } + + /** + * [周期试验任务] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入cycleTestTask") + public R update(@Valid @RequestBody CycleTestTask cycleTestTask) { + return R.status(cycleTestTaskGenService.updateById(cycleTestTask)); + } + + /** + * [周期试验任务] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入cycleTestTask") + public R submit(@Valid @RequestBody CycleTestTask cycleTestTask) { + return R.status(cycleTestTaskGenService.saveOrUpdate(cycleTestTask)); + } + + /** + * [周期试验任务] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(cycleTestTaskGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-cycleTestTask") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入cycleTestTask") + public void exportCycleTestTask(@Parameter(hidden = true) @RequestParam Map cycleTestTask, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(cycleTestTask, CycleTestTask.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(CycleTestTask::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(CycleTestTaskEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = cycleTestTaskGenService.exportCycleTestTask(queryWrapper); + ExcelUtil.export(response, "[周期试验任务]数据" + DateUtil.time(), "[周期试验任务]数据表", list, CycleTestTaskGenExcel.class); + } + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestGenExcel.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestGenExcel.java new file mode 100644 index 00000000..42dda761 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestGenExcel.java @@ -0,0 +1,162 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import org.springblade.core.mp.base.BaseEntity; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serial; + + +/** + * [周期试验] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class CycleTestGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [周期试验]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[周期试验]编码") + private String code; + /** + * [周期试验]类型 + */ + @ColumnWidth(20) + @ExcelProperty("[周期试验]类型") + private Long cycleTestType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * [班组]id + */ + @ColumnWidth(20) + @ExcelProperty("[班组]id") + private BigDecimal teamId; + /** + * [供应商]id + */ + @ColumnWidth(20) + @ExcelProperty("[供应商]id") + private BigDecimal supplierId; + /** + * [周期试验项目]id + */ + @ColumnWidth(20) + @ExcelProperty("[周期试验项目]id") + private BigDecimal cycleTestItemId; + /** + * [试验件]id + */ + @ColumnWidth(20) + @ExcelProperty("[试验件]id") + private BigDecimal testId; + /** + * 工艺员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("工艺员[用户]id") + private BigDecimal processEngineerUserId; + /** + * 试验技术员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("试验技术员[用户]id") + private BigDecimal testUserId; + /** + * 镀种 + */ + @ColumnWidth(20) + @ExcelProperty("镀种") + private String plate; + /** + * 生成任务cron表达式 + */ + @ColumnWidth(20) + @ExcelProperty("生成任务cron表达式") + private String cronGenTask; + /** + * 提醒cron表达式 + */ + @ColumnWidth(20) + @ExcelProperty("提醒cron表达式") + private String cronRemind; + /** + * 计划开始cron表达式 + */ + @ColumnWidth(20) + @ExcelProperty("计划开始cron表达式") + private String cronPlannedStart; + /** + * 生成任务说明 + */ + @ColumnWidth(20) + @ExcelProperty("生成任务说明") + private String descGenTask; + /** + * 提醒说明 + */ + @ColumnWidth(20) + @ExcelProperty("提醒说明") + private String descRemind; + /** + * 计划开始说明 + */ + @ColumnWidth(20) + @ExcelProperty("计划开始说明") + private String descPlannedStart; + /** + * 提醒文本 + */ + @ColumnWidth(20) + @ExcelProperty("提醒文本") + private String remindText; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 上次试验日期 + */ + @ColumnWidth(20) + @ExcelProperty("上次试验日期") + private LocalDateTime lastTestDate; + /** + * cron表达式配置OK + */ + @ColumnWidth(20) + @ExcelProperty("cron表达式配置OK") + private Long isCronOk; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestItemGenExcel.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestItemGenExcel.java new file mode 100644 index 00000000..7171563f --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestItemGenExcel.java @@ -0,0 +1,70 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import lombok.Data; + +import java.io.Serializable; +import org.springblade.core.mp.base.BaseEntity; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serial; + + +/** + * [周期试验项目] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class CycleTestItemGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private Long cycleTestItemType; + /** + * 周期试验项目名称 + */ + @ColumnWidth(20) + @ExcelProperty("周期试验项目名称") + private String name; + /** + * 试验条件 + */ + @ColumnWidth(20) + @ExcelProperty("试验条件") + private String condition; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestTaskGenExcel.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestTaskGenExcel.java new file mode 100644 index 00000000..cdb63212 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestTaskGenExcel.java @@ -0,0 +1,155 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import lombok.Data; + +import java.io.Serializable; +import java.math.BigDecimal; +import org.springblade.core.mp.base.BaseEntity; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import java.io.Serial; + + +/** + * [周期试验任务] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class CycleTestTaskGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [周期试验任务]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[周期试验任务]编码") + private String code; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private Long cycleTestTaskType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * 配置[班组]id + */ + @ColumnWidth(20) + @ExcelProperty("配置[班组]id") + private BigDecimal configTeamId; + /** + * 配置[外协商]id + */ + @ColumnWidth(20) + @ExcelProperty("配置[外协商]id") + private BigDecimal configOemId; + /** + * [周期性试验项目]id + */ + @ColumnWidth(20) + @ExcelProperty("[周期性试验项目]id") + private BigDecimal cycleTestItemId; + /** + * [试验件]id + */ + @ColumnWidth(20) + @ExcelProperty("[试验件]id") + private BigDecimal testId; + /** + * 工艺员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("工艺员[用户]id") + private BigDecimal processEngineerUserId; + /** + * 试验技术员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("试验技术员[用户]id") + private BigDecimal testUserId; + /** + * 下发[班组]id + */ + @ColumnWidth(20) + @ExcelProperty("下发[班组]id") + private BigDecimal sendTeamId; + /** + * 下发[外协商]id + */ + @ColumnWidth(20) + @ExcelProperty("下发[外协商]id") + private BigDecimal sendOmeId; + /** + * 下发人员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("下发人员[用户]id") + private BigDecimal snedUserId; + /** + * 数量 + */ + @ColumnWidth(20) + @ExcelProperty("数量") + private Long quantity; + /** + * 镀种 + */ + @ColumnWidth(20) + @ExcelProperty("镀种") + private String plate; + /** + * 零件号 + */ + @ColumnWidth(20) + @ExcelProperty("零件号") + private String partCode; + /** + * 批次号 + */ + @ColumnWidth(20) + @ExcelProperty("批次号") + private String batchCode; + /** + * 专家描述 + */ + @ColumnWidth(20) + @ExcelProperty("专家描述") + private String expertDesc; + /** + * 评审描述 + */ + @ColumnWidth(20) + @ExcelProperty("评审描述") + private String reviewDesc; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.java new file mode 100644 index 00000000..4772fdcd --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; +import org.springblade.desk.quality.excel.gen.CycleTestGenExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * [周期试验] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface CycleTestGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTest 查询参数 + * @return List + */ + List selectCycleTestPage(IPage page, CycleTestGenVO cycleTest); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTest(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml new file mode 100644 index 00000000..8e0e995a --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.java new file mode 100644 index 00000000..47e8ef29 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; +import org.springblade.desk.quality.excel.gen.CycleTestItemGenExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * [周期试验项目] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface CycleTestItemGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTestItem 查询参数 + * @return List + */ + List selectCycleTestItemPage(IPage page, CycleTestItemGenVO cycleTestItem); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTestItem(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.xml b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.xml new file mode 100644 index 00000000..2f14b4b2 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.java new file mode 100644 index 00000000..facb2d30 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; +import org.springblade.desk.quality.excel.gen.CycleTestTaskGenExcel; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import java.util.List; + +/** + * [周期试验任务] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface CycleTestTaskGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTestTask 查询参数 + * @return List + */ + List selectCycleTestTaskPage(IPage page, CycleTestTaskGenVO cycleTestTask); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTestTask(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.xml b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.xml new file mode 100644 index 00000000..0a6ad909 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestGenDTO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestGenDTO.java new file mode 100644 index 00000000..c331e655 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestGenDTO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import org.springblade.desk.quality.pojo.entity.CycleTest; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [周期试验] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestGenDTO extends CycleTest { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestItemGenDTO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestItemGenDTO.java new file mode 100644 index 00000000..86d468d7 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestItemGenDTO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [周期试验项目] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestItemGenDTO extends CycleTestItem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestTaskGenDTO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestTaskGenDTO.java new file mode 100644 index 00000000..6e692159 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestTaskGenDTO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [周期试验任务] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestTaskGenDTO extends CycleTestTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java new file mode 100644 index 00000000..f478e1a8 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java @@ -0,0 +1,136 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; +import java.math.BigDecimal; +import java.time.LocalDateTime; +import org.springblade.core.mp.base.BaseEntity; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [周期试验] 实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@TableName("QA_CYCLE_TEST") +@Schema(description = "CycleTest Entity对象") +@EqualsAndHashCode(callSuper = true) +public class CycleTest extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [周期试验]编码 + */ + @Schema(description = "[周期试验]编码") + private String code; + /** + * [周期试验]类型 + */ + @Schema(description = "[周期试验]类型") + private Long cycleTestType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [班组]id + */ + @Schema(description = "[班组]id") + private BigDecimal teamId; + /** + * [供应商]id + */ + @Schema(description = "[供应商]id") + private BigDecimal supplierId; + /** + * [周期试验项目]id + */ + @Schema(description = "[周期试验项目]id") + private BigDecimal cycleTestItemId; + /** + * [试验件]id + */ + @Schema(description = "[试验件]id") + private BigDecimal testId; + /** + * 工艺员[用户]id + */ + @Schema(description = "工艺员[用户]id") + private BigDecimal processEngineerUserId; + /** + * 试验技术员[用户]id + */ + @Schema(description = "试验技术员[用户]id") + private BigDecimal testUserId; + /** + * 镀种 + */ + @Schema(description = "镀种") + private String plate; + /** + * 生成任务cron表达式 + */ + @Schema(description = "生成任务cron表达式") + private String cronGenTask; + /** + * 提醒cron表达式 + */ + @Schema(description = "提醒cron表达式") + private String cronRemind; + /** + * 计划开始cron表达式 + */ + @Schema(description = "计划开始cron表达式") + private String cronPlannedStart; + /** + * 生成任务说明 + */ + @Schema(description = "生成任务说明") + private String descGenTask; + /** + * 提醒说明 + */ + @Schema(description = "提醒说明") + private String descRemind; + /** + * 计划开始说明 + */ + @Schema(description = "计划开始说明") + private String descPlannedStart; + /** + * 提醒文本 + */ + @Schema(description = "提醒文本") + private String remindText; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 上次试验日期 + */ + @Schema(description = "上次试验日期") + private LocalDateTime lastTestDate; + /** + * cron表达式配置OK + */ + @Schema(description = "cron表达式配置OK") + private Long isCronOk; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java new file mode 100644 index 00000000..7474a43f --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java @@ -0,0 +1,59 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; +import org.springblade.core.mp.base.BaseEntity; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [周期试验项目] 实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@TableName("QA_CYCLE_TEST_ITEM") +@Schema(description = "CycleTestItem Entity对象") +@EqualsAndHashCode(callSuper = true) +public class CycleTestItem extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 类型 + */ + @Schema(description = "类型") + private Long cycleTestItemType; + /** + * 周期试验项目名称 + */ + @Schema(description = "周期试验项目名称") + private String name; + /** + * 试验条件 + */ + @Schema(description = "试验条件") + private String condition; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java new file mode 100644 index 00000000..6a15d27e --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java @@ -0,0 +1,130 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; +import java.math.BigDecimal; +import org.springblade.core.mp.base.BaseEntity; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [周期试验任务] 实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@TableName("QA_CYCLE_TEST_TASK") +@Schema(description = "CycleTestTask Entity对象") +@EqualsAndHashCode(callSuper = true) +public class CycleTestTask extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [周期试验任务]编码 + */ + @Schema(description = "[周期试验任务]编码") + private String code; + /** + * 类型 + */ + @Schema(description = "类型") + private Long cycleTestTaskType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 配置[班组]id + */ + @Schema(description = "配置[班组]id") + private BigDecimal configTeamId; + /** + * 配置[外协商]id + */ + @Schema(description = "配置[外协商]id") + private BigDecimal configOemId; + /** + * [周期性试验项目]id + */ + @Schema(description = "[周期性试验项目]id") + private BigDecimal cycleTestItemId; + /** + * [试验件]id + */ + @Schema(description = "[试验件]id") + private BigDecimal testId; + /** + * 工艺员[用户]id + */ + @Schema(description = "工艺员[用户]id") + private BigDecimal processEngineerUserId; + /** + * 试验技术员[用户]id + */ + @Schema(description = "试验技术员[用户]id") + private BigDecimal testUserId; + /** + * 下发[班组]id + */ + @Schema(description = "下发[班组]id") + private BigDecimal sendTeamId; + /** + * 下发[外协商]id + */ + @Schema(description = "下发[外协商]id") + private BigDecimal sendOmeId; + /** + * 下发人员[用户]id + */ + @Schema(description = "下发人员[用户]id") + private BigDecimal snedUserId; + /** + * 数量 + */ + @Schema(description = "数量") + private Long quantity; + /** + * 镀种 + */ + @Schema(description = "镀种") + private String plate; + /** + * 零件号 + */ + @Schema(description = "零件号") + private String partCode; + /** + * 批次号 + */ + @Schema(description = "批次号") + private String batchCode; + /** + * 专家描述 + */ + @Schema(description = "专家描述") + private String expertDesc; + /** + * 评审描述 + */ + @Schema(description = "评审描述") + private String reviewDesc; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestGenVO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestGenVO.java new file mode 100644 index 00000000..7016c436 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestGenVO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import org.springblade.desk.quality.pojo.entity.CycleTest; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [周期试验] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestGenVO extends CycleTest { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestItemGenVO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestItemGenVO.java new file mode 100644 index 00000000..e792808f --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestItemGenVO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [周期试验项目] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestItemGenVO extends CycleTestItem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestTaskGenVO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestTaskGenVO.java new file mode 100644 index 00000000..509d9f0d --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestTaskGenVO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [周期试验任务] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestTaskGenVO extends CycleTestTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestGenService.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestGenService.java new file mode 100644 index 00000000..ce353ac1 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestGenService.java @@ -0,0 +1,38 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; +import org.springblade.desk.quality.excel.gen.CycleTestGenExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * [周期试验] 服务类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface ICycleTestGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTest 查询参数 + * @return IPage + */ + IPage selectCycleTestPage(IPage page, CycleTestGenVO cycleTest); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTest(Wrapper queryWrapper); + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestItemGenService.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestItemGenService.java new file mode 100644 index 00000000..246a7a98 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestItemGenService.java @@ -0,0 +1,38 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; +import org.springblade.desk.quality.excel.gen.CycleTestItemGenExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * [周期试验项目] 服务类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface ICycleTestItemGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTestItem 查询参数 + * @return IPage + */ + IPage selectCycleTestItemPage(IPage page, CycleTestItemGenVO cycleTestItem); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTestItem(Wrapper queryWrapper); + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestTaskGenService.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestTaskGenService.java new file mode 100644 index 00000000..9ef1351a --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestTaskGenService.java @@ -0,0 +1,38 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; +import org.springblade.desk.quality.excel.gen.CycleTestTaskGenExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * [周期试验任务] 服务类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface ICycleTestTaskGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTestTask 查询参数 + * @return IPage + */ + IPage selectCycleTestTaskPage(IPage page, CycleTestTaskGenVO cycleTestTask); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTestTask(Wrapper queryWrapper); + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestGenServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestGenServiceImpl.java new file mode 100644 index 00000000..ef2583a9 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestGenServiceImpl.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; +import org.springblade.desk.quality.excel.gen.CycleTestGenExcel; +import org.springblade.desk.quality.mapper.gen.CycleTestGenMapper; +import org.springblade.desk.quality.service.gen.ICycleTestGenService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * [周期试验] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Service +public class CycleTestGenServiceImpl extends BaseServiceImpl implements ICycleTestGenService { + + @Override + public IPage selectCycleTestPage(IPage page, CycleTestGenVO cycleTest) { + return page.setRecords(baseMapper.selectCycleTestPage(page, cycleTest)); + } + + @Override + public List exportCycleTest(Wrapper queryWrapper) { + List cycleTestList = baseMapper.exportCycleTest(queryWrapper); + //cycleTestList.forEach(cycleTest -> { + // cycleTest.setTypeName(DictCache.getValue(DictEnum.YES_NO, CycleTest.getType())); + //}); + return cycleTestList; + } + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestItemGenServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestItemGenServiceImpl.java new file mode 100644 index 00000000..c4ea5aa5 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestItemGenServiceImpl.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; +import org.springblade.desk.quality.excel.gen.CycleTestItemGenExcel; +import org.springblade.desk.quality.mapper.gen.CycleTestItemGenMapper; +import org.springblade.desk.quality.service.gen.ICycleTestItemGenService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * [周期试验项目] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Service +public class CycleTestItemGenServiceImpl extends BaseServiceImpl implements ICycleTestItemGenService { + + @Override + public IPage selectCycleTestItemPage(IPage page, CycleTestItemGenVO cycleTestItem) { + return page.setRecords(baseMapper.selectCycleTestItemPage(page, cycleTestItem)); + } + + @Override + public List exportCycleTestItem(Wrapper queryWrapper) { + List cycleTestItemList = baseMapper.exportCycleTestItem(queryWrapper); + //cycleTestItemList.forEach(cycleTestItem -> { + // cycleTestItem.setTypeName(DictCache.getValue(DictEnum.YES_NO, CycleTestItem.getType())); + //}); + return cycleTestItemList; + } + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestTaskGenServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestTaskGenServiceImpl.java new file mode 100644 index 00000000..5b73b173 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestTaskGenServiceImpl.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; +import org.springblade.desk.quality.excel.gen.CycleTestTaskGenExcel; +import org.springblade.desk.quality.mapper.gen.CycleTestTaskGenMapper; +import org.springblade.desk.quality.service.gen.ICycleTestTaskGenService; +import org.springframework.stereotype.Service; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import java.util.List; + +/** + * [周期试验任务] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Service +public class CycleTestTaskGenServiceImpl extends BaseServiceImpl implements ICycleTestTaskGenService { + + @Override + public IPage selectCycleTestTaskPage(IPage page, CycleTestTaskGenVO cycleTestTask) { + return page.setRecords(baseMapper.selectCycleTestTaskPage(page, cycleTestTask)); + } + + @Override + public List exportCycleTestTask(Wrapper queryWrapper) { + List cycleTestTaskList = baseMapper.exportCycleTestTask(queryWrapper); + //cycleTestTaskList.forEach(cycleTestTask -> { + // cycleTestTask.setTypeName(DictCache.getValue(DictEnum.YES_NO, CycleTestTask.getType())); + //}); + return cycleTestTaskList; + } + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestGenWrapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestGenWrapper.java new file mode 100644 index 00000000..3aef3021 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestGenWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; +import java.util.Objects; + +/** + * [周期试验] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public class CycleTestGenWrapper extends BaseEntityWrapper { + + public static CycleTestGenWrapper build() { + return new CycleTestGenWrapper(); + } + + @Override + public CycleTestGenVO entityVO(CycleTest cycleTest) { + CycleTestGenVO cycleTestVO = Objects.requireNonNull(BeanUtil.copyProperties(cycleTest, CycleTestGenVO.class)); + + //User createUser = UserCache.getUser(cycleTest.getCreateUser()); + //User updateUser = UserCache.getUser(cycleTest.getUpdateUser()); + //cycleTestVO.setCreateUserName(createUser.getName()); + //cycleTestVO.setUpdateUserName(updateUser.getName()); + + return cycleTestVO; + } + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestItemGenWrapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestItemGenWrapper.java new file mode 100644 index 00000000..ce99e571 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestItemGenWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; +import java.util.Objects; + +/** + * [周期试验项目] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public class CycleTestItemGenWrapper extends BaseEntityWrapper { + + public static CycleTestItemGenWrapper build() { + return new CycleTestItemGenWrapper(); + } + + @Override + public CycleTestItemGenVO entityVO(CycleTestItem cycleTestItem) { + CycleTestItemGenVO cycleTestItemVO = Objects.requireNonNull(BeanUtil.copyProperties(cycleTestItem, CycleTestItemGenVO.class)); + + //User createUser = UserCache.getUser(cycleTestItem.getCreateUser()); + //User updateUser = UserCache.getUser(cycleTestItem.getUpdateUser()); + //cycleTestItemVO.setCreateUserName(createUser.getName()); + //cycleTestItemVO.setUpdateUserName(updateUser.getName()); + + return cycleTestItemVO; + } + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestTaskGenWrapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestTaskGenWrapper.java new file mode 100644 index 00000000..2aa752ab --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestTaskGenWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; +import java.util.Objects; + +/** + * [周期试验任务] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public class CycleTestTaskGenWrapper extends BaseEntityWrapper { + + public static CycleTestTaskGenWrapper build() { + return new CycleTestTaskGenWrapper(); + } + + @Override + public CycleTestTaskGenVO entityVO(CycleTestTask cycleTestTask) { + CycleTestTaskGenVO cycleTestTaskVO = Objects.requireNonNull(BeanUtil.copyProperties(cycleTestTask, CycleTestTaskGenVO.class)); + + //User createUser = UserCache.getUser(cycleTestTask.getCreateUser()); + //User updateUser = UserCache.getUser(cycleTestTask.getUpdateUser()); + //cycleTestTaskVO.setCreateUserName(createUser.getName()); + //cycleTestTaskVO.setUpdateUserName(updateUser.getName()); + + return cycleTestTaskVO; + } + +} diff --git a/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java b/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java index 04be11b7..61e1b7a9 100644 --- a/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java +++ b/blade-ops/blade-develop/src/test/java/org/springblade/test/CodeGeneratorVer2.java @@ -41,7 +41,7 @@ public class CodeGeneratorVer2 { /** * 代码生成的模块名 */ - public static String CODE_NAME = "[检验任务]"; + public static String CODE_NAME = "[周期试验任务]"; /** * 代码所在服务名 */ @@ -57,7 +57,7 @@ public class CodeGeneratorVer2 { /** * 需要生成的表名(两者只能取其一) */ - public static String[] INCLUDE_TABLES = {"QA_INSPECTION_TASK"}; + public static String[] INCLUDE_TABLES = {"QA_CYCLE_TEST_TASK"}; /** * 需要排除的表名(两者只能取其一) */ 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 new file mode 100644 index 00000000..7ccccfe2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java @@ -0,0 +1,139 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.CycleTestGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; +import org.springblade.desk.quality.service.gen.ICycleTestGenService; +import org.springblade.desk.quality.wrapper.gen.CycleTestGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [周期试验] 控制器 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/cycleTest") +@Tag(name = "[周期试验]", description = "[周期试验]接口") +public class CycleTestController extends BladeController { + + 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("/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); + } + + /** + * [周期试验] 新增 + */ + @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("/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))); + } + + /** + * 导出数据 + */ + @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/controller/CycleTestItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java new file mode 100644 index 00000000..b88f2170 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java @@ -0,0 +1,139 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.CycleTestItemGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; +import org.springblade.desk.quality.service.gen.ICycleTestItemGenService; +import org.springblade.desk.quality.wrapper.gen.CycleTestItemGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [周期试验项目] 控制器 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/cycleTestItem") +@Tag(name = "[周期试验项目]", description = "[周期试验项目]接口") +public class CycleTestItemController extends BladeController { + + private final ICycleTestItemGenService cycleTestItemGenService; + + /** + * [周期试验项目] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入cycleTestItem") + public R detail(CycleTestItem cycleTestItem) { + CycleTestItem detail = cycleTestItemGenService.getOne(Condition.getQueryWrapper(cycleTestItem)); + return R.data(CycleTestItemGenWrapper.build().entityVO(detail)); + } + + /** + * [周期试验项目] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入cycleTestItem") + public R> list(@Parameter(hidden = true) @RequestParam Map cycleTestItem, Query query) { + IPage pages = cycleTestItemGenService.page(Condition.getPage(query), Condition.getQueryWrapper(cycleTestItem, CycleTestItem.class)); + return R.data(CycleTestItemGenWrapper.build().pageVO(pages)); + } + + + /** + * [周期试验项目] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入cycleTestItem") + public R> page(CycleTestItemGenVO cycleTestItem, Query query) { + IPage pages = cycleTestItemGenService.selectCycleTestItemPage(Condition.getPage(query), cycleTestItem); + return R.data(pages); + } + + /** + * [周期试验项目] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入cycleTestItem") + public R save(@Valid @RequestBody CycleTestItem cycleTestItem) { + return R.status(cycleTestItemGenService.save(cycleTestItem)); + } + + /** + * [周期试验项目] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入cycleTestItem") + public R update(@Valid @RequestBody CycleTestItem cycleTestItem) { + return R.status(cycleTestItemGenService.updateById(cycleTestItem)); + } + + /** + * [周期试验项目] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入cycleTestItem") + public R submit(@Valid @RequestBody CycleTestItem cycleTestItem) { + return R.status(cycleTestItemGenService.saveOrUpdate(cycleTestItem)); + } + + /** + * [周期试验项目] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(cycleTestItemGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-cycleTestItem") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入cycleTestItem") + public void exportCycleTestItem(@Parameter(hidden = true) @RequestParam Map cycleTestItem, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(cycleTestItem, CycleTestItem.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(CycleTestItem::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(CycleTestItemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = cycleTestItemGenService.exportCycleTestItem(queryWrapper); + ExcelUtil.export(response, "[周期试验项目]数据" + DateUtil.time(), "[周期试验项目]数据表", list, CycleTestItemGenExcel.class); + } + +} 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 new file mode 100644 index 00000000..ac595e0f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java @@ -0,0 +1,139 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.core.excel.util.ExcelUtil; +import org.springblade.core.mp.support.Condition; +import org.springblade.core.mp.support.Query; +import org.springblade.core.secure.BladeUser; +import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.quality.excel.gen.CycleTestTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; +import org.springblade.desk.quality.service.gen.ICycleTestTaskGenService; +import org.springblade.desk.quality.wrapper.gen.CycleTestTaskGenWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * [周期试验任务] 控制器 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/cycleTestTask") +@Tag(name = "[周期试验任务]", description = "[周期试验任务]接口") +public class CycleTestTaskController extends BladeController { + + private final ICycleTestTaskGenService cycleTestTaskGenService; + + /** + * [周期试验任务] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入cycleTestTask") + public R detail(CycleTestTask cycleTestTask) { + CycleTestTask detail = cycleTestTaskGenService.getOne(Condition.getQueryWrapper(cycleTestTask)); + return R.data(CycleTestTaskGenWrapper.build().entityVO(detail)); + } + + /** + * [周期试验任务] 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入cycleTestTask") + public R> list(@Parameter(hidden = true) @RequestParam Map cycleTestTask, Query query) { + IPage pages = cycleTestTaskGenService.page(Condition.getPage(query), Condition.getQueryWrapper(cycleTestTask, CycleTestTask.class)); + return R.data(CycleTestTaskGenWrapper.build().pageVO(pages)); + } + + + /** + * [周期试验任务] 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入cycleTestTask") + public R> page(CycleTestTaskGenVO cycleTestTask, Query query) { + IPage pages = cycleTestTaskGenService.selectCycleTestTaskPage(Condition.getPage(query), cycleTestTask); + return R.data(pages); + } + + /** + * [周期试验任务] 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入cycleTestTask") + public R save(@Valid @RequestBody CycleTestTask cycleTestTask) { + return R.status(cycleTestTaskGenService.save(cycleTestTask)); + } + + /** + * [周期试验任务] 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入cycleTestTask") + public R update(@Valid @RequestBody CycleTestTask cycleTestTask) { + return R.status(cycleTestTaskGenService.updateById(cycleTestTask)); + } + + /** + * [周期试验任务] 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入cycleTestTask") + public R submit(@Valid @RequestBody CycleTestTask cycleTestTask) { + return R.status(cycleTestTaskGenService.saveOrUpdate(cycleTestTask)); + } + + /** + * [周期试验任务] 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(cycleTestTaskGenService.deleteLogic(Func.toLongList(ids))); + } + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-cycleTestTask") + @ApiOperationSupport(order = 8) + @Operation(summary = "导出数据", description = "传入cycleTestTask") + public void exportCycleTestTask(@Parameter(hidden = true) @RequestParam Map cycleTestTask, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(cycleTestTask, CycleTestTask.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(CycleTestTask::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(CycleTestTaskEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = cycleTestTaskGenService.exportCycleTestTask(queryWrapper); + ExcelUtil.export(response, "[周期试验任务]数据" + DateUtil.time(), "[周期试验任务]数据表", list, CycleTestTaskGenExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestGenExcel.java new file mode 100644 index 00000000..a77bedf2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestGenExcel.java @@ -0,0 +1,161 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; +import java.time.LocalDateTime; + + +/** + * [周期试验] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class CycleTestGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [周期试验]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[周期试验]编码") + private String code; + /** + * [周期试验]类型 + */ + @ColumnWidth(20) + @ExcelProperty("[周期试验]类型") + private Long cycleTestType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * [班组]id + */ + @ColumnWidth(20) + @ExcelProperty("[班组]id") + private BigDecimal teamId; + /** + * [供应商]id + */ + @ColumnWidth(20) + @ExcelProperty("[供应商]id") + private BigDecimal supplierId; + /** + * [周期试验项目]id + */ + @ColumnWidth(20) + @ExcelProperty("[周期试验项目]id") + private BigDecimal cycleTestItemId; + /** + * [试验件]id + */ + @ColumnWidth(20) + @ExcelProperty("[试验件]id") + private BigDecimal testId; + /** + * 工艺员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("工艺员[用户]id") + private BigDecimal processEngineerUserId; + /** + * 试验技术员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("试验技术员[用户]id") + private BigDecimal testUserId; + /** + * 镀种 + */ + @ColumnWidth(20) + @ExcelProperty("镀种") + private String plate; + /** + * 生成任务cron表达式 + */ + @ColumnWidth(20) + @ExcelProperty("生成任务cron表达式") + private String cronGenTask; + /** + * 提醒cron表达式 + */ + @ColumnWidth(20) + @ExcelProperty("提醒cron表达式") + private String cronRemind; + /** + * 计划开始cron表达式 + */ + @ColumnWidth(20) + @ExcelProperty("计划开始cron表达式") + private String cronPlannedStart; + /** + * 生成任务说明 + */ + @ColumnWidth(20) + @ExcelProperty("生成任务说明") + private String descGenTask; + /** + * 提醒说明 + */ + @ColumnWidth(20) + @ExcelProperty("提醒说明") + private String descRemind; + /** + * 计划开始说明 + */ + @ColumnWidth(20) + @ExcelProperty("计划开始说明") + private String descPlannedStart; + /** + * 提醒文本 + */ + @ColumnWidth(20) + @ExcelProperty("提醒文本") + private String remindText; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 上次试验日期 + */ + @ColumnWidth(20) + @ExcelProperty("上次试验日期") + private LocalDateTime lastTestDate; + /** + * cron表达式配置OK + */ + @ColumnWidth(20) + @ExcelProperty("cron表达式配置OK") + private Long isCronOk; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestItemGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestItemGenExcel.java new file mode 100644 index 00000000..bfc09193 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestItemGenExcel.java @@ -0,0 +1,69 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; + + +/** + * [周期试验项目] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class CycleTestItemGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private Long cycleTestItemType; + /** + * 周期试验项目名称 + */ + @ColumnWidth(20) + @ExcelProperty("周期试验项目名称") + private String name; + /** + * 试验条件 + */ + @ColumnWidth(20) + @ExcelProperty("试验条件") + private String condition; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestTaskGenExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestTaskGenExcel.java new file mode 100644 index 00000000..6635bd83 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/gen/CycleTestTaskGenExcel.java @@ -0,0 +1,154 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel.gen; + + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; + + +/** + * [周期试验任务] Excel实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class CycleTestTaskGenExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [周期试验任务]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[周期试验任务]编码") + private String code; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private Long cycleTestTaskType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * 配置[班组]id + */ + @ColumnWidth(20) + @ExcelProperty("配置[班组]id") + private BigDecimal configTeamId; + /** + * 配置[外协商]id + */ + @ColumnWidth(20) + @ExcelProperty("配置[外协商]id") + private BigDecimal configOemId; + /** + * [周期性试验项目]id + */ + @ColumnWidth(20) + @ExcelProperty("[周期性试验项目]id") + private BigDecimal cycleTestItemId; + /** + * [试验件]id + */ + @ColumnWidth(20) + @ExcelProperty("[试验件]id") + private BigDecimal testId; + /** + * 工艺员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("工艺员[用户]id") + private BigDecimal processEngineerUserId; + /** + * 试验技术员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("试验技术员[用户]id") + private BigDecimal testUserId; + /** + * 下发[班组]id + */ + @ColumnWidth(20) + @ExcelProperty("下发[班组]id") + private BigDecimal sendTeamId; + /** + * 下发[外协商]id + */ + @ColumnWidth(20) + @ExcelProperty("下发[外协商]id") + private BigDecimal sendOmeId; + /** + * 下发人员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("下发人员[用户]id") + private BigDecimal snedUserId; + /** + * 数量 + */ + @ColumnWidth(20) + @ExcelProperty("数量") + private Long quantity; + /** + * 镀种 + */ + @ColumnWidth(20) + @ExcelProperty("镀种") + private String plate; + /** + * 零件号 + */ + @ColumnWidth(20) + @ExcelProperty("零件号") + private String partCode; + /** + * 批次号 + */ + @ColumnWidth(20) + @ExcelProperty("批次号") + private String batchCode; + /** + * 专家描述 + */ + @ColumnWidth(20) + @ExcelProperty("专家描述") + private String expertDesc; + /** + * 评审描述 + */ + @ColumnWidth(20) + @ExcelProperty("评审描述") + private String reviewDesc; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.java new file mode 100644 index 00000000..80552bd1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.CycleTestGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; + +import java.util.List; + +/** + * [周期试验] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface CycleTestGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTest 查询参数 + * @return List + */ + List selectCycleTestPage(IPage page, CycleTestGenVO cycleTest); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTest(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml new file mode 100644 index 00000000..8e0e995a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestGenMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.java new file mode 100644 index 00000000..d58c0dae --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.CycleTestItemGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; + +import java.util.List; + +/** + * [周期试验项目] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface CycleTestItemGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTestItem 查询参数 + * @return List + */ + List selectCycleTestItemPage(IPage page, CycleTestItemGenVO cycleTestItem); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTestItem(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.xml new file mode 100644 index 00000000..2f14b4b2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestItemGenMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.java new file mode 100644 index 00000000..4e7abda9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; +import org.springblade.desk.quality.excel.gen.CycleTestTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; + +import java.util.List; + +/** + * [周期试验任务] Mapper 接口 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface CycleTestTaskGenMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTestTask 查询参数 + * @return List + */ + List selectCycleTestTaskPage(IPage page, CycleTestTaskGenVO cycleTestTask); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTestTask(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.xml new file mode 100644 index 00000000..0a6ad909 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/gen/CycleTestTaskGenMapper.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestGenDTO.java new file mode 100644 index 00000000..10e49fcf --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.CycleTest; + +import java.io.Serial; + +/** + * [周期试验] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestGenDTO extends CycleTest { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestItemGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestItemGenDTO.java new file mode 100644 index 00000000..825d9b6d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestItemGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; + +import java.io.Serial; + +/** + * [周期试验项目] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestItemGenDTO extends CycleTestItem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestTaskGenDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestTaskGenDTO.java new file mode 100644 index 00000000..1cfe88f6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/gen/CycleTestTaskGenDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; + +import java.io.Serial; + +/** + * [周期试验任务] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestTaskGenDTO extends CycleTestTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java new file mode 100644 index 00000000..9d70fbf9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java @@ -0,0 +1,137 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; +import java.time.LocalDateTime; + +/** + * [周期试验] 实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@TableName("QA_CYCLE_TEST") +@Schema(description = "CycleTest Entity对象") +@EqualsAndHashCode(callSuper = true) +public class CycleTest extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [周期试验]编码 + */ + @Schema(description = "[周期试验]编码") + private String code; + /** + * [周期试验]类型 + */ + @Schema(description = "[周期试验]类型") + private Long cycleTestType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [班组]id + */ + @Schema(description = "[班组]id") + private BigDecimal teamId; + /** + * [供应商]id + */ + @Schema(description = "[供应商]id") + private BigDecimal supplierId; + /** + * [周期试验项目]id + */ + @Schema(description = "[周期试验项目]id") + private BigDecimal cycleTestItemId; + /** + * [试验件]id + */ + @Schema(description = "[试验件]id") + private BigDecimal testId; + /** + * 工艺员[用户]id + */ + @Schema(description = "工艺员[用户]id") + private BigDecimal processEngineerUserId; + /** + * 试验技术员[用户]id + */ + @Schema(description = "试验技术员[用户]id") + private BigDecimal testUserId; + /** + * 镀种 + */ + @Schema(description = "镀种") + private String plate; + /** + * 生成任务cron表达式 + */ + @Schema(description = "生成任务cron表达式") + private String cronGenTask; + /** + * 提醒cron表达式 + */ + @Schema(description = "提醒cron表达式") + private String cronRemind; + /** + * 计划开始cron表达式 + */ + @Schema(description = "计划开始cron表达式") + private String cronPlannedStart; + /** + * 生成任务说明 + */ + @Schema(description = "生成任务说明") + private String descGenTask; + /** + * 提醒说明 + */ + @Schema(description = "提醒说明") + private String descRemind; + /** + * 计划开始说明 + */ + @Schema(description = "计划开始说明") + private String descPlannedStart; + /** + * 提醒文本 + */ + @Schema(description = "提醒文本") + private String remindText; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 上次试验日期 + */ + @Schema(description = "上次试验日期") + private LocalDateTime lastTestDate; + /** + * cron表达式配置OK + */ + @Schema(description = "cron表达式配置OK") + private Long isCronOk; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java new file mode 100644 index 00000000..0299c203 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java @@ -0,0 +1,60 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; + +/** + * [周期试验项目] 实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@TableName("QA_CYCLE_TEST_ITEM") +@Schema(description = "CycleTestItem Entity对象") +@EqualsAndHashCode(callSuper = true) +public class CycleTestItem extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 类型 + */ + @Schema(description = "类型") + private Long cycleTestItemType; + /** + * 周期试验项目名称 + */ + @Schema(description = "周期试验项目名称") + private String name; + /** + * 试验条件 + */ + @Schema(description = "试验条件") + private String condition; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java new file mode 100644 index 00000000..794922b4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java @@ -0,0 +1,131 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +import java.io.Serial; +import java.math.BigDecimal; + +/** + * [周期试验任务] 实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@TableName("QA_CYCLE_TEST_TASK") +@Schema(description = "CycleTestTask Entity对象") +@EqualsAndHashCode(callSuper = true) +public class CycleTestTask extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [周期试验任务]编码 + */ + @Schema(description = "[周期试验任务]编码") + private String code; + /** + * 类型 + */ + @Schema(description = "类型") + private Long cycleTestTaskType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 配置[班组]id + */ + @Schema(description = "配置[班组]id") + private BigDecimal configTeamId; + /** + * 配置[外协商]id + */ + @Schema(description = "配置[外协商]id") + private BigDecimal configOemId; + /** + * [周期性试验项目]id + */ + @Schema(description = "[周期性试验项目]id") + private BigDecimal cycleTestItemId; + /** + * [试验件]id + */ + @Schema(description = "[试验件]id") + private BigDecimal testId; + /** + * 工艺员[用户]id + */ + @Schema(description = "工艺员[用户]id") + private BigDecimal processEngineerUserId; + /** + * 试验技术员[用户]id + */ + @Schema(description = "试验技术员[用户]id") + private BigDecimal testUserId; + /** + * 下发[班组]id + */ + @Schema(description = "下发[班组]id") + private BigDecimal sendTeamId; + /** + * 下发[外协商]id + */ + @Schema(description = "下发[外协商]id") + private BigDecimal sendOmeId; + /** + * 下发人员[用户]id + */ + @Schema(description = "下发人员[用户]id") + private BigDecimal snedUserId; + /** + * 数量 + */ + @Schema(description = "数量") + private Long quantity; + /** + * 镀种 + */ + @Schema(description = "镀种") + private String plate; + /** + * 零件号 + */ + @Schema(description = "零件号") + private String partCode; + /** + * 批次号 + */ + @Schema(description = "批次号") + private String batchCode; + /** + * 专家描述 + */ + @Schema(description = "专家描述") + private String expertDesc; + /** + * 评审描述 + */ + @Schema(description = "评审描述") + private String reviewDesc; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestGenVO.java new file mode 100644 index 00000000..cb1a6701 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.CycleTest; + +import java.io.Serial; + +/** + * [周期试验] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestGenVO extends CycleTest { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestItemGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestItemGenVO.java new file mode 100644 index 00000000..8a7b1793 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestItemGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; + +import java.io.Serial; + +/** + * [周期试验项目] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestItemGenVO extends CycleTestItem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestTaskGenVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestTaskGenVO.java new file mode 100644 index 00000000..66bccdad --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/gen/CycleTestTaskGenVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo.gen; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; + +import java.io.Serial; + +/** + * [周期试验任务] 视图实体类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CycleTestTaskGenVO extends CycleTestTask { + @Serial + private static final long serialVersionUID = 1L; + +} 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 60ad2f98..f15035d1 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 @@ -41,6 +41,7 @@ public class InspectionTaskService { new QueryWrapper() .eq(ColBase.STATUS, ColValue.STATE_ENABLE) .eq("PROCESS_ID", start.getProcessId()) + .orderByAsc(ColBase.ID) ); if (itemList.isEmpty()) { return R.fail("没有关联的检测项目!"); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java index 07504213..3212313e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService.java @@ -85,7 +85,9 @@ public class LiquidTankTaskService { log.info("========timeout========start"); // 查询出所有未处理的槽液任务 List list = genMapper.selectList(new QueryWrapper() - .eq(ColBase.STATUS, LiquidTankTaskConst.STATUS_HANDLED)); + .eq(ColBase.STATUS, LiquidTankTaskConst.STATUS_HANDLED) + .orderByAsc(ColBase.ID) + ); for (LiquidTankTask task : list) { LiquidTank tank = liquidTankGenMapper.selectById(task.getLiquidTankId()); // todo:对监测员进行提醒。 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestGenService.java new file mode 100644 index 00000000..dfa8ff9b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.CycleTestGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; + +import java.util.List; + +/** + * [周期试验] 服务类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface ICycleTestGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTest 查询参数 + * @return IPage + */ + IPage selectCycleTestPage(IPage page, CycleTestGenVO cycleTest); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTest(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestItemGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestItemGenService.java new file mode 100644 index 00000000..6a66ab24 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestItemGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.CycleTestItemGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; + +import java.util.List; + +/** + * [周期试验项目] 服务类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface ICycleTestItemGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTestItem 查询参数 + * @return IPage + */ + IPage selectCycleTestItemPage(IPage page, CycleTestItemGenVO cycleTestItem); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTestItem(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestTaskGenService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestTaskGenService.java new file mode 100644 index 00000000..6ed2886a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/gen/ICycleTestTaskGenService.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.gen.CycleTestTaskGenExcel; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; + +import java.util.List; + +/** + * [周期试验任务] 服务类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public interface ICycleTestTaskGenService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param cycleTestTask 查询参数 + * @return IPage + */ + IPage selectCycleTestTaskPage(IPage page, CycleTestTaskGenVO cycleTestTask); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCycleTestTask(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestGenServiceImpl.java new file mode 100644 index 00000000..7f508624 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.CycleTestGenExcel; +import org.springblade.desk.quality.mapper.gen.CycleTestGenMapper; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; +import org.springblade.desk.quality.service.gen.ICycleTestGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [周期试验] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Service +public class CycleTestGenServiceImpl extends BaseServiceImpl implements ICycleTestGenService { + + @Override + public IPage selectCycleTestPage(IPage page, CycleTestGenVO cycleTest) { + return page.setRecords(baseMapper.selectCycleTestPage(page, cycleTest)); + } + + @Override + public List exportCycleTest(Wrapper queryWrapper) { + List cycleTestList = baseMapper.exportCycleTest(queryWrapper); + //cycleTestList.forEach(cycleTest -> { + // cycleTest.setTypeName(DictCache.getValue(DictEnum.YES_NO, CycleTest.getType())); + //}); + return cycleTestList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestItemGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestItemGenServiceImpl.java new file mode 100644 index 00000000..b8f04a1c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestItemGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.CycleTestItemGenExcel; +import org.springblade.desk.quality.mapper.gen.CycleTestItemGenMapper; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; +import org.springblade.desk.quality.service.gen.ICycleTestItemGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [周期试验项目] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Service +public class CycleTestItemGenServiceImpl extends BaseServiceImpl implements ICycleTestItemGenService { + + @Override + public IPage selectCycleTestItemPage(IPage page, CycleTestItemGenVO cycleTestItem) { + return page.setRecords(baseMapper.selectCycleTestItemPage(page, cycleTestItem)); + } + + @Override + public List exportCycleTestItem(Wrapper queryWrapper) { + List cycleTestItemList = baseMapper.exportCycleTestItem(queryWrapper); + //cycleTestItemList.forEach(cycleTestItem -> { + // cycleTestItem.setTypeName(DictCache.getValue(DictEnum.YES_NO, CycleTestItem.getType())); + //}); + return cycleTestItemList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestTaskGenServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestTaskGenServiceImpl.java new file mode 100644 index 00000000..b1a1ef96 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/gen/CycleTestTaskGenServiceImpl.java @@ -0,0 +1,41 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl.gen; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.gen.CycleTestTaskGenExcel; +import org.springblade.desk.quality.mapper.gen.CycleTestTaskGenMapper; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; +import org.springblade.desk.quality.service.gen.ICycleTestTaskGenService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [周期试验任务] 服务实现类 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +@Service +public class CycleTestTaskGenServiceImpl extends BaseServiceImpl implements ICycleTestTaskGenService { + + @Override + public IPage selectCycleTestTaskPage(IPage page, CycleTestTaskGenVO cycleTestTask) { + return page.setRecords(baseMapper.selectCycleTestTaskPage(page, cycleTestTask)); + } + + @Override + public List exportCycleTestTask(Wrapper queryWrapper) { + List cycleTestTaskList = baseMapper.exportCycleTestTask(queryWrapper); + //cycleTestTaskList.forEach(cycleTestTask -> { + // cycleTestTask.setTypeName(DictCache.getValue(DictEnum.YES_NO, CycleTestTask.getType())); + //}); + return cycleTestTaskList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestGenWrapper.java new file mode 100644 index 00000000..fa9b7fd8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.CycleTest; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestGenVO; + +import java.util.Objects; + +/** + * [周期试验] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public class CycleTestGenWrapper extends BaseEntityWrapper { + + public static CycleTestGenWrapper build() { + return new CycleTestGenWrapper(); + } + + @Override + public CycleTestGenVO entityVO(CycleTest cycleTest) { + CycleTestGenVO cycleTestVO = Objects.requireNonNull(BeanUtil.copyProperties(cycleTest, CycleTestGenVO.class)); + + //User createUser = UserCache.getUser(cycleTest.getCreateUser()); + //User updateUser = UserCache.getUser(cycleTest.getUpdateUser()); + //cycleTestVO.setCreateUserName(createUser.getName()); + //cycleTestVO.setUpdateUserName(updateUser.getName()); + + return cycleTestVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestItemGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestItemGenWrapper.java new file mode 100644 index 00000000..d68b10a7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestItemGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.CycleTestItem; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestItemGenVO; + +import java.util.Objects; + +/** + * [周期试验项目] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public class CycleTestItemGenWrapper extends BaseEntityWrapper { + + public static CycleTestItemGenWrapper build() { + return new CycleTestItemGenWrapper(); + } + + @Override + public CycleTestItemGenVO entityVO(CycleTestItem cycleTestItem) { + CycleTestItemGenVO cycleTestItemVO = Objects.requireNonNull(BeanUtil.copyProperties(cycleTestItem, CycleTestItemGenVO.class)); + + //User createUser = UserCache.getUser(cycleTestItem.getCreateUser()); + //User updateUser = UserCache.getUser(cycleTestItem.getUpdateUser()); + //cycleTestItemVO.setCreateUserName(createUser.getName()); + //cycleTestItemVO.setUpdateUserName(updateUser.getName()); + + return cycleTestItemVO; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestTaskGenWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestTaskGenWrapper.java new file mode 100644 index 00000000..64cc1c28 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/gen/CycleTestTaskGenWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper.gen; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.CycleTestTask; +import org.springblade.desk.quality.pojo.vo.gen.CycleTestTaskGenVO; + +import java.util.Objects; + +/** + * [周期试验任务] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-11-14 + */ +public class CycleTestTaskGenWrapper extends BaseEntityWrapper { + + public static CycleTestTaskGenWrapper build() { + return new CycleTestTaskGenWrapper(); + } + + @Override + public CycleTestTaskGenVO entityVO(CycleTestTask cycleTestTask) { + CycleTestTaskGenVO cycleTestTaskVO = Objects.requireNonNull(BeanUtil.copyProperties(cycleTestTask, CycleTestTaskGenVO.class)); + + //User createUser = UserCache.getUser(cycleTestTask.getCreateUser()); + //User updateUser = UserCache.getUser(cycleTestTask.getUpdateUser()); + //cycleTestTaskVO.setCreateUserName(createUser.getName()); + //cycleTestTaskVO.setUpdateUserName(updateUser.getName()); + + return cycleTestTaskVO; + } + +}