From 63770ba4d6c76180ca426e98c7ec68fbdc77fe32 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Sun, 4 Jan 2026 10:51:29 +0800 Subject: [PATCH 01/22] =?UTF-8?q?setBaseVOValue=20=E5=92=8C=20en=E5=A2=9E?= =?UTF-8?q?=E5=BC=BA=E7=9A=84=E6=96=B9=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/mapper/en/EnBaseMapper.java | 2 +- .../desk/basic/pojo/vo/BaseEntityVO.java | 14 +- .../desk/basic/service/ExBaseService.java | 12 - .../desk/basic/service/en/EnBaseService.java | 12 + .../service/en/impl/EnBaseServiceImpl.java | 93 +++++ .../basic/service/impl/ExBaseServiceImpl.java | 17 - .../desk/quality/constant/AuditFileConst.java | 8 + .../quality/constant/ProReTemplateConst.java | 4 + .../controller/AuditFileController.java | 320 +++++++++--------- .../desk/quality/pojo/vo/ProReTemplateVO.java | 3 - .../quality/service/IAuditFileService.java | 5 +- .../service/IProReTemplateService.java | 3 +- .../service/impl/AuditFileServiceImpl.java | 55 +-- .../impl/ProReTemplateServiceImpl.java | 135 ++++---- 14 files changed, 403 insertions(+), 280 deletions(-) delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ExBaseService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/EnBaseService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/impl/EnBaseServiceImpl.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ExBaseServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/AuditFileConst.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java index 11811aa2..510a3c05 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java @@ -9,5 +9,5 @@ import org.springblade.core.mp.base.BaseEntity; * @param */ public interface EnBaseMapper extends BaseMapper { - + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java index e05c23a4..f0e0ba7a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java @@ -4,8 +4,10 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; + /** - * todo: + * BaseEntity 共用字段对应VO. */ @Data @EqualsAndHashCode() @@ -32,10 +34,18 @@ public class BaseEntityVO { @Schema(description = "维护[用户]id") private Long keepUser = 0L; /** - * + * 维护[用户]-真名 */ @Schema(description = "维护[用户]-真名") private String keepUserRealName = "维护[用户]-真名"; + /** + * 维护时间 + */ + @Schema(description = "维护时间") + private Date keepTime; + /** + * 业务状态 名称 + */ @Schema(description = "业务状态 名称") private String statusName = "statusName"; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ExBaseService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ExBaseService.java deleted file mode 100644 index 39570a64..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ExBaseService.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.springblade.desk.basic.service; - -import org.springblade.core.mp.base.BaseService; - -/** - * 扩展框架中的BaseService. - * - * @param - */ -public interface ExBaseService extends BaseService { - -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/EnBaseService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/EnBaseService.java new file mode 100644 index 00000000..95362667 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/EnBaseService.java @@ -0,0 +1,12 @@ +package org.springblade.desk.basic.service.en; + +import org.springblade.core.mp.base.BaseService; + +/** + * Enhance BaseService. + * + * @param + */ +public interface EnBaseService extends BaseService { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/impl/EnBaseServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/impl/EnBaseServiceImpl.java new file mode 100644 index 00000000..fe78bf6b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/en/impl/EnBaseServiceImpl.java @@ -0,0 +1,93 @@ +package org.springblade.desk.basic.service.en.impl; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.commons.lang3.StringUtils; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.pojo.vo.BaseEntityVO; +import org.springblade.desk.basic.service.en.EnBaseService; +import org.springblade.desk.basic.util.IdUtil; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.ISysClient; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.pojo.entity.Dept; +import org.springblade.system.pojo.entity.UserInfo; + +/** + * Enhance BaseServiceImpl. + * + * @param + * @param + */ +public class EnBaseServiceImpl, T extends BaseEntity> + extends BaseServiceImpl implements EnBaseService { + + /** + * 构建BaseEntityVO + * + * @param userClient feign IUserClient + * @param dictClient feign ISysClient + * @param sysClient feign IDictClient + * @param be 不赋值可以传入null + * @param statusCode 不需要可以传入null + * @return BaseEntityVO + */ + public BaseEntityVO setBaseVOValue(IUserClient userClient, ISysClient sysClient, IDictClient dictClient, + BaseEntity be, String statusCode) { + if (be == null) { + return null; + } + BaseEntityVO bv = new BaseEntityVO(); + R rUICR = null; + R rUIUP = null; + R rDept = null; + // createUserRealName + if (IdUtil.isValid(be.getCreateUser())) { + rUICR = userClient.userInfo(be.getCreateUser()); + if (rUICR != null && rUICR.isSuccess() && + rUICR.getData() != null && rUICR.getData().getUser() != null) { + bv.setCreateUserRealName(rUICR.getData().getUser().getRealName()); + } + } + // updateUserRealName + if (IdUtil.isValid(be.getUpdateUser())) { + rUIUP = userClient.userInfo(be.getUpdateUser()); + if (rUIUP != null && rUIUP.isSuccess() && + rUIUP.getData() != null && rUIUP.getData().getUser() != null) { + bv.setUpdateUserRealName(rUIUP.getData().getUser().getRealName()); + } + } + // createDeptName + if (IdUtil.isValid(be.getCreateDept())) { + rDept = sysClient.getDept(be.getCreateDept()); + if (rDept != null && rDept.isSuccess() && rDept.getData() != null) { + bv.setCreateDeptName(rDept.getData().getDeptName()); + } + } + // setKeepUser setKeepUserRealName setKeepTime + if (be.getCreateTime() != null && be.getUpdateTime() != null) { + if (be.getUpdateTime().after(be.getCreateTime())) { // 更新时间更晚 + bv.setKeepUser(be.getUpdateUser()); + bv.setKeepUserRealName(bv.getUpdateUserRealName()); + bv.setKeepTime(be.getUpdateTime()); + } else { // 等于或更早 + bv.setKeepUser(be.getCreateUser()); + bv.setKeepUserRealName(bv.getCreateUserRealName()); + bv.setKeepTime(be.getCreateTime()); + } + } else if (be.getCreateTime() != null && be.getUpdateTime() == null) { + bv.setKeepUser(be.getCreateUser()); + bv.setKeepUserRealName(bv.getCreateUserRealName()); + bv.setKeepTime(be.getCreateTime()); + } + // statusName + if (StringUtils.isNotBlank(statusCode)) { + R rStatusDic = dictClient.getValue(statusCode, "" + be.getStatus()); + if (rStatusDic != null && rStatusDic.isSuccess() && rStatusDic.getData() != null) { + bv.setStatusName(rStatusDic.getData()); + } + } + return bv; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ExBaseServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ExBaseServiceImpl.java deleted file mode 100644 index 57d9b36c..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ExBaseServiceImpl.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.springblade.desk.basic.service.impl; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.desk.basic.service.ExBaseService; - -/** - * 扩展框架中的BaseServiceImpl. - * - * @param - * @param - */ -public class ExBaseServiceImpl, T extends BaseEntity> - extends BaseServiceImpl implements ExBaseService { - -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/AuditFileConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/AuditFileConst.java new file mode 100644 index 00000000..fb6295f9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/AuditFileConst.java @@ -0,0 +1,8 @@ +package org.springblade.desk.quality.constant; + +public interface AuditFileConst { + + Integer S_NORMAL = 1; + + Integer S_ABANDON = 2; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ProReTemplateConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ProReTemplateConst.java index baf3f7cb..69a19725 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ProReTemplateConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ProReTemplateConst.java @@ -15,6 +15,10 @@ public interface ProReTemplateConst { Integer STATUS_NO = 3; + Integer APPROVAL_STATUS_1 = 1; + Integer APPROVAL_STATUS_2 = 2; + + Integer ONLINE = 1; Integer OFFLINE = 0; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java index 736fadab..96c258ef 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java @@ -40,6 +40,7 @@ import java.util.stream.Collectors; /** * [工艺文件] 控制器 + * mes v1: * * @author Tom Shuo * @since 2025-12-22 @@ -54,184 +55,191 @@ import java.util.stream.Collectors; public class AuditFileController extends BladeController { @Resource - private IAuditFileService service; - - /** - * [工艺文件] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入AuditFile Obj") - public R detail(AuditFile auditFile) { - QueryWrapper qw = Condition.getQueryWrapper(auditFile); - AuditFile detail = service.getOne(qw); - AuditFileVO detailVO = AuditFileWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [工艺文件] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入AuditFile Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map auditFile, - Query query) { + private IAuditFileService service; + + /** + * [工艺文件] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入AuditFile Obj") + public R detail(AuditFile auditFile) { + QueryWrapper qw = Condition.getQueryWrapper(auditFile); + AuditFile detail = service.getOne(qw); + AuditFileVO detailVO = AuditFileWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [工艺文件] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入AuditFile Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map auditFile, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(auditFile, AuditFile.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = AuditFileWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [工艺文件] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入AuditFile Obj") - public R> page(AuditFileVO auditFile, Query query) { - IPage pagesVO = service.selectAuditFilePage( - Condition.getPage(query), auditFile - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = AuditFileWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [工艺文件] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入AuditFile Obj") + public R> page(AuditFileVO auditFile, Query query) { + IPage pagesVO = service.selectAuditFilePage( + Condition.getPage(query), auditFile + ); + return R.data(pagesVO); + } + + /** * [工艺文件] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = AuditFileWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = AuditFileWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [工艺文件] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入AuditFile Obj") + public R save(@Valid @RequestBody AuditFile addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [工艺文件] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入AuditFile Obj") - public R save(@Valid @RequestBody AuditFile addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [工艺文件] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入AuditFile List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [工艺文件] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入AuditFile Obj") - public R update(@Valid @RequestBody AuditFile updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入AuditFile List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [工艺文件] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入AuditFile Obj") + public R update(@Valid @RequestBody AuditFile updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [工艺文件] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入AuditFile List") + @Operation(summary = "修改批量", description = "传入AuditFile List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [工艺文件] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入AuditFile Obj") - public R submit(@Valid @RequestBody AuditFile mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [工艺文件] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入AuditFile Obj") + public R submit(@Valid @RequestBody AuditFile mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [工艺文件] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入AuditFile List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [工艺文件] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [工艺文件] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入AuditFile") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map auditFile, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(auditFile, AuditFile.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(AuditFile::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(AuditFileEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportAuditFile(qw); - ExcelUtil.export(response, "[工艺文件]数据" + DateUtil.time(), - "[工艺文件]数据表", list, AuditFileExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入AuditFile List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [工艺文件] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [工艺文件] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入AuditFile") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map auditFile, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(auditFile, AuditFile.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(AuditFile::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(AuditFileEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportAuditFile(qw); + ExcelUtil.export(response, "[工艺文件]数据" + DateUtil.time(), + "[工艺文件]数据表", list, AuditFileExcel.class); + } + + /** * [工艺文件] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [工艺文件] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, AuditFile.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [工艺文件] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, AuditFile.class + ); + return R.status(service.saveBatch(importList)); + } + + @PostMapping("/upgradeVer") + @ApiOperationSupport(order = 50) + @Operation(summary = "升版", description = "传入AuditFile Obj") + public R upgradeVer(@Valid @RequestBody AuditFile find) { + return service.upgradeVer(find); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java index 1fbc8607..f0e2d93e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java @@ -23,9 +23,6 @@ import java.util.List; public class ProReTemplateVO extends ProReTemplate { @Serial private static final long serialVersionUID = 1L; - /** - * todo: - */ @Schema(description = "base信息字段") private BaseEntityVO base; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java index 2bf11cff..bba72eb9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; import org.springblade.desk.quality.pojo.vo.AuditFileVO; @@ -19,7 +20,7 @@ import java.util.List; * @author Tom Shuo * @since 2025-12-22 */ -public interface IAuditFileService extends BaseService { +public interface IAuditFileService extends EnBaseService { /** * 自定义分页 * @@ -43,5 +44,5 @@ public interface IAuditFileService extends BaseService { */ void setVOValue(AuditFileVO vo); - R upgradeVer(Long id); + R upgradeVer(AuditFile find); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java index 11cfef4c..89dc56ac 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.v3.oas.annotations.Parameter; import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.ProReTemplateExcel; import org.springblade.desk.quality.pojo.entity.ProReTemplate; import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO; @@ -22,7 +23,7 @@ import java.util.List; * @author Tom Shuo * @since 2025-12-22 */ -public interface IProReTemplateService extends BaseService { +public interface IProReTemplateService extends EnBaseService { /** * 自定义分页 * diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java index a4e32882..de5d0928 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.quality.service.impl; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.annotation.Resource; @@ -12,11 +13,15 @@ import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; +import org.springblade.desk.quality.constant.AuditFileConst; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.mapper.AuditFileMapper; import org.springblade.desk.quality.pojo.entity.AuditFile; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import org.springblade.desk.quality.service.IAuditFileService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; @@ -33,32 +38,44 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -public class AuditFileServiceImpl extends BaseServiceImpl implements IAuditFileService { +public class AuditFileServiceImpl extends EnBaseServiceImpl + implements IAuditFileService { @Resource private IUserClient userClient; + @Resource + private ISysClient sysClient; + @Resource + private IDictClient dictClient; - @Override - public IPage selectAuditFilePage(IPage page, AuditFileVO auditFile) { - return page.setRecords(baseMapper.selectAuditFilePage(page, auditFile)); - } + @Override + public IPage selectAuditFilePage(IPage page, AuditFileVO auditFile) { + return page.setRecords(baseMapper.selectAuditFilePage(page, auditFile)); + } - @Override - public List exportAuditFile(Wrapper queryWrapper) { - List auditFileList = baseMapper.exportAuditFile(queryWrapper); - //auditFileList.forEach(auditFile -> { - // auditFile.setTypeName(DictCache.getValue(DictEnum.YES_NO, AuditFile.getType())); - //}); - return auditFileList; - } + @Override + public List exportAuditFile(Wrapper queryWrapper) { + List auditFileList = baseMapper.exportAuditFile(queryWrapper); + //auditFileList.forEach(auditFile -> { + // auditFile.setTypeName(DictCache.getValue(DictEnum.YES_NO, AuditFile.getType())); + //}); + return auditFileList; + } - @Override + @Override public void setVOValue(AuditFileVO vo) { - + vo.setBase(setBaseVOValue(userClient, sysClient, dictClient, vo, "AuditFile-Status")); } - @Override - public R upgradeVer(Long id) { - return null; - } + @Override + public R upgradeVer(AuditFile find) { + AuditFile create = new AuditFile(); + BeanUtil.copyProperties(find, create); + find.setStatus(AuditFileConst.S_ABANDON); + create.setStatus(AuditFileConst.S_NORMAL); + create.setId(null); + updateById(find); + save(create); + return R.success("升版成功"); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java index 2d82f75d..407a7bb3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java @@ -16,6 +16,7 @@ import org.springblade.core.mp.base.BaseEntity; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.pojo.vo.BaseEntityVO; +import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; import org.springblade.desk.quality.constant.ProReTemplateConst; import org.springblade.desk.quality.excel.ProReTemplateExcel; import org.springblade.desk.quality.mapper.ProReTemplateMapper; @@ -35,8 +36,7 @@ import org.springblade.system.pojo.entity.User; import org.springblade.system.pojo.entity.UserInfo; import org.springframework.stereotype.Service; -import java.util.Comparator; -import java.util.List; +import java.util.*; import java.util.stream.Collectors; /** @@ -50,7 +50,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -public class ProReTemplateServiceImpl extends BaseServiceImpl +public class ProReTemplateServiceImpl extends EnBaseServiceImpl implements IProReTemplateService { @Resource @@ -80,75 +80,76 @@ public class ProReTemplateServiceImpl extends BaseServiceImpl tankVOList = tankService.getListByTemplateId(vo.getId()); - if (tankVOList != null && !tankVOList.isEmpty()) { - // 根据插入序号 getInsertIndex 排序 生成新的list - tankVOList = tankVOList.stream() - .sorted(Comparator.comparingInt(ProReTemplateTankVO::getInsertIndex)) - .collect(Collectors.toList()); - vo.setPreserveSlotList(tankVOList); - for (ProReTemplateTankVO tankVO : vo.getPreserveSlotList()) { - List detailVOList = detailService.getListByTemplateTankId(tankVO.getId()); - tankVO.setChildrenList(detailVOList); - } + // 根据插入序号 getInsertIndex 排序 生成新的list todo: +// tankVOList = Optional.ofNullable(tankVOList) +// .orElse(Collections.emptyList()) +// .stream() +// .filter(Objects::nonNull) +// .sorted(Comparator.comparingInt(ProReTemplateTankVO::getInsertIndex)) +// .collect(Collectors.toList()); + vo.setPreserveSlotList(tankVOList); + for (ProReTemplateTankVO tankVO : vo.getPreserveSlotList()) { + List detailVOList = detailService.getListByTemplateTankId(tankVO.getId()); + tankVO.setChildrenList(detailVOList); } } - /** - * 构建BaseEntityVO - * - * @param be 不赋值可以传入null - * @param statusCode 不需要可以传null - * @return BaseEntityVO - */ - public BaseEntityVO setBaseVOValue(BaseEntity be, String statusCode) { - if (be == null) { - return null; - } - BaseEntityVO bv = new BaseEntityVO(); - R rUICR = null; - R rUIUP = null; - R rDept = null; - if (IdUtil.isValid(be.getCreateUser())) { - rUICR = userClient.userInfo(be.getCreateUser()); - if (rUICR != null && rUICR.isSuccess() && - rUICR.getData() != null && rUICR.getData().getUser() != null) { - bv.setCreateUserRealName(rUICR.getData().getUser().getRealName()); - } - - } - if (IdUtil.isValid(be.getUpdateUser())) { - rUIUP = userClient.userInfo(be.getUpdateUser()); - if (rUIUP != null && rUIUP.isSuccess() && - rUIUP.getData() != null && rUIUP.getData().getUser() != null) { - bv.setUpdateUserRealName(rUIUP.getData().getUser().getRealName()); - } - } - if (IdUtil.isValid(be.getCreateDept())) { - rDept = sysClient.getDept(be.getCreateDept()); - if (rDept != null && rDept.isSuccess() && rDept.getData() != null) { - bv.setCreateDeptName(rDept.getData().getDeptName()); - } - } - if (be.getCreateTime() != null && be.getUpdateTime() != null) { - if (be.getUpdateTime().after(be.getCreateTime())) { // 更新时间更晚 - bv.setKeepUser(be.getUpdateUser()); - bv.setKeepUserRealName(bv.getUpdateUserRealName()); - } else { // 等于或更早 - bv.setKeepUser(be.getCreateUser()); - bv.setKeepUserRealName(bv.getCreateUserRealName()); - } - } - if (StringUtils.isNotBlank(statusCode)) { - R rStatusDic = dictClient.getValue(statusCode, "" + be.getStatus()); - if (rStatusDic != null && rStatusDic.isSuccess() && rStatusDic.getData() != null) { - bv.setStatusName(rStatusDic.getData()); - } - } - return bv; - } +// /** +// * 构建BaseEntityVO +// * +// * @param be 不赋值可以传入null +// * @param statusCode 不需要可以传入null +// * @return BaseEntityVO +// */ +// public BaseEntityVO setBaseVOValue(BaseEntity be, String statusCode) { +// if (be == null) { +// return null; +// } +// BaseEntityVO bv = new BaseEntityVO(); +// R rUICR = null; +// R rUIUP = null; +// R rDept = null; +// if (IdUtil.isValid(be.getCreateUser())) { +// rUICR = userClient.userInfo(be.getCreateUser()); +// if (rUICR != null && rUICR.isSuccess() && +// rUICR.getData() != null && rUICR.getData().getUser() != null) { +// bv.setCreateUserRealName(rUICR.getData().getUser().getRealName()); +// } +// +// } +// if (IdUtil.isValid(be.getUpdateUser())) { +// rUIUP = userClient.userInfo(be.getUpdateUser()); +// if (rUIUP != null && rUIUP.isSuccess() && +// rUIUP.getData() != null && rUIUP.getData().getUser() != null) { +// bv.setUpdateUserRealName(rUIUP.getData().getUser().getRealName()); +// } +// } +// if (IdUtil.isValid(be.getCreateDept())) { +// rDept = sysClient.getDept(be.getCreateDept()); +// if (rDept != null && rDept.isSuccess() && rDept.getData() != null) { +// bv.setCreateDeptName(rDept.getData().getDeptName()); +// } +// } +// if (be.getCreateTime() != null && be.getUpdateTime() != null) { +// if (be.getUpdateTime().after(be.getCreateTime())) { // 更新时间更晚 +// bv.setKeepUser(be.getUpdateUser()); +// bv.setKeepUserRealName(bv.getUpdateUserRealName()); +// } else { // 等于或更早 +// bv.setKeepUser(be.getCreateUser()); +// bv.setKeepUserRealName(bv.getCreateUserRealName()); +// } +// } +// if (StringUtils.isNotBlank(statusCode)) { +// R rStatusDic = dictClient.getValue(statusCode, "" + be.getStatus()); +// if (rStatusDic != null && rStatusDic.isSuccess() && rStatusDic.getData() != null) { +// bv.setStatusName(rStatusDic.getData()); +// } +// } +// return bv; +// } @Override public R updateDetail(ProReTemplateVO vo) { From 0842981456cdf2c179cb9debba4e3833f93edc1b Mon Sep 17 00:00:00 2001 From: Tom Li Date: Sun, 4 Jan 2026 10:52:01 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=8D=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProReTemplateServiceImpl.java | 56 +------------------ 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java index 407a7bb3..ca120e43 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java @@ -96,61 +96,7 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl rUICR = null; -// R rUIUP = null; -// R rDept = null; -// if (IdUtil.isValid(be.getCreateUser())) { -// rUICR = userClient.userInfo(be.getCreateUser()); -// if (rUICR != null && rUICR.isSuccess() && -// rUICR.getData() != null && rUICR.getData().getUser() != null) { -// bv.setCreateUserRealName(rUICR.getData().getUser().getRealName()); -// } -// -// } -// if (IdUtil.isValid(be.getUpdateUser())) { -// rUIUP = userClient.userInfo(be.getUpdateUser()); -// if (rUIUP != null && rUIUP.isSuccess() && -// rUIUP.getData() != null && rUIUP.getData().getUser() != null) { -// bv.setUpdateUserRealName(rUIUP.getData().getUser().getRealName()); -// } -// } -// if (IdUtil.isValid(be.getCreateDept())) { -// rDept = sysClient.getDept(be.getCreateDept()); -// if (rDept != null && rDept.isSuccess() && rDept.getData() != null) { -// bv.setCreateDeptName(rDept.getData().getDeptName()); -// } -// } -// if (be.getCreateTime() != null && be.getUpdateTime() != null) { -// if (be.getUpdateTime().after(be.getCreateTime())) { // 更新时间更晚 -// bv.setKeepUser(be.getUpdateUser()); -// bv.setKeepUserRealName(bv.getUpdateUserRealName()); -// } else { // 等于或更早 -// bv.setKeepUser(be.getCreateUser()); -// bv.setKeepUserRealName(bv.getCreateUserRealName()); -// } -// } -// if (StringUtils.isNotBlank(statusCode)) { -// R rStatusDic = dictClient.getValue(statusCode, "" + be.getStatus()); -// if (rStatusDic != null && rStatusDic.isSuccess() && rStatusDic.getData() != null) { -// bv.setStatusName(rStatusDic.getData()); -// } -// } -// return bv; -// } - + @Override public R updateDetail(ProReTemplateVO vo) { for (ProReTemplateTankVO tankOne : vo.getPreserveSlotList()) { From 4bfe03cf15914aee880056e3b2a80b1fea8d8ba3 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Sun, 4 Jan 2026 11:50:30 +0800 Subject: [PATCH 03/22] =?UTF-8?q?AuditFile=E7=9B=B8=E5=85=B3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/constant/BaseRequest.java | 43 ++++++++++++++----- .../desk/basic/pojo/vo/BaseEntityVO.java | 8 ++-- .../controller/AuditFileController.java | 14 ++++-- .../InspectionTemplateController.java | 12 +++--- .../LiquidTankTaskCopyController.java | 8 ++-- .../desk/quality/mapper/AuditFileMapper.java | 3 ++ .../desk/quality/mapper/AuditFileMapper.xml | 17 ++++++++ .../quality/pojo/request/AuditFileSearch.java | 14 ++++++ .../quality/service/IAuditFileService.java | 5 +++ .../service/impl/AuditFileServiceImpl.java | 8 ++++ .../impl/ProReTemplateServiceImpl.java | 2 +- 11 files changed, 104 insertions(+), 30 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java index b8e7a8e5..54168a1f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseRequest.java @@ -2,15 +2,36 @@ package org.springblade.desk.basic.constant; public interface BaseRequest { - String CR_REAL_NAME = "createUserRealName"; - - String UP_REAL_NAME = "updateUserRealName"; - - String CR_TIME_START = "createTimeStart"; - - String CR_TIME_END = "createTimeEnd"; - - String UP_TIME_START = "updateTimeStart"; - - String UP_TIME_END = "updateTimeEnd"; + /** + * 创建[用户]-真名 + */ + String CREATE_USER_REAL_NAME = "createUserRealName"; + /** + * 创建[部门]-部门名 + */ + String CREATE_DEPT_NAME = "createDeptName"; + /** + * + */ + String CREATE_TIME_START = "createTimeStart"; + /** + * + */ + String CREATE_TIME_END = "createTimeEnd"; + /** + * 更新[用户]-真名 + */ + String UPDATE_USER_REAL_NAME = "updateUserRealName"; + /** + * + */ + String UPDATE_TIME_START = "updateTimeStart"; + /** + * + */ + String UPDATE_TIME_END = "updateTimeEnd"; + /** + * + */ + String KEEP_USER_REAL_NAME = "keepUserRealName"; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java index f0e0ba7a..2739c5aa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java @@ -17,7 +17,7 @@ public class BaseEntityVO { * 创建[用户]-真名 */ @Schema(description = "创建[用户]-真名") - private String createUserRealName = "创建[用户]-真名"; + private String createUserRealName = ""; /** * 创建[部门]-部门名 */ @@ -27,7 +27,7 @@ public class BaseEntityVO { * 更新[用户]-真名 */ @Schema(description = "更新用户-真名") - private String updateUserRealName = "更新用户-真名"; + private String updateUserRealName = ""; /** * 维护[用户]id */ @@ -37,7 +37,7 @@ public class BaseEntityVO { * 维护[用户]-真名 */ @Schema(description = "维护[用户]-真名") - private String keepUserRealName = "维护[用户]-真名"; + private String keepUserRealName = ""; /** * 维护时间 */ @@ -47,5 +47,5 @@ public class BaseEntityVO { * 业务状态 名称 */ @Schema(description = "业务状态 名称") - private String statusName = "statusName"; + private String statusName = ""; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java index 96c258ef..af509792 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java @@ -24,9 +24,11 @@ import org.springblade.core.secure.BladeUser; 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.basic.constant.BaseRequest; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import org.springblade.desk.quality.service.IAuditFileService; import org.springblade.desk.quality.wrapper.AuditFileWrapper; @@ -77,10 +79,15 @@ public class AuditFileController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 20) @Operation(summary = "list分页", description = "传入AuditFile Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map auditFile, + public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(auditFile, AuditFile.class); - IPage pages = service.page(Condition.getPage(query), qw); + QueryWrapper qw = Condition.getQueryWrapper(map, AuditFile.class); + AuditFileSearch search = new AuditFileSearch(); + // todo: Func 用法 + search.setPpsId(Func.toLong(map.get(AuditFile.COL_PPS_ID))); + search.setPqId(Func.toLong(map.get(AuditFile.COL_PQ_ID))); + search.setKeepUserRealName(Func.toStr(map.get(BaseRequest.KEEP_USER_REAL_NAME))); + IPage pages = service.listSearch(Condition.getPage(query), search); IPage pagesVO = AuditFileWrapper.build().pageVO(pages); pagesVO.getRecords() .stream() @@ -89,7 +96,6 @@ public class AuditFileController extends BladeController { return R.data(pagesVO); } - /** * [工艺文件] page分页 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java index e286263e..7e3e0404 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java @@ -103,18 +103,18 @@ public class InspectionTemplateController extends BladeController { if (map.containsKey("processNum")) { search.setProcessNum(Integer.parseInt((String) map.get("processNum"))); } - if (map.containsKey(BaseRequest.UP_REAL_NAME)) { - search.setUpdateUserRealName((String) map.get(BaseRequest.UP_REAL_NAME)); + if (map.containsKey(BaseRequest.UPDATE_USER_REAL_NAME)) { + search.setUpdateUserRealName((String) map.get(BaseRequest.UPDATE_USER_REAL_NAME)); } if (map.containsKey(InspectionTemplate.COL_CATEGORY)) { search.setCategory((String) map.get(InspectionTemplate.COL_CATEGORY)); } - if (map.containsKey(BaseRequest.UP_REAL_NAME)) { - search.setUpdateUserRealName((String) map.get(BaseRequest.UP_REAL_NAME)); + if (map.containsKey(BaseRequest.UPDATE_USER_REAL_NAME)) { + search.setUpdateUserRealName((String) map.get(BaseRequest.UPDATE_USER_REAL_NAME)); } // if (map.containsKey(BaseRequest.UP_TIME_START) && map.containsKey(BaseRequest.UP_TIME_END)) { - Date upStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.UP_TIME_START); - Date upEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.UP_TIME_END); + Date upStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.UPDATE_TIME_START); + Date upEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.UPDATE_TIME_END); search.setUpdateTimeStart(upStart); search.setUpdateTimeEnd(upEnd); // } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java index 7d000f29..2e74e410 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java @@ -87,8 +87,8 @@ public class LiquidTankTaskCopyController extends BladeController { } ); // 范围日期 - Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CR_TIME_START); - Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CR_TIME_END); + Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START); + Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END); QueryWrapper qw = Condition.getQueryWrapper(map, LiquidTankTaskCopy.class); // 完成的 qw.in(BaseCol.STATUS, Arrays.asList(LiquidTankTaskConst.S_FINISH_FAILED, LiquidTankTaskConst.S_FINISH_OK)); @@ -119,8 +119,8 @@ public class LiquidTankTaskCopyController extends BladeController { } ); // 范围日期 - Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CR_TIME_START); - Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CR_TIME_END); + Date crStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.CREATE_TIME_START); + Date crEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.CREATE_TIME_END); QueryWrapper qw = Condition.getQueryWrapper(map, LiquidTankTaskCopy.class); // 完成的 qw.in(BaseCol.STATUS, Arrays.asList(LiquidTankTaskConst.S_FINISH_FAILED, LiquidTankTaskConst.S_FINISH_OK)); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java index a32d8129..0ab9c401 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import java.util.List; @@ -37,4 +38,6 @@ public interface AuditFileMapper extends BaseMapper { * @return List */ List exportAuditFile(@Param("ew") Wrapper queryWrapper); + + List listSearch(IPage page, @Param("q") AuditFileSearch search); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml index 6327b2f2..b481eb05 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml @@ -27,4 +27,21 @@ SELECT * FROM QA_AUDIT_FILE ${ew.customSqlSegment} + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java new file mode 100644 index 00000000..8554b322 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java @@ -0,0 +1,14 @@ +package org.springblade.desk.quality.pojo.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.AuditFile; + +@Data +@EqualsAndHashCode(callSuper = true) +public class AuditFileSearch extends AuditFile { + + @Schema(description = "") + private String keepUserRealName; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java index bba72eb9..7ec3536f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java @@ -10,6 +10,9 @@ import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.entity.InspectionTemplate; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; +import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import java.util.List; @@ -44,5 +47,7 @@ public interface IAuditFileService extends EnBaseService { */ void setVOValue(AuditFileVO vo); + IPage listSearch(IPage page, AuditFileSearch search); + R upgradeVer(AuditFile find); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java index de5d0928..1c0154f5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java @@ -18,6 +18,9 @@ import org.springblade.desk.quality.constant.AuditFileConst; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.mapper.AuditFileMapper; import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.entity.InspectionTemplate; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; +import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import org.springblade.desk.quality.service.IAuditFileService; import org.springblade.system.feign.IDictClient; @@ -67,6 +70,11 @@ public class AuditFileServiceImpl extends EnBaseServiceImpl listSearch(IPage page, AuditFileSearch search) { + return page.setRecords(baseMapper.listSearch(page, search)); + } + @Override public R upgradeVer(AuditFile find) { AuditFile create = new AuditFile(); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java index ca120e43..b4a1c764 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java @@ -96,7 +96,7 @@ public class ProReTemplateServiceImpl extends EnBaseServiceImpl Date: Sun, 4 Jan 2026 14:26:35 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0OEM=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/controller/OemController.java | 238 ++++++++++++++++++ .../desk/basic/excel/OemExcel.java | 117 +++++++++ .../desk/basic/mapper/OemMapper.java | 39 +++ .../desk/basic/mapper/OemMapper.xml | 30 +++ .../desk/basic/pojo/dto/OemDTO.java | 23 ++ .../desk/basic/pojo/entity/Oem.java | 155 ++++++++++++ .../springblade/desk/basic/pojo/vo/OemVO.java | 23 ++ .../desk/basic/service/IOemService.java | 43 ++++ .../basic/service/impl/OemServiceImpl.java | 60 +++++ .../desk/basic/wrapper/OemWrapper.java | 35 +++ 10 files changed, 763 insertions(+) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java new file mode 100644 index 00000000..bc1c113c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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 jakarta.annotation.Resource; +import jakarta.validation.Valid; + +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.desk.basic.excel.OemExcel; +import org.springblade.desk.basic.wrapper.OemWrapper; +import org.springblade.desk.basic.service.IOemService; +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 2026-01-04 + */ +@RestController +@RequestMapping("/Oem") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[外协厂家]", description = "[外协厂家]接口") +public class OemController extends BladeController { + + @Resource + private IOemService service; + + /** + * [外协厂家] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Oem Obj") + public R detail(Oem oem) { + QueryWrapper qw = Condition.getQueryWrapper(oem); + Oem detail = service.getOne(qw); + OemVO detailVO = OemWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [外协厂家] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Oem Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map oem, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = OemWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [外协厂家] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Oem Obj") + public R> page(OemVO oem, Query query) { + IPage pagesVO = service.selectOemPage( + Condition.getPage(query), oem + ); + return R.data(pagesVO); + } + + /** + * [外协厂家] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = OemWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [外协厂家] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Oem Obj") + public R save(@Valid @RequestBody Oem addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [外协厂家] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Oem List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [外协厂家] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Oem Obj") + public R update(@Valid @RequestBody Oem updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [外协厂家] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入Oem List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [外协厂家] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Oem Obj") + public R submit(@Valid @RequestBody Oem mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [外协厂家] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Oem List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [外协厂家] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [外协厂家] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Oem") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map oem, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Oem::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(OemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportOem(qw); + ExcelUtil.export(response, "[外协厂家]数据" + org.springblade.core.tool.utils.DateUtil.time(), + "[外协厂家]数据表", list, OemExcel.class); + } + + /** + * [外协厂家] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [外协厂家] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Oem.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java new file mode 100644 index 00000000..df17ee99 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java @@ -0,0 +1,117 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +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 2026-01-04 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class OemExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 简称 + */ + @ColumnWidth(20) + @ExcelProperty("简称") + private String abbreviation; + /** + * 工艺能力 + */ + @ColumnWidth(20) + @ExcelProperty("工艺能力") + private String craftAbility; + /** + * 地区 + */ + @ColumnWidth(20) + @ExcelProperty("地区") + private String region; + /** + * 地址 + */ + @ColumnWidth(20) + @ExcelProperty("地址") + private String address; + /** + * 资质 + */ + @ColumnWidth(20) + @ExcelProperty("资质") + private Short qualification; + /** + * 联系人 + */ + @ColumnWidth(20) + @ExcelProperty("联系人") + private String contactMan; + /** + * 邮箱 + */ + @ColumnWidth(20) + @ExcelProperty("邮箱") + private String email; + /** + * 联系电话 + */ + @ColumnWidth(20) + @ExcelProperty("联系电话") + private String contactPhone; + /** + * 密码 + */ + @ColumnWidth(20) + @ExcelProperty("密码") + private String oemPassword; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String ocName; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private Long oemType; + /** + * 排序 + */ + @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/basic/mapper/OemMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java new file mode 100644 index 00000000..3a3892f4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.desk.basic.excel.OemExcel; +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 2026-01-04 + */ +public interface OemMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param oem 查询参数 + * @return List + */ + List selectOemPage(IPage page, OemVO oem); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportOem(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.xml new file mode 100644 index 00000000..7ccd83c3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java new file mode 100644 index 00000000..4a346a40 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import org.springblade.desk.basic.pojo.entity.Oem; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [外协厂家] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class OemDTO extends Oem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java new file mode 100644 index 00000000..7ec9e2d5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java @@ -0,0 +1,155 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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 2026-01-04 + */ +@Data +@TableName("BA_OEM") +@Schema(description = "Oem Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Oem extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 简称 + */ + public static final String COL_ABBREVIATION = "ABBREVIATION"; + /** + * 工艺能力 + */ + public static final String COL_CRAFT_ABILITY = "CRAFT_ABILITY"; + /** + * 地区 + */ + public static final String COL_REGION = "REGION"; + /** + * 地址 + */ + public static final String COL_ADDRESS = "ADDRESS"; + /** + * 资质 + */ + public static final String COL_QUALIFICATION = "QUALIFICATION"; + /** + * 联系人 + */ + public static final String COL_CONTACT_MAN = "CONTACT_MAN"; + /** + * 邮箱 + */ + public static final String COL_EMAIL = "EMAIL"; + /** + * 联系电话 + */ + public static final String COL_CONTACT_PHONE = "CONTACT_PHONE"; + /** + * 密码 + */ + public static final String COL_OEM_PASSWORD = "OEM_PASSWORD"; + /** + * 名称 + */ + public static final String COL_OC_NAME = "OC_NAME"; + /** + * 类型 + */ + public static final String COL_OEM_TYPE = "OEM_TYPE"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 简称 + */ + @Schema(description = "简称") + private String abbreviation; + /** + * 工艺能力 + */ + @Schema(description = "工艺能力") + private String craftAbility; + /** + * 地区 + */ + @Schema(description = "地区") + private String region; + /** + * 地址 + */ + @Schema(description = "地址") + private String address; + /** + * 资质 + */ + @Schema(description = "资质") + private Short qualification; + /** + * 联系人 + */ + @Schema(description = "联系人") + private String contactMan; + /** + * 邮箱 + */ + @Schema(description = "邮箱") + private String email; + /** + * 联系电话 + */ + @Schema(description = "联系电话") + private String contactPhone; + /** + * 密码 + */ + @Schema(description = "密码") + private String oemPassword; + /** + * 名称 + */ + @Schema(description = "名称") + private String ocName; + /** + * 类型 + */ + @Schema(description = "类型") + private Long oemType; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java new file mode 100644 index 00000000..a5f19f3a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import org.springblade.desk.basic.pojo.entity.Oem; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [外协厂家] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class OemVO extends Oem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java new file mode 100644 index 00000000..6d951030 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java @@ -0,0 +1,43 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.desk.basic.excel.OemExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * [外协厂家] 服务类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +public interface IOemService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param oem 查询参数 + * @return IPage + */ + IPage selectOemPage(IPage page, OemVO oem); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportOem(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(OemVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java new file mode 100644 index 00000000..3bcc0bca --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java @@ -0,0 +1,60 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.desk.basic.excel.OemExcel; +import org.springblade.desk.basic.mapper.OemMapper; +import org.springblade.desk.basic.service.IOemService; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.feign.IDictClient; +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 2026-01-04 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class OemServiceImpl extends BaseServiceImpl implements IOemService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectOemPage(IPage page, OemVO oem) { + return page.setRecords(baseMapper.selectOemPage(page, oem)); + } + + @Override + public List exportOem(Wrapper queryWrapper) { + List oemList = baseMapper.exportOem(queryWrapper); + //oemList.forEach(oem -> { + // oem.setTypeName(DictCache.getValue(DictEnum.YES_NO, Oem.getType())); + //}); + return oemList; + } + + @Override + public void setVOValue(OemVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java new file mode 100644 index 00000000..0c047145 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java @@ -0,0 +1,35 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; +import java.util.Objects; + +/** + * [外协厂家] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +public class OemWrapper extends BaseEntityWrapper { + + public static OemWrapper build() { + return new OemWrapper(); + } + + @Override + public OemVO entityVO(Oem oem) { + OemVO VO = Objects.requireNonNull(BeanUtil.copyProperties(oem, OemVO.class)); + + //User createUser = UserCache.getUser(oem.getCreateUser()); + //User updateUser = UserCache.getUser(oem.getUpdateUser()); + //oemVO.setCreateUserName(createUser.getName()); + //oemVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} From d25ef291ba0f9068896274dd95c782bebc80baa8 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Sun, 4 Jan 2026 14:27:51 +0800 Subject: [PATCH 05/22] =?UTF-8?q?BA=E6=A8=A1=E5=9D=97=20Controller=20PREFI?= =?UTF-8?q?X=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/constant/FlowConst.java | 57 +++ .../basic/controller/BatConfigController.java | 315 ++++++++-------- .../basic/controller/FormulaController.java | 5 +- .../desk/basic/controller/OemController.java | 355 +++++++++--------- .../controller/ProcessAbilityController.java | 315 ++++++++-------- .../basic/controller/ProdMarkController.java | 315 ++++++++-------- .../basic/controller/TeamSetController.java | 3 +- .../controller/TestPowerJobController.java | 3 +- .../controller/WorkCenterController.java | 3 +- .../basic/controller/WorkTankController.java | 5 +- .../desk/basic/excel/OemExcel.java | 7 +- .../desk/basic/mapper/OemMapper.java | 9 +- .../desk/basic/pojo/dto/OemDTO.java | 3 +- .../desk/basic/pojo/entity/Oem.java | 7 +- .../springblade/desk/basic/pojo/vo/OemVO.java | 3 +- .../desk/basic/service/IOemService.java | 7 +- .../basic/service/impl/OemServiceImpl.java | 15 +- .../desk/basic/wrapper/OemWrapper.java | 1 + .../constant/InspectionTemplateConst.java | 2 +- .../controller/AuditFileController.java | 16 +- .../controller/ProReTemplateController.java | 7 +- .../desk/quality/mapper/AuditFileMapper.xml | 8 +- .../impl/ProReTemplateServiceImpl.java | 3 +- 23 files changed, 773 insertions(+), 691 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FlowConst.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FlowConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FlowConst.java new file mode 100644 index 00000000..e1188f94 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/FlowConst.java @@ -0,0 +1,57 @@ +package org.springblade.desk.basic.constant; + +/** + * mes v1: copy from IFlowBusinessBean + */ +public interface FlowConst { + + /** + * 初始状态(未发送审批) + */ + public static final short STATUS_NEW = -1; + + /** + * 审批中(审批中) + */ + public static final short STATUS_CHECKING = 0; + + /** + * 审批完毕(审批通过) + */ + public static final short STATUS_CHECKED = 1; + + /** + * 变更待审中 + */ + public static final short STATUS_CHANGE_WAITING_FOR_CHECKUP = 2; + + /** + * 变更中 + */ + public static final short STATUS_CHANGING = 3; + + /** + * 打回 + */ + public static final short STATUS_RETURN = 4; + + /** + * 审批未通过 + */ + public static final short STATUS_UNPASS = 10; + + /** + * 已完成 + */ + public static final short STATUS_COMPLETE = 20; + + /** + * 已作废 + */ + public static final short STATUS_CANCEL = 21; + + /** + * 已变更 + */ + public static final short STATUS_CHANGE_OK = 22; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java index c46d35be..50043f69 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java @@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser; 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.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.BatConfigExcel; import org.springblade.desk.basic.pojo.entity.BatConfig; import org.springblade.desk.basic.pojo.vo.BatConfigVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/BA/BatConfig") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/BatConfig") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -54,184 +55,184 @@ import java.util.stream.Collectors; public class BatConfigController extends BladeController { @Resource - private IBatConfigService service; - - /** - * [批量配置] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入BatConfig Obj") - public R detail(BatConfig batConfig) { - QueryWrapper qw = Condition.getQueryWrapper(batConfig); - BatConfig detail = service.getOne(qw); - BatConfigVO detailVO = BatConfigWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [批量配置] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入BatConfig Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map batConfig, - Query query) { + private IBatConfigService service; + + /** + * [批量配置] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入BatConfig Obj") + public R detail(BatConfig batConfig) { + QueryWrapper qw = Condition.getQueryWrapper(batConfig); + BatConfig detail = service.getOne(qw); + BatConfigVO detailVO = BatConfigWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [批量配置] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入BatConfig Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map batConfig, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(batConfig, BatConfig.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = BatConfigWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [批量配置] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入BatConfig Obj") - public R> page(BatConfigVO batConfig, Query query) { - IPage pagesVO = service.selectBatConfigPage( - Condition.getPage(query), batConfig - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = BatConfigWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [批量配置] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入BatConfig Obj") + public R> page(BatConfigVO batConfig, Query query) { + IPage pagesVO = service.selectBatConfigPage( + Condition.getPage(query), batConfig + ); + return R.data(pagesVO); + } + + /** * [批量配置] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = BatConfigWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = BatConfigWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [批量配置] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入BatConfig Obj") + public R save(@Valid @RequestBody BatConfig addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [批量配置] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入BatConfig Obj") - public R save(@Valid @RequestBody BatConfig addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [批量配置] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入BatConfig List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [批量配置] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入BatConfig Obj") - public R update(@Valid @RequestBody BatConfig updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入BatConfig List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [批量配置] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入BatConfig Obj") + public R update(@Valid @RequestBody BatConfig updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [批量配置] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入BatConfig List") + @Operation(summary = "修改批量", description = "传入BatConfig List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [批量配置] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入BatConfig Obj") - public R submit(@Valid @RequestBody BatConfig mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [批量配置] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入BatConfig Obj") + public R submit(@Valid @RequestBody BatConfig mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [批量配置] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入BatConfig List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [批量配置] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [批量配置] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入BatConfig") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map batConfig, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(batConfig, BatConfig.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(BatConfig::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(BatConfigEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportBatConfig(qw); - ExcelUtil.export(response, "[批量配置]数据" + DateUtil.time(), - "[批量配置]数据表", list, BatConfigExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入BatConfig List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [批量配置] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [批量配置] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入BatConfig") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map batConfig, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(batConfig, BatConfig.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BatConfig::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BatConfigEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportBatConfig(qw); + ExcelUtil.export(response, "[批量配置]数据" + DateUtil.time(), + "[批量配置]数据表", list, BatConfigExcel.class); + } + + /** * [批量配置] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [批量配置] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, BatConfig.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [批量配置] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, BatConfig.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java index b37783b4..1422781a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java @@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser; 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.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.FormulaExcel; import org.springblade.desk.basic.pojo.entity.Formula; import org.springblade.desk.basic.pojo.vo.FormulaVO; @@ -43,7 +44,7 @@ import java.util.Map; * @since 2025-12-16 */ @RestController -@RequestMapping("/BA/Formula") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/Formula") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -98,7 +99,7 @@ public class FormulaController extends BladeController { */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect( @Parameter(description = "formulaType", required = true) @RequestParam Integer formulaType) { List list = service.list( diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index bc1c113c..f2885e00 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -3,50 +3,51 @@ */ package org.springblade.desk.basic.controller; -import io.swagger.v3.oas.annotations.tags.Tag; +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 com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import lombok.Data; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.basic.excel.OemExcel; -import org.springblade.desk.basic.wrapper.OemWrapper; import org.springblade.desk.basic.service.IOemService; -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 org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.OemWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import java.util.Map; +import java.util.stream.Collectors; /** * [外协厂家] 控制器 + * mes v1: bs_oem_customer * * @author Tom Shuo * @since 2026-01-04 */ @RestController -@RequestMapping("/Oem") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/Oem") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -55,184 +56,184 @@ import jakarta.servlet.http.HttpServletResponse; public class OemController extends BladeController { @Resource - private IOemService service; - - /** - * [外协厂家] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入Oem Obj") - public R detail(Oem oem) { - QueryWrapper qw = Condition.getQueryWrapper(oem); - Oem detail = service.getOne(qw); - OemVO detailVO = OemWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [外协厂家] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入Oem Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map oem, - Query query) { + private IOemService service; + + /** + * [外协厂家] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Oem Obj") + public R detail(Oem oem) { + QueryWrapper qw = Condition.getQueryWrapper(oem); + Oem detail = service.getOne(qw); + OemVO detailVO = OemWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [外协厂家] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Oem Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map oem, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = OemWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [外协厂家] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入Oem Obj") - public R> page(OemVO oem, Query query) { - IPage pagesVO = service.selectOemPage( - Condition.getPage(query), oem - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = OemWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [外协厂家] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Oem Obj") + public R> page(OemVO oem, Query query) { + IPage pagesVO = service.selectOemPage( + Condition.getPage(query), oem + ); + return R.data(pagesVO); + } + + /** * [外协厂家] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = OemWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = OemWrapper.build().listVO(list); + return R.data(listVO); } - /** - * [外协厂家] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入Oem Obj") - public R save(@Valid @RequestBody Oem addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** + * [外协厂家] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Oem Obj") + public R save(@Valid @RequestBody Oem addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** * [外协厂家] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入Oem List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [外协厂家] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入Oem Obj") - public R update(@Valid @RequestBody Oem updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Oem List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [外协厂家] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Oem Obj") + public R update(@Valid @RequestBody Oem updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [外协厂家] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入Oem List") + @Operation(summary = "修改批量", description = "传入Oem List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [外协厂家] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入Oem Obj") - public R submit(@Valid @RequestBody Oem mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [外协厂家] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Oem Obj") + public R submit(@Valid @RequestBody Oem mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [外协厂家] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入Oem List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [外协厂家] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [外协厂家] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入Oem") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map oem, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(Oem::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(OemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportOem(qw); - ExcelUtil.export(response, "[外协厂家]数据" + org.springblade.core.tool.utils.DateUtil.time(), - "[外协厂家]数据表", list, OemExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Oem List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [外协厂家] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [外协厂家] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Oem") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map oem, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Oem::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(OemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportOem(qw); + ExcelUtil.export(response, "[外协厂家]数据" + DateUtil.time(), + "[外协厂家]数据表", list, OemExcel.class); + } + + /** * [外协厂家] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [外协厂家] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, Oem.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [外协厂家] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Oem.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java index 6280713f..e8d9d8aa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java @@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser; 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.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.ProcessAbilityExcel; import org.springblade.desk.basic.pojo.entity.ProcessAbility; import org.springblade.desk.basic.pojo.vo.ProcessAbilityVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/ProcessAbility") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/ProcessAbility") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -54,184 +55,184 @@ import java.util.stream.Collectors; public class ProcessAbilityController extends BladeController { @Resource - private IProcessAbilityService service; - - /** - * [工艺能力] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入ProcessAbility Obj") - public R detail(ProcessAbility processAbility) { - QueryWrapper qw = Condition.getQueryWrapper(processAbility); - ProcessAbility detail = service.getOne(qw); - ProcessAbilityVO detailVO = ProcessAbilityWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [工艺能力] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入ProcessAbility Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map processAbility, - Query query) { + private IProcessAbilityService service; + + /** + * [工艺能力] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入ProcessAbility Obj") + public R detail(ProcessAbility processAbility) { + QueryWrapper qw = Condition.getQueryWrapper(processAbility); + ProcessAbility detail = service.getOne(qw); + ProcessAbilityVO detailVO = ProcessAbilityWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [工艺能力] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入ProcessAbility Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map processAbility, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(processAbility, ProcessAbility.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ProcessAbilityWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [工艺能力] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入ProcessAbility Obj") - public R> page(ProcessAbilityVO processAbility, Query query) { - IPage pagesVO = service.selectProcessAbilityPage( - Condition.getPage(query), processAbility - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ProcessAbilityWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [工艺能力] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入ProcessAbility Obj") + public R> page(ProcessAbilityVO processAbility, Query query) { + IPage pagesVO = service.selectProcessAbilityPage( + Condition.getPage(query), processAbility + ); + return R.data(pagesVO); + } + + /** * [工艺能力] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = ProcessAbilityWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = ProcessAbilityWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [工艺能力] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入ProcessAbility Obj") + public R save(@Valid @RequestBody ProcessAbility addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [工艺能力] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入ProcessAbility Obj") - public R save(@Valid @RequestBody ProcessAbility addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [工艺能力] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入ProcessAbility List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [工艺能力] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入ProcessAbility Obj") - public R update(@Valid @RequestBody ProcessAbility updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入ProcessAbility List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [工艺能力] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入ProcessAbility Obj") + public R update(@Valid @RequestBody ProcessAbility updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [工艺能力] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入ProcessAbility List") + @Operation(summary = "修改批量", description = "传入ProcessAbility List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [工艺能力] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入ProcessAbility Obj") - public R submit(@Valid @RequestBody ProcessAbility mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [工艺能力] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入ProcessAbility Obj") + public R submit(@Valid @RequestBody ProcessAbility mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [工艺能力] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入ProcessAbility List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [工艺能力] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [工艺能力] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入ProcessAbility") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map processAbility, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(processAbility, ProcessAbility.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(ProcessAbility::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(ProcessAbilityEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportProcessAbility(qw); - ExcelUtil.export(response, "[工艺能力]数据" + DateUtil.time(), - "[工艺能力]数据表", list, ProcessAbilityExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入ProcessAbility List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [工艺能力] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [工艺能力] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入ProcessAbility") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map processAbility, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(processAbility, ProcessAbility.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(ProcessAbility::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ProcessAbilityEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportProcessAbility(qw); + ExcelUtil.export(response, "[工艺能力]数据" + DateUtil.time(), + "[工艺能力]数据表", list, ProcessAbilityExcel.class); + } + + /** * [工艺能力] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [工艺能力] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, ProcessAbility.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [工艺能力] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, ProcessAbility.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java index 60d7b5fd..7b8be809 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java @@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser; 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.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.ProdMarkExcel; import org.springblade.desk.basic.pojo.entity.ProdMark; import org.springblade.desk.basic.pojo.vo.ProdMarkVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/BA/ProdMark") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/ProdMark") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -54,184 +55,184 @@ import java.util.stream.Collectors; public class ProdMarkController extends BladeController { @Resource - private IProdMarkService service; - - /** - * [生产标识] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入ProdMark Obj") - public R detail(ProdMark prodMark) { - QueryWrapper qw = Condition.getQueryWrapper(prodMark); - ProdMark detail = service.getOne(qw); - ProdMarkVO detailVO = ProdMarkWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [生产标识] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入ProdMark Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map prodMark, - Query query) { + private IProdMarkService service; + + /** + * [生产标识] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入ProdMark Obj") + public R detail(ProdMark prodMark) { + QueryWrapper qw = Condition.getQueryWrapper(prodMark); + ProdMark detail = service.getOne(qw); + ProdMarkVO detailVO = ProdMarkWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [生产标识] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入ProdMark Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map prodMark, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(prodMark, ProdMark.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ProdMarkWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [生产标识] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入ProdMark Obj") - public R> page(ProdMarkVO prodMark, Query query) { - IPage pagesVO = service.selectProdMarkPage( - Condition.getPage(query), prodMark - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ProdMarkWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [生产标识] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入ProdMark Obj") + public R> page(ProdMarkVO prodMark, Query query) { + IPage pagesVO = service.selectProdMarkPage( + Condition.getPage(query), prodMark + ); + return R.data(pagesVO); + } + + /** * [生产标识] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = ProdMarkWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = ProdMarkWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [生产标识] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入ProdMark Obj") + public R save(@Valid @RequestBody ProdMark addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [生产标识] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入ProdMark Obj") - public R save(@Valid @RequestBody ProdMark addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [生产标识] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入ProdMark List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [生产标识] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入ProdMark Obj") - public R update(@Valid @RequestBody ProdMark updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入ProdMark List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [生产标识] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入ProdMark Obj") + public R update(@Valid @RequestBody ProdMark updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [生产标识] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入ProdMark List") + @Operation(summary = "修改批量", description = "传入ProdMark List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [生产标识] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入ProdMark Obj") - public R submit(@Valid @RequestBody ProdMark mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [生产标识] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入ProdMark Obj") + public R submit(@Valid @RequestBody ProdMark mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [生产标识] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入ProdMark List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [生产标识] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [生产标识] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入ProdMark") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map prodMark, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(prodMark, ProdMark.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(ProdMark::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(ProdMarkEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportProdMark(qw); - ExcelUtil.export(response, "[生产标识]数据" + DateUtil.time(), - "[生产标识]数据表", list, ProdMarkExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入ProdMark List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [生产标识] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [生产标识] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入ProdMark") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map prodMark, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(prodMark, ProdMark.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(ProdMark::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ProdMarkEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportProdMark(qw); + ExcelUtil.export(response, "[生产标识]数据" + DateUtil.time(), + "[生产标识]数据表", list, ProdMarkExcel.class); + } + + /** * [生产标识] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [生产标识] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, ProdMark.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [生产标识] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, ProdMark.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index 8ce777c0..a1aa3505 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser; 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.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.TeamSetExcel; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.vo.TeamSetVO; @@ -43,7 +44,7 @@ import java.util.Map; * @since 2025-12-16 */ @RestController -@RequestMapping("/BA/TeamSet") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/TeamSet") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TestPowerJobController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TestPowerJobController.java index b2b912e8..191696c5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TestPowerJobController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TestPowerJobController.java @@ -10,6 +10,7 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; +import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.service.TestPowerJobService; import org.springblade.desk.quality.service.CycleTestTaskService2; import org.springblade.desk.quality.service.TestService; @@ -21,7 +22,7 @@ import org.springframework.web.bind.annotation.RestController; import java.time.LocalDateTime; @RestController -@RequestMapping("/BA/TestPowerJob") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/TestPowerJob") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java index 38f99e47..4256df39 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java @@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser; 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.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.WorkCenterExcel; import org.springblade.desk.basic.pojo.entity.WorkCenter; import org.springblade.desk.basic.pojo.vo.WorkCenterVO; @@ -43,7 +44,7 @@ import java.util.Map; * @since 2025-12-16 */ @RestController -@RequestMapping("/BA/WorkCenter") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/WorkCenter") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java index c3bdd619..0a9fab13 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java @@ -23,6 +23,7 @@ import org.springblade.core.secure.BladeUser; 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.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.WorkTankExcel; import org.springblade.desk.basic.pojo.entity.WorkTank; import org.springblade.desk.basic.pojo.vo.WorkTankVO; @@ -43,7 +44,7 @@ import java.util.Map; * @since 2025-12-16 */ @RestController -@RequestMapping("/BA/WorkTank") +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/WorkTank") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -99,7 +100,7 @@ public class WorkTankController extends BladeController { */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect(@Parameter(hidden = true) @RequestParam Map workTank) { QueryWrapper qw = Condition.getQueryWrapper(workTank, WorkTank.class); List list = service.list(qw); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java index df17ee99..e52f7fc1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/OemExcel.java @@ -4,15 +4,14 @@ package org.springblade.desk.basic.excel; -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 lombok.Data; + import java.io.Serial; +import java.io.Serializable; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java index 3a3892f4..72ae9820 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java @@ -3,13 +3,14 @@ */ package org.springblade.desk.basic.mapper; -import org.springblade.desk.basic.pojo.entity.Oem; -import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.basic.excel.OemExcel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.basic.excel.OemExcel; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; + import java.util.List; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java index 4a346a40..9782f5cd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java @@ -3,9 +3,10 @@ */ package org.springblade.desk.basic.pojo.dto; -import org.springblade.desk.basic.pojo.entity.Oem; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Oem; + import java.io.Serial; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java index 7ec9e2d5..3546ce73 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java @@ -3,11 +3,12 @@ */ package org.springblade.desk.basic.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 io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + import java.io.Serial; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java index a5f19f3a..b3c1408f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java @@ -3,9 +3,10 @@ */ package org.springblade.desk.basic.pojo.vo; -import org.springblade.desk.basic.pojo.entity.Oem; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Oem; + import java.io.Serial; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java index 6d951030..22bfb08c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java @@ -4,11 +4,12 @@ package org.springblade.desk.basic.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.springblade.desk.basic.pojo.entity.Oem; -import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.basic.excel.OemExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.basic.excel.OemExcel; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; + import java.util.List; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java index 3bcc0bca..40cc9d5e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java @@ -3,22 +3,23 @@ */ package org.springblade.desk.basic.service.impl; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.annotation.Resource; -import lombok.Data; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.desk.basic.pojo.entity.Oem; -import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.mapper.OemMapper; +import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.vo.OemVO; import org.springblade.desk.basic.service.IOemService; -import org.springblade.system.feign.IUserClient; import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; 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; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java index 0c047145..cadccfeb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/OemWrapper.java @@ -7,6 +7,7 @@ import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.vo.OemVO; + import java.util.Objects; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTemplateConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTemplateConst.java index 86bc68d7..9857b2da 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTemplateConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTemplateConst.java @@ -1,6 +1,6 @@ package org.springblade.desk.quality.constant; -public class InspectionTemplateConst { +public interface InspectionTemplateConst { String DICT_CATEGORY = ""; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java index af509792..e5f7cd36 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java @@ -42,7 +42,7 @@ import java.util.stream.Collectors; /** * [工艺文件] 控制器 - * mes v1: + * mes v1: ds_audit_file * * @author Tom Shuo * @since 2025-12-22 @@ -81,12 +81,18 @@ public class AuditFileController extends BladeController { @Operation(summary = "list分页", description = "传入AuditFile Obj") public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(map, AuditFile.class); + // QueryWrapper qw = Condition.getQueryWrapper(map, AuditFile.class); AuditFileSearch search = new AuditFileSearch(); // todo: Func 用法 - search.setPpsId(Func.toLong(map.get(AuditFile.COL_PPS_ID))); - search.setPqId(Func.toLong(map.get(AuditFile.COL_PQ_ID))); - search.setKeepUserRealName(Func.toStr(map.get(BaseRequest.KEEP_USER_REAL_NAME))); + if (map.containsKey(AuditFile.COL_PPS_ID)) { + search.setPpsId(Func.toLong(map.get(AuditFile.COL_PPS_ID))); + } + if (map.containsKey(AuditFile.COL_PQ_ID)) { + search.setPqId(Func.toLong(map.get(AuditFile.COL_PQ_ID))); + } + if (map.containsKey(BaseRequest.KEEP_USER_REAL_NAME)) { + search.setKeepUserRealName(Func.toStr(map.get(BaseRequest.KEEP_USER_REAL_NAME))); + } IPage pages = service.listSearch(Condition.getPage(query), search); IPage pagesVO = AuditFileWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java index ba275361..8e8d86fa 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java @@ -41,6 +41,7 @@ import java.util.stream.Collectors; /** * [过程记录模板] 控制器 + * mes v1: ds_rb_file_preserve * * @author Tom Shuo * @since 2025-12-22 @@ -122,9 +123,9 @@ public class ProReTemplateController extends BladeController { @ApiOperationSupport(order = 30) @Operation(summary = "新增一条", description = "传入ProReTemplate Obj") public R save(@Valid @RequestBody ProReTemplate addOne) { - addOne.setId(null); addOne.setStatus(ProReTemplateConst.STATUS_NEW); - addOne.setApprovalStatus(1); + addOne.setApprovalStatus(ProReTemplateConst.APPROVAL_STATUS_1); + addOne.setId(null); return R.status(service.save(addOne)); } @@ -136,6 +137,8 @@ public class ProReTemplateController extends BladeController { @Operation(summary = "新增批量", description = "传入ProReTemplate List") public R saveBat(@Valid @RequestBody List addList) { addList.forEach(one -> { + one.setStatus(ProReTemplateConst.STATUS_NEW); + one.setApprovalStatus(ProReTemplateConst.APPROVAL_STATUS_1); one.setId(null); }); return R.status(service.saveBatch(addList)); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml index b481eb05..06fb0f6c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/AuditFileMapper.xml @@ -29,16 +29,16 @@ + SELECT * FROM QA_NG WHERE is_deleted = 0 + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java new file mode 100644 index 00000000..efc30a87 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto; + +import org.springblade.desk.quality.pojo.entity.Ng; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [缺陷] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class NgDTO extends Ng { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java new file mode 100644 index 00000000..b6b7f2e3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java @@ -0,0 +1,129 @@ +/** + * 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 2026-01-04 + */ +@Data +@TableName("QA_NG") +@Schema(description = "Ng Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Ng extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; + */ + public static final String COL_NG_TYPE = "NG_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 父级[不良原因]id + */ + public static final String COL_PARENT_ID = "PARENT_ID"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 缺陷描述 + */ + public static final String COL_DESC = "DESC"; + /** + * [制品]id + */ + public static final String COL_PRODUCT_ID = "PRODUCT_ID"; + /** + * [制品]编码 + */ + public static final String COL_PRODUCT_CODE = "PRODUCT_CODE"; + /** + * [工序]id + */ + public static final String COL_PROCESS_ID = "PROCESS_ID"; + /** + * [工序]编码 + */ + public static final String COL_PROCESS_CODE = "PROCESS_CODE"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; + */ + @Schema(description = "故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类;") + private Long ngType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 父级[不良原因]id + */ + @Schema(description = "父级[不良原因]id") + private BigDecimal parentId; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 缺陷描述 + */ + @Schema(description = "缺陷描述") + private String desc; + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private BigDecimal productId; + /** + * [制品]编码 + */ + @Schema(description = "[制品]编码") + private String productCode; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private BigDecimal processId; + /** + * [工序]编码 + */ + @Schema(description = "[工序]编码") + private String processCode; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java new file mode 100644 index 00000000..e2a09db8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import org.springblade.desk.quality.pojo.entity.Ng; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [缺陷] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class NgVO extends Ng { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/INgService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/INgService.java new file mode 100644 index 00000000..6191565b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/INgService.java @@ -0,0 +1,43 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import org.springblade.desk.quality.excel.NgExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * [缺陷] 服务类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +public interface INgService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param ng 查询参数 + * @return IPage + */ + IPage selectNgPage(IPage page, NgVO ng); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportNg(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(NgVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java new file mode 100644 index 00000000..b022af64 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java @@ -0,0 +1,60 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import org.springblade.desk.quality.excel.NgExcel; +import org.springblade.desk.quality.mapper.NgMapper; +import org.springblade.desk.quality.service.INgService; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.feign.IDictClient; +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 2026-01-04 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class NgServiceImpl extends BaseServiceImpl implements INgService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectNgPage(IPage page, NgVO ng) { + return page.setRecords(baseMapper.selectNgPage(page, ng)); + } + + @Override + public List exportNg(Wrapper queryWrapper) { + List ngList = baseMapper.exportNg(queryWrapper); + //ngList.forEach(ng -> { + // ng.setTypeName(DictCache.getValue(DictEnum.YES_NO, Ng.getType())); + //}); + return ngList; + } + + @Override + public void setVOValue(NgVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java new file mode 100644 index 00000000..6deefe1b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java @@ -0,0 +1,35 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import java.util.Objects; + +/** + * [缺陷] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +public class NgWrapper extends BaseEntityWrapper { + + public static NgWrapper build() { + return new NgWrapper(); + } + + @Override + public NgVO entityVO(Ng ng) { + NgVO VO = Objects.requireNonNull(BeanUtil.copyProperties(ng, NgVO.class)); + + //User createUser = UserCache.getUser(ng.getCreateUser()); + //User updateUser = UserCache.getUser(ng.getUpdateUser()); + //ngVO.setCreateUserName(createUser.getName()); + //ngVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} From d0c3dc24d759c0f3e43e30e8c894eccfb69844f2 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Sun, 4 Jan 2026 15:13:30 +0800 Subject: [PATCH 07/22] CONTROLLER_PREFIX --- .../desk/quality/controller/NgController.java | 238 +++++++++++ .../desk/quality/excel/NgExcel.java | 100 +++++ .../desk/quality/mapper/NgMapper.java | 39 ++ .../desk/quality/mapper/NgMapper.xml | 27 ++ .../desk/quality/pojo/dto/NgDTO.java | 23 ++ .../desk/quality/pojo/entity/Ng.java | 129 ++++++ .../desk/quality/pojo/vo/NgVO.java | 23 ++ .../desk/quality/service/INgService.java | 43 ++ .../quality/service/impl/NgServiceImpl.java | 60 +++ .../desk/quality/wrapper/NgWrapper.java | 35 ++ .../springblade/test/CodeGeneratorVer2.java | 2 +- .../desk/basic/controller/OemController.java | 10 + .../desk/basic/service/IOemService.java | 36 +- .../basic/service/impl/OemServiceImpl.java | 41 +- .../desk/quality/constant/QAModuleConst.java | 2 + .../controller/AuditFileController.java | 7 +- .../controller/CycleTestController.java | 3 +- .../controller/CycleTestItemController.java | 3 +- .../CycleTestStandardController.java | 3 +- .../controller/CycleTestTaskController.java | 3 +- .../controller/IndicatorMonthController.java | 3 +- .../controller/IndicatorYearController.java | 3 +- .../IndicatorYearDetailController.java | 3 +- .../controller/InspectionItemController.java | 3 +- .../InspectionResultController.java | 3 +- .../controller/InspectionTaskController.java | 3 +- .../InspectionTemplateController.java | 3 +- .../controller/IotHardnessController.java | 3 +- .../controller/IotThicknessController.java | 3 +- .../controller/LiquidTankController.java | 3 +- .../LiquidTankReportConfigController.java | 3 +- .../LiquidTankReportController.java | 3 +- .../controller/LiquidTankTaskController.java | 3 +- .../LiquidTankTaskCopyController.java | 3 +- .../LiquidTankTaskHiController.java | 3 +- .../controller/LiquidTankWaveController.java | 3 +- .../desk/quality/controller/NgController.java | 368 +++++++++--------- .../controller/PlanTestController.java | 3 +- .../controller/ProReTemplateController.java | 3 +- .../ProReTemplateDetailController.java | 3 +- .../ProReTemplateTankController.java | 3 +- .../RelInsTemplateItemController.java | 3 +- .../RelTankReportItemController.java | 3 +- .../controller/RelTankWaveItemController.java | 3 +- .../controller/RemindMsgController.java | 3 +- .../controller/StandardController.java | 3 +- .../controller/StandardParamController.java | 3 +- .../SupplyInspectionController.java | 3 +- .../quality/controller/TestController.java | 3 +- .../desk/quality/excel/NgExcel.java | 9 +- .../desk/quality/mapper/NgMapper.java | 9 +- .../desk/quality/pojo/dto/NgDTO.java | 3 +- .../desk/quality/pojo/entity/Ng.java | 17 +- .../desk/quality/pojo/vo/NgVO.java | 3 +- .../desk/quality/service/INgService.java | 7 +- .../quality/service/impl/NgServiceImpl.java | 15 +- .../desk/quality/wrapper/NgWrapper.java | 1 + 57 files changed, 1072 insertions(+), 271 deletions(-) create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java new file mode 100644 index 00000000..83fd7c52 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -0,0 +1,238 @@ +/** + * 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 jakarta.annotation.Resource; +import jakarta.validation.Valid; + +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import org.springblade.desk.quality.excel.NgExcel; +import org.springblade.desk.quality.wrapper.NgWrapper; +import org.springblade.desk.quality.service.INgService; +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 2026-01-04 + */ +@RestController +@RequestMapping("/Ng") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[缺陷]", description = "[缺陷]接口") +public class NgController extends BladeController { + + @Resource + private INgService service; + + /** + * [缺陷] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Ng Obj") + public R detail(Ng ng) { + QueryWrapper qw = Condition.getQueryWrapper(ng); + Ng detail = service.getOne(qw); + NgVO detailVO = NgWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [缺陷] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Ng Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map ng, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = NgWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [缺陷] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Ng Obj") + public R> page(NgVO ng, Query query) { + IPage pagesVO = service.selectNgPage( + Condition.getPage(query), ng + ); + return R.data(pagesVO); + } + + /** + * [缺陷] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = NgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [缺陷] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Ng Obj") + public R save(@Valid @RequestBody Ng addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [缺陷] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Ng List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [缺陷] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Ng Obj") + public R update(@Valid @RequestBody Ng updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [缺陷] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入Ng List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [缺陷] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Ng Obj") + public R submit(@Valid @RequestBody Ng mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [缺陷] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Ng List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [缺陷] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [缺陷] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Ng") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map ng, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportNg(qw); + ExcelUtil.export(response, "[缺陷]数据" + org.springblade.core.tool.utils.DateUtil.time(), + "[缺陷]数据表", list, NgExcel.class); + } + + /** + * [缺陷] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [缺陷] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Ng.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java new file mode 100644 index 00000000..b9345bdd --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java @@ -0,0 +1,100 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel; + + +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 2026-01-04 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class NgExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; + */ + @ColumnWidth(20) + @ExcelProperty("故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类;") + private Long ngType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * 父级[不良原因]id + */ + @ColumnWidth(20) + @ExcelProperty("父级[不良原因]id") + private BigDecimal parentId; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 缺陷描述 + */ + @ColumnWidth(20) + @ExcelProperty("缺陷描述") + private String desc; + /** + * [制品]id + */ + @ColumnWidth(20) + @ExcelProperty("[制品]id") + private BigDecimal productId; + /** + * [制品]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[制品]编码") + private String productCode; + /** + * [工序]id + */ + @ColumnWidth(20) + @ExcelProperty("[工序]id") + private BigDecimal processId; + /** + * [工序]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[工序]编码") + private String processCode; +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java new file mode 100644 index 00000000..d70d9b7b --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper; + +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import org.springblade.desk.quality.excel.NgExcel; +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 2026-01-04 + */ +public interface NgMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param ng 查询参数 + * @return List + */ + List selectNgPage(IPage page, NgVO ng); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportNg(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml new file mode 100644 index 00000000..ac77b49d --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java new file mode 100644 index 00000000..efc30a87 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto; + +import org.springblade.desk.quality.pojo.entity.Ng; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [缺陷] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class NgDTO extends Ng { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java new file mode 100644 index 00000000..b6b7f2e3 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java @@ -0,0 +1,129 @@ +/** + * 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 2026-01-04 + */ +@Data +@TableName("QA_NG") +@Schema(description = "Ng Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Ng extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; + */ + public static final String COL_NG_TYPE = "NG_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 父级[不良原因]id + */ + public static final String COL_PARENT_ID = "PARENT_ID"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 缺陷描述 + */ + public static final String COL_DESC = "DESC"; + /** + * [制品]id + */ + public static final String COL_PRODUCT_ID = "PRODUCT_ID"; + /** + * [制品]编码 + */ + public static final String COL_PRODUCT_CODE = "PRODUCT_CODE"; + /** + * [工序]id + */ + public static final String COL_PROCESS_ID = "PROCESS_ID"; + /** + * [工序]编码 + */ + public static final String COL_PROCESS_CODE = "PROCESS_CODE"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; + */ + @Schema(description = "故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类;") + private Long ngType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 父级[不良原因]id + */ + @Schema(description = "父级[不良原因]id") + private BigDecimal parentId; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 缺陷描述 + */ + @Schema(description = "缺陷描述") + private String desc; + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private BigDecimal productId; + /** + * [制品]编码 + */ + @Schema(description = "[制品]编码") + private String productCode; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private BigDecimal processId; + /** + * [工序]编码 + */ + @Schema(description = "[工序]编码") + private String processCode; +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java new file mode 100644 index 00000000..e2a09db8 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import org.springblade.desk.quality.pojo.entity.Ng; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [缺陷] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class NgVO extends Ng { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java new file mode 100644 index 00000000..6191565b --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java @@ -0,0 +1,43 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import org.springblade.desk.quality.excel.NgExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * [缺陷] 服务类 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +public interface INgService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param ng 查询参数 + * @return IPage + */ + IPage selectNgPage(IPage page, NgVO ng); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportNg(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(NgVO vo); +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java new file mode 100644 index 00000000..b022af64 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java @@ -0,0 +1,60 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import org.springblade.desk.quality.excel.NgExcel; +import org.springblade.desk.quality.mapper.NgMapper; +import org.springblade.desk.quality.service.INgService; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.feign.IDictClient; +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 2026-01-04 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class NgServiceImpl extends BaseServiceImpl implements INgService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectNgPage(IPage page, NgVO ng) { + return page.setRecords(baseMapper.selectNgPage(page, ng)); + } + + @Override + public List exportNg(Wrapper queryWrapper) { + List ngList = baseMapper.exportNg(queryWrapper); + //ngList.forEach(ng -> { + // ng.setTypeName(DictCache.getValue(DictEnum.YES_NO, Ng.getType())); + //}); + return ngList; + } + + @Override + public void setVOValue(NgVO vo) { + + } +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java new file mode 100644 index 00000000..6deefe1b --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java @@ -0,0 +1,35 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; +import java.util.Objects; + +/** + * [缺陷] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-04 + */ +public class NgWrapper extends BaseEntityWrapper { + + public static NgWrapper build() { + return new NgWrapper(); + } + + @Override + public NgVO entityVO(Ng ng) { + NgVO VO = Objects.requireNonNull(BeanUtil.copyProperties(ng, NgVO.class)); + + //User createUser = UserCache.getUser(ng.getCreateUser()); + //User updateUser = UserCache.getUser(ng.getUpdateUser()); + //ngVO.setCreateUserName(createUser.getName()); + //ngVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} 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 49683bae..8b894068 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 @@ -65,7 +65,7 @@ public class CodeGeneratorVer2 { * 需要生成的表名(两者只能取其一) */ public static String[] INCLUDE_TABLES = { - "QA_PLAN_TEST" + "QA_NG" }; /** * 需要排除的表名(两者只能取其一) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index f2885e00..110c701e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -236,4 +236,14 @@ public class OemController extends BladeController { ); return R.status(service.saveBatch(importList)); } + + /** + * [外协厂家] 设置密码 + */ + @PostMapping("/setPassword") + @ApiOperationSupport(order = 40) + @Operation(summary = "设置密码", description = "传入Oem Obj") + public R setPassword(@Valid @RequestBody Oem updateOne) { + return service.setPassword(updateOne); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java index 22bfb08c..df2ef9b8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java @@ -6,6 +6,7 @@ package org.springblade.desk.basic.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.tool.api.R; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.vo.OemVO; @@ -19,26 +20,29 @@ import java.util.List; * @since 2026-01-04 */ public interface IOemService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param oem 查询参数 - * @return IPage - */ - IPage selectOemPage(IPage page, OemVO oem); + /** + * 自定义分页 + * + * @param page 分页参数 + * @param oem 查询参数 + * @return IPage + */ + IPage selectOemPage(IPage page, OemVO oem); - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportOem(Wrapper queryWrapper); + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportOem(Wrapper queryWrapper); /** * VO + * * @param vo */ - void setVOValue(OemVO vo); + void setVOValue(OemVO vo); + + R setPassword(Oem updateOne); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java index 40cc9d5e..9361d4ea 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java @@ -11,6 +11,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.api.R; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.mapper.OemMapper; import org.springblade.desk.basic.pojo.entity.Oem; @@ -40,22 +41,32 @@ public class OemServiceImpl extends BaseServiceImpl implements I @Resource private IDictClient dictClient; - @Override - public IPage selectOemPage(IPage page, OemVO oem) { - return page.setRecords(baseMapper.selectOemPage(page, oem)); - } - - @Override - public List exportOem(Wrapper queryWrapper) { - List oemList = baseMapper.exportOem(queryWrapper); - //oemList.forEach(oem -> { - // oem.setTypeName(DictCache.getValue(DictEnum.YES_NO, Oem.getType())); - //}); - return oemList; - } - - @Override + @Override + public IPage selectOemPage(IPage page, OemVO oem) { + return page.setRecords(baseMapper.selectOemPage(page, oem)); + } + + @Override + public List exportOem(Wrapper queryWrapper) { + List oemList = baseMapper.exportOem(queryWrapper); + //oemList.forEach(oem -> { + // oem.setTypeName(DictCache.getValue(DictEnum.YES_NO, Oem.getType())); + //}); + return oemList; + } + + @Override public void setVOValue(OemVO vo) { } + + @Override + public R setPassword(Oem updateOne) { + Oem find = getById(updateOne.getId()); + if (find == null) { + return R.fail("没有找到对应外协厂商"); + } + find.setOemPassword(updateOne.getOemPassword()); + return R.success("设置密码成功"); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAModuleConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAModuleConst.java index 26abaa29..807e0ff8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAModuleConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/QAModuleConst.java @@ -9,4 +9,6 @@ public interface QAModuleConst { * 模块前缀 */ String PREFIX = "QA"; + + String CONTROLLER_PREFIX = "/QA"; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java index e5f7cd36..14b956f2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/AuditFileController.java @@ -24,8 +24,10 @@ import org.springblade.core.secure.BladeUser; 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.basic.constant.BaseCol; import org.springblade.desk.basic.constant.BaseRequest; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; import org.springblade.desk.quality.pojo.request.AuditFileSearch; @@ -48,7 +50,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/QA/AuditFile") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/AuditFile") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -93,6 +95,9 @@ public class AuditFileController extends BladeController { if (map.containsKey(BaseRequest.KEEP_USER_REAL_NAME)) { search.setKeepUserRealName(Func.toStr(map.get(BaseRequest.KEEP_USER_REAL_NAME))); } + if (map.containsKey(BaseCol.STATUS)) { + search.setStatus(Func.toInt(map.get(BaseCol.STATUS))); + } IPage pages = service.listSearch(Condition.getPage(query), search); IPage pagesVO = AuditFileWrapper.build().pageVO(pages); pagesVO.getRecords() diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java index 20d224c1..58ec68d1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java @@ -26,6 +26,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.CycleTestExcel; import org.springblade.desk.quality.excel.CycleTestExcelImport; import org.springblade.desk.quality.pojo.entity.CycleTest; @@ -55,7 +56,7 @@ import java.util.Map; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -@RequestMapping("/QA/CycleTest") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/CycleTest") @Tag(name = "[QA][周期试验]", description = "[周期试验]接口") public class CycleTestController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java index 9cca549c..5fb1214a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestItemController.java @@ -24,6 +24,7 @@ import org.springblade.core.secure.BladeUser; 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.constant.QAModuleConst; import org.springblade.desk.quality.excel.CycleTestItemExcel; import org.springblade.desk.quality.pojo.entity.CycleTestItem; import org.springblade.desk.quality.pojo.request.CycleTestItemSubmit; @@ -46,7 +47,7 @@ import java.util.Map; * @since 2025-11-17 */ @RestController -@RequestMapping("/QA/CycleTestItem") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/CycleTestItem") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestStandardController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestStandardController.java index b11f3259..8ad1565e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestStandardController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestStandardController.java @@ -24,6 +24,7 @@ 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.constant.QAModuleConst; import org.springblade.desk.quality.excel.CycleTestStandardExcel; import org.springblade.desk.quality.pojo.entity.CycleTestStandard; import org.springblade.desk.quality.pojo.vo.CycleTestStandardVO; @@ -45,7 +46,7 @@ import java.util.Map; @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@RequestMapping("/QA/CycleTestStandard") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/CycleTestStandard") @Tag(name = "[周期试验标准]", description = "[周期试验标准]接口") public class CycleTestStandardController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java index 06abf31f..523b130b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestTaskController.java @@ -25,6 +25,7 @@ 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.constant.QAModuleConst; import org.springblade.desk.quality.excel.CycleTestTaskExcel; import org.springblade.desk.quality.pojo.entity.CycleTestTask; import org.springblade.desk.quality.pojo.vo.CycleTestTaskVO; @@ -45,7 +46,7 @@ import java.util.Map; * @since 2025-11-17 */ @RestController -@RequestMapping("/QA/CycleTestTask") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/CycleTestTask") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorMonthController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorMonthController.java index 80ff3743..29c2948f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorMonthController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorMonthController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IndicatorMonthExcel; import org.springblade.desk.quality.pojo.entity.IndicatorMonth; import org.springblade.desk.quality.pojo.vo.IndicatorMonthVO; @@ -46,7 +47,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/QA/IndicatorMonth") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/IndicatorMonth") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java index 3814182e..f36dad20 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java @@ -26,6 +26,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IndicatorYearExcel; import org.springblade.desk.quality.pojo.entity.IndicatorMonth; import org.springblade.desk.quality.pojo.entity.IndicatorYear; @@ -51,7 +52,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/QA/IndicatorYear") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/IndicatorYear") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java index ea0a74b2..ac67fffe 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IndicatorYearDetailExcel; import org.springblade.desk.quality.pojo.entity.IndicatorYearDetail; import org.springblade.desk.quality.pojo.vo.IndicatorYearDetailVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-23 */ @RestController -@RequestMapping("/IndicatorYearDetail") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/IndicatorYearDetail") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java index a52ca47c..5ffcd56d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java @@ -24,6 +24,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionItemExcel; import org.springblade.desk.quality.pojo.entity.InspectionItem; import org.springblade.desk.quality.pojo.vo.InspectionItemVO; @@ -43,7 +44,7 @@ import java.util.Map; * @since 2025-12-16 */ @RestController -@RequestMapping("/QA/InspectionItem") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/InspectionItem") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java index 9b3f82ae..4a6f78d0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionResultController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionResultExcel; import org.springblade.desk.quality.pojo.entity.InspectionResult; import org.springblade.desk.quality.pojo.vo.InspectionResultVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-23 */ @RestController -@RequestMapping("/InspectionResult") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/InspectionResult") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index 67fa2bce..0a5085a4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -23,6 +23,7 @@ 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.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; @@ -44,7 +45,7 @@ import java.util.Map; @RestController @Data @EqualsAndHashCode(callSuper = true) -@RequestMapping("/QA/InspectionTask") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/InspectionTask") @Tag(name = "[QA][检验任务]", description = "[检验任务]接口") public class InspectionTaskController extends BladeController { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java index 7e3e0404..a974f41d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java @@ -27,6 +27,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BaseRequest; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.basic.util.RequestUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionTemplateExcel; import org.springblade.desk.quality.pojo.entity.InspectionTemplate; import org.springblade.desk.quality.pojo.request.InspectionTemplateAdd; @@ -52,7 +53,7 @@ import java.util.stream.Collectors; * @since 2025-12-19 */ @RestController -@RequestMapping("/QA/InspectionTemplate") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/InspectionTemplate") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java index 95d47d51..50e4d17a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotHardnessController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IotHardnessExcel; import org.springblade.desk.quality.pojo.entity.IotHardness; import org.springblade.desk.quality.pojo.vo.IotHardnessVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-23 */ @RestController -@RequestMapping("/IotHardness") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/IotHardness") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java index c9a18be7..070b87ee 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IotThicknessExcel; import org.springblade.desk.quality.pojo.entity.IotThickness; import org.springblade.desk.quality.pojo.vo.IotThicknessVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-23 */ @RestController -@RequestMapping("/IotThickness") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/IotThickness") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java index c97183c6..6f4889b3 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankController.java @@ -24,6 +24,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankExcel; import org.springblade.desk.quality.pojo.entity.LiquidTank; import org.springblade.desk.quality.pojo.vo.LiquidTankVO; @@ -44,7 +45,7 @@ import java.util.stream.Collectors; * @since 2025-12-16 */ @RestController -@RequestMapping("/QA/LiquidTank") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/LiquidTank") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportConfigController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportConfigController.java index d761dde4..59053fe4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportConfigController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportConfigController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankReportConfigExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankReportConfig; import org.springblade.desk.quality.pojo.vo.LiquidTankReportConfigVO; @@ -44,7 +45,7 @@ import java.util.Map; * @since 2025-12-18 */ @RestController -@RequestMapping("/QA/LiquidTankReportConfig") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/LiquidTankReportConfig") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java index e0acb9bd..e4e5e6b2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankReportExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankReport; import org.springblade.desk.quality.pojo.entity.LiquidTankTaskCopy; @@ -45,7 +46,7 @@ import java.util.Map; * @since 2025-12-18 */ @RestController -@RequestMapping("/QA/LiquidTankReport") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/LiquidTankReport") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java index d3f5cdfd..f0e71fc0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskController.java @@ -26,6 +26,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.quality.constant.LiquidTankTaskConst; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankTaskExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankTask; import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO; @@ -46,7 +47,7 @@ import java.util.stream.Collectors; * @since 2025-12-16 */ @RestController -@RequestMapping("/QA/LiquidTankTask") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/LiquidTankTask") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java index 2e74e410..d3be5f8b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskCopyController.java @@ -28,6 +28,7 @@ import org.springblade.desk.basic.util.RequestUtil; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.constant.BaseRequest; import org.springblade.desk.quality.constant.LiquidTankTaskConst; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankTaskCopyExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankTaskCopy; import org.springblade.desk.quality.pojo.vo.LiquidTankTaskCopyVO; @@ -50,7 +51,7 @@ import java.util.stream.Collectors; * @since 2025-12-18 */ @RestController -@RequestMapping("/QA/LiquidTankTaskCopy") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/LiquidTankTaskCopy") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskHiController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskHiController.java index d8c6048e..28d9976f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskHiController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankTaskHiController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankTaskHiExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankTaskHi; import org.springblade.desk.quality.pojo.vo.LiquidTankTaskHiVO; @@ -44,7 +45,7 @@ import java.util.Map; * @since 2025-12-17 */ @RestController -@RequestMapping("/QA/LiquidTankTaskHi") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/LiquidTankTaskHi") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java index 64574e0b..e490d692 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankWaveController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankWaveExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankWave; import org.springblade.desk.quality.pojo.vo.LiquidTankWaveVO; @@ -44,7 +45,7 @@ import java.util.Map; * @since 2025-12-19 */ @RestController -@RequestMapping("/QA/LiquidTankWave") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/LiquidTankWave") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java index 83fd7c52..03c653b0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -3,50 +3,56 @@ */ package org.springblade.desk.quality.controller; -import io.swagger.v3.oas.annotations.tags.Tag; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; -import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import lombok.Data; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +import org.springblade.common.constant.CommonConstant; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity; +import org.springblade.desk.order.pojo.entity.YieldOrderCraft; +import org.springblade.desk.quality.constant.QAModuleConst; +import org.springblade.desk.quality.excel.NgExcel; import org.springblade.desk.quality.pojo.entity.Ng; import org.springblade.desk.quality.pojo.vo.NgVO; -import org.springblade.desk.quality.excel.NgExcel; -import org.springblade.desk.quality.wrapper.NgWrapper; import org.springblade.desk.quality.service.INgService; -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 org.springblade.desk.quality.wrapper.NgWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + import java.util.List; -import jakarta.servlet.http.HttpServletResponse; +import java.util.Map; +import java.util.stream.Collectors; /** * [缺陷] 控制器 + * mes v1: bs_review_sheet_type * * @author Tom Shuo * @since 2026-01-04 */ @RestController -@RequestMapping("/Ng") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/Ng") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @@ -55,184 +61,192 @@ import jakarta.servlet.http.HttpServletResponse; public class NgController extends BladeController { @Resource - private INgService service; - - /** - * [缺陷] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入Ng Obj") - public R detail(Ng ng) { - QueryWrapper qw = Condition.getQueryWrapper(ng); - Ng detail = service.getOne(qw); - NgVO detailVO = NgWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [缺陷] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入Ng Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map ng, - Query query) { + private INgService service; + + /** + * [缺陷] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Ng Obj") + public R detail(Ng ng) { + QueryWrapper qw = Condition.getQueryWrapper(ng); + Ng detail = service.getOne(qw); + NgVO detailVO = NgWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [缺陷] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Ng Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map ng, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = NgWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [缺陷] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入Ng Obj") - public R> page(NgVO ng, Query query) { - IPage pagesVO = service.selectNgPage( - Condition.getPage(query), ng - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = NgWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [缺陷] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Ng Obj") + public R> page(NgVO ng, Query query) { + IPage pagesVO = service.selectNgPage( + Condition.getPage(query), ng + ); + return R.data(pagesVO); + } + + /** * [缺陷] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") - public R> listForSelect() { - List list = service.list(); - List listVO = NgWrapper.build().listVO(list); - return R.data(listVO); + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect( + @Parameter(description = "ngType", required = true) @RequestParam Integer ngType, + @Parameter(description = "parentId", required = false) @RequestParam Integer parentId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(Ng.class); + qw.eq(Ng::getNgType, ngType); + if (parentId != null) { + qw.eq(Ng::getParentId, parentId); + } + qw.eq(Ng::getIsDeleted, CommonConstant.DELETE_FALSE); + List list = service.list(qw); + List listVO = NgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [缺陷] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Ng Obj") + public R save(@Valid @RequestBody Ng addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [缺陷] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入Ng Obj") - public R save(@Valid @RequestBody Ng addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [缺陷] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入Ng List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [缺陷] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入Ng Obj") - public R update(@Valid @RequestBody Ng updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Ng List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [缺陷] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Ng Obj") + public R update(@Valid @RequestBody Ng updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [缺陷] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入Ng List") + @Operation(summary = "修改批量", description = "传入Ng List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [缺陷] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入Ng Obj") - public R submit(@Valid @RequestBody Ng mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [缺陷] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Ng Obj") + public R submit(@Valid @RequestBody Ng mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [缺陷] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入Ng List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [缺陷] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [缺陷] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入Ng") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map ng, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportNg(qw); - ExcelUtil.export(response, "[缺陷]数据" + org.springblade.core.tool.utils.DateUtil.time(), - "[缺陷]数据表", list, NgExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Ng List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [缺陷] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [缺陷] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Ng") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map ng, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportNg(qw); + ExcelUtil.export(response, "[缺陷]数据" + DateUtil.time(), + "[缺陷]数据表", list, NgExcel.class); + } + + /** * [缺陷] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [缺陷] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, Ng.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [缺陷] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Ng.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java index 1ad92851..7054a57b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.PlanTestExcel; import org.springblade.desk.quality.pojo.entity.PlanTest; import org.springblade.desk.quality.pojo.vo.PlanTestVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-24 */ @RestController -@RequestMapping("/QA/PlanTest") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/PlanTest") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java index 8e8d86fa..a9c53265 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateController.java @@ -26,6 +26,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.ProReTemplateConst; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.ProReTemplateExcel; import org.springblade.desk.quality.pojo.entity.ProReTemplate; import org.springblade.desk.quality.pojo.vo.ProReTemplateVO; @@ -47,7 +48,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/QA/ProReTemplate") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/ProReTemplate") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java index fa86dc18..11b437f6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java @@ -20,6 +20,7 @@ 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.springblade.desk.quality.constant.QAModuleConst; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -48,7 +49,7 @@ import jakarta.servlet.http.HttpServletResponse; * @since 2025-12-30 */ @RestController -@RequestMapping("/ProReTemplateDetail") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/ProReTemplateDetail") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java index 905fa26d..c231dbbb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java @@ -20,6 +20,7 @@ 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.springblade.desk.quality.constant.QAModuleConst; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -48,7 +49,7 @@ import jakarta.servlet.http.HttpServletResponse; * @since 2025-12-30 */ @RestController -@RequestMapping("/ProReTemplateTank") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/ProReTemplateTank") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelInsTemplateItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelInsTemplateItemController.java index 68829aa4..5c17e6c8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelInsTemplateItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelInsTemplateItemController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.RelInsTemplateItemExcel; import org.springblade.desk.quality.pojo.entity.RelInsTemplateItem; import org.springblade.desk.quality.pojo.vo.RelInsTemplateItemVO; @@ -44,7 +45,7 @@ import java.util.Map; * @since 2025-12-19 */ @RestController -@RequestMapping("/QA/RelInsTemplateItem") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/RelInsTemplateItem") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankReportItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankReportItemController.java index fbf39291..77e5cd24 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankReportItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankReportItemController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.RelTankReportItemExcel; import org.springblade.desk.quality.pojo.entity.RelTankReportItem; import org.springblade.desk.quality.pojo.vo.RelTankReportItemVO; @@ -44,7 +45,7 @@ import java.util.Map; * @since 2025-12-18 */ @RestController -@RequestMapping("/QA/RelTankReportItem") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/RelTankReportItem") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankWaveItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankWaveItemController.java index 51ac8409..4dce9cdf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankWaveItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RelTankWaveItemController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.RelTankWaveItemExcel; import org.springblade.desk.quality.pojo.entity.RelTankWaveItem; import org.springblade.desk.quality.pojo.vo.RelTankWaveItemVO; @@ -44,7 +45,7 @@ import java.util.Map; * @since 2025-12-19 */ @RestController -@RequestMapping("/QA/RelTankWaveItem") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/RelTankWaveItem") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java index 91ea7233..f692d46d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.RemindMsgExcel; import org.springblade.desk.quality.pojo.entity.RemindMsg; import org.springblade.desk.quality.pojo.vo.RemindMsgVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-22 */ @RestController -@RequestMapping("/QA/RemindMsg") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/RemindMsg") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java index 93fabbfd..84d73794 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java @@ -24,6 +24,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.StandardExcel; import org.springblade.desk.quality.pojo.entity.Standard; import org.springblade.desk.quality.pojo.vo.StandardVO; @@ -44,7 +45,7 @@ import java.util.stream.Collectors; * @since 2025-12-15 */ @RestController -@RequestMapping("/QA/Standard") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/Standard") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java index 84556b54..b42ff14f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardParamController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.StandardParamExcel; import org.springblade.desk.quality.pojo.entity.StandardParam; import org.springblade.desk.quality.pojo.vo.StandardParamVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-23 */ @RestController -@RequestMapping("/StandardParam") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/StandardParam") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/SupplyInspectionController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/SupplyInspectionController.java index 0a870c4a..21e4aed6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/SupplyInspectionController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/SupplyInspectionController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.SupplyInspectionExcel; import org.springblade.desk.quality.pojo.entity.SupplyInspection; import org.springblade.desk.quality.pojo.vo.SupplyInspectionVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2025-12-23 */ @RestController -@RequestMapping("/QA/SupplyInspection") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/SupplyInspection") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java index 14ec6b2a..cd708be6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.api.R; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.service.CycleTestTaskService2; import org.springblade.desk.quality.service.TestService; import org.springframework.web.bind.annotation.GetMapping; @@ -15,7 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @RestController -@RequestMapping("/QA/Test") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/Test") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/NgExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/NgExcel.java index b9345bdd..b3629354 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/NgExcel.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/NgExcel.java @@ -4,16 +4,15 @@ package org.springblade.desk.quality.excel; -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 lombok.Data; + import java.io.Serial; +import java.io.Serializable; +import java.math.BigDecimal; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java index d70d9b7b..38cd1464 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java @@ -3,13 +3,14 @@ */ package org.springblade.desk.quality.mapper; -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; -import org.springblade.desk.quality.excel.NgExcel; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; 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.NgExcel; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; + import java.util.List; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java index efc30a87..3d094261 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java @@ -3,9 +3,10 @@ */ package org.springblade.desk.quality.pojo.dto; -import org.springblade.desk.quality.pojo.entity.Ng; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.Ng; + import java.io.Serial; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java index b6b7f2e3..ad148988 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java @@ -3,13 +3,14 @@ */ 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 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; /** * [缺陷] 实体类 @@ -90,7 +91,7 @@ public class Ng extends BaseEntity { * 父级[不良原因]id */ @Schema(description = "父级[不良原因]id") - private BigDecimal parentId; + private Long parentId; /** * 排序 */ @@ -110,7 +111,7 @@ public class Ng extends BaseEntity { * [制品]id */ @Schema(description = "[制品]id") - private BigDecimal productId; + private Long productId; /** * [制品]编码 */ @@ -120,10 +121,10 @@ public class Ng extends BaseEntity { * [工序]id */ @Schema(description = "[工序]id") - private BigDecimal processId; + private Long processId; /** * [工序]编码 */ @Schema(description = "[工序]编码") - private String processCode; + private Long processCode; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java index e2a09db8..115a3654 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java @@ -3,9 +3,10 @@ */ package org.springblade.desk.quality.pojo.vo; -import org.springblade.desk.quality.pojo.entity.Ng; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.Ng; + import java.io.Serial; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/INgService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/INgService.java index 6191565b..dc4418e5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/INgService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/INgService.java @@ -4,11 +4,12 @@ package org.springblade.desk.quality.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; -import org.springblade.desk.quality.excel.NgExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.desk.quality.excel.NgExcel; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; + import java.util.List; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java index b022af64..b713a1ed 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java @@ -3,22 +3,23 @@ */ package org.springblade.desk.quality.service.impl; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import jakarta.annotation.Resource; -import lombok.Data; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; +import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.quality.excel.NgExcel; import org.springblade.desk.quality.mapper.NgMapper; +import org.springblade.desk.quality.pojo.entity.Ng; +import org.springblade.desk.quality.pojo.vo.NgVO; import org.springblade.desk.quality.service.INgService; -import org.springblade.system.feign.IUserClient; import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; 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; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java index 6deefe1b..4149c91b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java @@ -7,6 +7,7 @@ import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.quality.pojo.entity.Ng; import org.springblade.desk.quality.pojo.vo.NgVO; + import java.util.Objects; /** From c63df34f870d70dff9e383a01891458b865346be Mon Sep 17 00:00:00 2001 From: Tom Li Date: Mon, 5 Jan 2026 10:31:01 +0800 Subject: [PATCH 08/22] =?UTF-8?q?oem=E7=9B=B8=E5=85=B3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resource/feign/IAttachClient.java | 13 +- .../desk/quality/controller/NgController.java | 318 +++++++++--------- .../quality/service/impl/NgServiceImpl.java | 5 +- .../resource/feign/AttachClient.java | 6 + .../desk/basic/constant/OemConst.java | 44 +++ .../desk/basic/controller/OemController.java | 44 ++- .../desk/basic/mapper/OemMapper.java | 3 + .../desk/basic/pojo/entity/Oem.java | 2 +- .../desk/basic/pojo/request/OemSearch.java | 11 + .../desk/basic/service/IOemService.java | 5 + .../basic/service/impl/OemServiceImpl.java | 11 + .../quality/constant/LiquidTankTaskConst.java | 1 - .../controller/IndicatorYearController.java | 2 +- .../IndicatorYearDetailController.java | 2 +- .../controller/PlanTestController.java | 2 +- 15 files changed, 294 insertions(+), 175 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/OemConst.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java diff --git a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java index 309d29e8..8070473d 100644 --- a/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java +++ b/blade-ops-api/blade-resource-api/src/main/java/org/springblade/resource/feign/IAttachClient.java @@ -20,6 +20,8 @@ public interface IAttachClient { String DETAIL_BY_ID = API_PREFIX + "/detail-by-id"; + String COPY_FROM_TEMP_TO_BIZ_PREFIX = API_PREFIX + "/copy-from-temp-to-biz-prefix"; + /** * * @param attach @@ -29,10 +31,19 @@ public interface IAttachClient { R detail(@RequestBody Attach attach); /** - * todo:改成get * @param id * @return */ @GetMapping(DETAIL_BY_ID) R detailById(@RequestParam("id") Long id); + + /** + * + * @param id + * @param bizPrefix + * @return + */ + @GetMapping(COPY_FROM_TEMP_TO_BIZ_PREFIX) + R copyFromTempToBizPrefix(@RequestParam("id") Long id, + @RequestParam("bizPrefix") String bizPrefix); } diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java index 83fd7c52..bb651df9 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -25,7 +25,6 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.pojo.entity.Ng; import org.springblade.desk.quality.pojo.vo.NgVO; import org.springblade.desk.quality.excel.NgExcel; @@ -35,8 +34,11 @@ 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 java.util.stream.Collectors; + import jakarta.servlet.http.HttpServletResponse; /** @@ -55,184 +57,186 @@ import jakarta.servlet.http.HttpServletResponse; public class NgController extends BladeController { @Resource - private INgService service; - - /** - * [缺陷] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入Ng Obj") - public R detail(Ng ng) { - QueryWrapper qw = Condition.getQueryWrapper(ng); - Ng detail = service.getOne(qw); - NgVO detailVO = NgWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [缺陷] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入Ng Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map ng, - Query query) { + private INgService service; + + /** + * [缺陷] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Ng Obj") + public R detail(Ng ng) { + QueryWrapper qw = Condition.getQueryWrapper(ng); + Ng detail = service.getOne(qw); + NgVO detailVO = NgWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [缺陷] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Ng Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map ng, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = NgWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [缺陷] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入Ng Obj") - public R> page(NgVO ng, Query query) { - IPage pagesVO = service.selectNgPage( - Condition.getPage(query), ng - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = NgWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [缺陷] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Ng Obj") + public R> page(NgVO ng, Query query) { + IPage pagesVO = service.selectNgPage( + Condition.getPage(query), ng + ); + return R.data(pagesVO); + } + + /** * [缺陷] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = NgWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = NgWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [缺陷] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Ng Obj") + public R save(@Valid @RequestBody Ng addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [缺陷] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入Ng Obj") - public R save(@Valid @RequestBody Ng addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [缺陷] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入Ng List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [缺陷] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入Ng Obj") - public R update(@Valid @RequestBody Ng updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Ng List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [缺陷] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Ng Obj") + public R update(@Valid @RequestBody Ng updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [缺陷] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入Ng List") + @Operation(summary = "修改批量", description = "传入Ng List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [缺陷] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入Ng Obj") - public R submit(@Valid @RequestBody Ng mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [缺陷] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Ng Obj") + public R submit(@Valid @RequestBody Ng mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [缺陷] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入Ng List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [缺陷] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [缺陷] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入Ng") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map ng, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportNg(qw); - ExcelUtil.export(response, "[缺陷]数据" + org.springblade.core.tool.utils.DateUtil.time(), - "[缺陷]数据表", list, NgExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Ng List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [缺陷] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [缺陷] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Ng") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map ng, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportNg(qw); + ExcelUtil.export(response, "[缺陷]数据" + org.springblade.core.tool.utils.DateUtil.time(), + "[缺陷]数据表", list, NgExcel.class); + } + + /** * [缺陷] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [缺陷] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, Ng.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { +// return ExcelExtUtil.downloadXlsTemplate( +// "Excel/QA/ImportTemplate-CycleTestItem.xls", +// "导入模版-周期试验项目.xls"); + return null; + } + + /** + * [缺陷] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { +// R checkR = ExcelExtUtil.importExcelCheck(file); +// if (checkR != null) { +// return checkR; +// } +// List importList = ExcelUtil.read( +// file, 0, 1, Ng.class +// ); +// return R.status(service.saveBatch(importList)); + return null; + } } diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java index b022af64..4fa1aaa4 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java @@ -13,7 +13,6 @@ import org.springblade.desk.quality.pojo.vo.NgVO; import org.springblade.desk.quality.excel.NgExcel; import org.springblade.desk.quality.mapper.NgMapper; import org.springblade.desk.quality.service.INgService; -import org.springblade.system.feign.IUserClient; import org.springblade.system.feign.IDictClient; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; @@ -34,8 +33,8 @@ import java.util.List; @Slf4j public class NgServiceImpl extends BaseServiceImpl implements INgService { - @Resource - private IUserClient userClient; +// @Resource +// private IUserClient userClient; @Resource private IDictClient dictClient; diff --git a/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java b/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java index 2fdb059c..078bb9a5 100644 --- a/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java +++ b/blade-ops/blade-resource/src/main/java/org/springblade/resource/feign/AttachClient.java @@ -30,4 +30,10 @@ public class AttachClient implements IAttachClient { Attach detail = attachService.getById(id); return R.data(detail); } + + @Override + public R copyFromTempToBizPrefix(Long id, String bizPrefix) { + // todo:有temp桶,成功以后移动到具体业务桶中. + return null; + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/OemConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/OemConst.java new file mode 100644 index 00000000..55e07c7d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/OemConst.java @@ -0,0 +1,44 @@ +package org.springblade.desk.basic.constant; + +public interface OemConst { + + /** + * 正常供货 + */ + Integer S_OK = 0; + /** + * 暂停供货 + */ + Integer S_STOP = 1; + /** + * 暂停新物料采购 + */ + Integer S_STOP_NEW_MAT = 2; + + + /** + * 民品&普军 + */ + Integer QUALIFICATION_0 = 0; + /** + * 军标线 + */ + Integer QUALIFICATION_1 = 1; + /** + * 民品&普军&航军 + */ + Integer QUALIFICATION_2 = 2; + /** + * 民品&普军&军标线 + */ + Integer QUALIFICATION_3 = 3; + /** + * 民品&普军&航军&军标线 + */ + Integer QUALIFICATION_4 = 4; + + + + + String DICT_QUALIFICATION = "Oem-Qualification"; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index 110c701e..8231b870 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -25,8 +25,10 @@ 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.basic.constant.BAModuleConst; +import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; import org.springblade.desk.basic.service.IOemService; import org.springblade.desk.basic.util.ExcelExtUtil; @@ -78,16 +80,40 @@ public class OemController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 20) @Operation(summary = "list分页", description = "传入Oem Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map oem, + public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(oem, Oem.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = OemWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); + // 构建search对象。 + OemSearch search = new OemSearch(); + +// if (map.containsKey(Oem.COL_CODE)) { +// search.setCode((Func.toStr(map.get(OemSearch.COL_CODE)))); +// } +// if (map.containsKey(Oem.COL_OC_NAME)) { +// search.setOcName((Func.toStr(map.get(OemSearch.COL_OC_NAME)))); +// } +// if (map.containsKey(Oem.COL_ABBREVIATION)) { +// search.setAbbreviation((Func.toStr(map.get(OemSearch.COL_ABBREVIATION)))); +// } +// if (map.containsKey(OemSearch.COL_QUALIFICATION)) { +// search.setQualification((Func.toInt(map.get(OemSearch.COL_QUALIFICATION)))); +// } +// if (map.containsKey(BaseCol.STATUS)) { +// search.setStatus((Integer) map.get(BaseCol.STATUS)); +// } +// if (map.containsKey(OemSearch.COL_CONTACT_MAN)) { +// search.setContactMan((Func.toStr(map.get(OemSearch.COL_CONTACT_MAN)))); +// } + + +// IPage pages = service.page(Condition.getPage(query), qw); +// IPage pagesVO = OemWrapper.build().pageVO(pages); + +// pagesVO.getRecords() +// .stream() +// .peek(service::setVOValue) +// .collect(Collectors.toList()); +// return R.data(pagesVO); + return null; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java index 72ae9820..692c3739 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java @@ -9,7 +9,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java index 3546ce73..42f66146 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java @@ -112,7 +112,7 @@ public class Oem extends BaseEntity { * 资质 */ @Schema(description = "资质") - private Short qualification; + private Integer qualification; /** * 联系人 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java new file mode 100644 index 00000000..a122effb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java @@ -0,0 +1,11 @@ +package org.springblade.desk.basic.pojo.request; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Oem; + +@Data +@EqualsAndHashCode(callSuper = true) +public class OemSearch extends Oem { + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java index df2ef9b8..71b1c508 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java @@ -9,7 +9,10 @@ import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; +import org.springblade.desk.quality.pojo.entity.AuditFile; +import org.springblade.desk.quality.pojo.request.AuditFileSearch; import java.util.List; @@ -44,5 +47,7 @@ public interface IOemService extends BaseService { */ void setVOValue(OemVO vo); + IPage listSearch(IPage page, OemSearch search); + R setPassword(Oem updateOne); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java index 9361d4ea..5fa344e8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java @@ -5,16 +5,19 @@ package org.springblade.desk.basic.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.mp.support.Condition; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.mapper.OemMapper; import org.springblade.desk.basic.pojo.entity.Oem; +import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; import org.springblade.desk.basic.service.IOemService; import org.springblade.system.feign.IDictClient; @@ -60,6 +63,14 @@ public class OemServiceImpl extends BaseServiceImpl implements I } + @Override + public IPage listSearch(IPage page, OemSearch search) { + // todo: + // Wrapper qw = Wrappers.query().lambda(); + // qw.lambda().eq(CycleTestItem::getTenantId, bladeUser.getTenantId()); // todo: + return null; + } + @Override public R setPassword(Oem updateOne) { Oem find = getById(updateOne.getId()); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java index 79f18dd8..4dd2c0dd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/LiquidTankTaskConst.java @@ -9,7 +9,6 @@ public interface LiquidTankTaskConst { * 来源类型-[2]:周期自动生成; */ Integer FROM_TYPE_PERIODIC = 2; - /** * 来源类型-[3]:计算自动生成; */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java index f36dad20..1c6b2578 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java @@ -47,7 +47,7 @@ import java.util.stream.Collectors; /** * [年度指标] 控制器 - * + * mes v1: qc_annual_target * @author Tom Shuo * @since 2025-12-22 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java index ac67fffe..60dec0ef 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearDetailController.java @@ -41,7 +41,7 @@ import java.util.stream.Collectors; /** * [年度指标明细] 控制器 - * + * mes v1: qc_annual_target_detail * @author Tom Shuo * @since 2025-12-23 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java index 7054a57b..0a0b798d 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/PlanTestController.java @@ -41,7 +41,7 @@ import java.util.stream.Collectors; /** * [转试记录] 控制器 - * mes v1: + * mes v1: pr_plan_test * @author Tom Shuo * @since 2025-12-24 */ From d7ff3c54c88c3b17da4b533b4a9608414d351b05 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Mon, 5 Jan 2026 11:27:24 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=9F=E6=88=90?= =?UTF-8?q?=E7=9A=84=E6=97=A0=E7=94=A8=E7=B1=BB=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/quality/controller/NgController.java | 242 ------------------ .../desk/quality/excel/NgExcel.java | 100 -------- .../desk/quality/mapper/NgMapper.java | 39 --- .../desk/quality/mapper/NgMapper.xml | 27 -- .../desk/quality/pojo/dto/NgDTO.java | 23 -- .../desk/quality/pojo/entity/Ng.java | 129 ---------- .../desk/quality/pojo/vo/NgVO.java | 23 -- .../desk/quality/service/INgService.java | 43 ---- .../quality/service/impl/NgServiceImpl.java | 59 ----- .../desk/quality/wrapper/NgWrapper.java | 35 --- 10 files changed, 720 deletions(-) delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java deleted file mode 100644 index bb651df9..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ /dev/null @@ -1,242 +0,0 @@ -/** - * 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 jakarta.annotation.Resource; -import jakarta.validation.Valid; - -import lombok.Data; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.extern.slf4j.Slf4j; -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.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; -import org.springblade.desk.quality.excel.NgExcel; -import org.springblade.desk.quality.wrapper.NgWrapper; -import org.springblade.desk.quality.service.INgService; -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 java.util.stream.Collectors; - -import jakarta.servlet.http.HttpServletResponse; - -/** - * [缺陷] 控制器 - * - * @author Tom Shuo - * @since 2026-01-04 - */ -@RestController -@RequestMapping("/Ng") -@Data -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Slf4j -@Tag(name = "[缺陷]", description = "[缺陷]接口") -public class NgController extends BladeController { - - @Resource - private INgService service; - - /** - * [缺陷] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入Ng Obj") - public R detail(Ng ng) { - QueryWrapper qw = Condition.getQueryWrapper(ng); - Ng detail = service.getOne(qw); - NgVO detailVO = NgWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [缺陷] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入Ng Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map ng, - Query query) { - QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = NgWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [缺陷] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入Ng Obj") - public R> page(NgVO ng, Query query) { - IPage pagesVO = service.selectNgPage( - Condition.getPage(query), ng - ); - return R.data(pagesVO); - } - - /** - * [缺陷] list下拉选择 - */ - @GetMapping("/listForSelect") - @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") - public R> listForSelect() { - List list = service.list(); - List listVO = NgWrapper.build().listVO(list); - return R.data(listVO); - } - - /** - * [缺陷] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入Ng Obj") - public R save(@Valid @RequestBody Ng addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** - * [缺陷] 新增批量 - */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入Ng List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [缺陷] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入Ng Obj") - public R update(@Valid @RequestBody Ng updateOne) { - return R.status(service.updateById(updateOne)); - } - - /** - * [缺陷] 修改批量 - */ - @PostMapping("/updateBat") - @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入Ng List") - public R updateBat(@Valid @RequestBody List updateList) { - return R.status(service.updateBatchById(updateList)); - } - - /** - * [缺陷] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入Ng Obj") - public R submit(@Valid @RequestBody Ng mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** - * [缺陷] 新增或修改批量 - */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入Ng List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [缺陷] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [缺陷] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入Ng") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map ng, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(ng, Ng.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(Ng::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(NgEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportNg(qw); - ExcelUtil.export(response, "[缺陷]数据" + org.springblade.core.tool.utils.DateUtil.time(), - "[缺陷]数据表", list, NgExcel.class); - } - - /** - * [缺陷] 下载Excel模板 - */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { -// return ExcelExtUtil.downloadXlsTemplate( -// "Excel/QA/ImportTemplate-CycleTestItem.xls", -// "导入模版-周期试验项目.xls"); - return null; - } - - /** - * [缺陷] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { -// R checkR = ExcelExtUtil.importExcelCheck(file); -// if (checkR != null) { -// return checkR; -// } -// List importList = ExcelUtil.read( -// file, 0, 1, Ng.class -// ); -// return R.status(service.saveBatch(importList)); - return null; - } -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java deleted file mode 100644 index b9345bdd..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/excel/NgExcel.java +++ /dev/null @@ -1,100 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.excel; - - -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 2026-01-04 - */ -@Data -@ColumnWidth(25) -@HeadRowHeight(20) -@ContentRowHeight(18) -public class NgExcel implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 编码 - */ - @ColumnWidth(20) - @ExcelProperty("编码") - private String code; - /** - * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; - */ - @ColumnWidth(20) - @ExcelProperty("故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类;") - private Long ngType; - /** - * 名称 - */ - @ColumnWidth(20) - @ExcelProperty("名称") - private String name; - /** - * 父级[不良原因]id - */ - @ColumnWidth(20) - @ExcelProperty("父级[不良原因]id") - private BigDecimal parentId; - /** - * 排序 - */ - @ColumnWidth(20) - @ExcelProperty("排序") - private Long sort; - /** - * 备注 - */ - @ColumnWidth(20) - @ExcelProperty("备注") - private String remark; - /** - * 缺陷描述 - */ - @ColumnWidth(20) - @ExcelProperty("缺陷描述") - private String desc; - /** - * [制品]id - */ - @ColumnWidth(20) - @ExcelProperty("[制品]id") - private BigDecimal productId; - /** - * [制品]编码 - */ - @ColumnWidth(20) - @ExcelProperty("[制品]编码") - private String productCode; - /** - * [工序]id - */ - @ColumnWidth(20) - @ExcelProperty("[工序]id") - private BigDecimal processId; - /** - * [工序]编码 - */ - @ColumnWidth(20) - @ExcelProperty("[工序]编码") - private String processCode; -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java deleted file mode 100644 index d70d9b7b..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.mapper; - -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; -import org.springblade.desk.quality.excel.NgExcel; -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 2026-01-04 - */ -public interface NgMapper extends BaseMapper { - - /** - * 自定义分页 - * - * @param page 分页参数 - * @param ng 查询参数 - * @return List - */ - List selectNgPage(IPage page, NgVO ng); - - /** - * 获取导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportNg(@Param("ew") Wrapper queryWrapper); -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml deleted file mode 100644 index ac77b49d..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/mapper/NgMapper.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java deleted file mode 100644 index efc30a87..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.pojo.dto; - -import org.springblade.desk.quality.pojo.entity.Ng; -import lombok.Data; -import lombok.EqualsAndHashCode; -import java.io.Serial; - -/** - * [缺陷] 数据传输对象实体类 - * - * @author Tom Shuo - * @since 2026-01-04 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class NgDTO extends Ng { - @Serial - private static final long serialVersionUID = 1L; - -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java deleted file mode 100644 index b6b7f2e3..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java +++ /dev/null @@ -1,129 +0,0 @@ -/** - * 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 2026-01-04 - */ -@Data -@TableName("QA_NG") -@Schema(description = "Ng Entity对象") -@EqualsAndHashCode(callSuper = true) -public class Ng extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 编码 - */ - public static final String COL_CODE = "CODE"; - /** - * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; - */ - public static final String COL_NG_TYPE = "NG_TYPE"; - /** - * 名称 - */ - public static final String COL_NAME = "NAME"; - /** - * 父级[不良原因]id - */ - public static final String COL_PARENT_ID = "PARENT_ID"; - /** - * 排序 - */ - public static final String COL_SORT = "SORT"; - /** - * 备注 - */ - public static final String COL_REMARK = "REMARK"; - /** - * 缺陷描述 - */ - public static final String COL_DESC = "DESC"; - /** - * [制品]id - */ - public static final String COL_PRODUCT_ID = "PRODUCT_ID"; - /** - * [制品]编码 - */ - public static final String COL_PRODUCT_CODE = "PRODUCT_CODE"; - /** - * [工序]id - */ - public static final String COL_PROCESS_ID = "PROCESS_ID"; - /** - * [工序]编码 - */ - public static final String COL_PROCESS_CODE = "PROCESS_CODE"; - - /** - * 编码 - */ - @Schema(description = "编码") - private String code; - /** - * 故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类; - */ - @Schema(description = "故障类型-[1]:故障特征;[2]:故障类别;[3]:问题大类;[4]:问题小类;") - private Long ngType; - /** - * 名称 - */ - @Schema(description = "名称") - private String name; - /** - * 父级[不良原因]id - */ - @Schema(description = "父级[不良原因]id") - private BigDecimal parentId; - /** - * 排序 - */ - @Schema(description = "排序") - private Long sort; - /** - * 备注 - */ - @Schema(description = "备注") - private String remark; - /** - * 缺陷描述 - */ - @Schema(description = "缺陷描述") - private String desc; - /** - * [制品]id - */ - @Schema(description = "[制品]id") - private BigDecimal productId; - /** - * [制品]编码 - */ - @Schema(description = "[制品]编码") - private String productCode; - /** - * [工序]id - */ - @Schema(description = "[工序]id") - private BigDecimal processId; - /** - * [工序]编码 - */ - @Schema(description = "[工序]编码") - private String processCode; -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java deleted file mode 100644 index e2a09db8..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.pojo.vo; - -import org.springblade.desk.quality.pojo.entity.Ng; -import lombok.Data; -import lombok.EqualsAndHashCode; -import java.io.Serial; - -/** - * [缺陷] 视图实体类 - * - * @author Tom Shuo - * @since 2026-01-04 - */ -@Data -@EqualsAndHashCode(callSuper = true) -public class NgVO extends Ng { - @Serial - private static final long serialVersionUID = 1L; - -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java deleted file mode 100644 index 6191565b..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/INgService.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.service; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; -import org.springblade.desk.quality.excel.NgExcel; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseService; -import java.util.List; - -/** - * [缺陷] 服务类 - * - * @author Tom Shuo - * @since 2026-01-04 - */ -public interface INgService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param ng 查询参数 - * @return IPage - */ - IPage selectNgPage(IPage page, NgVO ng); - - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportNg(Wrapper queryWrapper); - - /** - * VO - * @param vo - */ - void setVOValue(NgVO vo); -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java deleted file mode 100644 index 4fa1aaa4..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/service/impl/NgServiceImpl.java +++ /dev/null @@ -1,59 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.service.impl; - -import jakarta.annotation.Resource; -import lombok.Data; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.extern.slf4j.Slf4j; -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; -import org.springblade.desk.quality.excel.NgExcel; -import org.springblade.desk.quality.mapper.NgMapper; -import org.springblade.desk.quality.service.INgService; -import org.springblade.system.feign.IDictClient; -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 2026-01-04 - */ -@Service -@Data -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Slf4j -public class NgServiceImpl extends BaseServiceImpl implements INgService { - -// @Resource -// private IUserClient userClient; - @Resource - private IDictClient dictClient; - - @Override - public IPage selectNgPage(IPage page, NgVO ng) { - return page.setRecords(baseMapper.selectNgPage(page, ng)); - } - - @Override - public List exportNg(Wrapper queryWrapper) { - List ngList = baseMapper.exportNg(queryWrapper); - //ngList.forEach(ng -> { - // ng.setTypeName(DictCache.getValue(DictEnum.YES_NO, Ng.getType())); - //}); - return ngList; - } - - @Override - public void setVOValue(NgVO vo) { - - } -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java deleted file mode 100644 index 6deefe1b..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/quality/wrapper/NgWrapper.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.quality.wrapper; - -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.desk.quality.pojo.entity.Ng; -import org.springblade.desk.quality.pojo.vo.NgVO; -import java.util.Objects; - -/** - * [缺陷] 包装类,返回视图层所需的字段 - * - * @author Tom Shuo - * @since 2026-01-04 - */ -public class NgWrapper extends BaseEntityWrapper { - - public static NgWrapper build() { - return new NgWrapper(); - } - - @Override - public NgVO entityVO(Ng ng) { - NgVO VO = Objects.requireNonNull(BeanUtil.copyProperties(ng, NgVO.class)); - - //User createUser = UserCache.getUser(ng.getCreateUser()); - //User updateUser = UserCache.getUser(ng.getUpdateUser()); - //ngVO.setCreateUserName(createUser.getName()); - //ngVO.setUpdateUserName(updateUser.getName()); - - return VO; - } -} From 7db431342f41d959b3de756b93c6d6ff7c18b831 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Mon, 5 Jan 2026 16:21:31 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E8=A1=A5=E5=85=A8=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A8=A1=E5=9D=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/controller/PlatingController.java | 238 ++++++++++++++++ .../desk/basic/excel/PlatingExcel.java | 125 +++++++++ .../desk/basic/mapper/PlatingMapper.java | 39 +++ .../desk/basic/mapper/PlatingMapper.xml | 31 +++ .../desk/basic/pojo/dto/PlatingDTO.java | 23 ++ .../desk/basic/pojo/entity/Plating.java | 166 ++++++++++++ .../desk/basic/pojo/vo/PlatingVO.java | 23 ++ .../desk/basic/service/IPlatingService.java | 43 +++ .../service/impl/PlatingServiceImpl.java | 60 ++++ .../desk/basic/wrapper/PlatingWrapper.java | 35 +++ .../test/resources/templates/code.properties | 2 +- .../desk/basic/constant/BasicClazzConst.java | 61 +++++ .../controller/BasicClazzController.java | 256 ++++++++++++++++++ .../basic/controller/BatConfigController.java | 3 +- .../CoatingThicknessController.java | 238 ++++++++++++++++ .../basic/controller/FormulaController.java | 4 +- .../LocallyPlatedPartController.java | 238 ++++++++++++++++ .../controller/MaterialQuotaController.java | 238 ++++++++++++++++ .../desk/basic/controller/OemController.java | 20 +- .../controller/PlanAssignSteerController.java | 238 ++++++++++++++++ .../basic/controller/PlatingController.java | 238 ++++++++++++++++ .../controller/PlatingSmallController.java | 239 ++++++++++++++++ .../controller/ProcessAbilityController.java | 4 +- .../basic/controller/ProdMarkController.java | 2 +- .../basic/controller/ShiftsController.java | 238 ++++++++++++++++ .../basic/controller/TeamSetController.java | 4 +- .../controller/WorkCenterController.java | 4 +- .../basic/controller/WorkTankController.java | 4 +- .../desk/basic/excel/BasicClazzExcel.java | 62 +++++ .../basic/excel/CoatingThicknessExcel.java | 74 +++++ .../basic/excel/LocallyPlatedPartExcel.java | 62 +++++ .../desk/basic/excel/MaterialQuotaExcel.java | 87 ++++++ .../basic/excel/PlanAssignSteerExcel.java | 94 +++++++ .../desk/basic/excel/PlatingExcel.java | 123 +++++++++ .../desk/basic/excel/PlatingSmallExcel.java | 63 +++++ .../desk/basic/excel/ShiftsExcel.java | 62 +++++ .../desk/basic/mapper/BasicClazzMapper.java | 40 +++ .../desk/basic/mapper/BasicClazzMapper.xml | 21 ++ .../basic/mapper/CoatingThicknessMapper.java | 40 +++ .../basic/mapper/CoatingThicknessMapper.xml | 23 ++ .../basic/mapper/LocallyPlatedPartMapper.java | 40 +++ .../basic/mapper/LocallyPlatedPartMapper.xml | 21 ++ .../basic/mapper/MaterialQuotaMapper.java | 40 +++ .../desk/basic/mapper/MaterialQuotaMapper.xml | 25 ++ .../basic/mapper/PlanAssignSteerMapper.java | 40 +++ .../basic/mapper/PlanAssignSteerMapper.xml | 26 ++ .../desk/basic/mapper/PlatingMapper.java | 40 +++ .../desk/basic/mapper/PlatingMapper.xml | 31 +++ .../desk/basic/mapper/PlatingSmallMapper.java | 40 +++ .../desk/basic/mapper/PlatingSmallMapper.xml | 21 ++ .../desk/basic/mapper/ShiftsMapper.java | 40 +++ .../desk/basic/mapper/ShiftsMapper.xml | 21 ++ .../desk/basic/pojo/dto/BasicClazzDTO.java | 24 ++ .../basic/pojo/dto/CoatingThicknessDTO.java | 24 ++ .../basic/pojo/dto/LocallyPlatedPartDTO.java | 24 ++ .../desk/basic/pojo/dto/MaterialQuotaDTO.java | 24 ++ .../basic/pojo/dto/PlanAssignSteerDTO.java | 24 ++ .../desk/basic/pojo/dto/PlatingDTO.java | 24 ++ .../desk/basic/pojo/dto/PlatingSmallDTO.java | 24 ++ .../desk/basic/pojo/dto/ShiftsDTO.java | 24 ++ .../desk/basic/pojo/entity/BasicClazz.java | 78 ++++++ .../desk/basic/pojo/entity/BatConfig.java | 9 +- .../basic/pojo/entity/CoatingThickness.java | 93 +++++++ .../basic/pojo/entity/LocallyPlatedPart.java | 75 +++++ .../desk/basic/pojo/entity/MaterialQuota.java | 111 ++++++++ .../basic/pojo/entity/PlanAssignSteer.java | 121 +++++++++ .../desk/basic/pojo/entity/Plating.java | 166 ++++++++++++ .../desk/basic/pojo/entity/PlatingSmall.java | 76 ++++++ .../basic/pojo/entity/ProcessAbility.java | 5 +- .../desk/basic/pojo/entity/ProdMark.java | 2 +- .../desk/basic/pojo/entity/Shifts.java | 75 +++++ .../desk/basic/pojo/vo/BasicClazzVO.java | 24 ++ .../basic/pojo/vo/CoatingThicknessVO.java | 24 ++ .../basic/pojo/vo/LocallyPlatedPartVO.java | 24 ++ .../desk/basic/pojo/vo/MaterialQuotaVO.java | 24 ++ .../desk/basic/pojo/vo/PlanAssignSteerVO.java | 24 ++ .../desk/basic/pojo/vo/PlatingSmallVO.java | 24 ++ .../desk/basic/pojo/vo/PlatingVO.java | 24 ++ .../desk/basic/pojo/vo/ShiftsVO.java | 24 ++ .../basic/service/IBasicClazzService.java | 44 +++ .../service/ICoatingThicknessService.java | 44 +++ .../service/ILocallyPlatedPartService.java | 44 +++ .../basic/service/IMaterialQuotaService.java | 44 +++ .../service/IPlanAssignSteerService.java | 44 +++ .../desk/basic/service/IPlatingService.java | 44 +++ .../basic/service/IPlatingSmallService.java | 44 +++ .../desk/basic/service/IShiftsService.java | 44 +++ .../service/impl/BasicClazzServiceImpl.java | 61 +++++ .../impl/CoatingThicknessServiceImpl.java | 61 +++++ .../impl/LocallyPlatedPartServiceImpl.java | 61 +++++ .../impl/MaterialQuotaServiceImpl.java | 61 +++++ .../impl/PlanAssignSteerServiceImpl.java | 61 +++++ .../service/impl/PlatingServiceImpl.java | 61 +++++ .../service/impl/PlatingSmallServiceImpl.java | 61 +++++ .../basic/service/impl/ShiftsServiceImpl.java | 61 +++++ .../desk/basic/wrapper/BasicClazzWrapper.java | 36 +++ .../wrapper/CoatingThicknessWrapper.java | 36 +++ .../wrapper/LocallyPlatedPartWrapper.java | 36 +++ .../basic/wrapper/MaterialQuotaWrapper.java | 36 +++ .../basic/wrapper/PlanAssignSteerWrapper.java | 36 +++ .../basic/wrapper/PlatingSmallWrapper.java | 36 +++ .../desk/basic/wrapper/PlatingWrapper.java | 36 +++ .../desk/basic/wrapper/ShiftsWrapper.java | 36 +++ 103 files changed, 6241 insertions(+), 32 deletions(-) create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java create mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BasicClazzConst.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CoatingThicknessController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/BasicClazzExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CoatingThicknessExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/LocallyPlatedPartExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingSmallExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/ShiftsExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IBasicClazzService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ICoatingThicknessService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ILocallyPlatedPartService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlanAssignSteerService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingSmallService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IShiftsService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BasicClazzServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/CoatingThicknessServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/LocallyPlatedPartServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingSmallServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ShiftsServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/BasicClazzWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/CoatingThicknessWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/LocallyPlatedPartWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/MaterialQuotaWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlanAssignSteerWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingSmallWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/ShiftsWrapper.java diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java new file mode 100644 index 00000000..8fc3b0f7 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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 jakarta.annotation.Resource; +import jakarta.validation.Valid; + +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; +import org.springblade.desk.basic.excel.PlatingExcel; +import org.springblade.desk.basic.wrapper.PlatingWrapper; +import org.springblade.desk.basic.service.IPlatingService; +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 2026-01-05 + */ +@RestController +@RequestMapping("/Plating") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[镀种]", description = "[镀种]接口") +public class PlatingController extends BladeController { + + @Resource + private IPlatingService service; + + /** + * [镀种] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Plating Obj") + public R detail(Plating plating) { + QueryWrapper qw = Condition.getQueryWrapper(plating); + Plating detail = service.getOne(qw); + PlatingVO detailVO = PlatingWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [镀种] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Plating Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map plating, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(plating, Plating.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = PlatingWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [镀种] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Plating Obj") + public R> page(PlatingVO plating, Query query) { + IPage pagesVO = service.selectPlatingPage( + Condition.getPage(query), plating + ); + return R.data(pagesVO); + } + + /** + * [镀种] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = PlatingWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [镀种] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Plating Obj") + public R save(@Valid @RequestBody Plating addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [镀种] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Plating List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [镀种] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Plating Obj") + public R update(@Valid @RequestBody Plating updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [镀种] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入Plating List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [镀种] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Plating Obj") + public R submit(@Valid @RequestBody Plating mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [镀种] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Plating List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [镀种] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [镀种] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Plating") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map plating, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(plating, Plating.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Plating::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(PlatingEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportPlating(qw); + ExcelUtil.export(response, "[镀种]数据" + org.springblade.core.tool.utils.DateUtil.time(), + "[镀种]数据表", list, PlatingExcel.class); + } + + /** + * [镀种] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [镀种] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Plating.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java new file mode 100644 index 00000000..6bfa41ab --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java @@ -0,0 +1,125 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +import lombok.Data; + +import com.baomidou.mybatisplus.annotation.TableId; +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 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class PlatingExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流水号 + */ + @ColumnWidth(20) + @ExcelProperty("流水号") + private BigDecimal platId; + /** + * 配置码 + */ + @ColumnWidth(20) + @ExcelProperty("配置码") + private String configNo; + /** + * [镀种分类]id + */ + @ColumnWidth(20) + @ExcelProperty("[镀种分类]id") + private BigDecimal bcId; + /** + * 镀种 + */ + @ColumnWidth(20) + @ExcelProperty("镀种") + private String plating; + /** + * 材料 + */ + @ColumnWidth(20) + @ExcelProperty("材料") + private String material; + /** + * 硬度 + */ + @ColumnWidth(20) + @ExcelProperty("硬度") + private String hardness; + /** + * 镀层编码 + */ + @ColumnWidth(20) + @ExcelProperty("镀层编码") + private String matCode; + /** + * 材料状态 + */ + @ColumnWidth(20) + @ExcelProperty("材料状态") + private String matState; + /** + * 镀种小类 + */ + @ColumnWidth(20) + @ExcelProperty("镀种小类") + private Long subClass; + /** + * 其他要求 + */ + @ColumnWidth(20) + @ExcelProperty("其他要求") + private String memo; + /** + * 镀层代号 + */ + @ColumnWidth(20) + @ExcelProperty("镀层代号") + private String plateCode; + /** + * 镀层物料 + */ + @ColumnWidth(20) + @ExcelProperty("镀层物料") + private String plateGoodsCode; + /** + * 镀层厚度 + */ + @ColumnWidth(20) + @ExcelProperty("镀层厚度") + private String plateThickness; + /** + * 排序 + */ + @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/basic/mapper/PlatingMapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java new file mode 100644 index 00000000..686edde4 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java @@ -0,0 +1,39 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; +import org.springblade.desk.basic.excel.PlatingExcel; +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 2026-01-05 + */ +public interface PlatingMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param plating 查询参数 + * @return List + */ + List selectPlatingPage(IPage page, PlatingVO plating); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlating(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml new file mode 100644 index 00000000..a384c9bb --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java new file mode 100644 index 00000000..3afc59f0 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import org.springblade.desk.basic.pojo.entity.Plating; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [镀种] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlatingDTO extends Plating { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java new file mode 100644 index 00000000..b4ca3b67 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java @@ -0,0 +1,166 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.entity; + +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableId; +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 2026-01-05 + */ +@Data +@TableName("BA_PLATING") +@Schema(description = "Plating Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Plating extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流水号 + */ + public static final String COL_PLAT_ID = "PLAT_ID"; + /** + * 配置码 + */ + public static final String COL_CONFIG_NO = "CONFIG_NO"; + /** + * [镀种分类]id + */ + public static final String COL_BC_ID = "BC_ID"; + /** + * 镀种 + */ + public static final String COL_PLATING = "PLATING"; + /** + * 材料 + */ + public static final String COL_MATERIAL = "MATERIAL"; + /** + * 硬度 + */ + public static final String COL_HARDNESS = "HARDNESS"; + /** + * 镀层编码 + */ + public static final String COL_MAT_CODE = "MAT_CODE"; + /** + * 材料状态 + */ + public static final String COL_MAT_STATE = "MAT_STATE"; + /** + * 镀种小类 + */ + public static final String COL_SUB_CLASS = "SUB_CLASS"; + /** + * 其他要求 + */ + public static final String COL_MEMO = "MEMO"; + /** + * 镀层代号 + */ + public static final String COL_PLATE_CODE = "PLATE_CODE"; + /** + * 镀层物料 + */ + public static final String COL_PLATE_GOODS_CODE = "PLATE_GOODS_CODE"; + /** + * 镀层厚度 + */ + public static final String COL_PLATE_THICKNESS = "PLATE_THICKNESS"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 流水号 + */ + @Schema(description = "流水号") + private BigDecimal platId; + /** + * 配置码 + */ + @Schema(description = "配置码") + private String configNo; + /** + * [镀种分类]id + */ + @Schema(description = "[镀种分类]id") + private BigDecimal bcId; + /** + * 镀种 + */ + @Schema(description = "镀种") + private String plating; + /** + * 材料 + */ + @Schema(description = "材料") + private String material; + /** + * 硬度 + */ + @Schema(description = "硬度") + private String hardness; + /** + * 镀层编码 + */ + @Schema(description = "镀层编码") + private String matCode; + /** + * 材料状态 + */ + @Schema(description = "材料状态") + private String matState; + /** + * 镀种小类 + */ + @Schema(description = "镀种小类") + private Long subClass; + /** + * 其他要求 + */ + @Schema(description = "其他要求") + private String memo; + /** + * 镀层代号 + */ + @Schema(description = "镀层代号") + private String plateCode; + /** + * 镀层物料 + */ + @Schema(description = "镀层物料") + private String plateGoodsCode; + /** + * 镀层厚度 + */ + @Schema(description = "镀层厚度") + private String plateThickness; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java new file mode 100644 index 00000000..c7ab1b7a --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java @@ -0,0 +1,23 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import org.springblade.desk.basic.pojo.entity.Plating; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serial; + +/** + * [镀种] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlatingVO extends Plating { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java new file mode 100644 index 00000000..4d3842af --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java @@ -0,0 +1,43 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; +import org.springblade.desk.basic.excel.PlatingExcel; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import java.util.List; + +/** + * [镀种] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface IPlatingService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param plating 查询参数 + * @return IPage + */ + IPage selectPlatingPage(IPage page, PlatingVO plating); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlating(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(PlatingVO vo); +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java new file mode 100644 index 00000000..52b4fd87 --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java @@ -0,0 +1,60 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import jakarta.annotation.Resource; +import lombok.Data; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; +import org.springblade.desk.basic.excel.PlatingExcel; +import org.springblade.desk.basic.mapper.PlatingMapper; +import org.springblade.desk.basic.service.IPlatingService; +import org.springblade.system.feign.IUserClient; +import org.springblade.system.feign.IDictClient; +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 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class PlatingServiceImpl extends BaseServiceImpl implements IPlatingService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectPlatingPage(IPage page, PlatingVO plating) { + return page.setRecords(baseMapper.selectPlatingPage(page, plating)); + } + + @Override + public List exportPlating(Wrapper queryWrapper) { + List platingList = baseMapper.exportPlating(queryWrapper); + //platingList.forEach(plating -> { + // plating.setTypeName(DictCache.getValue(DictEnum.YES_NO, Plating.getType())); + //}); + return platingList; + } + + @Override + public void setVOValue(PlatingVO vo) { + + } +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java new file mode 100644 index 00000000..92b27fff --- /dev/null +++ b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java @@ -0,0 +1,35 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; +import java.util.Objects; + +/** + * [镀种] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class PlatingWrapper extends BaseEntityWrapper { + + public static PlatingWrapper build() { + return new PlatingWrapper(); + } + + @Override + public PlatingVO entityVO(Plating plating) { + PlatingVO VO = Objects.requireNonNull(BeanUtil.copyProperties(plating, PlatingVO.class)); + + //User createUser = UserCache.getUser(plating.getCreateUser()); + //User updateUser = UserCache.getUser(plating.getUpdateUser()); + //platingVO.setCreateUserName(createUser.getName()); + //platingVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-ops/blade-develop/src/test/resources/templates/code.properties b/blade-ops/blade-develop/src/test/resources/templates/code.properties index 0f392d89..dbbe261a 100644 --- a/blade-ops/blade-develop/src/test/resources/templates/code.properties +++ b/blade-ops/blade-develop/src/test/resources/templates/code.properties @@ -6,7 +6,7 @@ # CodeGenerator spring.datasource.driver-class-name=oracle.jdbc.OracleDriver -spring.datasource.url=jdbc:oracle:thin:@192.168.0.221:1521/orcl +spring.datasource.url=jdbc:oracle:thin:@172.31.31.31:1521/orcl #spring.datasource.url=jdbc:oracle:thin:@172.18.80.50:1521/orcl spring.datasource.username=JONHON_MES spring.datasource.password=oracle123456 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BasicClazzConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BasicClazzConst.java new file mode 100644 index 00000000..0dd50467 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BasicClazzConst.java @@ -0,0 +1,61 @@ +package org.springblade.desk.basic.constant; + +public interface BasicClazzConst { + + /** + * 物料标记 + */ + Integer TYPE_FLAG = 1; + /** + * 出库原因 + */ + Integer TYPE_OUT_STORE = 2; + /** + * 退库原因 + */ + Integer TYPE_TK_STORE = 3; + /** + * 简单原因 + */ + Integer TYPE_POOR_REASON = 4; + /** + * 镀种分类 + */ + Integer TYPE_PLATING_ASSORT = 5; + /** + * IOT获取挂次号接口保存 + */ + Integer TYPE_SUSPENSION_NO = 6; + /** + * 外协匹配规则 + */ + Integer TYPE_RULE = 7; + /** + * 排除部门 + */ + Integer TYPE_EXCLUDE_DIVISION = 8; + /** + * 异常配置 + */ + Integer TYPE_ABNORMAL_CONFIG = 9; + /** + * 成本类型 + */ + Integer TYPE_COST_TYPE = 10; + /** + * 烧结转试验计划 + */ + Integer TYPE_TEST_TYPE = 11; + /** + * 绩效模板 + */ + Integer TYPE_JXMB = 12; + /** + * 重点工作类型 + */ + Integer TYPE_ZDGZLX = 13; + /** + * 绩效模板 + */ + Integer TYPE_NOTICE = 14; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java new file mode 100644 index 00000000..d13d0e08 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BasicClazzController.java @@ -0,0 +1,256 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +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.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.constant.BasicClazzConst; +import org.springblade.desk.basic.excel.BasicClazzExcel; +import org.springblade.desk.basic.pojo.entity.BasicClazz; +import org.springblade.desk.basic.pojo.vo.BasicClazzVO; +import org.springblade.desk.basic.service.IBasicClazzService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.BasicClazzWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [基础分类] 控制器 + * mes v1: bs_basic_class + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/BasicClazz") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][基础分类]", description = "[基础分类]接口") +public class BasicClazzController extends BladeController { + + @Resource + private IBasicClazzService service; + + /** + * [基础分类] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入BasicClazz Obj") + public R detail(BasicClazz basicClazz) { + QueryWrapper qw = Condition.getQueryWrapper(basicClazz); + BasicClazz detail = service.getOne(qw); + BasicClazzVO detailVO = BasicClazzWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [基础分类] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入BasicClazz Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map basicClazz, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(basicClazz, BasicClazz.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = BasicClazzWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [基础分类] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入BasicClazz Obj") + public R> page(BasicClazzVO basicClazz, Query query) { + IPage pagesVO = service.selectBasicClazzPage( + Condition.getPage(query), basicClazz + ); + return R.data(pagesVO); + } + + /** + * [基础分类] list下拉选择 镀种分类 + */ + @GetMapping("/listForSelectPlatingAssort") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择 镀种分类", description = "") + public R> listForSelectPlatingAssort() { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(BasicClazz::getBizType, BasicClazzConst.TYPE_PLATING_ASSORT); + List list = service.list(qw); + List listVO = BasicClazzWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [基础分类] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = BasicClazzWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [基础分类] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入BasicClazz Obj") + public R save(@Valid @RequestBody BasicClazz addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [基础分类] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入BasicClazz List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [基础分类] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入BasicClazz Obj") + public R update(@Valid @RequestBody BasicClazz updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [基础分类] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入BasicClazz List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [基础分类] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入BasicClazz Obj") + public R submit(@Valid @RequestBody BasicClazz mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [基础分类] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入BasicClazz List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [基础分类] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [基础分类] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入BasicClazz") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map basicClazz, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(basicClazz, BasicClazz.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BasicClazz::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BasicClazzEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportBasicClazz(qw); + ExcelUtil.export(response, "[基础分类]数据" + DateUtil.time(), + "[基础分类]数据表", list, BasicClazzExcel.class); + } + + /** + * [基础分类] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [基础分类] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, BasicClazz.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java index 50043f69..1a021cd2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/BatConfigController.java @@ -41,6 +41,7 @@ import java.util.stream.Collectors; /** * [批量配置] 控制器 + * mes v1: bs_craft_set * * @author Tom Shuo * @since 2025-12-22 @@ -51,7 +52,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -@Tag(name = "[批量配置]", description = "[批量配置]接口") +@Tag(name = "[BA][批量配置]", description = "[批量配置]接口") public class BatConfigController extends BladeController { @Resource diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CoatingThicknessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CoatingThicknessController.java new file mode 100644 index 00000000..cf4366b9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/CoatingThicknessController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.CoatingThicknessExcel; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; +import org.springblade.desk.basic.pojo.vo.CoatingThicknessVO; +import org.springblade.desk.basic.service.ICoatingThicknessService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.CoatingThicknessWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [镀层厚度对应] 控制器 + * mes v1: 新加 + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/CoatingThickness") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][镀层厚度对应]", description = "[镀层厚度对应]接口") +public class CoatingThicknessController extends BladeController { + + @Resource + private ICoatingThicknessService service; + + /** + * [镀层厚度对应] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入CoatingThickness Obj") + public R detail(CoatingThickness coatingThickness) { + QueryWrapper qw = Condition.getQueryWrapper(coatingThickness); + CoatingThickness detail = service.getOne(qw); + CoatingThicknessVO detailVO = CoatingThicknessWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [镀层厚度对应] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入CoatingThickness Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map coatingThickness, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(coatingThickness, CoatingThickness.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = CoatingThicknessWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [镀层厚度对应] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入CoatingThickness Obj") + public R> page(CoatingThicknessVO coatingThickness, Query query) { + IPage pagesVO = service.selectCoatingThicknessPage( + Condition.getPage(query), coatingThickness + ); + return R.data(pagesVO); + } + + /** + * [镀层厚度对应] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = CoatingThicknessWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [镀层厚度对应] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入CoatingThickness Obj") + public R save(@Valid @RequestBody CoatingThickness addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [镀层厚度对应] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入CoatingThickness List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [镀层厚度对应] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入CoatingThickness Obj") + public R update(@Valid @RequestBody CoatingThickness updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [镀层厚度对应] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入CoatingThickness List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [镀层厚度对应] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入CoatingThickness Obj") + public R submit(@Valid @RequestBody CoatingThickness mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [镀层厚度对应] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入CoatingThickness List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [镀层厚度对应] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [镀层厚度对应] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入CoatingThickness") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map coatingThickness, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(coatingThickness, CoatingThickness.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(CoatingThickness::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(CoatingThicknessEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportCoatingThickness(qw); + ExcelUtil.export(response, "[镀层厚度对应]数据" + DateUtil.time(), + "[镀层厚度对应]数据表", list, CoatingThicknessExcel.class); + } + + /** + * [镀层厚度对应] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [镀层厚度对应] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, CoatingThickness.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java index 1422781a..68d055a4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java @@ -39,7 +39,7 @@ import java.util.Map; /** * [计算公式] 控制器 - * + * mes v1: 新加 * @author Tom Shuo * @since 2025-12-16 */ @@ -48,7 +48,7 @@ import java.util.Map; @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Tag(name = "[计算公式]", description = "[计算公式]接口") +@Tag(name = "[BA][计算公式]", description = "[计算公式]接口") public class FormulaController extends BladeController { @Resource diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java new file mode 100644 index 00000000..a19ab08a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/LocallyPlatedPartController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.LocallyPlatedPartExcel; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; +import org.springblade.desk.basic.pojo.vo.LocallyPlatedPartVO; +import org.springblade.desk.basic.service.ILocallyPlatedPartService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.LocallyPlatedPartWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [局部镀零件] 控制器 + * mes v1: 新加 + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/LocallyPlatedPart") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][局部镀零件]", description = "[局部镀零件]接口") +public class LocallyPlatedPartController extends BladeController { + + @Resource + private ILocallyPlatedPartService service; + + /** + * [局部镀零件] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入LocallyPlatedPart Obj") + public R detail(LocallyPlatedPart locallyPlatedPart) { + QueryWrapper qw = Condition.getQueryWrapper(locallyPlatedPart); + LocallyPlatedPart detail = service.getOne(qw); + LocallyPlatedPartVO detailVO = LocallyPlatedPartWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [局部镀零件] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入LocallyPlatedPart Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map locallyPlatedPart, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(locallyPlatedPart, LocallyPlatedPart.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = LocallyPlatedPartWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [局部镀零件] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入LocallyPlatedPart Obj") + public R> page(LocallyPlatedPartVO locallyPlatedPart, Query query) { + IPage pagesVO = service.selectLocallyPlatedPartPage( + Condition.getPage(query), locallyPlatedPart + ); + return R.data(pagesVO); + } + + /** + * [局部镀零件] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = LocallyPlatedPartWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [局部镀零件] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入LocallyPlatedPart Obj") + public R save(@Valid @RequestBody LocallyPlatedPart addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [局部镀零件] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入LocallyPlatedPart List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [局部镀零件] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入LocallyPlatedPart Obj") + public R update(@Valid @RequestBody LocallyPlatedPart updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [局部镀零件] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入LocallyPlatedPart List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [局部镀零件] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入LocallyPlatedPart Obj") + public R submit(@Valid @RequestBody LocallyPlatedPart mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [局部镀零件] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入LocallyPlatedPart List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [局部镀零件] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [局部镀零件] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入LocallyPlatedPart") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map locallyPlatedPart, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(locallyPlatedPart, LocallyPlatedPart.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(LocallyPlatedPart::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(LocallyPlatedPartEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportLocallyPlatedPart(qw); + ExcelUtil.export(response, "[局部镀零件]数据" + DateUtil.time(), + "[局部镀零件]数据表", list, LocallyPlatedPartExcel.class); + } + + /** + * [局部镀零件] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [局部镀零件] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, LocallyPlatedPart.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java new file mode 100644 index 00000000..1c4139a0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.MaterialQuotaExcel; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; +import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; +import org.springblade.desk.basic.service.IMaterialQuotaService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.MaterialQuotaWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [物料定额] 控制器 + * mes v1: 新加 + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/MaterialQuota") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][物料定额]", description = "[物料定额]接口") +public class MaterialQuotaController extends BladeController { + + @Resource + private IMaterialQuotaService service; + + /** + * [物料定额] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入MaterialQuota Obj") + public R detail(MaterialQuota materialQuota) { + QueryWrapper qw = Condition.getQueryWrapper(materialQuota); + MaterialQuota detail = service.getOne(qw); + MaterialQuotaVO detailVO = MaterialQuotaWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [物料定额] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入MaterialQuota Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map materialQuota, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(materialQuota, MaterialQuota.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = MaterialQuotaWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [物料定额] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入MaterialQuota Obj") + public R> page(MaterialQuotaVO materialQuota, Query query) { + IPage pagesVO = service.selectMaterialQuotaPage( + Condition.getPage(query), materialQuota + ); + return R.data(pagesVO); + } + + /** + * [物料定额] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = MaterialQuotaWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [物料定额] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入MaterialQuota Obj") + public R save(@Valid @RequestBody MaterialQuota addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [物料定额] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入MaterialQuota List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [物料定额] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入MaterialQuota Obj") + public R update(@Valid @RequestBody MaterialQuota updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [物料定额] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入MaterialQuota List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [物料定额] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入MaterialQuota Obj") + public R submit(@Valid @RequestBody MaterialQuota mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [物料定额] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入MaterialQuota List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [物料定额] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [物料定额] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入MaterialQuota") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map materialQuota, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(materialQuota, MaterialQuota.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(MaterialQuota::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(MaterialQuotaEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportMaterialQuota(qw); + ExcelUtil.export(response, "[物料定额]数据" + DateUtil.time(), + "[物料定额]数据表", list, MaterialQuotaExcel.class); + } + + /** + * [物料定额] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [物料定额] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, MaterialQuota.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index 8231b870..2382e0ff 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -27,6 +27,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.excel.OemExcel; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; @@ -54,7 +55,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -@Tag(name = "[外协厂家]", description = "[外协厂家]接口") +@Tag(name = "[BA][外协厂家]", description = "[外协厂家]接口") public class OemController extends BladeController { @Resource @@ -104,16 +105,15 @@ public class OemController extends BladeController { // search.setContactMan((Func.toStr(map.get(OemSearch.COL_CONTACT_MAN)))); // } + QueryWrapper qw = Condition.getQueryWrapper(map, Oem.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = OemWrapper.build().pageVO(pages); -// IPage pages = service.page(Condition.getPage(query), qw); -// IPage pagesVO = OemWrapper.build().pageVO(pages); - -// pagesVO.getRecords() -// .stream() -// .peek(service::setVOValue) -// .collect(Collectors.toList()); -// return R.data(pagesVO); - return null; + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java new file mode 100644 index 00000000..22da8b08 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlanAssignSteerController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.PlanAssignSteerExcel; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; +import org.springblade.desk.basic.pojo.vo.PlanAssignSteerVO; +import org.springblade.desk.basic.service.IPlanAssignSteerService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.PlanAssignSteerWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [外协分派] 控制器 + * mes v1: bs_plan_assign_steer + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/PlanAssignSteer") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][外协分派]", description = "[外协分派]接口") +public class PlanAssignSteerController extends BladeController { + + @Resource + private IPlanAssignSteerService service; + + /** + * [外协分派] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入PlanAssignSteer Obj") + public R detail(PlanAssignSteer planAssignSteer) { + QueryWrapper qw = Condition.getQueryWrapper(planAssignSteer); + PlanAssignSteer detail = service.getOne(qw); + PlanAssignSteerVO detailVO = PlanAssignSteerWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [外协分派] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入PlanAssignSteer Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map planAssignSteer, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(planAssignSteer, PlanAssignSteer.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = PlanAssignSteerWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [外协分派] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入PlanAssignSteer Obj") + public R> page(PlanAssignSteerVO planAssignSteer, Query query) { + IPage pagesVO = service.selectPlanAssignSteerPage( + Condition.getPage(query), planAssignSteer + ); + return R.data(pagesVO); + } + + /** + * [外协分派] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = PlanAssignSteerWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [外协分派] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入PlanAssignSteer Obj") + public R save(@Valid @RequestBody PlanAssignSteer addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [外协分派] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入PlanAssignSteer List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [外协分派] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入PlanAssignSteer Obj") + public R update(@Valid @RequestBody PlanAssignSteer updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [外协分派] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入PlanAssignSteer List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [外协分派] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入PlanAssignSteer Obj") + public R submit(@Valid @RequestBody PlanAssignSteer mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [外协分派] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入PlanAssignSteer List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [外协分派] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [外协分派] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入PlanAssignSteer") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map planAssignSteer, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(planAssignSteer, PlanAssignSteer.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(PlanAssignSteer::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(PlanAssignSteerEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportPlanAssignSteer(qw); + ExcelUtil.export(response, "[外协分派]数据" + DateUtil.time(), + "[外协分派]数据表", list, PlanAssignSteerExcel.class); + } + + /** + * [外协分派] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [外协分派] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, PlanAssignSteer.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java new file mode 100644 index 00000000..bdbdf420 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.PlatingExcel; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; +import org.springblade.desk.basic.service.IPlatingService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.PlatingWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [镀种] 控制器 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/Plating") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][镀种]", description = "[镀种]接口") +public class PlatingController extends BladeController { + + @Resource + private IPlatingService service; + + /** + * [镀种] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Plating Obj") + public R detail(Plating plating) { + QueryWrapper qw = Condition.getQueryWrapper(plating); + Plating detail = service.getOne(qw); + PlatingVO detailVO = PlatingWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [镀种] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Plating Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map plating, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(plating, Plating.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = PlatingWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [镀种] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Plating Obj") + public R> page(PlatingVO plating, Query query) { + IPage pagesVO = service.selectPlatingPage( + Condition.getPage(query), plating + ); + return R.data(pagesVO); + } + + /** + * [镀种] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = PlatingWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [镀种] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Plating Obj") + public R save(@Valid @RequestBody Plating addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [镀种] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Plating List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [镀种] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Plating Obj") + public R update(@Valid @RequestBody Plating updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [镀种] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入Plating List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [镀种] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Plating Obj") + public R submit(@Valid @RequestBody Plating mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [镀种] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Plating List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [镀种] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [镀种] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Plating") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map plating, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(plating, Plating.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Plating::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(PlatingEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportPlating(qw); + ExcelUtil.export(response, "[镀种]数据" + DateUtil.time(), + "[镀种]数据表", list, PlatingExcel.class); + } + + /** + * [镀种] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [镀种] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Plating.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java new file mode 100644 index 00000000..265bb16d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/PlatingSmallController.java @@ -0,0 +1,239 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.PlatingSmallExcel; +import org.springblade.desk.basic.pojo.entity.PlatingSmall; +import org.springblade.desk.basic.pojo.vo.PlatingSmallVO; +import org.springblade.desk.basic.service.IPlatingSmallService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.PlatingSmallWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [镀种小类] 控制器 + * mes v1: bs_plating_small + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/PlatingSmall") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][镀种小类]", description = "[镀种小类]接口") +public class PlatingSmallController extends BladeController { + + @Resource + private IPlatingSmallService service; + + /** + * [镀种小类] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入PlatingSmall Obj") + public R detail(PlatingSmall platingSmall) { + QueryWrapper qw = Condition.getQueryWrapper(platingSmall); + PlatingSmall detail = service.getOne(qw); + PlatingSmallVO detailVO = PlatingSmallWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [镀种小类] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入PlatingSmall Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map platingSmall, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(platingSmall, PlatingSmall.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = PlatingSmallWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [镀种小类] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入PlatingSmall Obj") + public R> page(PlatingSmallVO platingSmall, Query query) { + IPage pagesVO = service.selectPlatingSmallPage( + Condition.getPage(query), platingSmall + ); + return R.data(pagesVO); + } + + /** + * [镀种小类] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = PlatingSmallWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [镀种小类] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入PlatingSmall Obj") + public R save(@Valid @RequestBody PlatingSmall addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [镀种小类] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入PlatingSmall List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [镀种小类] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入PlatingSmall Obj") + public R update(@Valid @RequestBody PlatingSmall updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [镀种小类] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入PlatingSmall List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [镀种小类] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入PlatingSmall Obj") + public R submit(@Valid @RequestBody PlatingSmall mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [镀种小类] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入PlatingSmall List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [镀种小类] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [镀种小类] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入PlatingSmall") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map platingSmall, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(platingSmall, PlatingSmall.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(PlatingSmall::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(PlatingSmallEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportPlatingSmall(qw); + ExcelUtil.export(response, "[镀种小类]数据" + DateUtil.time(), + "[镀种小类]数据表", list, PlatingSmallExcel.class); + } + + /** + * [镀种小类] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [镀种小类] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, PlatingSmall.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java index e8d9d8aa..233e8d10 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProcessAbilityController.java @@ -41,7 +41,7 @@ import java.util.stream.Collectors; /** * [工艺能力] 控制器 - * + * mes v1: bs_craft_ability * @author Tom Shuo * @since 2025-12-22 */ @@ -51,7 +51,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -@Tag(name = "[工艺能力]", description = "[工艺能力]接口") +@Tag(name = "[BA][工艺能力]", description = "[工艺能力]接口") public class ProcessAbilityController extends BladeController { @Resource diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java index 7b8be809..8b5289ab 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ProdMarkController.java @@ -51,7 +51,7 @@ import java.util.stream.Collectors; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -@Tag(name = "[生产标识]", description = "[生产标识]接口") +@Tag(name = "[BA][生产标识]", description = "[生产标识]接口") public class ProdMarkController extends BladeController { @Resource diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java new file mode 100644 index 00000000..d3f9f2ed --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java @@ -0,0 +1,238 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.constant.BAModuleConst; +import org.springblade.desk.basic.excel.ShiftsExcel; +import org.springblade.desk.basic.pojo.entity.Shifts; +import org.springblade.desk.basic.pojo.vo.ShiftsVO; +import org.springblade.desk.basic.service.IShiftsService; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.basic.wrapper.ShiftsWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [班次] 控制器 + * mes v1: bs_classes_set + * @author Tom Shuo + * @since 2026-01-05 + */ +@RestController +@RequestMapping(BAModuleConst.CONTROLLER_PREFIX + "/Shifts") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[BA][班次]", description = "[班次]接口") +public class ShiftsController extends BladeController { + + @Resource + private IShiftsService service; + + /** + * [班次] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Shifts Obj") + public R detail(Shifts shifts) { + QueryWrapper qw = Condition.getQueryWrapper(shifts); + Shifts detail = service.getOne(qw); + ShiftsVO detailVO = ShiftsWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [班次] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Shifts Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map shifts, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(shifts, Shifts.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ShiftsWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [班次] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Shifts Obj") + public R> page(ShiftsVO shifts, Query query) { + IPage pagesVO = service.selectShiftsPage( + Condition.getPage(query), shifts + ); + return R.data(pagesVO); + } + + /** + * [班次] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = ShiftsWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [班次] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Shifts Obj") + public R save(@Valid @RequestBody Shifts addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [班次] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Shifts List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [班次] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Shifts Obj") + public R update(@Valid @RequestBody Shifts updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [班次] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入Shifts List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [班次] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Shifts Obj") + public R submit(@Valid @RequestBody Shifts mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [班次] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Shifts List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [班次] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [班次] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Shifts") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map shifts, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(shifts, Shifts.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Shifts::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ShiftsEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportShifts(qw); + ExcelUtil.export(response, "[班次]数据" + DateUtil.time(), + "[班次]数据表", list, ShiftsExcel.class); + } + + /** + * [班次] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [班次] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Shifts.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index a1aa3505..b73ef998 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -39,7 +39,7 @@ import java.util.Map; /** * [班组] 控制器 - * + * mes v1: bs_team_set * @author Tom Shuo * @since 2025-12-16 */ @@ -48,7 +48,7 @@ import java.util.Map; @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Tag(name = "[班组]", description = "[班组]接口") +@Tag(name = "[BA][班组]", description = "[班组]接口") public class TeamSetController extends BladeController { @Resource diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java index 4256df39..c8a1030a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkCenterController.java @@ -39,7 +39,7 @@ import java.util.Map; /** * [作业中心] 控制器 - * + * mes v1: bs_work_center * @author Tom Shuo * @since 2025-12-16 */ @@ -48,7 +48,7 @@ import java.util.Map; @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Tag(name = "[作业中心]", description = "[作业中心]接口") +@Tag(name = "[BA][作业中心]", description = "[作业中心]接口") public class WorkCenterController extends BladeController { @Resource diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java index 0a9fab13..c8a0ccd5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/WorkTankController.java @@ -39,7 +39,7 @@ import java.util.Map; /** * [作业槽] 控制器 - * + * mes v1: * @author Tom Shuo * @since 2025-12-16 */ @@ -48,7 +48,7 @@ import java.util.Map; @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -@Tag(name = "[作业槽]", description = "[作业槽]接口") +@Tag(name = "[BA][作业槽]", description = "[作业槽]接口") public class WorkTankController extends BladeController { @Resource diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/BasicClazzExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/BasicClazzExcel.java new file mode 100644 index 00000000..1e431879 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/BasicClazzExcel.java @@ -0,0 +1,62 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +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 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BasicClazzExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String code; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * 业务类别 + */ + @ColumnWidth(20) + @ExcelProperty("业务类别") + private Short bizType; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String memo; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CoatingThicknessExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CoatingThicknessExcel.java new file mode 100644 index 00000000..45eb845f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/CoatingThicknessExcel.java @@ -0,0 +1,74 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +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 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class CoatingThicknessExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 镀层代号 + */ + @ColumnWidth(20) + @ExcelProperty("镀层代号") + private String thicknessCode; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * 质量等级 + */ + @ColumnWidth(20) + @ExcelProperty("质量等级") + private Long level; + /** + * 是否以21E8-210开头 + */ + @ColumnWidth(20) + @ExcelProperty("是否以21E8-210开头") + private Short startF21e8; + /** + * 厚度 + */ + @ColumnWidth(20) + @ExcelProperty("厚度") + private Long thickness; + /** + * 排序 + */ + @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/basic/excel/LocallyPlatedPartExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/LocallyPlatedPartExcel.java new file mode 100644 index 00000000..5002745f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/LocallyPlatedPartExcel.java @@ -0,0 +1,62 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +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 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class LocallyPlatedPartExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 零件编号 + */ + @ColumnWidth(20) + @ExcelProperty("零件编号") + private String partCode; + /** + * 类型 + */ + @ColumnWidth(20) + @ExcelProperty("类型") + private Long partType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * 排序 + */ + @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/basic/excel/MaterialQuotaExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java new file mode 100644 index 00000000..8087c103 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/MaterialQuotaExcel.java @@ -0,0 +1,87 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +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 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class MaterialQuotaExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 类型-[1]:金押定额;[2]:银板定额; + */ + @ColumnWidth(20) + @ExcelProperty("类型-[1]:金押定额;[2]:银板定额;") + private Long quotaType; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * [工艺能力]id + */ + @ColumnWidth(20) + @ExcelProperty("[工艺能力]id") + private BigDecimal processAbilityId; + /** + * 镀层厚度 + */ + @ColumnWidth(20) + @ExcelProperty("镀层厚度") + private Long thickness; + /** + * 定额 + */ + @ColumnWidth(20) + @ExcelProperty("定额") + private Long quota; + /** + * 小批量定额 + */ + @ColumnWidth(20) + @ExcelProperty("小批量定额") + private Long smallBatQuota; + /** + * 大批量定额 + */ + @ColumnWidth(20) + @ExcelProperty("大批量定额") + private Long bigBatQuota; + /** + * 排序 + */ + @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/basic/excel/PlanAssignSteerExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java new file mode 100644 index 00000000..8684b9e0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlanAssignSteerExcel.java @@ -0,0 +1,94 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +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 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class PlanAssignSteerExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [外协厂家]id + */ + @ColumnWidth(20) + @ExcelProperty("[外协厂家]id") + private BigDecimal oemId; + /** + * [工艺能力]id + */ + @ColumnWidth(20) + @ExcelProperty("[工艺能力]id") + private BigDecimal platingId; + /** + * 零件;外键(dsPart) + */ + @ColumnWidth(20) + @ExcelProperty("零件;外键(dsPart)") + private Long dsPart; + /** + * 分派比例 + */ + @ColumnWidth(20) + @ExcelProperty("分派比例") + private BigDecimal assignScale; + /** + * 厂家周累计分派量 + */ + @ColumnWidth(20) + @ExcelProperty("厂家周累计分派量") + private BigDecimal weekAssign; + /** + * 分类周累计分派量 + */ + @ColumnWidth(20) + @ExcelProperty("分类周累计分派量") + private BigDecimal classifyAssign; + /** + * 比例偏差因子 + */ + @ColumnWidth(20) + @ExcelProperty("比例偏差因子") + private BigDecimal factor; + /** + * 维护人 + */ + @ColumnWidth(20) + @ExcelProperty("维护人") + private Long maintainMan; + /** + * 维护时间 + */ + @ColumnWidth(20) + @ExcelProperty("维护时间") + private LocalDateTime maintainTime; + /** + * 日分派量 + */ + @ColumnWidth(20) + @ExcelProperty("日分派量") + private String assign; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java new file mode 100644 index 00000000..bb991417 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java @@ -0,0 +1,123 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +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 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class PlatingExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流水号 + */ + @ColumnWidth(20) + @ExcelProperty("流水号") + private BigDecimal platId; + /** + * 配置码 + */ + @ColumnWidth(20) + @ExcelProperty("配置码") + private String configNo; + /** + * [镀种分类]id + */ + @ColumnWidth(20) + @ExcelProperty("[镀种分类]id") + private BigDecimal bcId; + /** + * 镀种 + */ + @ColumnWidth(20) + @ExcelProperty("镀种") + private String plating; + /** + * 材料 + */ + @ColumnWidth(20) + @ExcelProperty("材料") + private String material; + /** + * 硬度 + */ + @ColumnWidth(20) + @ExcelProperty("硬度") + private String hardness; + /** + * 镀层编码 + */ + @ColumnWidth(20) + @ExcelProperty("镀层编码") + private String matCode; + /** + * 材料状态 + */ + @ColumnWidth(20) + @ExcelProperty("材料状态") + private String matState; + /** + * 镀种小类 + */ + @ColumnWidth(20) + @ExcelProperty("镀种小类") + private Long subClass; + /** + * 其他要求 + */ + @ColumnWidth(20) + @ExcelProperty("其他要求") + private String memo; + /** + * 镀层代号 + */ + @ColumnWidth(20) + @ExcelProperty("镀层代号") + private String plateCode; + /** + * 镀层物料 + */ + @ColumnWidth(20) + @ExcelProperty("镀层物料") + private String plateGoodsCode; + /** + * 镀层厚度 + */ + @ColumnWidth(20) + @ExcelProperty("镀层厚度") + private String plateThickness; + /** + * 排序 + */ + @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/basic/excel/PlatingSmallExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingSmallExcel.java new file mode 100644 index 00000000..60f76b5e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/PlatingSmallExcel.java @@ -0,0 +1,63 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +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 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class PlatingSmallExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String bpsName; + /** + * 日常规生产能力 + */ + @ColumnWidth(20) + @ExcelProperty("日常规生产能力") + private BigDecimal capacity; + /** + * [作业中心]id + */ + @ColumnWidth(20) + @ExcelProperty("[作业中心]id") + private BigDecimal wcId; + /** + * 排序 + */ + @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/basic/excel/ShiftsExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/ShiftsExcel.java new file mode 100644 index 00000000..2d574db5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/excel/ShiftsExcel.java @@ -0,0 +1,62 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.excel; + + +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 2026-01-05 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class ShiftsExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [班次]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[班次]编码") + private String shiftCode; + /** + * [班次]类型 + */ + @ColumnWidth(20) + @ExcelProperty("[班次]类型") + private Long shiftType; + /** + * [班次]名称 + */ + @ColumnWidth(20) + @ExcelProperty("[班次]名称") + private String name; + /** + * 排序 + */ + @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/basic/mapper/BasicClazzMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.java new file mode 100644 index 00000000..798590ea --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +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.basic.excel.BasicClazzExcel; +import org.springblade.desk.basic.pojo.entity.BasicClazz; +import org.springblade.desk.basic.pojo.vo.BasicClazzVO; + +import java.util.List; + +/** + * [基础分类] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface BasicClazzMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param basicClazz 查询参数 + * @return List + */ + List selectBasicClazzPage(IPage page, BasicClazzVO basicClazz); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBasicClazz(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.xml new file mode 100644 index 00000000..2382e46d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/BasicClazzMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.java new file mode 100644 index 00000000..0f1d7da3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +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.basic.excel.CoatingThicknessExcel; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; +import org.springblade.desk.basic.pojo.vo.CoatingThicknessVO; + +import java.util.List; + +/** + * [镀层厚度对应] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface CoatingThicknessMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param coatingThickness 查询参数 + * @return List + */ + List selectCoatingThicknessPage(IPage page, CoatingThicknessVO coatingThickness); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCoatingThickness(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.xml new file mode 100644 index 00000000..7545a49e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/CoatingThicknessMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.java new file mode 100644 index 00000000..2ed1bb7d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +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.basic.excel.LocallyPlatedPartExcel; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; +import org.springblade.desk.basic.pojo.vo.LocallyPlatedPartVO; + +import java.util.List; + +/** + * [局部镀零件] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface LocallyPlatedPartMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param locallyPlatedPart 查询参数 + * @return List + */ + List selectLocallyPlatedPartPage(IPage page, LocallyPlatedPartVO locallyPlatedPart); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportLocallyPlatedPart(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.xml new file mode 100644 index 00000000..94cbd242 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/LocallyPlatedPartMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java new file mode 100644 index 00000000..3be67637 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +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.basic.excel.MaterialQuotaExcel; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; +import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; + +import java.util.List; + +/** + * [物料定额] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface MaterialQuotaMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param materialQuota 查询参数 + * @return List + */ + List selectMaterialQuotaPage(IPage page, MaterialQuotaVO materialQuota); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportMaterialQuota(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.xml new file mode 100644 index 00000000..6cbf0ca6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/MaterialQuotaMapper.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.java new file mode 100644 index 00000000..7878b9a3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +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.basic.excel.PlanAssignSteerExcel; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; +import org.springblade.desk.basic.pojo.vo.PlanAssignSteerVO; + +import java.util.List; + +/** + * [外协分派] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface PlanAssignSteerMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param planAssignSteer 查询参数 + * @return List + */ + List selectPlanAssignSteerPage(IPage page, PlanAssignSteerVO planAssignSteer); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlanAssignSteer(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml new file mode 100644 index 00000000..2359cbe0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlanAssignSteerMapper.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java new file mode 100644 index 00000000..efa83ef8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +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.basic.excel.PlatingExcel; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; + +import java.util.List; + +/** + * [镀种] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface PlatingMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param plating 查询参数 + * @return List + */ + List selectPlatingPage(IPage page, PlatingVO plating); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlating(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml new file mode 100644 index 00000000..a384c9bb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.java new file mode 100644 index 00000000..d31beb31 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +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.basic.excel.PlatingSmallExcel; +import org.springblade.desk.basic.pojo.entity.PlatingSmall; +import org.springblade.desk.basic.pojo.vo.PlatingSmallVO; + +import java.util.List; + +/** + * [镀种小类] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface PlatingSmallMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param platingSmall 查询参数 + * @return List + */ + List selectPlatingSmallPage(IPage page, PlatingSmallVO platingSmall); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlatingSmall(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.xml new file mode 100644 index 00000000..f0b7f558 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/PlatingSmallMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.java new file mode 100644 index 00000000..88ab774c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.mapper; + +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.basic.excel.ShiftsExcel; +import org.springblade.desk.basic.pojo.entity.Shifts; +import org.springblade.desk.basic.pojo.vo.ShiftsVO; + +import java.util.List; + +/** + * [班次] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface ShiftsMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param shifts 查询参数 + * @return List + */ + List selectShiftsPage(IPage page, ShiftsVO shifts); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportShifts(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.xml new file mode 100644 index 00000000..05b4b20f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/ShiftsMapper.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java new file mode 100644 index 00000000..edc119f5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.BasicClazz; + +import java.io.Serial; + +/** + * [基础分类] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicClazzDTO extends BasicClazz { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java new file mode 100644 index 00000000..52b885d5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; + +import java.io.Serial; + +/** + * [镀层厚度对应] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CoatingThicknessDTO extends CoatingThickness { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java new file mode 100644 index 00000000..29193b22 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; + +import java.io.Serial; + +/** + * [局部镀零件] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class LocallyPlatedPartDTO extends LocallyPlatedPart { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java new file mode 100644 index 00000000..1a70b992 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; + +import java.io.Serial; + +/** + * [物料定额] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class MaterialQuotaDTO extends MaterialQuota { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java new file mode 100644 index 00000000..54b447db --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; + +import java.io.Serial; + +/** + * [外协分派] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlanAssignSteerDTO extends PlanAssignSteer { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java new file mode 100644 index 00000000..aae42cbf --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Plating; + +import java.io.Serial; + +/** + * [镀种] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlatingDTO extends Plating { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java new file mode 100644 index 00000000..f1a05401 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.PlatingSmall; + +import java.io.Serial; + +/** + * [镀种小类] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlatingSmallDTO extends PlatingSmall { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java new file mode 100644 index 00000000..e99a0e95 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Shifts; + +import java.io.Serial; + +/** + * [班次] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ShiftsDTO extends Shifts { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java new file mode 100644 index 00000000..3be73f2e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java @@ -0,0 +1,78 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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; + +/** + * [基础分类] 实体类 + * todo: + * 没有插入，单独处理 + * '302007' + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@TableName("BA_BASIC_CLAZZ") +@Schema(description = "BasicClazz Entity对象") +@EqualsAndHashCode(callSuper = true) +public class BasicClazz extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 编码 + */ + public static final String COL_CODE = "CODE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 业务类别 + */ + public static final String COL_BIZ_TYPE = "BIZ_TYPE"; + /** + * 备注 + */ + public static final String COL_MEMO = "MEMO"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + + /** + * 编码 + */ + @Schema(description = "编码") + private String code; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 业务类别 + */ + @Schema(description = "业务类别") + private Integer bizType; + /** + * 备注 + */ + @Schema(description = "备注") + private String memo; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java index 8fc19c43..3bbec3ae 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java @@ -10,7 +10,6 @@ import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; -import java.math.BigDecimal; /** * [批量配置] 实体类 @@ -91,22 +90,22 @@ public class BatConfig extends BaseEntity { * [工艺能力]id */ @Schema(description = "[工艺能力]id") - private BigDecimal caId; + private Long caId; /** * 面积 */ @Schema(description = "面积") - private BigDecimal area; + private Long area; /** * 单件面积 */ @Schema(description = "单件面积") - private BigDecimal singletonArea; + private Long singletonArea; /** * [零件]id */ @Schema(description = "[零件]id") - private BigDecimal partId; + private Long partId; /** * [零件]编码 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java new file mode 100644 index 00000000..beef0dc0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java @@ -0,0 +1,93 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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 2026-01-05 + */ +@Data +@TableName("BA_COATING_THICKNESS") +@Schema(description = "CoatingThickness Entity对象") +@EqualsAndHashCode(callSuper = true) +public class CoatingThickness extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 镀层代号 + */ + public static final String COL_THICKNESS_CODE = "THICKNESS_CODE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 质量等级 + */ + public static final String COL_LEVEL = "LEVEL"; + /** + * 是否以21E8-210开头 + */ + public static final String COL_START_F21E8 = "START_F21E8"; + /** + * 厚度 + */ + public static final String COL_THICKNESS = "THICKNESS"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 镀层代号 + */ + @Schema(description = "镀层代号") + private String thicknessCode; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 质量等级 + */ + @Schema(description = "质量等级") + private Integer level; + /** + * 是否以21E8-210开头 + */ + @Schema(description = "是否以21E8-210开头") + private Short startF21e8; + /** + * 厚度 + */ + @Schema(description = "厚度") + private Long thickness; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java new file mode 100644 index 00000000..8b774f58 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java @@ -0,0 +1,75 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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 2026-01-05 + */ +@Data +@TableName("BA_LOCALLY_PLATED_PART") +@Schema(description = "LocallyPlatedPart Entity对象") +@EqualsAndHashCode(callSuper = true) +public class LocallyPlatedPart extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 零件编号 + */ + public static final String COL_PART_CODE = "PART_CODE"; + /** + * 类型 + */ + public static final String COL_PART_TYPE = "PART_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 零件编号 + */ + @Schema(description = "零件编号") + private String partCode; + /** + * 类型 + */ + @Schema(description = "类型") + private Long partType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java new file mode 100644 index 00000000..af3a8ed8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java @@ -0,0 +1,111 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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 2026-01-05 + */ +@Data +@TableName("BA_MATERIAL_QUOTA") +@Schema(description = "MaterialQuota Entity对象") +@EqualsAndHashCode(callSuper = true) +public class MaterialQuota extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 类型-[1]:金押定额;[2]:银板定额; + */ + public static final String COL_QUOTA_TYPE = "QUOTA_TYPE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * [工艺能力]id + */ + public static final String COL_PROCESS_ABILITY_ID = "PROCESS_ABILITY_ID"; + /** + * 镀层厚度 + */ + public static final String COL_THICKNESS = "THICKNESS"; + /** + * 定额 + */ + public static final String COL_QUOTA = "QUOTA"; + /** + * 小批量定额 + */ + public static final String COL_SMALL_BAT_QUOTA = "SMALL_BAT_QUOTA"; + /** + * 大批量定额 + */ + public static final String COL_BIG_BAT_QUOTA = "BIG_BAT_QUOTA"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 类型-[1]:金押定额;[2]:银板定额; + */ + @Schema(description = "类型-[1]:金押定额;[2]:银板定额;") + private Long quotaType; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [工艺能力]id + */ + @Schema(description = "[工艺能力]id") + private Long processAbilityId; + /** + * 镀层厚度 + */ + @Schema(description = "镀层厚度") + private Long thickness; + /** + * 定额 + */ + @Schema(description = "定额") + private Long quota; + /** + * 小批量定额 + */ + @Schema(description = "小批量定额") + private Long smallBatQuota; + /** + * 大批量定额 + */ + @Schema(description = "大批量定额") + private Long bigBatQuota; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java new file mode 100644 index 00000000..7d8f9e31 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java @@ -0,0 +1,121 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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.time.LocalDateTime; + +/** + * [外协分派] 实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@TableName("BA_PLAN_ASSIGN_STEER") +@Schema(description = "PlanAssignSteer Entity对象") +@EqualsAndHashCode(callSuper = true) +public class PlanAssignSteer extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [外协厂家]id + */ + public static final String COL_OEM_ID = "OEM_ID"; + /** + * [工艺能力]id + */ + public static final String COL_PLATING_ID = "PLATING_ID"; + /** + * 零件;外键(dsPart) + */ + public static final String COL_DS_PART = "DS_PART"; + /** + * 分派比例 + */ + public static final String COL_ASSIGN_SCALE = "ASSIGN_SCALE"; + /** + * 厂家周累计分派量 + */ + public static final String COL_WEEK_ASSIGN = "WEEK_ASSIGN"; + /** + * 分类周累计分派量 + */ + public static final String COL_CLASSIFY_ASSIGN = "CLASSIFY_ASSIGN"; + /** + * 比例偏差因子 + */ + public static final String COL_FACTOR = "FACTOR"; + /** + * 维护人 + */ + public static final String COL_MAINTAIN_MAN = "MAINTAIN_MAN"; + /** + * 维护时间 + */ + public static final String COL_MAINTAIN_TIME = "MAINTAIN_TIME"; + /** + * 日分派量 + */ + public static final String COL_ASSIGN = "ASSIGN"; + + /** + * [外协厂家]id + */ + @Schema(description = "[外协厂家]id") + private Long oemId; + /** + * [工艺能力]id + */ + @Schema(description = "[工艺能力]id") + private Long platingId; + /** + * 零件;外键(dsPart) + */ + @Schema(description = "零件;外键(dsPart)") + private Long dsPart; + /** + * 分派比例 + */ + @Schema(description = "分派比例") + private Long assignScale; + /** + * 厂家周累计分派量 + */ + @Schema(description = "厂家周累计分派量") + private Long weekAssign; + /** + * 分类周累计分派量 + */ + @Schema(description = "分类周累计分派量") + private Long classifyAssign; + /** + * 比例偏差因子 + */ + @Schema(description = "比例偏差因子") + private Long factor; + /** + * 维护人 + */ + @Schema(description = "维护人") + private Long maintainMan; + /** + * 维护时间 + */ + @Schema(description = "维护时间") + private LocalDateTime maintainTime; + /** + * 日分派量 + */ + @Schema(description = "日分派量") + private String assign; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java new file mode 100644 index 00000000..d7e7faa3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java @@ -0,0 +1,166 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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 2026-01-05 + */ +@Data +@TableName("BA_PLATING") +@Schema(description = "Plating Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Plating extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 流水号 + */ + public static final String COL_PLAT_ID = "PLAT_ID"; + /** + * 配置码 + */ + public static final String COL_CONFIG_NO = "CONFIG_NO"; + /** + * [镀种分类]id + */ + public static final String COL_BC_ID = "BC_ID"; + /** + * 镀种 + */ + public static final String COL_PLATING = "PLATING"; + /** + * 材料 + */ + public static final String COL_MATERIAL = "MATERIAL"; + /** + * 硬度 + */ + public static final String COL_HARDNESS = "HARDNESS"; + /** + * 镀层编码 + */ + public static final String COL_MAT_CODE = "MAT_CODE"; + /** + * 材料状态 + */ + public static final String COL_MAT_STATE = "MAT_STATE"; + /** + * 镀种小类 + */ + public static final String COL_SUB_CLASS = "SUB_CLASS"; + /** + * 其他要求 + */ + public static final String COL_MEMO = "MEMO"; + /** + * 镀层代号 + */ + public static final String COL_PLATE_CODE = "PLATE_CODE"; + /** + * 镀层物料 + */ + public static final String COL_PLATE_GOODS_CODE = "PLATE_GOODS_CODE"; + /** + * 镀层厚度 + */ + public static final String COL_PLATE_THICKNESS = "PLATE_THICKNESS"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 流水号 + */ + @Schema(description = "流水号") + private BigDecimal platId; + /** + * 配置码 + */ + @Schema(description = "配置码") + private String configNo; + /** + * [镀种分类]id + */ + @Schema(description = "[镀种分类]id") + private BigDecimal bcId; + /** + * 镀种 + */ + @Schema(description = "镀种") + private String plating; + /** + * 材料 + */ + @Schema(description = "材料") + private String material; + /** + * 硬度 + */ + @Schema(description = "硬度") + private String hardness; + /** + * 镀层编码 + */ + @Schema(description = "镀层编码") + private String matCode; + /** + * 材料状态 + */ + @Schema(description = "材料状态") + private String matState; + /** + * 镀种小类 + */ + @Schema(description = "镀种小类") + private Long subClass; + /** + * 其他要求 + */ + @Schema(description = "其他要求") + private String memo; + /** + * 镀层代号 + */ + @Schema(description = "镀层代号") + private String plateCode; + /** + * 镀层物料 + */ + @Schema(description = "镀层物料") + private String plateGoodsCode; + /** + * 镀层厚度 + */ + @Schema(description = "镀层厚度") + private String plateThickness; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java new file mode 100644 index 00000000..58aee23b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java @@ -0,0 +1,76 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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 2026-01-05 + */ +@Data +@TableName("BA_PLATING_SMALL") +@Schema(description = "PlatingSmall Entity对象") +@EqualsAndHashCode(callSuper = true) +public class PlatingSmall extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 名称 + */ + public static final String COL_BPS_NAME = "BPS_NAME"; + /** + * 日常规生产能力 + */ + public static final String COL_CAPACITY = "CAPACITY"; + /** + * [作业中心]id + */ + public static final String COL_WC_ID = "WC_ID"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * 名称 + */ + @Schema(description = "名称") + private String bpsName; + /** + * 日常规生产能力 + */ + @Schema(description = "日常规生产能力") + private BigDecimal capacity; + /** + * [作业中心]id + */ + @Schema(description = "[作业中心]id") + private Long wcId; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java index 4331a726..d331e851 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java @@ -10,7 +10,6 @@ import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; -import java.math.BigDecimal; /** * [工艺能力] 实体类 @@ -66,12 +65,12 @@ public class ProcessAbility extends BaseEntity { * 能力分类 */ @Schema(description = "能力分类") - private BigDecimal wtId; + private Long wtId; /** * [镀种小类]id */ @Schema(description = "[镀种小类]id") - private BigDecimal bpsId; + private Long bpsId; /** * 排序 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java index 10c45cc6..f0153ada 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java @@ -13,7 +13,7 @@ import java.io.Serial; /** * [生产标识] 实体类 - * + * mes v1: bs_procedure_qua * @author Tom Shuo * @since 2025-12-22 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java new file mode 100644 index 00000000..8f9e00bb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java @@ -0,0 +1,75 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.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 2026-01-05 + */ +@Data +@TableName("BA_SHIFTS") +@Schema(description = "Shifts Entity对象") +@EqualsAndHashCode(callSuper = true) +public class Shifts extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [班次]编码 + */ + public static final String COL_SHIFT_CODE = "SHIFT_CODE"; + /** + * [班次]类型 + */ + public static final String COL_SHIFT_TYPE = "SHIFT_TYPE"; + /** + * [班次]名称 + */ + public static final String COL_NAME = "NAME"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + + /** + * [班次]编码 + */ + @Schema(description = "[班次]编码") + private String shiftCode; + /** + * [班次]类型 + */ + @Schema(description = "[班次]类型") + private Long shiftType; + /** + * [班次]名称 + */ + @Schema(description = "[班次]名称") + private String name; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java new file mode 100644 index 00000000..6c183616 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.BasicClazz; + +import java.io.Serial; + +/** + * [基础分类] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BasicClazzVO extends BasicClazz { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java new file mode 100644 index 00000000..42877ab0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; + +import java.io.Serial; + +/** + * [镀层厚度对应] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class CoatingThicknessVO extends CoatingThickness { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java new file mode 100644 index 00000000..7f32aca3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; + +import java.io.Serial; + +/** + * [局部镀零件] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class LocallyPlatedPartVO extends LocallyPlatedPart { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java new file mode 100644 index 00000000..942d7f90 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; + +import java.io.Serial; + +/** + * [物料定额] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class MaterialQuotaVO extends MaterialQuota { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java new file mode 100644 index 00000000..885409b9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; + +import java.io.Serial; + +/** + * [外协分派] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlanAssignSteerVO extends PlanAssignSteer { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java new file mode 100644 index 00000000..617337d7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.PlatingSmall; + +import java.io.Serial; + +/** + * [镀种小类] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlatingSmallVO extends PlatingSmall { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java new file mode 100644 index 00000000..e7cb10ea --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Plating; + +import java.io.Serial; + +/** + * [镀种] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class PlatingVO extends Plating { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java new file mode 100644 index 00000000..9c487437 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.basic.pojo.entity.Shifts; + +import java.io.Serial; + +/** + * [班次] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ShiftsVO extends Shifts { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IBasicClazzService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IBasicClazzService.java new file mode 100644 index 00000000..05466550 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IBasicClazzService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +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.basic.excel.BasicClazzExcel; +import org.springblade.desk.basic.pojo.entity.BasicClazz; +import org.springblade.desk.basic.pojo.vo.BasicClazzVO; + +import java.util.List; + +/** + * [基础分类] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface IBasicClazzService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param basicClazz 查询参数 + * @return IPage + */ + IPage selectBasicClazzPage(IPage page, BasicClazzVO basicClazz); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBasicClazz(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(BasicClazzVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ICoatingThicknessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ICoatingThicknessService.java new file mode 100644 index 00000000..752edc04 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ICoatingThicknessService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +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.basic.excel.CoatingThicknessExcel; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; +import org.springblade.desk.basic.pojo.vo.CoatingThicknessVO; + +import java.util.List; + +/** + * [镀层厚度对应] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface ICoatingThicknessService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param coatingThickness 查询参数 + * @return IPage + */ + IPage selectCoatingThicknessPage(IPage page, CoatingThicknessVO coatingThickness); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportCoatingThickness(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(CoatingThicknessVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ILocallyPlatedPartService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ILocallyPlatedPartService.java new file mode 100644 index 00000000..b0ad62b5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/ILocallyPlatedPartService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +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.basic.excel.LocallyPlatedPartExcel; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; +import org.springblade.desk.basic.pojo.vo.LocallyPlatedPartVO; + +import java.util.List; + +/** + * [局部镀零件] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface ILocallyPlatedPartService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param locallyPlatedPart 查询参数 + * @return IPage + */ + IPage selectLocallyPlatedPartPage(IPage page, LocallyPlatedPartVO locallyPlatedPart); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportLocallyPlatedPart(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(LocallyPlatedPartVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java new file mode 100644 index 00000000..933e83db --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IMaterialQuotaService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +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.basic.excel.MaterialQuotaExcel; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; +import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; + +import java.util.List; + +/** + * [物料定额] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface IMaterialQuotaService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param materialQuota 查询参数 + * @return IPage + */ + IPage selectMaterialQuotaPage(IPage page, MaterialQuotaVO materialQuota); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportMaterialQuota(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(MaterialQuotaVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlanAssignSteerService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlanAssignSteerService.java new file mode 100644 index 00000000..42fb91c1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlanAssignSteerService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +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.basic.excel.PlanAssignSteerExcel; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; +import org.springblade.desk.basic.pojo.vo.PlanAssignSteerVO; + +import java.util.List; + +/** + * [外协分派] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface IPlanAssignSteerService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param planAssignSteer 查询参数 + * @return IPage + */ + IPage selectPlanAssignSteerPage(IPage page, PlanAssignSteerVO planAssignSteer); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlanAssignSteer(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(PlanAssignSteerVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingService.java new file mode 100644 index 00000000..d3da4f4c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +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.basic.excel.PlatingExcel; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; + +import java.util.List; + +/** + * [镀种] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface IPlatingService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param plating 查询参数 + * @return IPage + */ + IPage selectPlatingPage(IPage page, PlatingVO plating); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlating(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(PlatingVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingSmallService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingSmallService.java new file mode 100644 index 00000000..f72556d2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IPlatingSmallService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +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.basic.excel.PlatingSmallExcel; +import org.springblade.desk.basic.pojo.entity.PlatingSmall; +import org.springblade.desk.basic.pojo.vo.PlatingSmallVO; + +import java.util.List; + +/** + * [镀种小类] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface IPlatingSmallService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param platingSmall 查询参数 + * @return IPage + */ + IPage selectPlatingSmallPage(IPage page, PlatingSmallVO platingSmall); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportPlatingSmall(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(PlatingSmallVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IShiftsService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IShiftsService.java new file mode 100644 index 00000000..c05361cd --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IShiftsService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service; + +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.basic.excel.ShiftsExcel; +import org.springblade.desk.basic.pojo.entity.Shifts; +import org.springblade.desk.basic.pojo.vo.ShiftsVO; + +import java.util.List; + +/** + * [班次] 服务类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public interface IShiftsService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param shifts 查询参数 + * @return IPage + */ + IPage selectShiftsPage(IPage page, ShiftsVO shifts); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportShifts(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(ShiftsVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BasicClazzServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BasicClazzServiceImpl.java new file mode 100644 index 00000000..67dee254 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/BasicClazzServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.BasicClazzExcel; +import org.springblade.desk.basic.mapper.BasicClazzMapper; +import org.springblade.desk.basic.pojo.entity.BasicClazz; +import org.springblade.desk.basic.pojo.vo.BasicClazzVO; +import org.springblade.desk.basic.service.IBasicClazzService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [基础分类] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class BasicClazzServiceImpl extends BaseServiceImpl implements IBasicClazzService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectBasicClazzPage(IPage page, BasicClazzVO basicClazz) { + return page.setRecords(baseMapper.selectBasicClazzPage(page, basicClazz)); + } + + @Override + public List exportBasicClazz(Wrapper queryWrapper) { + List basicClazzList = baseMapper.exportBasicClazz(queryWrapper); + //basicClazzList.forEach(basicClazz -> { + // basicClazz.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicClazz.getType())); + //}); + return basicClazzList; + } + + @Override + public void setVOValue(BasicClazzVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/CoatingThicknessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/CoatingThicknessServiceImpl.java new file mode 100644 index 00000000..ff336567 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/CoatingThicknessServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.CoatingThicknessExcel; +import org.springblade.desk.basic.mapper.CoatingThicknessMapper; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; +import org.springblade.desk.basic.pojo.vo.CoatingThicknessVO; +import org.springblade.desk.basic.service.ICoatingThicknessService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [镀层厚度对应] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class CoatingThicknessServiceImpl extends BaseServiceImpl implements ICoatingThicknessService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectCoatingThicknessPage(IPage page, CoatingThicknessVO coatingThickness) { + return page.setRecords(baseMapper.selectCoatingThicknessPage(page, coatingThickness)); + } + + @Override + public List exportCoatingThickness(Wrapper queryWrapper) { + List coatingThicknessList = baseMapper.exportCoatingThickness(queryWrapper); + //coatingThicknessList.forEach(coatingThickness -> { + // coatingThickness.setTypeName(DictCache.getValue(DictEnum.YES_NO, CoatingThickness.getType())); + //}); + return coatingThicknessList; + } + + @Override + public void setVOValue(CoatingThicknessVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/LocallyPlatedPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/LocallyPlatedPartServiceImpl.java new file mode 100644 index 00000000..f7265131 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/LocallyPlatedPartServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.LocallyPlatedPartExcel; +import org.springblade.desk.basic.mapper.LocallyPlatedPartMapper; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; +import org.springblade.desk.basic.pojo.vo.LocallyPlatedPartVO; +import org.springblade.desk.basic.service.ILocallyPlatedPartService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [局部镀零件] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class LocallyPlatedPartServiceImpl extends BaseServiceImpl implements ILocallyPlatedPartService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectLocallyPlatedPartPage(IPage page, LocallyPlatedPartVO locallyPlatedPart) { + return page.setRecords(baseMapper.selectLocallyPlatedPartPage(page, locallyPlatedPart)); + } + + @Override + public List exportLocallyPlatedPart(Wrapper queryWrapper) { + List locallyPlatedPartList = baseMapper.exportLocallyPlatedPart(queryWrapper); + //locallyPlatedPartList.forEach(locallyPlatedPart -> { + // locallyPlatedPart.setTypeName(DictCache.getValue(DictEnum.YES_NO, LocallyPlatedPart.getType())); + //}); + return locallyPlatedPartList; + } + + @Override + public void setVOValue(LocallyPlatedPartVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java new file mode 100644 index 00000000..6d281ff5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/MaterialQuotaServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.MaterialQuotaExcel; +import org.springblade.desk.basic.mapper.MaterialQuotaMapper; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; +import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; +import org.springblade.desk.basic.service.IMaterialQuotaService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [物料定额] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class MaterialQuotaServiceImpl extends BaseServiceImpl implements IMaterialQuotaService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectMaterialQuotaPage(IPage page, MaterialQuotaVO materialQuota) { + return page.setRecords(baseMapper.selectMaterialQuotaPage(page, materialQuota)); + } + + @Override + public List exportMaterialQuota(Wrapper queryWrapper) { + List materialQuotaList = baseMapper.exportMaterialQuota(queryWrapper); + //materialQuotaList.forEach(materialQuota -> { + // materialQuota.setTypeName(DictCache.getValue(DictEnum.YES_NO, MaterialQuota.getType())); + //}); + return materialQuotaList; + } + + @Override + public void setVOValue(MaterialQuotaVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerServiceImpl.java new file mode 100644 index 00000000..8b8879e0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlanAssignSteerServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.PlanAssignSteerExcel; +import org.springblade.desk.basic.mapper.PlanAssignSteerMapper; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; +import org.springblade.desk.basic.pojo.vo.PlanAssignSteerVO; +import org.springblade.desk.basic.service.IPlanAssignSteerService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [外协分派] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class PlanAssignSteerServiceImpl extends BaseServiceImpl implements IPlanAssignSteerService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectPlanAssignSteerPage(IPage page, PlanAssignSteerVO planAssignSteer) { + return page.setRecords(baseMapper.selectPlanAssignSteerPage(page, planAssignSteer)); + } + + @Override + public List exportPlanAssignSteer(Wrapper queryWrapper) { + List planAssignSteerList = baseMapper.exportPlanAssignSteer(queryWrapper); + //planAssignSteerList.forEach(planAssignSteer -> { + // planAssignSteer.setTypeName(DictCache.getValue(DictEnum.YES_NO, PlanAssignSteer.getType())); + //}); + return planAssignSteerList; + } + + @Override + public void setVOValue(PlanAssignSteerVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java new file mode 100644 index 00000000..ffb7dc1c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.PlatingExcel; +import org.springblade.desk.basic.mapper.PlatingMapper; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; +import org.springblade.desk.basic.service.IPlatingService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [镀种] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class PlatingServiceImpl extends BaseServiceImpl implements IPlatingService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectPlatingPage(IPage page, PlatingVO plating) { + return page.setRecords(baseMapper.selectPlatingPage(page, plating)); + } + + @Override + public List exportPlating(Wrapper queryWrapper) { + List platingList = baseMapper.exportPlating(queryWrapper); + //platingList.forEach(plating -> { + // plating.setTypeName(DictCache.getValue(DictEnum.YES_NO, Plating.getType())); + //}); + return platingList; + } + + @Override + public void setVOValue(PlatingVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingSmallServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingSmallServiceImpl.java new file mode 100644 index 00000000..0df8ee85 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/PlatingSmallServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.PlatingSmallExcel; +import org.springblade.desk.basic.mapper.PlatingSmallMapper; +import org.springblade.desk.basic.pojo.entity.PlatingSmall; +import org.springblade.desk.basic.pojo.vo.PlatingSmallVO; +import org.springblade.desk.basic.service.IPlatingSmallService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [镀种小类] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class PlatingSmallServiceImpl extends BaseServiceImpl implements IPlatingSmallService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectPlatingSmallPage(IPage page, PlatingSmallVO platingSmall) { + return page.setRecords(baseMapper.selectPlatingSmallPage(page, platingSmall)); + } + + @Override + public List exportPlatingSmall(Wrapper queryWrapper) { + List platingSmallList = baseMapper.exportPlatingSmall(queryWrapper); + //platingSmallList.forEach(platingSmall -> { + // platingSmall.setTypeName(DictCache.getValue(DictEnum.YES_NO, PlatingSmall.getType())); + //}); + return platingSmallList; + } + + @Override + public void setVOValue(PlatingSmallVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ShiftsServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ShiftsServiceImpl.java new file mode 100644 index 00000000..dee1ba69 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/ShiftsServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.excel.ShiftsExcel; +import org.springblade.desk.basic.mapper.ShiftsMapper; +import org.springblade.desk.basic.pojo.entity.Shifts; +import org.springblade.desk.basic.pojo.vo.ShiftsVO; +import org.springblade.desk.basic.service.IShiftsService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [班次] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class ShiftsServiceImpl extends BaseServiceImpl implements IShiftsService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectShiftsPage(IPage page, ShiftsVO shifts) { + return page.setRecords(baseMapper.selectShiftsPage(page, shifts)); + } + + @Override + public List exportShifts(Wrapper queryWrapper) { + List shiftsList = baseMapper.exportShifts(queryWrapper); + //shiftsList.forEach(shifts -> { + // shifts.setTypeName(DictCache.getValue(DictEnum.YES_NO, Shifts.getType())); + //}); + return shiftsList; + } + + @Override + public void setVOValue(ShiftsVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/BasicClazzWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/BasicClazzWrapper.java new file mode 100644 index 00000000..8423ca15 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/BasicClazzWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.BasicClazz; +import org.springblade.desk.basic.pojo.vo.BasicClazzVO; + +import java.util.Objects; + +/** + * [基础分类] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class BasicClazzWrapper extends BaseEntityWrapper { + + public static BasicClazzWrapper build() { + return new BasicClazzWrapper(); + } + + @Override + public BasicClazzVO entityVO(BasicClazz basicClazz) { + BasicClazzVO VO = Objects.requireNonNull(BeanUtil.copyProperties(basicClazz, BasicClazzVO.class)); + + //User createUser = UserCache.getUser(basicClazz.getCreateUser()); + //User updateUser = UserCache.getUser(basicClazz.getUpdateUser()); + //basicClazzVO.setCreateUserName(createUser.getName()); + //basicClazzVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/CoatingThicknessWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/CoatingThicknessWrapper.java new file mode 100644 index 00000000..b49283b4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/CoatingThicknessWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.CoatingThickness; +import org.springblade.desk.basic.pojo.vo.CoatingThicknessVO; + +import java.util.Objects; + +/** + * [镀层厚度对应] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class CoatingThicknessWrapper extends BaseEntityWrapper { + + public static CoatingThicknessWrapper build() { + return new CoatingThicknessWrapper(); + } + + @Override + public CoatingThicknessVO entityVO(CoatingThickness coatingThickness) { + CoatingThicknessVO VO = Objects.requireNonNull(BeanUtil.copyProperties(coatingThickness, CoatingThicknessVO.class)); + + //User createUser = UserCache.getUser(coatingThickness.getCreateUser()); + //User updateUser = UserCache.getUser(coatingThickness.getUpdateUser()); + //coatingThicknessVO.setCreateUserName(createUser.getName()); + //coatingThicknessVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/LocallyPlatedPartWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/LocallyPlatedPartWrapper.java new file mode 100644 index 00000000..620d58a4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/LocallyPlatedPartWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.LocallyPlatedPart; +import org.springblade.desk.basic.pojo.vo.LocallyPlatedPartVO; + +import java.util.Objects; + +/** + * [局部镀零件] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class LocallyPlatedPartWrapper extends BaseEntityWrapper { + + public static LocallyPlatedPartWrapper build() { + return new LocallyPlatedPartWrapper(); + } + + @Override + public LocallyPlatedPartVO entityVO(LocallyPlatedPart locallyPlatedPart) { + LocallyPlatedPartVO VO = Objects.requireNonNull(BeanUtil.copyProperties(locallyPlatedPart, LocallyPlatedPartVO.class)); + + //User createUser = UserCache.getUser(locallyPlatedPart.getCreateUser()); + //User updateUser = UserCache.getUser(locallyPlatedPart.getUpdateUser()); + //locallyPlatedPartVO.setCreateUserName(createUser.getName()); + //locallyPlatedPartVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/MaterialQuotaWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/MaterialQuotaWrapper.java new file mode 100644 index 00000000..6b179a5d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/MaterialQuotaWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.MaterialQuota; +import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; + +import java.util.Objects; + +/** + * [物料定额] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class MaterialQuotaWrapper extends BaseEntityWrapper { + + public static MaterialQuotaWrapper build() { + return new MaterialQuotaWrapper(); + } + + @Override + public MaterialQuotaVO entityVO(MaterialQuota materialQuota) { + MaterialQuotaVO VO = Objects.requireNonNull(BeanUtil.copyProperties(materialQuota, MaterialQuotaVO.class)); + + //User createUser = UserCache.getUser(materialQuota.getCreateUser()); + //User updateUser = UserCache.getUser(materialQuota.getUpdateUser()); + //materialQuotaVO.setCreateUserName(createUser.getName()); + //materialQuotaVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlanAssignSteerWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlanAssignSteerWrapper.java new file mode 100644 index 00000000..532d66dd --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlanAssignSteerWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.PlanAssignSteer; +import org.springblade.desk.basic.pojo.vo.PlanAssignSteerVO; + +import java.util.Objects; + +/** + * [外协分派] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class PlanAssignSteerWrapper extends BaseEntityWrapper { + + public static PlanAssignSteerWrapper build() { + return new PlanAssignSteerWrapper(); + } + + @Override + public PlanAssignSteerVO entityVO(PlanAssignSteer planAssignSteer) { + PlanAssignSteerVO VO = Objects.requireNonNull(BeanUtil.copyProperties(planAssignSteer, PlanAssignSteerVO.class)); + + //User createUser = UserCache.getUser(planAssignSteer.getCreateUser()); + //User updateUser = UserCache.getUser(planAssignSteer.getUpdateUser()); + //planAssignSteerVO.setCreateUserName(createUser.getName()); + //planAssignSteerVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingSmallWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingSmallWrapper.java new file mode 100644 index 00000000..2819582c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingSmallWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.PlatingSmall; +import org.springblade.desk.basic.pojo.vo.PlatingSmallVO; + +import java.util.Objects; + +/** + * [镀种小类] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class PlatingSmallWrapper extends BaseEntityWrapper { + + public static PlatingSmallWrapper build() { + return new PlatingSmallWrapper(); + } + + @Override + public PlatingSmallVO entityVO(PlatingSmall platingSmall) { + PlatingSmallVO VO = Objects.requireNonNull(BeanUtil.copyProperties(platingSmall, PlatingSmallVO.class)); + + //User createUser = UserCache.getUser(platingSmall.getCreateUser()); + //User updateUser = UserCache.getUser(platingSmall.getUpdateUser()); + //platingSmallVO.setCreateUserName(createUser.getName()); + //platingSmallVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java new file mode 100644 index 00000000..9083b553 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Plating; +import org.springblade.desk.basic.pojo.vo.PlatingVO; + +import java.util.Objects; + +/** + * [镀种] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class PlatingWrapper extends BaseEntityWrapper { + + public static PlatingWrapper build() { + return new PlatingWrapper(); + } + + @Override + public PlatingVO entityVO(Plating plating) { + PlatingVO VO = Objects.requireNonNull(BeanUtil.copyProperties(plating, PlatingVO.class)); + + //User createUser = UserCache.getUser(plating.getCreateUser()); + //User updateUser = UserCache.getUser(plating.getUpdateUser()); + //platingVO.setCreateUserName(createUser.getName()); + //platingVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/ShiftsWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/ShiftsWrapper.java new file mode 100644 index 00000000..9c341dd2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/wrapper/ShiftsWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.basic.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.basic.pojo.entity.Shifts; +import org.springblade.desk.basic.pojo.vo.ShiftsVO; + +import java.util.Objects; + +/** + * [班次] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-05 + */ +public class ShiftsWrapper extends BaseEntityWrapper { + + public static ShiftsWrapper build() { + return new ShiftsWrapper(); + } + + @Override + public ShiftsVO entityVO(Shifts shifts) { + ShiftsVO VO = Objects.requireNonNull(BeanUtil.copyProperties(shifts, ShiftsVO.class)); + + //User createUser = UserCache.getUser(shifts.getCreateUser()); + //User updateUser = UserCache.getUser(shifts.getUpdateUser()); + //shiftsVO.setCreateUserName(createUser.getName()); + //shiftsVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} From abcfdc64a7e1af7f749c427df857dafffe4ddf6b Mon Sep 17 00:00:00 2001 From: Tom Li Date: Tue, 6 Jan 2026 17:29:15 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=EF=BC=8C=E5=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8D=95=EF=BC=8C=E7=94=9F=E4=BA=A7=E8=B4=A8=E9=87=8F=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/excel/PlatingExcel.java | 125 ----- .../desk/basic/mapper/PlatingMapper.java | 39 -- .../desk/basic/mapper/PlatingMapper.xml | 31 -- .../desk/basic/pojo/entity/Plating.java | 166 ------ .../desk/basic/service/IPlatingService.java | 43 -- .../service/impl/PlatingServiceImpl.java | 60 --- .../desk/basic/wrapper/PlatingWrapper.java | 35 -- .../basic/controller/FormulaController.java | 17 +- .../controller/MaterialQuotaController.java | 321 ++++++------ .../desk/basic/controller/OemController.java | 31 +- .../basic/controller/ShiftsController.java | 320 ++++++------ .../basic/controller/TeamSetController.java | 10 +- .../desk/basic/mapper/TeamSetMapper.xml | 2 +- .../basic/pojo/entity/CoatingThickness.java | 4 +- .../desk/basic/pojo/entity/Plating.java | 11 +- .../desk/basic/pojo/entity/TeamSet.java | 9 - .../quality/constant/InspectionTaskConst.java | 13 + .../controller/InspectionItemController.java | 307 +++++------ .../controller/InspectionTaskController.java | 11 +- .../InspectionTemplateController.java | 2 +- .../controller/ReviewDutyController.java | 237 +++++++++ .../controller/ReviewFaultController.java | 237 +++++++++ .../controller/ReviewSheetController.java | 159 +++--- .../controller/StandardController.java | 3 + .../controller/WorkPlanItemController.java | 237 +++++++++ .../WorkPlanItemDetailController.java | 237 +++++++++ .../desk/quality/excel/ReviewDutyExcel.java | 81 +++ .../desk/quality/excel/ReviewFaultExcel.java | 75 +++ .../desk/quality/excel/ReviewSheetExcel.java | 256 +++++++++ .../excel/WorkPlanItemDetailExcel.java | 111 ++++ .../desk/quality/excel/WorkPlanItemExcel.java | 136 +++++ .../quality/mapper/InspectionTaskMapper.java | 4 +- .../quality/mapper/InspectionTaskMapper.xml | 17 +- .../desk/quality/mapper/ReviewDutyMapper.java | 40 ++ .../desk/quality/mapper/ReviewDutyMapper.xml | 24 + .../quality/mapper/ReviewFaultMapper.java | 40 ++ .../desk/quality/mapper/ReviewFaultMapper.xml | 23 + .../quality/mapper/ReviewSheetMapper.java | 40 ++ .../desk/quality/mapper/ReviewSheetMapper.xml | 53 ++ .../mapper/WorkPlanItemDetailMapper.java | 40 ++ .../mapper/WorkPlanItemDetailMapper.xml | 29 + .../quality/mapper/WorkPlanItemMapper.java | 40 ++ .../quality/mapper/WorkPlanItemMapper.xml | 33 ++ .../desk/quality/pojo/dto/ReviewDutyDTO.java | 24 + .../desk/quality/pojo/dto/ReviewFaultDTO.java | 24 + .../desk/quality/pojo/dto/ReviewSheetDTO.java | 24 + .../quality/pojo/dto/WorkPlanItemDTO.java | 24 + .../pojo/dto/WorkPlanItemDetailDTO.java | 24 + .../quality/pojo/entity/InspectionItem.java | 2 +- .../quality/pojo/entity/InspectionTask.java | 494 +++++++++--------- .../pojo/entity/RelInsTemplateItem.java | 2 +- .../desk/quality/pojo/entity/ReviewDuty.java | 102 ++++ .../desk/quality/pojo/entity/ReviewFault.java | 94 ++++ .../desk/quality/pojo/entity/ReviewSheet.java | 364 +++++++++++++ .../quality/pojo/entity/WorkPlanItem.java | 184 +++++++ .../pojo/entity/WorkPlanItemDetail.java | 147 ++++++ .../pojo/request/InspectionTaskSearch.java | 33 +- .../pojo/vo/InspectionTaskDetailVO.java | 29 + .../quality/pojo/vo/InspectionTaskListVO.java | 71 +++ .../desk/quality/pojo/vo/QAPrWorkOrderVO.java | 15 + .../desk/quality/pojo/vo/QAPrWorkPlanVO.java | 17 + .../desk/quality/pojo/vo/ReviewDutyVO.java | 11 +- .../desk/quality/pojo/vo/ReviewFaultVO.java | 24 + ...spectionTaskVO.java => ReviewSheetVO.java} | 8 +- .../quality/pojo/vo/WorkPlanItemDetailVO.java | 24 + .../desk/quality/pojo/vo/WorkPlanItemVO.java | 11 +- .../service/IInspectionTaskService.java | 6 +- .../quality/service/IReviewDutyService.java | 44 ++ .../quality/service/IReviewFaultService.java | 44 ++ .../quality/service/IReviewSheetService.java | 44 ++ .../service/IWorkPlanItemDetailService.java | 44 ++ .../quality/service/IWorkPlanItemService.java | 44 ++ .../impl/InspectionTaskServiceImpl.java | 6 +- .../service/impl/ReviewDutyServiceImpl.java | 61 +++ .../service/impl/ReviewFaultServiceImpl.java | 61 +++ .../service/impl/ReviewSheetServiceImpl.java | 61 +++ .../impl/WorkPlanItemDetailServiceImpl.java | 61 +++ .../service/impl/WorkPlanItemServiceImpl.java | 61 +++ .../wrapper/InspectionTaskWrapper.java | 8 +- .../quality/wrapper/ReviewDutyWrapper.java | 36 ++ .../quality/wrapper/ReviewFaultWrapper.java | 36 ++ .../quality/wrapper/ReviewSheetWrapper.java | 36 ++ .../wrapper/WorkPlanItemDetailWrapper.java | 36 ++ .../quality/wrapper/WorkPlanItemWrapper.java | 36 ++ 84 files changed, 4805 insertions(+), 1381 deletions(-) delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java delete mode 100644 blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewDutyController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewFaultController.java rename blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java => blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java (54%) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemDetailController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewDutyExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewFaultExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewSheetExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemDetailExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java rename blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java => blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java (51%) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java rename blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/{InspectionTaskVO.java => ReviewSheetVO.java} (62%) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java rename blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java => blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java (52%) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewDutyServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewDutyWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewFaultWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemDetailWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemWrapper.java diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java deleted file mode 100644 index 6bfa41ab..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/excel/PlatingExcel.java +++ /dev/null @@ -1,125 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.basic.excel; - - -import lombok.Data; - -import com.baomidou.mybatisplus.annotation.TableId; -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 2026-01-05 - */ -@Data -@ColumnWidth(25) -@HeadRowHeight(20) -@ContentRowHeight(18) -public class PlatingExcel implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 流水号 - */ - @ColumnWidth(20) - @ExcelProperty("流水号") - private BigDecimal platId; - /** - * 配置码 - */ - @ColumnWidth(20) - @ExcelProperty("配置码") - private String configNo; - /** - * [镀种分类]id - */ - @ColumnWidth(20) - @ExcelProperty("[镀种分类]id") - private BigDecimal bcId; - /** - * 镀种 - */ - @ColumnWidth(20) - @ExcelProperty("镀种") - private String plating; - /** - * 材料 - */ - @ColumnWidth(20) - @ExcelProperty("材料") - private String material; - /** - * 硬度 - */ - @ColumnWidth(20) - @ExcelProperty("硬度") - private String hardness; - /** - * 镀层编码 - */ - @ColumnWidth(20) - @ExcelProperty("镀层编码") - private String matCode; - /** - * 材料状态 - */ - @ColumnWidth(20) - @ExcelProperty("材料状态") - private String matState; - /** - * 镀种小类 - */ - @ColumnWidth(20) - @ExcelProperty("镀种小类") - private Long subClass; - /** - * 其他要求 - */ - @ColumnWidth(20) - @ExcelProperty("其他要求") - private String memo; - /** - * 镀层代号 - */ - @ColumnWidth(20) - @ExcelProperty("镀层代号") - private String plateCode; - /** - * 镀层物料 - */ - @ColumnWidth(20) - @ExcelProperty("镀层物料") - private String plateGoodsCode; - /** - * 镀层厚度 - */ - @ColumnWidth(20) - @ExcelProperty("镀层厚度") - private String plateThickness; - /** - * 排序 - */ - @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/basic/mapper/PlatingMapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java deleted file mode 100644 index 686edde4..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.java +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.basic.mapper; - -import org.springblade.desk.basic.pojo.entity.Plating; -import org.springblade.desk.basic.pojo.vo.PlatingVO; -import org.springblade.desk.basic.excel.PlatingExcel; -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 2026-01-05 - */ -public interface PlatingMapper extends BaseMapper { - - /** - * 自定义分页 - * - * @param page 分页参数 - * @param plating 查询参数 - * @return List - */ - List selectPlatingPage(IPage page, PlatingVO plating); - - /** - * 获取导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportPlating(@Param("ew") Wrapper queryWrapper); -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml deleted file mode 100644 index a384c9bb..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/mapper/PlatingMapper.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java deleted file mode 100644 index b4ca3b67..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java +++ /dev/null @@ -1,166 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.basic.pojo.entity; - -import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; -import com.baomidou.mybatisplus.annotation.TableId; -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 2026-01-05 - */ -@Data -@TableName("BA_PLATING") -@Schema(description = "Plating Entity对象") -@EqualsAndHashCode(callSuper = true) -public class Plating extends BaseEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 流水号 - */ - public static final String COL_PLAT_ID = "PLAT_ID"; - /** - * 配置码 - */ - public static final String COL_CONFIG_NO = "CONFIG_NO"; - /** - * [镀种分类]id - */ - public static final String COL_BC_ID = "BC_ID"; - /** - * 镀种 - */ - public static final String COL_PLATING = "PLATING"; - /** - * 材料 - */ - public static final String COL_MATERIAL = "MATERIAL"; - /** - * 硬度 - */ - public static final String COL_HARDNESS = "HARDNESS"; - /** - * 镀层编码 - */ - public static final String COL_MAT_CODE = "MAT_CODE"; - /** - * 材料状态 - */ - public static final String COL_MAT_STATE = "MAT_STATE"; - /** - * 镀种小类 - */ - public static final String COL_SUB_CLASS = "SUB_CLASS"; - /** - * 其他要求 - */ - public static final String COL_MEMO = "MEMO"; - /** - * 镀层代号 - */ - public static final String COL_PLATE_CODE = "PLATE_CODE"; - /** - * 镀层物料 - */ - public static final String COL_PLATE_GOODS_CODE = "PLATE_GOODS_CODE"; - /** - * 镀层厚度 - */ - public static final String COL_PLATE_THICKNESS = "PLATE_THICKNESS"; - /** - * 排序 - */ - public static final String COL_SORT = "SORT"; - /** - * 备注 - */ - public static final String COL_REMARK = "REMARK"; - - /** - * 流水号 - */ - @Schema(description = "流水号") - private BigDecimal platId; - /** - * 配置码 - */ - @Schema(description = "配置码") - private String configNo; - /** - * [镀种分类]id - */ - @Schema(description = "[镀种分类]id") - private BigDecimal bcId; - /** - * 镀种 - */ - @Schema(description = "镀种") - private String plating; - /** - * 材料 - */ - @Schema(description = "材料") - private String material; - /** - * 硬度 - */ - @Schema(description = "硬度") - private String hardness; - /** - * 镀层编码 - */ - @Schema(description = "镀层编码") - private String matCode; - /** - * 材料状态 - */ - @Schema(description = "材料状态") - private String matState; - /** - * 镀种小类 - */ - @Schema(description = "镀种小类") - private Long subClass; - /** - * 其他要求 - */ - @Schema(description = "其他要求") - private String memo; - /** - * 镀层代号 - */ - @Schema(description = "镀层代号") - private String plateCode; - /** - * 镀层物料 - */ - @Schema(description = "镀层物料") - private String plateGoodsCode; - /** - * 镀层厚度 - */ - @Schema(description = "镀层厚度") - private String plateThickness; - /** - * 排序 - */ - @Schema(description = "排序") - private Long sort; - /** - * 备注 - */ - @Schema(description = "备注") - private String remark; -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java deleted file mode 100644 index 4d3842af..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/IPlatingService.java +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.basic.service; - -import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.springblade.desk.basic.pojo.entity.Plating; -import org.springblade.desk.basic.pojo.vo.PlatingVO; -import org.springblade.desk.basic.excel.PlatingExcel; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseService; -import java.util.List; - -/** - * [镀种] 服务类 - * - * @author Tom Shuo - * @since 2026-01-05 - */ -public interface IPlatingService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param plating 查询参数 - * @return IPage - */ - IPage selectPlatingPage(IPage page, PlatingVO plating); - - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportPlating(Wrapper queryWrapper); - - /** - * VO - * @param vo - */ - void setVOValue(PlatingVO vo); -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java deleted file mode 100644 index 52b4fd87..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/service/impl/PlatingServiceImpl.java +++ /dev/null @@ -1,60 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.basic.service.impl; - -import jakarta.annotation.Resource; -import lombok.Data; -import lombok.AllArgsConstructor; -import lombok.EqualsAndHashCode; -import lombok.extern.slf4j.Slf4j; -import org.springblade.desk.basic.pojo.entity.Plating; -import org.springblade.desk.basic.pojo.vo.PlatingVO; -import org.springblade.desk.basic.excel.PlatingExcel; -import org.springblade.desk.basic.mapper.PlatingMapper; -import org.springblade.desk.basic.service.IPlatingService; -import org.springblade.system.feign.IUserClient; -import org.springblade.system.feign.IDictClient; -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 2026-01-05 - */ -@Service -@Data -@AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -@Slf4j -public class PlatingServiceImpl extends BaseServiceImpl implements IPlatingService { - - @Resource - private IUserClient userClient; - @Resource - private IDictClient dictClient; - - @Override - public IPage selectPlatingPage(IPage page, PlatingVO plating) { - return page.setRecords(baseMapper.selectPlatingPage(page, plating)); - } - - @Override - public List exportPlating(Wrapper queryWrapper) { - List platingList = baseMapper.exportPlating(queryWrapper); - //platingList.forEach(plating -> { - // plating.setTypeName(DictCache.getValue(DictEnum.YES_NO, Plating.getType())); - //}); - return platingList; - } - - @Override - public void setVOValue(PlatingVO vo) { - - } -} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java b/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java deleted file mode 100644 index 92b27fff..00000000 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/wrapper/PlatingWrapper.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Author: Tom Shuo - */ -package org.springblade.desk.basic.wrapper; - -import org.springblade.core.mp.support.BaseEntityWrapper; -import org.springblade.core.tool.utils.BeanUtil; -import org.springblade.desk.basic.pojo.entity.Plating; -import org.springblade.desk.basic.pojo.vo.PlatingVO; -import java.util.Objects; - -/** - * [镀种] 包装类,返回视图层所需的字段 - * - * @author Tom Shuo - * @since 2026-01-05 - */ -public class PlatingWrapper extends BaseEntityWrapper { - - public static PlatingWrapper build() { - return new PlatingWrapper(); - } - - @Override - public PlatingVO entityVO(Plating plating) { - PlatingVO VO = Objects.requireNonNull(BeanUtil.copyProperties(plating, PlatingVO.class)); - - //User createUser = UserCache.getUser(plating.getCreateUser()); - //User updateUser = UserCache.getUser(plating.getUpdateUser()); - //platingVO.setCreateUserName(createUser.getName()); - //platingVO.setUpdateUserName(updateUser.getName()); - - return VO; - } -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java index 68d055a4..93f13d1b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java @@ -3,8 +3,10 @@ */ package org.springblade.desk.basic.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -24,7 +26,9 @@ 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.basic.constant.BAModuleConst; +import org.springblade.desk.basic.constant.BasicClazzConst; import org.springblade.desk.basic.excel.FormulaExcel; +import org.springblade.desk.basic.pojo.entity.BasicClazz; import org.springblade.desk.basic.pojo.entity.Formula; import org.springblade.desk.basic.pojo.vo.FormulaVO; import org.springblade.desk.basic.service.IFormulaService; @@ -40,6 +44,7 @@ import java.util.Map; /** * [计算公式] 控制器 * mes v1: 新加 + * * @author Tom Shuo * @since 2025-12-16 */ @@ -88,9 +93,7 @@ public class FormulaController extends BladeController { @ApiOperationSupport(order = 21) @Operation(summary = "page分页", description = "传入Formula Obj") public R> page(FormulaVO formula, Query query) { - IPage pagesVO = service.selectFormulaPage( - Condition.getPage(query), formula - ); + IPage pagesVO = service.selectFormulaPage(Condition.getPage(query), formula); return R.data(pagesVO); } @@ -101,10 +104,10 @@ public class FormulaController extends BladeController { @ApiOperationSupport(order = 22) @Operation(summary = "list下拉选择", description = "") public R> listForSelect( - @Parameter(description = "formulaType", required = true) @RequestParam Integer formulaType) { - List list = service.list( - new QueryWrapper().eq(Formula.COL_FORMULA_TYPE, formulaType) - ); + @Parameter(description = "formulaType 公式类型", required = true) @RequestParam Integer formulaType) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(Formula::getFormulaType, formulaType); + List list = service.list(qw); List listVO = FormulaWrapper.build().listVO(list); return R.data(listVO); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java index 1c4139a0..2a33e127 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java @@ -3,8 +3,10 @@ */ package org.springblade.desk.basic.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -26,6 +28,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.MaterialQuotaExcel; +import org.springblade.desk.basic.pojo.entity.Formula; import org.springblade.desk.basic.pojo.entity.MaterialQuota; import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; import org.springblade.desk.basic.service.IMaterialQuotaService; @@ -42,6 +45,7 @@ import java.util.stream.Collectors; /** * [物料定额] 控制器 * mes v1: 新加 + * * @author Tom Shuo * @since 2026-01-05 */ @@ -55,184 +59,187 @@ import java.util.stream.Collectors; public class MaterialQuotaController extends BladeController { @Resource - private IMaterialQuotaService service; - - /** - * [物料定额] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入MaterialQuota Obj") - public R detail(MaterialQuota materialQuota) { - QueryWrapper qw = Condition.getQueryWrapper(materialQuota); - MaterialQuota detail = service.getOne(qw); - MaterialQuotaVO detailVO = MaterialQuotaWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [物料定额] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入MaterialQuota Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map materialQuota, - Query query) { + private IMaterialQuotaService service; + + /** + * [物料定额] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入MaterialQuota Obj") + public R detail(MaterialQuota materialQuota) { + QueryWrapper qw = Condition.getQueryWrapper(materialQuota); + MaterialQuota detail = service.getOne(qw); + MaterialQuotaVO detailVO = MaterialQuotaWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [物料定额] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入MaterialQuota Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map materialQuota, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(materialQuota, MaterialQuota.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = MaterialQuotaWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [物料定额] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入MaterialQuota Obj") - public R> page(MaterialQuotaVO materialQuota, Query query) { - IPage pagesVO = service.selectMaterialQuotaPage( - Condition.getPage(query), materialQuota - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = MaterialQuotaWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [物料定额] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入MaterialQuota Obj") + public R> page(MaterialQuotaVO materialQuota, Query query) { + IPage pagesVO = service.selectMaterialQuotaPage( + Condition.getPage(query), materialQuota + ); + return R.data(pagesVO); + } + + /** * [物料定额] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") - public R> listForSelect() { - List list = service.list(); - List listVO = MaterialQuotaWrapper.build().listVO(list); - return R.data(listVO); + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect( + @Parameter(description = "quotaType 定额类型", required = true) @RequestParam Integer quotaType) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(MaterialQuota::getQuotaType, quotaType); + List list = service.list(qw); + List listVO = MaterialQuotaWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [物料定额] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入MaterialQuota Obj") + public R save(@Valid @RequestBody MaterialQuota addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [物料定额] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入MaterialQuota Obj") - public R save(@Valid @RequestBody MaterialQuota addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [物料定额] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入MaterialQuota List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [物料定额] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入MaterialQuota Obj") - public R update(@Valid @RequestBody MaterialQuota updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入MaterialQuota List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [物料定额] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入MaterialQuota Obj") + public R update(@Valid @RequestBody MaterialQuota updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [物料定额] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入MaterialQuota List") + @Operation(summary = "修改批量", description = "传入MaterialQuota List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [物料定额] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入MaterialQuota Obj") - public R submit(@Valid @RequestBody MaterialQuota mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [物料定额] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入MaterialQuota Obj") + public R submit(@Valid @RequestBody MaterialQuota mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [物料定额] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入MaterialQuota List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [物料定额] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [物料定额] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入MaterialQuota") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map materialQuota, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(materialQuota, MaterialQuota.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(MaterialQuota::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(MaterialQuotaEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportMaterialQuota(qw); - ExcelUtil.export(response, "[物料定额]数据" + DateUtil.time(), - "[物料定额]数据表", list, MaterialQuotaExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入MaterialQuota List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [物料定额] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [物料定额] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入MaterialQuota") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map materialQuota, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(materialQuota, MaterialQuota.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(MaterialQuota::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(MaterialQuotaEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportMaterialQuota(qw); + ExcelUtil.export(response, "[物料定额]数据" + DateUtil.time(), + "[物料定额]数据表", list, MaterialQuotaExcel.class); + } + + /** * [物料定额] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [物料定额] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, MaterialQuota.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [物料定额] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, MaterialQuota.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index 2382e0ff..be4e8032 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -83,32 +83,17 @@ public class OemController extends BladeController { @Operation(summary = "list分页", description = "传入Oem Obj") public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - // 构建search对象。 - OemSearch search = new OemSearch(); - -// if (map.containsKey(Oem.COL_CODE)) { -// search.setCode((Func.toStr(map.get(OemSearch.COL_CODE)))); -// } -// if (map.containsKey(Oem.COL_OC_NAME)) { -// search.setOcName((Func.toStr(map.get(OemSearch.COL_OC_NAME)))); -// } -// if (map.containsKey(Oem.COL_ABBREVIATION)) { -// search.setAbbreviation((Func.toStr(map.get(OemSearch.COL_ABBREVIATION)))); -// } -// if (map.containsKey(OemSearch.COL_QUALIFICATION)) { -// search.setQualification((Func.toInt(map.get(OemSearch.COL_QUALIFICATION)))); -// } -// if (map.containsKey(BaseCol.STATUS)) { -// search.setStatus((Integer) map.get(BaseCol.STATUS)); -// } -// if (map.containsKey(OemSearch.COL_CONTACT_MAN)) { -// search.setContactMan((Func.toStr(map.get(OemSearch.COL_CONTACT_MAN)))); -// } - + // build QueryWrapper QueryWrapper qw = Condition.getQueryWrapper(map, Oem.class); + qw.eq(map.containsKey(Oem.COL_CODE), Oem.COL_CODE, (Func.toStr(map.get(OemSearch.COL_CODE)))); + qw.like(map.containsKey(Oem.COL_OC_NAME), Oem.COL_OC_NAME, (Func.toStr(map.get(OemSearch.COL_OC_NAME)))); + qw.like(map.containsKey(Oem.COL_ABBREVIATION), Oem.COL_ABBREVIATION, (Func.toStr(map.get(OemSearch.COL_ABBREVIATION)))); + qw.eq(map.containsKey(Oem.COL_QUALIFICATION), Oem.COL_QUALIFICATION, (Func.toInt(map.get(OemSearch.COL_QUALIFICATION)))); + qw.eq(map.containsKey(BaseCol.STATUS), BaseCol.STATUS, (Func.toInt(map.get(BaseCol.STATUS)))); + qw.like(map.containsKey(Oem.COL_CONTACT_MAN), Oem.COL_CONTACT_MAN, (Func.toStr(map.get(Oem.COL_CONTACT_MAN)))); + // page IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = OemWrapper.build().pageVO(pages); - pagesVO.getRecords() .stream() .peek(service::setVOValue) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java index d3f9f2ed..2cbca935 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java @@ -26,7 +26,9 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.ShiftsExcel; +import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.entity.Shifts; +import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.ShiftsVO; import org.springblade.desk.basic.service.IShiftsService; import org.springblade.desk.basic.util.ExcelExtUtil; @@ -42,6 +44,7 @@ import java.util.stream.Collectors; /** * [班次] 控制器 * mes v1: bs_classes_set + * * @author Tom Shuo * @since 2026-01-05 */ @@ -55,184 +58,187 @@ import java.util.stream.Collectors; public class ShiftsController extends BladeController { @Resource - private IShiftsService service; - - /** - * [班次] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入Shifts Obj") - public R detail(Shifts shifts) { - QueryWrapper qw = Condition.getQueryWrapper(shifts); - Shifts detail = service.getOne(qw); - ShiftsVO detailVO = ShiftsWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [班次] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入Shifts Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map shifts, - Query query) { - QueryWrapper qw = Condition.getQueryWrapper(shifts, Shifts.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ShiftsWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [班次] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入Shifts Obj") - public R> page(ShiftsVO shifts, Query query) { - IPage pagesVO = service.selectShiftsPage( - Condition.getPage(query), shifts - ); - return R.data(pagesVO); - } - - /** + private IShiftsService service; + + /** + * [班次] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入Shifts Obj") + public R detail(Shifts shifts) { + QueryWrapper qw = Condition.getQueryWrapper(shifts); + Shifts detail = service.getOne(qw); + ShiftsVO detailVO = ShiftsWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [班次] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入Shifts Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map map, + Query query) { + // build QueryWrapper + QueryWrapper qw = Condition.getQueryWrapper(map, Shifts.class); + qw.like(map.containsKey(Shifts.COL_NAME), Shifts.COL_NAME, (Func.toStr(map.get(Shifts.COL_NAME)))); + // page + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ShiftsWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [班次] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入Shifts Obj") + public R> page(ShiftsVO shifts, Query query) { + IPage pagesVO = service.selectShiftsPage( + Condition.getPage(query), shifts + ); + return R.data(pagesVO); + } + + /** * [班次] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = ShiftsWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = ShiftsWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [班次] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入Shifts Obj") + public R save(@Valid @RequestBody Shifts addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [班次] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入Shifts Obj") - public R save(@Valid @RequestBody Shifts addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [班次] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入Shifts List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [班次] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入Shifts Obj") - public R update(@Valid @RequestBody Shifts updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入Shifts List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [班次] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入Shifts Obj") + public R update(@Valid @RequestBody Shifts updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [班次] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入Shifts List") + @Operation(summary = "修改批量", description = "传入Shifts List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [班次] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入Shifts Obj") - public R submit(@Valid @RequestBody Shifts mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [班次] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入Shifts Obj") + public R submit(@Valid @RequestBody Shifts mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [班次] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入Shifts List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [班次] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [班次] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入Shifts") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map shifts, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(shifts, Shifts.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(Shifts::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(ShiftsEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportShifts(qw); - ExcelUtil.export(response, "[班次]数据" + DateUtil.time(), - "[班次]数据表", list, ShiftsExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入Shifts List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [班次] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [班次] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入Shifts") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map shifts, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(shifts, Shifts.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(Shifts::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ShiftsEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportShifts(qw); + ExcelUtil.export(response, "[班次]数据" + DateUtil.time(), + "[班次]数据表", list, ShiftsExcel.class); + } + + /** * [班次] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [班次] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, Shifts.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [班次] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, Shifts.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index b73ef998..e342e074 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -25,6 +25,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.TeamSetExcel; +import org.springblade.desk.basic.pojo.entity.Shifts; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.vo.TeamSetVO; import org.springblade.desk.basic.service.ITeamSetService; @@ -73,9 +74,14 @@ public class TeamSetController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 20) @Operation(summary = "list分页", description = "传入TeamSet Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map teamSet, + public R> list(@Parameter(hidden = true) @RequestParam Map map, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(teamSet, TeamSet.class); + // build QueryWrapper + QueryWrapper qw = Condition.getQueryWrapper(map, TeamSet.class); + qw.like(map.containsKey(TeamSet.COL_TS_CODE), TeamSet.COL_TS_CODE, (Func.toStr(map.get(TeamSet.COL_TS_CODE)))); + qw.like(map.containsKey(TeamSet.COL_TS_NAME), TeamSet.COL_TS_NAME, (Func.toStr(map.get(TeamSet.COL_TS_NAME)))); + qw.eq(map.containsKey(TeamSet.COL_DISPATCHER), TeamSet.COL_DISPATCHER, (Func.toLong(map.get(TeamSet.COL_DISPATCHER)))); + // page IPage pages = service.page(Condition.getPage(query), qw); IPage pagesVO = TeamSetWrapper.build().pageVO(pages); return R.data(pagesVO); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.xml index 44f9744e..73b0f2c5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.xml @@ -11,7 +11,7 @@ - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java index beef0dc0..22cb92fb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java @@ -37,7 +37,7 @@ public class CoatingThickness extends BaseEntity { /** * 质量等级 */ - public static final String COL_LEVEL = "LEVEL"; + public static final String COL_LEVEL_NUM = "LEVEL_NUM"; /** * 是否以21E8-210开头 */ @@ -69,7 +69,7 @@ public class CoatingThickness extends BaseEntity { * 质量等级 */ @Schema(description = "质量等级") - private Integer level; + private Integer levelNum; /** * 是否以21E8-210开头 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java index d7e7faa3..05912651 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java @@ -27,10 +27,6 @@ public class Plating extends BaseEntity { @Serial private static final long serialVersionUID = 1L; - /** - * 流水号 - */ - public static final String COL_PLAT_ID = "PLAT_ID"; /** * 配置码 */ @@ -88,11 +84,6 @@ public class Plating extends BaseEntity { */ public static final String COL_REMARK = "REMARK"; - /** - * 流水号 - */ - @Schema(description = "流水号") - private BigDecimal platId; /** * 配置码 */ @@ -102,7 +93,7 @@ public class Plating extends BaseEntity { * [镀种分类]id */ @Schema(description = "[镀种分类]id") - private BigDecimal bcId; + private Long bcId; /** * 镀种 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java index 792f3c47..05015429 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java @@ -54,10 +54,6 @@ public class TeamSet extends BaseEntity { * 创建人;外键（人员） */ public static final String COL_CREATE_MAN = "CREATE_MAN"; - /** - * 删除标记;1:删除，0:正常 - */ - public static final String COL_DELETED = "DELETED"; /** * 作业中心 */ @@ -126,11 +122,6 @@ public class TeamSet extends BaseEntity { */ @Schema(description = "创建人;外键（人员）") private Long createMan; - /** - * 删除标记;1:删除，0:正常 - */ - @Schema(description = "删除标记;1:删除，0:正常") - private String deleted; /** * 作业中心 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java index 86e212c4..9b1f1a9a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java @@ -11,4 +11,17 @@ public interface InspectionTaskConst { * 烧结 */ Integer TYPE_SJ = 2; + + /** + * 未检验 + */ + Integer CHECK_RESULT_NOT = -1; + /** + * 合格 + */ + Integer CHECK_RESULT_OK = 1; + /** + * 不合格 + */ + Integer CHECK_RESULT_NO = 2; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java index 5ffcd56d..a9dfb050 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionItemController.java @@ -39,6 +39,11 @@ import java.util.Map; /** * [检验项目] 控制器 + * mes v1: + * + *

+ * SELECT * FROM "RB_BS_ADDITIONAL_MESS" WHERE TYPE = 2 ORDER BY ONE_DATA ASC + *

* * @author Tom Shuo * @since 2025-12-16 @@ -52,179 +57,179 @@ import java.util.Map; public class InspectionItemController extends BladeController { @Resource - private IInspectionItemService service; - - /** - * [检验项目] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入InspectionItem Obj") - public R detail(InspectionItem inspectionItem) { - QueryWrapper qw = Condition.getQueryWrapper(inspectionItem); - InspectionItem detail = service.getOne(qw); - InspectionItemVO detailVO = InspectionItemWrapper.build().entityVO(detail); - return R.data(detailVO); - } - - /** - * [检验项目] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入InspectionItem Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map inspectionItem, - Query query) { + private IInspectionItemService service; + + /** + * [检验项目] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入InspectionItem Obj") + public R detail(InspectionItem inspectionItem) { + QueryWrapper qw = Condition.getQueryWrapper(inspectionItem); + InspectionItem detail = service.getOne(qw); + InspectionItemVO detailVO = InspectionItemWrapper.build().entityVO(detail); + return R.data(detailVO); + } + + /** + * [检验项目] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入InspectionItem Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map inspectionItem, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(inspectionItem, InspectionItem.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = InspectionItemWrapper.build().pageVO(pages); - return R.data(pagesVO); - } - - - /** - * [检验项目] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入InspectionItem Obj") - public R> page(InspectionItemVO inspectionItem, Query query) { - IPage pagesVO = service.selectInspectionItemPage( - Condition.getPage(query), inspectionItem - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = InspectionItemWrapper.build().pageVO(pages); + return R.data(pagesVO); + } + + + /** + * [检验项目] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入InspectionItem Obj") + public R> page(InspectionItemVO inspectionItem, Query query) { + IPage pagesVO = service.selectInspectionItemPage( + Condition.getPage(query), inspectionItem + ); + return R.data(pagesVO); + } + + /** * [检验项目] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = InspectionItemWrapper.build().listVO(list); - return R.data(listVO); + List list = service.list(); + List listVO = InspectionItemWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [检验项目] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入InspectionItem Obj") + public R save(@Valid @RequestBody InspectionItem addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); } - /** - * [检验项目] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入InspectionItem Obj") - public R save(@Valid @RequestBody InspectionItem addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + /** * [检验项目] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入InspectionItem List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [检验项目] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入InspectionItem Obj") - public R update(@Valid @RequestBody InspectionItem updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入InspectionItem List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [检验项目] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入InspectionItem Obj") + public R update(@Valid @RequestBody InspectionItem updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [检验项目] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入InspectionItem List") + @Operation(summary = "修改批量", description = "传入InspectionItem List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [检验项目] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入InspectionItem Obj") - public R submit(@Valid @RequestBody InspectionItem mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } - - /** + /** + * [检验项目] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入InspectionItem Obj") + public R submit(@Valid @RequestBody InspectionItem mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** * [检验项目] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入InspectionItem List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [检验项目] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [检验项目] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入InspectionItem") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map inspectionItem, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(inspectionItem, InspectionItem.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(InspectionItem::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(InspectionItemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportInspectionItem(qw); - ExcelUtil.export(response, "[检验项目]数据" + DateUtil.time(), - "[检验项目]数据表", list, InspectionItemExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入InspectionItem List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [检验项目] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [检验项目] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入InspectionItem") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map inspectionItem, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(inspectionItem, InspectionItem.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(InspectionItem::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(InspectionItemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportInspectionItem(qw); + ExcelUtil.export(response, "[检验项目]数据" + DateUtil.time(), + "[检验项目]数据表", list, InspectionItemExcel.class); + } + + /** * [检验项目] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [检验项目] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, InspectionItem.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [检验项目] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, InspectionItem.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index 0a5085a4..fe866737 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -27,7 +27,7 @@ import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; -import org.springblade.desk.quality.pojo.vo.InspectionTaskVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import org.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.desk.quality.service.InspectionTaskService2; import org.springblade.desk.quality.wrapper.InspectionTaskWrapper; @@ -38,6 +38,7 @@ import java.util.Map; /** * [检验任务] 控制器 + * mes v1: rb_pr_work_check * * @author Tom Shuo * @since 2025-11-14 @@ -60,7 +61,7 @@ public class InspectionTaskController extends BladeController { @GetMapping("/detail") @ApiOperationSupport(order = 1) @Operation(summary = "详情", description = "传入inspectionTask") - public R detail(InspectionTask inspectionTask) { + public R detail(InspectionTask inspectionTask) { InspectionTask detail = inspectionTaskGenService.getOne(Condition.getQueryWrapper(inspectionTask)); return R.data(InspectionTaskWrapper.build().entityVO(detail)); } @@ -71,7 +72,7 @@ public class InspectionTaskController extends BladeController { @GetMapping("/list") @ApiOperationSupport(order = 2) @Operation(summary = "分页", description = "传入inspectionTask") - public R> list(@Parameter(hidden = true) @RequestParam Map inspectionTask, Query query) { + public R> list(@Parameter(hidden = true) @RequestParam Map inspectionTask, Query query) { IPage pages = inspectionTaskGenService.page(Condition.getPage(query), Condition.getQueryWrapper(inspectionTask, InspectionTask.class)); return R.data(InspectionTaskWrapper.build().pageVO(pages)); } @@ -83,8 +84,8 @@ public class InspectionTaskController extends BladeController { @GetMapping("/page") @ApiOperationSupport(order = 3) @Operation(summary = "分页", description = "传入inspectionTask") - public R> page(InspectionTaskVO inspectionTask, Query query) { - IPage pages = inspectionTaskGenService.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); + public R> page(InspectionTaskDetailVO inspectionTask, Query query) { + IPage pages = inspectionTaskGenService.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); return R.data(pages); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java index a974f41d..2e5b06d8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java @@ -48,7 +48,7 @@ import java.util.stream.Collectors; /** * [检验模板] 控制器 - * + * mes v1: ds_trialItem_model DsTrialitemModel 试验项目 * @author Tom Shuo * @since 2025-12-19 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewDutyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewDutyController.java new file mode 100644 index 00000000..4a01a98e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewDutyController.java @@ -0,0 +1,237 @@ +/** + * 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.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.excel.ReviewDutyExcel; +import org.springblade.desk.quality.pojo.entity.ReviewDuty; +import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; +import org.springblade.desk.quality.service.IReviewDutyService; +import org.springblade.desk.quality.wrapper.ReviewDutyWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [生产处置单-责任零件] 控制器 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@RestController +@RequestMapping("/ReviewDuty") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[生产处置单-责任零件]", description = "[生产处置单-责任零件]接口") +public class ReviewDutyController extends BladeController { + + @Resource + private IReviewDutyService service; + + /** + * [生产处置单-责任零件] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入ReviewDuty Obj") + public R detail(ReviewDuty reviewDuty) { + QueryWrapper qw = Condition.getQueryWrapper(reviewDuty); + ReviewDuty detail = service.getOne(qw); + ReviewDutyVO detailVO = ReviewDutyWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [生产处置单-责任零件] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入ReviewDuty Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map reviewDuty, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(reviewDuty, ReviewDuty.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ReviewDutyWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [生产处置单-责任零件] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入ReviewDuty Obj") + public R> page(ReviewDutyVO reviewDuty, Query query) { + IPage pagesVO = service.selectReviewDutyPage( + Condition.getPage(query), reviewDuty + ); + return R.data(pagesVO); + } + + /** + * [生产处置单-责任零件] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = ReviewDutyWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [生产处置单-责任零件] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入ReviewDuty Obj") + public R save(@Valid @RequestBody ReviewDuty addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [生产处置单-责任零件] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入ReviewDuty List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [生产处置单-责任零件] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入ReviewDuty Obj") + public R update(@Valid @RequestBody ReviewDuty updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [生产处置单-责任零件] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入ReviewDuty List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [生产处置单-责任零件] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入ReviewDuty Obj") + public R submit(@Valid @RequestBody ReviewDuty mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [生产处置单-责任零件] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入ReviewDuty List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [生产处置单-责任零件] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [生产处置单-责任零件] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入ReviewDuty") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map reviewDuty, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(reviewDuty, ReviewDuty.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(ReviewDuty::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ReviewDutyEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportReviewDuty(qw); + ExcelUtil.export(response, "[生产处置单-责任零件]数据" + DateUtil.time(), + "[生产处置单-责任零件]数据表", list, ReviewDutyExcel.class); + } + + /** + * [生产处置单-责任零件] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [生产处置单-责任零件] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, ReviewDuty.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewFaultController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewFaultController.java new file mode 100644 index 00000000..582675bf --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewFaultController.java @@ -0,0 +1,237 @@ +/** + * 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.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.excel.ReviewFaultExcel; +import org.springblade.desk.quality.pojo.entity.ReviewFault; +import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; +import org.springblade.desk.quality.service.IReviewFaultService; +import org.springblade.desk.quality.wrapper.ReviewFaultWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [生产处置单-问题故障] 控制器 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@RestController +@RequestMapping("/ReviewFault") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[生产处置单-问题故障]", description = "[生产处置单-问题故障]接口") +public class ReviewFaultController extends BladeController { + + @Resource + private IReviewFaultService service; + + /** + * [生产处置单-问题故障] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入ReviewFault Obj") + public R detail(ReviewFault reviewFault) { + QueryWrapper qw = Condition.getQueryWrapper(reviewFault); + ReviewFault detail = service.getOne(qw); + ReviewFaultVO detailVO = ReviewFaultWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [生产处置单-问题故障] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入ReviewFault Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map reviewFault, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(reviewFault, ReviewFault.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ReviewFaultWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [生产处置单-问题故障] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入ReviewFault Obj") + public R> page(ReviewFaultVO reviewFault, Query query) { + IPage pagesVO = service.selectReviewFaultPage( + Condition.getPage(query), reviewFault + ); + return R.data(pagesVO); + } + + /** + * [生产处置单-问题故障] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = ReviewFaultWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [生产处置单-问题故障] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入ReviewFault Obj") + public R save(@Valid @RequestBody ReviewFault addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [生产处置单-问题故障] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入ReviewFault List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [生产处置单-问题故障] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入ReviewFault Obj") + public R update(@Valid @RequestBody ReviewFault updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [生产处置单-问题故障] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入ReviewFault List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [生产处置单-问题故障] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入ReviewFault Obj") + public R submit(@Valid @RequestBody ReviewFault mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [生产处置单-问题故障] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入ReviewFault List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [生产处置单-问题故障] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [生产处置单-问题故障] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入ReviewFault") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map reviewFault, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(reviewFault, ReviewFault.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(ReviewFault::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ReviewFaultEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportReviewFault(qw); + ExcelUtil.export(response, "[生产处置单-问题故障]数据" + DateUtil.time(), + "[生产处置单-问题故障]数据表", list, ReviewFaultExcel.class); + } + + /** + * [生产处置单-问题故障] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [生产处置单-问题故障] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, ReviewFault.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java similarity index 54% rename from blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java index 8fc3b0f7..c4af8c40 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/controller/PlatingController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java @@ -1,87 +1,86 @@ /** * Author: Tom Shuo */ -package org.springblade.desk.basic.controller; +package org.springblade.desk.quality.controller; -import io.swagger.v3.oas.annotations.tags.Tag; +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 com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.Valid; - -import lombok.Data; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.secure.BladeUser; -import org.springblade.core.secure.annotation.IsAdmin; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.excel.ReviewSheetExcel; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; +import org.springblade.desk.quality.service.IReviewSheetService; +import org.springblade.desk.quality.wrapper.ReviewSheetWrapper; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.desk.basic.util.ExcelExtUtil; -import org.springblade.desk.basic.pojo.entity.Plating; -import org.springblade.desk.basic.pojo.vo.PlatingVO; -import org.springblade.desk.basic.excel.PlatingExcel; -import org.springblade.desk.basic.wrapper.PlatingWrapper; -import org.springblade.desk.basic.service.IPlatingService; -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; +import java.util.Map; +import java.util.stream.Collectors; /** - * [镀种] 控制器 + * [生产处置单] 控制器 * * @author Tom Shuo - * @since 2026-01-05 + * @since 2026-01-06 */ @RestController -@RequestMapping("/Plating") +@RequestMapping("/ReviewSheet") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -@Tag(name = "[镀种]", description = "[镀种]接口") -public class PlatingController extends BladeController { +@Tag(name = "[生产处置单]", description = "[生产处置单]接口") +public class ReviewSheetController extends BladeController { @Resource - private IPlatingService service; + private IReviewSheetService service; /** - * [镀种] 详情 + * [生产处置单] 详情 */ @GetMapping("/detail") @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入Plating Obj") - public R detail(Plating plating) { - QueryWrapper qw = Condition.getQueryWrapper(plating); - Plating detail = service.getOne(qw); - PlatingVO detailVO = PlatingWrapper.build().entityVO(detail); + @Operation(summary = "详情", description = "传入ReviewSheet Obj") + public R detail(ReviewSheet reviewSheet) { + QueryWrapper qw = Condition.getQueryWrapper(reviewSheet); + ReviewSheet detail = service.getOne(qw); + ReviewSheetVO detailVO = ReviewSheetWrapper.build().entityVO(detail); service.setVOValue(detailVO); return R.data(detailVO); } /** - * [镀种] list分页 + * [生产处置单] list分页 */ @GetMapping("/list") @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入Plating Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map plating, + @Operation(summary = "list分页", description = "传入ReviewSheet Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map reviewSheet, Query query) { - QueryWrapper qw = Condition.getQueryWrapper(plating, Plating.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = PlatingWrapper.build().pageVO(pages); + QueryWrapper qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); pagesVO.getRecords() .stream() .peek(service::setVOValue) @@ -91,48 +90,48 @@ public class PlatingController extends BladeController { /** - * [镀种] page分页 + * [生产处置单] page分页 */ @GetMapping("/page") @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入Plating Obj") - public R> page(PlatingVO plating, Query query) { - IPage pagesVO = service.selectPlatingPage( - Condition.getPage(query), plating + @Operation(summary = "page分页", description = "传入ReviewSheet Obj") + public R> page(ReviewSheetVO reviewSheet, Query query) { + IPage pagesVO = service.selectReviewSheetPage( + Condition.getPage(query), reviewSheet ); return R.data(pagesVO); } /** - * [镀种] list下拉选择 + * [生产处置单] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) @Operation(summary = "list下拉选择", description = "") - public R> listForSelect() { - List list = service.list(); - List listVO = PlatingWrapper.build().listVO(list); + public R> listForSelect() { + List list = service.list(); + List listVO = ReviewSheetWrapper.build().listVO(list); return R.data(listVO); } /** - * [镀种] 新增一条 + * [生产处置单] 新增一条 */ @PostMapping("/save") @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入Plating Obj") - public R save(@Valid @RequestBody Plating addOne) { + @Operation(summary = "新增一条", description = "传入ReviewSheet Obj") + public R save(@Valid @RequestBody ReviewSheet addOne) { addOne.setId(null); return R.status(service.save(addOne)); } /** - * [镀种] 新增批量 + * [生产处置单] 新增批量 */ @PostMapping("/saveBat") @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入Plating List") - public R saveBat(@Valid @RequestBody List addList) { + @Operation(summary = "新增批量", description = "传入ReviewSheet List") + public R saveBat(@Valid @RequestBody List addList) { addList.forEach(one -> { one.setId(null); }); @@ -140,47 +139,47 @@ public class PlatingController extends BladeController { } /** - * [镀种] 修改一条 + * [生产处置单] 修改一条 */ @PostMapping("/update") @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入Plating Obj") - public R update(@Valid @RequestBody Plating updateOne) { + @Operation(summary = "修改一条", description = "传入ReviewSheet Obj") + public R update(@Valid @RequestBody ReviewSheet updateOne) { return R.status(service.updateById(updateOne)); } /** - * [镀种] 修改批量 + * [生产处置单] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入Plating List") - public R updateBat(@Valid @RequestBody List updateList) { + @Operation(summary = "修改批量", description = "传入ReviewSheet List") + public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } /** - * [镀种] 新增或修改一条 + * [生产处置单] 新增或修改一条 */ @PostMapping("/submit") @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入Plating Obj") - public R submit(@Valid @RequestBody Plating mergeOne) { + @Operation(summary = "新增或修改一条", description = "传入ReviewSheet Obj") + public R submit(@Valid @RequestBody ReviewSheet mergeOne) { return R.status(service.saveOrUpdate(mergeOne)); } /** - * [镀种] 新增或修改批量 + * [生产处置单] 新增或修改批量 */ @PostMapping("/submitBat") @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入Plating List") - public R submitBat(@Valid @RequestBody List mergeList) { + @Operation(summary = "新增或修改批量", description = "传入ReviewSheet List") + public R submitBat(@Valid @RequestBody List mergeList) { return R.status(service.saveOrUpdateBatch(mergeList)); } /** - * [镀种] 逻辑删除 + * [生产处置单] 逻辑删除 */ @PostMapping("/remove") @ApiOperationSupport(order = 61) @@ -190,25 +189,25 @@ public class PlatingController extends BladeController { } /** - * [镀种] 导出Excel + * [生产处置单] 导出Excel */ @GetMapping("/exportExcel") @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入Plating") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map plating, + @Operation(summary = "导出Excel", description = "传入ReviewSheet") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map reviewSheet, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(plating, Plating.class); + QueryWrapper qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class); //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(Plating::getTenantId, bladeUser.getTenantId()); + // queryWrapper.lambda().eq(ReviewSheet::getTenantId, bladeUser.getTenantId()); //} - //queryWrapper.lambda().eq(PlatingEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportPlating(qw); - ExcelUtil.export(response, "[镀种]数据" + org.springblade.core.tool.utils.DateUtil.time(), - "[镀种]数据表", list, PlatingExcel.class); + //queryWrapper.lambda().eq(ReviewSheetEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportReviewSheet(qw); + ExcelUtil.export(response, "[生产处置单]数据" + DateUtil.time(), + "[生产处置单]数据表", list, ReviewSheetExcel.class); } /** - * [镀种] 下载Excel模板 + * [生产处置单] 下载Excel模板 */ @GetMapping("/downloadExcelTemplate") @ApiOperationSupport(order = 71) @@ -220,7 +219,7 @@ public class PlatingController extends BladeController { } /** - * [镀种] 导入Excel + * [生产处置单] 导入Excel */ @PostMapping("/importExcel") @ApiOperationSupport(order = 72) @@ -230,8 +229,8 @@ public class PlatingController extends BladeController { if (checkR != null) { return checkR; } - List importList = ExcelUtil.read( - file, 0, 1, Plating.class + List importList = ExcelUtil.read( + file, 0, 1, ReviewSheet.class ); return R.status(service.saveBatch(importList)); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java index 84d73794..534fa5df 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/StandardController.java @@ -40,6 +40,9 @@ import java.util.stream.Collectors; /** * [质量标准] 控制器 + * mes v1: 新加 + * + * SELECT * FROM "RB_BS_ADDITIONAL_MESS" WHERE TYPE = 3 ORDER BY ONE_DATA ASC * * @author Tom Shuo * @since 2025-12-15 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemController.java new file mode 100644 index 00000000..851db1d0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemController.java @@ -0,0 +1,237 @@ +/** + * 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.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.excel.WorkPlanItemExcel; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; +import org.springblade.desk.quality.service.IWorkPlanItemService; +import org.springblade.desk.quality.wrapper.WorkPlanItemWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [工序检验项] 控制器 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@RestController +@RequestMapping("/WorkPlanItem") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[工序检验项]", description = "[工序检验项]接口") +public class WorkPlanItemController extends BladeController { + + @Resource + private IWorkPlanItemService service; + + /** + * [工序检验项] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入WorkPlanItem Obj") + public R detail(WorkPlanItem workPlanItem) { + QueryWrapper qw = Condition.getQueryWrapper(workPlanItem); + WorkPlanItem detail = service.getOne(qw); + WorkPlanItemVO detailVO = WorkPlanItemWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [工序检验项] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入WorkPlanItem Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map workPlanItem, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(workPlanItem, WorkPlanItem.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = WorkPlanItemWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [工序检验项] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入WorkPlanItem Obj") + public R> page(WorkPlanItemVO workPlanItem, Query query) { + IPage pagesVO = service.selectWorkPlanItemPage( + Condition.getPage(query), workPlanItem + ); + return R.data(pagesVO); + } + + /** + * [工序检验项] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = WorkPlanItemWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [工序检验项] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入WorkPlanItem Obj") + public R save(@Valid @RequestBody WorkPlanItem addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [工序检验项] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入WorkPlanItem List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [工序检验项] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入WorkPlanItem Obj") + public R update(@Valid @RequestBody WorkPlanItem updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [工序检验项] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入WorkPlanItem List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [工序检验项] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入WorkPlanItem Obj") + public R submit(@Valid @RequestBody WorkPlanItem mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [工序检验项] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入WorkPlanItem List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [工序检验项] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [工序检验项] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入WorkPlanItem") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map workPlanItem, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(workPlanItem, WorkPlanItem.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(WorkPlanItem::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(WorkPlanItemEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportWorkPlanItem(qw); + ExcelUtil.export(response, "[工序检验项]数据" + DateUtil.time(), + "[工序检验项]数据表", list, WorkPlanItemExcel.class); + } + + /** + * [工序检验项] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [工序检验项] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, WorkPlanItem.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemDetailController.java new file mode 100644 index 00000000..c9123893 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemDetailController.java @@ -0,0 +1,237 @@ +/** + * 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.annotation.Resource; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +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.tool.api.R; +import org.springblade.core.tool.utils.DateUtil; +import org.springblade.core.tool.utils.Func; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.excel.WorkPlanItemDetailExcel; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; +import org.springblade.desk.quality.service.IWorkPlanItemDetailService; +import org.springblade.desk.quality.wrapper.WorkPlanItemDetailWrapper; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * [工序检验项明细] 控制器 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@RestController +@RequestMapping("/WorkPlanItemDetail") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[工序检验项明细]", description = "[工序检验项明细]接口") +public class WorkPlanItemDetailController extends BladeController { + + @Resource + private IWorkPlanItemDetailService service; + + /** + * [工序检验项明细] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入WorkPlanItemDetail Obj") + public R detail(WorkPlanItemDetail workPlanItemDetail) { + QueryWrapper qw = Condition.getQueryWrapper(workPlanItemDetail); + WorkPlanItemDetail detail = service.getOne(qw); + WorkPlanItemDetailVO detailVO = WorkPlanItemDetailWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [工序检验项明细] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入WorkPlanItemDetail Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map workPlanItemDetail, + Query query) { + QueryWrapper qw = Condition.getQueryWrapper(workPlanItemDetail, WorkPlanItemDetail.class); + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = WorkPlanItemDetailWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [工序检验项明细] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入WorkPlanItemDetail Obj") + public R> page(WorkPlanItemDetailVO workPlanItemDetail, Query query) { + IPage pagesVO = service.selectWorkPlanItemDetailPage( + Condition.getPage(query), workPlanItemDetail + ); + return R.data(pagesVO); + } + + /** + * [工序检验项明细] list下拉选择 + */ + @GetMapping("/listForSelect") + @ApiOperationSupport(order = 22) + @Operation(summary = "list下拉选择", description = "") + public R> listForSelect() { + List list = service.list(); + List listVO = WorkPlanItemDetailWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [工序检验项明细] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入WorkPlanItemDetail Obj") + public R save(@Valid @RequestBody WorkPlanItemDetail addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** + * [工序检验项明细] 新增批量 + */ + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入WorkPlanItemDetail List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [工序检验项明细] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入WorkPlanItemDetail Obj") + public R update(@Valid @RequestBody WorkPlanItemDetail updateOne) { + return R.status(service.updateById(updateOne)); + } + + /** + * [工序检验项明细] 修改批量 + */ + @PostMapping("/updateBat") + @ApiOperationSupport(order = 41) + @Operation(summary = "修改批量", description = "传入WorkPlanItemDetail List") + public R updateBat(@Valid @RequestBody List updateList) { + return R.status(service.updateBatchById(updateList)); + } + + /** + * [工序检验项明细] 新增或修改一条 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入WorkPlanItemDetail Obj") + public R submit(@Valid @RequestBody WorkPlanItemDetail mergeOne) { + return R.status(service.saveOrUpdate(mergeOne)); + } + + /** + * [工序检验项明细] 新增或修改批量 + */ + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入WorkPlanItemDetail List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [工序检验项明细] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [工序检验项明细] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入WorkPlanItemDetail") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map workPlanItemDetail, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(workPlanItemDetail, WorkPlanItemDetail.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(WorkPlanItemDetail::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(WorkPlanItemDetailEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportWorkPlanItemDetail(qw); + ExcelUtil.export(response, "[工序检验项明细]数据" + DateUtil.time(), + "[工序检验项明细]数据表", list, WorkPlanItemDetailExcel.class); + } + + /** + * [工序检验项明细] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [工序检验项明细] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, WorkPlanItemDetail.class + ); + return R.status(service.saveBatch(importList)); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewDutyExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewDutyExcel.java new file mode 100644 index 00000000..8019de11 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewDutyExcel.java @@ -0,0 +1,81 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel; + + +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 2026-01-06 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class ReviewDutyExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [生产处置单]id + */ + @ColumnWidth(20) + @ExcelProperty("[生产处置单]id") + private BigDecimal reviewSheetId; + /** + * 责任零件 + */ + @ColumnWidth(20) + @ExcelProperty("责任零件") + private String dutyPart; + /** + * 责任批号 + */ + @ColumnWidth(20) + @ExcelProperty("责任批号") + private String dutyBatch; + /** + * 相关零件 + */ + @ColumnWidth(20) + @ExcelProperty("相关零件") + private String relevantPart; + /** + * 相关批号 + */ + @ColumnWidth(20) + @ExcelProperty("相关批号") + private String relevantBatch; + /** + * 数量 + */ + @ColumnWidth(20) + @ExcelProperty("数量") + private Short qty; + /** + * 单位 + */ + @ColumnWidth(20) + @ExcelProperty("单位") + private String unit; + /** + * 描述 + */ + @ColumnWidth(20) + @ExcelProperty("描述") + private String memo; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewFaultExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewFaultExcel.java new file mode 100644 index 00000000..d3e765fb --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewFaultExcel.java @@ -0,0 +1,75 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel; + + +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 2026-01-06 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class ReviewFaultExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [生产处置单]id + */ + @ColumnWidth(20) + @ExcelProperty("[生产处置单]id") + private BigDecimal reviewSheetId; + /** + * 故障类别[缺陷]id + */ + @ColumnWidth(20) + @ExcelProperty("故障类别[缺陷]id") + private BigDecimal ngType2Id; + /** + * 问题大类[缺陷]id + */ + @ColumnWidth(20) + @ExcelProperty("问题大类[缺陷]id") + private BigDecimal ngType3Id; + /** + * 问题小类[缺陷]id + */ + @ColumnWidth(20) + @ExcelProperty("问题小类[缺陷]id") + private BigDecimal ngType4Id; + /** + * 比例 + */ + @ColumnWidth(20) + @ExcelProperty("比例") + private BigDecimal scale; + /** + * 数量 + */ + @ColumnWidth(20) + @ExcelProperty("数量") + private Long qty; + /** + * 描述 + */ + @ColumnWidth(20) + @ExcelProperty("描述") + private String memo; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewSheetExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewSheetExcel.java new file mode 100644 index 00000000..02a890f6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/ReviewSheetExcel.java @@ -0,0 +1,256 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel; + + +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 2026-01-06 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class ReviewSheetExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [生产处置单]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[生产处置单]编码") + private String reviewOrderCode; + /** + * [生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式; + */ + @ColumnWidth(20) + @ExcelProperty("[生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式;") + private Long reviewOrderMode; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String name; + /** + * [检验任务]id + */ + @ColumnWidth(20) + @ExcelProperty("[检验任务]id") + private BigDecimal taskId; + /** + * 打回[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("打回[用户]id") + private BigDecimal backUserId; + /** + * 审理[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("审理[用户]id") + private BigDecimal reviewUserId; + /** + * [部门]id + */ + @ColumnWidth(20) + @ExcelProperty("[部门]id") + private BigDecimal deptId; + /** + * 比例 + */ + @ColumnWidth(20) + @ExcelProperty("比例") + private BigDecimal scale; + /** + * 不合格数量 + */ + @ColumnWidth(20) + @ExcelProperty("不合格数量") + private Short unqualifiedQty; + /** + * 上级编号 + */ + @ColumnWidth(20) + @ExcelProperty("上级编号") + private String upCode; + /** + * 审理意见/审理结论 + */ + @ColumnWidth(20) + @ExcelProperty("审理意见/审理结论") + private String memo; + /** + * 打回原因 + */ + @ColumnWidth(20) + @ExcelProperty("打回原因") + private String backReason; + /** + * 打回时间 + */ + @ColumnWidth(20) + @ExcelProperty("打回时间") + private LocalDateTime backDate; + /** + * 新ERP返回审理单主键 + */ + @ColumnWidth(20) + @ExcelProperty("新ERP返回审理单主键") + private String erpId; + /** + * 审理时间 + */ + @ColumnWidth(20) + @ExcelProperty("审理时间") + private LocalDateTime reviewDate; + /** + * 排序 + */ + @ColumnWidth(20) + @ExcelProperty("排序") + private Long sort; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String remark; + /** + * 是否批次性问题-[1]:是;[0]否; + */ + @ColumnWidth(20) + @ExcelProperty("是否批次性问题-[1]:是;[0]否;") + private Long isBatProblem; + /** + * 是否经典问题-[1]:是;[0]否; + */ + @ColumnWidth(20) + @ExcelProperty("是否经典问题-[1]:是;[0]否;") + private Long isClassicProblem; + /** + * 是否低级错误-[1]:是;[0]否; + */ + @ColumnWidth(20) + @ExcelProperty("是否低级错误-[1]:是;[0]否;") + private Long isLowError; + /** + * 是否质量问题-[1]:是;[0]否; + */ + @ColumnWidth(20) + @ExcelProperty("是否质量问题-[1]:是;[0]否;") + private Long isQualityProblem; + /** + * 审理单号 + */ + @ColumnWidth(20) + @ExcelProperty("审理单号") + private String rsCode; + /** + * 审理状态 + */ + @ColumnWidth(20) + @ExcelProperty("审理状态") + private Long reviewStatus; + /** + * 业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废; + */ + @ColumnWidth(20) + @ExcelProperty("业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废;") + private Short bizType; + /** + * 物料号 + */ + @ColumnWidth(20) + @ExcelProperty("物料号") + private String partCode; + /** + * 批次号 + */ + @ColumnWidth(20) + @ExcelProperty("批次号") + private String batchNo; + /** + * [外协厂家]id + */ + @ColumnWidth(20) + @ExcelProperty("[外协厂家]id") + private BigDecimal oemId; + /** + * 生产标识 + */ + @ColumnWidth(20) + @ExcelProperty("生产标识") + private String prodIdent; + /** + * 故障类别 + */ + @ColumnWidth(20) + @ExcelProperty("故障类别") + private String faultType; + /** + * [车间订单]id + */ + @ColumnWidth(20) + @ExcelProperty("[车间订单]id") + private BigDecimal woId; + /** + * [车间订单]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[车间订单]编码") + private String woCode; + /** + * [车间作业计划]id + */ + @ColumnWidth(20) + @ExcelProperty("[车间作业计划]id") + private BigDecimal wpId; + /** + * 总数量 + */ + @ColumnWidth(20) + @ExcelProperty("总数量") + private Short num; + /** + * 返修数量 + */ + @ColumnWidth(20) + @ExcelProperty("返修数量") + private Short reDoNum; + /** + * 返修原因 + */ + @ColumnWidth(20) + @ExcelProperty("返修原因") + private String reDoReason; + /** + * 返修建议 + */ + @ColumnWidth(20) + @ExcelProperty("返修建议") + private String reDoSuggest; + /** + * 返修路线 + */ + @ColumnWidth(20) + @ExcelProperty("返修路线") + private String reDoPath; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemDetailExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemDetailExcel.java new file mode 100644 index 00000000..0f4bcad6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemDetailExcel.java @@ -0,0 +1,111 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel; + + +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 2026-01-06 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class WorkPlanItemDetailExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [工序检验项]id + */ + @ColumnWidth(20) + @ExcelProperty("[工序检验项]id") + private BigDecimal workPlanItemId; + /** + * 测量类型-[1]镀前;[2]:镀后; + */ + @ColumnWidth(20) + @ExcelProperty("测量类型-[1]镀前;[2]:镀后;") + private String testType; + /** + * 尺寸 + */ + @ColumnWidth(20) + @ExcelProperty("尺寸") + private String ruleSize; + /** + * 量具 + */ + @ColumnWidth(20) + @ExcelProperty("量具") + private String tools; + /** + * 测量值1 + */ + @ColumnWidth(20) + @ExcelProperty("测量值1") + private String gaugeValue1; + /** + * 测量值2 + */ + @ColumnWidth(20) + @ExcelProperty("测量值2") + private String gaugeValue2; + /** + * 测量值3 + */ + @ColumnWidth(20) + @ExcelProperty("测量值3") + private String gaugeValue3; + /** + * 测量值4 + */ + @ColumnWidth(20) + @ExcelProperty("测量值4") + private String gaugeValue4; + /** + * 测量值5 + */ + @ColumnWidth(20) + @ExcelProperty("测量值5") + private String gaugeValue5; + /** + * 测量值6 + */ + @ColumnWidth(20) + @ExcelProperty("测量值6") + private String gaugeValue6; + /** + * 测量值7 + */ + @ColumnWidth(20) + @ExcelProperty("测量值7") + private String gaugeValue7; + /** + * 测量值8 + */ + @ColumnWidth(20) + @ExcelProperty("测量值8") + private String gaugeValue8; + /** + * [量具]id + */ + @ColumnWidth(20) + @ExcelProperty("[量具]id") + private BigDecimal mtId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemExcel.java new file mode 100644 index 00000000..33d02b43 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/excel/WorkPlanItemExcel.java @@ -0,0 +1,136 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.excel; + + +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 2026-01-06 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class WorkPlanItemExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [作业计划]id + */ + @ColumnWidth(20) + @ExcelProperty("[作业计划]id") + private BigDecimal wpId; + /** + * 检验数 + */ + @ColumnWidth(20) + @ExcelProperty("检验数") + private Short checkQty; + /** + * 试验数量 + */ + @ColumnWidth(20) + @ExcelProperty("试验数量") + private Short testQty; + /** + * 消耗数量 + */ + @ColumnWidth(20) + @ExcelProperty("消耗数量") + private Short lossQty; + /** + * [检验项目]编码 + */ + @ColumnWidth(20) + @ExcelProperty("[检验项目]编码") + private String itemCode; + /** + * [检验项目]名称 + */ + @ColumnWidth(20) + @ExcelProperty("[检验项目]名称") + private String itemName; + /** + * [质量标准]名称 + */ + @ColumnWidth(20) + @ExcelProperty("[质量标准]名称") + private String standardName; + /** + * 检验员[用户]id + */ + @ColumnWidth(20) + @ExcelProperty("检验员[用户]id") + private BigDecimal checkUserId; + /** + * 检验值 + */ + @ColumnWidth(20) + @ExcelProperty("检验值") + private String checkValue; + /** + * 检验日期 + */ + @ColumnWidth(20) + @ExcelProperty("检验日期") + private LocalDateTime checkDate; + /** + * 检验结果-[1]:合格;[2]:不合格;[-1]:NA + */ + @ColumnWidth(20) + @ExcelProperty("检验结果-[1]:合格;[2]:不合格;[-1]:NA") + private Short checkResult; + /** + * 工时定额 + */ + @ColumnWidth(20) + @ExcelProperty("工时定额") + private Short hourQuota; + /** + * 准备工时 + */ + @ColumnWidth(20) + @ExcelProperty("准备工时") + private Short hourPrepare; + /** + * [检验任务]id + */ + @ColumnWidth(20) + @ExcelProperty("[检验任务]id") + private BigDecimal taskId; + /** + * [检验项目]id + */ + @ColumnWidth(20) + @ExcelProperty("[检验项目]id") + private BigDecimal itemId; + /** + * [质量标准]id + */ + @ColumnWidth(20) + @ExcelProperty("[质量标准]id") + private BigDecimal standardId; + /** + * [检验模板]id + */ + @ColumnWidth(20) + @ExcelProperty("[检验模板]id") + private BigDecimal templateId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java index 23042bb5..7b12f30f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; -import org.springblade.desk.quality.pojo.vo.InspectionTaskVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import java.util.List; @@ -28,7 +28,7 @@ public interface InspectionTaskMapper extends BaseMapper { * @param inspectionTask 查询参数 * @return List */ - List selectInspectionTaskPage(IPage page, InspectionTaskVO inspectionTask); + List selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask); /** * 获取导出数据 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml index af60ba5f..54405acb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -34,13 +36,18 @@ + - + SELECT * + FROM QA_INSPECTION_TASK ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.java new file mode 100644 index 00000000..0a3c5a2c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper; + +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.ReviewDutyExcel; +import org.springblade.desk.quality.pojo.entity.ReviewDuty; +import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; + +import java.util.List; + +/** + * [生产处置单-责任零件] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface ReviewDutyMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewDuty 查询参数 + * @return List + */ + List selectReviewDutyPage(IPage page, ReviewDutyVO reviewDuty); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewDuty(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml new file mode 100644 index 00000000..6af5e14f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.java new file mode 100644 index 00000000..246a778d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper; + +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.ReviewFaultExcel; +import org.springblade.desk.quality.pojo.entity.ReviewFault; +import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; + +import java.util.List; + +/** + * [生产处置单-问题故障] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface ReviewFaultMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewFault 查询参数 + * @return List + */ + List selectReviewFaultPage(IPage page, ReviewFaultVO reviewFault); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewFault(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml new file mode 100644 index 00000000..852c6f50 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java new file mode 100644 index 00000000..6681b62c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper; + +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.ReviewSheetExcel; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; + +import java.util.List; + +/** + * [生产处置单] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface ReviewSheetMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewSheet 查询参数 + * @return List + */ + List selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewSheet(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml new file mode 100644 index 00000000..bf15a0bc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.java new file mode 100644 index 00000000..c9337cff --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper; + +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.WorkPlanItemDetailExcel; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; + +import java.util.List; + +/** + * [工序检验项明细] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface WorkPlanItemDetailMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workPlanItemDetail 查询参数 + * @return List + */ + List selectWorkPlanItemDetailPage(IPage page, WorkPlanItemDetailVO workPlanItemDetail); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkPlanItemDetail(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.xml new file mode 100644 index 00000000..36f7cb91 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemDetailMapper.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.java new file mode 100644 index 00000000..bf6632f5 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.java @@ -0,0 +1,40 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.mapper; + +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.WorkPlanItemExcel; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; + +import java.util.List; + +/** + * [工序检验项] Mapper 接口 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface WorkPlanItemMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workPlanItem 查询参数 + * @return List + */ + List selectWorkPlanItemPage(IPage page, WorkPlanItemVO workPlanItem); + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkPlanItem(@Param("ew") Wrapper queryWrapper); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml new file mode 100644 index 00000000..8abe8903 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java new file mode 100644 index 00000000..07966acf --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewDuty; + +import java.io.Serial; + +/** + * [生产处置单-责任零件] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ReviewDutyDTO extends ReviewDuty { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java new file mode 100644 index 00000000..c321096d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewFault; + +import java.io.Serial; + +/** + * [生产处置单-问题故障] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ReviewFaultDTO extends ReviewFault { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java new file mode 100644 index 00000000..8524efe0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; + +import java.io.Serial; + +/** + * [生产处置单] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ReviewSheetDTO extends ReviewSheet { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java new file mode 100644 index 00000000..f2968c99 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; + +import java.io.Serial; + +/** + * [工序检验项] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkPlanItemDTO extends WorkPlanItem { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java new file mode 100644 index 00000000..00003c72 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; + +import java.io.Serial; + +/** + * [工序检验项明细] 数据传输对象实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkPlanItemDetailDTO extends WorkPlanItemDetail { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java index 0c82e351..a1dd0d2a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; /** * [检验项目] 实体类 - * + * mes v1 : bs_text_project BsTextProject 试验项目 * @author Tom Shuo * @since 2025-12-16 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java index c2831fe9..6961090a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java @@ -10,7 +10,6 @@ import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; import java.io.Serial; -import java.math.BigDecimal; import java.time.LocalDateTime; /** @@ -25,278 +24,287 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) public class InspectionTask extends BaseEntity { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; - /** - * [检验任务]编码 - */ + /** + * [检验任务]编码 + */ public static final String COL_CODE = "CODE"; - /** - * [检验任务]类型 - */ + /** + * [检验任务]类型 + */ public static final String COL_INSPECTION_TASK_TYPE = "INSPECTION_TASK_TYPE"; - /** - * [检验任务] - */ + /** + * [检验任务] + */ public static final String COL_NAME = "NAME"; - /** - * [工单]id - */ + /** + * [工单]id + */ public static final String COL_WORK_ORDER_ID = "WORK_ORDER_ID"; - /** - * [制品]id - */ + /** + * [制品]id + */ public static final String COL_PRODUCT_ID = "PRODUCT_ID"; - /** - * [工序]id - */ + /** + * [工序]id + */ public static final String COL_PROCESS_ID = "PROCESS_ID"; - /** - * 质检员[用户]id - */ + /** + * 质检员[用户]id + */ public static final String COL_CHECK_USER_ID = "CHECK_USER_ID"; - /** - * [制品]编码 - */ + /** + * [制品]编码 + */ public static final String COL_PRODUCT_CODE = "PRODUCT_CODE"; - /** - * [制品]序列号 - */ + /** + * [制品]序列号 + */ public static final String COL_PRODUCT_SN = "PRODUCT_SN"; - /** - * 生产批次号 - */ + /** + * 生产批次号 + */ public static final String COL_BATCH_NUMBER = "BATCH_NUMBER"; - /** - * [工单]编码 - */ + /** + * [工单]编码 + */ public static final String COL_WORK_ORDER_CODE = "WORK_ORDER_CODE"; - /** - * [工序]编码 - */ + /** + * [工序]编码 + */ public static final String COL_PROCESS_CODE = "PROCESS_CODE"; - /** - * 备注 - */ + /** + * 备注 + */ public static final String COL_REMARK = "REMARK"; - /** - * 计划开始时间 - */ + /** + * 计划开始时间 + */ public static final String COL_PLANNED_START_DATE = "PLANNED_START_DATE"; - /** - * 计划结束时间 - */ + /** + * 计划结束时间 + */ public static final String COL_PLANNED_END_DATE = "PLANNED_END_DATE"; - /** - * 实际开始时间 - */ + /** + * 实际开始时间 + */ public static final String COL_ACTUAL_START_DATE = "ACTUAL_START_DATE"; - /** - * 实际结束时间 - */ + /** + * 实际结束时间 + */ public static final String COL_ACTUAL_END_DATE = "ACTUAL_END_DATE"; - /** - * 检验样本数量 - */ + /** + * 检验样本数量 + */ public static final String COL_SIMPLE_COUNT = "SIMPLE_COUNT"; - /** - * 检验结果-[1]:合格;[2]:不合格;[3]:NA - */ + /** + * 检验结果-[1]:合格;[2]:不合格;[-1]:NA + */ public static final String COL_CHECK_RESULT = "CHECK_RESULT"; - /** - * 检验数量 - */ + /** + * 检验数量 + */ public static final String COL_CHECK_QTY = "CHECK_QTY"; - /** - * 消耗数量 - */ + /** + * 消耗数量 + */ public static final String COL_LOSS_QTY = "LOSS_QTY"; - /** - * 合格数量 - */ + /** + * 合格数量 + */ public static final String COL_QUALIFIED_QTY = "QUALIFIED_QTY"; - /** - * 报废数量 - */ + /** + * 报废数量 + */ public static final String COL_SCRAP_QTY = "SCRAP_QTY"; - /** - * 不合格数量 - */ + /** + * 不合格数量 + */ public static final String COL_UNQUALIFIED_QTY = "UNQUALIFIED_QTY"; - /** - * 不良原因 - */ + /** + * 不良原因 + */ public static final String COL_POOR_REASON = "POOR_REASON"; - /** - * 不良描述 - */ + /** + * 不良描述 + */ public static final String COL_POOR_MEMO = "POOR_MEMO"; - /** - * 检验日期 - */ + /** + * 检验日期 + */ public static final String COL_CHECK_DATE = "CHECK_DATE"; - /** - * 审理单状态 - */ + /** + * 审理单状态 + */ public static final String COL_REVIEW_STATUS = "REVIEW_STATUS"; - /** - * 检验备注 - */ + /** + * 检验备注 + */ public static final String COL_CHECK_MEMO = "CHECK_MEMO"; - /** - * 返工数 - */ + /** + * 返工数 + */ public static final String COL_REWORK_QTY = "REWORK_QTY"; + /** + * [作业计划]id + */ + public static final String COL_WP_ID = "WP_ID"; - /** - * [检验任务]编码 - */ - @Schema(description = "[检验任务]编码") - private String code; - /** - * [检验任务]类型 - */ - @Schema(description = "[检验任务]类型") - private Long inspectionTaskType; - /** - * [检验任务] - */ - @Schema(description = "[检验任务]") - private String name; - /** - * [工单]id - */ - @Schema(description = "[工单]id") - private BigDecimal workOrderId; - /** - * [制品]id - */ - @Schema(description = "[制品]id") - private BigDecimal productId; - /** - * [工序]id - */ - @Schema(description = "[工序]id") - private BigDecimal processId; - /** - * 质检员[用户]id - */ - @Schema(description = "质检员[用户]id") - private BigDecimal checkUserId; - /** - * [制品]编码 - */ - @Schema(description = "[制品]编码") - private Long productCode; - /** - * [制品]序列号 - */ - @Schema(description = "[制品]序列号") - private Long productSn; - /** - * 生产批次号 - */ - @Schema(description = "生产批次号") - private Long batchNumber; - /** - * [工单]编码 - */ - @Schema(description = "[工单]编码") - private String workOrderCode; - /** - * [工序]编码 - */ - @Schema(description = "[工序]编码") - private String processCode; - /** - * 备注 - */ - @Schema(description = "备注") - private String remark; - /** - * 计划开始时间 - */ - @Schema(description = "计划开始时间") - private LocalDateTime plannedStartDate; - /** - * 计划结束时间 - */ - @Schema(description = "计划结束时间") - private LocalDateTime plannedEndDate; - /** - * 实际开始时间 - */ - @Schema(description = "实际开始时间") - private LocalDateTime actualStartDate; - /** - * 实际结束时间 - */ - @Schema(description = "实际结束时间") - private LocalDateTime actualEndDate; - /** - * 检验样本数量 - */ - @Schema(description = "检验样本数量") - private BigDecimal simpleCount; - /** - * 检验结果-[1]:合格;[2]:不合格;[3]:NA - */ - @Schema(description = "检验结果-[1]:合格;[2]:不合格;[3]:NA") - private Short checkResult; - /** - * 检验数量 - */ - @Schema(description = "检验数量") - private Short checkQty; - /** - * 消耗数量 - */ - @Schema(description = "消耗数量") - private Short lossQty; - /** - * 合格数量 - */ - @Schema(description = "合格数量") - private Short qualifiedQty; - /** - * 报废数量 - */ - @Schema(description = "报废数量") - private Short scrapQty; - /** - * 不合格数量 - */ - @Schema(description = "不合格数量") - private Short unqualifiedQty; - /** - * 不良原因 - */ - @Schema(description = "不良原因") - private String poorReason; - /** - * 不良描述 - */ - @Schema(description = "不良描述") - private String poorMemo; - /** - * 检验日期 - */ - @Schema(description = "检验日期") - private LocalDateTime checkDate; - /** - * 审理单状态 - */ - @Schema(description = "审理单状态") - private Short reviewStatus; - /** - * 检验备注 - */ - @Schema(description = "检验备注") - private String checkMemo; - /** - * 返工数 - */ - @Schema(description = "返工数") - private Short reworkQty; + /** + * [检验任务]编码 + */ + @Schema(description = "[检验任务]编码") + private String code; + /** + * [检验任务]类型 + */ + @Schema(description = "[检验任务]类型") + private Long inspectionTaskType; + /** + * [检验任务] + */ + @Schema(description = "[检验任务]") + private String name; + /** + * [工单]id + */ + @Schema(description = "[工单]id") + private Long workOrderId; + /** + * [制品]id + */ + @Schema(description = "[制品]id") + private Long productId; + /** + * [工序]id + */ + @Schema(description = "[工序]id") + private Long processId; + /** + * 质检员[用户]id + */ + @Schema(description = "质检员[用户]id") + private Long checkUserId; + /** + * [制品]编码 + */ + @Schema(description = "[制品]编码") + private Long productCode; + /** + * [制品]序列号 + */ + @Schema(description = "[制品]序列号") + private Long productSn; + /** + * 生产批次号 + */ + @Schema(description = "生产批次号") + private Long batchNumber; + /** + * [工单]编码 + */ + @Schema(description = "[工单]编码") + private String workOrderCode; + /** + * [工序]编码 + */ + @Schema(description = "[工序]编码") + private String processCode; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 计划开始时间 + */ + @Schema(description = "计划开始时间") + private LocalDateTime plannedStartDate; + /** + * 计划结束时间 + */ + @Schema(description = "计划结束时间") + private LocalDateTime plannedEndDate; + /** + * 实际开始时间 + */ + @Schema(description = "实际开始时间") + private LocalDateTime actualStartDate; + /** + * 实际结束时间 + */ + @Schema(description = "实际结束时间") + private LocalDateTime actualEndDate; + /** + * 检验样本数量 + */ + @Schema(description = "检验样本数量") + private Long simpleCount; + /** + * 检验结果-[1]:合格;[2]:不合格;[3]:NA + */ + @Schema(description = "检验结果-[1]:合格;[2]:不合格;[-1]:NA") + private Integer checkResult; + /** + * 检验数量 + */ + @Schema(description = "检验数量") + private Short checkQty; + /** + * 消耗数量 + */ + @Schema(description = "消耗数量") + private Short lossQty; + /** + * 合格数量 + */ + @Schema(description = "合格数量") + private Short qualifiedQty; + /** + * 报废数量 + */ + @Schema(description = "报废数量") + private Short scrapQty; + /** + * 不合格数量 + */ + @Schema(description = "不合格数量") + private Short unqualifiedQty; + /** + * 不良原因 + */ + @Schema(description = "不良原因") + private String poorReason; + /** + * 不良描述 + */ + @Schema(description = "不良描述") + private String poorMemo; + /** + * 检验日期 + */ + @Schema(description = "检验日期") + private LocalDateTime checkDate; + /** + * 审理单状态 + */ + @Schema(description = "审理单状态") + private Short reviewStatus; + /** + * 检验备注 + */ + @Schema(description = "检验备注") + private String checkMemo; + /** + * 返工数 + */ + @Schema(description = "返工数") + private Long reworkQty; + /** + * [作业计划]id + */ + @Schema(description = "[作业计划]id") + private Long wpId; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java index 03526087..143df500 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; /** * [检验模板明细关联] 实体类 - * + * mes v1: * @author Tom Shuo * @since 2025-12-19 */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java new file mode 100644 index 00000000..aa8241c7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java @@ -0,0 +1,102 @@ +/** + * 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 2026-01-06 + */ +@Data +@TableName("QA_REVIEW_DUTY") +@Schema(description = "ReviewDuty Entity对象") +@EqualsAndHashCode(callSuper = true) +public class ReviewDuty extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [生产处置单]id + */ + public static final String COL_REVIEW_SHEET_ID = "REVIEW_SHEET_ID"; + /** + * 责任零件 + */ + public static final String COL_DUTY_PART = "DUTY_PART"; + /** + * 责任批号 + */ + public static final String COL_DUTY_BATCH = "DUTY_BATCH"; + /** + * 相关零件 + */ + public static final String COL_RELEVANT_PART = "RELEVANT_PART"; + /** + * 相关批号 + */ + public static final String COL_RELEVANT_BATCH = "RELEVANT_BATCH"; + /** + * 数量 + */ + public static final String COL_QTY = "QTY"; + /** + * 单位 + */ + public static final String COL_UNIT = "UNIT"; + /** + * 描述 + */ + public static final String COL_MEMO = "MEMO"; + + /** + * [生产处置单]id + */ + @Schema(description = "[生产处置单]id") + private Long reviewSheetId; + /** + * 责任零件 + */ + @Schema(description = "责任零件") + private String dutyPart; + /** + * 责任批号 + */ + @Schema(description = "责任批号") + private String dutyBatch; + /** + * 相关零件 + */ + @Schema(description = "相关零件") + private String relevantPart; + /** + * 相关批号 + */ + @Schema(description = "相关批号") + private String relevantBatch; + /** + * 数量 + */ + @Schema(description = "数量") + private Short qty; + /** + * 单位 + */ + @Schema(description = "单位") + private String unit; + /** + * 描述 + */ + @Schema(description = "描述") + private String memo; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java new file mode 100644 index 00000000..c993bc75 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java @@ -0,0 +1,94 @@ +/** + * 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 2026-01-06 + */ +@Data +@TableName("QA_REVIEW_FAULT") +@Schema(description = "ReviewFault Entity对象") +@EqualsAndHashCode(callSuper = true) +public class ReviewFault extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [生产处置单]id + */ + public static final String COL_REVIEW_SHEET_ID = "REVIEW_SHEET_ID"; + /** + * 故障类别[缺陷]id + */ + public static final String COL_NG_TYPE2_ID = "NG_TYPE2_ID"; + /** + * 问题大类[缺陷]id + */ + public static final String COL_NG_TYPE3_ID = "NG_TYPE3_ID"; + /** + * 问题小类[缺陷]id + */ + public static final String COL_NG_TYPE4_ID = "NG_TYPE4_ID"; + /** + * 比例 + */ + public static final String COL_SCALE = "SCALE"; + /** + * 数量 + */ + public static final String COL_QTY = "QTY"; + /** + * 描述 + */ + public static final String COL_MEMO = "MEMO"; + + /** + * [生产处置单]id + */ + @Schema(description = "[生产处置单]id") + private Long reviewSheetId; + /** + * 故障类别[缺陷]id + */ + @Schema(description = "故障类别[缺陷]id") + private Long ngType2Id; + /** + * 问题大类[缺陷]id + */ + @Schema(description = "问题大类[缺陷]id") + private Long ngType3Id; + /** + * 问题小类[缺陷]id + */ + @Schema(description = "问题小类[缺陷]id") + private Long ngType4Id; + /** + * 比例 + */ + @Schema(description = "比例") + private Double scale; + /** + * 数量 + */ + @Schema(description = "数量") + private Long qty; + /** + * 描述 + */ + @Schema(description = "描述") + private String memo; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java new file mode 100644 index 00000000..6a5cb806 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java @@ -0,0 +1,364 @@ +/** + * 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.time.LocalDateTime; + +/** + * [生产处置单] 实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@TableName("QA_REVIEW_SHEET") +@Schema(description = "ReviewSheet Entity对象") +@EqualsAndHashCode(callSuper = true) +public class ReviewSheet extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [生产处置单]编码 + */ + public static final String COL_REVIEW_ORDER_CODE = "REVIEW_ORDER_CODE"; + /** + * [生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式; + */ + public static final String COL_REVIEW_ORDER_MODE = "REVIEW_ORDER_MODE"; + /** + * 名称 + */ + public static final String COL_NAME = "NAME"; + /** + * [检验任务]id + */ + public static final String COL_TASK_ID = "TASK_ID"; + /** + * 打回[用户]id + */ + public static final String COL_BACK_USER_ID = "BACK_USER_ID"; + /** + * 审理[用户]id + */ + public static final String COL_REVIEW_USER_ID = "REVIEW_USER_ID"; + /** + * [部门]id + */ + public static final String COL_DEPT_ID = "DEPT_ID"; + /** + * 比例 + */ + public static final String COL_SCALE = "SCALE"; + /** + * 不合格数量 + */ + public static final String COL_UNQUALIFIED_QTY = "UNQUALIFIED_QTY"; + /** + * 上级编号 + */ + public static final String COL_UP_CODE = "UP_CODE"; + /** + * 审理意见/审理结论 + */ + public static final String COL_MEMO = "MEMO"; + /** + * 打回原因 + */ + public static final String COL_BACK_REASON = "BACK_REASON"; + /** + * 打回时间 + */ + public static final String COL_BACK_DATE = "BACK_DATE"; + /** + * 新ERP返回审理单主键 + */ + public static final String COL_ERP_ID = "ERP_ID"; + /** + * 审理时间 + */ + public static final String COL_REVIEW_DATE = "REVIEW_DATE"; + /** + * 排序 + */ + public static final String COL_SORT = "SORT"; + /** + * 备注 + */ + public static final String COL_REMARK = "REMARK"; + /** + * 是否批次性问题-[1]:是;[0]否; + */ + public static final String COL_IS_BAT_PROBLEM = "IS_BAT_PROBLEM"; + /** + * 是否经典问题-[1]:是;[0]否; + */ + public static final String COL_IS_CLASSIC_PROBLEM = "IS_CLASSIC_PROBLEM"; + /** + * 是否低级错误-[1]:是;[0]否; + */ + public static final String COL_IS_LOW_ERROR = "IS_LOW_ERROR"; + /** + * 是否质量问题-[1]:是;[0]否; + */ + public static final String COL_IS_QUALITY_PROBLEM = "IS_QUALITY_PROBLEM"; + /** + * 审理单号 + */ + public static final String COL_RS_CODE = "RS_CODE"; + /** + * 审理状态 + */ + public static final String COL_REVIEW_STATUS = "REVIEW_STATUS"; + /** + * 业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废; + */ + public static final String COL_BIZ_TYPE = "BIZ_TYPE"; + /** + * 物料号 + */ + public static final String COL_PART_CODE = "PART_CODE"; + /** + * 批次号 + */ + public static final String COL_BATCH_NO = "BATCH_NO"; + /** + * [外协厂家]id + */ + public static final String COL_OEM_ID = "OEM_ID"; + /** + * 生产标识 + */ + public static final String COL_PROD_IDENT = "PROD_IDENT"; + /** + * 故障类别 + */ + public static final String COL_FAULT_TYPE = "FAULT_TYPE"; + /** + * [车间订单]id + */ + public static final String COL_WO_ID = "WO_ID"; + /** + * [车间订单]编码 + */ + public static final String COL_WO_CODE = "WO_CODE"; + /** + * [车间作业计划]id + */ + public static final String COL_WP_ID = "WP_ID"; + /** + * 总数量 + */ + public static final String COL_NUM = "NUM"; + /** + * 返修数量 + */ + public static final String COL_RE_DO_NUM = "RE_DO_NUM"; + /** + * 返修原因 + */ + public static final String COL_RE_DO_REASON = "RE_DO_REASON"; + /** + * 返修建议 + */ + public static final String COL_RE_DO_SUGGEST = "RE_DO_SUGGEST"; + /** + * 返修路线 + */ + public static final String COL_RE_DO_PATH = "RE_DO_PATH"; + + /** + * [生产处置单]编码 + */ + @Schema(description = "[生产处置单]编码") + private String reviewOrderCode; + /** + * [生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式; + */ + @Schema(description = "[生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式;") + private Long reviewOrderMode; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [检验任务]id + */ + @Schema(description = "[检验任务]id") + private Long taskId; + /** + * 打回[用户]id + */ + @Schema(description = "打回[用户]id") + private Long backUserId; + /** + * 审理[用户]id + */ + @Schema(description = "审理[用户]id") + private Long reviewUserId; + /** + * [部门]id + */ + @Schema(description = "[部门]id") + private Long deptId; + /** + * 比例 + */ + @Schema(description = "比例") + private Double scale; + /** + * 不合格数量 + */ + @Schema(description = "不合格数量") + private Short unqualifiedQty; + /** + * 上级编号 + */ + @Schema(description = "上级编号") + private String upCode; + /** + * 审理意见/审理结论 + */ + @Schema(description = "审理意见/审理结论") + private String memo; + /** + * 打回原因 + */ + @Schema(description = "打回原因") + private String backReason; + /** + * 打回时间 + */ + @Schema(description = "打回时间") + private LocalDateTime backDate; + /** + * 新ERP返回审理单主键 + */ + @Schema(description = "新ERP返回审理单主键") + private String erpId; + /** + * 审理时间 + */ + @Schema(description = "审理时间") + private LocalDateTime reviewDate; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 是否批次性问题-[1]:是;[0]否; + */ + @Schema(description = "是否批次性问题-[1]:是;[0]否;") + private Long isBatProblem; + /** + * 是否经典问题-[1]:是;[0]否; + */ + @Schema(description = "是否经典问题-[1]:是;[0]否;") + private Long isClassicProblem; + /** + * 是否低级错误-[1]:是;[0]否; + */ + @Schema(description = "是否低级错误-[1]:是;[0]否;") + private Long isLowError; + /** + * 是否质量问题-[1]:是;[0]否; + */ + @Schema(description = "是否质量问题-[1]:是;[0]否;") + private Long isQualityProblem; + /** + * 审理单号 + */ + @Schema(description = "审理单号") + private String rsCode; + /** + * 审理状态 + */ + @Schema(description = "审理状态") + private Long reviewStatus; + /** + * 业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废; + */ + @Schema(description = "业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废;") + private Short bizType; + /** + * 物料号 + */ + @Schema(description = "物料号") + private String partCode; + /** + * 批次号 + */ + @Schema(description = "批次号") + private String batchNo; + /** + * [外协厂家]id + */ + @Schema(description = "[外协厂家]id") + private Long oemId; + /** + * 生产标识 + */ + @Schema(description = "生产标识") + private String prodIdent; + /** + * 故障类别 + */ + @Schema(description = "故障类别") + private String faultType; + /** + * [车间订单]id + */ + @Schema(description = "[车间订单]id") + private Long woId; + /** + * [车间订单]编码 + */ + @Schema(description = "[车间订单]编码") + private String woCode; + /** + * [车间作业计划]id + */ + @Schema(description = "[车间作业计划]id") + private Long wpId; + /** + * 总数量 + */ + @Schema(description = "总数量") + private Short num; + /** + * 返修数量 + */ + @Schema(description = "返修数量") + private Short reDoNum; + /** + * 返修原因 + */ + @Schema(description = "返修原因") + private String reDoReason; + /** + * 返修建议 + */ + @Schema(description = "返修建议") + private String reDoSuggest; + /** + * 返修路线 + */ + @Schema(description = "返修路线") + private String reDoPath; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java new file mode 100644 index 00000000..618dd7f3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java @@ -0,0 +1,184 @@ +/** + * 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.time.LocalDateTime; + +/** + * [工序检验项] 实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@TableName("QA_WORK_PLAN_ITEM") +@Schema(description = "WorkPlanItem Entity对象") +@EqualsAndHashCode(callSuper = true) +public class WorkPlanItem extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [作业计划]id + */ + public static final String COL_WP_ID = "WP_ID"; + /** + * 检验数 + */ + public static final String COL_CHECK_QTY = "CHECK_QTY"; + /** + * 试验数量 + */ + public static final String COL_TEST_QTY = "TEST_QTY"; + /** + * 消耗数量 + */ + public static final String COL_LOSS_QTY = "LOSS_QTY"; + /** + * [检验项目]编码 + */ + public static final String COL_ITEM_CODE = "ITEM_CODE"; + /** + * [检验项目]名称 + */ + public static final String COL_ITEM_NAME = "ITEM_NAME"; + /** + * [质量标准]名称 + */ + public static final String COL_STANDARD_NAME = "STANDARD_NAME"; + /** + * 检验员[用户]id + */ + public static final String COL_CHECK_USER_ID = "CHECK_USER_ID"; + /** + * 检验值 + */ + public static final String COL_CHECK_VALUE = "CHECK_VALUE"; + /** + * 检验日期 + */ + public static final String COL_CHECK_DATE = "CHECK_DATE"; + /** + * 检验结果-[1]:合格;[2]:不合格;[-1]:NA + */ + public static final String COL_CHECK_RESULT = "CHECK_RESULT"; + /** + * 工时定额 + */ + public static final String COL_HOUR_QUOTA = "HOUR_QUOTA"; + /** + * 准备工时 + */ + public static final String COL_HOUR_PREPARE = "HOUR_PREPARE"; + /** + * [检验任务]id + */ + public static final String COL_TASK_ID = "TASK_ID"; + /** + * [检验项目]id + */ + public static final String COL_ITEM_ID = "ITEM_ID"; + /** + * [质量标准]id + */ + public static final String COL_STANDARD_ID = "STANDARD_ID"; + /** + * [检验模板]id + */ + public static final String COL_TEMPLATE_ID = "TEMPLATE_ID"; + + /** + * [作业计划]id + */ + @Schema(description = "[作业计划]id") + private Long wpId; + /** + * 检验数 + */ + @Schema(description = "检验数") + private Short checkQty; + /** + * 试验数量 + */ + @Schema(description = "试验数量") + private Short testQty; + /** + * 消耗数量 + */ + @Schema(description = "消耗数量") + private Short lossQty; + /** + * [检验项目]编码 + */ + @Schema(description = "[检验项目]编码") + private String itemCode; + /** + * [检验项目]名称 + */ + @Schema(description = "[检验项目]名称") + private String itemName; + /** + * [质量标准]名称 + */ + @Schema(description = "[质量标准]名称") + private String standardName; + /** + * 检验员[用户]id + */ + @Schema(description = "检验员[用户]id") + private Long checkUserId; + /** + * 检验值 + */ + @Schema(description = "检验值") + private String checkValue; + /** + * 检验日期 + */ + @Schema(description = "检验日期") + private LocalDateTime checkDate; + /** + * 检验结果-[1]:合格;[2]:不合格;[-1]:NA + */ + @Schema(description = "检验结果-[1]:合格;[2]:不合格;[-1]:NA") + private Short checkResult; + /** + * 工时定额 + */ + @Schema(description = "工时定额") + private Short hourQuota; + /** + * 准备工时 + */ + @Schema(description = "准备工时") + private Short hourPrepare; + /** + * [检验任务]id + */ + @Schema(description = "[检验任务]id") + private Long taskId; + /** + * [检验项目]id + */ + @Schema(description = "[检验项目]id") + private Long itemId; + /** + * [质量标准]id + */ + @Schema(description = "[质量标准]id") + private Long standardId; + /** + * [检验模板]id + */ + @Schema(description = "[检验模板]id") + private Long templateId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java new file mode 100644 index 00000000..f7c12823 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java @@ -0,0 +1,147 @@ +/** + * 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 2026-01-06 + */ +@Data +@TableName("QA_WORK_PLAN_ITEM_DETAIL") +@Schema(description = "WorkPlanItemDetail Entity对象") +@EqualsAndHashCode(callSuper = true) +public class WorkPlanItemDetail extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * [工序检验项]id + */ + public static final String COL_WORK_PLAN_ITEM_ID = "WORK_PLAN_ITEM_ID"; + /** + * 测量类型-[1]镀前;[2]:镀后; + */ + public static final String COL_TEST_TYPE = "TEST_TYPE"; + /** + * 尺寸 + */ + public static final String COL_RULE_SIZE = "RULE_SIZE"; + /** + * 量具 + */ + public static final String COL_TOOLS = "TOOLS"; + /** + * 测量值1 + */ + public static final String COL_GAUGE_VALUE1 = "GAUGE_VALUE1"; + /** + * 测量值2 + */ + public static final String COL_GAUGE_VALUE2 = "GAUGE_VALUE2"; + /** + * 测量值3 + */ + public static final String COL_GAUGE_VALUE3 = "GAUGE_VALUE3"; + /** + * 测量值4 + */ + public static final String COL_GAUGE_VALUE4 = "GAUGE_VALUE4"; + /** + * 测量值5 + */ + public static final String COL_GAUGE_VALUE5 = "GAUGE_VALUE5"; + /** + * 测量值6 + */ + public static final String COL_GAUGE_VALUE6 = "GAUGE_VALUE6"; + /** + * 测量值7 + */ + public static final String COL_GAUGE_VALUE7 = "GAUGE_VALUE7"; + /** + * 测量值8 + */ + public static final String COL_GAUGE_VALUE8 = "GAUGE_VALUE8"; + /** + * [量具]id + */ + public static final String COL_MT_ID = "MT_ID"; + + /** + * [工序检验项]id + */ + @Schema(description = "[工序检验项]id") + private Long workPlanItemId; + /** + * 测量类型-[1]镀前;[2]:镀后; + */ + @Schema(description = "测量类型-[1]镀前;[2]:镀后;") + private String testType; + /** + * 尺寸 + */ + @Schema(description = "尺寸") + private String ruleSize; + /** + * 量具 + */ + @Schema(description = "量具") + private String tools; + /** + * 测量值1 + */ + @Schema(description = "测量值1") + private String gaugeValue1; + /** + * 测量值2 + */ + @Schema(description = "测量值2") + private String gaugeValue2; + /** + * 测量值3 + */ + @Schema(description = "测量值3") + private String gaugeValue3; + /** + * 测量值4 + */ + @Schema(description = "测量值4") + private String gaugeValue4; + /** + * 测量值5 + */ + @Schema(description = "测量值5") + private String gaugeValue5; + /** + * 测量值6 + */ + @Schema(description = "测量值6") + private String gaugeValue6; + /** + * 测量值7 + */ + @Schema(description = "测量值7") + private String gaugeValue7; + /** + * 测量值8 + */ + @Schema(description = "测量值8") + private String gaugeValue8; + /** + * [量具]id + */ + @Schema(description = "[量具]id") + private Long mtId; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java index 333c4a1b..ee801651 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java @@ -1,12 +1,43 @@ package org.springblade.desk.quality.pojo.request; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.InspectionTask; +import java.time.LocalDate; +import java.time.LocalDateTime; + @Data @EqualsAndHashCode(callSuper = true) public class InspectionTaskSearch extends InspectionTask { - + @Schema(description = "流程卡号") + private String cardNo; + @Schema(description = "加工单位-班组") + private Long teamSetId; + @Schema(description = "加工单位-供应商") + private Long oemId; + @Schema(description = "车间订单号") + private String woCode; + @Schema(description = "零件号") + private String partCode; + @Schema(description = "生产标识") + private String prodIdent; + @Schema(description = "需求部门") + private String needDeptName; + @Schema(description = "批次号") + private String batchNo; + @Schema(description = "分批号") + private String poBatchNo; + @Schema(description = "当前工序") + private Long currentProcessId; + @Schema(description = "下个工序") + private Long nextProcessId; + @Schema(description = "生产数量") + private Double poQty; + @Schema(description = "接收时间-开始") + private LocalDate receiveDateStart; + @Schema(description = "接收时间-结束") + private LocalDate receiveDateEnd; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java new file mode 100644 index 00000000..853db304 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java @@ -0,0 +1,29 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionTask; + +import java.io.Serial; + +/** + * [检验任务] 视图实体类 + *

+ * 主要关联 - 生产模块中 todo: 需要联调关联 生产模块。 + * mes v1: PrWorkPlan + * mes v1: PrWorkOrder + * + * @author Tom Shuo + * @since 2025-12-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionTaskDetailVO extends InspectionTask { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java new file mode 100644 index 00000000..3ce3aeea --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java @@ -0,0 +1,71 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionTask; + +import java.io.Serial; +import java.time.LocalDateTime; + +/** + * [检验任务] 视图实体类 + *

+ * 主要关联 - 生产模块中 todo: 需要联调关联 生产模块。 + * mes v1: PrWorkPlan + * mes v1: PrWorkOrder + * + * @author Tom Shuo + * @since 2025-12-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class InspectionTaskListVO extends InspectionTask { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 质检员[用户]真名 + */ + @Schema(description = "质检员[用户]真名") + private Long checkUserRealName; + /** + * 检验结果 + */ + @Schema(description = "检验结果") + private String checkResultName; + @Schema(description = "主加工单位") + private String mainProcessingUnit = "第一班组"; + /** + * + */ + @Schema(description = "车间订单号") + private String woCode = "XXXX12345"; + @Schema(description = "零件号") + private String partCode = "XXXX12345"; + @Schema(description = "生产标识") + private String prodIdent = "XXXX12345"; + @Schema(description = "流程卡号") + private String cardNo = "XXXX12345"; + @Schema(description = "需求部门") + private String needDeptName = "XXXX12345"; + @Schema(description = "批次号") + private String batchNo = "XXXX12345"; + @Schema(description = "分批号") + private String poBatchNo = "XXXX12345"; + @Schema(description = "当前工序") + private String currentProcessName = "XXXX12345"; + @Schema(description = "下个工序") + private String nextProcessName = "XXXX12345"; + @Schema(description = "面积") + private Double area = 100.10; + @Schema(description = "总面积") + private Double areaTotal = 200.10; + @Schema(description = "生产数量") + private Double poQty = 2002d; + @Schema(description = "接收时间") + private LocalDateTime receiveDate = LocalDateTime.now(); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java new file mode 100644 index 00000000..02d9db40 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java @@ -0,0 +1,15 @@ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * mes v1: PrWorkOrder 车间订单 + */ +@Data +@EqualsAndHashCode() +public class QAPrWorkOrderVO { + + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java new file mode 100644 index 00000000..909f6644 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java @@ -0,0 +1,17 @@ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * mes v1: PrWorkPlan 车间作业计划 + */ +@Data +@EqualsAndHashCode() +public class QAPrWorkPlanVO { + + + + + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java similarity index 51% rename from blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java index c7ab1b7a..e1afcb01 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java @@ -1,22 +1,23 @@ /** * Author: Tom Shuo */ -package org.springblade.desk.basic.pojo.vo; +package org.springblade.desk.quality.pojo.vo; -import org.springblade.desk.basic.pojo.entity.Plating; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewDuty; + import java.io.Serial; /** - * [镀种] 视图实体类 + * [生产处置单-责任零件] 视图实体类 * * @author Tom Shuo - * @since 2026-01-05 + * @since 2026-01-06 */ @Data @EqualsAndHashCode(callSuper = true) -public class PlatingVO extends Plating { +public class ReviewDutyVO extends ReviewDuty { @Serial private static final long serialVersionUID = 1L; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java new file mode 100644 index 00000000..d7363081 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.ReviewFault; + +import java.io.Serial; + +/** + * [生产处置单-问题故障] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class ReviewFaultVO extends ReviewFault { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java similarity index 62% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskVO.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java index f602b338..e91a9fdd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskVO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java @@ -5,19 +5,19 @@ package org.springblade.desk.quality.pojo.vo; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; import java.io.Serial; /** - * [检验任务] 视图实体类 + * [生产处置单] 视图实体类 * * @author Tom Shuo - * @since 2025-12-23 + * @since 2026-01-06 */ @Data @EqualsAndHashCode(callSuper = true) -public class InspectionTaskVO extends InspectionTask { +public class ReviewSheetVO extends ReviewSheet { @Serial private static final long serialVersionUID = 1L; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java new file mode 100644 index 00000000..bd161524 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; + +import java.io.Serial; + +/** + * [工序检验项明细] 视图实体类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class WorkPlanItemDetailVO extends WorkPlanItemDetail { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java similarity index 52% rename from blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java index 3afc59f0..fff382d9 100644 --- a/blade-ops/blade-develop/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java @@ -1,22 +1,23 @@ /** * Author: Tom Shuo */ -package org.springblade.desk.basic.pojo.dto; +package org.springblade.desk.quality.pojo.vo; -import org.springblade.desk.basic.pojo.entity.Plating; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; + import java.io.Serial; /** - * [镀种] 数据传输对象实体类 + * [工序检验项] 视图实体类 * * @author Tom Shuo - * @since 2026-01-05 + * @since 2026-01-06 */ @Data @EqualsAndHashCode(callSuper = true) -public class PlatingDTO extends Plating { +public class WorkPlanItemVO extends WorkPlanItem { @Serial private static final long serialVersionUID = 1L; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java index 1151fc06..6c724cd9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; -import org.springblade.desk.quality.pojo.vo.InspectionTaskVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import java.util.List; @@ -26,7 +26,7 @@ public interface IInspectionTaskService extends BaseService { * @param inspectionTask 查询参数 * @return IPage */ - IPage selectInspectionTaskPage(IPage page, InspectionTaskVO inspectionTask); + IPage selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask); /** * 导出数据 @@ -40,5 +40,5 @@ public interface IInspectionTaskService extends BaseService { * VO * @param vo */ - void setVOValue(InspectionTaskVO vo); + void setVOValue(InspectionTaskDetailVO vo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java new file mode 100644 index 00000000..51b558e1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +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.ReviewDutyExcel; +import org.springblade.desk.quality.pojo.entity.ReviewDuty; +import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; + +import java.util.List; + +/** + * [生产处置单-责任零件] 服务类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface IReviewDutyService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewDuty 查询参数 + * @return IPage + */ + IPage selectReviewDutyPage(IPage page, ReviewDutyVO reviewDuty); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewDuty(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(ReviewDutyVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java new file mode 100644 index 00000000..3ffd53f3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +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.ReviewFaultExcel; +import org.springblade.desk.quality.pojo.entity.ReviewFault; +import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; + +import java.util.List; + +/** + * [生产处置单-问题故障] 服务类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface IReviewFaultService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewFault 查询参数 + * @return IPage + */ + IPage selectReviewFaultPage(IPage page, ReviewFaultVO reviewFault); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewFault(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(ReviewFaultVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java new file mode 100644 index 00000000..fa74e7c2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +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.ReviewSheetExcel; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; + +import java.util.List; + +/** + * [生产处置单] 服务类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface IReviewSheetService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewSheet 查询参数 + * @return IPage + */ + IPage selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewSheet(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(ReviewSheetVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java new file mode 100644 index 00000000..581ef04c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +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.WorkPlanItemDetailExcel; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; + +import java.util.List; + +/** + * [工序检验项明细] 服务类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface IWorkPlanItemDetailService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workPlanItemDetail 查询参数 + * @return IPage + */ + IPage selectWorkPlanItemDetailPage(IPage page, WorkPlanItemDetailVO workPlanItemDetail); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkPlanItemDetail(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(WorkPlanItemDetailVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java new file mode 100644 index 00000000..a4c6e35b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java @@ -0,0 +1,44 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +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.WorkPlanItemExcel; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; + +import java.util.List; + +/** + * [工序检验项] 服务类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public interface IWorkPlanItemService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workPlanItem 查询参数 + * @return IPage + */ + IPage selectWorkPlanItemPage(IPage page, WorkPlanItemVO workPlanItem); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkPlanItem(Wrapper queryWrapper); + + /** + * VO + * @param vo + */ + void setVOValue(WorkPlanItemVO vo); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index 03500614..61431ad4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -14,7 +14,7 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.mapper.InspectionTaskMapper; import org.springblade.desk.quality.pojo.entity.InspectionTask; -import org.springblade.desk.quality.pojo.vo.InspectionTaskVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import org.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; @@ -41,7 +41,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl selectInspectionTaskPage(IPage page, InspectionTaskVO inspectionTask) { + public IPage selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask) { return page.setRecords(baseMapper.selectInspectionTaskPage(page, inspectionTask)); } @@ -55,7 +55,7 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl implements IReviewDutyService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectReviewDutyPage(IPage page, ReviewDutyVO reviewDuty) { + return page.setRecords(baseMapper.selectReviewDutyPage(page, reviewDuty)); + } + + @Override + public List exportReviewDuty(Wrapper queryWrapper) { + List reviewDutyList = baseMapper.exportReviewDuty(queryWrapper); + //reviewDutyList.forEach(reviewDuty -> { + // reviewDuty.setTypeName(DictCache.getValue(DictEnum.YES_NO, ReviewDuty.getType())); + //}); + return reviewDutyList; + } + + @Override + public void setVOValue(ReviewDutyVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java new file mode 100644 index 00000000..b7bd11bc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.ReviewFaultExcel; +import org.springblade.desk.quality.mapper.ReviewFaultMapper; +import org.springblade.desk.quality.pojo.entity.ReviewFault; +import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; +import org.springblade.desk.quality.service.IReviewFaultService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [生产处置单-问题故障] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class ReviewFaultServiceImpl extends BaseServiceImpl implements IReviewFaultService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectReviewFaultPage(IPage page, ReviewFaultVO reviewFault) { + return page.setRecords(baseMapper.selectReviewFaultPage(page, reviewFault)); + } + + @Override + public List exportReviewFault(Wrapper queryWrapper) { + List reviewFaultList = baseMapper.exportReviewFault(queryWrapper); + //reviewFaultList.forEach(reviewFault -> { + // reviewFault.setTypeName(DictCache.getValue(DictEnum.YES_NO, ReviewFault.getType())); + //}); + return reviewFaultList; + } + + @Override + public void setVOValue(ReviewFaultVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java new file mode 100644 index 00000000..421a37e7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.ReviewSheetExcel; +import org.springblade.desk.quality.mapper.ReviewSheetMapper; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; +import org.springblade.desk.quality.service.IReviewSheetService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [生产处置单] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class ReviewSheetServiceImpl extends BaseServiceImpl implements IReviewSheetService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet) { + return page.setRecords(baseMapper.selectReviewSheetPage(page, reviewSheet)); + } + + @Override + public List exportReviewSheet(Wrapper queryWrapper) { + List reviewSheetList = baseMapper.exportReviewSheet(queryWrapper); + //reviewSheetList.forEach(reviewSheet -> { + // reviewSheet.setTypeName(DictCache.getValue(DictEnum.YES_NO, ReviewSheet.getType())); + //}); + return reviewSheetList; + } + + @Override + public void setVOValue(ReviewSheetVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java new file mode 100644 index 00000000..fa99427a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.WorkPlanItemDetailExcel; +import org.springblade.desk.quality.mapper.WorkPlanItemDetailMapper; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; +import org.springblade.desk.quality.service.IWorkPlanItemDetailService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [工序检验项明细] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class WorkPlanItemDetailServiceImpl extends BaseServiceImpl implements IWorkPlanItemDetailService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectWorkPlanItemDetailPage(IPage page, WorkPlanItemDetailVO workPlanItemDetail) { + return page.setRecords(baseMapper.selectWorkPlanItemDetailPage(page, workPlanItemDetail)); + } + + @Override + public List exportWorkPlanItemDetail(Wrapper queryWrapper) { + List workPlanItemDetailList = baseMapper.exportWorkPlanItemDetail(queryWrapper); + //workPlanItemDetailList.forEach(workPlanItemDetail -> { + // workPlanItemDetail.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkPlanItemDetail.getType())); + //}); + return workPlanItemDetailList; + } + + @Override + public void setVOValue(WorkPlanItemDetailVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java new file mode 100644 index 00000000..3577e21a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java @@ -0,0 +1,61 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.excel.WorkPlanItemExcel; +import org.springblade.desk.quality.mapper.WorkPlanItemMapper; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; +import org.springblade.desk.quality.service.IWorkPlanItemService; +import org.springblade.system.feign.IDictClient; +import org.springblade.system.feign.IUserClient; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * [工序检验项] 服务实现类 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class WorkPlanItemServiceImpl extends BaseServiceImpl implements IWorkPlanItemService { + + @Resource + private IUserClient userClient; + @Resource + private IDictClient dictClient; + + @Override + public IPage selectWorkPlanItemPage(IPage page, WorkPlanItemVO workPlanItem) { + return page.setRecords(baseMapper.selectWorkPlanItemPage(page, workPlanItem)); + } + + @Override + public List exportWorkPlanItem(Wrapper queryWrapper) { + List workPlanItemList = baseMapper.exportWorkPlanItem(queryWrapper); + //workPlanItemList.forEach(workPlanItem -> { + // workPlanItem.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkPlanItem.getType())); + //}); + return workPlanItemList; + } + + @Override + public void setVOValue(WorkPlanItemVO vo) { + + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskWrapper.java index b4e93a2d..57cf5cd9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskWrapper.java @@ -6,7 +6,7 @@ package org.springblade.desk.quality.wrapper; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.desk.quality.pojo.entity.InspectionTask; -import org.springblade.desk.quality.pojo.vo.InspectionTaskVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import java.util.Objects; @@ -16,15 +16,15 @@ import java.util.Objects; * @author Tom Shuo * @since 2025-12-23 */ -public class InspectionTaskWrapper extends BaseEntityWrapper { +public class InspectionTaskWrapper extends BaseEntityWrapper { public static InspectionTaskWrapper build() { return new InspectionTaskWrapper(); } @Override - public InspectionTaskVO entityVO(InspectionTask inspectionTask) { - InspectionTaskVO VO = Objects.requireNonNull(BeanUtil.copyProperties(inspectionTask, InspectionTaskVO.class)); + public InspectionTaskDetailVO entityVO(InspectionTask inspectionTask) { + InspectionTaskDetailVO VO = Objects.requireNonNull(BeanUtil.copyProperties(inspectionTask, InspectionTaskDetailVO.class)); //User createUser = UserCache.getUser(inspectionTask.getCreateUser()); //User updateUser = UserCache.getUser(inspectionTask.getUpdateUser()); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewDutyWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewDutyWrapper.java new file mode 100644 index 00000000..943a115a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewDutyWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.ReviewDuty; +import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; + +import java.util.Objects; + +/** + * [生产处置单-责任零件] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public class ReviewDutyWrapper extends BaseEntityWrapper { + + public static ReviewDutyWrapper build() { + return new ReviewDutyWrapper(); + } + + @Override + public ReviewDutyVO entityVO(ReviewDuty reviewDuty) { + ReviewDutyVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewDuty, ReviewDutyVO.class)); + + //User createUser = UserCache.getUser(reviewDuty.getCreateUser()); + //User updateUser = UserCache.getUser(reviewDuty.getUpdateUser()); + //reviewDutyVO.setCreateUserName(createUser.getName()); + //reviewDutyVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewFaultWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewFaultWrapper.java new file mode 100644 index 00000000..c6123324 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewFaultWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.ReviewFault; +import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; + +import java.util.Objects; + +/** + * [生产处置单-问题故障] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public class ReviewFaultWrapper extends BaseEntityWrapper { + + public static ReviewFaultWrapper build() { + return new ReviewFaultWrapper(); + } + + @Override + public ReviewFaultVO entityVO(ReviewFault reviewFault) { + ReviewFaultVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewFault, ReviewFaultVO.class)); + + //User createUser = UserCache.getUser(reviewFault.getCreateUser()); + //User updateUser = UserCache.getUser(reviewFault.getUpdateUser()); + //reviewFaultVO.setCreateUserName(createUser.getName()); + //reviewFaultVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetWrapper.java new file mode 100644 index 00000000..44932661 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/ReviewSheetWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; + +import java.util.Objects; + +/** + * [生产处置单] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public class ReviewSheetWrapper extends BaseEntityWrapper { + + public static ReviewSheetWrapper build() { + return new ReviewSheetWrapper(); + } + + @Override + public ReviewSheetVO entityVO(ReviewSheet reviewSheet) { + ReviewSheetVO VO = Objects.requireNonNull(BeanUtil.copyProperties(reviewSheet, ReviewSheetVO.class)); + + //User createUser = UserCache.getUser(reviewSheet.getCreateUser()); + //User updateUser = UserCache.getUser(reviewSheet.getUpdateUser()); + //reviewSheetVO.setCreateUserName(createUser.getName()); + //reviewSheetVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemDetailWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemDetailWrapper.java new file mode 100644 index 00000000..05a0c9e8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemDetailWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; + +import java.util.Objects; + +/** + * [工序检验项明细] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public class WorkPlanItemDetailWrapper extends BaseEntityWrapper { + + public static WorkPlanItemDetailWrapper build() { + return new WorkPlanItemDetailWrapper(); + } + + @Override + public WorkPlanItemDetailVO entityVO(WorkPlanItemDetail workPlanItemDetail) { + WorkPlanItemDetailVO VO = Objects.requireNonNull(BeanUtil.copyProperties(workPlanItemDetail, WorkPlanItemDetailVO.class)); + + //User createUser = UserCache.getUser(workPlanItemDetail.getCreateUser()); + //User updateUser = UserCache.getUser(workPlanItemDetail.getUpdateUser()); + //workPlanItemDetailVO.setCreateUserName(createUser.getName()); + //workPlanItemDetailVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemWrapper.java new file mode 100644 index 00000000..74a79ef3 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/WorkPlanItemWrapper.java @@ -0,0 +1,36 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; + +import java.util.Objects; + +/** + * [工序检验项] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2026-01-06 + */ +public class WorkPlanItemWrapper extends BaseEntityWrapper { + + public static WorkPlanItemWrapper build() { + return new WorkPlanItemWrapper(); + } + + @Override + public WorkPlanItemVO entityVO(WorkPlanItem workPlanItem) { + WorkPlanItemVO VO = Objects.requireNonNull(BeanUtil.copyProperties(workPlanItem, WorkPlanItemVO.class)); + + //User createUser = UserCache.getUser(workPlanItem.getCreateUser()); + //User updateUser = UserCache.getUser(workPlanItem.getUpdateUser()); + //workPlanItemVO.setCreateUserName(createUser.getName()); + //workPlanItemVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +} From 918691bc8f80c294ff91abc8d6831768b8294fc2 Mon Sep 17 00:00:00 2001 From: sugy <455459989@qq.com> Date: Wed, 7 Jan 2026 17:28:50 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E5=AE=89=E7=8E=AF=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/mapper/TeamSetMapper.xml | 2 +- .../desk/basic/pojo/entity/TeamSet.java | 2 + .../controller/BsDischargeRecController.java | 203 +++++++++++++ .../controller/BsDosingRecController.java | 204 +++++++++++++ .../BsEpciuInspectionPointController.java | 201 +++++++++++++ .../BsEpciuPatrolInspectionController.java | 160 +++++++++++ .../controller/BsInsTestController.java | 204 +++++++++++++ .../controller/BsMeterParamController.java | 161 +++++++++++ .../BsSafeInspectionPointController.java | 203 +++++++++++++ .../BsSafePatrolInspectionController.java | 160 +++++++++++ .../energy/controller/BsTowerController.java | 202 +++++++++++++ .../controller/BsTowerReportController.java | 160 +++++++++++ .../BsWasteGasRunRecController.java | 193 +++++++++++++ .../energy/excel/BsDischargeRecExcel.java | 104 +++++++ .../desk/energy/excel/BsDosingRecExcel.java | 123 ++++++++ .../excel/BsEpciuInspectionPointExcel.java | 105 +++++++ .../excel/BsEpciuPatrolInspectionExcel.java | 135 +++++++++ .../desk/energy/excel/BsInsTestExcel.java | 123 ++++++++ .../desk/energy/excel/BsMeterParamExcel.java | 99 +++++++ .../excel/BsSafeInspectionPointExcel.java | 93 ++++++ .../excel/BsSafePatrolInspectionExcel.java | 129 +++++++++ .../desk/energy/excel/BsTowerExcel.java | 116 ++++++++ .../desk/energy/excel/BsTowerReportExcel.java | 111 +++++++ .../energy/excel/BsWasteGasRunRecExcel.java | 171 +++++++++++ .../energy/mapper/BsDischargeRecMapper.java | 64 +++++ .../desk/energy/mapper/BsDosingRecMapper.java | 64 +++++ .../mapper/BsEpciuInspectionPointMapper.java | 65 +++++ .../mapper/BsEpciuPatrolInspectionMapper.java | 65 +++++ .../desk/energy/mapper/BsInsTestMapper.java | 64 +++++ .../energy/mapper/BsMeterParamMapper.java | 65 +++++ .../mapper/BsSafeInspectionPointMapper.java | 63 ++++ .../mapper/BsSafePatrolInspectionMapper.java | 65 +++++ .../desk/energy/mapper/BsTowerMapper.java | 64 +++++ .../energy/mapper/BsTowerReportMapper.java | 65 +++++ .../energy/mapper/BsWasteGasRunRecMapper.java | 65 +++++ .../desk/energy/mapper/DischargeRecMapper.xml | 54 ++++ .../desk/energy/mapper/DosingRecMapper.xml | 60 ++++ .../mapper/EpciuInspectionPointMapper.xml | 45 +++ .../mapper/EpciuPatrolInspectionMapper.xml | 65 +++++ .../desk/energy/mapper/InsTestMapper.xml | 51 ++++ .../desk/energy/mapper/MeterParamMapper.xml | 32 +++ .../mapper/SafeInspectionPointMapper.xml | 40 +++ .../mapper/SafePatrolInspectionMapper.xml | 58 ++++ .../desk/energy/mapper/TowerMapper.xml | 47 +++ .../desk/energy/mapper/TowerReportMapper.xml | 58 ++++ .../energy/mapper/WasteGasRunRecMapper.xml | 56 ++++ .../energy/pojo/dto/BsDischargeRecDTO.java | 46 +++ .../desk/energy/pojo/dto/BsDosingRecDTO.java | 46 +++ .../pojo/dto/BsEpciuInspectionPointDTO.java | 46 +++ .../pojo/dto/BsEpciuPatrolInspectionDTO.java | 46 +++ .../desk/energy/pojo/dto/BsInsTestDTO.java | 46 +++ .../desk/energy/pojo/dto/BsMeterParamDTO.java | 46 +++ .../pojo/dto/BsSafeInspectionPointDTO.java | 46 +++ .../pojo/dto/BsSafePatrolInspectionDTO.java | 46 +++ .../desk/energy/pojo/dto/BsTowerDTO.java | 46 +++ .../energy/pojo/dto/BsTowerReportDTO.java | 46 +++ .../energy/pojo/dto/BsWasteGasRunRecDTO.java | 46 +++ .../pojo/entity/BsDischargeRecEntity.java | 88 ++++++ .../energy/pojo/entity/BsDosingRecEntity.java | 105 +++++++ .../entity/BsEpciuInspectionPointEntity.java | 97 +++++++ .../entity/BsEpciuPatrolInspectionEntity.java | 140 +++++++++ .../energy/pojo/entity/BsInsTestEntity.java | 104 +++++++ .../pojo/entity/BsMeterParamEntity.java | 77 +++++ .../entity/BsSafeInspectionPointEntity.java | 92 ++++++ .../entity/BsSafePatrolInspectionEntity.java | 136 +++++++++ .../energy/pojo/entity/BsTowerEntity.java | 93 ++++++ .../pojo/entity/BsTowerReportEntity.java | 93 ++++++ .../pojo/entity/BsWasteGasRunRecEntity.java | 147 ++++++++++ .../desk/energy/pojo/vo/BsDischargeRecVO.java | 61 ++++ .../desk/energy/pojo/vo/BsDosingRecVO.java | 61 ++++ .../pojo/vo/BsEpciuInspectionPointVO.java | 46 +++ .../pojo/vo/BsEpciuPatrolInspectionVO.java | 73 +++++ .../desk/energy/pojo/vo/BsInsTestVO.java | 46 +++ .../desk/energy/pojo/vo/BsMeterParamVO.java | 46 +++ .../pojo/vo/BsSafeInspectionPointVO.java | 46 +++ .../pojo/vo/BsSafePatrolInspectionVO.java | 74 +++++ .../desk/energy/pojo/vo/BsTowerReportVO.java | 61 ++++ .../desk/energy/pojo/vo/BsTowerVO.java | 46 +++ .../energy/pojo/vo/BsWasteGasRunRecVO.java | 46 +++ .../service/IBsDischargeRecService.java | 62 ++++ .../energy/service/IBsDosingRecService.java | 62 ++++ .../IBsEpciuInspectionPointService.java | 62 ++++ .../IBsEpciuPatrolInspectionService.java | 64 +++++ .../energy/service/IBsInsTestService.java | 62 ++++ .../energy/service/IBsMeterParamService.java | 62 ++++ .../IBsSafeInspectionPointService.java | 62 ++++ .../IBsSafePatrolInspectionService.java | 65 +++++ .../energy/service/IBsTowerReportService.java | 62 ++++ .../desk/energy/service/IBsTowerService.java | 62 ++++ .../service/IBsWasteGasRunRecService.java | 62 ++++ .../impl/BsDischargeRecServiceImpl.java | 69 +++++ .../service/impl/BsDosingRecServiceImpl.java | 68 +++++ .../BsEpciuInspectionPointServiceImpl.java | 64 +++++ .../BsEpciuPatrolInspectionServiceImpl.java | 149 ++++++++++ .../service/impl/BsInsTestServiceImpl.java | 65 +++++ .../service/impl/BsMeterParamServiceImpl.java | 64 +++++ .../BsSafeInspectionPointServiceImpl.java | 64 +++++ .../BsSafePatrolInspectionServiceImpl.java | 110 +++++++ .../impl/BsTowerReportServiceImpl.java | 69 +++++ .../service/impl/BsTowerServiceImpl.java | 63 ++++ .../impl/BsWasteGasRunRecServiceImpl.java | 64 +++++ .../desk/energy/task/OrderEnvJob.java | 84 ++++++ .../desk/energy/task/OrderSafeJob.java | 55 ++++ .../desk/energy/util/HttpRequestService.java | 76 +++++ .../energy/wrapper/BsDischargeRecWrapper.java | 60 ++++ .../energy/wrapper/BsDosingRecWrapper.java | 60 ++++ .../BsEpciuInspectionPointWrapper.java | 60 ++++ .../BsEpciuPatrolInspectionWrapper.java | 60 ++++ .../desk/energy/wrapper/BsInsTestWrapper.java | 60 ++++ .../energy/wrapper/BsMeterParamWrapper.java | 60 ++++ .../wrapper/BsSafeInspectionPointWrapper.java | 60 ++++ .../BsSafePatrolInspectionWrapper.java | 60 ++++ .../energy/wrapper/BsTowerReportWrapper.java | 60 ++++ .../desk/energy/wrapper/BsTowerWrapper.java | 60 ++++ .../wrapper/BsWasteGasRunRecWrapper.java | 60 ++++ .../FmProjectApplicationController.java | 175 +++++++++++ .../FmProjectMilestoneController.java | 189 ++++++++++++ .../excel/FmProjectApplicationExcel.java | 171 +++++++++++ .../excel/FmProjectMilestoneExcel.java | 201 +++++++++++++ .../mapper/FmProjectApplicationMapper.java | 64 +++++ .../mapper/FmProjectMilestoneMapper.java | 64 +++++ .../mapper/ProjectApplicationMapper.xml | 56 ++++ .../process/mapper/ProjectMilestoneMapper.xml | 49 ++++ .../pojo/dto/FmProjectApplicationDTO.java | 46 +++ .../pojo/dto/FmProjectMilestoneDTO.java | 46 +++ .../entity/FmProjectApplicationEntity.java | 144 ++++++++++ .../pojo/entity/FmProjectMilestoneEntity.java | 272 ++++++++++++++++++ .../pojo/vo/FmProjectApplicationVO.java | 46 +++ .../process/pojo/vo/FmProjectMilestoneVO.java | 46 +++ .../service/IFmProjectApplicationService.java | 62 ++++ .../service/IFmProjectMilestoneService.java | 82 ++++++ .../impl/FmProjectApplicationServiceImpl.java | 63 ++++ .../impl/FmProjectMilestoneServiceImpl.java | 201 +++++++++++++ .../wrapper/FmProjectApplicationWrapper.java | 60 ++++ .../wrapper/FmProjectMilestoneWrapper.java | 60 ++++ .../Excel/QA/加药记录导入模板.xls | Bin 0 -> 19968 bytes .../QA/安全巡检配置导入模板.xls | Bin 0 -> 18944 bytes .../QA/废水化验记录导入模板.xls | Bin 0 -> 20992 bytes .../QA/槽液排放记录导入模板.xls | Bin 0 -> 21504 bytes .../QA/环保巡检点配置导入模板.xls | Bin 0 -> 18944 bytes .../Excel/QA/酸雾塔导入模板.xls | Bin 0 -> 19456 bytes .../src/main/resources/application-dev.yml | 3 + .../springblade/system/mapper/UserMapper.xml | 3 + 143 files changed, 11436 insertions(+), 1 deletion(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDischargeRecController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDosingRecController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEpciuInspectionPointController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEpciuPatrolInspectionController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsInsTestController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsMeterParamController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafePatrolInspectionController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsTowerController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsTowerReportController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsWasteGasRunRecController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsDischargeRecExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsDosingRecExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuPatrolInspectionExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsInsTestExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsMeterParamExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsSafeInspectionPointExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsSafePatrolInspectionExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsTowerExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsTowerReportExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsWasteGasRunRecExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsDischargeRecMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsDosingRecMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEpciuInspectionPointMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEpciuPatrolInspectionMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsInsTestMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsMeterParamMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsSafeInspectionPointMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsSafePatrolInspectionMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsTowerMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsTowerReportMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsWasteGasRunRecMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/DischargeRecMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/DosingRecMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuInspectionPointMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/InsTestMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/MeterParamMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafeInspectionPointMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafePatrolInspectionMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/TowerMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/TowerReportMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/WasteGasRunRecMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsDischargeRecDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsDosingRecDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsEpciuInspectionPointDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsEpciuPatrolInspectionDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsInsTestDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsMeterParamDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsSafeInspectionPointDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsSafePatrolInspectionDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsTowerDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsTowerReportDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsWasteGasRunRecDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDischargeRecEntity.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEpciuInspectionPointEntity.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEpciuPatrolInspectionEntity.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsInsTestEntity.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsMeterParamEntity.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafeInspectionPointEntity.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafePatrolInspectionEntity.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsTowerEntity.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsTowerReportEntity.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsWasteGasRunRecEntity.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsDischargeRecVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsDosingRecVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEpciuInspectionPointVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEpciuPatrolInspectionVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsInsTestVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsMeterParamVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsSafeInspectionPointVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsSafePatrolInspectionVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsTowerReportVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsTowerVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsWasteGasRunRecVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsDischargeRecService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsDosingRecService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuInspectionPointService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsInsTestService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsMeterParamService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafeInspectionPointService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafePatrolInspectionService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsTowerReportService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsTowerService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsWasteGasRunRecService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDischargeRecServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuInspectionPointServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsInsTestServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsMeterParamServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafeInspectionPointServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafePatrolInspectionServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsTowerReportServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsTowerServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsWasteGasRunRecServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/task/OrderEnvJob.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/task/OrderSafeJob.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/HttpRequestService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsDischargeRecWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsDosingRecWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsEpciuInspectionPointWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsEpciuPatrolInspectionWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsInsTestWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsMeterParamWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsSafeInspectionPointWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsSafePatrolInspectionWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsTowerReportWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsTowerWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsWasteGasRunRecWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/controller/FmProjectApplicationController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/controller/FmProjectMilestoneController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/excel/FmProjectApplicationExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/excel/FmProjectMilestoneExcel.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/FmProjectApplicationMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/FmProjectMilestoneMapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectApplicationMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectMilestoneMapper.xml create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/dto/FmProjectApplicationDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/dto/FmProjectMilestoneDTO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectApplicationEntity.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectApplicationVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/IFmProjectApplicationService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/IFmProjectMilestoneService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectApplicationServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/wrapper/FmProjectApplicationWrapper.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/process/wrapper/FmProjectMilestoneWrapper.java create mode 100644 blade-service/blade-desk/src/main/resources/Excel/QA/加药记录导入模板.xls create mode 100644 blade-service/blade-desk/src/main/resources/Excel/QA/安全巡检配置导入模板.xls create mode 100644 blade-service/blade-desk/src/main/resources/Excel/QA/废水化验记录导入模板.xls create mode 100644 blade-service/blade-desk/src/main/resources/Excel/QA/槽液排放记录导入模板.xls create mode 100644 blade-service/blade-desk/src/main/resources/Excel/QA/环保巡检点配置导入模板.xls create mode 100644 blade-service/blade-desk/src/main/resources/Excel/QA/酸雾塔导入模板.xls diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.xml index 44f9744e..cfdfbb87 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.xml @@ -11,7 +11,7 @@ - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java index 792f3c47..1619a96b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.basic.pojo.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -129,6 +130,7 @@ public class TeamSet extends BaseEntity { /** * 删除标记;1:删除，0:正常 */ + @TableField("IS_DELETED") @Schema(description = "删除标记;1:删除，0:正常") private String deleted; /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDischargeRecController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDischargeRecController.java new file mode 100644 index 00000000..f702d3d0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDischargeRecController.java @@ -0,0 +1,203 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.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.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.energy.excel.BsDischargeRecExcel; +import org.springblade.desk.energy.pojo.entity.BsDischargeRecEntity; +import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; +import org.springblade.desk.energy.pojo.vo.BsDischargeRecVO; +import org.springblade.desk.energy.service.IBsDischargeRecService; +import org.springblade.desk.energy.wrapper.BsDischargeRecWrapper; +import org.springframework.core.io.Resource; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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; +import org.springframework.web.multipart.MultipartFile; + +/** + * 槽液排放记录表 控制器 + * + * @author BladeX + * @since 2025-12-25 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/bsDischargeRec") +@Tag(name = "槽液排放记录表", description = "槽液排放记录表接口") +public class BsDischargeRecController extends BladeController { + + private final IBsDischargeRecService bsDischargeRecService; + + /** + * 槽液排放记录表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入bsDischargeRec") + public R detail(BsDischargeRecEntity bsDischargeRec) { + BsDischargeRecEntity detail = bsDischargeRecService.getOne(Condition.getQueryWrapper(bsDischargeRec)); + return R.data(BsDischargeRecWrapper.build().entityVO(detail)); + } + /** + * 槽液排放记录表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入bsDischargeRec") + public R> list(@Parameter(hidden = true) @RequestParam Map bsDischargeRec, Query query) { + IPage pages = bsDischargeRecService.page(Condition.getPage(query), Condition.getQueryWrapper(bsDischargeRec, BsDischargeRecEntity.class)); + return R.data(BsDischargeRecWrapper.build().pageVO(pages)); + } + + /** + * 槽液排放记录表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入bsDischargeRec") + public R> page(BsDischargeRecVO bsDischargeRec, Query query) { + IPage pages = bsDischargeRecService.selectBsDischargeRecPage(Condition.getPage(query), bsDischargeRec); + return R.data(pages); + } + + /** + * 槽液排放记录表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入bsDischargeRec") + public R save(@Valid @RequestBody BsDischargeRecEntity bsDischargeRec) { + return R.status(bsDischargeRecService.save(bsDischargeRec)); + } + + /** + * 槽液排放记录表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入bsDischargeRec") + public R update(@Valid @RequestBody BsDischargeRecEntity bsDischargeRec) { + return R.status(bsDischargeRecService.updateById(bsDischargeRec)); + } + + /** + * 槽液排放记录表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入bsDischargeRec") + public R submit(@Valid @RequestBody BsDischargeRecEntity bsDischargeRec) { + return R.status(bsDischargeRecService.saveOrUpdate(bsDischargeRec)); + } + + /** + * 槽液排放记录表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(bsDischargeRecService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-bsDischargeRec") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入bsDischargeRec") + public void exportBsDischargeRec(@Parameter(hidden = true) @RequestParam Map bsDischargeRec, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(bsDischargeRec, BsDischargeRecEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BsDischargeRec::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BsDischargeRecEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = bsDischargeRecService.exportBsDischargeRec(queryWrapper); + ExcelUtil.export(response, "槽液排放记录表数据" + DateUtil.time(), "槽液排放记录表数据表", list, BsDischargeRecExcel.class); + } + /** + * 槽液排放记录表 批量新增 + */ + @PostMapping("/saveList") + @ApiOperationSupport(order = 12) + @Operation(summary = "批量新增", description = "传入bsDischargeRecList") + public R save(@Valid @RequestBody List bsDischargeRecList) { + return R.status(bsDischargeRecService.saveOrUpdateBatch(bsDischargeRecList)); + } + /** + * [批量配置] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 10) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/槽液排放记录导入模板.xls", + "导入模版-槽液排放记录导入模板.xls"); + } + + /** + * [批量配置] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 11) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, BsDischargeRecEntity.class + ); + return R.status(bsDischargeRecService.saveBatch(importList)); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDosingRecController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDosingRecController.java new file mode 100644 index 00000000..476ff162 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsDosingRecController.java @@ -0,0 +1,204 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.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.basic.util.ExcelExtUtil; +import org.springblade.desk.energy.excel.BsDosingRecExcel; +import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; +import org.springblade.desk.energy.pojo.entity.BsTowerEntity; +import org.springblade.desk.energy.pojo.vo.BsDosingRecVO; +import org.springblade.desk.energy.service.IBsDosingRecService; +import org.springblade.desk.energy.wrapper.BsDosingRecWrapper; +import org.springframework.core.io.Resource; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + +/** + * 废气/废水加药记录表 控制器 + * + * @author BladeX + * @since 2025-12-25 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/bsDosingRec") +@Tag(name = "废气/废水加药记录表", description = "废气/废水加药记录表接口") +public class BsDosingRecController extends BladeController { + + private final IBsDosingRecService bsDosingRecService; + + /** + * 废气/废水加药记录表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入bsDosingRec") + public R detail(BsDosingRecEntity bsDosingRec) { + BsDosingRecEntity detail = bsDosingRecService.getOne(Condition.getQueryWrapper(bsDosingRec)); + return R.data(BsDosingRecWrapper.build().entityVO(detail)); + } + /** + * 废气/废水加药记录表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入bsDosingRec") + public R> list(@Parameter(hidden = true) @RequestParam Map bsDosingRec, Query query) { + IPage pages = bsDosingRecService.page(Condition.getPage(query), Condition.getQueryWrapper(bsDosingRec, BsDosingRecEntity.class)); + return R.data(BsDosingRecWrapper.build().pageVO(pages)); + } + + /** + * 废气/废水加药记录表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入bsDosingRec") + public R> page(BsDosingRecVO bsDosingRec, Query query) { + IPage pages = bsDosingRecService.selectBsDosingRecPage(Condition.getPage(query), bsDosingRec); + return R.data(pages); + } + + /** + * 废气/废水加药记录表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入bsDosingRec") + public R save(@Valid @RequestBody BsDosingRecEntity bsDosingRec) { + return R.status(bsDosingRecService.save(bsDosingRec)); + } + + /** + * 废气/废水加药记录表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入bsDosingRec") + public R update(@Valid @RequestBody BsDosingRecEntity bsDosingRec) { + return R.status(bsDosingRecService.updateById(bsDosingRec)); + } + + /** + * 废气/废水加药记录表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入bsDosingRec") + public R submit(@Valid @RequestBody BsDosingRecEntity bsDosingRec) { + return R.status(bsDosingRecService.saveOrUpdate(bsDosingRec)); + } + + /** + * 废气/废水加药记录表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(bsDosingRecService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-bsDosingRec") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入bsDosingRec") + public void exportBsDosingRec(@Parameter(hidden = true) @RequestParam Map bsDosingRec, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(bsDosingRec, BsDosingRecEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BsDosingRec::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BsDosingRecEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = bsDosingRecService.exportBsDosingRec(queryWrapper); + ExcelUtil.export(response, "废气/废水加药记录表数据" + DateUtil.time(), "废气/废水加药记录表数据表", list, BsDosingRecExcel.class); + } + + /** + * [批量配置] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 10) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/加药记录导入模板.xls", + "导入模版-加药记录导入模板.xls"); + } + + /** + * [批量配置] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 11) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, BsDosingRecEntity.class + ); + return R.status(bsDosingRecService.saveBatch(importList)); + } + /** + * 废气/废水加药记录表 批量新增 + */ + @PostMapping("/saveList") + @ApiOperationSupport(order = 12) + @Operation(summary = "批量新增", description = "传入bsDosingRecList") + public R saveList(@Valid @RequestBody List bsDosingRecList) { + return R.status(bsDosingRecService.saveOrUpdateBatch(bsDosingRecList)); + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEpciuInspectionPointController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEpciuInspectionPointController.java new file mode 100644 index 00000000..27b7962f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEpciuInspectionPointController.java @@ -0,0 +1,201 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.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.basic.util.ExcelExtUtil; +import org.springblade.desk.energy.excel.BsEpciuInspectionPointExcel; +import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity; +import org.springblade.desk.energy.pojo.vo.BsEpciuInspectionPointVO; +import org.springblade.desk.energy.service.IBsEpciuInspectionPointService; +import org.springblade.desk.energy.wrapper.BsEpciuInspectionPointWrapper; +import org.springframework.core.io.Resource; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + +/** + * 环保巡检点配置表 控制器 + * + * @author BladeX + * @since 2025-12-24 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/bsEpciuInspectionPoint") +@Tag(name = "环保巡检点配置表", description = "环保巡检点配置表接口") +public class BsEpciuInspectionPointController extends BladeController { + + private final IBsEpciuInspectionPointService bsEpciuInspectionPointService; + + /** + * 环保巡检点配置表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入bsEpciuInspectionPoint") + public R detail(BsEpciuInspectionPointEntity bsEpciuInspectionPoint) { + BsEpciuInspectionPointEntity detail = bsEpciuInspectionPointService.getOne(Condition.getQueryWrapper(bsEpciuInspectionPoint)); + return R.data(BsEpciuInspectionPointWrapper.build().entityVO(detail)); + } + /** + * 环保巡检点配置表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入bsEpciuInspectionPoint") + public R> list(@Parameter(hidden = true) @RequestParam Map bsEpciuInspectionPoint, Query query) { + IPage pages = bsEpciuInspectionPointService.page(Condition.getPage(query), Condition.getQueryWrapper(bsEpciuInspectionPoint, BsEpciuInspectionPointEntity.class)); + return R.data(BsEpciuInspectionPointWrapper.build().pageVO(pages)); + } + + /** + * 环保巡检点配置表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入bsEpciuInspectionPoint") + public R> page(BsEpciuInspectionPointVO bsEpciuInspectionPoint, Query query) { + IPage pages = bsEpciuInspectionPointService.selectBsEpciuInspectionPointPage(Condition.getPage(query), bsEpciuInspectionPoint); + return R.data(pages); + } + + /** + * 环保巡检点配置表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入bsEpciuInspectionPoint") + public R save(@Valid @RequestBody BsEpciuInspectionPointEntity bsEpciuInspectionPoint) { + return R.status(bsEpciuInspectionPointService.save(bsEpciuInspectionPoint)); + } + + /** + * 环保巡检点配置表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入bsEpciuInspectionPoint") + public R update(@Valid @RequestBody BsEpciuInspectionPointEntity bsEpciuInspectionPoint) { + return R.status(bsEpciuInspectionPointService.updateById(bsEpciuInspectionPoint)); + } + + /** + * 环保巡检点配置表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入bsEpciuInspectionPoint") + public R submit(@Valid @RequestBody BsEpciuInspectionPointEntity bsEpciuInspectionPoint) { + return R.status(bsEpciuInspectionPointService.saveOrUpdate(bsEpciuInspectionPoint)); + } + + /** + * 环保巡检点配置表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(bsEpciuInspectionPointService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-bsEpciuInspectionPoint") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入bsEpciuInspectionPoint") + public void exportBsEpciuInspectionPoint(@Parameter(hidden = true) @RequestParam Map bsEpciuInspectionPoint, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(bsEpciuInspectionPoint, BsEpciuInspectionPointEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BsEpciuInspectionPoint::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BsEpciuInspectionPointEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = bsEpciuInspectionPointService.exportBsEpciuInspectionPoint(queryWrapper); + ExcelUtil.export(response, "环保巡检点配置表数据" + DateUtil.time(), "环保巡检点配置表数据表", list, BsEpciuInspectionPointExcel.class); + } + /** + * [批量配置] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 10) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/环保巡检点配置导入模板.xls", + "导入模版-环保巡检点配置导入模板.xls"); + } + + /** + * [批量配置] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 11) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, BsEpciuInspectionPointEntity.class + ); + return R.status(bsEpciuInspectionPointService.saveBatch(importList)); + } + /** + * 环保巡检点配置表 批量新增 + */ + @PostMapping("/saveList") + @ApiOperationSupport(order = 12) + @Operation(summary = "批量新增", description = "传入bsEpciuInspectionPointList") + public R saveList(@Valid @RequestBody List bsEpciuInspectionPointList) { + return R.status(bsEpciuInspectionPointService.saveOrUpdateBatch(bsEpciuInspectionPointList)); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEpciuPatrolInspectionController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEpciuPatrolInspectionController.java new file mode 100644 index 00000000..d2c28060 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsEpciuPatrolInspectionController.java @@ -0,0 +1,160 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.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.energy.excel.BsEpciuPatrolInspectionExcel; +import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity; +import org.springblade.desk.energy.pojo.vo.BsEpciuPatrolInspectionVO; +import org.springblade.desk.energy.service.IBsEpciuPatrolInspectionService; +import org.springblade.desk.energy.wrapper.BsEpciuPatrolInspectionWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * 环保巡检任务表 控制器 + * + * @author BladeX + * @since 2025-12-24 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/bsEpciuPatrolInspection") +@Tag(name = "环保巡检任务表", description = "环保巡检任务表接口") +public class BsEpciuPatrolInspectionController extends BladeController { + + private final IBsEpciuPatrolInspectionService bsEpciuPatrolInspectionService; + + /** + * 环保巡检任务表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入bsEpciuPatrolInspection") + public R detail(BsEpciuPatrolInspectionEntity bsEpciuPatrolInspection) { + BsEpciuPatrolInspectionEntity detail = bsEpciuPatrolInspectionService.getOne(Condition.getQueryWrapper(bsEpciuPatrolInspection)); + return R.data(BsEpciuPatrolInspectionWrapper.build().entityVO(detail)); + } + /** + * 环保巡检任务表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入bsEpciuPatrolInspection") + public R> list(@Parameter(hidden = true) @RequestParam Map bsEpciuPatrolInspection, Query query) { + IPage pages = bsEpciuPatrolInspectionService.page(Condition.getPage(query), Condition.getQueryWrapper(bsEpciuPatrolInspection, BsEpciuPatrolInspectionEntity.class)); + return R.data(BsEpciuPatrolInspectionWrapper.build().pageVO(pages)); + } + + /** + * 环保巡检任务表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入bsEpciuPatrolInspection") + public R> page(BsEpciuPatrolInspectionVO bsEpciuPatrolInspection, Query query) { + IPage pages = bsEpciuPatrolInspectionService.selectBsEpciuPatrolInspectionPage(Condition.getPage(query), bsEpciuPatrolInspection); + return R.data(pages); + } + + /** + * 环保巡检任务表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入bsEpciuPatrolInspection") + public R save(@Valid @RequestBody BsEpciuPatrolInspectionEntity bsEpciuPatrolInspection) { + return R.status(bsEpciuPatrolInspectionService.save(bsEpciuPatrolInspection)); + } + + /** + * 环保巡检任务表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入bsEpciuPatrolInspection") + public R update(@Valid @RequestBody BsEpciuPatrolInspectionEntity bsEpciuPatrolInspection) { + return R.status(bsEpciuPatrolInspectionService.updateById(bsEpciuPatrolInspection)); + } + + /** + * 环保巡检任务表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入bsEpciuPatrolInspection") + public R submit(@Valid @RequestBody BsEpciuPatrolInspectionEntity bsEpciuPatrolInspection) { + return R.status(bsEpciuPatrolInspectionService.saveOrUpdate(bsEpciuPatrolInspection)); + } + + /** + * 环保巡检任务表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(bsEpciuPatrolInspectionService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-bsEpciuPatrolInspection") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入bsEpciuPatrolInspection") + public void exportBsEpciuPatrolInspection(@Parameter(hidden = true) @RequestParam Map bsEpciuPatrolInspection, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(bsEpciuPatrolInspection, BsEpciuPatrolInspectionEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BsEpciuPatrolInspection::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BsEpciuPatrolInspectionEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = bsEpciuPatrolInspectionService.exportBsEpciuPatrolInspection(queryWrapper); + ExcelUtil.export(response, "环保巡检任务表数据" + DateUtil.time(), "环保巡检任务表数据表", list, BsEpciuPatrolInspectionExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsInsTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsInsTestController.java new file mode 100644 index 00000000..71a1c7db --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsInsTestController.java @@ -0,0 +1,204 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.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.basic.util.ExcelExtUtil; +import org.springblade.desk.energy.excel.BsInsTestExcel; +import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; +import org.springblade.desk.energy.pojo.entity.BsInsTestEntity; +import org.springblade.desk.energy.pojo.vo.BsInsTestVO; +import org.springblade.desk.energy.service.IBsInsTestService; +import org.springblade.desk.energy.wrapper.BsInsTestWrapper; +import org.springframework.core.io.Resource; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + +/** + * 废水化验记录表 控制器 + * + * @author BladeX + * @since 2025-12-29 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/bsInsTest") +@Tag(name = "废水化验记录表", description = "废水化验记录表接口") +public class BsInsTestController extends BladeController { + + private final IBsInsTestService bsInsTestService; + + /** + * 废水化验记录表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入bsInsTest") + public R detail(BsInsTestEntity bsInsTest) { + BsInsTestEntity detail = bsInsTestService.getOne(Condition.getQueryWrapper(bsInsTest)); + return R.data(BsInsTestWrapper.build().entityVO(detail)); + } + /** + * 废水化验记录表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入bsInsTest") + public R> list(@Parameter(hidden = true) @RequestParam Map bsInsTest, Query query) { + IPage pages = bsInsTestService.page(Condition.getPage(query), Condition.getQueryWrapper(bsInsTest, BsInsTestEntity.class)); + return R.data(BsInsTestWrapper.build().pageVO(pages)); + } + + /** + * 废水化验记录表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入bsInsTest") + public R> page(BsInsTestVO bsInsTest, Query query) { + IPage pages = bsInsTestService.selectBsInsTestPage(Condition.getPage(query), bsInsTest); + return R.data(pages); + } + + /** + * 废水化验记录表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入bsInsTest") + public R save(@Valid @RequestBody BsInsTestEntity bsInsTest) { + return R.status(bsInsTestService.save(bsInsTest)); + } + + /** + * 废水化验记录表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入bsInsTest") + public R update(@Valid @RequestBody BsInsTestEntity bsInsTest) { + return R.status(bsInsTestService.updateById(bsInsTest)); + } + + /** + * 废水化验记录表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入bsInsTest") + public R submit(@Valid @RequestBody BsInsTestEntity bsInsTest) { + return R.status(bsInsTestService.saveOrUpdate(bsInsTest)); + } + + /** + * 废水化验记录表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(bsInsTestService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-bsInsTest") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入bsInsTest") + public void exportBsInsTest(@Parameter(hidden = true) @RequestParam Map bsInsTest, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(bsInsTest, BsInsTestEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BsInsTest::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BsInsTestEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = bsInsTestService.exportBsInsTest(queryWrapper); + ExcelUtil.export(response, "废水化验记录表数据" + DateUtil.time(), "废水化验记录表数据表", list, BsInsTestExcel.class); + } + + /** + * 废水化验记录表 批量新增 + */ + @PostMapping("/saveList") + @ApiOperationSupport(order = 12) + @Operation(summary = "批量新增", description = "传入bsInsTestList") + public R saveList(@Valid @RequestBody List bsInsTestList) { + return R.status(bsInsTestService.saveOrUpdateBatch(bsInsTestList)); + } + /** + * [批量配置] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 10) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/废水化验记录导入模板.xls", + "导入模版-废水化验记录导入模板.xls"); + } + + /** + * [批量配置] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 11) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, BsInsTestEntity.class + ); + return R.status(bsInsTestService.saveBatch(importList)); + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsMeterParamController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsMeterParamController.java new file mode 100644 index 00000000..ca4912d9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsMeterParamController.java @@ -0,0 +1,161 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.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.springblade.desk.energy.excel.BsMeterParamExcel; +import org.springblade.desk.energy.pojo.entity.BsMeterParamEntity; +import org.springblade.desk.energy.pojo.vo.BsMeterParamVO; +import org.springblade.desk.energy.service.IBsMeterParamService; +import org.springblade.desk.energy.wrapper.BsMeterParamWrapper; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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 BladeX + * @since 2025-12-25 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/bsMeterParam") +@Tag(name = "仪表参数表", description = "仪表参数表接口") +public class BsMeterParamController extends BladeController { + + private final IBsMeterParamService bsMeterParamService; + + /** + * 仪表参数表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入bsMeterParam") + public R detail(BsMeterParamEntity bsMeterParam) { + BsMeterParamEntity detail = bsMeterParamService.getOne(Condition.getQueryWrapper(bsMeterParam)); + return R.data(BsMeterParamWrapper.build().entityVO(detail)); + } + /** + * 仪表参数表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入bsMeterParam") + public R> list(@Parameter(hidden = true) @RequestParam Map bsMeterParam, Query query) { + IPage pages = bsMeterParamService.page(Condition.getPage(query), Condition.getQueryWrapper(bsMeterParam, BsMeterParamEntity.class)); + return R.data(BsMeterParamWrapper.build().pageVO(pages)); + } + + /** + * 仪表参数表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入bsMeterParam") + public R> page(BsMeterParamVO bsMeterParam, Query query) { + IPage pages = bsMeterParamService.selectBsMeterParamPage(Condition.getPage(query), bsMeterParam); + return R.data(pages); + } + + /** + * 仪表参数表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入bsMeterParam") + public R save(@Valid @RequestBody BsMeterParamEntity bsMeterParam) { + return R.status(bsMeterParamService.save(bsMeterParam)); + } + + /** + * 仪表参数表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入bsMeterParam") + public R update(@Valid @RequestBody BsMeterParamEntity bsMeterParam) { + return R.status(bsMeterParamService.updateById(bsMeterParam)); + } + + /** + * 仪表参数表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入bsMeterParam") + public R submit(@Valid @RequestBody BsMeterParamEntity bsMeterParam) { + return R.status(bsMeterParamService.saveOrUpdate(bsMeterParam)); + } + + /** + * 仪表参数表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(bsMeterParamService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-bsMeterParam") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入bsMeterParam") + public void exportBsMeterParam(@Parameter(hidden = true) @RequestParam Map bsMeterParam, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(bsMeterParam, BsMeterParamEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BsMeterParam::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BsMeterParamEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = bsMeterParamService.exportBsMeterParam(queryWrapper); + ExcelUtil.export(response, "仪表参数表数据" + DateUtil.time(), "仪表参数表数据表", list, BsMeterParamExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java new file mode 100644 index 00000000..a9e03915 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafeInspectionPointController.java @@ -0,0 +1,203 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.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.basic.pojo.entity.BatConfig; +import org.springblade.desk.basic.util.ExcelExtUtil; +import org.springblade.desk.energy.excel.BsSafeInspectionPointExcel; +import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity; +import org.springblade.desk.energy.pojo.vo.BsSafeInspectionPointVO; +import org.springblade.desk.energy.service.IBsSafeInspectionPointService; +import org.springblade.desk.energy.wrapper.BsSafeInspectionPointWrapper; +import org.springframework.core.io.Resource; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + +/** + * 巡检点配置表 控制器 + * + * @author BladeX + * @since 2025-12-22 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/bsSafeInspectionPoint") +@Tag(name = "巡检点配置表", description = "巡检点配置表接口") +public class BsSafeInspectionPointController extends BladeController { + + private final IBsSafeInspectionPointService bsSafeInspectionPointService; + + /** + * 巡检点配置表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入bsSafeInspectionPoint") + public R detail(BsSafeInspectionPointEntity bsSafeInspectionPoint) { + BsSafeInspectionPointEntity detail = bsSafeInspectionPointService.getOne(Condition.getQueryWrapper(bsSafeInspectionPoint)); + return R.data(BsSafeInspectionPointWrapper.build().entityVO(detail)); + } + /** + * 巡检点配置表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入bsSafeInspectionPoint") + public R> list(@Parameter(hidden = true) @RequestParam Map bsSafeInspectionPoint, Query query) { + IPage pages = bsSafeInspectionPointService.page(Condition.getPage(query), Condition.getQueryWrapper(bsSafeInspectionPoint, BsSafeInspectionPointEntity.class)); + return R.data(BsSafeInspectionPointWrapper.build().pageVO(pages)); + } + + /** + * 巡检点配置表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入bsSafeInspectionPoint") + public R> page(BsSafeInspectionPointVO bsSafeInspectionPoint, Query query) { + IPage pages = bsSafeInspectionPointService.selectBsSafeInspectionPointPage(Condition.getPage(query), bsSafeInspectionPoint); + return R.data(pages); + } + + /** + * 巡检点配置表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入bsSafeInspectionPoint") + public R save(@Valid @RequestBody BsSafeInspectionPointEntity bsSafeInspectionPoint) { + return R.status(bsSafeInspectionPointService.save(bsSafeInspectionPoint)); + } + + /** + * 巡检点配置表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入bsSafeInspectionPoint") + public R update(@Valid @RequestBody BsSafeInspectionPointEntity bsSafeInspectionPoint) { + return R.status(bsSafeInspectionPointService.updateById(bsSafeInspectionPoint)); + } + + /** + * 巡检点配置表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入bsSafeInspectionPoint") + public R submit(@Valid @RequestBody BsSafeInspectionPointEntity bsSafeInspectionPoint) { + return R.status(bsSafeInspectionPointService.saveOrUpdate(bsSafeInspectionPoint)); + } + + /** + * 巡检点配置表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(bsSafeInspectionPointService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-bsSafeInspectionPoint") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入bsSafeInspectionPoint") + public void exportBsSafeInspectionPoint(@Parameter(hidden = true) @RequestParam Map bsSafeInspectionPoint, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(bsSafeInspectionPoint, BsSafeInspectionPointEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BsSafeInspectionPoint::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BsSafeInspectionPointEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = bsSafeInspectionPointService.exportBsSafeInspectionPoint(queryWrapper); + ExcelUtil.export(response, "巡检点配置表数据" + DateUtil.time(), "巡检点配置表数据表", list, BsSafeInspectionPointExcel.class); + } + + /** + * [批量配置] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 10) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/安全巡检配置导入模板.xls", + "导入模版-安全巡检配置导入模板.xls"); + } + + /** + * [批量配置] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 11) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, BsSafeInspectionPointEntity.class + ); + return R.status(bsSafeInspectionPointService.saveBatch(importList)); + } + /** + * 巡检点配置表 批量新增 + */ + @PostMapping("/saveList") + @ApiOperationSupport(order = 12) + @Operation(summary = "批量新增", description = "传入bsSafeInspectionPointList") + public R saveList(@Valid @RequestBody List bsSafeInspectionPointList) { + return R.status(bsSafeInspectionPointService.saveOrUpdateBatch(bsSafeInspectionPointList)); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafePatrolInspectionController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafePatrolInspectionController.java new file mode 100644 index 00000000..4e49f563 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsSafePatrolInspectionController.java @@ -0,0 +1,160 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.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.energy.excel.BsSafePatrolInspectionExcel; +import org.springblade.desk.energy.pojo.entity.BsSafePatrolInspectionEntity; +import org.springblade.desk.energy.pojo.vo.BsSafePatrolInspectionVO; +import org.springblade.desk.energy.service.IBsSafePatrolInspectionService; +import org.springblade.desk.energy.wrapper.BsSafePatrolInspectionWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * 巡检任务表 控制器 + * + * @author BladeX + * @since 2025-12-22 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/bsSafePatrolInspection") +@Tag(name = "巡检任务表", description = "巡检任务表接口") +public class BsSafePatrolInspectionController extends BladeController { + + private final IBsSafePatrolInspectionService bsSafePatrolInspectionService; + + /** + * 巡检任务表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入bsSafePatrolInspection") + public R detail(BsSafePatrolInspectionEntity bsSafePatrolInspection) { + BsSafePatrolInspectionEntity detail = bsSafePatrolInspectionService.getOne(Condition.getQueryWrapper(bsSafePatrolInspection)); + return R.data(BsSafePatrolInspectionWrapper.build().entityVO(detail)); + } + /** + * 巡检任务表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入bsSafePatrolInspection") + public R> list(@Parameter(hidden = true) @RequestParam Map bsSafePatrolInspection, Query query) { + IPage pages = bsSafePatrolInspectionService.page(Condition.getPage(query), Condition.getQueryWrapper(bsSafePatrolInspection, BsSafePatrolInspectionEntity.class)); + return R.data(BsSafePatrolInspectionWrapper.build().pageVO(pages)); + } + + /** + * 巡检任务表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入bsSafePatrolInspection") + public R> page(BsSafePatrolInspectionVO bsSafePatrolInspection, Query query) { + IPage pages = bsSafePatrolInspectionService.selectBsSafePatrolInspectionPage(Condition.getPage(query), bsSafePatrolInspection); + return R.data(pages); + } + + /** + * 巡检任务表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入bsSafePatrolInspection") + public R save(@Valid @RequestBody BsSafePatrolInspectionEntity bsSafePatrolInspection) { + return R.status(bsSafePatrolInspectionService.save(bsSafePatrolInspection)); + } + + /** + * 巡检任务表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入bsSafePatrolInspection") + public R update(@Valid @RequestBody BsSafePatrolInspectionEntity bsSafePatrolInspection) { + return R.status(bsSafePatrolInspectionService.updateById(bsSafePatrolInspection)); + } + + /** + * 巡检任务表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入bsSafePatrolInspection") + public R submit(@Valid @RequestBody BsSafePatrolInspectionEntity bsSafePatrolInspection) { + return R.status(bsSafePatrolInspectionService.saveOrUpdate(bsSafePatrolInspection)); + } + + /** + * 巡检任务表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(bsSafePatrolInspectionService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-bsSafePatrolInspection") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入bsSafePatrolInspection") + public void exportBsSafePatrolInspection(@Parameter(hidden = true) @RequestParam Map bsSafePatrolInspection, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(bsSafePatrolInspection, BsSafePatrolInspectionEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BsSafePatrolInspection::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BsSafePatrolInspectionEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = bsSafePatrolInspectionService.exportBsSafePatrolInspection(queryWrapper); + ExcelUtil.export(response, "巡检任务表数据" + DateUtil.time(), "巡检任务表数据表", list, BsSafePatrolInspectionExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsTowerController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsTowerController.java new file mode 100644 index 00000000..fbc9380f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsTowerController.java @@ -0,0 +1,202 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.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.basic.util.ExcelExtUtil; +import org.springblade.desk.energy.excel.BsTowerExcel; +import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity; +import org.springblade.desk.energy.pojo.entity.BsTowerEntity; +import org.springblade.desk.energy.pojo.vo.BsTowerVO; +import org.springblade.desk.energy.service.IBsTowerService; +import org.springblade.desk.energy.wrapper.BsTowerWrapper; +import org.springframework.core.io.Resource; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + +/** + * 酸雾塔报警点配置表 控制器 + * + * @author BladeX + * @since 2025-12-23 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/bsTower") +@Tag(name = "酸雾塔报警点配置表", description = "酸雾塔报警点配置表接口") +public class BsTowerController extends BladeController { + + private final IBsTowerService bsTowerService; + + /** + * 酸雾塔报警点配置表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入bsTower") + public R detail(BsTowerEntity bsTower) { + BsTowerEntity detail = bsTowerService.getOne(Condition.getQueryWrapper(bsTower)); + return R.data(BsTowerWrapper.build().entityVO(detail)); + } + /** + * 酸雾塔报警点配置表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入bsTower") + public R> list(@Parameter(hidden = true) @RequestParam Map bsTower, Query query) { + IPage pages = bsTowerService.page(Condition.getPage(query), Condition.getQueryWrapper(bsTower, BsTowerEntity.class)); + return R.data(BsTowerWrapper.build().pageVO(pages)); + } + + /** + * 酸雾塔报警点配置表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入bsTower") + public R> page(BsTowerVO bsTower, Query query) { + IPage pages = bsTowerService.selectBsTowerPage(Condition.getPage(query), bsTower); + return R.data(pages); + } + + /** + * 酸雾塔报警点配置表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入bsTower") + public R save(@Valid @RequestBody BsTowerEntity bsTower) { + return R.status(bsTowerService.save(bsTower)); + } + + /** + * 酸雾塔报警点配置表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入bsTower") + public R update(@Valid @RequestBody BsTowerEntity bsTower) { + return R.status(bsTowerService.updateById(bsTower)); + } + + /** + * 酸雾塔报警点配置表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入bsTower") + public R submit(@Valid @RequestBody BsTowerEntity bsTower) { + return R.status(bsTowerService.saveOrUpdate(bsTower)); + } + + /** + * 酸雾塔报警点配置表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(bsTowerService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-bsTower") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入bsTower") + public void exportBsTower(@Parameter(hidden = true) @RequestParam Map bsTower, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(bsTower, BsTowerEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BsTower::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BsTowerEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = bsTowerService.exportBsTower(queryWrapper); + ExcelUtil.export(response, "酸雾塔报警点配置表数据" + DateUtil.time(), "酸雾塔报警点配置表数据表", list, BsTowerExcel.class); + } + /** + * [批量配置] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 10) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/酸雾塔导入模板.xls", + "导入模版-酸雾塔导入模板.xls"); + } + + /** + * [批量配置] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 11) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, BsTowerEntity.class + ); + return R.status(bsTowerService.saveBatch(importList)); + } + /** + * 酸雾塔报警点配置表 批量新增 + */ + @PostMapping("/saveList") + @ApiOperationSupport(order = 12) + @Operation(summary = "批量新增", description = "传入bsTowerList") + public R saveALL(@Valid @RequestBody List bsTowerList) { + return R.status(bsTowerService.saveOrUpdateBatch(bsTowerList)); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsTowerReportController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsTowerReportController.java new file mode 100644 index 00000000..6dd5b4e9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsTowerReportController.java @@ -0,0 +1,160 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.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.energy.excel.BsTowerReportExcel; +import org.springblade.desk.energy.pojo.entity.BsTowerReportEntity; +import org.springblade.desk.energy.pojo.vo.BsTowerReportVO; +import org.springblade.desk.energy.service.IBsTowerReportService; +import org.springblade.desk.energy.wrapper.BsTowerReportWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * 酸雾塔报警记录表 控制器 + * + * @author BladeX + * @since 2025-12-24 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/bsTowerReport") +@Tag(name = "酸雾塔报警记录表", description = "酸雾塔报警记录表接口") +public class BsTowerReportController extends BladeController { + + private final IBsTowerReportService bsTowerReportService; + + /** + * 酸雾塔报警记录表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入bsTowerReport") + public R detail(BsTowerReportEntity bsTowerReport) { + BsTowerReportEntity detail = bsTowerReportService.getOne(Condition.getQueryWrapper(bsTowerReport)); + return R.data(BsTowerReportWrapper.build().entityVO(detail)); + } + /** + * 酸雾塔报警记录表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入bsTowerReport") + public R> list(@Parameter(hidden = true) @RequestParam Map bsTowerReport, Query query) { + IPage pages = bsTowerReportService.page(Condition.getPage(query), Condition.getQueryWrapper(bsTowerReport, BsTowerReportEntity.class)); + return R.data(BsTowerReportWrapper.build().pageVO(pages)); + } + + /** + * 酸雾塔报警记录表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入bsTowerReport") + public R> page(BsTowerReportVO bsTowerReport, Query query) { + IPage pages = bsTowerReportService.selectBsTowerReportPage(Condition.getPage(query), bsTowerReport); + return R.data(pages); + } + + /** + * 酸雾塔报警记录表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入bsTowerReport") + public R save(@Valid @RequestBody BsTowerReportEntity bsTowerReport) { + return R.status(bsTowerReportService.save(bsTowerReport)); + } + + /** + * 酸雾塔报警记录表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入bsTowerReport") + public R update(@Valid @RequestBody BsTowerReportEntity bsTowerReport) { + return R.status(bsTowerReportService.updateById(bsTowerReport)); + } + + /** + * 酸雾塔报警记录表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入bsTowerReport") + public R submit(@Valid @RequestBody BsTowerReportEntity bsTowerReport) { + return R.status(bsTowerReportService.saveOrUpdate(bsTowerReport)); + } + + /** + * 酸雾塔报警记录表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(bsTowerReportService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-bsTowerReport") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入bsTowerReport") + public void exportBsTowerReport(@Parameter(hidden = true) @RequestParam Map bsTowerReport, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(bsTowerReport, BsTowerReportEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BsTowerReport::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BsTowerReportEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = bsTowerReportService.exportBsTowerReport(queryWrapper); + ExcelUtil.export(response, "酸雾塔报警记录表数据" + DateUtil.time(), "酸雾塔报警记录表数据表", list, BsTowerReportExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsWasteGasRunRecController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsWasteGasRunRecController.java new file mode 100644 index 00000000..5f0bf1c4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/controller/BsWasteGasRunRecController.java @@ -0,0 +1,193 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.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.basic.util.ExcelExtUtil; +import org.springblade.desk.energy.excel.BsWasteGasRunRecExcel; +import org.springblade.desk.energy.pojo.entity.BsTowerEntity; +import org.springblade.desk.energy.pojo.entity.BsWasteGasRunRecEntity; +import org.springblade.desk.energy.pojo.vo.BsWasteGasRunRecVO; +import org.springblade.desk.energy.service.IBsWasteGasRunRecService; +import org.springblade.desk.energy.wrapper.BsWasteGasRunRecWrapper; +import org.springframework.core.io.Resource; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; + +import java.util.List; +import java.util.Map; + +/** + * 废气运行记录表 控制器 + * + * @author BladeX + * @since 2025-12-29 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/bsWasteGasRunRec") +@Tag(name = "废气运行记录表", description = "废气运行记录表接口") +public class BsWasteGasRunRecController extends BladeController { + + private final IBsWasteGasRunRecService bsWasteGasRunRecService; + + /** + * 废气运行记录表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入bsWasteGasRunRec") + public R detail(BsWasteGasRunRecEntity bsWasteGasRunRec) { + BsWasteGasRunRecEntity detail = bsWasteGasRunRecService.getOne(Condition.getQueryWrapper(bsWasteGasRunRec)); + return R.data(BsWasteGasRunRecWrapper.build().entityVO(detail)); + } + /** + * 废气运行记录表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入bsWasteGasRunRec") + public R> list(@Parameter(hidden = true) @RequestParam Map bsWasteGasRunRec, Query query) { + IPage pages = bsWasteGasRunRecService.page(Condition.getPage(query), Condition.getQueryWrapper(bsWasteGasRunRec, BsWasteGasRunRecEntity.class)); + return R.data(BsWasteGasRunRecWrapper.build().pageVO(pages)); + } + + /** + * 废气运行记录表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入bsWasteGasRunRec") + public R> page(BsWasteGasRunRecVO bsWasteGasRunRec, Query query) { + IPage pages = bsWasteGasRunRecService.selectBsWasteGasRunRecPage(Condition.getPage(query), bsWasteGasRunRec); + return R.data(pages); + } + + /** + * 废气运行记录表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入bsWasteGasRunRec") + public R save(@Valid @RequestBody BsWasteGasRunRecEntity bsWasteGasRunRec) { + return R.status(bsWasteGasRunRecService.save(bsWasteGasRunRec)); + } + + /** + * 废气运行记录表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入bsWasteGasRunRec") + public R update(@Valid @RequestBody BsWasteGasRunRecEntity bsWasteGasRunRec) { + return R.status(bsWasteGasRunRecService.updateById(bsWasteGasRunRec)); + } + + /** + * 废气运行记录表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入bsWasteGasRunRec") + public R submit(@Valid @RequestBody BsWasteGasRunRecEntity bsWasteGasRunRec) { + return R.status(bsWasteGasRunRecService.saveOrUpdate(bsWasteGasRunRec)); + } + + /** + * 废气运行记录表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(bsWasteGasRunRecService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-bsWasteGasRunRec") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入bsWasteGasRunRec") + public void exportBsWasteGasRunRec(@Parameter(hidden = true) @RequestParam Map bsWasteGasRunRec, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(bsWasteGasRunRec, BsWasteGasRunRecEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(BsWasteGasRunRec::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(BsWasteGasRunRecEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = bsWasteGasRunRecService.exportBsWasteGasRunRec(queryWrapper); + ExcelUtil.export(response, "废气运行记录表数据" + DateUtil.time(), "废气运行记录表数据表", list, BsWasteGasRunRecExcel.class); + } + /** + * [批量配置] 下载Excel模板 + */ + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 10) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/酸雾塔导入模板.xls", + "导入模版-酸雾塔导入模板.xls"); + } + + /** + * [批量配置] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 11) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, BsWasteGasRunRecEntity.class + ); + return R.status(bsWasteGasRunRecService.saveBatch(importList)); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsDischargeRecExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsDischargeRecExcel.java new file mode 100644 index 00000000..dc39e645 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsDischargeRecExcel.java @@ -0,0 +1,104 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.excel; + + +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.util.Date; + + +/** + * 槽液排放记录表 Excel实体类 + * + * @author BladeX + * @since 2025-12-25 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BsDischargeRecExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ColumnWidth(20) + @ExcelProperty("ID") + private Short id; + /** + * 报废槽液类型 + */ + @ColumnWidth(20) + @ExcelProperty("报废槽液类型") + private String wasteType; + /** + * 排放班组 + */ + @ColumnWidth(20) + @ExcelProperty("排放班组") + private String bsTeamSet; + /** + * 排放量(单位：L) + */ + @ColumnWidth(20) + @ExcelProperty("排放量(单位：L)") + private Long amount; + /** + * 日期 + */ + @ColumnWidth(20) + @ExcelProperty("日期") + private Date dirDate; + /** + * 水处理工 + */ + @ColumnWidth(20) + @ExcelProperty("水处理工") + private String handleMan; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String memo; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsDosingRecExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsDosingRecExcel.java new file mode 100644 index 00000000..2d785abc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsDosingRecExcel.java @@ -0,0 +1,123 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.excel; + + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +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.Serializable; +import java.io.Serial; + + +/** + * 废气/废水加药记录表 Excel实体类 + * + * @author BladeX + * @since 2025-12-25 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BsDosingRecExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ColumnWidth(20) + @ExcelProperty("主键ID") + private Short id; + /** + * 酸雾塔 + */ + @ColumnWidth(20) + @ExcelProperty("酸雾塔") + private BigDecimal btId; + /** + * 设施 + */ + @ColumnWidth(20) + @ExcelProperty("设施") + private String device; + /** + * 药品 + */ + @ColumnWidth(20) + @ExcelProperty("药品") + private String drug; + /** + * 剂量 + */ + @ColumnWidth(20) + @ExcelProperty("剂量") + private BigDecimal dose; + /** + * 加药时间 + */ + @ColumnWidth(20) + @ExcelProperty("加药时间") + private Date dosingTime; + /** + * 加药人 + */ + @ColumnWidth(20) + @ExcelProperty("加药人") + private String dosingMan; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String memo; + /** + * 处理类型 + */ + @ColumnWidth(20) + @ExcelProperty("处理类型") + private Long handleResult; + /** + * 类型：1、废气加药；2、废水加药 + */ + @ColumnWidth(20) + @ExcelProperty("类型：1、废气加药；2、废水加药") + private String dorType; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java new file mode 100644 index 00000000..b71c949d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuInspectionPointExcel.java @@ -0,0 +1,105 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.excel; + + +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +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.Serializable; +import java.io.Serial; + + +/** + * 环保巡检点配置表 Excel实体类 + * + * @author BladeX + * @since 2025-12-24 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BsEpciuInspectionPointExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ColumnWidth(20) + @ExcelProperty("ID") + private Short id; + /** + * 巡检点编号 + */ + @ColumnWidth(20) + @ExcelProperty("巡检点编号") + private String insNum; + /** + * 巡检点位置 + */ + @ColumnWidth(20) + @ExcelProperty("巡检点位置") + private String insSite; + /** + * 上次巡检日期 + */ + @ColumnWidth(20) + @ExcelProperty("上次巡检日期") + private Date lastInsCycle; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String memo; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + /** + * 巡检点类型 + */ + @ColumnWidth(20) + @ExcelProperty("巡检点类型") + private String insType; + /** + * 巡检周期 + */ + @ColumnWidth(20) + @ExcelProperty("巡检周期") + private Long insCycle; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuPatrolInspectionExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuPatrolInspectionExcel.java new file mode 100644 index 00000000..35a7fbb9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsEpciuPatrolInspectionExcel.java @@ -0,0 +1,135 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.excel; + + +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +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.Serializable; +import java.io.Serial; + + +/** + * 环保巡检任务表 Excel实体类 + * + * @author BladeX + * @since 2025-12-24 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BsEpciuPatrolInspectionExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ColumnWidth(20) + @ExcelProperty("ID") + private Short id; + /** + * 巡检点配置 + */ + @ColumnWidth(20) + @ExcelProperty("巡检点配置") + private Long epcId; + /** + * 巡检点编号 + */ + @ColumnWidth(20) + @ExcelProperty("巡检点编号") + private String insNum; + /** + * 巡检点位置 + */ + @ColumnWidth(20) + @ExcelProperty("巡检点位置") + private String insSite; + /** + * 巡检人 + */ + @ColumnWidth(20) + @ExcelProperty("巡检人") + private String insMan; + /** + * 等待周期 + */ + @ColumnWidth(20) + @ExcelProperty("等待周期") + private Date waitCycle; + /** + * 巡检点备注 + */ + @ColumnWidth(20) + @ExcelProperty("巡检点备注") + private String insMemo; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String parMemo; + /** + * 发起时间 + */ + @ColumnWidth(20) + @ExcelProperty("发起时间") + private Date launchTime; + /** + * 检验时间 + */ + @ColumnWidth(20) + @ExcelProperty("检验时间") + private Date testTime; + /** + * 任务状态:1、已检，2、待检，3、未准时完成 + */ + @ColumnWidth(20) + @ExcelProperty("任务状态:1、已检，2、待检，3、未准时完成") + private String taskStatus; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + /** + * 巡检点类型 + */ + @ColumnWidth(20) + @ExcelProperty("巡检点类型") + private String insType; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsInsTestExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsInsTestExcel.java new file mode 100644 index 00000000..b3f85312 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsInsTestExcel.java @@ -0,0 +1,123 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.excel; + + +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +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.Serializable; +import java.io.Serial; + + +/** + * 废水化验记录表 Excel实体类 + * + * @author BladeX + * @since 2025-12-29 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BsInsTestExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ColumnWidth(20) + @ExcelProperty("主键ID") + private Short id; + /** + * 设施 + */ + @ColumnWidth(20) + @ExcelProperty("设施") + private String device; + /** + * 化验时间 + */ + @ColumnWidth(20) + @ExcelProperty("化验时间") + private Date dosingTime; + /** + * 化验人 + */ + @ColumnWidth(20) + @ExcelProperty("化验人") + private String dosingMan; + /** + * 镍 + */ + @ColumnWidth(20) + @ExcelProperty("镍") + private String itNi; + /** + * 铜 + */ + @ColumnWidth(20) + @ExcelProperty("铜") + private String itCu; + /** + * 六价铬 + */ + @ColumnWidth(20) + @ExcelProperty("六价铬") + private String itCr; + /** + * 氰化物 + */ + @ColumnWidth(20) + @ExcelProperty("氰化物") + private String itCn2; + /** + * PH + */ + @ColumnWidth(20) + @ExcelProperty("PH") + private String itPh; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String memo; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsMeterParamExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsMeterParamExcel.java new file mode 100644 index 00000000..dd968b56 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsMeterParamExcel.java @@ -0,0 +1,99 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.excel; + + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +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.Serializable; +import java.io.Serial; + + +/** + * 仪表参数表 Excel实体类 + * + * @author BladeX + * @since 2025-12-25 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BsMeterParamExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ColumnWidth(20) + @ExcelProperty("主键ID") + private Short id; + /** + * 池体名称 + */ + @ColumnWidth(20) + @ExcelProperty("池体名称") + private String poolName; + /** + * 测量值 + */ + @ColumnWidth(20) + @ExcelProperty("测量值") + private Integer meter; + /** + * 上限 + */ + @ColumnWidth(20) + @ExcelProperty("上限") + private Integer upLimit; + /** + * 下限 + */ + @ColumnWidth(20) + @ExcelProperty("下限") + private Integer downLimit; + /** + * 参考值 + */ + @ColumnWidth(20) + @ExcelProperty("参考值") + private Integer consult; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsSafeInspectionPointExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsSafeInspectionPointExcel.java new file mode 100644 index 00000000..8f3d5e97 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsSafeInspectionPointExcel.java @@ -0,0 +1,93 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.excel; + + +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +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.Serializable; +import java.io.Serial; + + +/** + * 巡检点配置表 Excel实体类 + * + * @author BladeX + * @since 2025-12-22 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BsSafeInspectionPointExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ColumnWidth(20) + @ExcelProperty("ID") + private Long id; + /** + * 巡检器 + */ + @ColumnWidth(20) + @ExcelProperty("巡检器") + private String patrolRegister; + /** + * 巡检点 + */ + @ColumnWidth(20) + @ExcelProperty("巡检点") + private String insSpot; + /** + * 上次巡检周期 + */ + @ColumnWidth(20) + @ExcelProperty("上次巡检周期") + private Date lastInsCycle; + /** + * 备注 + */ + @ColumnWidth(20) + @ExcelProperty("备注") + private String memo; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsSafePatrolInspectionExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsSafePatrolInspectionExcel.java new file mode 100644 index 00000000..6e08b0bf --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsSafePatrolInspectionExcel.java @@ -0,0 +1,129 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.excel; + + +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +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.Serializable; +import java.io.Serial; + + +/** + * 巡检任务表 Excel实体类 + * + * @author BladeX + * @since 2025-12-22 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BsSafePatrolInspectionExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ColumnWidth(20) + @ExcelProperty("ID") + private Long id; + /** + * 巡检点配置 + */ + @ColumnWidth(20) + @ExcelProperty("巡检点配置") + private Long ipId; + /** + * 巡检器 + */ + @ColumnWidth(20) + @ExcelProperty("巡检器") + private String patrolRegister; + /** + * 巡检点 + */ + @ColumnWidth(20) + @ExcelProperty("巡检点") + private String insSpot; + /** + * 巡检人 + */ + @ColumnWidth(20) + @ExcelProperty("巡检人") + private String insMan; + /** + * 上次巡检周期 + */ + @ColumnWidth(20) + @ExcelProperty("上次巡检周期") + private Date lastInsCycle; + /** + * 巡检点备注 + */ + @ColumnWidth(20) + @ExcelProperty("巡检点备注") + private String insMemo; + /** + * 巡检情况备注 + */ + @ColumnWidth(20) + @ExcelProperty("巡检情况备注") + private String parMemo; + /** + * 发起时间 + */ + @ColumnWidth(20) + @ExcelProperty("发起时间") + private Date launchTime; + /** + * 检验时间 + */ + @ColumnWidth(20) + @ExcelProperty("检验时间") + private Date testTime; + /** + * 任务状态:1、已检，2、待检，3、未准时完成 + */ + @ColumnWidth(20) + @ExcelProperty("任务状态:1、已检，2、待检，3、未准时完成") + private String taskStatus; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsTowerExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsTowerExcel.java new file mode 100644 index 00000000..b0bf39e0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsTowerExcel.java @@ -0,0 +1,116 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.excel; + + +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 BladeX + * @since 2025-12-23 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BsTowerExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ColumnWidth(20) + @ExcelProperty("ID") + private Short id; + /** + * 名称 + */ + @ColumnWidth(20) + @ExcelProperty("名称") + private String btName; + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String btCode; + /** + * 药品名称 + */ + @ColumnWidth(20) + @ExcelProperty("药品名称") + private String drugName; + /** + * 报警阀值 + */ + @ColumnWidth(20) + @ExcelProperty("报警阀值") + private BigDecimal threshold; + /** + * ph报警点位 + */ + @ColumnWidth(20) + @ExcelProperty("ph报警点位") + private String phPoint; + /** + * 风机报警点位 + */ + @ColumnWidth(20) + @ExcelProperty("风机报警点位") + private String fanPoint; + /** + * 风机运行点位 + */ + @ColumnWidth(20) + @ExcelProperty("风机运行点位") + private String fanRunPoint; + /** + * 循环泵报警点位 + */ + @ColumnWidth(20) + @ExcelProperty("循环泵报警点位") + private String pumpPoint; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsTowerReportExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsTowerReportExcel.java new file mode 100644 index 00000000..bfc67a14 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsTowerReportExcel.java @@ -0,0 +1,111 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.excel; + + +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +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.Serializable; +import java.io.Serial; + + +/** + * 酸雾塔报警记录表 Excel实体类 + * + * @author BladeX + * @since 2025-12-24 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BsTowerReportExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ColumnWidth(20) + @ExcelProperty("ID") + private Short id; + /** + * 酸雾塔配置 + */ + @ColumnWidth(20) + @ExcelProperty("酸雾塔配置") + private Short btId; + /** + * 处理状态 + */ + @ColumnWidth(20) + @ExcelProperty("处理状态") + private String dealStatus; + /** + * 编码 + */ + @ColumnWidth(20) + @ExcelProperty("编码") + private String btCode; + /** + * 日期 + */ + @ColumnWidth(20) + @ExcelProperty("日期") + private Date btDate; + /** + * 错误点 + */ + @ColumnWidth(20) + @ExcelProperty("错误点") + private String errorPoint; + /** + * 消息文本 + */ + @ColumnWidth(20) + @ExcelProperty("消息文本") + private String messText; + /** + * 持续时间 + */ + @ColumnWidth(20) + @ExcelProperty("持续时间") + private String consLong; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsWasteGasRunRecExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsWasteGasRunRecExcel.java new file mode 100644 index 00000000..d3e4c474 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/excel/BsWasteGasRunRecExcel.java @@ -0,0 +1,171 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.excel; + + +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +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.Serializable; +import java.io.Serial; + + +/** + * 废气运行记录表 Excel实体类 + * + * @author BladeX + * @since 2025-12-29 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class BsWasteGasRunRecExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ColumnWidth(20) + @ExcelProperty("主键ID") + private Short id; + /** + * 设备编号 + */ + @ColumnWidth(20) + @ExcelProperty("设备编号") + private String deviceNum; + /** + * 开始时间 + */ + @ColumnWidth(20) + @ExcelProperty("开始时间") + private Date startTime; + /** + * 结束时间 + */ + @ColumnWidth(20) + @ExcelProperty("结束时间") + private Date endTime; + /** + * 运行时间 + */ + @ColumnWidth(20) + @ExcelProperty("运行时间") + private Date runTime; + /** + * 系统参数 + */ + @ColumnWidth(20) + @ExcelProperty("系统参数") + private String sysData; + /** + * 药品名称 + */ + @ColumnWidth(20) + @ExcelProperty("药品名称") + private String drugName; + /** + * 药品投加量 + */ + @ColumnWidth(20) + @ExcelProperty("药品投加量") + private BigDecimal drugNum; + /** + * 风机状态 + */ + @ColumnWidth(20) + @ExcelProperty("风机状态") + private Short fan; + /** + * 循环泵状态 + */ + @ColumnWidth(20) + @ExcelProperty("循环泵状态") + private Short pump; + /** + * 结构外观 + */ + @ColumnWidth(20) + @ExcelProperty("结构外观") + private Short jgwg; + /** + * 管道阀门 + */ + @ColumnWidth(20) + @ExcelProperty("管道阀门") + private Short gdfm; + /** + * 电气控制 + */ + @ColumnWidth(20) + @ExcelProperty("电气控制") + private Short dqkz; + /** + * 仪表显示 + */ + @ColumnWidth(20) + @ExcelProperty("仪表显示") + private Short ybxs; + /** + * 排口规范 + */ + @ColumnWidth(20) + @ExcelProperty("排口规范") + private Short pkgf; + /** + * 循环水箱 + */ + @ColumnWidth(20) + @ExcelProperty("循环水箱") + private Short xhsx; + /** + * 维保记录 + */ + @ColumnWidth(20) + @ExcelProperty("维保记录") + private String record; + /** + * 责任人 + */ + @ColumnWidth(20) + @ExcelProperty("责任人") + private String dutyMan; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsDischargeRecMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsDischargeRecMapper.java new file mode 100644 index 00000000..296072e9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsDischargeRecMapper.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.mapper; + +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 org.springblade.desk.energy.excel.BsDischargeRecExcel; +import org.springblade.desk.energy.pojo.entity.BsDischargeRecEntity; +import org.springblade.desk.energy.pojo.vo.BsDischargeRecVO; + +import java.util.List; + +/** + * 槽液排放记录表 Mapper 接口 + * + * @author BladeX + * @since 2025-12-25 + */ +public interface BsDischargeRecMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsDischargeRec 查询参数 + * @return List + */ + List selectBsDischargeRecPage(IPage page, BsDischargeRecVO bsDischargeRec); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsDischargeRec(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsDosingRecMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsDosingRecMapper.java new file mode 100644 index 00000000..cfdef187 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsDosingRecMapper.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.mapper; + +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 org.springblade.desk.energy.excel.BsDosingRecExcel; +import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; +import org.springblade.desk.energy.pojo.vo.BsDosingRecVO; + +import java.util.List; + +/** + * 废气/废水加药记录表 Mapper 接口 + * + * @author BladeX + * @since 2025-12-25 + */ +public interface BsDosingRecMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsDosingRec 查询参数 + * @return List + */ + List selectBsDosingRecPage(IPage page, BsDosingRecVO bsDosingRec); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsDosingRec(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEpciuInspectionPointMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEpciuInspectionPointMapper.java new file mode 100644 index 00000000..554cdcf9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEpciuInspectionPointMapper.java @@ -0,0 +1,65 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.mapper; + + +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 org.springblade.desk.energy.excel.BsEpciuInspectionPointExcel; +import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity; +import org.springblade.desk.energy.pojo.vo.BsEpciuInspectionPointVO; + +import java.util.List; + +/** + * 环保巡检点配置表 Mapper 接口 + * + * @author BladeX + * @since 2025-12-24 + */ +public interface BsEpciuInspectionPointMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsEpciuInspectionPoint 查询参数 + * @return List + */ + List selectBsEpciuInspectionPointPage(IPage page, BsEpciuInspectionPointVO bsEpciuInspectionPoint); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsEpciuInspectionPoint(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEpciuPatrolInspectionMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEpciuPatrolInspectionMapper.java new file mode 100644 index 00000000..c7246333 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsEpciuPatrolInspectionMapper.java @@ -0,0 +1,65 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.mapper; + + +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 org.springblade.desk.energy.excel.BsEpciuPatrolInspectionExcel; +import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity; +import org.springblade.desk.energy.pojo.vo.BsEpciuPatrolInspectionVO; + +import java.util.List; + +/** + * 环保巡检任务表 Mapper 接口 + * + * @author BladeX + * @since 2025-12-24 + */ +public interface BsEpciuPatrolInspectionMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsEpciuPatrolInspection 查询参数 + * @return List + */ + List selectBsEpciuPatrolInspectionPage(IPage page, BsEpciuPatrolInspectionVO bsEpciuPatrolInspection); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsEpciuPatrolInspection(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsInsTestMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsInsTestMapper.java new file mode 100644 index 00000000..37203d5e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsInsTestMapper.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.mapper; + +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.energy.excel.BsInsTestExcel; +import org.springblade.desk.energy.pojo.entity.BsInsTestEntity; +import org.springblade.desk.energy.pojo.vo.BsInsTestVO; + +import java.util.List; + +/** + * 废水化验记录表 Mapper 接口 + * + * @author BladeX + * @since 2025-12-29 + */ +public interface BsInsTestMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsInsTest 查询参数 + * @return List + */ + List selectBsInsTestPage(IPage page, BsInsTestVO bsInsTest); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsInsTest(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsMeterParamMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsMeterParamMapper.java new file mode 100644 index 00000000..63163f32 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsMeterParamMapper.java @@ -0,0 +1,65 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.mapper; + + +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 org.springblade.desk.energy.excel.BsMeterParamExcel; +import org.springblade.desk.energy.pojo.entity.BsMeterParamEntity; +import org.springblade.desk.energy.pojo.vo.BsMeterParamVO; + +import java.util.List; + +/** + * 仪表参数表 Mapper 接口 + * + * @author BladeX + * @since 2025-12-25 + */ +public interface BsMeterParamMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsMeterParam 查询参数 + * @return List + */ + List selectBsMeterParamPage(IPage page, BsMeterParamVO bsMeterParam); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsMeterParam(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsSafeInspectionPointMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsSafeInspectionPointMapper.java new file mode 100644 index 00000000..a29f85e9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsSafeInspectionPointMapper.java @@ -0,0 +1,63 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.mapper; +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.energy.excel.BsSafeInspectionPointExcel; +import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity; +import org.springblade.desk.energy.pojo.vo.BsSafeInspectionPointVO; + +import java.util.List; + +/** + * 巡检点配置表 Mapper 接口 + * + * @author BladeX + * @since 2025-12-22 + */ +public interface BsSafeInspectionPointMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsSafeInspectionPoint 查询参数 + * @return List + */ + List selectBsSafeInspectionPointPage(IPage page, BsSafeInspectionPointVO bsSafeInspectionPoint); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsSafeInspectionPoint(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsSafePatrolInspectionMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsSafePatrolInspectionMapper.java new file mode 100644 index 00000000..aa0bd239 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsSafePatrolInspectionMapper.java @@ -0,0 +1,65 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.mapper; + + +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 org.springblade.desk.energy.excel.BsSafePatrolInspectionExcel; +import org.springblade.desk.energy.pojo.entity.BsSafePatrolInspectionEntity; +import org.springblade.desk.energy.pojo.vo.BsSafePatrolInspectionVO; + +import java.util.List; + +/** + * 巡检任务表 Mapper 接口 + * + * @author BladeX + * @since 2025-12-22 + */ +public interface BsSafePatrolInspectionMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsSafePatrolInspection 查询参数 + * @return List + */ + List selectBsSafePatrolInspectionPage(IPage page, BsSafePatrolInspectionVO bsSafePatrolInspection); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsSafePatrolInspection(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsTowerMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsTowerMapper.java new file mode 100644 index 00000000..4d2ee484 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsTowerMapper.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.mapper; + +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 org.springblade.desk.energy.excel.BsTowerExcel; +import org.springblade.desk.energy.pojo.entity.BsTowerEntity; +import org.springblade.desk.energy.pojo.vo.BsTowerVO; + +import java.util.List; + +/** + * 酸雾塔报警点配置表 Mapper 接口 + * + * @author BladeX + * @since 2025-12-23 + */ +public interface BsTowerMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsTower 查询参数 + * @return List + */ + List selectBsTowerPage(IPage page, BsTowerVO bsTower); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsTower(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsTowerReportMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsTowerReportMapper.java new file mode 100644 index 00000000..45b444a2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsTowerReportMapper.java @@ -0,0 +1,65 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.mapper; + + +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 org.springblade.desk.energy.excel.BsTowerReportExcel; +import org.springblade.desk.energy.pojo.entity.BsTowerReportEntity; +import org.springblade.desk.energy.pojo.vo.BsTowerReportVO; + +import java.util.List; + +/** + * 酸雾塔报警记录表 Mapper 接口 + * + * @author BladeX + * @since 2025-12-24 + */ +public interface BsTowerReportMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsTowerReport 查询参数 + * @return List + */ + List selectBsTowerReportPage(IPage page, BsTowerReportVO bsTowerReport); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsTowerReport(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsWasteGasRunRecMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsWasteGasRunRecMapper.java new file mode 100644 index 00000000..2f8aff02 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/BsWasteGasRunRecMapper.java @@ -0,0 +1,65 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.mapper; + + +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 org.springblade.desk.energy.excel.BsWasteGasRunRecExcel; +import org.springblade.desk.energy.pojo.entity.BsWasteGasRunRecEntity; +import org.springblade.desk.energy.pojo.vo.BsWasteGasRunRecVO; + +import java.util.List; + +/** + * 废气运行记录表 Mapper 接口 + * + * @author BladeX + * @since 2025-12-29 + */ +public interface BsWasteGasRunRecMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsWasteGasRunRec 查询参数 + * @return List + */ + List selectBsWasteGasRunRecPage(IPage page, BsWasteGasRunRecVO bsWasteGasRunRec); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsWasteGasRunRec(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/DischargeRecMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/DischargeRecMapper.xml new file mode 100644 index 00000000..7fa980a7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/DischargeRecMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/DosingRecMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/DosingRecMapper.xml new file mode 100644 index 00000000..7766ff41 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/DosingRecMapper.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuInspectionPointMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuInspectionPointMapper.xml new file mode 100644 index 00000000..f9940129 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuInspectionPointMapper.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml new file mode 100644 index 00000000..d357cc1d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/EpciuPatrolInspectionMapper.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/InsTestMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/InsTestMapper.xml new file mode 100644 index 00000000..40857cfa --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/InsTestMapper.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/MeterParamMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/MeterParamMapper.xml new file mode 100644 index 00000000..78657887 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/MeterParamMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafeInspectionPointMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafeInspectionPointMapper.xml new file mode 100644 index 00000000..25170d66 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafeInspectionPointMapper.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafePatrolInspectionMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafePatrolInspectionMapper.xml new file mode 100644 index 00000000..f71eb756 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/SafePatrolInspectionMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/TowerMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/TowerMapper.xml new file mode 100644 index 00000000..17f91521 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/TowerMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/TowerReportMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/TowerReportMapper.xml new file mode 100644 index 00000000..55057935 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/TowerReportMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/WasteGasRunRecMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/WasteGasRunRecMapper.xml new file mode 100644 index 00000000..9b2f5802 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/mapper/WasteGasRunRecMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsDischargeRecDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsDischargeRecDTO.java new file mode 100644 index 00000000..cf1c2471 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsDischargeRecDTO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsDischargeRecEntity; + +import java.io.Serial; + +/** + * 槽液排放记录表 数据传输对象实体类 + * + * @author BladeX + * @since 2025-12-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsDischargeRecDTO extends BsDischargeRecEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsDosingRecDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsDosingRecDTO.java new file mode 100644 index 00000000..0d15c67f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsDosingRecDTO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; + +import java.io.Serial; + +/** + * 废气/废水加药记录表 数据传输对象实体类 + * + * @author BladeX + * @since 2025-12-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsDosingRecDTO extends BsDosingRecEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsEpciuInspectionPointDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsEpciuInspectionPointDTO.java new file mode 100644 index 00000000..3bfaba2e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsEpciuInspectionPointDTO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity; + +import java.io.Serial; + +/** + * 环保巡检点配置表 数据传输对象实体类 + * + * @author BladeX + * @since 2025-12-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsEpciuInspectionPointDTO extends BsEpciuInspectionPointEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsEpciuPatrolInspectionDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsEpciuPatrolInspectionDTO.java new file mode 100644 index 00000000..3c602905 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsEpciuPatrolInspectionDTO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity; + +import java.io.Serial; + +/** + * 环保巡检任务表 数据传输对象实体类 + * + * @author BladeX + * @since 2025-12-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsEpciuPatrolInspectionDTO extends BsEpciuPatrolInspectionEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsInsTestDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsInsTestDTO.java new file mode 100644 index 00000000..46a38e17 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsInsTestDTO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsInsTestEntity; + +import java.io.Serial; + +/** + * 废水化验记录表 数据传输对象实体类 + * + * @author BladeX + * @since 2025-12-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsInsTestDTO extends BsInsTestEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsMeterParamDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsMeterParamDTO.java new file mode 100644 index 00000000..5f464dc0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsMeterParamDTO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsMeterParamEntity; + +import java.io.Serial; + +/** + * 仪表参数表 数据传输对象实体类 + * + * @author BladeX + * @since 2025-12-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsMeterParamDTO extends BsMeterParamEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsSafeInspectionPointDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsSafeInspectionPointDTO.java new file mode 100644 index 00000000..b3bb4ca1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsSafeInspectionPointDTO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity; + +import java.io.Serial; + +/** + * 巡检点配置表 数据传输对象实体类 + * + * @author BladeX + * @since 2025-12-22 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsSafeInspectionPointDTO extends BsSafeInspectionPointEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsSafePatrolInspectionDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsSafePatrolInspectionDTO.java new file mode 100644 index 00000000..05aac516 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsSafePatrolInspectionDTO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsSafePatrolInspectionEntity; + +import java.io.Serial; + +/** + * 巡检任务表 数据传输对象实体类 + * + * @author BladeX + * @since 2025-12-22 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsSafePatrolInspectionDTO extends BsSafePatrolInspectionEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsTowerDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsTowerDTO.java new file mode 100644 index 00000000..f1635300 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsTowerDTO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsTowerEntity; + +import java.io.Serial; + +/** + * 酸雾塔报警点配置表 数据传输对象实体类 + * + * @author BladeX + * @since 2025-12-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsTowerDTO extends BsTowerEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsTowerReportDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsTowerReportDTO.java new file mode 100644 index 00000000..83cf305d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsTowerReportDTO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsTowerReportEntity; + +import java.io.Serial; + +/** + * 酸雾塔报警记录表 数据传输对象实体类 + * + * @author BladeX + * @since 2025-12-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsTowerReportDTO extends BsTowerReportEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsWasteGasRunRecDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsWasteGasRunRecDTO.java new file mode 100644 index 00000000..20e32c8e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/dto/BsWasteGasRunRecDTO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsWasteGasRunRecEntity; + +import java.io.Serial; + +/** + * 废气运行记录表 数据传输对象实体类 + * + * @author BladeX + * @since 2025-12-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsWasteGasRunRecDTO extends BsWasteGasRunRecEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDischargeRecEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDischargeRecEntity.java new file mode 100644 index 00000000..57b1d075 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDischargeRecEntity.java @@ -0,0 +1,88 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; +import java.util.Date; + +/** + * 槽液排放记录表 实体类 + * + * @author BladeX + * @since 2025-12-25 + */ +@Data +@TableName("BS_DISCHARGE_REC") +@Schema(description = "BsDischargeRec对象") +@EqualsAndHashCode(callSuper = true) +public class BsDischargeRecEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 报废槽液类型 + */ + @Schema(description = "报废槽液类型") + private String wasteType; + /** + * 排放班组 + */ + @Schema(description = "排放班组") + private String bsTeamSet; + /** + * 排放量(单位：L) + */ + @Schema(description = "排放量(单位：L)") + private Long amount; + /** + * 日期 + */ + @Schema(description = "日期") + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + private Date dirDate; + /** + * 水处理工 + */ + @Schema(description = "水处理工") + private String handleMan; + /** + * 备注 + */ + @Schema(description = "备注") + private String memo; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java new file mode 100644 index 00000000..b5363fee --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsDosingRecEntity.java @@ -0,0 +1,105 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; +import java.math.BigDecimal; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tenant.mp.TenantEntity; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; + +/** + * 废气/废水加药记录表 实体类 + * + * @author BladeX + * @since 2025-12-25 + */ +@Data +@TableName("BS_DOSING_REC") +@Schema(description = "BsDosingRec对象") +@EqualsAndHashCode(callSuper = true) +public class BsDosingRecEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 酸雾塔 + */ + @Schema(description = "酸雾塔") + private BigDecimal btId; + /** + * 设施 + */ + @Schema(description = "设施") + private String device; + /** + * 药品 + */ + @Schema(description = "药品") + private String drug; + /** + * 剂量 + */ + @Schema(description = "剂量") + private BigDecimal dose; + /** + * 加药时间 + */ + @Schema(description = "加药时间") + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + private Date dosingTime; + /** + * 加药人 + */ + @Schema(description = "加药人") + private String dosingMan; + /** + * 备注 + */ + @Schema(description = "备注") + private String memo; + /** + * 处理类型 + */ + @Schema(description = "处理类型") + private Long handleResult; + /** + * 类型：1、废气加药；2、废水加药 + */ + @Schema(description = "类型：1、废气加药；2、废水加药") + private String dorType; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEpciuInspectionPointEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEpciuInspectionPointEntity.java new file mode 100644 index 00000000..0aaec314 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEpciuInspectionPointEntity.java @@ -0,0 +1,97 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; +import java.util.Date; + +/** + * 环保巡检点配置表 实体类 + * + * @author BladeX + * @since 2025-12-24 + */ +@Data +@TableName("BS_EPCIU_INSPECTION_POINT") +@Schema(description = "BsEpciuInspectionPoint对象") +@EqualsAndHashCode(callSuper = true) +public class BsEpciuInspectionPointEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 巡检点编号 + */ + @Schema(description = "巡检点编号") + private String insNum; + /** + * 巡检点位置 + */ + @Schema(description = "巡检点位置") + private String insSite; + /** + * 上次巡检日期 + */ + @Schema(description = "上次巡检日期") + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + private Date lastInsCycle; + /** + * 备注 + */ + @Schema(description = "备注") + private String memo; + /** + * 巡检点类型 + */ + @Schema(description = "巡检点类型") + private String insType; + /** + * 巡检周期 + */ + @Schema(description = "巡检周期") + private Long insCycle; + + /** + * 废气 + */ + public static Short GAS = 2; + /** + * 废水 + */ + public static Short WATER = 1; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEpciuPatrolInspectionEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEpciuPatrolInspectionEntity.java new file mode 100644 index 00000000..a5171c4b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsEpciuPatrolInspectionEntity.java @@ -0,0 +1,140 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 环保巡检任务表 实体类 + * + * @author BladeX + * @since 2025-12-24 + */ +@Data +@TableName("BS_EPCIU_PATROL_INSPECTION") +@Schema(description = "BsEpciuPatrolInspection对象") +@EqualsAndHashCode(callSuper = true) +public class BsEpciuPatrolInspectionEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 巡检点配置 + */ + @Schema(description = "巡检点配置") + private Long epcId; + /** + * 巡检点编号 + */ + @Schema(description = "巡检点编号") + private String insNum; + /** + * 巡检点位置 + */ + @Schema(description = "巡检点位置") + private String insSite; + /** + * 巡检人 + */ + @Schema(description = "巡检人") + private String insMan; + /** + * 等待周期 + */ + @Schema(description = "等待周期") + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + private Date waitCycle; + /** + * 巡检点备注 + */ + @Schema(description = "巡检点备注") + private String insMemo; + /** + * 备注 + */ + @Schema(description = "备注") + private String parMemo; + /** + * 发起时间 + */ + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @Schema(description = "发起时间") + private Date launchTime; + /** + * 检验时间 + */ + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @Schema(description = "检验时间") + private Date testTime; + /** + * 任务状态:1、已检，2、待检，3、未准时完成 + */ + @Schema(description = "任务状态:1、已检，2、待检，3、未准时完成") + private String taskStatus; + /** + * 巡检点类型 + */ + @Schema(description = "巡检点类型") + private String insType; + + /** + * 待检 + */ + public static Short PREPARE_TEXT = 1; + /** + * 未检 + */ + public static Short NO_CHECK = 2; + /** + * 已检 + */ + public static Short CHECKED = 3; + + public static Map taskStatusMap = new HashMap(2); + + static { + taskStatusMap.put(CHECKED, "已检"); + taskStatusMap.put(PREPARE_TEXT, "待检"); + taskStatusMap.put(NO_CHECK, "未检"); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsInsTestEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsInsTestEntity.java new file mode 100644 index 00000000..6a3f7b98 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsInsTestEntity.java @@ -0,0 +1,104 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import java.math.BigDecimal; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; + +/** + * 废水化验记录表 实体类 + * + * @author BladeX + * @since 2025-12-29 + */ +@Data +@TableName("BS_INS_TEST") +@Schema(description = "BsInsTest对象") +@EqualsAndHashCode(callSuper = true) +public class BsInsTestEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 设施 + */ + @Schema(description = "设施") + private String device; + /** + * 化验时间 + */ + @Schema(description = "化验时间") + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + private Date dosingTime; + /** + * 化验人 + */ + @Schema(description = "化验人") + private String dosingMan; + /** + * 镍 + */ + @Schema(description = "镍") + private String itNi; + /** + * 铜 + */ + @Schema(description = "铜") + private String itCu; + /** + * 六价铬 + */ + @Schema(description = "六价铬") + private String itCr; + /** + * 氰化物 + */ + @Schema(description = "氰化物") + private String itCn2; + /** + * PH + */ + @Schema(description = "PH") + private String itPh; + /** + * 备注 + */ + @Schema(description = "备注") + private String memo; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsMeterParamEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsMeterParamEntity.java new file mode 100644 index 00000000..14858439 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsMeterParamEntity.java @@ -0,0 +1,77 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.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 BladeX + * @since 2025-12-25 + */ +@Data +@TableName("BS_METER_PARAM") +@Schema(description = "BsMeterParam对象") +@EqualsAndHashCode(callSuper = true) +public class BsMeterParamEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 池体名称 + */ + @Schema(description = "池体名称") + private String poolName; + /** + * 测量值 + */ + @Schema(description = "测量值") + private Integer meter; + /** + * 上限 + */ + @Schema(description = "上限") + private Integer upLimit; + /** + * 下限 + */ + @Schema(description = "下限") + private Integer downLimit; + /** + * 参考值 + */ + @Schema(description = "参考值") + private Integer consult; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafeInspectionPointEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafeInspectionPointEntity.java new file mode 100644 index 00000000..3a0438ea --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafeInspectionPointEntity.java @@ -0,0 +1,92 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tenant.mp.TenantEntity; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; + +/** + * 巡检点配置表 实体类 + * + * @author BladeX + * @since 2025-12-22 + */ +@Data +@TableName("BS_SAFE_INSPECTION_POINT") +@Schema(description = "BsSafeInspectionPoint对象") +@EqualsAndHashCode(callSuper = true) +public class BsSafeInspectionPointEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + + + /** + * 巡检点编号 + */ + @Schema(description = "巡检点编号") + private String insNum; + /** + * 巡检点位置 + */ + @Schema(description = "巡检点位置") + private String insSite; + +// /** +// * 巡检器 +// */ +// @Schema(description = "巡检器") +// private String patrolRegister; +// /** +// * 巡检点 +// */ +// @Schema(description = "巡检点") +// private String insSpot; + /** + * 上次巡检周期 + */ + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @Schema(description = "上次巡检周期") + private Date lastInsCycle; + /** + * 备注 + */ + @Schema(description = "备注") + private String memo; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafePatrolInspectionEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafePatrolInspectionEntity.java new file mode 100644 index 00000000..6774e0c4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsSafePatrolInspectionEntity.java @@ -0,0 +1,136 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tenant.mp.TenantEntity; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; + +/** + * 巡检任务表 实体类 + * + * @author BladeX + * @since 2025-12-22 + */ +@Data +@TableName("BS_SAFE_PATROL_INSPECTION") +@Schema(description = "BsSafePatrolInspection对象") +@EqualsAndHashCode(callSuper = true) +public class BsSafePatrolInspectionEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 巡检点配置 + */ + @Schema(description = "巡检点配置") + private Long ipId; + /** + * 巡检点编号 + */ + @Schema(description = "巡检点编号") + private String insNum; + /** + * 巡检点位置 + */ + @Schema(description = "巡检点位置") + private String insSite; + /** + * 巡检人 + */ + @Schema(description = "巡检人") + private String insMan; + /** + * 等待周期 + */ + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @Schema(description = "等待周期") + private Date waitCycle; + /** + * 巡检点备注 + */ + @Schema(description = "巡检点备注") + private String insMemo; + /** + * 备注 + */ + @Schema(description = "备注") + private String parMemo; + /** + * 发起时间 + */ + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @Schema(description = "发起时间") + private Date launchTime; + /** + * 检验时间 + */ + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @Schema(description = "检验时间") + private Date testTime; + /** + * 任务状态:1、已检，2、待检，3、未准时完成 + */ + @Schema(description = "任务状态:1、已检，2、待检，3、未准时完成") + private String taskStatus; + + /** + * 待检 + */ + public static Short PREPARE_TEXT = 1; + /** + * 未检 + */ + public static Short NO_CHECK = 2; + /** + * 已检 + */ + public static Short CHECKED = 3; + + public static Map taskStatusMap = new HashMap(2); + + static { + taskStatusMap.put(CHECKED, "已检"); + taskStatusMap.put(PREPARE_TEXT, "待检"); + taskStatusMap.put(NO_CHECK, "未检"); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsTowerEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsTowerEntity.java new file mode 100644 index 00000000..1c023693 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsTowerEntity.java @@ -0,0 +1,93 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.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 BladeX + * @since 2025-12-23 + */ +@Data +@TableName("BS_TOWER") +@Schema(description = "BsTower对象") +@EqualsAndHashCode(callSuper = true) +public class BsTowerEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 名称 + */ + @Schema(description = "名称") + private String btName; + /** + * 编码 + */ + @Schema(description = "编码") + private String btCode; + /** + * 药品名称 + */ + @Schema(description = "药品名称") + private String drugName; + /** + * 报警阀值 + */ + @Schema(description = "报警阀值") + private BigDecimal threshold; + /** + * ph报警点位 + */ + @Schema(description = "ph报警点位") + private String phPoint; + /** + * 风机报警点位 + */ + @Schema(description = "风机报警点位") + private String fanPoint; + /** + * 风机运行点位 + */ + @Schema(description = "风机运行点位") + private String fanRunPoint; + /** + * 循环泵报警点位 + */ + @Schema(description = "循环泵报警点位") + private String pumpPoint; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsTowerReportEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsTowerReportEntity.java new file mode 100644 index 00000000..754c61d6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsTowerReportEntity.java @@ -0,0 +1,93 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; +import java.util.Date; + +/** + * 酸雾塔报警记录表 实体类 + * + * @author BladeX + * @since 2025-12-24 + */ +@Data +@TableName("BS_TOWER_REPORT") +@Schema(description = "BsTowerReport对象") +@EqualsAndHashCode(callSuper = true) +public class BsTowerReportEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 酸雾塔配置 + */ + @Schema(description = "酸雾塔配置") + private Double btId; + /** + * 处理状态 + */ + @Schema(description = "处理状态") + private String dealStatus; + /** + * 编码 + */ + @Schema(description = "编码") + private String btCode; + /** + * 日期 + */ + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @Schema(description = "日期") + private Date btDate; + /** + * 错误点 + */ + @Schema(description = "错误点") + private String errorPoint; + /** + * 消息文本 + */ + @Schema(description = "消息文本") + private String messText; + /** + * 持续时间 + */ + @Schema(description = "持续时间") + private Double consLong; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsWasteGasRunRecEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsWasteGasRunRecEntity.java new file mode 100644 index 00000000..08e47592 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/entity/BsWasteGasRunRecEntity.java @@ -0,0 +1,147 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.entity; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import java.math.BigDecimal; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tenant.mp.TenantEntity; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; + +/** + * 废气运行记录表 实体类 + * + * @author BladeX + * @since 2025-12-29 + */ +@Data +@TableName("BS_WASTE_GAS_RUN_REC") +@Schema(description = "BsWasteGasRunRec对象") +@EqualsAndHashCode(callSuper = true) +public class BsWasteGasRunRecEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 设备编号 + */ + @Schema(description = "设备编号") + private String deviceNum; + /** + * 开始时间 + */ + @Schema(description = "开始时间") + private Date startTime; + /** + * 结束时间 + */ + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @Schema(description = "结束时间") + private Date endTime; + /** + * 运行时间 + */ + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @Schema(description = "运行时间") + private Date runTime; + /** + * 系统参数 + */ + @Schema(description = "系统参数") + private String sysData; + /** + * 药品名称 + */ + @Schema(description = "药品名称") + private String drugName; + /** + * 药品投加量 + */ + @Schema(description = "药品投加量") + private BigDecimal drugNum; + /** + * 风机状态 + */ + @Schema(description = "风机状态") + private Boolean fan=true; + /** + * 循环泵状态 + */ + @Schema(description = "循环泵状态") + private Short pump; + /** + * 结构外观 + */ + @Schema(description = "结构外观") + private Short jgwg; + /** + * 管道阀门 + */ + @Schema(description = "管道阀门") + private Short gdfm; + /** + * 电气控制 + */ + @Schema(description = "电气控制") + private Short dqkz; + /** + * 仪表显示 + */ + @Schema(description = "仪表显示") + private Short ybxs; + /** + * 排口规范 + */ + @Schema(description = "排口规范") + private Short pkgf; + /** + * 循环水箱 + */ + @Schema(description = "循环水箱") + private Short xhsx; + /** + * 维保记录 + */ + @Schema(description = "维保记录") + private String record; + /** + * 责任人 + */ + @Schema(description = "责任人") + private String dutyMan; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsDischargeRecVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsDischargeRecVO.java new file mode 100644 index 00000000..fba194f4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsDischargeRecVO.java @@ -0,0 +1,61 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsDischargeRecEntity; + +import java.io.Serial; + +/** + * 槽液排放记录表 视图实体类 + * + * @author BladeX + * @since 2025-12-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsDischargeRecVO extends BsDischargeRecEntity { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 开始时间 + */ + @Schema(description = "开始时间") + private String startDate; + /** + * 结束时间 + */ + @Schema(description = "结束时间") + private String endDate; + + + private String queryDirDate; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsDosingRecVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsDosingRecVO.java new file mode 100644 index 00000000..f1bec92c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsDosingRecVO.java @@ -0,0 +1,61 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; + +import java.io.Serial; +import java.util.Date; + +/** + * 废气/废水加药记录表 视图实体类 + * + * @author BladeX + * @since 2025-12-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsDosingRecVO extends BsDosingRecEntity { + @Serial + private static final long serialVersionUID = 1L; + + private String queryDosingTime; + + /** + * 开始时间 + */ + @Schema(description = "开始时间") + private String startDate; + /** + * 结束时间 + */ + @Schema(description = "结束时间") + private String endDate; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEpciuInspectionPointVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEpciuInspectionPointVO.java new file mode 100644 index 00000000..552a4c0e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEpciuInspectionPointVO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity; + +import java.io.Serial; + +/** + * 环保巡检点配置表 视图实体类 + * + * @author BladeX + * @since 2025-12-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsEpciuInspectionPointVO extends BsEpciuInspectionPointEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEpciuPatrolInspectionVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEpciuPatrolInspectionVO.java new file mode 100644 index 00000000..5d576cf2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsEpciuPatrolInspectionVO.java @@ -0,0 +1,73 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity; + +import java.io.Serial; + +/** + * 环保巡检任务表 视图实体类 + * + * @author BladeX + * @since 2025-12-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsEpciuPatrolInspectionVO extends BsEpciuPatrolInspectionEntity { + @Serial + private static final long serialVersionUID = 1L; + + + /** + * 开始时间 + */ + @Schema(description = "开始时间") + private String startDate; + + + private String startTestDate; + + /** + * 结束时间 + */ + @Schema(description = "结束时间") + private String endDate; + + + private String endTestDate; + + + @Schema(description = "查询传值") + private String queryLaunchTime; + + @Schema(description = "查询传值") + private String queryTestTime; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsInsTestVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsInsTestVO.java new file mode 100644 index 00000000..6946eeab --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsInsTestVO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsInsTestEntity; + +import java.io.Serial; + +/** + * 废水化验记录表 视图实体类 + * + * @author BladeX + * @since 2025-12-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsInsTestVO extends BsInsTestEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsMeterParamVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsMeterParamVO.java new file mode 100644 index 00000000..b44c3f2a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsMeterParamVO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsMeterParamEntity; + +import java.io.Serial; + +/** + * 仪表参数表 视图实体类 + * + * @author BladeX + * @since 2025-12-25 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsMeterParamVO extends BsMeterParamEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsSafeInspectionPointVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsSafeInspectionPointVO.java new file mode 100644 index 00000000..58b9d0b2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsSafeInspectionPointVO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity; + +import java.io.Serial; + +/** + * 巡检点配置表 视图实体类 + * + * @author BladeX + * @since 2025-12-22 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsSafeInspectionPointVO extends BsSafeInspectionPointEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsSafePatrolInspectionVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsSafePatrolInspectionVO.java new file mode 100644 index 00000000..3cb3b2c0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsSafePatrolInspectionVO.java @@ -0,0 +1,74 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsSafePatrolInspectionEntity; + +import java.io.Serial; +import java.util.Date; + +/** + * 巡检任务表 视图实体类 + * + * @author BladeX + * @since 2025-12-22 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsSafePatrolInspectionVO extends BsSafePatrolInspectionEntity { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 开始时间 + */ + @Schema(description = "开始时间") + private String startDate; + + + private String startTestDate; + + /** + * 结束时间 + */ + @Schema(description = "结束时间") + private String endDate; + + + private String endTestDate; + + + @Schema(description = "查询传值") + private String queryLaunchTime; + + @Schema(description = "查询传值") + private String queryTestTime; + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsTowerReportVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsTowerReportVO.java new file mode 100644 index 00000000..c7f35176 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsTowerReportVO.java @@ -0,0 +1,61 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsTowerReportEntity; + +import java.io.Serial; + +/** + * 酸雾塔报警记录表 视图实体类 + * + * @author BladeX + * @since 2025-12-24 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsTowerReportVO extends BsTowerReportEntity { + @Serial + private static final long serialVersionUID = 1L; + + /** + * 开始时间 + */ + @Schema(description = "开始时间") + private String startDate; + /** + * 结束时间 + */ + @Schema(description = "结束时间") + private String endDate; + + + private String queryBtDate; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsTowerVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsTowerVO.java new file mode 100644 index 00000000..931f4ef1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsTowerVO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsTowerEntity; + +import java.io.Serial; + +/** + * 酸雾塔报警点配置表 视图实体类 + * + * @author BladeX + * @since 2025-12-23 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsTowerVO extends BsTowerEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsWasteGasRunRecVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsWasteGasRunRecVO.java new file mode 100644 index 00000000..d9a6ccc1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/pojo/vo/BsWasteGasRunRecVO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.energy.pojo.entity.BsWasteGasRunRecEntity; + +import java.io.Serial; + +/** + * 废气运行记录表 视图实体类 + * + * @author BladeX + * @since 2025-12-29 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class BsWasteGasRunRecVO extends BsWasteGasRunRecEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsDischargeRecService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsDischargeRecService.java new file mode 100644 index 00000000..7a5a75cc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsDischargeRecService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service; + +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.energy.excel.BsDischargeRecExcel; +import org.springblade.desk.energy.pojo.entity.BsDischargeRecEntity; +import org.springblade.desk.energy.pojo.vo.BsDischargeRecVO; + +import java.util.List; + +/** + * 槽液排放记录表 服务类 + * + * @author BladeX + * @since 2025-12-25 + */ +public interface IBsDischargeRecService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsDischargeRec 查询参数 + * @return IPage + */ + IPage selectBsDischargeRecPage(IPage page, BsDischargeRecVO bsDischargeRec); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsDischargeRec(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsDosingRecService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsDosingRecService.java new file mode 100644 index 00000000..b9e7150f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsDosingRecService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service; + +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.energy.excel.BsDosingRecExcel; +import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; +import org.springblade.desk.energy.pojo.vo.BsDosingRecVO; + +import java.util.List; + +/** + * 废气/废水加药记录表 服务类 + * + * @author BladeX + * @since 2025-12-25 + */ +public interface IBsDosingRecService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsDosingRec 查询参数 + * @return IPage + */ + IPage selectBsDosingRecPage(IPage page, BsDosingRecVO bsDosingRec); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsDosingRec(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuInspectionPointService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuInspectionPointService.java new file mode 100644 index 00000000..7eabcde7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuInspectionPointService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service; + +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.energy.excel.BsEpciuInspectionPointExcel; +import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity; +import org.springblade.desk.energy.pojo.vo.BsEpciuInspectionPointVO; + +import java.util.List; + +/** + * 环保巡检点配置表 服务类 + * + * @author BladeX + * @since 2025-12-24 + */ +public interface IBsEpciuInspectionPointService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsEpciuInspectionPoint 查询参数 + * @return IPage + */ + IPage selectBsEpciuInspectionPointPage(IPage page, BsEpciuInspectionPointVO bsEpciuInspectionPoint); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsEpciuInspectionPoint(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java new file mode 100644 index 00000000..3e4d6bda --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsEpciuPatrolInspectionService.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service; + +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.energy.excel.BsEpciuPatrolInspectionExcel; +import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity; +import org.springblade.desk.energy.pojo.vo.BsEpciuPatrolInspectionVO; + +import java.util.List; + +/** + * 环保巡检任务表 服务类 + * + * @author BladeX + * @since 2025-12-24 + */ +public interface IBsEpciuPatrolInspectionService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsEpciuPatrolInspection 查询参数 + * @return IPage + */ + IPage selectBsEpciuPatrolInspectionPage(IPage page, BsEpciuPatrolInspectionVO bsEpciuPatrolInspection); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsEpciuPatrolInspection(Wrapper queryWrapper); + + void epInspectionTasks(boolean b); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsInsTestService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsInsTestService.java new file mode 100644 index 00000000..13ea1d90 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsInsTestService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service; + +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.energy.excel.BsInsTestExcel; +import org.springblade.desk.energy.pojo.entity.BsInsTestEntity; +import org.springblade.desk.energy.pojo.vo.BsInsTestVO; + +import java.util.List; + +/** + * 废水化验记录表 服务类 + * + * @author BladeX + * @since 2025-12-29 + */ +public interface IBsInsTestService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsInsTest 查询参数 + * @return IPage + */ + IPage selectBsInsTestPage(IPage page, BsInsTestVO bsInsTest); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsInsTest(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsMeterParamService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsMeterParamService.java new file mode 100644 index 00000000..a8c8e766 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsMeterParamService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service; + +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.energy.excel.BsMeterParamExcel; +import org.springblade.desk.energy.pojo.entity.BsMeterParamEntity; +import org.springblade.desk.energy.pojo.vo.BsMeterParamVO; + +import java.util.List; + +/** + * 仪表参数表 服务类 + * + * @author BladeX + * @since 2025-12-25 + */ +public interface IBsMeterParamService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsMeterParam 查询参数 + * @return IPage + */ + IPage selectBsMeterParamPage(IPage page, BsMeterParamVO bsMeterParam); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsMeterParam(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafeInspectionPointService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafeInspectionPointService.java new file mode 100644 index 00000000..305e08d1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafeInspectionPointService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service; + +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.energy.excel.BsSafeInspectionPointExcel; +import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity; +import org.springblade.desk.energy.pojo.vo.BsSafeInspectionPointVO; + +import java.util.List; + +/** + * 巡检点配置表 服务类 + * + * @author BladeX + * @since 2025-12-22 + */ +public interface IBsSafeInspectionPointService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsSafeInspectionPoint 查询参数 + * @return IPage + */ + IPage selectBsSafeInspectionPointPage(IPage page, BsSafeInspectionPointVO bsSafeInspectionPoint); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsSafeInspectionPoint(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafePatrolInspectionService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafePatrolInspectionService.java new file mode 100644 index 00000000..32ebeba8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsSafePatrolInspectionService.java @@ -0,0 +1,65 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service; + +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.energy.excel.BsSafePatrolInspectionExcel; +import org.springblade.desk.energy.pojo.entity.BsSafePatrolInspectionEntity; +import org.springblade.desk.energy.pojo.vo.BsSafePatrolInspectionVO; + +import java.util.List; + +/** + * 巡检任务表 服务类 + * + * @author BladeX + * @since 2025-12-22 + */ +public interface IBsSafePatrolInspectionService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsSafePatrolInspection 查询参数 + * @return IPage + */ + IPage selectBsSafePatrolInspectionPage(IPage page, BsSafePatrolInspectionVO bsSafePatrolInspection); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsSafePatrolInspection(Wrapper queryWrapper); + + void createSafPatrolTask(); + + void handleSafPatrolTask(); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsTowerReportService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsTowerReportService.java new file mode 100644 index 00000000..ecb7c2ce --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsTowerReportService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service; + +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.energy.excel.BsTowerReportExcel; +import org.springblade.desk.energy.pojo.entity.BsTowerReportEntity; +import org.springblade.desk.energy.pojo.vo.BsTowerReportVO; + +import java.util.List; + +/** + * 酸雾塔报警记录表 服务类 + * + * @author BladeX + * @since 2025-12-24 + */ +public interface IBsTowerReportService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsTowerReport 查询参数 + * @return IPage + */ + IPage selectBsTowerReportPage(IPage page, BsTowerReportVO bsTowerReport); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsTowerReport(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsTowerService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsTowerService.java new file mode 100644 index 00000000..51a1e492 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsTowerService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service; + +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.energy.excel.BsTowerExcel; +import org.springblade.desk.energy.pojo.entity.BsTowerEntity; +import org.springblade.desk.energy.pojo.vo.BsTowerVO; + +import java.util.List; + +/** + * 酸雾塔报警点配置表 服务类 + * + * @author BladeX + * @since 2025-12-23 + */ +public interface IBsTowerService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsTower 查询参数 + * @return IPage + */ + IPage selectBsTowerPage(IPage page, BsTowerVO bsTower); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsTower(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsWasteGasRunRecService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsWasteGasRunRecService.java new file mode 100644 index 00000000..610e40e2 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/IBsWasteGasRunRecService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service; + +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.energy.excel.BsWasteGasRunRecExcel; +import org.springblade.desk.energy.pojo.entity.BsWasteGasRunRecEntity; +import org.springblade.desk.energy.pojo.vo.BsWasteGasRunRecVO; + +import java.util.List; + +/** + * 废气运行记录表 服务类 + * + * @author BladeX + * @since 2025-12-29 + */ +public interface IBsWasteGasRunRecService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param bsWasteGasRunRec 查询参数 + * @return IPage + */ + IPage selectBsWasteGasRunRecPage(IPage page, BsWasteGasRunRecVO bsWasteGasRunRec); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportBsWasteGasRunRec(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDischargeRecServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDischargeRecServiceImpl.java new file mode 100644 index 00000000..678049a7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDischargeRecServiceImpl.java @@ -0,0 +1,69 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service.impl; + + +import org.apache.commons.lang3.StringUtils; +import org.springblade.desk.energy.excel.BsDischargeRecExcel; +import org.springblade.desk.energy.mapper.BsDischargeRecMapper; +import org.springblade.desk.energy.pojo.entity.BsDischargeRecEntity; +import org.springblade.desk.energy.pojo.vo.BsDischargeRecVO; +import org.springblade.desk.energy.service.IBsDischargeRecService; +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 BladeX + * @since 2025-12-25 + */ +@Service +public class BsDischargeRecServiceImpl extends BaseServiceImpl implements IBsDischargeRecService { + + @Override + public IPage selectBsDischargeRecPage(IPage page, BsDischargeRecVO bsDischargeRec) { + if(StringUtils.isNotEmpty(bsDischargeRec.getQueryDirDate())){ + bsDischargeRec.setStartDate(bsDischargeRec.getQueryDirDate().split(",")[0]); + bsDischargeRec.setEndDate(bsDischargeRec.getQueryDirDate().split(",")[1]); + } + return page.setRecords(baseMapper.selectBsDischargeRecPage(page, bsDischargeRec)); + } + + + @Override + public List exportBsDischargeRec(Wrapper queryWrapper) { + List bsDischargeRecList = baseMapper.exportBsDischargeRec(queryWrapper); + //bsDischargeRecList.forEach(bsDischargeRec -> { + // bsDischargeRec.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsDischargeRec.getType())); + //}); + return bsDischargeRecList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java new file mode 100644 index 00000000..30dc426c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsDosingRecServiceImpl.java @@ -0,0 +1,68 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service.impl; + +import org.apache.commons.lang3.StringUtils; +import org.springblade.desk.energy.excel.BsDosingRecExcel; +import org.springblade.desk.energy.mapper.BsDosingRecMapper; +import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; +import org.springblade.desk.energy.pojo.vo.BsDosingRecVO; +import org.springblade.desk.energy.service.IBsDosingRecService; +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 BladeX + * @since 2025-12-25 + */ +@Service +public class BsDosingRecServiceImpl extends BaseServiceImpl implements IBsDosingRecService { + + @Override + public IPage selectBsDosingRecPage(IPage page, BsDosingRecVO bsDosingRec) { + if(StringUtils.isNotEmpty(bsDosingRec.getQueryDosingTime())){ + bsDosingRec.setStartDate(bsDosingRec.getQueryDosingTime().split(",")[0]); + bsDosingRec.setEndDate(bsDosingRec.getQueryDosingTime().split(",")[1]); + } + return page.setRecords(baseMapper.selectBsDosingRecPage(page, bsDosingRec)); + } + + + @Override + public List exportBsDosingRec(Wrapper queryWrapper) { + List bsDosingRecList = baseMapper.exportBsDosingRec(queryWrapper); + //bsDosingRecList.forEach(bsDosingRec -> { + // bsDosingRec.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsDosingRec.getType())); + //}); + return bsDosingRecList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuInspectionPointServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuInspectionPointServiceImpl.java new file mode 100644 index 00000000..e62cad65 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuInspectionPointServiceImpl.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service.impl; + + +import org.springblade.desk.energy.excel.BsEpciuInspectionPointExcel; +import org.springblade.desk.energy.mapper.BsEpciuInspectionPointMapper; +import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity; +import org.springblade.desk.energy.pojo.vo.BsEpciuInspectionPointVO; +import org.springblade.desk.energy.service.IBsEpciuInspectionPointService; +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 BladeX + * @since 2025-12-24 + */ +@Service +public class BsEpciuInspectionPointServiceImpl extends BaseServiceImpl implements IBsEpciuInspectionPointService { + + @Override + public IPage selectBsEpciuInspectionPointPage(IPage page, BsEpciuInspectionPointVO bsEpciuInspectionPoint) { + return page.setRecords(baseMapper.selectBsEpciuInspectionPointPage(page, bsEpciuInspectionPoint)); + } + + + @Override + public List exportBsEpciuInspectionPoint(Wrapper queryWrapper) { + List bsEpciuInspectionPointList = baseMapper.exportBsEpciuInspectionPoint(queryWrapper); + //bsEpciuInspectionPointList.forEach(bsEpciuInspectionPoint -> { + // bsEpciuInspectionPoint.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsEpciuInspectionPoint.getType())); + //}); + return bsEpciuInspectionPointList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java new file mode 100644 index 00000000..233a9c5f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsEpciuPatrolInspectionServiceImpl.java @@ -0,0 +1,149 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service.impl; + + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.energy.excel.BsEpciuPatrolInspectionExcel; +import org.springblade.desk.energy.mapper.BsEpciuPatrolInspectionMapper; +import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity; +import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity; +import org.springblade.desk.energy.pojo.vo.BsEpciuPatrolInspectionVO; +import org.springblade.desk.energy.service.IBsEpciuInspectionPointService; +import org.springblade.desk.energy.service.IBsEpciuPatrolInspectionService; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + +/** + * 环保巡检任务表 服务实现类 + * + * @author BladeX + * @since 2025-12-24 + */ +@Service +@RequiredArgsConstructor +public class BsEpciuPatrolInspectionServiceImpl extends BaseServiceImpl implements IBsEpciuPatrolInspectionService { + + + private final IBsEpciuInspectionPointService bsEpciuInspectionPointService; + @Override + public IPage selectBsEpciuPatrolInspectionPage(IPage page, BsEpciuPatrolInspectionVO bsEpciuPatrolInspection) { + if(bsEpciuPatrolInspection.getQueryLaunchTime()!=null){ + bsEpciuPatrolInspection.setStartDate(bsEpciuPatrolInspection.getQueryLaunchTime().split(",")[0]); + bsEpciuPatrolInspection.setEndDate(bsEpciuPatrolInspection.getQueryLaunchTime().split(",")[1]); + }else if(StringUtils.isNotEmpty(bsEpciuPatrolInspection.getQueryTestTime())){ + bsEpciuPatrolInspection.setStartTestDate(bsEpciuPatrolInspection.getQueryTestTime().split(",")[0]); + bsEpciuPatrolInspection.setEndTestDate(bsEpciuPatrolInspection.getQueryTestTime().split(",")[1]); + } + return page.setRecords(baseMapper.selectBsEpciuPatrolInspectionPage(page, bsEpciuPatrolInspection)); + } + + + @Override + public List exportBsEpciuPatrolInspection(Wrapper queryWrapper) { + List bsEpciuPatrolInspectionList = baseMapper.exportBsEpciuPatrolInspection(queryWrapper); + //bsEpciuPatrolInspectionList.forEach(bsEpciuPatrolInspection -> { + // bsEpciuPatrolInspection.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsEpciuPatrolInspection.getType())); + //}); + return bsEpciuPatrolInspectionList; + } + + @Override + public void epInspectionTasks(boolean flag) { + List epInspectionPointList = bsEpciuInspectionPointService.list(); + if (epInspectionPointList.size() == 0) { + return; + } + BsEpciuPatrolInspectionEntity epPatrolInspection; + for (BsEpciuInspectionPointEntity epInspectionPoint : epInspectionPointList) { + epPatrolInspection = new BsEpciuPatrolInspectionEntity(); + // 如果是整点 + if (flag) { + epPatrolInspection.setEpcId(epInspectionPoint.getId()); + epPatrolInspection.setInsNum(epInspectionPoint.getInsNum()); + epPatrolInspection.setInsSite(epInspectionPoint.getInsSite()); + epPatrolInspection.setInsMemo(epPatrolInspection.getInsMemo()); + epPatrolInspection.setLaunchTime(new Date()); + epPatrolInspection.setTaskStatus(BsEpciuPatrolInspectionEntity.PREPARE_TEXT.toString()); + baseMapper.insertOrUpdate(epPatrolInspection); + // 保存触发任务的时间 + epInspectionPoint.setLastInsCycle(new Date()); + bsEpciuInspectionPointService.saveOrUpdate(epInspectionPoint); + } else { + Boolean isAdd = false; + // 拿到当前的小时值 + int hour = Calendar.getInstance().get(Calendar.HOUR_OF_DAY); + + // 拿到巡检点的上次生成任务的时间 + Date lastInsCycle = epInspectionPoint.getLastInsCycle(); + // 如果是刚创建的 + if (lastInsCycle == null) { + isAdd = true; + } else { + SimpleDateFormat format = new SimpleDateFormat("HH"); + String lastHours = format.format(lastInsCycle); + // 下次触发时间 + Long insCycle = epInspectionPoint.getInsCycle() + Integer.valueOf(lastHours); + + if (insCycle < 24) { + + // 如果当前时间与下次触发时间一样就生成任务 + isAdd = hour == insCycle; + // 特殊情况下服务器停的时间过长 + if (Integer.valueOf(lastHours) + epInspectionPoint.getInsCycle() < hour) { + isAdd = true; + } + } else { + // 如果下次触发时间大于24，则减去24并判断时间是否相等 + isAdd = insCycle - 24 == hour; + } + } + if (isAdd) { + epPatrolInspection.setEpcId(epInspectionPoint.getId()); + epPatrolInspection.setInsNum(epInspectionPoint.getInsNum()); + epPatrolInspection.setInsSite(epInspectionPoint.getInsSite()); + epPatrolInspection.setInsMemo(epPatrolInspection.getInsMemo()); + epPatrolInspection.setLaunchTime(new Date()); + epPatrolInspection.setTaskStatus(BsEpciuPatrolInspectionEntity.PREPARE_TEXT.toString()); + baseMapper.insertOrUpdate(epPatrolInspection); + // 保存触发任务的时间 + epInspectionPoint.setLastInsCycle(new Date()); + bsEpciuInspectionPointService.saveOrUpdate(epInspectionPoint); + } + } + + } + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsInsTestServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsInsTestServiceImpl.java new file mode 100644 index 00000000..ca8d68b0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsInsTestServiceImpl.java @@ -0,0 +1,65 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service.impl; + + +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.energy.excel.BsInsTestExcel; +import org.springblade.desk.energy.mapper.BsInsTestMapper; +import org.springblade.desk.energy.pojo.entity.BsInsTestEntity; +import org.springblade.desk.energy.pojo.vo.BsInsTestVO; +import org.springblade.desk.energy.service.IBsInsTestService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 废水化验记录表 服务实现类 + * + * @author BladeX + * @since 2025-12-29 + */ +@Service +public class BsInsTestServiceImpl extends BaseServiceImpl implements IBsInsTestService { + + @Override + public IPage selectBsInsTestPage(IPage page, BsInsTestVO bsInsTest) { + return page.setRecords(baseMapper.selectBsInsTestPage(page, bsInsTest)); + } + + + @Override + public List exportBsInsTest(Wrapper queryWrapper) { + List bsInsTestList = baseMapper.exportBsInsTest(queryWrapper); + //bsInsTestList.forEach(bsInsTest -> { + // bsInsTest.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsInsTest.getType())); + //}); + return bsInsTestList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsMeterParamServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsMeterParamServiceImpl.java new file mode 100644 index 00000000..56e90658 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsMeterParamServiceImpl.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service.impl; + + +import org.springblade.desk.energy.excel.BsMeterParamExcel; +import org.springblade.desk.energy.mapper.BsMeterParamMapper; +import org.springblade.desk.energy.pojo.entity.BsMeterParamEntity; +import org.springblade.desk.energy.pojo.vo.BsMeterParamVO; +import org.springblade.desk.energy.service.IBsMeterParamService; +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 BladeX + * @since 2025-12-25 + */ +@Service +public class BsMeterParamServiceImpl extends BaseServiceImpl implements IBsMeterParamService { + + @Override + public IPage selectBsMeterParamPage(IPage page, BsMeterParamVO bsMeterParam) { + return page.setRecords(baseMapper.selectBsMeterParamPage(page, bsMeterParam)); + } + + + @Override + public List exportBsMeterParam(Wrapper queryWrapper) { + List bsMeterParamList = baseMapper.exportBsMeterParam(queryWrapper); + //bsMeterParamList.forEach(bsMeterParam -> { + // bsMeterParam.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsMeterParam.getType())); + //}); + return bsMeterParamList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafeInspectionPointServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafeInspectionPointServiceImpl.java new file mode 100644 index 00000000..a20cef4c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafeInspectionPointServiceImpl.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service.impl; + + +import org.springblade.desk.energy.excel.BsSafeInspectionPointExcel; +import org.springblade.desk.energy.mapper.BsSafeInspectionPointMapper; +import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity; +import org.springblade.desk.energy.pojo.vo.BsSafeInspectionPointVO; +import org.springblade.desk.energy.service.IBsSafeInspectionPointService; +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 BladeX + * @since 2025-12-22 + */ +@Service +public class BsSafeInspectionPointServiceImpl extends BaseServiceImpl implements IBsSafeInspectionPointService { + + @Override + public IPage selectBsSafeInspectionPointPage(IPage page, BsSafeInspectionPointVO bsSafeInspectionPoint) { + return page.setRecords(baseMapper.selectBsSafeInspectionPointPage(page, bsSafeInspectionPoint)); + } + + + @Override + public List exportBsSafeInspectionPoint(Wrapper queryWrapper) { + List bsSafeInspectionPointList = baseMapper.exportBsSafeInspectionPoint(queryWrapper); + //bsSafeInspectionPointList.forEach(bsSafeInspectionPoint -> { + // bsSafeInspectionPoint.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsSafeInspectionPoint.getType())); + //}); + return bsSafeInspectionPointList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafePatrolInspectionServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafePatrolInspectionServiceImpl.java new file mode 100644 index 00000000..20e9f9dc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsSafePatrolInspectionServiceImpl.java @@ -0,0 +1,110 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.tool.constant.BladeConstant; +import org.springblade.desk.energy.excel.BsSafePatrolInspectionExcel; +import org.springblade.desk.energy.mapper.BsSafePatrolInspectionMapper; +import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity; +import org.springblade.desk.energy.pojo.entity.BsSafePatrolInspectionEntity; +import org.springblade.desk.energy.pojo.vo.BsSafePatrolInspectionVO; +import org.springblade.desk.energy.service.IBsSafeInspectionPointService; +import org.springblade.desk.energy.service.IBsSafePatrolInspectionService; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * 巡检任务表 服务实现类 + * + * @author BladeX + * @since 2025-12-22 + */ +@Service +@RequiredArgsConstructor +public class BsSafePatrolInspectionServiceImpl extends BaseServiceImpl implements IBsSafePatrolInspectionService { + + private final IBsSafeInspectionPointService bsSafeInspectionPointService; + @Override + public IPage selectBsSafePatrolInspectionPage(IPage page, BsSafePatrolInspectionVO bsSafePatrolInspection) { + if(bsSafePatrolInspection.getQueryLaunchTime()!=null){ + bsSafePatrolInspection.setStartDate(bsSafePatrolInspection.getQueryLaunchTime().split(",")[0]); + bsSafePatrolInspection.setEndDate(bsSafePatrolInspection.getQueryLaunchTime().split(",")[1]); + }else if(StringUtils.isNotEmpty(bsSafePatrolInspection.getQueryTestTime())){ + bsSafePatrolInspection.setStartTestDate(bsSafePatrolInspection.getQueryTestTime().split(",")[0]); + bsSafePatrolInspection.setEndTestDate(bsSafePatrolInspection.getQueryTestTime().split(",")[1]); + } + return page.setRecords(baseMapper.selectBsSafePatrolInspectionPage(page, bsSafePatrolInspection)); + } + + + @Override + public List exportBsSafePatrolInspection(Wrapper queryWrapper) { + List bsSafePatrolInspectionList = baseMapper.exportBsSafePatrolInspection(queryWrapper); + //bsSafePatrolInspectionList.forEach(bsSafePatrolInspection -> { + // bsSafePatrolInspection.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsSafePatrolInspection.getType())); + //}); + return bsSafePatrolInspectionList; + } + + @Override + public void createSafPatrolTask() { + // 如果是节假日就不需要生产任务 +// if (DateTools.isHoliday()) { +// return; +// } + //查询巡检配置 + List ipLiST = bsSafeInspectionPointService.list(); + if (ipLiST.size() == 0) { + return; + } + BsSafePatrolInspectionEntity pi; + for (BsSafeInspectionPointEntity ip : ipLiST) { + pi = new BsSafePatrolInspectionEntity(); + pi.setIpId(ip.getId()); + pi.setInsSite(ip.getInsSite()); + pi.setInsNum(ip.getInsNum()); + pi.setWaitCycle(ip.getLastInsCycle()); + pi.setInsMemo(ip.getMemo()); + pi.setLaunchTime(new Date()); + pi.setTaskStatus(BsSafePatrolInspectionEntity.PREPARE_TEXT.toString()); + baseMapper.insertOrUpdate(pi); + } + } + + @Override + public void handleSafPatrolTask() { + baseMapper.update(Wrappers.update().lambda().set(BsSafePatrolInspectionEntity::getTaskStatus, BsSafePatrolInspectionEntity.NO_CHECK).eq(BsSafePatrolInspectionEntity::getTaskStatus, BsSafePatrolInspectionEntity.PREPARE_TEXT)); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsTowerReportServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsTowerReportServiceImpl.java new file mode 100644 index 00000000..d365f2c9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsTowerReportServiceImpl.java @@ -0,0 +1,69 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service.impl; + + +import org.apache.commons.lang3.StringUtils; +import org.springblade.desk.energy.excel.BsTowerReportExcel; +import org.springblade.desk.energy.mapper.BsTowerReportMapper; +import org.springblade.desk.energy.pojo.entity.BsTowerReportEntity; +import org.springblade.desk.energy.pojo.vo.BsTowerReportVO; +import org.springblade.desk.energy.service.IBsTowerReportService; +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 BladeX + * @since 2025-12-24 + */ +@Service +public class BsTowerReportServiceImpl extends BaseServiceImpl implements IBsTowerReportService { + + @Override + public IPage selectBsTowerReportPage(IPage page, BsTowerReportVO bsTowerReport) { + if(StringUtils.isNotEmpty(bsTowerReport.getQueryBtDate())){ + bsTowerReport.setStartDate(bsTowerReport.getQueryBtDate().split(",")[0]); + bsTowerReport.setEndDate(bsTowerReport.getQueryBtDate().split(",")[1]); + } + return page.setRecords(baseMapper.selectBsTowerReportPage(page, bsTowerReport)); + } + + + @Override + public List exportBsTowerReport(Wrapper queryWrapper) { + List bsTowerReportList = baseMapper.exportBsTowerReport(queryWrapper); + //bsTowerReportList.forEach(bsTowerReport -> { + // bsTowerReport.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsTowerReport.getType())); + //}); + return bsTowerReportList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsTowerServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsTowerServiceImpl.java new file mode 100644 index 00000000..f0cf1f97 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsTowerServiceImpl.java @@ -0,0 +1,63 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service.impl; + +import org.springblade.desk.energy.excel.BsTowerExcel; +import org.springblade.desk.energy.mapper.BsTowerMapper; +import org.springblade.desk.energy.pojo.entity.BsTowerEntity; +import org.springblade.desk.energy.pojo.vo.BsTowerVO; +import org.springblade.desk.energy.service.IBsTowerService; +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 BladeX + * @since 2025-12-23 + */ +@Service +public class BsTowerServiceImpl extends BaseServiceImpl implements IBsTowerService { + + @Override + public IPage selectBsTowerPage(IPage page, BsTowerVO bsTower) { + return page.setRecords(baseMapper.selectBsTowerPage(page, bsTower)); + } + + + @Override + public List exportBsTower(Wrapper queryWrapper) { + List bsTowerList = baseMapper.exportBsTower(queryWrapper); + //bsTowerList.forEach(bsTower -> { + // bsTower.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsTower.getType())); + //}); + return bsTowerList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsWasteGasRunRecServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsWasteGasRunRecServiceImpl.java new file mode 100644 index 00000000..b8d8f193 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/service/impl/BsWasteGasRunRecServiceImpl.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.service.impl; + +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.energy.excel.BsWasteGasRunRecExcel; +import org.springblade.desk.energy.mapper.BsWasteGasRunRecMapper; +import org.springblade.desk.energy.pojo.entity.BsWasteGasRunRecEntity; +import org.springblade.desk.energy.pojo.vo.BsWasteGasRunRecVO; +import org.springblade.desk.energy.service.IBsWasteGasRunRecService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 废气运行记录表 服务实现类 + * + * @author BladeX + * @since 2025-12-29 + */ +@Service +public class BsWasteGasRunRecServiceImpl extends BaseServiceImpl implements IBsWasteGasRunRecService { + + @Override + public IPage selectBsWasteGasRunRecPage(IPage page, BsWasteGasRunRecVO bsWasteGasRunRec) { + return page.setRecords(baseMapper.selectBsWasteGasRunRecPage(page, bsWasteGasRunRec)); + } + + + @Override + public List exportBsWasteGasRunRec(Wrapper queryWrapper) { + List bsWasteGasRunRecList = baseMapper.exportBsWasteGasRunRec(queryWrapper); + //bsWasteGasRunRecList.forEach(bsWasteGasRunRec -> { + // bsWasteGasRunRec.setTypeName(DictCache.getValue(DictEnum.YES_NO, BsWasteGasRunRec.getType())); + //}); + return bsWasteGasRunRecList; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/task/OrderEnvJob.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/task/OrderEnvJob.java new file mode 100644 index 00000000..3f26e5e6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/task/OrderEnvJob.java @@ -0,0 +1,84 @@ +package org.springblade.desk.energy.task; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.energy.service.IBsEpciuPatrolInspectionService; +import org.springblade.desk.energy.util.HttpRequestService; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.Calendar; + +/** + * 定时任务 + * + * @author Chill + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class OrderEnvJob { + + + private final IBsEpciuPatrolInspectionService bsEpciuPatrolInspectionService; + + private final HttpRequestService httpRequestService; + + @Value("${business.oldMes.jobEnable}") + private String jobSafeEnable; + + @Value("${business.device.id}") + private String deviceId; + + /** + * 创建安全巡检任务定时器运行... + * + */ + @Scheduled(cron = "0/20 * * * * ?") + public void rpAcidMistTower() { + log.info("开始酸雾塔报警记录数据查询..."); + + if ("false".equals(jobSafeEnable)) { + log.info("同步酸雾塔报警记录数据查询..."); + return; + } + //酸雾塔报警记录数据查询..... + httpRequestService.getWasteWaterAndGas(deviceId,true,"rpAcidMistTower"); + + log.info("同步酸雾塔报警记录数据查询..."); + } + @Scheduled(cron = "0 0 0/1 * * ? ") + public void eneUpdateUsed() { + + if ("false".equals(jobSafeEnable)) { + log.info("生成环保巡检任务..."); + return; + } + log.info("生成环保巡检任务"); + //可以对每个时间域单独修改 + Calendar c = Calendar.getInstance(); + int hour = c.get(Calendar.HOUR_OF_DAY); + if (8 == hour) { + bsEpciuPatrolInspectionService.epInspectionTasks(true); + }else { + bsEpciuPatrolInspectionService.epInspectionTasks(false); + } + } + + @Scheduled(cron = "0 0/3 * * * ?") + public void bsTowerSosRec() { + log.info("开始酸雾塔PH报警......"); + + if ("false".equals(jobSafeEnable)) { + log.info("同步酸雾塔PH报警......"); + return; + } + //酸雾塔PH报警... + httpRequestService.getWasteWaterAndGas(deviceId,true,"towerSosRec"); + + log.info("同步酸雾塔PH报警..."); + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/task/OrderSafeJob.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/task/OrderSafeJob.java new file mode 100644 index 00000000..496bcfb9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/task/OrderSafeJob.java @@ -0,0 +1,55 @@ +package org.springblade.desk.energy.task; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.energy.service.IBsSafePatrolInspectionService; +import org.springblade.desk.order.service.IYieldOrderService; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * 定时任务 + * + * @author Chill + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class OrderSafeJob { + + private final IBsSafePatrolInspectionService bsSafePatrolInspectionService; + + @Value("${business.oldMes.jobEnable}") + private String jobSafeEnable; + + /** + * 创建安全巡检任务定时器运行... + * + */ + @Scheduled(cron = "0 0 0,2,5,7 * * ? ") + public void createSafPatrolTask() { + log.info("开始创建安全巡检任务定时器运行..."); + + if ("false".equals(jobSafeEnable)) { + log.info("同步创建安全巡检任务定时器运行...已关闭..."); + return; + } + //安全巡检任务定时器运行... + bsSafePatrolInspectionService.createSafPatrolTask(); + + log.info("同步创建安全巡检任务定时器运行...已完成..."); + } + @Scheduled(cron = "0 0 8 * * ? ") + public void handleSafPatrolTask() { + + if ("false".equals(jobSafeEnable)) { + log.info("验证当天7点的安全巡检任务有没有处理已关闭..."); + return; + } + log.info("验证当天7点的安全巡检任务有没有处理..."); + bsSafePatrolInspectionService.handleSafPatrolTask(); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/HttpRequestService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/HttpRequestService.java new file mode 100644 index 00000000..2a238b7f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/util/HttpRequestService.java @@ -0,0 +1,76 @@ +package org.springblade.desk.energy.util; + +import com.alibaba.fastjson.JSONObject; +import lombok.RequiredArgsConstructor; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; + +import java.util.List; +@Service +@RequiredArgsConstructor +public class HttpRequestService { + + private static final Logger log = LoggerFactory.getLogger(HttpRequestService.class); + + // private final RestTemplate httpClientTemplate; + + + + + /** + *

Description: 获取看板废水废气酸雾塔实时数据新接口

+ * + * @Author cdl + * @Date: 2023/9/19 10:10 + */ + public List getWasteWaterAndGas(String deviceId, Boolean flag, String str) { + // 头信息 + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + JSONObject object = new JSONObject(); + object.put("deviceNum", deviceId); + + + JSONObject result = null; + + HttpEntity entity = new HttpEntity<>(object, headers); + ResponseEntity responseEntity= null;//httpClientTemplate.postForEntity(iotNewUrl + "/deviceForZhgd/getDataByIotCode", entity, JSONObject.class); + result = responseEntity.getBody(); + if (result != null && result.getInteger("code").equals(200)) { + JSONObject object1 = result.getJSONObject("data"); + List objList = object1.getJSONArray("modelAttrs").toJavaList(JSONObject.class); + if (objList.size() > 0) { + // 如果是定时器调用，将值返回存储到服务器 + if (flag) { + if (str.equals("rpAcidMistTower")) { + // 酸雾塔报警记录 + // epTowerRecService.setEpTowerRec(objList); + // 废气运行记录 + // epWasteGasRunRecService.creatRunData(objList); + } else if (str.equals("rpParameterSet")) { + // 参数设置 + // rpParameterSetServer.setParameterSet(objList); + } else if (str.equals("towerSosRec")) { + // 生产酸雾塔报警任务 + // epDosingRecService.towerSosRec(objList); + + // 生成报警数据用于报表展示 + // bsTowerService.generateData(objList); + } + } else { + return objList; + } + } + } else { + log.error("获取废水、大屏数据接口调用失败!编码:" + deviceId + "-类型:" + str); + } + return null; + } + + +} \ No newline at end of file diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsDischargeRecWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsDischargeRecWrapper.java new file mode 100644 index 00000000..be3bf1c9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsDischargeRecWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.energy.pojo.entity.BsDischargeRecEntity; +import org.springblade.desk.energy.pojo.vo.BsDischargeRecVO; + +import java.util.Objects; + +/** + * 槽液排放记录表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2025-12-25 + */ +public class BsDischargeRecWrapper extends BaseEntityWrapper { + + public static BsDischargeRecWrapper build() { + return new BsDischargeRecWrapper(); + } + + @Override + public BsDischargeRecVO entityVO(BsDischargeRecEntity bsDischargeRec) { + BsDischargeRecVO bsDischargeRecVO = Objects.requireNonNull(BeanUtil.copyProperties(bsDischargeRec, BsDischargeRecVO.class)); + + //User createUser = UserCache.getUser(bsDischargeRec.getCreateUser()); + //User updateUser = UserCache.getUser(bsDischargeRec.getUpdateUser()); + //bsDischargeRecVO.setCreateUserName(createUser.getName()); + //bsDischargeRecVO.setUpdateUserName(updateUser.getName()); + + return bsDischargeRecVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsDosingRecWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsDosingRecWrapper.java new file mode 100644 index 00000000..73881562 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsDosingRecWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.energy.pojo.entity.BsDosingRecEntity; +import org.springblade.desk.energy.pojo.vo.BsDosingRecVO; + +import java.util.Objects; + +/** + * 废气/废水加药记录表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2025-12-25 + */ +public class BsDosingRecWrapper extends BaseEntityWrapper { + + public static BsDosingRecWrapper build() { + return new BsDosingRecWrapper(); + } + + @Override + public BsDosingRecVO entityVO(BsDosingRecEntity bsDosingRec) { + BsDosingRecVO bsDosingRecVO = Objects.requireNonNull(BeanUtil.copyProperties(bsDosingRec, BsDosingRecVO.class)); + + //User createUser = UserCache.getUser(bsDosingRec.getCreateUser()); + //User updateUser = UserCache.getUser(bsDosingRec.getUpdateUser()); + //bsDosingRecVO.setCreateUserName(createUser.getName()); + //bsDosingRecVO.setUpdateUserName(updateUser.getName()); + + return bsDosingRecVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsEpciuInspectionPointWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsEpciuInspectionPointWrapper.java new file mode 100644 index 00000000..be6d3fa7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsEpciuInspectionPointWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.energy.pojo.entity.BsEpciuInspectionPointEntity; +import org.springblade.desk.energy.pojo.vo.BsEpciuInspectionPointVO; + +import java.util.Objects; + +/** + * 环保巡检点配置表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2025-12-24 + */ +public class BsEpciuInspectionPointWrapper extends BaseEntityWrapper { + + public static BsEpciuInspectionPointWrapper build() { + return new BsEpciuInspectionPointWrapper(); + } + + @Override + public BsEpciuInspectionPointVO entityVO(BsEpciuInspectionPointEntity bsEpciuInspectionPoint) { + BsEpciuInspectionPointVO bsEpciuInspectionPointVO = Objects.requireNonNull(BeanUtil.copyProperties(bsEpciuInspectionPoint, BsEpciuInspectionPointVO.class)); + + //User createUser = UserCache.getUser(bsEpciuInspectionPoint.getCreateUser()); + //User updateUser = UserCache.getUser(bsEpciuInspectionPoint.getUpdateUser()); + //bsEpciuInspectionPointVO.setCreateUserName(createUser.getName()); + //bsEpciuInspectionPointVO.setUpdateUserName(updateUser.getName()); + + return bsEpciuInspectionPointVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsEpciuPatrolInspectionWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsEpciuPatrolInspectionWrapper.java new file mode 100644 index 00000000..b8a787bd --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsEpciuPatrolInspectionWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.energy.pojo.entity.BsEpciuPatrolInspectionEntity; +import org.springblade.desk.energy.pojo.vo.BsEpciuPatrolInspectionVO; + +import java.util.Objects; + +/** + * 环保巡检任务表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2025-12-24 + */ +public class BsEpciuPatrolInspectionWrapper extends BaseEntityWrapper { + + public static BsEpciuPatrolInspectionWrapper build() { + return new BsEpciuPatrolInspectionWrapper(); + } + + @Override + public BsEpciuPatrolInspectionVO entityVO(BsEpciuPatrolInspectionEntity bsEpciuPatrolInspection) { + BsEpciuPatrolInspectionVO bsEpciuPatrolInspectionVO = Objects.requireNonNull(BeanUtil.copyProperties(bsEpciuPatrolInspection, BsEpciuPatrolInspectionVO.class)); + + //User createUser = UserCache.getUser(bsEpciuPatrolInspection.getCreateUser()); + //User updateUser = UserCache.getUser(bsEpciuPatrolInspection.getUpdateUser()); + //bsEpciuPatrolInspectionVO.setCreateUserName(createUser.getName()); + //bsEpciuPatrolInspectionVO.setUpdateUserName(updateUser.getName()); + + return bsEpciuPatrolInspectionVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsInsTestWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsInsTestWrapper.java new file mode 100644 index 00000000..1f077c1e --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsInsTestWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.energy.pojo.entity.BsInsTestEntity; +import org.springblade.desk.energy.pojo.vo.BsInsTestVO; + +import java.util.Objects; + +/** + * 废水化验记录表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2025-12-29 + */ +public class BsInsTestWrapper extends BaseEntityWrapper { + + public static BsInsTestWrapper build() { + return new BsInsTestWrapper(); + } + + @Override + public BsInsTestVO entityVO(BsInsTestEntity bsInsTest) { + BsInsTestVO bsInsTestVO = Objects.requireNonNull(BeanUtil.copyProperties(bsInsTest, BsInsTestVO.class)); + + //User createUser = UserCache.getUser(bsInsTest.getCreateUser()); + //User updateUser = UserCache.getUser(bsInsTest.getUpdateUser()); + //bsInsTestVO.setCreateUserName(createUser.getName()); + //bsInsTestVO.setUpdateUserName(updateUser.getName()); + + return bsInsTestVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsMeterParamWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsMeterParamWrapper.java new file mode 100644 index 00000000..fc508774 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsMeterParamWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.energy.pojo.entity.BsMeterParamEntity; +import org.springblade.desk.energy.pojo.vo.BsMeterParamVO; + +import java.util.Objects; + +/** + * 仪表参数表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2025-12-25 + */ +public class BsMeterParamWrapper extends BaseEntityWrapper { + + public static BsMeterParamWrapper build() { + return new BsMeterParamWrapper(); + } + + @Override + public BsMeterParamVO entityVO(BsMeterParamEntity bsMeterParam) { + BsMeterParamVO bsMeterParamVO = Objects.requireNonNull(BeanUtil.copyProperties(bsMeterParam, BsMeterParamVO.class)); + + //User createUser = UserCache.getUser(bsMeterParam.getCreateUser()); + //User updateUser = UserCache.getUser(bsMeterParam.getUpdateUser()); + //bsMeterParamVO.setCreateUserName(createUser.getName()); + //bsMeterParamVO.setUpdateUserName(updateUser.getName()); + + return bsMeterParamVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsSafeInspectionPointWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsSafeInspectionPointWrapper.java new file mode 100644 index 00000000..ec5e0c2c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsSafeInspectionPointWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.energy.pojo.entity.BsSafeInspectionPointEntity; +import org.springblade.desk.energy.pojo.vo.BsSafeInspectionPointVO; + +import java.util.Objects; + +/** + * 巡检点配置表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2025-12-22 + */ +public class BsSafeInspectionPointWrapper extends BaseEntityWrapper { + + public static BsSafeInspectionPointWrapper build() { + return new BsSafeInspectionPointWrapper(); + } + + @Override + public BsSafeInspectionPointVO entityVO(BsSafeInspectionPointEntity bsSafeInspectionPoint) { + BsSafeInspectionPointVO bsSafeInspectionPointVO = Objects.requireNonNull(BeanUtil.copyProperties(bsSafeInspectionPoint, BsSafeInspectionPointVO.class)); + + //User createUser = UserCache.getUser(bsSafeInspectionPoint.getCreateUser()); + //User updateUser = UserCache.getUser(bsSafeInspectionPoint.getUpdateUser()); + //bsSafeInspectionPointVO.setCreateUserName(createUser.getName()); + //bsSafeInspectionPointVO.setUpdateUserName(updateUser.getName()); + + return bsSafeInspectionPointVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsSafePatrolInspectionWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsSafePatrolInspectionWrapper.java new file mode 100644 index 00000000..db750054 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsSafePatrolInspectionWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.energy.pojo.entity.BsSafePatrolInspectionEntity; +import org.springblade.desk.energy.pojo.vo.BsSafePatrolInspectionVO; + +import java.util.Objects; + +/** + * 巡检任务表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2025-12-22 + */ +public class BsSafePatrolInspectionWrapper extends BaseEntityWrapper { + + public static BsSafePatrolInspectionWrapper build() { + return new BsSafePatrolInspectionWrapper(); + } + + @Override + public BsSafePatrolInspectionVO entityVO(BsSafePatrolInspectionEntity bsSafePatrolInspection) { + BsSafePatrolInspectionVO bsSafePatrolInspectionVO = Objects.requireNonNull(BeanUtil.copyProperties(bsSafePatrolInspection, BsSafePatrolInspectionVO.class)); + + //User createUser = UserCache.getUser(bsSafePatrolInspection.getCreateUser()); + //User updateUser = UserCache.getUser(bsSafePatrolInspection.getUpdateUser()); + //bsSafePatrolInspectionVO.setCreateUserName(createUser.getName()); + //bsSafePatrolInspectionVO.setUpdateUserName(updateUser.getName()); + + return bsSafePatrolInspectionVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsTowerReportWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsTowerReportWrapper.java new file mode 100644 index 00000000..1d279ced --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsTowerReportWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.energy.pojo.entity.BsTowerReportEntity; +import org.springblade.desk.energy.pojo.vo.BsTowerReportVO; + +import java.util.Objects; + +/** + * 酸雾塔报警记录表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2025-12-24 + */ +public class BsTowerReportWrapper extends BaseEntityWrapper { + + public static BsTowerReportWrapper build() { + return new BsTowerReportWrapper(); + } + + @Override + public BsTowerReportVO entityVO(BsTowerReportEntity bsTowerReport) { + BsTowerReportVO bsTowerReportVO = Objects.requireNonNull(BeanUtil.copyProperties(bsTowerReport, BsTowerReportVO.class)); + + //User createUser = UserCache.getUser(bsTowerReport.getCreateUser()); + //User updateUser = UserCache.getUser(bsTowerReport.getUpdateUser()); + //bsTowerReportVO.setCreateUserName(createUser.getName()); + //bsTowerReportVO.setUpdateUserName(updateUser.getName()); + + return bsTowerReportVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsTowerWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsTowerWrapper.java new file mode 100644 index 00000000..9c6574c8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsTowerWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.energy.pojo.entity.BsTowerEntity; +import org.springblade.desk.energy.pojo.vo.BsTowerVO; + +import java.util.Objects; + +/** + * 酸雾塔报警点配置表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2025-12-23 + */ +public class BsTowerWrapper extends BaseEntityWrapper { + + public static BsTowerWrapper build() { + return new BsTowerWrapper(); + } + + @Override + public BsTowerVO entityVO(BsTowerEntity bsTower) { + BsTowerVO bsTowerVO = Objects.requireNonNull(BeanUtil.copyProperties(bsTower, BsTowerVO.class)); + + //User createUser = UserCache.getUser(bsTower.getCreateUser()); + //User updateUser = UserCache.getUser(bsTower.getUpdateUser()); + //bsTowerVO.setCreateUserName(createUser.getName()); + //bsTowerVO.setUpdateUserName(updateUser.getName()); + + return bsTowerVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsWasteGasRunRecWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsWasteGasRunRecWrapper.java new file mode 100644 index 00000000..d1b8d9e6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/energy/wrapper/BsWasteGasRunRecWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.energy.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.energy.pojo.entity.BsWasteGasRunRecEntity; +import org.springblade.desk.energy.pojo.vo.BsWasteGasRunRecVO; + +import java.util.Objects; + +/** + * 废气运行记录表 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2025-12-29 + */ +public class BsWasteGasRunRecWrapper extends BaseEntityWrapper { + + public static BsWasteGasRunRecWrapper build() { + return new BsWasteGasRunRecWrapper(); + } + + @Override + public BsWasteGasRunRecVO entityVO(BsWasteGasRunRecEntity bsWasteGasRunRec) { + BsWasteGasRunRecVO bsWasteGasRunRecVO = Objects.requireNonNull(BeanUtil.copyProperties(bsWasteGasRunRec, BsWasteGasRunRecVO.class)); + + //User createUser = UserCache.getUser(bsWasteGasRunRec.getCreateUser()); + //User updateUser = UserCache.getUser(bsWasteGasRunRec.getUpdateUser()); + //bsWasteGasRunRecVO.setCreateUserName(createUser.getName()); + //bsWasteGasRunRecVO.setUpdateUserName(updateUser.getName()); + + return bsWasteGasRunRecVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/controller/FmProjectApplicationController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/controller/FmProjectApplicationController.java new file mode 100644 index 00000000..32914b7b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/controller/FmProjectApplicationController.java @@ -0,0 +1,175 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.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.process.excel.FmProjectApplicationExcel; +import org.springblade.desk.process.pojo.entity.FmProjectApplicationEntity; +import org.springblade.desk.process.pojo.entity.FmProjectMilestoneEntity; +import org.springblade.desk.process.pojo.vo.FmProjectApplicationVO; +import org.springblade.desk.process.service.IFmProjectApplicationService; +import org.springblade.desk.process.service.IFmProjectMilestoneService; +import org.springblade.desk.process.wrapper.FmProjectApplicationWrapper; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import java.util.Map; + +/** + * 项目管理 控制器 + * + * @author BladeX + * @since 2026-01-07 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/fmProjectApplication") +@Tag(name = "项目管理", description = "项目管理接口") +public class FmProjectApplicationController extends BladeController { + + private final IFmProjectApplicationService fmProjectApplicationService; + + private final IFmProjectMilestoneService fmProjectMilestoneService; + + /** + * 项目管理 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入fmProjectApplication") + public R detail(FmProjectApplicationEntity fmProjectApplication) { + FmProjectApplicationEntity detail = fmProjectApplicationService.getOne(Condition.getQueryWrapper(fmProjectApplication)); + List stoneList=fmProjectMilestoneService.list(new QueryWrapper().lambda() + .eq(FmProjectMilestoneEntity::getPaId,detail.getId())); + detail.setStoneList(stoneList); + return R.data(FmProjectApplicationWrapper.build().entityVO(detail)); + } + /** + * 项目管理 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入fmProjectApplication") + public R> list(@Parameter(hidden = true) @RequestParam Map fmProjectApplication, Query query) { + IPage pages = fmProjectApplicationService.page(Condition.getPage(query), Condition.getQueryWrapper(fmProjectApplication, FmProjectApplicationEntity.class)); + return R.data(FmProjectApplicationWrapper.build().pageVO(pages)); + } + + /** + * 项目管理 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入fmProjectApplication") + public R> page(FmProjectApplicationVO fmProjectApplication, Query query) { + IPage pages = fmProjectApplicationService.selectFmProjectApplicationPage(Condition.getPage(query), fmProjectApplication); + return R.data(pages); + } + + /** + * 项目管理 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入fmProjectApplication") + public R save(@Valid @RequestBody FmProjectApplicationEntity fmProjectApplication) { + return R.status(fmProjectApplicationService.save(fmProjectApplication)); + } + + /** + * 项目管理 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入fmProjectApplication") + public R update(@Valid @RequestBody FmProjectApplicationEntity fmProjectApplication) { + return R.status(fmProjectApplicationService.updateById(fmProjectApplication)); + } + + /** + * 项目管理 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入fmProjectApplication") + public R submit(@Valid @RequestBody FmProjectApplicationEntity fmProjectApplication) { + Boolean flag=fmProjectApplicationService.save(fmProjectApplication); + if(flag){ + List stoneList=fmProjectApplication.getStoneList(); + stoneList.forEach(x->{ + x.setPaId(fmProjectApplication.getId()); + }); + return R.status(fmProjectMilestoneService.saveOrUpdateBatch(stoneList)); + } + return R.status(false); + } + + /** + * 项目管理 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(fmProjectApplicationService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-fmProjectApplication") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入fmProjectApplication") + public void exportFmProjectApplication(@Parameter(hidden = true) @RequestParam Map fmProjectApplication, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(fmProjectApplication, FmProjectApplicationEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(FmProjectApplication::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(FmProjectApplicationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = fmProjectApplicationService.exportFmProjectApplication(queryWrapper); + ExcelUtil.export(response, "项目管理数据" + DateUtil.time(), "项目管理数据表", list, FmProjectApplicationExcel.class); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/controller/FmProjectMilestoneController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/controller/FmProjectMilestoneController.java new file mode 100644 index 00000000..1a36c85f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/controller/FmProjectMilestoneController.java @@ -0,0 +1,189 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.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.springblade.desk.process.excel.FmProjectMilestoneExcel; +import org.springblade.desk.process.pojo.entity.FmProjectMilestoneEntity; +import org.springblade.desk.process.pojo.vo.FmProjectMilestoneVO; +import org.springblade.desk.process.service.IFmProjectMilestoneService; +import org.springblade.desk.process.wrapper.FmProjectMilestoneWrapper; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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 BladeX + * @since 2026-01-07 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/fmProjectMilestone") +@Tag(name = "项目里程碑", description = "项目里程碑接口") +public class FmProjectMilestoneController extends BladeController { + + private final IFmProjectMilestoneService fmProjectMilestoneService; + + /** + * 项目里程碑 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入fmProjectMilestone") + public R detail(FmProjectMilestoneEntity fmProjectMilestone) { + FmProjectMilestoneEntity detail = fmProjectMilestoneService.getOne(Condition.getQueryWrapper(fmProjectMilestone)); + return R.data(FmProjectMilestoneWrapper.build().entityVO(detail)); + } + /** + * 项目里程碑 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入fmProjectMilestone") + public R> list(@Parameter(hidden = true) @RequestParam Map fmProjectMilestone, Query query) { + IPage pages = fmProjectMilestoneService.page(Condition.getPage(query), Condition.getQueryWrapper(fmProjectMilestone, FmProjectMilestoneEntity.class)); + return R.data(FmProjectMilestoneWrapper.build().pageVO(pages)); + } + + /** + * 项目里程碑 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入fmProjectMilestone") + public R> page(FmProjectMilestoneVO fmProjectMilestone, Query query) { + IPage pages = fmProjectMilestoneService.selectFmProjectMilestonePage(Condition.getPage(query), fmProjectMilestone); + return R.data(pages); + } + + /** + * 项目里程碑 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入fmProjectMilestone") + public R save(@Valid @RequestBody FmProjectMilestoneEntity fmProjectMilestone) { + return R.status(fmProjectMilestoneService.save(fmProjectMilestone)); + } + + /** + * 项目里程碑 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入fmProjectMilestone") + public R update(@Valid @RequestBody FmProjectMilestoneEntity fmProjectMilestone) { + return R.status(fmProjectMilestoneService.updateById(fmProjectMilestone)); + } + + /** + * 项目里程碑 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入fmProjectMilestone") + public R submit(@Valid @RequestBody FmProjectMilestoneEntity fmProjectMilestone) { + return R.status(fmProjectMilestoneService.saveOrUpdate(fmProjectMilestone)); + } + + /** + * 项目里程碑 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(fmProjectMilestoneService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export-fmProjectMilestone") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入fmProjectMilestone") + public void exportFmProjectMilestone(@Parameter(hidden = true) @RequestParam Map fmProjectMilestone, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(fmProjectMilestone, FmProjectMilestoneEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(FmProjectMilestone::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(FmProjectMilestoneEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = fmProjectMilestoneService.exportFmProjectMilestone(queryWrapper); + ExcelUtil.export(response, "项目里程碑数据" + DateUtil.time(), "项目里程碑数据表", list, FmProjectMilestoneExcel.class); + } + /** + * 项目里程碑 执行 + */ + @PostMapping("/projectExecute") + @ApiOperationSupport(order = 10) + @Operation(summary = "执行", description = "传入fmProjectMilestone") + public R projectExecute(@Valid @RequestBody FmProjectMilestoneEntity fmProjectMilestone) { + return R.status(fmProjectMilestoneService.projectExecute(fmProjectMilestone)); + } + /** + * 项目里程碑 核查 + */ + @PostMapping("/sendCheck") + @ApiOperationSupport(order = 10) + @Operation(summary = "核查", description = "传入fmProjectMilestone") + public R sendCheck(@Valid @RequestBody FmProjectMilestoneEntity fmProjectMilestone) { + return R.status(fmProjectMilestoneService.sendCheck(fmProjectMilestone)); + } + /** + * 项目里程碑 核准 + */ + @PostMapping("/gradeSubmit") + @ApiOperationSupport(order = 10) + @Operation(summary = "核准", description = "传入fmProjectMilestone") + public R gradeSubmit(@Valid @RequestBody FmProjectMilestoneEntity fmProjectMilestone) { + return R.status(fmProjectMilestoneService.gradeSubmit(fmProjectMilestone)); + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/excel/FmProjectApplicationExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/excel/FmProjectApplicationExcel.java new file mode 100644 index 00000000..9089046f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/excel/FmProjectApplicationExcel.java @@ -0,0 +1,171 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.excel; + + +import lombok.Data; + +import java.util.Date; +import java.math.BigDecimal; +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.Serializable; +import java.io.Serial; + + +/** + * 项目管理 Excel实体类 + * + * @author BladeX + * @since 2026-01-07 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class FmProjectApplicationExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ColumnWidth(20) + @ExcelProperty("主键ID") + private Short id; + /** + * 单据号 + */ + @ColumnWidth(20) + @ExcelProperty("单据号") + private String paCode; + /** + * 制单人 + */ + @ColumnWidth(20) + @ExcelProperty("制单人") + private String touchingMan; + /** + * 制单部门 + */ + @ColumnWidth(20) + @ExcelProperty("制单部门") + private String touchingDept; + /** + * 制单时间 + */ + @ColumnWidth(20) + @ExcelProperty("制单时间") + private Date touchingTime; + /** + * 项目名称 + */ + @ColumnWidth(20) + @ExcelProperty("项目名称") + private String projectName; + /** + * 项目类型 + */ + @ColumnWidth(20) + @ExcelProperty("项目类型") + private BigDecimal bcId; + /** + * 项目背景 + */ + @ColumnWidth(20) + @ExcelProperty("项目背景") + private String projectBackcloth; + /** + * 项目目标 + */ + @ColumnWidth(20) + @ExcelProperty("项目目标") + private String projectTarget; + /** + * 预期效果 + */ + @ColumnWidth(20) + @ExcelProperty("预期效果") + private String desiredResult; + /** + * 项目开始时间 + */ + @ColumnWidth(20) + @ExcelProperty("项目开始时间") + private Date projectStartTime; + /** + * 项目预期结束时间 + */ + @ColumnWidth(20) + @ExcelProperty("项目预期结束时间") + private Date projectDesiredEnd; + /** + * 项目实际结束时间 + */ + @ColumnWidth(20) + @ExcelProperty("项目实际结束时间") + private Date projectEnd; + /** + * 项目支持人 + */ + @ColumnWidth(20) + @ExcelProperty("项目支持人") + private String projectSupportMan; + /** + * 项目负责人 + */ + @ColumnWidth(20) + @ExcelProperty("项目负责人") + private String projectHead; + /** + * 成员ID + */ + @ColumnWidth(20) + @ExcelProperty("成员ID") + private BigDecimal memberId; + /** + * 成员名称 + */ + @ColumnWidth(20) + @ExcelProperty("成员名称") + private String memberName; + /** + * 审批状态 + */ + @ColumnWidth(20) + @ExcelProperty("审批状态") + private Long approvalStatus; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/excel/FmProjectMilestoneExcel.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/excel/FmProjectMilestoneExcel.java new file mode 100644 index 00000000..20b0374a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/excel/FmProjectMilestoneExcel.java @@ -0,0 +1,201 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.excel; + + +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; +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.Serializable; +import java.io.Serial; + + +/** + * 项目里程碑 Excel实体类 + * + * @author BladeX + * @since 2026-01-07 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class FmProjectMilestoneExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ColumnWidth(20) + @ExcelProperty("主键ID") + private Short id; + /** + * 项目ID + */ + @ColumnWidth(20) + @ExcelProperty("项目ID") + private BigDecimal paId; + /** + * 序号 + */ + @ColumnWidth(20) + @ExcelProperty("序号") + private String paIndex; + /** + * 里程碑计划 + */ + @ColumnWidth(20) + @ExcelProperty("里程碑计划") + private String milestonePlan; + /** + * 里程碑负责人 + */ + @ColumnWidth(20) + @ExcelProperty("里程碑负责人") + private String milestoneMan; + /** + * 里程碑输出物 + */ + @ColumnWidth(20) + @ExcelProperty("里程碑输出物") + private String outputMaterial; + /** + * 里程碑节点 + */ + @ColumnWidth(20) + @ExcelProperty("里程碑节点") + private String milestoneNode; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + /** + * 里程碑描述 + */ + @ColumnWidth(20) + @ExcelProperty("里程碑描述") + private String milestoneMemo; + /** + * 进展情况 + */ + @ColumnWidth(20) + @ExcelProperty("进展情况") + private String evolve; + /** + * 下一步计划 + */ + @ColumnWidth(20) + @ExcelProperty("下一步计划") + private String lastPlan; + /** + * 评价等级 + */ + @ColumnWidth(20) + @ExcelProperty("评价等级") + private String grade; + /** + * 分数 + */ + @ColumnWidth(20) + @ExcelProperty("分数") + private String score; + /** + * 执行结果 + */ + @ColumnWidth(20) + @ExcelProperty("执行结果") + private String executeResult; + /** + * 执行类型 + */ + @ColumnWidth(20) + @ExcelProperty("执行类型") + private String executeType; + /** + * 延期时间 + */ + @ColumnWidth(20) + @ExcelProperty("延期时间") + private Date delayTime; + /** + * 核查结果 + */ + @ColumnWidth(20) + @ExcelProperty("核查结果") + private String checkResult; + /** + * 核查人 + */ + @ColumnWidth(20) + @ExcelProperty("核查人") + private String checkMan; + /** + * 核查时间 + */ + @ColumnWidth(20) + @ExcelProperty("核查时间") + private Date checkTime; + /** + * 评价人 + */ + @ColumnWidth(20) + @ExcelProperty("评价人") + private String gradeMan; + /** + * 业务领导评价 + */ + @ColumnWidth(20) + @ExcelProperty("业务领导评价") + private String evaluate; + /** + * 通过时间 + */ + @ColumnWidth(20) + @ExcelProperty("通过时间") + private Date okTime; + /** + * 延期产生数据 + */ + @ColumnWidth(20) + @ExcelProperty("延期产生数据") + private Long delayDate; + /** + * 附件ID + */ + @ColumnWidth(20) + @ExcelProperty("附件ID") + private BigDecimal fileId; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/FmProjectApplicationMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/FmProjectApplicationMapper.java new file mode 100644 index 00000000..5501ca87 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/FmProjectApplicationMapper.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.mapper; + +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 org.springblade.desk.process.excel.FmProjectApplicationExcel; +import org.springblade.desk.process.pojo.entity.FmProjectApplicationEntity; +import org.springblade.desk.process.pojo.vo.FmProjectApplicationVO; + +import java.util.List; + +/** + * 项目管理 Mapper 接口 + * + * @author BladeX + * @since 2026-01-07 + */ +public interface FmProjectApplicationMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param fmProjectApplication 查询参数 + * @return List + */ + List selectFmProjectApplicationPage(IPage page, FmProjectApplicationVO fmProjectApplication); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportFmProjectApplication(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/FmProjectMilestoneMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/FmProjectMilestoneMapper.java new file mode 100644 index 00000000..2de61e7d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/FmProjectMilestoneMapper.java @@ -0,0 +1,64 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.mapper; + +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 org.springblade.desk.process.excel.FmProjectMilestoneExcel; +import org.springblade.desk.process.pojo.entity.FmProjectMilestoneEntity; +import org.springblade.desk.process.pojo.vo.FmProjectMilestoneVO; + +import java.util.List; + +/** + * 项目里程碑 Mapper 接口 + * + * @author BladeX + * @since 2026-01-07 + */ +public interface FmProjectMilestoneMapper extends BaseMapper { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param fmProjectMilestone 查询参数 + * @return List + */ + List selectFmProjectMilestonePage(IPage page, FmProjectMilestoneVO fmProjectMilestone); + + + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportFmProjectMilestone(@Param("ew") Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectApplicationMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectApplicationMapper.xml new file mode 100644 index 00000000..64486fb4 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectApplicationMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectMilestoneMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectMilestoneMapper.xml new file mode 100644 index 00000000..f8c2b096 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/mapper/ProjectMilestoneMapper.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/dto/FmProjectApplicationDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/dto/FmProjectApplicationDTO.java new file mode 100644 index 00000000..29a5d770 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/dto/FmProjectApplicationDTO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.process.pojo.entity.FmProjectApplicationEntity; + +import java.io.Serial; + +/** + * 项目管理 数据传输对象实体类 + * + * @author BladeX + * @since 2026-01-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class FmProjectApplicationDTO extends FmProjectApplicationEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/dto/FmProjectMilestoneDTO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/dto/FmProjectMilestoneDTO.java new file mode 100644 index 00000000..45caeaaa --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/dto/FmProjectMilestoneDTO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.pojo.dto; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.process.pojo.entity.FmProjectMilestoneEntity; + +import java.io.Serial; + +/** + * 项目里程碑 数据传输对象实体类 + * + * @author BladeX + * @since 2026-01-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class FmProjectMilestoneDTO extends FmProjectMilestoneEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectApplicationEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectApplicationEntity.java new file mode 100644 index 00000000..e845679d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectApplicationEntity.java @@ -0,0 +1,144 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; +import java.util.Date; +import java.math.BigDecimal; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tenant.mp.TenantEntity; +import java.io.Serial; +import java.util.List; + +/** + * 项目管理 实体类 + * + * @author BladeX + * @since 2026-01-07 + */ +@Data +@TableName("FM_PROJECT_APPLICATION") +@Schema(description = "FmProjectApplication对象") +@EqualsAndHashCode(callSuper = true) +public class FmProjectApplicationEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 单据号 + */ + @Schema(description = "单据号") + private String paCode; + /** + * 制单人 + */ + @Schema(description = "制单人") + private String touchingMan; + /** + * 制单部门 + */ + @Schema(description = "制单部门") + private String touchingDept; + /** + * 制单时间 + */ + @Schema(description = "制单时间") + private Date touchingTime; + /** + * 项目名称 + */ + @Schema(description = "项目名称") + private String projectName; + /** + * 项目类型 + */ + @Schema(description = "项目类型") + private BigDecimal bcId; + /** + * 项目背景 + */ + @Schema(description = "项目背景") + private String projectBackcloth; + /** + * 项目目标 + */ + @Schema(description = "项目目标") + private String projectTarget; + /** + * 预期效果 + */ + @Schema(description = "预期效果") + private String desiredResult; + /** + * 项目开始时间 + */ + @Schema(description = "项目开始时间") + private Date projectStartTime; + /** + * 项目预期结束时间 + */ + @Schema(description = "项目预期结束时间") + private Date projectDesiredEnd; + /** + * 项目实际结束时间 + */ + @Schema(description = "项目实际结束时间") + private Date projectEnd; + /** + * 项目支持人 + */ + @Schema(description = "项目支持人") + private String projectSupportMan; + /** + * 项目负责人 + */ + @Schema(description = "项目负责人") + private String projectHead; + /** + * 成员ID + */ + @Schema(description = "成员ID") + private BigDecimal memberId; + /** + * 成员名称 + */ + @Schema(description = "成员名称") + private String memberName; + /** + * 审批状态 + */ + @Schema(description = "审批状态") + private Long approvalStatus; + + @TableField(exist = false) + private List stoneList; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java new file mode 100644 index 00000000..e3daaf47 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/entity/FmProjectMilestoneEntity.java @@ -0,0 +1,272 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.pojo.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; +import io.swagger.v3.oas.annotations.media.Schema; +import com.baomidou.mybatisplus.annotation.TableName; +import java.math.BigDecimal; +import java.util.Date; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.tenant.mp.TenantEntity; +import java.io.Serial; +import java.util.HashMap; +import java.util.Map; + +/** + * 项目里程碑 实体类 + * + * @author BladeX + * @since 2026-01-07 + */ +@Data +@TableName("FM_PROJECT_MILESTONE") +@Schema(description = "FmProjectMilestone对象") +@EqualsAndHashCode(callSuper = true) +public class FmProjectMilestoneEntity extends BaseEntity { + + @Serial + private static final long serialVersionUID = 1L; + + + @TableField(exist = false) + private FmProjectApplicationEntity fmProjectApplication; + + /** + * 项目ID + */ + @Schema(description = "项目ID") + private Long paId; + /** + * 序号 + */ + @Schema(description = "序号") + private String paIndex; + /** + * 里程碑计划 + */ + @Schema(description = "里程碑计划") + private String milestonePlan; + /** + * 里程碑负责人 + */ + @Schema(description = "里程碑负责人") + private String milestoneMan; + /** + * 里程碑输出物 + */ + @Schema(description = "里程碑输出物") + private String outputMaterial; + /** + * 里程碑节点 + */ + @Schema(description = "里程碑节点") + private Date milestoneNode; + /** + * 里程碑描述 + */ + @Schema(description = "里程碑描述") + private String milestoneMemo; + /** + * 进展情况 + */ + @Schema(description = "进展情况") + private String evolve; + /** + * 下一步计划 + */ + @Schema(description = "下一步计划") + private String lastPlan; + /** + * 评价等级 + */ + @Schema(description = "评价等级") + private Short grade; + /** + * 分数 + */ + @Schema(description = "分数") + private Double score; + /** + * 执行结果 + */ + @Schema(description = "执行结果") + private Short executeResult=0; + /** + * 执行类型 + */ + @Schema(description = "执行类型") + private String executeType; + /** + * 延期时间 + */ + @Schema(description = "延期时间") + private Date delayTime; + /** + * 核查结果 + */ + @Schema(description = "核查结果") + private Short checkResult=0; + /** + * 核查人 + */ + @Schema(description = "核查人") + private String checkMan; + /** + * 核查时间 + */ + @Schema(description = "核查时间") + private Date checkTime; + /** + * 评价人 + */ + @Schema(description = "评价人") + private String gradeMan; + /** + * 业务领导评价 + */ + @Schema(description = "业务领导评价") + private String evaluate; + /** + * 通过时间 + */ + @Schema(description = "通过时间") + private Date okTime; + /** + * 延期产生数据 + */ + @Schema(description = "延期产生数据") + private Boolean delayDate=false; + /** + * 附件ID + */ + @Schema(description = "附件ID") + private Long fileId; + + /** + * 评价等级 未评价 + */ + public static Short GRADE_NO = 0; + /** + * 评价等级 待评价 + */ + public static Short GRADE_TREAT = 1; + /** + * 评价等级 差 + */ + public static Short GRADE_C = 2; + /** + * 评价等级 中 + */ + public static Short GRADE_Z = 3; + /** + * 评价等级 良 + */ + public static Short GRADE_L = 4; + /** + * 评价等级 优 + */ + public static Short GRADE_Y = 5; + + public static Map gradeMap = new HashMap<>(3); + + static { + gradeMap.put(GRADE_NO, "未评价"); + gradeMap.put(GRADE_TREAT, "待评价"); + gradeMap.put(GRADE_L, "良"); + gradeMap.put(GRADE_Z, "中"); + gradeMap.put(GRADE_C, "差"); + gradeMap.put(GRADE_Y, "优"); + } + + public String getGradeTitle() { + return gradeMap.get(this.grade); + } + + /** + * 执行类型 无 + */ + public static Short EXECUTE_RESULT_NO = 0; + /** + * 执行类型 延期 + */ + public static Short EXECUTE_RESULT_YQ = 1; + /** + * 执行类型 终止 + */ + public static Short EXECUTE_RESULT_ZZ = 2; + /** + * 执行类型 完成 + */ + public static Short EXECUTE_RESULT_JXSQ = 3; + + public static Map executeResultMap = new HashMap<>(3); + + static { + executeResultMap.put(EXECUTE_RESULT_NO, "无"); + executeResultMap.put(EXECUTE_RESULT_YQ, "延期"); + executeResultMap.put(EXECUTE_RESULT_ZZ, "终止"); + executeResultMap.put(EXECUTE_RESULT_JXSQ, "完成"); + } + + public String getExecuteResultTitle() { + return executeResultMap.get(this.executeResult); + } + + + /** + * 核查结果 未审核 + */ + public static Short CHECK_RESULT_NULL = 0; + /** + * 核查结果 待审核 + */ + public static Short CHECK_RESULT_TREAT = 1; + /** + * 核查结果 通过 + */ + public static Short CHECK_RESULT_OK = 2; + /** + * 核查结果 不通过 + */ + public static Short CHECK_RESULT_NO = 3; + + public static Map checkResultMap = new HashMap<>(3); + + static { + checkResultMap.put(CHECK_RESULT_NULL, "未核查"); + checkResultMap.put(CHECK_RESULT_TREAT, "待核查"); + checkResultMap.put(CHECK_RESULT_OK, "通过"); + checkResultMap.put(CHECK_RESULT_NO, "不通过"); + } + + public String getCheckResultTitle() { + return checkResultMap.get(this.checkResult); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectApplicationVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectApplicationVO.java new file mode 100644 index 00000000..1eedba8f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectApplicationVO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.process.pojo.entity.FmProjectApplicationEntity; + +import java.io.Serial; + +/** + * 项目管理 视图实体类 + * + * @author BladeX + * @since 2026-01-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class FmProjectApplicationVO extends FmProjectApplicationEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java new file mode 100644 index 00000000..8dd61ffc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/pojo/vo/FmProjectMilestoneVO.java @@ -0,0 +1,46 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.pojo.vo; + +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.desk.process.pojo.entity.FmProjectMilestoneEntity; + +import java.io.Serial; + +/** + * 项目里程碑 视图实体类 + * + * @author BladeX + * @since 2026-01-07 + */ +@Data +@EqualsAndHashCode(callSuper = true) +public class FmProjectMilestoneVO extends FmProjectMilestoneEntity { + @Serial + private static final long serialVersionUID = 1L; + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/IFmProjectApplicationService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/IFmProjectApplicationService.java new file mode 100644 index 00000000..b88088fa --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/IFmProjectApplicationService.java @@ -0,0 +1,62 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.service; + +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.process.excel.FmProjectApplicationExcel; +import org.springblade.desk.process.pojo.entity.FmProjectApplicationEntity; +import org.springblade.desk.process.pojo.vo.FmProjectApplicationVO; + +import java.util.List; + +/** + * 项目管理 服务类 + * + * @author BladeX + * @since 2026-01-07 + */ +public interface IFmProjectApplicationService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param fmProjectApplication 查询参数 + * @return IPage + */ + IPage selectFmProjectApplicationPage(IPage page, FmProjectApplicationVO fmProjectApplication); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportFmProjectApplication(Wrapper queryWrapper); + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/IFmProjectMilestoneService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/IFmProjectMilestoneService.java new file mode 100644 index 00000000..ee7088cc --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/IFmProjectMilestoneService.java @@ -0,0 +1,82 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.service; + +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.process.excel.FmProjectMilestoneExcel; +import org.springblade.desk.process.pojo.entity.FmProjectMilestoneEntity; +import org.springblade.desk.process.pojo.vo.FmProjectMilestoneVO; + +import java.util.List; + +/** + * 项目里程碑 服务类 + * + * @author BladeX + * @since 2026-01-07 + */ +public interface IFmProjectMilestoneService extends BaseService { + /** + * 自定义分页 + * + * @param page 分页参数 + * @param fmProjectMilestone 查询参数 + * @return IPage + */ + IPage selectFmProjectMilestonePage(IPage page, FmProjectMilestoneVO fmProjectMilestone); + + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportFmProjectMilestone(Wrapper queryWrapper); + + /** + * 核查 + * @param fmProjectMilestone + * @return + */ + boolean sendCheck(FmProjectMilestoneEntity fmProjectMilestone); + + /** + * 核准 + * @param fmProjectMilestone + * @return + */ + boolean gradeSubmit(FmProjectMilestoneEntity fmProjectMilestone); + + /** + * 执行 + * @param fmProjectMilestone + * @return + */ + boolean projectExecute(FmProjectMilestoneEntity fmProjectMilestone); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectApplicationServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectApplicationServiceImpl.java new file mode 100644 index 00000000..974821f6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectApplicationServiceImpl.java @@ -0,0 +1,63 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.service.impl; + +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.process.excel.FmProjectApplicationExcel; +import org.springblade.desk.process.mapper.FmProjectApplicationMapper; +import org.springblade.desk.process.pojo.entity.FmProjectApplicationEntity; +import org.springblade.desk.process.pojo.vo.FmProjectApplicationVO; +import org.springblade.desk.process.service.IFmProjectApplicationService; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 项目管理 服务实现类 + * + * @author BladeX + * @since 2026-01-07 + */ +@Service +public class FmProjectApplicationServiceImpl extends BaseServiceImpl implements IFmProjectApplicationService { + + @Override + public IPage selectFmProjectApplicationPage(IPage page, FmProjectApplicationVO fmProjectApplication) { + return page.setRecords(baseMapper.selectFmProjectApplicationPage(page, fmProjectApplication)); + } + + + @Override + public List exportFmProjectApplication(Wrapper queryWrapper) { + List fmProjectApplicationList = baseMapper.exportFmProjectApplication(queryWrapper); + //fmProjectApplicationList.forEach(fmProjectApplication -> { + // fmProjectApplication.setTypeName(DictCache.getValue(DictEnum.YES_NO, FmProjectApplication.getType())); + //}); + return fmProjectApplicationList; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java new file mode 100644 index 00000000..ef387ac9 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/service/impl/FmProjectMilestoneServiceImpl.java @@ -0,0 +1,201 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.service.impl; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.process.excel.FmProjectMilestoneExcel; +import org.springblade.desk.process.mapper.FmProjectMilestoneMapper; +import org.springblade.desk.process.pojo.entity.FmProjectApplicationEntity; +import org.springblade.desk.process.pojo.entity.FmProjectMilestoneEntity; +import org.springblade.desk.process.pojo.vo.FmProjectMilestoneVO; +import org.springblade.desk.process.service.IFmProjectApplicationService; +import org.springblade.desk.process.service.IFmProjectMilestoneService; +import org.springframework.stereotype.Service; + +import java.util.Date; +import java.util.List; + +/** + * 项目里程碑 服务实现类 + * + * @author BladeX + * @since 2026-01-07 + */ +@Service +@RequiredArgsConstructor +public class FmProjectMilestoneServiceImpl extends BaseServiceImpl implements IFmProjectMilestoneService { + + private final IFmProjectApplicationService fmProjectApplicationService; + @Override + public IPage selectFmProjectMilestonePage(IPage page, FmProjectMilestoneVO fmProjectMilestone) { + return page.setRecords(baseMapper.selectFmProjectMilestonePage(page, fmProjectMilestone)); + } + + + @Override + public List exportFmProjectMilestone(Wrapper queryWrapper) { + List fmProjectMilestoneList = baseMapper.exportFmProjectMilestone(queryWrapper); + //fmProjectMilestoneList.forEach(fmProjectMilestone -> { + // fmProjectMilestone.setTypeName(DictCache.getValue(DictEnum.YES_NO, FmProjectMilestone.getType())); + //}); + return fmProjectMilestoneList; + } + + @Override + public boolean sendCheck(FmProjectMilestoneEntity fmProjectMilestone) { + if (fmProjectMilestone != null && fmProjectMilestone.getId() != null) { + // 如果是项目执行发送 + if (FmProjectMilestoneEntity.CHECK_RESULT_TREAT.equals(fmProjectMilestone.getCheckResult())) { + fmProjectMilestone.setCheckMan(String.valueOf(AuthUtil.getUser().getUserId())); + if (StringUtils.isBlank(fmProjectMilestone.getMilestoneMemo())) { + throw new ServiceException("请先维护节点信息"); + } + } + // 如果是项目核查 + if (FmProjectMilestoneEntity.CHECK_RESULT_OK.equals(fmProjectMilestone.getCheckResult()) || FmProjectMilestoneEntity.CHECK_RESULT_NO.equals(fmProjectMilestone.getCheckResult())) { +// fmProjectMilestone.setCheckMan(pfUserInfo); + if (FmProjectMilestoneEntity.CHECK_RESULT_OK.equals(fmProjectMilestone.getCheckResult())) { + fmProjectMilestone.setGrade(FmProjectMilestoneEntity.GRADE_TREAT); + fmProjectMilestone.setGradeMan(String.valueOf(AuthUtil.getUser().getUserId())); + } + fmProjectMilestone.setCheckTime(new Date()); + } + baseMapper.updateById(fmProjectMilestone); + return true; + } + return false; + } + + @Override + public boolean gradeSubmit(FmProjectMilestoneEntity fmProjectMilestone) { + if (fmProjectMilestone != null && fmProjectMilestone.getId() != null) { + fmProjectMilestone.setGradeMan(String.valueOf(AuthUtil.getUser().getUserId())); + Double score= fmProjectMilestone.getScore(); + fmProjectMilestone.setScore(score); + + if (score > 95) { + fmProjectMilestone.setGrade(FmProjectMilestoneEntity.GRADE_Y); + } else if (score >= 85 && score <= 95) { + fmProjectMilestone.setGrade(FmProjectMilestoneEntity.GRADE_L); + } else if (score >= 75 && score <= 84) { + fmProjectMilestone.setGrade(FmProjectMilestoneEntity.GRADE_Z); + } else { + fmProjectMilestone.setGrade(FmProjectMilestoneEntity.GRADE_C); + } + fmProjectMilestone.setOkTime(new Date()); + fmProjectMilestone.setEvaluate(fmProjectMilestone.getEvolve()); + // 如果评价分数在75分以上，并且执行类型不是延期。则代表本节点已经完成 + if (score < 75 && !FmProjectMilestoneEntity.EXECUTE_RESULT_YQ.equals(fmProjectMilestone.getExecuteResult())) { + fmProjectMilestone.setCheckResult(FmProjectMilestoneEntity.CHECK_RESULT_TREAT); + return false; + } + baseMapper.updateById(fmProjectMilestone); + // 如果选择的是延期，则生成一条新的里程碑，此里程碑关闭 + if (FmProjectMilestoneEntity.EXECUTE_RESULT_YQ.equals(fmProjectMilestone.getExecuteResult())) { + FmProjectMilestoneEntity projectMilestoneClone = BeanUtil.copyProperties(fmProjectMilestone, FmProjectMilestoneEntity.class); + projectMilestoneClone.setId(null); + projectMilestoneClone.setDelayDate(Boolean.TRUE); + String paIndex = fmProjectMilestone.getPaIndex(); + Double paIndexDou = Double.valueOf(paIndex) + 0.01; + String format = "0"; + if (paIndexDou >= 2) { + paIndexDou = paIndexDou + 0.001; + format = String.format("%.2f",paIndexDou); + }else { + format = String.format("%.3f",paIndexDou); + } + projectMilestoneClone.setPaIndex(format); + + projectMilestoneClone.setMilestoneNode(fmProjectMilestone.getDelayTime()); + projectMilestoneClone.setGrade((short) 0); + projectMilestoneClone.setScore((double) 0); + projectMilestoneClone.setExecuteResult((short) 0); + projectMilestoneClone.setDelayTime(null); + projectMilestoneClone.setCheckResult((short) 0); + projectMilestoneClone.setCheckMan(null); + projectMilestoneClone.setCheckTime(null); + projectMilestoneClone.setGradeMan(null); + projectMilestoneClone.setEvaluate(null); + projectMilestoneClone.setOkTime(null); + projectMilestoneClone.setUpdateTime(new Date()); + baseMapper.insert(projectMilestoneClone); + } else { + // 获取所有得节点信息，看是否都已经完成 + FmProjectApplicationEntity fmProjectApplication = fmProjectMilestone.getFmProjectApplication(); + List fmProjectMilestoneList = baseMapper + .selectList(new QueryWrapper().lambda() + .eq(FmProjectMilestoneEntity::getPaId,fmProjectApplication.getId())); + Boolean isOk = Boolean.TRUE; + if (fmProjectMilestoneList != null && fmProjectMilestoneList.size() > 0) { + for (FmProjectMilestoneEntity projectMilestone : fmProjectMilestoneList) { + if (projectMilestone.getGrade().equals(FmProjectMilestoneEntity.GRADE_NO)) { + isOk = Boolean.FALSE; + } + } + if (isOk) { + fmProjectApplication.setProjectEnd(new Date()); + fmProjectApplicationService.updateById(fmProjectApplication); + } + } + } + return true; + } + return false; + } + + @Override + public boolean projectExecute(FmProjectMilestoneEntity fmProjectMilestone) { + if (fmProjectMilestone != null && fmProjectMilestone.getId() != null) { + fmProjectMilestone.setUpdateTime(new Date()); + baseMapper.updateById(fmProjectMilestone); + //如果类型选择终止，则后面的里程碑就不需要继续执行 + if(fmProjectMilestone.getExecuteResult().equals(FmProjectMilestoneEntity.EXECUTE_RESULT_ZZ)){ + FmProjectApplicationEntity fmProjectApplication = fmProjectMilestone.getFmProjectApplication(); + String paIndex = fmProjectMilestone.getPaIndex(); + List fmProjectMilestoneList = baseMapper + .selectList(new QueryWrapper().lambda() + .eq(FmProjectMilestoneEntity::getPaId,fmProjectApplication.getId())); + for (FmProjectMilestoneEntity projectMilestone : fmProjectMilestoneList) { + if(Double.valueOf(projectMilestone.getPaIndex())>Double.valueOf(paIndex)){ + projectMilestone.setExecuteResult(FmProjectMilestoneEntity.EXECUTE_RESULT_ZZ); + baseMapper.updateById(projectMilestone); + } + } + } + return true; + } + return false; + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/wrapper/FmProjectApplicationWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/wrapper/FmProjectApplicationWrapper.java new file mode 100644 index 00000000..80d7cdff --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/wrapper/FmProjectApplicationWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.process.pojo.entity.FmProjectApplicationEntity; +import org.springblade.desk.process.pojo.vo.FmProjectApplicationVO; + +import java.util.Objects; + +/** + * 项目管理 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2026-01-07 + */ +public class FmProjectApplicationWrapper extends BaseEntityWrapper { + + public static FmProjectApplicationWrapper build() { + return new FmProjectApplicationWrapper(); + } + + @Override + public FmProjectApplicationVO entityVO(FmProjectApplicationEntity fmProjectApplication) { + FmProjectApplicationVO fmProjectApplicationVO = Objects.requireNonNull(BeanUtil.copyProperties(fmProjectApplication, FmProjectApplicationVO.class)); + + //User createUser = UserCache.getUser(fmProjectApplication.getCreateUser()); + //User updateUser = UserCache.getUser(fmProjectApplication.getUpdateUser()); + //fmProjectApplicationVO.setCreateUserName(createUser.getName()); + //fmProjectApplicationVO.setUpdateUserName(updateUser.getName()); + + return fmProjectApplicationVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/process/wrapper/FmProjectMilestoneWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/wrapper/FmProjectMilestoneWrapper.java new file mode 100644 index 00000000..479acee0 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/process/wrapper/FmProjectMilestoneWrapper.java @@ -0,0 +1,60 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.desk.process.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.process.pojo.entity.FmProjectMilestoneEntity; +import org.springblade.desk.process.pojo.vo.FmProjectMilestoneVO; + +import java.util.Objects; + +/** + * 项目里程碑 包装类,返回视图层所需的字段 + * + * @author BladeX + * @since 2026-01-07 + */ +public class FmProjectMilestoneWrapper extends BaseEntityWrapper { + + public static FmProjectMilestoneWrapper build() { + return new FmProjectMilestoneWrapper(); + } + + @Override + public FmProjectMilestoneVO entityVO(FmProjectMilestoneEntity fmProjectMilestone) { + FmProjectMilestoneVO fmProjectMilestoneVO = Objects.requireNonNull(BeanUtil.copyProperties(fmProjectMilestone, FmProjectMilestoneVO.class)); + + //User createUser = UserCache.getUser(fmProjectMilestone.getCreateUser()); + //User updateUser = UserCache.getUser(fmProjectMilestone.getUpdateUser()); + //fmProjectMilestoneVO.setCreateUserName(createUser.getName()); + //fmProjectMilestoneVO.setUpdateUserName(updateUser.getName()); + + return fmProjectMilestoneVO; + } + + +} diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/加药记录导入模板.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/加药记录导入模板.xls new file mode 100644 index 0000000000000000000000000000000000000000..29b180316b972860d76fca76926a84620cc134e9 GIT binary patch literal 19968 zcmeHP2UrwW*S@nXu!|x^ItmNYlrB{fL9w6$BBEljAWBhDR1^y!C=k1%Vk{xHh$Tie zCMHH~h_M9?_TNH4jegdISYu=Vb7q*`VRvSOe$W3uPrm27``o#6&pqe8=bl^UmYJ>o z#i(x6H&(ZZit9?WNP}ETbU1Vh?$OiEkPth#!FYpQE@y~@!0mtCKga^_L01Q;JT35I z@Y>+9&UL{{z)QjFfo}o6C3t=Ct-u?AhbBObz#D^a4c-L2DR?vR=HM;BTY|R&Zwj!eV*hDw{wThgF%wvCAelxcz;6_7`#w+$$+S(7 zGL?*l`-vzZ;9MHZkA1hf`D0(MZ^V;Ipcm_ClXCsDx)pg8(Sgo?i-^b`aRponxeb08 znFM136+x0fm2{E`UiN?Oy3;z0qELsUVBlc56TxVLaj0{+wx+MUX^w;RHJBcWplwYW z;uQ!S_;iXBh0=UW=&L<_Z3S0~{6NcGrzzercHIPi2`R$LB%gv+`(z!N&C=z$O8TPs zf&D+8eh^is@wqq>!cT8W>qDvOV$(9TAH4@-A6ri^jpi6n^-vPcnw`o1vh+UzFwSmxC!TpRP?a6Xs(w4uLM9L}AO7LR^VAU%6D_)Jw<5p(!g* z==-LG8b%zN)KYt>rD4PcJeNKUtZgIi1TE8wUqsnPgoJ~jby}+mvr6;l%A_)R_k^5f zn#46}zy-1-dtg3G&4g(V{ygEq>j~W|h=h_ldIC$x3%LxsGV6}YkWNALg&ZE0&zncb zQJ#-qh>oay{Qt>x3Tjm0M2wvY^Z?opf3Ybn-A#Zl6`;2lpm*S<<8p`3{{sQ=n zoz?XhvcH8uxjG5pGwnwmU&sy&9r-C-Mqo!krx=%z4n%Cg=oIul0(5we^YS<1sNiek zb071~HZp?#A|pEbbh&UVhM$i4^6?AdsM1x+>(!XAqFjyn`l`|!^Hrla;&bTP5)+b* z1E|79ky##T4LK5blGB8a3?kTCGNG5z_^f4JE0{iuawL{20%$!7_MvzaajX(d!~sh% z5l1b-M67v5qG}0n{9;N#ukTmWM5&OF5QPA%6qm*-#ig-I zacQhlPoF+j;3<_-<{_YzT@$6arDc`k(paUqG*&4tO_Ne@a@0DAs-^6kD8(%;s}z^U zD#fL-N^xndQl+J(YL?>e5H?y$wL9QOJkye~zU6t88VFCx2B|bm2M`rQ(^T)6s4;d* zzAnNu@T+QvM+90R%(TW6f1Fd(4t7lyG=U;IH35;IR0k;`I)4Y^+!W+di9&#FmL*Al ztBH#OM93zeO$AUDYv3YPnsviOFahUULR)Q@K8^=%p1WyZDkTJ=) z%fmVrq!~8p3NkE6Rm4Yvgm6H-efU6F%`j{%j_OPkw||r~O&--%1wubmpxcKEbpKF+ zun!gJ@pl3)DzliLAV4W58?dBPJmPaCT~v5`(ctXFgv-mL8+U{Q9dlkiNkGK`pA^hYCb|s6eD9BR44jr20>C&NTo`ep~@}v+-;e-XwneV5aS+16aNDs2W6ebIO zI9U-BDtS@g*m+5ADJvv4O*Im=kc$bM%7{qmvv5i`bM}uMcODuI`W7ZDMWA{f!5WBH-Z$o z`0$7rD@1VCz=+r=MSOWgS}R0wj({Rkc;5)>V&$@=0czF~nSix0g=Lj7tZ#T&O=;FQ z3RXL0-LzYC!C<4vwbYO&K&WY(SUP6%y4tFo!x&rn6%0P^_W2bhMC| z1&Arr*)lkwV!hLX64VsavINC2g<;i&x2`Bceydk#Q7dC8tQvP>ih<=@KVo z`+c}Nn>DcgKAd5b5@*aFefs!iLg*_0j8?ciM@jW$I%RhxFu zXj3J$zh;~ALAz?SsS-LsvrYM+-89;ig*GLD>NfS`v8lV7O>q&-40@e3+Z5qcZR(-X zrb_6}nr+Gl?WxhGO6VZXHsyo%(r8l_+LUxrx2ZpmO}*7@ihBZ#O@lSt6ya2D+EJrT zmC#)^+msL5N25)Z&>@;_$_MSM(WVUaXo(pa&3PW1(PqNSXOdGbKjWkzExMnU7~h;A zWM0(mPz+gzdqz`JlO`m23iIGQ6bz4&(*$S|8g2Z{&&+Zlwh%lX0dYC$`^ZrfN2Mf9 z@t83oO}{EquTo|hdMjts^rCA4qsv`-Chq;Yto$VjE3xW!a^r;!H?H2jlOJ%d*5vZ% z{q%>rmFVg(Ogif^|A+c)w{6zjuZOq!$t~^HNz;1|W>}p5Zb|FfKBqDUA3|(#VIu#XKyo;ttjlWdFW03^-Je%sL?Nq4P4}P$MS(r3;X=Hx*KLsG5BL=!4~nH z9H&>41Hy~XyqcalMp7B~>#a_w>uQP@nYhj{`7_F)Ui+`eYv(5Jx^lgb_gPW#Et8vF z*F}vDuZ}Bk+3K@%x-D&d9AAW(JeCuBVE> zZS8sRVp_`^<)zO|^}gEll}GST#VO-%?4 zLPBO2HZ(lhHhuSDSEu18`&r9hUfo^W@aMnY-mLWh#Aw#D_m6%!a%A?i%7EPWPtV+W zA6>UV-}Yj0`17J+8=bopmag5uKl@aVVZS7nBs`3(6K7`)GmuU4ufHYovHgAie!Fa^ z&~DjB@4Rj??~#j9M$cfMknkAY87Ddg-9BcWr#s8T_1K-6W^bL%Gpt{U?_|{83@+&; zwW-P|ih7uFt>65xXWo@-k9nV--~CP74Mw+z)@1bkV*mQ{(UVSZ(+l2qUotQ~{KVAT zCKt}!FW6eNx^S6n%k>3kulYo9_MXH zT=iG@QZxJSCTs1GUGyH+M&I7P^p|_f^Im+?Czm|D)&H$!{1%TGm(I^#cloL0#;L9w zUKp3$>-uN7Cd#7GWp;z1f7&SI?N2a;Y&8_3I0&AC!c-uC}=*ZR>TfK)hp3dXn z9Mpeh8+*6w`jlnTw1Tr`&j%ETESyq*#Qg4rtk*9~XOte6RlRvPq~x2k3xaB9)vb>? z(Q91AsU5y46Q#kwAe@3T5GX86&k;)Y8>mQIrz=;3-7eL}I63KuW1H`cnmnX@bWRzPQu1?-RYX znc;DF@2&7!?j0QA6lk9`?cw>I)%z!w1??>E{Cuj*nYcLL>(gsb-roA7PWiM632S$m zxP_V5Y}|LXV1;z@ulidjjhq*9vCX*N4=df0y|bU|t#a{y7g_9R9`oXxh=qC9=i6VB zl`fPVPra`H{OL~LJyogmZw;>1?)F#0>1m;ZyZTNkni_C=OlQYUdoNC0azEUB*~a?9 z!82;Do_(Ib&v8T8f!=+l&T&ffSfAkXO>%jemc;<6?X-tIecS2P+PT`rU#|URbcdv? z4Th=Xwp*NZ>p$t*fHZH^jh^V$}Gn zhi-=VK4*M(&@WSCdrpr$vapkn+l`~2xTRnD&3*9ChGFI31!ddSJX&#M=(w8eoi;r* zHmvV3dwp3};im}$;v?@xUtAoJ6gNJz)5Dib?}|J(Wv+4>wPW`92bt~@2Q90Q(#;Qe z_%7jx5&OJ+hp%^y+;TR=?XkRl{pl8l%erPC`ohPt#T>7V`MLCyK=^Sua!OKK2K_ix zJ}pYGZ2Q*%cuM%g7B9YP$nba|XW_D6##MT?ocBlJq5ShX11?lrIA(g57KM3!nL}>5 z`mkqyI@Ay>dyxmOozY2yQ4_^!iruzhq|XzS60@9TxI)>aEP+Be`==7jD_+ zD2bmj>C-Q>ZtNR*F#7zLUCw%2mxh1uwaVCF{8ndN)%*6pzQQ~Z`ORRg@<8M>iT?Sb4ZDHQ8cgEM%dh(MZ!}k=-Z3wef>(2=OVZOX z9xz<)R5QPN*Cnlj-~9CbLmUP?exhIICh?dz>hRjJ<*UCq-FkG#U%gYmvXXRuuxj$U ziV6E4FAa?`i&}6kXw063xl7Xno|vXA@8=Tf(ZlpmwX{j2-z5xG2A5J#H>Vzb2H9VPkWu`o~Ao^ zSyrd6>w2_VG5FQVMXh&UFg#Z0wr9<{wtlrP*Seo7%{aVrmidKMsi_&Cc@3JaJH5DYl#+MAPou#~nV*vQuqw-`EUsyAMLp`=dHqBJEn*wuV zrg#v@>9ozy3?Z1gp(YueA~OyZbO6ttPim6HuEsc&G=qsdSCYS&s$CD|8Qb>amFMk< zj8e)9Q=JeiLA9ZWbCsg+>FKd5hU!{CiGiDyY8afAL3BTDx{{^v7FG!KuF-TuSPUQ4 zEmm2}ES1EOr5sujARECi7G79MBx&$*&p`OxZzg>gNq_1ymi{oXBZ-EO0P&l5j>J&mVuEY~yqC*XYv?Tap`a0OzUB}58%tAXj{veBCCw(ydDkuqf z_yFsnh&+NE;efC{oaWN0mthDk1z%CYd{7=e-m@-@w5Yd$$Q-I0^rRz{A-wx~lnRA= zIUq~OJNOb54TT;yhz~D1lmtO~enl*NSlB)0m*p<-4QLAN=fYXQ#+dZ{mr2i8K?>d; zh^igpv?L%A_;rWgPm{yv8xoQM<;2E|=4L)&G;Hz-V+-iitiy6TLO*hb<79oz9VA8Y z&4&SfZvOv?|0$XGyEC54p za#eQdL4YA4Ikc4sS!EdtaWNf7^g-s`6mc!6*+GWg6>%}}g&Kz`;@WToaoM5=9Va6E zqJVvU3u{v%!T|tl7C$s3B$P6sX&6zZVS!X>*s8d+_jH{S_$U`06QiK@ARZGFK@5?Y zm=@_xw@fA`CgGqxo2E_rfbN7GhBu{AzAxzqzX%cuciJ=+anz}(Q&Z|yu;V?Tc7gtC z2EWJ91)%-ZBP_I?daM$}q9AhvqE&w%?hS~z-UVqyTF=-BA{-|odbAuWj9Mc99tbzL zWax;6#&`yOYa-m{g3lv!$faUJ<`O?gY;Sm9K;O@URN$dp;9O-66%7@WPhZ)-2xnH3 zD->FR>5+N)*h7wJ!I=yRgV6;)LB{WU@l$Ybgd&FZILKq`z)`RjsObauC2((44;T0p z(HA};Gse#jiBSSlSf@{KO|UU0#GD!Tm~Qp@G{*OoF)>EN(M|{7mqVZqEy^X?u z6o3YDwDG-{|L+j>p~vm!guuhmuR-yuPE$G}Azy!~Y)^zH1z{ zA*AnkLfT^Q8r#X=hiErK-pOqlJeBa30gf?JQqc__YaY!Ra(PxcpTm_Jsdo^ylA-K*cS&L(^A2s9y7q>cvk=($G9T!IL_?{ zk7MQ@5W=_^gs@zQkqZBnF$qF8-UCo0ARY>ybZ=#Ga6>hP_jyGtr{`o|r;yJOd?ZZh zN5emWq>~Kr$@F6w|CeMmJe1QQ9mi)rCscmaPjvb0;+oRcZL#o=?}mYRbpOKQ#Z3%SBk~pPc_HhuY`a(` zF5toCdBFvD3}Kx`x6e=rRogtKqhrH&aF6o`bSRH_Q!xT~*>FMm0`Sz zBy=!@n1+3-A1rqJ!$K5$#29FuqXDTqgkzyMi~-IhNI|En6ZR)N@L}}pGCkl`p8)!< z7c3|`0)j6c??mty2nz{6`1v=|x zMqHwa5f>0Q3>w^@3lUU|OEgAB;>Nsly6Kr_rh8o8efRrvzgzQFFQ?A=>(t*>)m>HH zQ~9f5^~SyCHAE?NB^snbrbDz?aseD;q=Eqlua5yX}djUk#qG=i5KNl$u5Z!5L-ZCg9(mOuihSy<5^d-{?m!$u zCP1Gc2qkggN-~)OQS$#Cx>G)k5TFkwK(Id?37|K@bGYWPZAoo+QyPbhORQ1Qo@L!Jnpdy~URjgr0)dSiwEOu3wS^hG>!(RrvlMlMYHZ1Gsy=51WHjkOJc(d9 zku*Bk0ge>qMY$hon%cDNTpBjOjtyl++Xhm{mZC37d-zeA@nwT@z6>yp4|*D0qR#x~ zpo`1pYtzj5_2`TPpsFiSm~tf$C*r|XE@e2?(s601%gPPfxCs#qA+}AfQhT^cLx>|p zwtNV%Z7J#mHPf8iL{UfhjQyZ?S|}ScPIKoHOu?XDjvXhLKA#*Bx%B^&^EDOV>Re7gRq;`8x9%L(3M z@yQ=5B-LIT`z6GoUSd$(8c;YSdTG*S)D+lkyW~O@`QoWHgbZf)Hk9jHwYQ-t(By0-jWb8RFJT z2G}hKU4V6S0@zO~kH3o~T>`>@VmNP(v3O#e#qejZP{XU`L`b$Rb(F z1{q34#+IuEGg&ZJhogP__Q?%&Ib_-#GBJlt)F_k5D&%-P9z&nW@))!~WPr0~imQrq z3ryh20jJm$oMdKZD(BEmi4&ZU(|~~jU2kyqfC)@p;>cAQqz%~opFwa&kO7eee55DJ zbpodp)e^Q$sr*)8pe?TxY{Hm2!Im*~f-Pg}1Y0Jr6BTRa7XbOhdKVBdMJ{W+ipow& znm82@5Fj^ToMOuur`R&aDYlGp>iP5May*4oiadCnvTouOyR?i`Y#HMeTgEuWmZ@{< zO@>MXQD(}fiBs&-GET8&j8kkG;}l!QI8|6!sKOL`a;=dm<>r9%*mOn+O?sDN;k zY@kxbv;|WUR87@}i5_F4iM0Q#gB%f$~ z2*jZ&$m4vu0aGpW<38w#qa1{f6Ht%`p5n9z1q~n+iH(c@Okz8*Kq^8%6U2!H;wj|< zk(UJyc#7l90-=|37$c@rXU=iY1L6Wn3QiiQ=_xw~(iUUH6o)y-Jr9TnBq=z-kt7oskdNTR6KoieiqOvlk+MKMrCcD4XSnAn zju#7rUg~3vnBp+!xaR@s2uVzF;^MVg77WNoaN^AZsR;c{5FZwZr<4nXz~?0%1JEePeNypEPm0Me(G` z;kvRx;HMgN`;dY1oxM94(Bx3h9Wuqe^Ai{j`d5JTkb`ItK{cGngBnki2@3|JPhz;| zryBH<8&HIOcsv%O-e83gZrE8wwp?sZmb2QLKtN~&yrAC@d1B%NKRl7&zgvcMEN3q6?B7ZE}HqAw!n z#W^P|7h5*2_1}_(z0hK7EgFs*|6OfF-c(y{QP3%$a=}=WQ3s8GH zlvdLr4w$hp*Ck9PV?i6p7*l9f6IkF96G7+U8jI(}eHopH_9 zrwV8{^_+4++p6W1fi{8bq{1n7RLY#%sc_14Sk};es^t{nlsUCm%c%m|Q$43#&<<)j zRX|JCbIJwnsFqU(+60=33a8kUD|6ajg;S-&`xSO zRY3cw=adWDSuLjwvMlZlndHjEvF2$2`u}laO%y$sfP-uI7X&9^;gd+!YOm=sg_d(bXWD9azRVga;kt1 zP|qnBw3k{=Y3Pw+Q!!#0fU|`VaY=-&NgekcF@8isT#9SjxFo%bzPe=+gTR`M zjZ<^4`;07h436FROHuJF5|nS=?evC=>u+AGy*tO}{B7ea-}KQN?3}Nyw=nLU>-?Xd z&2ZjovF%1ko0HB-HK$GPKTI<#-@l~g?cQfn`(?DdlAFEjK$Ya`0jDe0e>ztU``LDk z|Ds-BKDboh{!Z{?CwpC??|T6jP~mpxRn7FT!mOGZtTrKeDsFqA!%qhHNw)AYINIt# zrsUOcQTyuVFFrGC*SxAzVY5SeFKc(8&lAr(uB~k2di^vky?unlWqSL{X#L<>^;4&e5|>5& zR@14xx+-sxu~VAyUtzY-H2>~<{rvb{S8w$8I48`jF}~GxUD)W5%BbSzEmob^Zf+^H zs|!4HBBa3Z79ftp7T%u2r2;_Z?jL2K@Xq#tJ$b&O6wQai@!Ox_PI-40($YJRi0@P&!)j*UB9 z{ZHm4jEUY=__t=OAd)C4TNoeWlHz&NI&z}Ew6me{w-pIri}#OzI(BU4i!z_g_s`GXeIHT1K+oz@UdYSbAsZaJWEZYI zcyPv<9z%YO&5wB$RV|v4K15$K!TVW_P-^vb{z2;*_JQ4Il-zyYY~Eu>!_;7ZX+TJS z?X**!{O%mL$kLwf>U8|>G}E^Ztx_%OMR!wg-}2Azq+?l;nj7{g^?INAK`%VY)*kmL zpWppW+x3Qb23Mti@$JEa3lS5_x9a+DeIOo?9CB*X9pj5fkmR0vv?@aQjCj4#d=*_PE9Xr2x-Q{Hd%`;us*BRyC@A}95_ytSe4>`Y~hsX4a zmHIPJRkhu;-df-H=DMc|dA<*i4iOj3o^T^?kmjb_71<7}PtWzM^ZRN~d;6Yof!Esp z95#B&_9?BTx3-K)_r0An>}^{=!(&_eTj@Tka&s8_=CEG9Rb*|~f`p|yNpsH?z3i74 zurTG>u~xO?(qF$SOe;Jpsd)45%ly6P7Wh?7uP*3+s^^%}Guyoq#_RYym>=KpqjYuO z{zFTiiyAKbwYHxyVQ)0&^PTr%x_@O@?BGK=c4vQ{o4%>_t2bBEyu*J@ zi@YU$JUL^l^NFC?1LnIs?wokA-8Ny>nB7mqR;HJEdr!S(Cm5IB*68Xe*9HFi3tpu} zXqVsGW}Rqh6d(7~@lAI}O#HHV_?9tqG$VHI6V9^{_1ZqZGAT>PtTb3hYV@#+$@XFK z*KA*SOOLp$3Ddk>J+kLu!OqaBUe|X0a%rd27f*E8P6>&sy}#UjnTLO`p%Z0wTdT?i&?wN*g2?G)rJGt<}TNn_?zCA3B%_F zTxv6>*P}A$c#jz`byqrizw4W4*Q$Tr-q3|v78lxImJ}`&pGdr+_wxBpuRRrs^J@m( z*6j9oO!?%%L0!F4awqwekLqlJ5qp#flYGjAFYYhg8W44){b`GC#yUpT8SvZ%FiO!nraxhtZ4qWrdn`RqE>vvkDRYe#N{^g3^JZs4zzB7>*)J+`ou z)cIz~SI)^-@3{>6#UQA7zuye&s>jQ34jxl=qtnJmMh4G1%q%EM&;B~5Uv%I55tkPG z#6^vr(&^EwoLZsV#wjc9M{J)t_Tdzl@dKAW3)7zC^XOg7Ps0wldkrmc>bv<|fb$=+ z_Rq?j87%EO?3n7Wc0gOW@b0VtuQyp?Yj(8$1M{>8t?YL}NdEnsdtMm<#n+7AL8zL7a zdKYrn?*=^!pu~YwU-|CeNLOFot|0DCnsMzWU$P>YJTOe%Nldj%3G8ngw&1$os68>WbCP|Y zm?SLgZTk7>}O~*~ADyrLkvm;b=Hu}(^6Stc_G)TU; zz4$kjwGGUiwuF6jQ1bXmapNZqkDN9kE_EnAG3;9QOIVq^L2!M@yE(NkU*zu#6x%(V zeLCm#rWqw?*4mnu|Ifay1K-w%UX1L%O=6nleEsgvzo!i;s=vEoirI=6kq-wBOUxdX zad+F!mv8U4FTT>jBSK@2!}l)*D~4TL-KzG!fqVOhTOuD8bh_1gMbgrCn{R2`Zr|TE zr)1xfZ*^hf&k2cE()t_F}a_2>Z>9kFJ>B>f*}8#MD*p17~VEXYBS|_rN?d+2FNi&kOF(OHb^6+(G95 zc=7ki(FuG1n&Nj>^1RdYdv6@>OLG@X8}z5?`01>9o%}dFqK`mm3`@z(W1%utkN^{3 z64-WzwFeI3XaMf|s95R47r69ck&CI3O*2()rl8!IDK3n$8tunth7k0#p*kCUM5Y5e zXbX}3JgLqSn;IR^(i9%t*_PbJRBn1`PjlOo)1I>-(oQKZnDPU$0#p-PINK@en0h=` z#!wy$C@^rcQU!xGGKlD-NnK_t7mN|$l1MgG<8o@4 zr6m{uX>stw^mQ<^yN;DJ&_V@R{veBCCVde6N(Eww@Qu$SA$(;v5GI}JR}oC$8rmYdW%iyC_F&P6cV!cDA=nvTpntaIC4B8_T&_z3F0{XB z?RYBO4{%@|p8VKhi>KySWcIYNQhY59Z#X@ne0ZWP|mWp#IsbHJ98~6lALVOvWc@qga z5DT&GqQs1@69Rooh9}B0WLjB9zr*8>NhA<#-&5C=knSjGJQI*0@R>Oik{;kObEW}j zh;bC>8eks`U!LMmgOZ@0LW0<++Y3tq>3Aj}A@CEDYrxbQkamG7FeCVN6&jHrX|F&! z3L=I@&?pzN_#Xw9ZJ{P%jX?#EL-@QkFsMh>3d(dI|SMWR9GzONO zlEAqEHhqpglTO(~I^UkLH^VL(@vHwM_wVp70Ri?@cqfAuT0C!jNnf$IYLr_w>fw2b z?41nHOJw!>*mvlV(r$#zg?9t#XIxZm0Pb|D9th7A0pY5%*FS$9o@lUhnV2{^{BYeJ zWEBvxqGEaoL7XJcVE4r-GDD$0wPh;WgoolYL@Q7KoefEzAzDuM|+nKAF`28z2_;jeP-U zB;X-NGGNjFvXBO{ICwUr17G>kKjD>gSMpsg3|6d$@;kpS>H#uMB^j0xdBE}`Cyo#y zWFc2r9$$#)OCUtVWS1G!HQ~mY3?AWs5a8$i_+J%6kR7<}QHFylI3yD9L62k3PwTA8VNP5JM2e83m65Oagc%mv9O*7!5Aiqs*g!<#Qgt7f3U!D zjcOgnwq^~{7as6B!2_QZ_THo$yq6IKtL?t9I@}S?eBh`jj9+@dkq78`!MPNU+#%Hi qWH2UxfLPd1;5!{1Ve0~Ep2QWl_{Fg+9OEk)QrObZNwE9JhyMi*Awe4e literal 0 HcmV?d00001 diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/废水化验记录导入模板.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/废水化验记录导入模板.xls new file mode 100644 index 0000000000000000000000000000000000000000..9b676fc1028a9dbf6a2f95ee230cf1d6d055abbb GIT binary patch literal 20992 zcmeG^2Urx>)_0c$7LWjnNKsf3rAS+mq97n(2T`!bf+!$H1VluAiV!<0ii!=<*s#SG z6}y5#O;l{yV$=v4v7w@gL1WqfoSB{7+1XjL=ZBtg8qo1ri2UE9cgD1x&i zWc0Z{WHDp|$cB)OAUA?+4EYPlCXgWnh#BO@kefg@hujph1>|OsEg@S$wuWp2xjEz( zkZmE`L6$&n3E3WUE65IzTSLZpV)DO{DgP~1jUp-VO9x+cA<1w~BU8Ww+9wO5tLXDM z9!SJ^B&3u&lCF3P_0vzw8GBo>-b?7aXZl@%4gxXAAPofRX=E%JN$D|`1~%Z>mB zfX^6T8&bsg4yG}?kbcne$Vnn-YN@F)0w|X*~Y(XFD3soEbW`vRqF_U*^o< zGiQd5IWzEok@H8nb>U21vCe2H@=+!Oc&SYD8SRC5b~L^GTxWt~i2*s)nUGoT^a_JQ zZ14dMYeBu(u{J%u+e-Y9gpF)cNoBQ zIWX-1L{FD|8F^9v9JEdk8d3%4y`oc8TOR<;P?AdYh#;KA!&H<)G9XL-uTu!6L#zPX zQ3}rL1Xn`vo)A`?R+MHi^Fv(|>bQr(J5C)tfe&R_vaEhXHn#Bt4D|INVK9Z4OC9a0 z;}>ugkV6#B&lE%oE7-e$FD7{y9%PO{DCjY@WI6+vWhvnchD1mHJ-7h0JC3ST{24w6 zpv>mama9phKn;4DYk(W@!bK44*e(I5y&|v%A6!6uh*E#Ho`yX96Jd44k1vFK1f@M0 zKCT+@MH=9DLGK`5eFUVv2Dkw)oB+PMKFD9J0pE-lpO64vxGEp?yRFC))>|;L*caKi za&6Vh(;qH|x>1+5q88BS;0{VrHzX=PZWtTE76vl7ypOUtW~!qXgKy*;9q!7>TXOojAh}NZE8Q5;l>GM1>-VxRQ>l z!axZndpW5J3>X9jDTVrwwnWMj%HS&GDghiyYlu0xLmlcsH`3XEsFVD9sI#re4(tv0 zs>)i*SSlzIusGbx%27}biw6{uO>1Bx;ozupk|Uasy?Adu1(L@&k2wF}O6nGxkhe0R zSEN!2!f`};i%ag`nTq=1IKuGZYl7pX$cO)*3P&pn&`(Sf()Lue7e{1FA{)y7>TnMY za03l+YYlKa4R99?a90g*P5M}9z;CMou8BX5kDEbMoG9!=i8Yx`Ww*tyraAY2ilLgLB$u(xM4-XuMtsZ*BpAj|rXRJX;c9w1 z^TKhXkm94T8yye0@TTCPKdmRNKQ6c#INdHf-f-bg!8!V?$B(AC^41V5cLkX}!4U&LE zOoIq8W*bC+gH?kFu-7$+0Ef>85#adKAOf5K>LuvRi6!hPI+|k%?}v0qTms(p!{Qj0 zzYh-gOjQjOzQUz&e&Qosoy&|-D$z3e(&HPYg#a=-#hrvoEA*#_YVHGr(^;J z)p3~aJ5sOuy@US^YQdy_@8HIq7EJ2*4(?iN!K8lgNVH>8zjs<{$3)dT+*#5dnAAHI zatT_g5a549oN1Li>^Z2YsYW1{Ptf)Izx6+ZNgHjL$bwWg;kMrqm?#aV)*SU=-$@}A z@2?Aqo=nAH82?xy`{9yIImB_LIxD0iF8-gV!bDxF3n0;9N)f~oRRTup*;j0-{W;TK zTVNv6JniZ8xQ^{km<6e%zSMFB#!4eew7a&dSP?F{)#8xG)124A7}$$OFq1bCvP{T%}U@@1Ken8K)E#6{#r|6cnVU6dT4U zg)q5Juz^G?&xWb{!V}PGUoZ_-QA(Wv_SaYhAWgLu>ao}k2$Zp?<_pHgvTT8(+3Hfg z6jHIzX%RB*|B8S+PZikAKJI|Fw}^HcZ-<1U+It16`)MjZg{FK1r*uQ%mD%5^gAFKff3 z{)L3Uc1-GDNCardr2d6OC+(QjzmN#jj*03*f*WH&z=RHb-u}r1zD!oG7GwMN?Nb}u z*f1vW5e8DI#EflhnEId*47d%NXF4~OAf%xLp?^i-#F@#$fItA#Fg=#TV?>I6k|_@0 z;C9i-oJ|j_2g(WR^j+(v*CB#RK)}_9oSxgKyFq1x?A^Vg1U>$WfNPST8VUGJvP@_N zyJCh!(2jV*1BVjg203_A+6)QoMJ*L~gADxSNg%S78N%OV>X8NZx%JaX)L<nX z@!^rvj#mz@1?259h)a0z>SumA7AU7ZPZX)gn;ppE!&Jx-m4~0W^^#vsGk!UI@z#o0 z4m;k;!{1%l#V^N_Uk+cqIr7S3$6I;$ojZ5<^Ud=DZnqLlI zym|1-VaHo}_<^&J`Q_N~%i)VRFJ3w9cq253Nin{);FrS}Zw|b2*zqRy`hD*#emS=Ma`@uSiB}Fg-lSgV&Yk0zW5+LtFWy{v z<*?&T>Lt6Kz%NI_FNZJQJbC4?<4x+dXuG`saQ)MgUk+cqwda+?jyI{-_A86{+9M+N z*}Af&;^r`Hf(G&=(AAackm(tEQP;;JXqnIep7V#NuJjXEty(H>tBR~+A`=p=NZ$*qaa<RE+T@_YRx{0vmXK^W`w6r|aT~^uzq3K-%)#n9TZ7J-gV{Rc z1{b3VQI_(Gih)QTZ$AxDb){*?NHK zz`@j$=_@c*7~d7bW|-V|2CyIiKFb#W*;hRt zn*txKVaEVF9?_91@rVFrJklk03<%&!aN0t29nKTJwETD;`R0`Tcoq4$tHrb*l3an zFe&u%5!CbVv!VYP;5H-CBhiWR@#)e6u_Y;B$)smTdgFByyfd(gRflv7!Mp?DcS<0J zOh|5fA^AvdQ}2)Bo+23QE6-}*99UZ=})1tgIyS&X6fBFe8 zcxSZ9{*?X2#fg3IT0YNN;`i`e=&eUO2luuZ)am7;_p2Np*G?elMjR& zKCl#%7N0c1!yS*a7GM6V%(KzlSF=ydyqej!qRg^&hDT9esK=&EQstDDXm4}J=J}n- zAM^~5iDzwoRkyv<=iLk5SLHvJSQPBgD|-+cbRn@Sqf<%NjB~R$Z*46eGC6h5rm1&| zV~+Q^x+&nI)TXHWLC@ulP3GN>JRY?>B<|`t(~6#5?zA82khOKm_?TOEtJYan`h;J5 zYY}zJcf{_++s?`MmwA@2i#(OJ$MsPcQL=A-_?TZuZrJAWF#1H^w)h>_ZLbs`et+{5 zG)29kW2daJm4;de{NKcF(7w^G3M#Lt^j*d^m2x(LvVOS05_B(%`F^AGDQzPWSj(ZiX(m+qV2SkudRuxp{d@%;FU?(+`SPIKLAv+d{Z z&Cj?dRsGPk`srlLa|d#p-0$(@gua=rZsg70ReVo!v$*Yzmakmz4L{=WRi_2r20pn~ z=lr0{^R{gag?{|X3m!eX@&x{Aakrv-150hX2~t$MW^k{?cYI7wHhYpKNl&@?%iC7N zPutY|`Q4oaUxSg3T^1b(>$T9iujJ{ycQ?m+=o)VB;-UMG=Np_%*LQkbk+p1nL{`|` zeAi_@Ycoffj4}H#vhV#yL6;VuZ24$vUCfq7Yn!xmzI?Rvr`~SC4n|YL_8+zhXkij` z%to?3)gtz+SB0@fm|mSp;HO`0e;H`d!$9~U{N=;sJg4QaUe)|)I_JCNWfPX3I^o>R zc|fZ3gSFi&jcV8ITYK-zUB$~r7U(*aIUmk!zqTT8{dXBw&0W`;SPo6-`RwbwoFy3% z&5dT}CQQuDGrB!WxOUV{;}PrT#VkD6tEps8(F~h=>k|S`T{?B5#qk(xY4Mqx`)mp# z#|*R%+ds@}>paIBn{&JFzuIxnGX0e^}9@;#T~nSO2{b= zJ`=h4)%0T}11Ht4kex8TG&kbY#9F<6?^2Q~=a$)qT|H&f=j)W@N}Jq2lJ`_q8gDB- zV7DKJwr+pmQ%4I&zXjtKObW{SaCvdehLWrgPw##EYJQJfuPe@$e0ux* zP}axyfpxW(yTm8ne|~%CeoV>xsx>9kr#yN+-KqBUoW)~$I{c%%`;{i^zOM)$Iy5lO ze)ni;Z_kOYslt<;cI%t^*}O~rdbP=$o_!as*D8h^ef`4<2d;6lx z)l0J9e%T|7JgbWQU^Qg3dz4eh-`)qDDZKMz;5Tm@7gh(>%uC40{WSE_`Y`D~%9oo= zKYPzHEGE=8^`Q5?%TD7fGLM)B=vEzY-enkef3;Dh`(lGh&n6uh5goqpeD-etw6zsA zQ7_yR4oBShBlTp96My(;*iVlr3N*j|;dtTBr@#5!&FZuK!{l|H+SE#tGKv;&{Ma{t zrtE}M%G4DpG4lsLGx~mKUDg@fJ2i)|?Xr349G|q=Vqsy={f}2%nXs{Cqp$oY{N!*$ z;2K%Eb^6j+p?))?q@=vcXT5eT?K@+_PkV0Zyl_}i^nB39!d`xk1+jZla!3F6`@(K# zI_w{QYxMb$0EYqJzW#E*^<1wRE?0K_@vNrb5#OXy6V486eC6P+ma!4lOMm(;FVRDP zVqSTU^^EG4u>&&Nx^}d+m{j~BeuvK>QtZ-puXD)W<aEH)Yo71fYRRSOCC}nB zBHE>RUAr^mX}@6O;R*Ro_nuGhHsRjUfD=bIUf-QJX6~&1$?gVCtge;C&1e-hV5{v3 z!`$c9NB8&K9vV4!gqoJQ7H-11yw}@w}rhfy&pC>t!00^3!BA<&DMq(N9~vwyl~6CV2_fXIu{nsu}pqD z%ygE?ilO>(k3w7N_n5RSd`om=7ylPG=PgPfZ(tacIJ<7Qw4}qJA#XZto|+%lEb;s5 z2L^K*k3IOjW477y+NiC=!@M@u+U{$-um7iA-dmzFUNrl9%bfY+%ioArwm4()n=pCv z@r|Q)@30&+@KHg_^#i(}@9LK`ac1$%XX)2=j5Tk5Fyr2Z-1J{vuMT}1-mQQ7t>3?0 z5GHwR%tvw>;Pku$N; zvpF?eu%>gqGy{GxCx*3ziDJj>Enl5Q`Z{C$%*L7z7>TT>30UQ6bN%Zzf@xNwxJhk-W|^PMi95L~Io;&rL{0Tv9^4>M z@^}O5VzxH*ghZcSy7(Xl+;HiVVbJ;)c+WxBz>Ufp)|wkC$U=ZEWWf**pO2?sgf>-q z5!y&-j@49x4NzhS4^bQm!k5C~rUh?c8vtZOI5b#0I{>v{vR zr#RyK`uIG7GF5`!m@0!zN(#koNFm1tbS-_vr}^pBAG8pYOlT{nd0iXWj5Jedr1p7YtkUk_KKHX2>T+*K$5)1LJ3$GK= zX(U)+LJ)=pE(~qUg@J4p*eA-zusr~9LgTZD# z?15@#Q0-s}7qW4Y>*qeg%S&jc1ig4FwB;kI_)~cfbvm|9526NAtgt zUki+PLdMRHF6j;#-;(JA88=l1LB^qY1Z3QlN`#E|ONET@a7~7clfweYIE>-9QE1+#(Q6>(U^sXam1R!LCZ*d^_$mUyh-@TwX(gCv>fH)Lma)OM|Xvj!31TxB= zD=#AqaeIUgpx~%~ujt4=X(@3NN2P~M9Fr6`AU;i@Hp+B>+|IXi*O1WmAzi(E+qDnr z>=n|XtB8{VzMfuK*^nfFPa5gKn2J8+ yemkuNFtX%)L`Kri)6+{LHwzB;A!8B}{9yZ*5b7f{?vx?j{mAbf_Knv3NguZM>grT8vsbT} zRBrs{Ou{crdW(!eK>)j{5eB1jz} zVxQ|m6hqX5s1MNqViSml5Wj+G1QAStm_Rgz*c74}#AXo9AvT9-0nrko6+~-@Eg-gp zXams}q6A_qh;|TLL$rt324Y)?Xj4r54^roUoT!l`1%Bz!7a=4W(ljy^wBPVxPP7$c z9_Isz7_WqsQdjadCbju`X*uKW2sX5RbnC>7Uj$kRL?eSR5V)t2aby%F$2c0;h^r|P z3bX;AQG7$HBL1#G8Z(6SgO*Q$mIspr{*Ko%_jz#wP z$GoQTk7YRiG5v4&zpVj1u`vF_CE%5)0qEK?6;bM@dm2iu2CgsARShXIVr|4l>C7s7x8jnByY)iwLl&Pndm&?h> z%cKlGlQQ*~l!5;rNk7W9%StH-bG5OpD9c>qM5^LjwUy-q)f zxR;5Ah;mGai2I!d5OIG~01@ZP?J!y59tP_sq^45$SpUG5!%rZg@;En!Cyq`_nV1rv zE(w`3IxdOgM*_dHIPvXOK>(Cz$G!6qj=w{%hmikAf~NMPoWh%zZWg*&8!uZ4?RS2^ zCm3Mb92ky&qN7cQL|oE653SRIhEzeiPjs4U>jS7WjHD7BA_yaKuoR_`42Y6{cL=0p zh!J2rN};p5!krL$PY63sOG+|W`Jt>Sb=^zhouIB=p$}zQvaEhXH?{Qv4D9Pc!T<^{ zm%7?f*RS9zAcv_sKT{AX>|lQZd@;#G^C0sCLP5`IB{LYfEK3PrI5aBaAA<`(x)Ufm zMW3N_5b~PnYm&!LgPdj>;Cj4p5!gDmOTcNb2(-Zm7Z5L^l%K61eIEJ=ush<%7s44q zsZWNEvj%*T2KX-^w?D5u0^*?ouEz@}fUhnO(idyMH{r!6#FrPYN=H+_qaJKT7O)S4 z8ON^3uC;UP)^1(kW>^R6)<)D4#v+`o6lFsr<6?)i5o}=oAYiJTo zU~CKy6$;Ipv?Cn}iIxCjI|;=;TGBAOenR=1-M9N~y;41hk0i2pvV2f~a9cE8A(y7ZZNBR9Q zCmWG1=o`+k%2G;MDku`rI2>{1D9DFJ1F}e_4G@uVa8xPD5sk<`JabQl;5yzlwo5=I zb+jhroeb(LLa7AdI8(jDt@!UuLH%%?dHC=(!I3H-{{LsV0Q-pvLRz1=X`u9gGc^X0 zHKl)bxT^-Zo(8y;2Dq&TcsmVnXAN*o@|bJDZ?6Hai9U^wP9jzP(D>?bS{`*cEsr`} z6MZQqr#gNox%_&xJbzNX1sA#>(Q(CR&*;da;5UdQKvD`bERByFLOwWd43+Qz@Ojbr z3OHvxq9cvMSJ+PnN=`hCQ*aJG2*AOo`yCI~a=tMElJ6CA>cad1F+QgDu(=nUk8qZ5#V-ykCcBmppgGUKQ{ z4Of%Xi5HFzM2e0=Z?rw&hMaoad&3Pq1?R}GZaTe+NtCMM!R35e z@abYRG93*?5qgu?*UOVK#T`hd3LFuHa0oP`9AvoGQfoBqYrcXlnozw0s-;mC(An0g z3c8K0fDLLC2b`)JRRL|kQ5A5~Yg7dsy^X4X({Q6I;5^o-3b>FoszQe^Rp`bsK3saV zG#eit(6mTwJX#R!%3Ri0H~;Sy@>! zph*QW4@{2*0}@ow=Ygq@5@*0|lT~&1M#07^hxrR}6d^Vuc?doFMDJtNjfCkKTK8gy+ zA)91#IdCn}AJAw^GWY=E+H zT4#oby6zmHRB6uGx-TdjPN}Tk0g<`7<926jMFphZ01j@73fMb1k~t!A6=6@&WmY;h z4mkc1h(1rHBDh4_{40pyW8wyMN&S+vRUx9GIWqtHiP)+TfsAUuG9wXJWTj5HX72^1 z>*}fBW{Wn%VpN`>UBf8^)MD!caO4jM=kc>Z=0y)>%URmB}%{`h@z|tqNRC zxvB_-&&^b9mJzC`sOaCQDXvN5c}QuEYV#s(1F`YAXHwb#mk2nvSVSPhXGrwJSItDg z6(=WxLt3rRm=#)YqRGNY(&J>L-E+=`Ru~ z538RDdN;mEBsN}knd2%JT@PO*QXW=6kuEAkAj7X%)!hwO65oaqQJt8%M9_oq#pcAu z*G~l96JI1!9#%h*t|~+z!>^P2Efzd14UwdNA`%rMkl~X=>Rvw)zlIQ@UoF!-0P%&f z1}L`vdAF4c5y-YF4>-Vg;z7`Qw0s>L;=Ndz(#`+o@ zLcJPWA*`_#!t1ZFOlS$dL46|VNZjD{N(t!zF<^4qED3nt^2OaD0s(mth-_r~@X${k z6Gx)}9u@0~V&m_pXcXe%g=|;-kf>)uvxMtBd*CBO-R$+Om9c3z#-R0(lT^B5N7Rgak`)Z%M7CaO@85H8_mm#_-BF*2hw`T{RlI@STP( zoC=4oy$P(A2@PTKS5QQY zg|3`dH&swX%j4CYE_}lRucy8mo-aoG!mgl$Kwu4TslFP{jC5`EyMpT;rNVpk@5@Iz zs4bg74|6&VUfmNCpAlzr6s%P@KqBIlErx0xRQU?UU>I|AKNl2@W-1~-oLl7l@F6|O zoH<50bpcDl!O{g$5o;(+&Y*b;SC6=$q#GBm zoR%+6QLP{}2eMd#{z=@=pr+6_%Cs2$UQ~-wYAi&5BrUZvCsrxbQ^_q88WC4ef}k|v z@tFQmL4AD_^2L)lQZxsC%5t_W=zU~lQLGJ&Ea-IAp)`oH&^bmHI>*RD=TH_ml;vU0 zg{2N7=f^pZ$rt0UoYE9^5ePkjpR$~7LD+P8?;FB20HZs8VQ4>^3TNa94PfLjrED4? zCqu&sHvS+B+9{(Ke~v5`Ad9k`nRl?Uihe=+K>+$8Y5Q@{)&k40Q6;6V1p);{g-7T_ z7ObG{LPR{WbpX?zgQ+9aRbZ;xktf=bFt0=Je6hD`B|!_YBP?N$9P}G9eOCz1Ma9VR zLORQq{MA?89-9FjEMeOK+a9qaRqPP~N_(VpY#R{3`|Y%b=rUXs0ewPDWw#nMz4#K9xhZ|dTkW+ z*c&H8n8B__&sRwgmnkkiCj~wB1_|0&O8DjLs-%a#z@^tgL65x=f(=938Gd?xN_x2Y z;nI^T=&?6Egrx57&PPuVUa^J&@-*qf(tPm}sk?B<#lkmo_yt`@(g*JF zD7^b+PN9Nkl4&B z!+MKAy#wHPS|El{YAxU@fNcdnxp>aG&dw%v@Iu!MXfM(j0%b@;0#|K#69#sQRAi)tEJY6;@9xB)))dkbc*R>xW(vB& z=M1HS0Jt(-;LR8@5D|knUyNKnlChu%)CERC(Wq}nd`jFue%kbf17S?(kM@guIq}R4 zJ^J>_Qb*DsCT%NO7`)#NHt{&lb_^uCgP$hp5^ZdSN0Ml;PWt2F_XoDk^&W*5VGZ*e z6J)SMhu()_3o?+=VsnU08U5ujom(MJHCVwaL1>>|S|T%$5y7pp%Q?OJ-VcbS`UNL`PQvmbW|E!-a|6e9KGjf_sm%nSv0LWbxhd)u8Z^1Z1c8M{N*FO=$X+r`&0H; zmnQZ7#o|TIQlE$CgKj_8I<&9lpsueTzh7nlAn)KYf3M!VLW9J!50vKLsM-Gh>+|M; zE*FkEymQ&oK4;^l!9VnSZ@KU3h&az{p4)$wyfs*4TDGrAPV|*A63Y(NC0*9%)ZD!_ zIO)W_#rqde_Zm^&`?Sn#lb$;e$>%FE}paH zb={7xpZ6?$Usdo#V!mdlPT7MX|BDG#8C^@VW}TnAWm_BZ&?%|&Hcz`-9DSnCwavbl zq}D|}4!JEiHCk{d;zZ=0z}Rc&jVnS!?s|-}&)T+hLiBChRqHJ)y~3`)GmpIOJ#x>I z?dN3&%G}D=N1V>u>-;!Glz^VAx+A|^~)s20ackBC+FSq9(~*~WYqqPdyfA> zf(os={kWmx+q<_PKb-A-`M%lBwY>}nI~VF2eiL`eWx?Uv>CW4%xBuLu#aZX1svnzG zKbvB4{$Os?`#pb}*f+EF&Ahq0i|b3K|5l8LEc3s$g;M41MP7gv}v~Q~~ z^x+p?@c8l7r!bIR;K7nPpYT!?yJm2&C3n4yPc?sLpRu{ds$-1VkoUR<}_NjM=0DFU}!3U05`?fUlKW;7Ak!l`u&b`9W zJXojB$nVo5n_ma&_0$u72z&J~InQzV>(@0u8PEIvMA^jr(CCe`Zn`!gk}a(uPcQxV?vmjn`hCmhoWjDT?o zVQoAPe(G%Q;InZ2!pZ(wAFeEk-dK|L;n}_KUVqc`_M3`xC7<5CIGpwIy`%y6tdGjB;^sQur1xLj?z{)dXNVZ;1l?e>h3_I8`(oGLuk zb&syGkM*CaGgli;4*td1ujvMfU*(&RbIT?bEI7Jp{c2nL9a_E*3tLX8GAz~Vy0Tf- z8{dVWmMuJ*J8jmRqbaX!E*FZ7syp>?cz3j>&6$nwS5<{ot%?n9mAT}K_|2|Yor-!7 zyOQ8|Zgl8bT^KCd8WF?vh#!T!_WOXOLO z|F-3N52fqd7ydPD@q`OC+24*@{%4QH=5_}sXzh?(m&UX(w6iO^QoS_$-H@JHT3GE@vmibv_tUV;8-k^OD_?Fj)m;OHQm)I*;4 zt~gGp$UJK7t6g=_X}5mx{nZ8$E=%+#Kc9SXWK`Iq3)y?Rq^+x{iG1l2e$|OAImIPyF<(>|df>^5s}nc1YBILV#J}6$6gWpzZkv%GBh+nf zkd%~H`MlT8{Jyg${(bLlt(W#Iie3!bRM^YMVNJ~5l-x1D{l2LC*-i&W+#Yiw(AR#z zcW;Iqu$u2atKHSze>|`0choy+^u%++O|Krh-6|%$I{)v#Zy~xP3!!>#VpFdb(r!HNzp(!W~x|Ke;zj|H-63S6BDx5}6V&U078# zaC`8Z()+=K(^~bny|_hu#AIEdVdTyQ0gJZY3vew7)w;N7o<;Jz;l^`}Rt(dPeH_$U zx98+#VOyh2+jV()Yr*3533~d`33KcANJ}~m8v3@=mT3jS%@cm8exNtcbljmAowH4r z*G6s|5$wLH)@Hxy{{EkKdv1-)c-egB)_LDdD1R$j+48LUZ^Gm)CpL}Vv(sYGz{hJ^ zZ5Ytw!q+}IlV%ssex81P=Qy(#hcfP6%uRpfd~Mjfu0ce)4!dmlV`c5GmR*u3~=>{p(brbNvvj$gSs`Sl=| zTGO!u6HQkSi`dCz*!sU)tp-7Sj(Gybr0A7 z!Od(=-K@#tl$7hojF+~(x8UmT8(MQ7c^Z28+xM+`X}HH(>@q**)au0JE7zTGI=bVp z(uAE>;?B>OPgrw${E?c)0g>jtbMADB-8XX9;uP-UySOVU-QuG}E%jU)Tq97@cnkYtwlwva zM4w*TxZQ^nn>HB^t$&Hn+sRru>8xe#xuJk80@xxJ4Ds|K(%+36t9&f;|x!P`-A^kWh-i-KfRyM4$) zXainG_*WspOei@GCjt83hGtXPbEs=u1@=>a2iCo#;=b13iFLn`*ijVm?+oy52W6-P z*)df58cKuLvpq~EN0H$@)5W?ya=sK{%< ziEeq*AVppT(lj#;R^+j#ZdxeoL-&Cr3BN&rAjFRs=+i2FjuQ*41*oh=SU_=mx z87>TU&4u9!lMVYs^*Mom%E3VA1du~|bWR9=^@Eh?oEGU$olxnV2>xLK&!%)voAjhK zeF{Ei!up}`>qWvyIHcMHp-4v^iZZD}Z-ZW|0qP6B0dx4(z}Nd=U$yuRKiF0+b{WzV z!Hp5osyzeuMnqKW2q`G9mevtuSV2hisd{K6C^OO0 zo!qscJPLBnAZ?+AngstxEtU@lyk?*uOVFRmNQ5xKkUA?cIVNS=SA&fqh7^rM0#jm& zN}+-Xq{H9~K1l%{^UbpaQ+z3)4s@CY)lrDhg8E}G>@E?YlCZ?VDam6(6XS@V(3Bja z=8^y?jD?tzOvpl*H5MXMd59%rlUrgR=usVlE>O4=uEw0+YcMt1MKA`O5@T4^VA?>h zpjI$F=P=a%oBr!Gpbh_fl|n{S9yHn-8~1-yKG22OM@(plWH@UTpe;cV$j3q|i2!fc zSQ^-fE6x@SZ%i9f70=a)4MA)mPGk8ukZgm|{u%x_DeQuXqYk^I2So4;f-jZ!5)FbB z=ZKLI(aV+q5%re}5x=pU0uk50g%ELC!T-j=nHp=MmkEQW)CLG6PxP+Sepu23KuE?$ z4nDf&cHQ?cDT=hgY=Ht1L=27)5sI@VRvHQsdC!;U5r()ug9cD=l)qP0M4z;j*h!<) z11BXW#SVx|Q;3Z`?IHSjb#njO&C|!TQztJEuMnS3-W@|cJ4plGJ)~}df!@>_h`2bN zcXadY*g-0Fk-E6KNZq~N+yU08Ab`KL(t`B_`;hzJdH8LT1?NwMBpuz{+$D0g;Jh1{ d7$5Hg4sBSR@lS?aC`G#Xkl#D)pU?nF{s)5)L3aQE literal 0 HcmV?d00001 diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/环保巡检点配置导入模板.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/环保巡检点配置导入模板.xls new file mode 100644 index 0000000000000000000000000000000000000000..40e383b651dd8df0777e5cef85de7d47d9e05a93 GIT binary patch literal 18944 zcmeHP2Urxzwyqfl7*GTh5J6!;qGX1oh@gn#ihzoWivdxBh@xUZ5y8Nk6&2&M7*>oc zhSgnH3?Sx37xOc)V!$=82{AJFoNjuindu(GyYGG9-tX3Y)zx+CoWD+;3SFUlD*iC6 zTDQyW7Ey8?hz6;X=@2azT>$s!DQ7^4CEQ@VP9~GlL_*;9zwRGofsdf8HB_DkcoBF_ z@L1>C;Kkr|!0Uo<1imqNJ@8Gy>w||TKn%e*1>X$35qM+pCg7WcHwE7Uycu|N@GZf& z0&f8x+YEXuxNpsh|AS2TAE9b5k_x|ZL_$KyClo8$#K>8`MGqWfP=~Bg5f- z6bkS-hx+nk-~HVDu|I#P$I}r*FV@l|#d>G7OS1(;3p)QTA|yLSrEn$WHuwQ#G>i#? zFcJ@{q>>5XCI8p16Q#ot0qRf!1`dEb0gNUXhdPIAGwQm7;y6HE1E`URkfN^9=6=9| zE?O8w@hzaP*3`8LTm|G;O6D3x@qn@G25^f>E>9@Eh{*8}QJZ@z8aY=oTU;=&{X+z?xLUW3x4J2H%>v6MsTe1`rn()k5SA z9mkZ5J%;px?lg=HHef)YQwT~aae&+Rn(l5kQ$i;MjJwcBtdXf zB0;(U;x#gOy1l{_bn59iaB}hU(Gii0|38^7fJ#G0*;z>2Qwth7WrsHn?XLwrkDIQ; zLwDq%x8bDY3Wc#hyWVlt!bQhb4Mop4G&E^s(uj!6sCI%AQ7(R5`Eb#3_QXZU6%s|i zNT3x4!QzLu53ZWH=(v(%(P7a<^ULYbZrSC+RTssdXK1*h(F)MtjnW@iVhsJTghv*B<}KZ;cAbf@2S^Q z)P};r6<|ZU3q{9OVMDqTMaPw5L%KUf2eJ~~oQH17gX7FY_vXQ&+k~G3buC_e*bo)`o=d%M%C-{iPnLjj0 zs=w5aONc|!p(8Y;*Yl4vG^FTSdUAaz{?VVJE9L7|&##=XdqcV=r6=^h_C&ze2ge@) z?xXlA=u^Z-WC{*sa@URQc^>+Grr3pKHlQPe5O!sZs1+za^BC6zW~#zWaSJ5@92Nwy zg~OSMV*_s@4iLPFI7;v);!q(^R4xII7jy}zr3C6xtmAW;ZplWb*yOr;`Y z&((sRELf|<-R|AHWGS<9Kqw zEjEQsva+(2bLgmK6Wou}fQ16xZgBU2aZFp{$W^ z8f>vr`7J>}Tizzv24mU;o5r*WHjQZ$Y?{1Hl&_Lk0NNAVU0~n@Ijz1Hm6eh-P%1Dm zP%gkI#ilVzv1yD_Y#O7~ix)5CcnYNydGIJ@)j%nBX&I&1G)5^ljZunCQ>WCsOqC9z zY$@voO0i4JD8;5RO0j8-QfwNdRAFJEilx|_YxR~=?hd$*O}AvMZ&|iL1%#tyeUuue z4Ty@MX{vTi)EGM@R~O+J_?5M@rL<#;c>M3PD%!z@qnyT5M7stcvJy zp5i#OK3`3scc(Fj} zqdrE6DGn3IkO#yYl9=MeCup-I7?97fi4O~;JnSn$d|4o#QZ5jda(u<{V}Z~|pNtSw z943w-k4^AUNnsQAM4bWo44brLfs}`RC5S%@#8b)z0t|A;Q=Im|z!Zl*3T7mj;xKUx zc|Zani2;dEz+Dx_F(98|lMW!mfRu-QB}gC(#8b)z!f1wJeQ}g$nz-Gfm}zpTt}GDr zr2-v4C7}Fd?*sz0aj1ERO!4ge0t*NKJ3u>AWx9XAX`I*p<%X&3Y%tYQem@f zEh;q1)}}(^Y%vv@Wa~hv1DpGBWO+a3^kS7Pgu0LgrqEgF!KS{52omOf6E!Q|IdO^D zqM=5@Mlum$QfUz#>R45vowRbL3c7|qpkoTnst?=tnnZAC&gsSWu{6F!3Ex|$Nfhaf zQs$@>;z(c@L`5kL15k=dWkgykL_9e}4CNyDTt(~Z!OJD`T%;T#P30o^6s1Kh6e3<6 zBF*F?_{>BR9eC{t>SF1l_?{}(5*mTEFoj{2(5&w`SdA&xcXC!MWL-CJMTRP>39w=c zjjB(qu?|X-suTP44({1LX^B|54w^$9DAF0R)+kn&S2&bU%oM~F=}Z}HP_eEl{;?{G zX|w>vFokB-CbqE4BgpK(L~IJCL?Z130yCL_WcJ6{QlU1nL$;>_RoTpe?dd?8O^4WH z#==~eaFvV&Eg@q}p;?XLfJ;mS?FMVipB3LPCV%DF>2x!*Yp8~(l}t>Oxo8M0I1y_? z1fFoXYD*+=Oes-eTq4G1i0rfzh%97H;Ea@C0{NB-t>7dTpuN;EszO@=v^og}+6ke3 zz6e?Z(CQ>;Xk$3NQL!l+K-s2NDmG>MqZOD@txXY5*{0TNZK{BFRc})+=+D{0qSjvaLP9IRBKZObO-e|<${)~wW$I+ zP`ypLpuN=El!hKEHX%b<&tntHOn6x?KG}FVD+Oth-8Dpba!<&t@Y_KcG7k4p#wEp% zjCbSb!83fCN5N?XG%HF?_{hjl*_2$N(ah?6^ zvnkG-%r{>PZF$T&<<<$~dk@l0PwiRI>}I!RN=zL87O|Ho^xe)(EAk2Au&TShlJtPUR@S`l5`xXJRf+Knxw zwlzT~kA@c8EzBwH^7H;KCvzTqOgroGNXtFqsN3cC(# zkG;n(?>1k(=6sRY?1bWkaKnhL-OLvx{5U@PtuNW=GiJu?wcbg6>Kc<-RzK~jihG}8 zF@E8@GfhWKn;RH#=>3zrL6xO3b+tZzmOeE*X85i>k~LH#u;pvX+$Mi!>rP42xS6zP zVuqe}YLMokz0*>!GhOmA0&+;`O8G{3_>PT>kv{;YncN)SSAyCz~ejIOJqE@I-fW z+3PDiZq_~j>-~)~pKlE(zx?><*TaXWzAW?2`uO7XosW@KbM!1P^$I)xcu0M(N&@;83XhsqkW#;5=t$f&faG=#V)Ahl#)Ad8_jy;V3-yXAPo%d zrJa7ft^e&K=GoelU7e2HnPl?bzImE?t>{kL%^LyvZFMZl({jTfrd{nmJNTtX*{UNR zr)GD0*J_R7?f#W%-~6zz;9TVBQ=4=HHr*HZP7OUi?zYkS)Awg?%w3VQNV4JDoHJLY ztf^_5f3L&i*$HzNd>n9gZD)_k z<;(P^9>H6us)1 z7dUt9v%}4+M`pZzU6@{YNK*dpL%;l8XXf}B%i#iKBD^?9Gm>{YAQ> zN3Ve;FGO`0{ae_L9=)sNxRy@Qp$%gOytj?n*Lt(CGI__-@MRfgK0Xs~*a}8wv}$^JnCqMX{W-74 zMrxnBvDqrgqG>|>uSeG388W6{@!*ZgGc+T&?H10m7Iob+sv;#@$Fwv=N80p3d*dyG z60X?1^pPHPSsAW*v1(|S{(@~`6TPl%|NX)?r*EFpv^Ub|Q098O0^dtIA&^Th3qziAbZ9~rx9yODEn^UAe*ugqMcGv-gdjiU$8 z3cS!Vx$DC+=LC-_uXL9=_pMijO8;(|h$|o7c|rq}jLn z-qh^)Cic|$puQcv#^#RmJvFSI?Yi9;MlHA>+I-R4XE}Y-Z<@XQe#TzgHNpG4b{jX% zF2%JV)?rsdagl~;PaVtg4@10K>)y0-vWmHM^V^|q;;+;hBqeV)J>eWN`fAS<54Wl= zr=8l}+cI}rO;k|}VRFufl$lGTeWU$1hx=~d-=%cOh${zggmyjK^h}>W#zlop>~VN* zTdDK)l5d?;FW+_P`@2DK@gDyvR+W#IT<@P;d9CfbhfNKhwV7H_l#%mYY|oe;_aZOM z_l=JpF`@0l*9)tKZtEs2vm3Hy>WBvuTt@X-^ekL^hVR1+UtMz^TWEGl9;J zWsc8IH8NP#VamZDq_&Nwxv!m(MLh}lABTg-#;2rFk3+@NqVV#jzxKmZ!UwiI@l`jP z#}zqq7X6W2=H7VL-#G_ooXhNazRc8if?Hv3u-lKBCi)U{5 zyLL-JUD3R^xAOjyn5^EaRdzc#@b{!!69NurO+S^hVUw*mCVljGKW1FtJNQ84xgXn~ z@h~q8{l$G*Q~lXjBM$T`>NM=!DTDLhgk1NEv&q`Dc+B7{mMaTdRQZHms4?kv#W%KS z(dJXKpUd3K3nEIhb~smuh(`J5g$=(Ow{ElBo!$p?H^*3u-`mUd1CiSdO_d&q zTqe;wm%C;M@R@^2>^b?BpZ@jc>Y;nY-Dqa*^oios)C>C!7TZDYIyOAA5JwJ>iMTf(pEEZy9dk0tS%k7@A1N*UMAsluKEw#89RMp zs_zry#Kqkmdf3_Ya&YxnIkt)YH%s#?=0?5EF7o?vQQy1PKW^-JvbZ9&c6{dA=idva z9J4tXXOMA;v{)XwTK4ltKeIWBZk8qk>w0!fyPBivu>N>?RqOA!hKWwc?B9R%X2VH? zzWDd>GIxWJ+RzU(s$IUx-yI~j zeK7sR!V~MKl$=~;V{+<$c5mwQzBcT9RHw}nlN9HxcYgaTeLzv|owXB8m%fa8&}UFm z&alioo437sf6uY_QX7v*jT!boy%H=PbY(^J>U#$6jt@3QJt$~tbCjLC?c}EKxhO<$;`A+*;J4K z8($K*wu7?=4#Uv^-0e|u(uXf_>BAux(;^#Ys@zS1xjs`o7-MzX&(91Y=((Xf8Jr^1 z4i&Tk&z?`JlfOX}KaGX%mC11G8#7N53Ez|9=Ud}g9AQ99BuPN?fPKMO0Un9uKr{Y} zT4repdP7<~{4jkr?Ch>)u?k&G$x`f1Z_Nl})G4v@1WytyaP4YwLmk~DvHb-ZOF>%R4IU9aX{FFz2A`~oNiq}wTP50&{>;sw!Dnubptmv( z3t$VHj)4S_nv36#4RXwSOG?QGiJ4|HVRuY;|B9ncE4&*4W82~x^k z2xLM5$%nnKd$wXa7;E( z#6=)yY^I27!db&5BSjo^6>JuF1f9VqLVT5-d5;N8Ar@lK$G0;~=@uo>r)U^areRGe z)9?)-E#i(zBnV_bQgu#9CnVIz1SA;B#KeT8Gn9ylX+R7yXgLwYu;%EPCdBa7lSA-| zG0KO)H?7Q1lcFL{Ln=xlURTfxB{3!-q3{!uD`4%%Ky44*)dYSWgiXmW03jejKph4i z-8|^_^H_B_3?y4YYt(>md>~l>-}=CvU=#@Hl|uTmZWhHgQb< zulr|M00%~a7SUfVyo6Ow)%kne5i;qNJf!o5jJzrK6~wRlj|@NHa{wHKl=~oq6IzVdzof4SE$iu) z^?VpFk$sS1yhK*3k7I`pDeXweOn5htp5r2G9oSBn8i6pTa0pkGv*yLyh$Mq;i^asr z{^zUiKr0824HeTv!Gp_=gbUVZG3~D7Ig-irVJ%4Nm==`8ga6ChY?FOr;zRzU;1ozl}_JGH^0w!Xc!+#N==N)vs z8%(qM*7IQB>JIHG0@fYa3x+|<8VW6}6NJN|2Mhzwct}BqSlCX3VGWZ)wZ{~=WB&i5 z7f9f`MzsxNU$X-52UD=NFfo%t=tDZfdl|uS+U^IZ!`=|{g}W}We(4N%9>C`XaVgxn tL#hYRVAc-~v2dKgcRIY`>H=w=#1*di#jz{g<0~0bxHf#b8lwML_b+hCQH}rr literal 0 HcmV?d00001 diff --git a/blade-service/blade-desk/src/main/resources/Excel/QA/酸雾塔导入模板.xls b/blade-service/blade-desk/src/main/resources/Excel/QA/酸雾塔导入模板.xls new file mode 100644 index 0000000000000000000000000000000000000000..b89b452f22991814b6a608c4d6dc7f3d78b98821 GIT binary patch literal 19456 zcmeG^3tUav*ZbUVb&FJ_Qs|aS^j0d8B9YMxA(Ka<2O{JV6;X}1LY~ujjXXyl!;BG; zyeB3MK99(AJccpITYYPtbI-k}bI-Z|%=iDk-#6bk`~LPhXRp2X+H0-7_S&y=ZpAOg zRqJ2A_)qv7Y2Xv^+6vlD3!)UF zHbiW5U5GM>dJy#?Hh|a=q5;H45Dg)M2@qq5jUhIHXacb*L{o@n5X~VrgJ=QK5@K_R zEg-gpXay1N2BQr;+j7!>BlZ35S?xoT;WrWbau68{_X%Vwv_$=bDOe1v1PK(A%kWCb z5&BBHGdJccpI5SS#l#zwH6#Pj&>#$e+9#0FB$no5Gz0vMYhxmz*!uBapQ6ZNSVsmk zh(vO+8oV*>S~55)dc-}RKkRSVQee1{m{9Hj#PX@hMN1GHIoYgJOq=*i5{@X-Cc1cU&O2{3EgUC4W z2~-G)16GpBWQg+r?$DLyVHkxx903LU!4n1E1k=#waBV_gchVRK>8l^@i3o`q5NYcJ z7&tmbNdjoRh4j^izBYm@MSi5qT%#fG;Ja=BzKrByW0J2xt3A^WPiNt^GgR>T(S5`J zDx6E7OGicyqDXYTb>XUdx%_k%;nPS2t|tO-NW&>Lc}+y%UK~ET{OAkNPXtX0<4a(4 zP?yU|1Yarw$M*6U;itU_Tu%hvUVtCQ9#rkZmDgAVzX=cCQtAjjya}Of$bA^*S`jCR zt%w`(B@AQ`appik+6BzMrFc=z zHM2xUlD4EBp@tH>lmzNBt$UD<^&Y(P6UbSb860R7xjI)Jo+A6=PPH3%20 z0Q1C1PlYDxC@u#ht`M(vD-*|KD)tA{RZ(H(N+6EJT}UoIId$oTFf>)=3VpCCp$5Uk zi`zD9svjJ^x)8n?9H|Q7|6hhv z(6Y)PVf3sE?u6FETQ-M*V~U3FRlucsbi3eEg@)%F8?R`vq5+Y*(r{hq&O&r_!J>uW z>hw)%I=Bp~Td%W%zM~)=oMP3*XXxNEiiY#-M;8`aLj2&8OBi1PFEBPXZD0!WTG0Hc z*URVumu*6Ha49DQ$K{<69G84Ta9jq`@L!2MKpp@qKc>BKX($9&=hKPiU&$v!2Ud~{ z9d&$0E?jof^r77kTOGC{3VXn%C<|xofw2=@o-*+Gcn05_t{1=zTxnNrMfBO8hT{@f zAy*8@3oBfPPh9pY;KKssZc07CgCKoe9@F^BdL2dhu@d3OO$6Uk1kTWbYI*fC_M;AG z^sKIbMsMnH50QGs=ri)F)A16aBc=y)8eg4G2N60Y5nq%*tlGO@2~!DbOsi;Kt2 zA~tBKVKI*gItFxluzrT888c=mSMK@(FkJzdOaO*VA-&r2RZ4ou6vF)dCo5qhVxu=v zip|#vx)fz5Unl5SSe=xI)Ke#XBIr~YBD4%A&nfw3WhfvzN|=ZY=z&DpMC)YPZ08}w zCLkz-q6WS-q0eHh3E9ML2l@sV5teZOPstLW8g2}#sAZB&KD7*<<=`%&j?!}W?AfC% zz*-I$###;+###;+rnH>eawR>5IQ(Y9EliaX75i8K!_85qhtUbeMMR0X2de6lxO>C~ zkpfnbuhJ9n$Y+zUSh=zQQm;o1*2)6duG}suq6izBE@~60;|>%XSVaib%GYKqD5C`{ z(Ekz<+&xw`i4Z3&XLuJ8$Brh#a8m0pM5G?#*waK9=h)6e7pqeQRwry4?+Q-%&apLQ zshp#~zrV7rSrg~NSQF>MSQF>MSQCHo;)RkP>sYvWB1}2dVTx-WEK^(<%M=&JGR1{y zV(NW{nvwH0)us+pTq#(lxG-<{#pBX}4Xh0a z48i<<;Rt0|BFwQ2p9q`Ay9g&vki~Q^dPK>j)Wi|caX+5Jbp|3*ut)VC%JdcCu3rxk zU1;uDWuN#%eY}G$a3#kgBD&TgQv0MpS%9_eg1CQ4#7#*Ar!?HT(`U4pJBNs{P5?m} zM8s(a2yC;*#S1y1dMMU|L!><9FB0+O5Q&Qy8s_T3NqY{F@{qqs#EV0OIh_Om9oW`k z(|8wAtT$w_ie-*B*+QQ|#D_y9E?&sH*Fz^AI7G@r{vr`PzEX)JWU;Jxco)%$FNa8Z zh!Bx_h|`Hfq@9Nl5#)dkBAoa^zDgV+m&p>qy9kla93tf*LPY8zjz5P;I}afu$N?J^ zobcyfxP79U-3ip{!1J*IP=Hd-AGrlGWPIE%pMl#|18yfC4}pLyq1ScvU{R~`nrsiL z%NM_Vx6drkmn%pEuYBC@qPR;X;O{a??Gl*lS*o7 zZd`9QZX_na4d$@iG|7|#H!v7x>d;&@MXo$G)S=E*Yv4*#38pGtct3+8)U&}$Waf3n zqAY7E@@z26ky)k|&51d3;`LdaH~=S_O0ZQl%aqYVTV!g}cgsvYxa+~L3!KnCOgghz zU2poJH_Ty3Si=h?8o9%k1r{V^CBcGebN^WrCg92C+d(GTnd-Az)(#Q=?hmf=$X^joGH21wgr*2Aj>i3FH ztp^8bfVzJEiZr#hm6!r5<}g$Z;XDG`_DJIWgnoSkdv{7)BICEM8MLh`pDAVy$0VS2 zaaZIeAZI&}Q&S0sbW=Eslo6_~FGQ8uLqrrNP*Uq!8P8*~Hem>dFCbJ+e&KL2q0B)j zRX&nL4LhUSdL;SAsHsh>8K@0&7*t(2#sgoLF;Lx?S%5Fg7|2p|MT(L<=P)&jRCAz+ zISi^b_&JRlZ7-lv7mXUlIWWrA6!wDEG>YAVuhAB28fCkJH8h+??u2?-OO4#ANP8e@ z@$o~5v=xxnRD#v1r)I9vtoXgrMkCj(iCL5OnzxP;VZ*>yrdiW&TsF7gZjWzMntUDo3)>fnLRHQp-)}0V(M~%8;NjHUeDAaU^J%=y2 zvzp*+Z?T3q5j5JPP)Bst$eoIGCnPOCK@lSD2BbBWVEeeAy5Q)9`GUKv3685=X6)*$ zS#Tkr?x9g|6={FXf(w!M)F?PZdbrG#4CjmrrnD@0SuQ)(a5*OjVG+HwqKa7i7L zWKbTeUnVySxSg?nO5RoP;l&O?v3q_lDt=7@3oN>vTz6sZ^(*)9W_h2xWpe53UIqi5 z3Um$T#hrDT^W*b$r_GjIt_3$g?v!-PAGg@8B%h|E7Qhs@# z<0b1qoGOR>WIM`levbhUFTQDWC+LZzy}rcf6NLh**zUNzf#GG?9x;c*6;z%Y+wREl z(}BH`ExnCO%pT5=zrGo@r+UtUQ!{tWt~?PoE4b(4R{MHAZFk4T%r>sak3-VhM97_| zwW)|U44O%vZe3CHwRFt;RvqsZ_21a-xZ&G8)7`E^o_Uw$dXy!fsy_6=weMHw=H}%m zRIZ!8*;KwHr_+XkHw@M+n!UEtATQEqzT4eqk8~Q?WPQ+GJAH!TAKSAxN@r%+zZvfx zoPXxcl*uDxWl=Y8cQ{>DnLppeG1cVHFx%(aZ$q!18@uE3wVv*0CHc2aZggH9HZr&( zs<>gJ<>z!8w)C*84mfozxY&MCPHFe=4|G43^Sk@ZbM8-c+`^B!p14=2Z&cQ&bpF@~ z5C770rH5J^9BSdd@A&0CmaErZDDs>WUmPE19KNlm<-+)HCq=#UCY!v*XT4t6KCxd- zLo(a?yS-JhACg*5TJ-*G^0vNXEpjhBy=SM|;;?{!CK4A=5+{#rh- z(alW#^c1aIiF>D{8R#YlXqW7pnS7; z@Op9K%clC<)^Bt1JD#5~DtbrZTWzyIk|-~m7a#0Aq1|!o$nl0A9gR)Cx!}`#n#IBJ zUDYM#`u9)dtua0wQ88#zmg|IuA7bxUziZwiWm!eV>nBkKRZc%R-~9CPslWg9oSK@a zo2Tq7akL+NvX^D;>nl5N)%^L}hZ|*HUm8z)`RU1zhYwGGS>`?C(~C2AKSfl{HL$vv zAN(qB(7M*0atc@N-=BV}+n`@!3t}EeRY}v+1{uo7c|E@^@vwR}XTNp2eL$D=BX{35 znEk}TI3>u>!#}u>Zt95+zITpVX6jCJaXfl=s_BQ;W+|3$q<2$p-S8{upx3fIB`@r8 z%GF+T0$;k9tvc#{dQR8(E!G;}8CaR}#W(xcoR1iHdb7UY=7+Mr$-yTk-Z8mw=3(}x zycIdQ@{QN#p1tZZ@z|>5OBoZM*$j)0d0_2tU#@r8eT`$m`$3DwpZPs=ZS1nQ!HZ07 z_Kw%uD!=GHths@WP2n#O7H3v}*>eVYd^`L@v*?X3eH=QzeAnrC!Sz#}*H$+!c+mOx zIq`EBej0RcT{rh><;x7GpQvoHVXd{H&-K;M67qc>l?;-tnKkZOet+!^x5{%`uQ-|Q zTkZSht~U1F;{vX<_$h4USLwwfT95!z?)kr&dMUwxa|j~lo9$O#?2qLPhmo7wryemTvrA}n^`fkk#_ ze#%bU(Cqd5%c)-BzobUq@OUyQW3$t-z}S5jJKJv`zrWQMN#&@W&%&0am3ethxnW0* zNo&#g@(7o?eui^jPl(VxePfGtV#~(yaX%j2aCg}F0mVZ%jmpxF*uF)48< zOg;0`AU%)9k2*EoIwbyz?Mp9@L(VJ1w12G{-hCjoJ!FdKl^s7{-0t|rQ~gzwgQM<0 zSmL(W-7m!6$0lyl^UKCqW9?$9qrcdxj1&=!(g-Ab}>%O^n0t_~Ifh^WJ(^lO6|ow$i_4?Pwi+>DHIS+s0j~F-jb@ z#r&jG__(XRliXdax}S0E_+ab2nbna+%_O68HYQ~+jq;B2-4f=#<3RV)VWY1cx)I#t zT;sF-ewi20*m+hrdwA&S#o{gsLE>{)<14+^t|o# zHAQJTU&Zu}4t)@Dae;SS)ac0_9=~36U*fuc@-q8jTc?kHG}(D??jKgRqx zWS^Vo;5Ck+8_)VX{a)MV`RN8mxt-GwedA%*V5Zx;tQqu3AU+%poe-ClLJxK!#?a6+JXUsaCvvISXEIM`E zSKp>x-#7GN#QASKoprY?4F17wS!2UFSHlnXDe5}n{Ar^LUj$wEjJ2JydGYw6SFBd9 zX;$SGaI&6A>SmJtX4Vv0a`MFk zMvLt$=Tz+YRV({mdjl_j+upxFH7IhDxy&9`vT9`Uif>Lg8Q$)ud*U_=S;t4q#;-0N zv;X%+0ewuv=3ez3u`6cQqGa!;C+jNH4 z4l8pr3VIX#G3&nb7X^C)WOk2com_NsL;8_Zt87hA|Hq!q{XV=2xe(cPi`+EH>FV8| zeoGxx^ycom$>vL6Mn38{Br#`1#@#L3UwwGcrub4@_Xw@5*5AFNmJYeH!tDM7Beyn> zHbp*K)8R(5rAfK1Hr~*+-MY8)q9c12exn!Tzb-Iku!;AHX|cBFQqNROdY9>(q}x9? ztwZP4-I_1y|K{ZUCfhF<9j$WOwQ_Zf_O~3ac0E;?QnGZK*@b0^i7Ct7`c2ny%GlX% z^+SuuWTSW5-Osx@}f(+O=ki)ejZ1D>yjv*jykE-`(@I5I*IKg2pvTmjPZVJeX zO7X=2PN%JZWk`ZCZB1oxip&IL&=w-MJ7_A2U5yD?(iA4{+>*j#^1B|EXLQ?Lu)JVL zWSCMl7=J>nBB~8NoXZsbOiz#bH27-)6%E|%QKP|G8ASBbrW;ug-ZS!t-Zh*ygaz=e z)B@gGW|1t4EaJfOfU+_CBH`#dmL$P98-3v`uBr4>DE$S;NcwxPb|eD6?ZQu~CUP)B z0G2=!0p<>i%@_&~VsgNYQ|M)u4%HX(;^2q*t6}?oHK%4!3mxG2gDijz)Bf-)rDPBZ zS?DPtA4v*G!+g;Rn_;Fis8qNaL_VJiTh_^0rICuq!r1uvvgMs3;ES&a5==1p)40%Z zNS<5SF@a6$5^CGfohj8xEI^T8ksC4x(X|Mb0$XVwaEPQ2)xL(cH(Dj?k@@7zsLm&6 z4WPHO0R^yw4$=S)N)2$|4oXVk(-%Yf*%+?)>8Xr--1_H*(AWt7p)|ZL4R@rkvuH>r z;IP3CPlbq_nh80j^t!7lq_b%3Z2D>s*zt6D;NP0_?4YFb(7z4mc|E-CsRvxa_9Og| zCqg{vaM7Q=Q=|YE{sk&FXe{nU)l>Tc4H?OxwM3DAEdn4drPC5P8SU4ii!v>R*WbAL zy6|oWHy^5_9_x37YCvWQzTwTjjev~EB-pdjFUlEKI198l)hs{n8u3mjuj=y%pkIiqHgG~Z?(EHU0ap$&(q&S z1893_lh`G&BVzZ%PKUOP?TjM^exr}e40Klbfd;1W4F_~2#t?DRfbμh6VN`1@!8 z2V+Wy7_OFF!X~HN{DWa<$<#J$i+iBQ0s}dsc%|-t`i}g7qoYF=T%rCNWQFEK0q5lt z1s=Z~l;V|R(lkBHt76jls7c-$D<+@4v*py%3O-qW**lBR-q~{OorV7|xqrlg2K2$X z)AD~**oEqD#o*O4_cw;r|Y7=79UK><#{=B>(E`{G@AqS5xnGUC|! z`>SpMI|32?66Oa(gpe5l7xZ0G5HT+iBG#V@5&cy*MD$U45YbQVhloCJ7Zk#@6bfOx zB8@~C{KvtaO&3QPgcU;t0RSUi8<`(mTS3v!x{}K;w_l|Y&j?~D%-n~=KR6`AEIS$g z!GZZljZ}ce!Q7wmuW(ZfV)7$@l1pbV6}VU$EnNZfJH0FF1~6?NYyrSf56C;}!~r6N zOgFfo&-Q_c`~^Vd%Z&NjFs(`kF7ZDo@b4XPHS#(CN8tlhx!w*){>y+<(mBZNzbSlf z{r{$Fm1O?z^`jkN_y`fle++0p*hCXC0rr#*7qp*jh&WfMP^1xtw$~FT>;2)5dDy3V zfgOdz8W(%S2(YN(K&dO-M?!BH0hn=+gMn|8*q^K+2EsJHD_E~PJo!Kj1dj0d)e};l z@D@ZDSXz1khC4m&_aq$vf+Y|Kb1)z+?DzPxOMAFF1GYQ7F@h04_I3wK9`FR~%>TFH FKLHioK#l+a literal 0 HcmV?d00001 diff --git a/blade-service/blade-desk/src/main/resources/application-dev.yml b/blade-service/blade-desk/src/main/resources/application-dev.yml index 7d9bcedc..b972b2ec 100644 --- a/blade-service/blade-desk/src/main/resources/application-dev.yml +++ b/blade-service/blade-desk/src/main/resources/application-dev.yml @@ -12,11 +12,14 @@ spring: business: oldMes: jobEnable: false + jobSafeEnable: false url: 192.168.169.172:9000 # url: 127.0.0.1:32111 syncOrderList: /zhgd-rb/aiWebapi/syncApsOrderData/化学镀镍 # syncOrderList: /zhgd-rb/aiWebapi/syncApsOrderData/all pushSyncResult: /zhgd-rb/aiWebapi/syncApsOrderDataResult + device: + id: 9651230 #角色配置 role-config: diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml index 894059a9..c63db15b 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/UserMapper.xml @@ -38,6 +38,9 @@ and account = #{user.account} + + and role_id = #{user.roleId} + and real_name = #{user.realName} From 1df70a1e4f92cda7dc66eade5bc63d3d1607f9ab Mon Sep 17 00:00:00 2001 From: sunjianxi <839419401@qq.com> Date: Wed, 7 Jan 2026 17:36:17 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E6=8E=92=E4=BA=A7=E7=9B=B8=E5=85=B3-sjx?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/LauncherConstant.java | 8 +- .../DifferentFurnaceTankController.java | 160 ---------------- .../controller/EquipAbilityController.java | 12 +- .../controller/SameTroughController.java | 161 +++++++++++++++++ .../scheduling/entity/EquipAbilityEntity.java | 2 +- ...eTankEntity.java => SameTroughEntity.java} | 53 +++--- .../scheduling/excel/SameTroughExcel.java | 171 ++++++++++++++++++ ...eTankMapper.java => SameTroughMapper.java} | 22 +-- ...aceTankMapper.xml => SameTroughMapper.xml} | 32 ++-- .../scheduling/mapper/YieldOrderMapper.xml | 2 +- .../service/IEquipResourceService.java | 1 + ...nkService.java => ISameTroughService.java} | 22 +-- .../impl/EquipResourceServiceImpl.java | 48 ++++- ...ceImpl.java => SameTroughServiceImpl.java} | 30 ++- .../service/impl/WorkOrderServiceImpl.java | 28 ++- ...ntFurnaceTankVO.java => SameTroughVO.java} | 9 +- ...ankWrapper.java => SameTroughWrapper.java} | 28 +-- 17 files changed, 509 insertions(+), 280 deletions(-) delete mode 100644 blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/DifferentFurnaceTankController.java create mode 100644 blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java rename blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/{DifferentFurnaceTankEntity.java => SameTroughEntity.java} (79%) create mode 100644 blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/SameTroughExcel.java rename blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/{DifferentFurnaceTankMapper.java => SameTroughMapper.java} (65%) rename blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/{DifferentFurnaceTankMapper.xml => SameTroughMapper.xml} (60%) rename blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/{IDifferentFurnaceTankService.java => ISameTroughService.java} (64%) rename blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/service/impl/{DifferentFurnaceTankServiceImpl.java => SameTroughServiceImpl.java} (51%) rename blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/vo/{DifferentFurnaceTankVO.java => SameTroughVO.java} (84%) rename blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/wrapper/{DifferentFurnaceTankWrapper.java => SameTroughWrapper.java} (54%) diff --git a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java index 25e59f6e..0ff16892 100644 --- a/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java +++ b/blade-common/src/main/java/org/springblade/common/constant/LauncherConstant.java @@ -13,10 +13,10 @@ public interface LauncherConstant { * nacos 命名空间 */ // String NACOS_NAMESPACE = "feaf627f-a847-463b-8b73-24a0538f526e"; - // 生产环境 - String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; - // 测试环境 - // String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; + // 生产环境 +// String NACOS_NAMESPACE = "db3f4da1-ae19-4104-8c17-6d9b8f069401"; + // 测试环境 + String NACOS_NAMESPACE = "6cdd0310-0d61-4f54-891a-7fb06224d9b8"; /** * nacos 用户名 diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/DifferentFurnaceTankController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/DifferentFurnaceTankController.java deleted file mode 100644 index 730e2cf5..00000000 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/DifferentFurnaceTankController.java +++ /dev/null @@ -1,160 +0,0 @@ -/** - * BladeX Commercial License Agreement - * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. - *

- * Use of this software is governed by the Commercial License Agreement - * obtained after purchasing a license from BladeX. - *

- * 1. This software is for development use only under a valid license - * from BladeX. - *

- * 2. Redistribution of this software's source code to any third party - * without a commercial license is strictly prohibited. - *

- * 3. Licensees may copyright their own code but cannot use segments - * from this software for such purposes. Copyright of this software - * remains with BladeX. - *

- * Using this software signifies agreement to this License, and the software - * must not be used for illegal purposes. - *

- * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is - * not liable for any claims arising from secondary or illegal development. - *

- * Author: Chill Zhuang (bladejava@qq.com) - */ -package org.springblade.scheduling.scheduling.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.scheduling.scheduling.entity.DifferentFurnaceTankEntity; -import org.springblade.scheduling.scheduling.excel.DifferentFurnaceTankExcel; -import org.springblade.scheduling.scheduling.service.IDifferentFurnaceTankService; -import org.springblade.scheduling.scheduling.vo.DifferentFurnaceTankVO; -import org.springblade.scheduling.scheduling.wrapper.DifferentFurnaceTankWrapper; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Map; - -/** - * 非同炉同槽因素表 控制器 - * - * @author BladeX - * @since 2025-12-18 - */ -@RestController -@AllArgsConstructor -@RequestMapping("/differentFurnaceTank") -@Tag(name = "非同炉同槽因素表", description = "非同炉同槽因素表接口") -public class DifferentFurnaceTankController extends BladeController { - - private final IDifferentFurnaceTankService differentFurnaceTankService; - - /** - * 非同炉同槽因素表 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 1) - @Operation(summary = "详情", description = "传入DifferentFurnaceTank") - public R detail(DifferentFurnaceTankEntity DifferentFurnaceTank) { - DifferentFurnaceTankEntity detail = differentFurnaceTankService.getOne(Condition.getQueryWrapper(DifferentFurnaceTank)); - return R.data(DifferentFurnaceTankWrapper.build().entityVO(detail)); - } - /** - * 非同炉同槽因素表 分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 2) - @Operation(summary = "分页", description = "传入DifferentFurnaceTank") - public R> list(@Parameter(hidden = true) @RequestParam Map DifferentFurnaceTank, Query query) { - IPage pages = differentFurnaceTankService.page(Condition.getPage(query), Condition.getQueryWrapper(DifferentFurnaceTank, DifferentFurnaceTankEntity.class)); - return R.data(DifferentFurnaceTankWrapper.build().pageVO(pages)); - } - - /** - * 非同炉同槽因素表 自定义分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 3) - @Operation(summary = "分页", description = "传入DifferentFurnaceTank") - public R> page(DifferentFurnaceTankVO DifferentFurnaceTank, Query query) { - IPage pages = differentFurnaceTankService.selectDifferentFurnaceTankPage(Condition.getPage(query), DifferentFurnaceTank); - return R.data(pages); - } - - /** - * 非同炉同槽因素表 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @Operation(summary = "新增", description = "传入DifferentFurnaceTank") - public R save(@Valid @RequestBody DifferentFurnaceTankEntity DifferentFurnaceTank) { - return R.status(differentFurnaceTankService.save(DifferentFurnaceTank)); - } - - /** - * 非同炉同槽因素表 修改 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @Operation(summary = "修改", description = "传入DifferentFurnaceTank") - public R update(@Valid @RequestBody DifferentFurnaceTankEntity DifferentFurnaceTank) { - return R.status(differentFurnaceTankService.updateById(DifferentFurnaceTank)); - } - - /** - * 非同炉同槽因素表 新增或修改 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 6) - @Operation(summary = "新增或修改", description = "传入DifferentFurnaceTank") - public R submit(@Valid @RequestBody DifferentFurnaceTankEntity DifferentFurnaceTank) { - return R.status(differentFurnaceTankService.saveOrUpdate(DifferentFurnaceTank)); - } - - /** - * 非同炉同槽因素表 删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 7) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(differentFurnaceTankService.deleteLogic(Func.toLongList(ids))); - } - - - /** - * 导出数据 - */ - @IsAdmin - @GetMapping("/export") - @ApiOperationSupport(order = 9) - @Operation(summary = "导出数据", description = "传入DifferentFurnaceTank") - public void export(@Parameter(hidden = true) @RequestParam Map DifferentFurnaceTank, BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper queryWrapper = Condition.getQueryWrapper(DifferentFurnaceTank, DifferentFurnaceTankEntity.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(DifferentFurnaceTank::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(DifferentFurnaceTankEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = differentFurnaceTankService.export(queryWrapper); - ExcelUtil.export(response, "非同炉同槽因素表数据" + DateUtil.time(), "非同炉同槽因素表数据表", list, DifferentFurnaceTankExcel.class); - } - -} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java index 7ba3a69c..bab19bde 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/EquipAbilityController.java @@ -49,6 +49,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.scheduling.scheduling.entity.EquipAbilityEntity; import org.springblade.scheduling.scheduling.excel.EquipAbilityExcel; import org.springblade.scheduling.scheduling.service.IEquipAbilityService; +import org.springblade.scheduling.scheduling.service.IEquipResourceService; import org.springblade.scheduling.scheduling.vo.EquipAbilityVO; import org.springblade.scheduling.scheduling.wrapper.EquipAbilityWrapper; import org.springframework.web.bind.annotation.*; @@ -69,6 +70,7 @@ import java.util.Map; public class EquipAbilityController extends BladeController { private final IEquipAbilityService equipAbilityService; + private final IEquipResourceService equipResourceService; /** * 设备能力表 详情 @@ -113,7 +115,10 @@ public class EquipAbilityController extends BladeController { if(CollectionUtils.isNotEmpty(list)){ return R.status(false,"该设备能力已存在！"); } - return R.status(equipAbilityService.save(entity)); + equipAbilityService.save(entity); + //初始化设备资源 + equipResourceService.initSingleEquipResource(entity.getWorkCenterId(),entity.getCraftId(),entity.getEquipCode()); + return R.status(true); } /** @@ -123,7 +128,10 @@ public class EquipAbilityController extends BladeController { @ApiOperationSupport(order = 5) @Operation(summary = "修改", description = "传入mesEquipAbility") public R update(@Valid @RequestBody EquipAbilityEntity entity) { - return R.status(equipAbilityService.updateById(entity)); + equipAbilityService.updateById(entity); + //初始化设备资源 + equipResourceService.initSingleEquipResource(entity.getWorkCenterId(),entity.getCraftId(),entity.getEquipCode()); + return R.status(true); } /** diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java new file mode 100644 index 00000000..8f0cddbb --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/controller/SameTroughController.java @@ -0,0 +1,161 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.scheduling.scheduling.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.springblade.scheduling.scheduling.entity.SameTroughEntity; +import org.springblade.scheduling.scheduling.excel.SameTroughExcel; +import org.springblade.scheduling.scheduling.service.ISameTroughService; +import org.springblade.scheduling.scheduling.vo.SameTroughVO; +import org.springblade.scheduling.scheduling.wrapper.SameTroughWrapper; +import org.springframework.web.bind.annotation.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +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 BladeX + * @since 2026-01-07 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/sameTrough") +@Tag(name = "非同槽因素表", description = "非同槽因素表接口") +public class SameTroughController extends BladeController { + + private final ISameTroughService sameTroughService; + + /** + * 非同槽因素表 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 1) + @Operation(summary = "详情", description = "传入SameTrough") + public R detail(SameTroughEntity sameTrough) { + SameTroughEntity detail = sameTroughService.getOne(Condition.getQueryWrapper(sameTrough)); + return R.data(SameTroughWrapper.build().entityVO(detail)); + } + /** + * 非同槽因素表 分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 2) + @Operation(summary = "分页", description = "传入SameTrough") + public R> list(@Parameter(hidden = true) @RequestParam Map sameTrough, Query query) { + IPage pages = sameTroughService.page(Condition.getPage(query), Condition.getQueryWrapper(sameTrough, SameTroughEntity.class)); + return R.data(SameTroughWrapper.build().pageVO(pages)); + } + + /** + * 非同槽因素表 自定义分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 3) + @Operation(summary = "分页", description = "传入SameTrough") + public R> page(SameTroughVO sameTrough, Query query) { + IPage pages = sameTroughService.selectSameTroughPage(Condition.getPage(query), sameTrough); + return R.data(pages); + } + + /** + * 非同槽因素表 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 4) + @Operation(summary = "新增", description = "传入SameTrough") + public R save(@Valid @RequestBody SameTroughEntity sameTrough) { + return R.status(sameTroughService.save(sameTrough)); + } + + /** + * 非同槽因素表 修改 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 5) + @Operation(summary = "修改", description = "传入SameTrough") + public R update(@Valid @RequestBody SameTroughEntity sameTrough) { + return R.status(sameTroughService.updateById(sameTrough)); + } + + /** + * 非同槽因素表 新增或修改 + */ + @PostMapping("/submit") + @ApiOperationSupport(order = 6) + @Operation(summary = "新增或修改", description = "传入SameTrough") + public R submit(@Valid @RequestBody SameTroughEntity sameTrough) { + return R.status(sameTroughService.saveOrUpdate(sameTrough)); + } + + /** + * 非同槽因素表 删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 7) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(sameTroughService.deleteLogic(Func.toLongList(ids))); + } + + + /** + * 导出数据 + */ + @IsAdmin + @GetMapping("/export") + @ApiOperationSupport(order = 9) + @Operation(summary = "导出数据", description = "传入SameTrough") + public void export(@Parameter(hidden = true) @RequestParam Map sameTrough, BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper queryWrapper = Condition.getQueryWrapper(sameTrough, SameTroughEntity.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(SameTrough::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(SameTroughEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = sameTroughService.export(queryWrapper); + ExcelUtil.export(response, "非同槽因素表数据" + DateUtil.time(), "非同槽因素表数据表", list, SameTroughExcel.class); + } + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipAbilityEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipAbilityEntity.java index 593baaa0..8eaec722 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipAbilityEntity.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/EquipAbilityEntity.java @@ -84,7 +84,7 @@ public class EquipAbilityEntity extends BaseEntity { * 工艺能力Id */ @Schema(description = "工艺能力Id") - private String craftId; + private Long craftId; /** * 工艺能力名称 diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/DifferentFurnaceTankEntity.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/SameTroughEntity.java similarity index 79% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/DifferentFurnaceTankEntity.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/SameTroughEntity.java index 350ec512..1272fe24 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/DifferentFurnaceTankEntity.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/entity/SameTroughEntity.java @@ -25,27 +25,26 @@ */ package org.springblade.scheduling.scheduling.entity; -import lombok.Data; -import io.swagger.v3.oas.annotations.media.Schema; import com.baomidou.mybatisplus.annotation.TableName; -import java.math.BigDecimal; -import java.util.Date; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.tenant.mp.TenantEntity; + import java.io.Serial; +import java.math.BigDecimal; /** - * 非同炉同槽因素表 实体类 + * 非同槽因素表 实体类 * * @author BladeX - * @since 2025-12-18 + * @since 2026-01-07 */ @Data -@TableName("MES_DIFFERENT_FURNACE_TANK") -@Schema(description = "MesDifferentFurnaceTank对象") +@TableName("MES_SAME_TROUGH") +@Schema(description = "MesSameTrough对象") @EqualsAndHashCode(callSuper = true) -public class DifferentFurnaceTankEntity extends BaseEntity { +public class SameTroughEntity extends BaseEntity { @Serial private static final long serialVersionUID = 1L; @@ -71,14 +70,14 @@ public class DifferentFurnaceTankEntity extends BaseEntity { @Schema(description = "工序名称") private String processName; /** - * 工艺能力id + * 工艺id */ - @Schema(description = "工艺能力id") + @Schema(description = "工艺id") private BigDecimal craftId; /** - * 工艺能力 + * 工艺名称 */ - @Schema(description = "工艺能力") + @Schema(description = "工艺名称") private String craftName; /** * 键位 @@ -89,11 +88,11 @@ public class DifferentFurnaceTankEntity extends BaseEntity { * 生产厂家 */ @Schema(description = "生产厂家") - private String factory; + private String producter; /** - * 检验编号 + * 检验编码 */ - @Schema(description = "检验编号") + @Schema(description = "检验编码") private String inspectionCode; /** * 材料 @@ -106,7 +105,7 @@ public class DifferentFurnaceTankEntity extends BaseEntity { @Schema(description = "厚度") private String thickness; /** - * 镀化 + * 钝化 */ @Schema(description = "钝化") private String passivation; @@ -119,11 +118,21 @@ public class DifferentFurnaceTankEntity extends BaseEntity { * 生产标识 */ @Schema(description = "生产标识") - private String productionIdent; + private String productIdent; + /** + * 结构 + */ + @Schema(description = "结构") + private String structure; + /** + * 磁性 + */ + @Schema(description = "磁性") + private String magnetism; /** - * 结构/单件面积 + * 批次号 */ - @Schema(description = "结构/单件面积") - private String singleArea; + @Schema(description = "批次号") + private String batchNo; } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/SameTroughExcel.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/SameTroughExcel.java new file mode 100644 index 00000000..e0d9096c --- /dev/null +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/excel/SameTroughExcel.java @@ -0,0 +1,171 @@ +/** + * BladeX Commercial License Agreement + * Copyright (c) 2018-2099, https://bladex.cn. All rights reserved. + *

+ * Use of this software is governed by the Commercial License Agreement + * obtained after purchasing a license from BladeX. + *

+ * 1. This software is for development use only under a valid license + * from BladeX. + *

+ * 2. Redistribution of this software's source code to any third party + * without a commercial license is strictly prohibited. + *

+ * 3. Licensees may copyright their own code but cannot use segments + * from this software for such purposes. Copyright of this software + * remains with BladeX. + *

+ * Using this software signifies agreement to this License, and the software + * must not be used for illegal purposes. + *

+ * THIS SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY. The author is + * not liable for any claims arising from secondary or illegal development. + *

+ * Author: Chill Zhuang (bladejava@qq.com) + */ +package org.springblade.scheduling.scheduling.excel; + + +import lombok.Data; + +import java.math.BigDecimal; + +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.Serializable; +import java.io.Serial; + + +/** + * 非同槽因素表 Excel实体类 + * + * @author BladeX + * @since 2026-01-07 + */ +@Data +@ColumnWidth(25) +@HeadRowHeight(20) +@ContentRowHeight(18) +public class SameTroughExcel implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * ID + */ + @ColumnWidth(20) + @ExcelProperty("ID") + private BigDecimal id; + /** + * 作业中心id + */ + @ColumnWidth(20) + @ExcelProperty("作业中心id") + private BigDecimal workCenterId; + /** + * 作业中心名称 + */ + @ColumnWidth(20) + @ExcelProperty("作业中心名称") + private String workCenterName; + /** + * 工序id + */ + @ColumnWidth(20) + @ExcelProperty("工序id") + private BigDecimal processId; + /** + * 工序名称 + */ + @ColumnWidth(20) + @ExcelProperty("工序名称") + private String processName; + /** + * 工艺id + */ + @ColumnWidth(20) + @ExcelProperty("工艺id") + private BigDecimal craftId; + /** + * 工艺名称 + */ + @ColumnWidth(20) + @ExcelProperty("工艺名称") + private String craftName; + /** + * 键位 + */ + @ColumnWidth(20) + @ExcelProperty("键位") + private String keyBinding; + /** + * 生产厂家 + */ + @ColumnWidth(20) + @ExcelProperty("生产厂家") + private String producter; + /** + * 检验编码 + */ + @ColumnWidth(20) + @ExcelProperty("检验编码") + private String inspectionCode; + /** + * 材料 + */ + @ColumnWidth(20) + @ExcelProperty("材料") + private String material; + /** + * 厚度 + */ + @ColumnWidth(20) + @ExcelProperty("厚度") + private String thickness; + /** + * 钝化 + */ + @ColumnWidth(20) + @ExcelProperty("钝化") + private String passivation; + /** + * 硬度 + */ + @ColumnWidth(20) + @ExcelProperty("硬度") + private String hardness; + /** + * 生产标识 + */ + @ColumnWidth(20) + @ExcelProperty("生产标识") + private String productIdent; + /** + * 结构 + */ + @ColumnWidth(20) + @ExcelProperty("结构") + private String structure; + /** + * 磁性 + */ + @ColumnWidth(20) + @ExcelProperty("磁性") + private String magnetism; + /** + * 批次号 + */ + @ColumnWidth(20) + @ExcelProperty("批次号") + private String batchNo; + /** + * 是否已删除 + */ + @ColumnWidth(20) + @ExcelProperty("是否已删除") + private Long isDeleted; + +} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.java b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.java similarity index 65% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.java rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.java index ee38a6a2..32adaa91 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.java +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.java @@ -29,36 +29,36 @@ 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 org.springblade.scheduling.scheduling.entity.DifferentFurnaceTankEntity; -import org.springblade.scheduling.scheduling.excel.DifferentFurnaceTankExcel; -import org.springblade.scheduling.scheduling.vo.DifferentFurnaceTankVO; +import org.springblade.scheduling.scheduling.entity.SameTroughEntity; +import org.springblade.scheduling.scheduling.excel.SameTroughExcel; +import org.springblade.scheduling.scheduling.vo.SameTroughVO; import java.util.List; /** - * 非同炉同槽因素表 Mapper 接口 + * 非同槽因素表 Mapper 接口 * * @author BladeX - * @since 2025-12-18 + * @since 2026-01-07 */ -public interface DifferentFurnaceTankMapper extends BaseMapper { +public interface SameTroughMapper extends BaseMapper { /** * 自定义分页 * * @param page 分页参数 - * @param DifferentFurnaceTank 查询参数 - * @return List + * @param SameTrough 查询参数 + * @return List */ - List selectDifferentFurnaceTankPage(IPage page, DifferentFurnaceTankVO DifferentFurnaceTank); + List selectSameTroughPage(IPage page, SameTroughVO SameTrough); /** * 获取导出数据 * * @param queryWrapper 查询条件 - * @return List + * @return List */ - List export(@Param("ew") Wrapper queryWrapper); + List export(@Param("ew") Wrapper queryWrapper); } diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml similarity index 60% rename from blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.xml rename to blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml index 7fe16847..0662df00 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/DifferentFurnaceTankMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/SameTroughMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -12,14 +12,16 @@ - + - - + + + + @@ -30,25 +32,13 @@ - + select * from MES_SAME_TROUGH where is_deleted = 0 - + SELECT * FROM MES_SAME_TROUGH ${ew.customSqlSegment} diff --git a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml index 7d335b51..10108696 100644 --- a/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml +++ b/blade-service/blade-scheduling/src/main/java/org/springblade/scheduling/scheduling/mapper/YieldOrderMapper.xml @@ -61,7 +61,7 @@ - SELECT * FROM QA_NG WHERE is_deleted = 0 + SELECT * + FROM QA_NG + WHERE is_deleted = 0 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java index ad148988..262ec0dd 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; /** * [缺陷] 实体类 - * + * mes v1: bs_review_sheet_type BsReviewSheetType 不良原因 * @author Tom Shuo * @since 2026-01-04 */ @@ -54,7 +54,7 @@ public class Ng extends BaseEntity { /** * 缺陷描述 */ - public static final String COL_DESC = "DESC"; + public static final String COL_DESCRIPTION = "DESCRIPTION"; /** * [制品]id */ @@ -106,7 +106,7 @@ public class Ng extends BaseEntity { * 缺陷描述 */ @Schema(description = "缺陷描述") - private String desc; + private String description; /** * [制品]id */ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java deleted file mode 100644 index 9cc70d1a..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/NgService.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.springblade.desk.quality.service; - -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -@Slf4j -@Data -public class NgService { - -} From 593f16d4995d5697845787c21ad6ccb9b738425c Mon Sep 17 00:00:00 2001 From: Tom Li Date: Thu, 8 Jan 2026 13:35:30 +0800 Subject: [PATCH 16/22] =?UTF-8?q?=E7=A7=BB=E5=8A=A8pojo=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-service-api/blade-desk-api/pom.xml | 4 ++++ .../springblade/desk/basic/pojo/dto/BasicClazzDTO.java | 0 .../org/springblade/desk/basic/pojo/dto/BatConfigDTO.java | 0 .../desk/basic/pojo/dto/CoatingThicknessDTO.java | 0 .../org/springblade/desk/basic/pojo/dto/FormulaDTO.java | 0 .../desk/basic/pojo/dto/LocallyPlatedPartDTO.java | 0 .../springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java | 0 .../java/org/springblade/desk/basic/pojo/dto/OemDTO.java | 0 .../desk/basic/pojo/dto/PlanAssignSteerDTO.java | 0 .../org/springblade/desk/basic/pojo/dto/PlatingDTO.java | 0 .../springblade/desk/basic/pojo/dto/PlatingSmallDTO.java | 0 .../desk/basic/pojo/dto/ProcessAbilityDTO.java | 0 .../org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java | 0 .../org/springblade/desk/basic/pojo/dto/ShiftsDTO.java | 0 .../org/springblade/desk/basic/pojo/dto/TeamSetDTO.java | 0 .../springblade/desk/basic/pojo/dto/WorkCenterDTO.java | 0 .../org/springblade/desk/basic/pojo/dto/WorkTankDTO.java | 0 .../springblade/desk/basic/pojo/entity/BasicClazz.java | 0 .../org/springblade/desk/basic/pojo/entity/BatConfig.java | 0 .../desk/basic/pojo/entity/CoatingThickness.java | 0 .../org/springblade/desk/basic/pojo/entity/Formula.java | 0 .../desk/basic/pojo/entity/LocallyPlatedPart.java | 0 .../springblade/desk/basic/pojo/entity/MaterialQuota.java | 0 .../java/org/springblade/desk/basic/pojo/entity/Oem.java | 0 .../desk/basic/pojo/entity/PlanAssignSteer.java | 0 .../org/springblade/desk/basic/pojo/entity/Plating.java | 0 .../springblade/desk/basic/pojo/entity/PlatingSmall.java | 0 .../desk/basic/pojo/entity/ProcessAbility.java | 0 .../org/springblade/desk/basic/pojo/entity/ProdMark.java | 0 .../org/springblade/desk/basic/pojo/entity/Shifts.java | 0 .../org/springblade/desk/basic/pojo/entity/TeamSet.java | 0 .../springblade/desk/basic/pojo/entity/WorkCenter.java | 0 .../org/springblade/desk/basic/pojo/entity/WorkTank.java | 0 .../springblade/desk/basic/pojo/request/OemSearch.java | 0 .../org/springblade/desk/basic/pojo/vo/BaseEntityVO.java | 0 .../org/springblade/desk/basic/pojo/vo/BasicClazzVO.java | 0 .../org/springblade/desk/basic/pojo/vo/BatConfigVO.java | 0 .../desk/basic/pojo/vo/CoatingThicknessVO.java | 0 .../org/springblade/desk/basic/pojo/vo/FormulaVO.java | 0 .../desk/basic/pojo/vo/LocallyPlatedPartVO.java | 0 .../springblade/desk/basic/pojo/vo/MaterialQuotaVO.java | 0 .../java/org/springblade/desk/basic/pojo/vo/OemVO.java | 0 .../springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java | 0 .../springblade/desk/basic/pojo/vo/PlatingSmallVO.java | 0 .../org/springblade/desk/basic/pojo/vo/PlatingVO.java | 0 .../springblade/desk/basic/pojo/vo/ProcessAbilityVO.java | 0 .../org/springblade/desk/basic/pojo/vo/ProdMarkVO.java | 0 .../java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java | 0 .../org/springblade/desk/basic/pojo/vo/TeamSetVO.java | 0 .../org/springblade/desk/basic/pojo/vo/WorkCenterVO.java | 0 .../org/springblade/desk/basic/pojo/vo/WorkTankVO.java | 0 .../springblade/desk/quality/pojo/dto/AuditFileDTO.java | 0 .../springblade/desk/quality/pojo/dto/CycleTestDTO.java | 0 .../desk/quality/pojo/dto/CycleTestItemDTO.java | 0 .../desk/quality/pojo/dto/CycleTestStandardDTO.java | 0 .../desk/quality/pojo/dto/CycleTestTaskDTO.java | 0 .../desk/quality/pojo/dto/IndicatorMonthDTO.java | 0 .../desk/quality/pojo/dto/IndicatorYearDTO.java | 0 .../desk/quality/pojo/dto/IndicatorYearDetailDTO.java | 0 .../desk/quality/pojo/dto/InspectionItemDTO.java | 0 .../desk/quality/pojo/dto/InspectionResultDTO.java | 0 .../desk/quality/pojo/dto/InspectionTaskDTO.java | 0 .../desk/quality/pojo/dto/InspectionTemplateDTO.java | 0 .../springblade/desk/quality/pojo/dto/IotHardnessDTO.java | 0 .../desk/quality/pojo/dto/IotThicknessDTO.java | 0 .../springblade/desk/quality/pojo/dto/LiquidTankDTO.java | 0 .../desk/quality/pojo/dto/LiquidTankReportConfigDTO.java | 0 .../desk/quality/pojo/dto/LiquidTankReportDTO.java | 0 .../desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java | 0 .../desk/quality/pojo/dto/LiquidTankTaskDTO.java | 0 .../desk/quality/pojo/dto/LiquidTankTaskHiDTO.java | 0 .../desk/quality/pojo/dto/LiquidTankWaveDTO.java | 0 .../java/org/springblade/desk/quality/pojo/dto/NgDTO.java | 0 .../springblade/desk/quality/pojo/dto/PlanTestDTO.java | 0 .../desk/quality/pojo/dto/ProReTemplateDTO.java | 0 .../desk/quality/pojo/dto/ProReTemplateDetailDTO.java | 0 .../desk/quality/pojo/dto/ProReTemplateTankDTO.java | 0 .../desk/quality/pojo/dto/RelInsTemplateItemDTO.java | 0 .../desk/quality/pojo/dto/RelTankReportItemDTO.java | 0 .../desk/quality/pojo/dto/RelTankWaveItemDTO.java | 0 .../springblade/desk/quality/pojo/dto/RemindMsgDTO.java | 0 .../springblade/desk/quality/pojo/dto/ReviewDutyDTO.java | 0 .../springblade/desk/quality/pojo/dto/ReviewFaultDTO.java | 0 .../springblade/desk/quality/pojo/dto/ReviewSheetDTO.java | 0 .../springblade/desk/quality/pojo/dto/StandardDTO.java | 0 .../desk/quality/pojo/dto/StandardParamDTO.java | 0 .../desk/quality/pojo/dto/SupplyInspectionDTO.java | 0 .../desk/quality/pojo/dto/WorkPlanItemDTO.java | 0 .../desk/quality/pojo/dto/WorkPlanItemDetailDTO.java | 0 .../springblade/desk/quality/pojo/dto/package-info.java | 0 .../springblade/desk/quality/pojo/entity/AuditFile.java | 0 .../springblade/desk/quality/pojo/entity/CycleTest.java | 0 .../desk/quality/pojo/entity/CycleTestItem.java | 0 .../desk/quality/pojo/entity/CycleTestStandard.java | 0 .../desk/quality/pojo/entity/CycleTestTask.java | 0 .../desk/quality/pojo/entity/IndicatorMonth.java | 0 .../desk/quality/pojo/entity/IndicatorYear.java | 0 .../desk/quality/pojo/entity/IndicatorYearDetail.java | 0 .../desk/quality/pojo/entity/InspectionItem.java | 0 .../desk/quality/pojo/entity/InspectionResult.java | 0 .../desk/quality/pojo/entity/InspectionTask.java | 0 .../desk/quality/pojo/entity/InspectionTemplate.java | 0 .../springblade/desk/quality/pojo/entity/IotHardness.java | 0 .../desk/quality/pojo/entity/IotThickness.java | 0 .../springblade/desk/quality/pojo/entity/LiquidTank.java | 0 .../desk/quality/pojo/entity/LiquidTankReport.java | 0 .../desk/quality/pojo/entity/LiquidTankReportConfig.java | 0 .../desk/quality/pojo/entity/LiquidTankTask.java | 0 .../desk/quality/pojo/entity/LiquidTankTaskCopy.java | 0 .../desk/quality/pojo/entity/LiquidTankTaskHi.java | 0 .../desk/quality/pojo/entity/LiquidTankWave.java | 0 .../java/org/springblade/desk/quality/pojo/entity/Ng.java | 0 .../springblade/desk/quality/pojo/entity/PlanTest.java | 0 .../desk/quality/pojo/entity/ProReTemplate.java | 0 .../desk/quality/pojo/entity/ProReTemplateDetail.java | 0 .../desk/quality/pojo/entity/ProReTemplateTank.java | 0 .../desk/quality/pojo/entity/RelInsTemplateItem.java | 0 .../desk/quality/pojo/entity/RelTankReportItem.java | 0 .../desk/quality/pojo/entity/RelTankWaveItem.java | 0 .../springblade/desk/quality/pojo/entity/RemindMsg.java | 0 .../springblade/desk/quality/pojo/entity/ReviewDuty.java | 0 .../springblade/desk/quality/pojo/entity/ReviewFault.java | 0 .../springblade/desk/quality/pojo/entity/ReviewSheet.java | 0 .../springblade/desk/quality/pojo/entity/Standard.java | 0 .../desk/quality/pojo/entity/StandardParam.java | 0 .../desk/quality/pojo/entity/SupplyInspection.java | 0 .../springblade/desk/quality/pojo/entity/TraceChain.java | 0 .../springblade/desk/quality/pojo/entity/TraceEvent.java | 0 .../springblade/desk/quality/pojo/entity/TraceItem.java | 0 .../desk/quality/pojo/entity/WorkPlanItem.java | 0 .../desk/quality/pojo/entity/WorkPlanItemDetail.java | 0 .../desk/quality/pojo/entity/package-info.java | 0 .../desk/quality/pojo/request/AuditFileSearch.java | 0 .../quality/pojo/request/CycleTestBatUpdateCycle.java | 0 .../desk/quality/pojo/request/CycleTestItemSubmit.java | 0 .../desk/quality/pojo/request/CycleTestSubmit.java | 0 .../desk/quality/pojo/request/CycleTestTaskAccept.java | 0 .../desk/quality/pojo/request/CycleTestTaskFillData.java | 0 .../desk/quality/pojo/request/CycleTestTaskFilter.java | 0 .../desk/quality/pojo/request/CycleTestTaskIssue.java | 0 .../desk/quality/pojo/request/CycleTestTaskIssueBat.java | 0 .../desk/quality/pojo/request/CycleTestUpdateUserBat.java | 0 .../quality/pojo/request/InspectionTaskEditResult.java | 0 .../desk/quality/pojo/request/InspectionTaskSearch.java | 1 - .../desk/quality/pojo/request/InspectionTaskStartNew.java | 0 .../desk/quality/pojo/request/InspectionTaskSubmit.java | 4 ---- .../desk/quality/pojo/request/InspectionTemplateAdd.java | 0 .../quality/pojo/request/InspectionTemplateSearch.java | 1 - .../quality/pojo/request/InspectionTemplateUpdate.java | 0 .../org/springblade/desk/quality/pojo/request/JobExt.java | 0 .../desk/quality/pojo/request/LiquidTankSubmit.java | 0 .../desk/quality/pojo/request/LiquidTankTaskAccept.java | 0 .../desk/quality/pojo/request/LiquidTankTaskApproval.java | 0 .../desk/quality/pojo/request/LiquidTankTaskClose.java | 0 .../desk/quality/pojo/request/LiquidTankTaskCloseBat.java | 0 .../desk/quality/pojo/request/LiquidTankTaskEditDrug.java | 0 .../quality/pojo/request/LiquidTankTaskException.java | 0 .../desk/quality/pojo/request/LiquidTankTaskFillData.java | 0 .../quality/pojo/request/LiquidTankTaskFillDataBat.java | 0 .../quality/pojo/request/LiquidTankTaskGenManual.java | 0 .../desk/quality/pojo/request/LiquidTankTaskIssue.java | 0 .../desk/quality/pojo/request/LiquidTankTaskIssueBat.java | 0 .../quality/pojo/request/LiquidTankTaskReceiveDrug.java | 0 .../desk/quality/pojo/request/LiquidTankTaskSendDrug.java | 0 .../desk/quality/pojo/request/LiquidTankTaskSubmit.java | 0 .../desk/quality/pojo/request/LiquidTankUpdateBat.java | 0 .../springblade/desk/quality/pojo/request/NgSearch.java | 0 .../org/springblade/desk/quality/pojo/vo/AuditFileVO.java | 1 - .../springblade/desk/quality/pojo/vo/CycleTestItemVO.java | 0 .../desk/quality/pojo/vo/CycleTestStandardVO.java | 0 .../springblade/desk/quality/pojo/vo/CycleTestTaskVO.java | 0 .../org/springblade/desk/quality/pojo/vo/CycleTestVO.java | 0 .../desk/quality/pojo/vo/IndicatorMonthVO.java | 1 - .../desk/quality/pojo/vo/IndicatorYearDetailVO.java | 0 .../springblade/desk/quality/pojo/vo/IndicatorYearVO.java | 0 .../desk/quality/pojo/vo/InspectionItemVO.java | 0 .../desk/quality/pojo/vo/InspectionResultVO.java | 0 .../desk/quality/pojo/vo/InspectionTaskDetailVO.java | 1 - .../desk/quality/pojo/vo/InspectionTaskListVO.java | 0 .../desk/quality/pojo/vo/InspectionTemplateVO.java | 0 .../springblade/desk/quality/pojo/vo/IotHardnessVO.java | 0 .../springblade/desk/quality/pojo/vo/IotThicknessVO.java | 0 .../desk/quality/pojo/vo/LiquidTankReportConfigVO.java | 0 .../desk/quality/pojo/vo/LiquidTankReportVO.java | 0 .../desk/quality/pojo/vo/LiquidTankTaskCopyVO.java | 0 .../desk/quality/pojo/vo/LiquidTankTaskHiVO.java | 0 .../desk/quality/pojo/vo/LiquidTankTaskVO.java | 1 - .../springblade/desk/quality/pojo/vo/LiquidTankVO.java | 0 .../desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java | 0 .../desk/quality/pojo/vo/LiquidTankWaveDrawVO.java | 0 .../desk/quality/pojo/vo/LiquidTankWaveVO.java | 0 .../java/org/springblade/desk/quality/pojo/vo/NgVO.java | 0 .../org/springblade/desk/quality/pojo/vo/PlanTestVO.java | 0 .../desk/quality/pojo/vo/ProReTemplateDetailVO.java | 0 .../desk/quality/pojo/vo/ProReTemplateTankVO.java | 0 .../springblade/desk/quality/pojo/vo/ProReTemplateVO.java | 0 .../springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java | 0 .../springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java | 0 .../desk/quality/pojo/vo/RelInsTemplateItemVO.java | 0 .../desk/quality/pojo/vo/RelTankReportItemVO.java | 0 .../desk/quality/pojo/vo/RelTankWaveItemVO.java | 0 .../org/springblade/desk/quality/pojo/vo/RemindMsgVO.java | 0 .../springblade/desk/quality/pojo/vo/ReviewDutyVO.java | 0 .../springblade/desk/quality/pojo/vo/ReviewFaultVO.java | 0 .../springblade/desk/quality/pojo/vo/ReviewSheetVO.java | 0 .../springblade/desk/quality/pojo/vo/StandardParamVO.java | 0 .../org/springblade/desk/quality/pojo/vo/StandardVO.java | 0 .../desk/quality/pojo/vo/SupplyInspectionVO.java | 0 .../desk/quality/pojo/vo/WorkPlanItemDetailVO.java | 0 .../springblade/desk/quality/pojo/vo/WorkPlanItemVO.java | 0 .../springblade/desk/quality/pojo/vo/package-info.java | 0 .../desk/basic/controller/FormulaController.java | 2 -- .../desk/basic/controller/MaterialQuotaController.java | 1 - .../springblade/desk/basic/controller/OemController.java | 1 - .../desk/basic/controller/ShiftsController.java | 2 -- .../desk/basic/controller/TeamSetController.java | 1 - .../java/org/springblade/desk/basic/mapper/OemMapper.java | 3 --- .../org/springblade/desk/basic/mapper/TeamSetMapper.java | 1 - .../springblade/desk/basic/mapper/WorkCenterMapper.java | 1 - .../org/springblade/desk/basic/service/IOemService.java | 2 -- .../desk/basic/service/impl/OemServiceImpl.java | 2 -- .../dashboard/controller/DsSimilarPartsController.java | 6 +----- .../desk/quality/controller/CycleTestController.java | 3 --- .../desk/quality/controller/IndicatorYearController.java | 3 --- .../quality/controller/LiquidTankReportController.java | 1 - .../springblade/desk/quality/controller/NgController.java | 2 -- .../quality/controller/ProReTemplateDetailController.java | 4 +--- .../quality/controller/ProReTemplateTankController.java | 4 +--- .../desk/quality/mapper/InspectionTemplateMapper.java | 1 - .../desk/quality/service/CycleTestService2.java | 3 --- .../desk/quality/service/IAuditFileService.java | 3 --- .../desk/quality/service/IInspectionTemplateService.java | 2 -- .../desk/quality/service/ILiquidTankReportService.java | 1 - .../desk/quality/service/ILiquidTankTaskCopyService.java | 1 - .../desk/quality/service/ILiquidTankTaskService.java | 1 - .../desk/quality/service/IProReTemplateService.java | 4 ---- .../desk/quality/service/IStandardService.java | 1 - .../desk/quality/service/LiquidTankTaskService222.java | 2 +- .../desk/quality/service/impl/AuditFileServiceImpl.java | 3 --- .../desk/quality/service/impl/CycleTestServiceImpl.java | 1 - .../service/impl/CycleTestStandardServiceImpl.java | 1 - .../service/impl/InspectionTemplateServiceImpl.java | 1 - .../service/impl/ProReTemplateDetailServiceImpl.java | 2 -- .../quality/service/impl/ProReTemplateServiceImpl.java | 8 -------- .../service/impl/ProReTemplateTankServiceImpl.java | 2 -- .../org/springblade/desk/quality/util/PowerJobUtil.java | 1 - 246 files changed, 8 insertions(+), 83 deletions(-) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/BatConfigDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/FormulaDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/ProcessAbilityDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/TeamSetDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/WorkCenterDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/dto/WorkTankDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/BatConfigVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/FormulaVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/ProcessAbilityVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/ProdMarkVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/basic/pojo/vo/WorkTankVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/AuditFileDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestItemDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestStandardDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestTaskDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorMonthDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDetailDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionItemDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionResultDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTaskDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTemplateDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/IotHardnessDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportConfigDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskHiDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankWaveDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/PlanTestDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDetailDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateTankDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/RelInsTemplateItemDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankReportItemDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankWaveItemDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/RemindMsgDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/StandardDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/StandardParamDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/SupplyInspectionDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestStandard.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorMonth.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYearDetail.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReport.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReportConfig.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskHi.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankWave.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankReportItem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankWaveItem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestBatUpdateCycle.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFilter.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java (97%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java (58%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateAdd.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java (94%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateUpdate.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/JobExt.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java (92%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestItemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestStandardVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java (95%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearDetailVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionResultVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java (92%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTemplateVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/IotHardnessVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportConfigVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskHiVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java (98%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/PlanTestVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateDetailVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/RelInsTemplateItemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankReportItemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankWaveItemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/StandardParamVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/StandardVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java (100%) rename {blade-service/blade-desk => blade-service-api/blade-desk-api}/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java (100%) diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index 6e04f3e3..ec72e80c 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -24,6 +24,10 @@ org.springblade blade-starter-excel + + org.springblade + blade-resource-api + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/BasicClazzDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BatConfigDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/BatConfigDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/BatConfigDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/BatConfigDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/CoatingThicknessDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/FormulaDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/FormulaDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/FormulaDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/FormulaDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/LocallyPlatedPartDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/MaterialQuotaDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/OemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlanAssignSteerDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/PlatingSmallDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ProcessAbilityDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ProcessAbilityDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ProcessAbilityDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ProcessAbilityDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ProdMarkDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/ShiftsDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/TeamSetDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/TeamSetDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/TeamSetDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/TeamSetDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/WorkCenterDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/WorkCenterDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/WorkCenterDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/WorkCenterDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/WorkTankDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/WorkTankDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/dto/WorkTankDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/dto/WorkTankDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BasicClazz.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/BatConfig.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/CoatingThickness.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Formula.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/LocallyPlatedPart.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/MaterialQuota.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Oem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlanAssignSteer.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Plating.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/PlatingSmall.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProcessAbility.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/ProdMark.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/Shifts.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/TeamSet.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkCenter.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/entity/WorkTank.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/request/OemSearch.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BaseEntityVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BasicClazzVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BatConfigVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BatConfigVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/BatConfigVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/BatConfigVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/CoatingThicknessVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/FormulaVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/FormulaVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/FormulaVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/FormulaVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/LocallyPlatedPartVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/MaterialQuotaVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/OemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlanAssignSteerVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingSmallVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/PlatingVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ProcessAbilityVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ProcessAbilityVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ProcessAbilityVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ProcessAbilityVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ProdMarkVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ProdMarkVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ProdMarkVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ProdMarkVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/ShiftsVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/TeamSetVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/WorkCenterVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/WorkTankVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/WorkTankVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/pojo/vo/WorkTankVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/WorkTankVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/AuditFileDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/AuditFileDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/AuditFileDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/AuditFileDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestStandardDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestStandardDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestStandardDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestStandardDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestTaskDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestTaskDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestTaskDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/CycleTestTaskDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorMonthDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorMonthDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorMonthDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorMonthDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDetailDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDetailDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDetailDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IndicatorYearDetailDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionResultDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionResultDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionResultDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionResultDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTaskDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTaskDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTaskDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTaskDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTemplateDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTemplateDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTemplateDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/InspectionTemplateDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IotHardnessDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotHardnessDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IotHardnessDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotHardnessDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportConfigDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportConfigDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportConfigDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportConfigDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankReportDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskCopyDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskHiDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskHiDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskHiDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankTaskHiDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankWaveDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankWaveDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankWaveDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/LiquidTankWaveDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/NgDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/PlanTestDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/PlanTestDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/PlanTestDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/PlanTestDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDetailDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDetailDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDetailDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateDetailDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateTankDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateTankDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateTankDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ProReTemplateTankDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelInsTemplateItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelInsTemplateItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelInsTemplateItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelInsTemplateItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankReportItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankReportItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankReportItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankReportItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankWaveItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankWaveItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankWaveItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RelTankWaveItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RemindMsgDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RemindMsgDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/RemindMsgDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/RemindMsgDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewDutyDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewFaultDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/ReviewSheetDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/StandardDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/StandardDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/StandardDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/StandardDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/StandardParamDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/StandardParamDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/StandardParamDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/StandardParamDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/SupplyInspectionDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/SupplyInspectionDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/SupplyInspectionDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/SupplyInspectionDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/WorkPlanItemDetailDTO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/package-info.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/AuditFile.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTest.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestStandard.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestStandard.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestStandard.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestStandard.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/CycleTestTask.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorMonth.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorMonth.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorMonth.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorMonth.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYear.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYearDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYearDetail.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYearDetail.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IndicatorYearDetail.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionResult.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTemplate.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotHardness.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTank.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReport.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReport.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReport.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReport.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReportConfig.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReportConfig.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReportConfig.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankReportConfig.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTask.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskCopy.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskHi.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskHi.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskHi.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankTaskHi.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankWave.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankWave.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankWave.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/LiquidTankWave.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Ng.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/PlanTest.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplate.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateDetail.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ProReTemplateTank.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelInsTemplateItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankReportItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankReportItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankReportItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankReportItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankWaveItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankWaveItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankWaveItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RelTankWaveItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/RemindMsg.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewDuty.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewFault.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/StandardParam.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceChain.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceEvent.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/TraceItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItemDetail.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/package-info.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/AuditFileSearch.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestBatUpdateCycle.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestBatUpdateCycle.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestBatUpdateCycle.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestBatUpdateCycle.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestItemSubmit.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestSubmit.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskAccept.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFillData.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFilter.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFilter.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFilter.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskFilter.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssue.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestTaskIssueBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/CycleTestUpdateUserBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskEditResult.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java similarity index 97% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java index ee801651..f1851ffe 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java @@ -6,7 +6,6 @@ import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.InspectionTask; import java.time.LocalDate; -import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java similarity index 58% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java index 8d84bfd0..773ea271 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java @@ -1,9 +1,5 @@ package org.springblade.desk.quality.pojo.request; -import org.springblade.desk.quality.pojo.entity.InspectionResult; - -import java.util.List; - public class InspectionTaskSubmit { /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateAdd.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateAdd.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateAdd.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateAdd.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java similarity index 94% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java index 81a587fd..62aca6d0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateSearch.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.InspectionTemplate; -import java.time.LocalDateTime; import java.util.Date; @Data diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateUpdate.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateUpdate.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateUpdate.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTemplateUpdate.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/JobExt.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/JobExt.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/JobExt.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/JobExt.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankSubmit.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskAccept.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskApproval.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskClose.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskCloseBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskEditDrug.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskException.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillData.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskFillDataBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskGenManual.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssue.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskIssueBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskReceiveDrug.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSendDrug.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankTaskSubmit.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/LiquidTankUpdateBat.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/NgSearch.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java similarity index 92% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java index 178c8ec1..69b44287 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/AuditFileVO.java @@ -6,7 +6,6 @@ package org.springblade.desk.quality.pojo.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; -import org.springblade.core.mp.base.BaseEntity; import org.springblade.desk.basic.pojo.vo.BaseEntityVO; import org.springblade.desk.quality.pojo.entity.AuditFile; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestStandardVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestStandardVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestStandardVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestStandardVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestTaskVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/CycleTestVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java similarity index 95% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java index 4af2161c..e9647fc7 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorMonthVO.java @@ -8,7 +8,6 @@ import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.IndicatorMonth; import java.io.Serial; -import java.util.List; /** * [月度指标] 视图实体类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearDetailVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearDetailVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IndicatorYearVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionResultVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionResultVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionResultVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionResultVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java similarity index 92% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java index 853db304..74c68865 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java @@ -3,7 +3,6 @@ */ package org.springblade.desk.quality.pojo.vo; -import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.InspectionTask; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTemplateVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTemplateVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTemplateVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTemplateVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IotHardnessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotHardnessVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IotHardnessVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotHardnessVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportConfigVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportConfigVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportConfigVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportConfigVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankReportVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskCopyVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskHiVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskHiVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskHiVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskHiVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java similarity index 98% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java index e3506146..f5a92141 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankTaskVO.java @@ -11,7 +11,6 @@ import org.springblade.desk.quality.pojo.entity.LiquidTankTask; import java.io.Serial; import java.time.LocalDate; -import java.time.LocalDateTime; /** * 视图实体类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveDrawVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/LiquidTankWaveVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/NgVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/PlanTestVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/PlanTestVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/PlanTestVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/PlanTestVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateDetailVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateDetailVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateTankVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ProReTemplateVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelInsTemplateItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelInsTemplateItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelInsTemplateItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelInsTemplateItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankReportItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankReportItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankReportItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankReportItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankWaveItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankWaveItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankWaveItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RelTankWaveItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewDutyVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewFaultVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/StandardParamVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/StandardParamVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/StandardParamVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/StandardParamVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/StandardVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/StandardVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/StandardVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/StandardVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/SupplyInspectionVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemDetailVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java similarity index 100% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java rename to blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/package-info.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java index 93f13d1b..1f718d0e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/FormulaController.java @@ -26,9 +26,7 @@ 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.basic.constant.BAModuleConst; -import org.springblade.desk.basic.constant.BasicClazzConst; import org.springblade.desk.basic.excel.FormulaExcel; -import org.springblade.desk.basic.pojo.entity.BasicClazz; import org.springblade.desk.basic.pojo.entity.Formula; import org.springblade.desk.basic.pojo.vo.FormulaVO; import org.springblade.desk.basic.service.IFormulaService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java index 2a33e127..ced140a1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/MaterialQuotaController.java @@ -28,7 +28,6 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.MaterialQuotaExcel; -import org.springblade.desk.basic.pojo.entity.Formula; import org.springblade.desk.basic.pojo.entity.MaterialQuota; import org.springblade.desk.basic.pojo.vo.MaterialQuotaVO; import org.springblade.desk.basic.service.IMaterialQuotaService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java index be4e8032..4b7adeaf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/OemController.java @@ -27,7 +27,6 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.basic.excel.OemExcel; -import org.springblade.desk.basic.pojo.entity.MaterialQuota; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java index 2cbca935..4e9c9883 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/ShiftsController.java @@ -26,9 +26,7 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.ShiftsExcel; -import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.entity.Shifts; -import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.ShiftsVO; import org.springblade.desk.basic.service.IShiftsService; import org.springblade.desk.basic.util.ExcelExtUtil; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java index e342e074..f9cef1c9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/controller/TeamSetController.java @@ -25,7 +25,6 @@ import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.constant.BAModuleConst; import org.springblade.desk.basic.excel.TeamSetExcel; -import org.springblade.desk.basic.pojo.entity.Shifts; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.vo.TeamSetVO; import org.springblade.desk.basic.service.ITeamSetService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java index 692c3739..72ae9820 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/OemMapper.java @@ -9,10 +9,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; -import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.quality.pojo.entity.AuditFile; -import org.springblade.desk.quality.pojo.request.AuditFileSearch; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java index d60e0d17..ab84e8f8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/TeamSetMapper.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.basic.excel.TeamSetExcel; -import org.springblade.desk.basic.mapper.en.EnBaseMapper; import org.springblade.desk.basic.pojo.entity.TeamSet; import org.springblade.desk.basic.pojo.vo.TeamSetVO; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java index d9424e25..583ab8b0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/WorkCenterMapper.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.basic.excel.WorkCenterExcel; -import org.springblade.desk.basic.mapper.en.EnBaseMapper; import org.springblade.desk.basic.pojo.entity.WorkCenter; import org.springblade.desk.basic.pojo.vo.WorkCenterVO; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java index 71b1c508..ceaf5592 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IOemService.java @@ -11,8 +11,6 @@ import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.pojo.entity.Oem; import org.springblade.desk.basic.pojo.request.OemSearch; import org.springblade.desk.basic.pojo.vo.OemVO; -import org.springblade.desk.quality.pojo.entity.AuditFile; -import org.springblade.desk.quality.pojo.request.AuditFileSearch; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java index 5fa344e8..a856665e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/OemServiceImpl.java @@ -5,14 +5,12 @@ package org.springblade.desk.basic.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; -import org.springblade.core.mp.support.Condition; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.excel.OemExcel; import org.springblade.desk.basic.mapper.OemMapper; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java index c76da256..c27bd77f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/dashboard/controller/DsSimilarPartsController.java @@ -34,7 +34,6 @@ import jakarta.validation.Valid; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; -import org.springblade.core.log.exception.ServiceException; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.annotation.IsAdmin; import org.springblade.core.mp.support.Condition; @@ -42,11 +41,9 @@ import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; -import org.springblade.desk.quality.pojo.entity.CycleTestItem; import org.springframework.core.io.Resource; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -58,10 +55,9 @@ import org.springblade.desk.dashboard.service.IDsSimilarPartsService; 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 java.util.stream.Collectors; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java index 58ec68d1..02b7a969 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/CycleTestController.java @@ -3,7 +3,6 @@ */ package org.springblade.desk.quality.controller; -import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; @@ -28,9 +27,7 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.CycleTestExcel; -import org.springblade.desk.quality.excel.CycleTestExcelImport; import org.springblade.desk.quality.pojo.entity.CycleTest; -import org.springblade.desk.quality.pojo.entity.CycleTestItem; import org.springblade.desk.quality.pojo.request.CycleTestBatUpdateCycle; import org.springblade.desk.quality.pojo.request.CycleTestSubmit; import org.springblade.desk.quality.pojo.vo.CycleTestVO; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java index 1c6b2578..e8e39a5b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IndicatorYearController.java @@ -28,11 +28,8 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.IndicatorYearExcel; -import org.springblade.desk.quality.pojo.entity.IndicatorMonth; import org.springblade.desk.quality.pojo.entity.IndicatorYear; import org.springblade.desk.quality.pojo.entity.IndicatorYearDetail; -import org.springblade.desk.quality.pojo.vo.IndicatorMonthVO; -import org.springblade.desk.quality.pojo.vo.IndicatorYearDetailVO; import org.springblade.desk.quality.pojo.vo.IndicatorYearVO; import org.springblade.desk.quality.service.IIndicatorYearDetailService; import org.springblade.desk.quality.service.IIndicatorYearService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java index e4e5e6b2..f4d8d143 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/LiquidTankReportController.java @@ -28,7 +28,6 @@ import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.LiquidTankReportExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankReport; -import org.springblade.desk.quality.pojo.entity.LiquidTankTaskCopy; import org.springblade.desk.quality.pojo.vo.LiquidTankReportVO; import org.springblade.desk.quality.service.ILiquidTankReportService; import org.springblade.desk.quality.wrapper.LiquidTankReportWrapper; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java index 0676f181..459dbe85 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/NgController.java @@ -28,8 +28,6 @@ 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.basic.util.ExcelExtUtil; -import org.springblade.desk.device.pojo.entity.MeasuringUpkeepEntity; -import org.springblade.desk.order.pojo.entity.YieldOrderCraft; import org.springblade.desk.quality.constant.NgConst; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.NgExcel; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java index 11b437f6..73501122 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateDetailController.java @@ -15,7 +15,6 @@ import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; 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; @@ -33,9 +32,8 @@ import org.springblade.desk.quality.excel.ProReTemplateDetailExcel; import org.springblade.desk.quality.wrapper.ProReTemplateDetailWrapper; import org.springblade.desk.quality.service.IProReTemplateDetailService; 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 java.util.stream.Collectors; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java index c231dbbb..b43c3987 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ProReTemplateTankController.java @@ -15,7 +15,6 @@ import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; 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; @@ -33,9 +32,8 @@ import org.springblade.desk.quality.excel.ProReTemplateTankExcel; import org.springblade.desk.quality.wrapper.ProReTemplateTankWrapper; import org.springblade.desk.quality.service.IProReTemplateTankService; 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 java.util.stream.Collectors; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.java index efee2bf0..8746aafe 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTemplateMapper.java @@ -13,7 +13,6 @@ import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO; import java.util.List; -import java.util.Map; /** * [检验模板] Mapper 接口 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java index e81c6322..1cc4076b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/CycleTestService2.java @@ -10,10 +10,8 @@ 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.springblade.desk.dashboard.service.IBsPlatingService; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.quality.constant.CycleTestTaskConst; -import org.springblade.desk.quality.constant.JobTypeConst; import org.springblade.desk.quality.mapper.CycleTestMapper; import org.springblade.desk.quality.pojo.entity.CycleTest; import org.springblade.desk.quality.pojo.entity.CycleTestItem; @@ -25,7 +23,6 @@ import org.springblade.desk.quality.pojo.vo.CycleTestStandardVO; import org.springblade.desk.quality.wrapper.CycleTestStandardWrapper; import org.springblade.desk.quality.wrapper.CycleTestWrapper; import org.springblade.resource.feign.IAttachClient; -import org.springblade.resource.pojo.entity.Attach; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.UserInfo; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java index 7ec3536f..bfeaad70 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IAuditFileService.java @@ -5,14 +5,11 @@ package org.springblade.desk.quality.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.pojo.entity.AuditFile; -import org.springblade.desk.quality.pojo.entity.InspectionTemplate; import org.springblade.desk.quality.pojo.request.AuditFileSearch; -import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTemplateService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTemplateService.java index 0782dd12..6c3c5e9c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTemplateService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTemplateService.java @@ -10,10 +10,8 @@ import org.springblade.desk.quality.excel.InspectionTemplateExcel; import org.springblade.desk.quality.pojo.entity.InspectionTemplate; import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO; -import org.springblade.desk.quality.pojo.vo.LiquidTankVO; import java.util.List; -import java.util.Map; /** * [检验模板] 服务类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java index 80d3b62c..c6a0ea1a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankReportService.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.quality.excel.LiquidTankReportExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankReport; -import org.springblade.desk.quality.pojo.vo.LiquidTankReportConfigVO; import org.springblade.desk.quality.pojo.vo.LiquidTankReportVO; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java index 4af52fa1..e3dafa3f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskCopyService.java @@ -11,7 +11,6 @@ import org.springblade.core.tool.api.R; import org.springblade.desk.quality.excel.LiquidTankTaskCopyExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankTaskCopy; import org.springblade.desk.quality.pojo.vo.LiquidTankTaskCopyVO; -import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO; import org.springframework.web.bind.annotation.RequestBody; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java index 7851c154..c5b58bd4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ILiquidTankTaskService.java @@ -10,7 +10,6 @@ import org.springblade.core.tool.api.R; import org.springblade.desk.quality.excel.LiquidTankTaskExcel; import org.springblade.desk.quality.pojo.entity.LiquidTankTask; import org.springblade.desk.quality.pojo.vo.LiquidTankTaskVO; -import org.springblade.desk.quality.pojo.vo.LiquidTankVO; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java index 89dc56ac..c3be1c49 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IProReTemplateService.java @@ -5,15 +5,11 @@ package org.springblade.desk.quality.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import io.swagger.v3.oas.annotations.Parameter; -import org.springblade.core.mp.base.BaseService; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.ProReTemplateExcel; import org.springblade.desk.quality.pojo.entity.ProReTemplate; -import org.springblade.desk.quality.pojo.vo.InspectionTemplateVO; import org.springblade.desk.quality.pojo.vo.ProReTemplateVO; -import org.springframework.web.bind.annotation.RequestParam; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java index a3c072da..c643c947 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IStandardService.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.quality.excel.StandardExcel; import org.springblade.desk.quality.pojo.entity.Standard; -import org.springblade.desk.quality.pojo.vo.LiquidTankVO; import org.springblade.desk.quality.pojo.vo.StandardVO; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService222.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService222.java index f35d8a9f..cbe23b25 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService222.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/LiquidTankTaskService222.java @@ -12,8 +12,8 @@ import org.springblade.desk.quality.mapper.LiquidTankMapper; import org.springblade.desk.quality.mapper.LiquidTankTaskMapper; import org.springblade.desk.quality.pojo.entity.LiquidTank; import org.springblade.desk.quality.pojo.entity.LiquidTankTask; -import org.springblade.desk.quality.pojo.request.*; import org.springblade.desk.basic.util.IdUtil; +import org.springblade.desk.quality.pojo.request.*; import org.springblade.system.feign.IUserClient; import org.springblade.system.pojo.entity.UserInfo; import org.springframework.stereotype.Service; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java index 1c0154f5..069ea2e9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/AuditFileServiceImpl.java @@ -11,16 +11,13 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; import org.springblade.desk.quality.constant.AuditFileConst; import org.springblade.desk.quality.excel.AuditFileExcel; import org.springblade.desk.quality.mapper.AuditFileMapper; import org.springblade.desk.quality.pojo.entity.AuditFile; -import org.springblade.desk.quality.pojo.entity.InspectionTemplate; import org.springblade.desk.quality.pojo.request.AuditFileSearch; -import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.AuditFileVO; import org.springblade.desk.quality.service.IAuditFileService; import org.springblade.system.feign.IDictClient; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java index a81fe509..32d1a3bf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestServiceImpl.java @@ -33,7 +33,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; import java.util.ArrayList; import java.util.List; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java index 4b147556..891c52e5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/CycleTestStandardServiceImpl.java @@ -15,7 +15,6 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.quality.excel.CycleTestStandardExcel; import org.springblade.desk.quality.mapper.CycleTestStandardMapper; -import org.springblade.desk.quality.pojo.entity.CycleTestItem; import org.springblade.desk.quality.pojo.entity.CycleTestStandard; import org.springblade.desk.quality.pojo.vo.CycleTestStandardVO; import org.springblade.desk.quality.service.ICycleTestStandardService; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTemplateServiceImpl.java index d34b779a..56d32152 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTemplateServiceImpl.java @@ -26,7 +26,6 @@ import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import java.util.List; -import java.util.Map; /** * [检验模板] 服务实现类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateDetailServiceImpl.java index 7bf92438..e16f4a16 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateDetailServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateDetailServiceImpl.java @@ -16,11 +16,9 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.quality.excel.ProReTemplateDetailExcel; import org.springblade.desk.quality.mapper.ProReTemplateDetailMapper; import org.springblade.desk.quality.pojo.entity.ProReTemplateDetail; -import org.springblade.desk.quality.pojo.entity.ProReTemplateTank; import org.springblade.desk.quality.pojo.vo.ProReTemplateDetailVO; import org.springblade.desk.quality.service.IProReTemplateDetailService; import org.springblade.desk.quality.wrapper.ProReTemplateDetailWrapper; -import org.springblade.desk.quality.wrapper.ProReTemplateTankWrapper; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java index 0cfc94d0..90d8ed63 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateServiceImpl.java @@ -11,11 +11,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; -import org.springblade.core.mp.base.BaseEntity; -import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.tool.api.R; -import org.springblade.desk.basic.pojo.vo.BaseEntityVO; import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; import org.springblade.desk.quality.constant.ProReTemplateConst; import org.springblade.desk.quality.excel.ProReTemplateExcel; @@ -31,13 +27,9 @@ import org.springblade.desk.basic.util.IdUtil; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.ISysClient; import org.springblade.system.feign.IUserClient; -import org.springblade.system.pojo.entity.Dept; -import org.springblade.system.pojo.entity.User; -import org.springblade.system.pojo.entity.UserInfo; import org.springframework.stereotype.Service; import java.util.*; -import java.util.stream.Collectors; /** * [过程记录模板] 服务实现类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateTankServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateTankServiceImpl.java index ab22ddac..c26f38f8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateTankServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ProReTemplateTankServiceImpl.java @@ -5,7 +5,6 @@ package org.springblade.desk.quality.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; @@ -24,7 +23,6 @@ import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; /** * [过程记录模板-槽-明细] 服务实现类 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java index aa26567d..bf333add 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/util/PowerJobUtil.java @@ -3,7 +3,6 @@ package org.springblade.desk.quality.util; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springblade.core.tool.api.R; -import org.springblade.desk.quality.constant.JobTypeConst; import org.springblade.desk.quality.pojo.request.JobExt; import java.util.Objects; From 2c2bb858b798b63cccd6f51121a4207cc3519e1c Mon Sep 17 00:00:00 2001 From: Tom Li Date: Thu, 8 Jan 2026 15:30:36 +0800 Subject: [PATCH 17/22] =?UTF-8?q?=E6=95=B4=E7=90=86mapper=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/request/InspectionTaskSearch.java | 2 + .../{CheckType.java => CheckWorkType.java} | 5 ++- .../controller/InspectionTaskController.java | 30 ++++++++------- .../mapper/CycleTestStandardMapper.xml | 3 +- .../mapper/IndicatorYearDetailMapper.xml | 16 +++++--- .../quality/mapper/InspectionItemMapper.xml | 16 +++++--- .../quality/mapper/InspectionResultMapper.xml | 16 +++++--- .../desk/quality/mapper/IotHardnessMapper.xml | 13 +++++-- .../quality/mapper/IotThicknessMapper.xml | 16 +++++--- .../desk/quality/mapper/LiquidTankMapper.xml | 10 +++-- .../desk/quality/mapper/PlanTestMapper.xml | 10 +++-- .../mapper/ProReTemplateDetailMapper.xml | 16 +++++--- .../mapper/ProReTemplateTankMapper.xml | 16 +++++--- .../desk/quality/mapper/RemindMsgMapper.xml | 10 +++-- .../desk/quality/mapper/ReviewDutyMapper.xml | 10 +++-- .../desk/quality/mapper/ReviewFaultMapper.xml | 13 +++++-- .../desk/quality/mapper/ReviewSheetMapper.xml | 13 +++++-- .../quality/mapper/StandardParamMapper.xml | 16 +++++--- .../quality/mapper/SupplyInspectionMapper.xml | 2 +- .../mapper/WorkPlanItemDetailMapper.xml | 16 +++++--- .../quality/mapper/WorkPlanItemMapper.xml | 16 +++++--- .../service/IInspectionTaskService.java | 37 +++++++++++-------- .../impl/InspectionTaskServiceImpl.java | 7 ++++ 23 files changed, 208 insertions(+), 101 deletions(-) rename blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/{CheckType.java => CheckWorkType.java} (69%) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java index f1851ffe..2869e294 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSearch.java @@ -39,4 +39,6 @@ public class InspectionTaskSearch extends InspectionTask { private LocalDate receiveDateStart; @Schema(description = "接收时间-结束") private LocalDate receiveDateEnd; + @Schema(description = "质量检验类型") + private Integer checkWorkType; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckType.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckWorkType.java similarity index 69% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckType.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckWorkType.java index 00e3dc0e..ad127aba 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckType.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/CheckWorkType.java @@ -1,6 +1,9 @@ package org.springblade.desk.quality.constant; -public interface CheckType { +/** + * 质检工作类型。 + */ +public interface CheckWorkType { /** * 热表 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index fe866737..acb0bdad 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -26,8 +26,10 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; import org.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.desk.quality.service.InspectionTaskService2; import org.springblade.desk.quality.wrapper.InspectionTaskWrapper; @@ -51,9 +53,9 @@ import java.util.Map; public class InspectionTaskController extends BladeController { @Resource - private IInspectionTaskService inspectionTaskGenService; + private IInspectionTaskService service; @Resource - private InspectionTaskService2 service; + private InspectionTaskService2 service2; /** * [检验任务] 详情 @@ -62,18 +64,20 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 1) @Operation(summary = "详情", description = "传入inspectionTask") public R detail(InspectionTask inspectionTask) { - InspectionTask detail = inspectionTaskGenService.getOne(Condition.getQueryWrapper(inspectionTask)); + InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask)); return R.data(InspectionTaskWrapper.build().entityVO(detail)); } /** * [检验任务] 分页 */ - @GetMapping("/list") + @PostMapping("/listTask") @ApiOperationSupport(order = 2) @Operation(summary = "分页", description = "传入inspectionTask") - public R> list(@Parameter(hidden = true) @RequestParam Map inspectionTask, Query query) { - IPage pages = inspectionTaskGenService.page(Condition.getPage(query), Condition.getQueryWrapper(inspectionTask, InspectionTask.class)); + public R> listTask( + @Parameter(hidden = true) @RequestParam InspectionTaskSearch search, Query query) { + IPage pages = service.listTask(Condition.getPage(query), qw); + ???? return R.data(InspectionTaskWrapper.build().pageVO(pages)); } @@ -85,7 +89,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 3) @Operation(summary = "分页", description = "传入inspectionTask") public R> page(InspectionTaskDetailVO inspectionTask, Query query) { - IPage pages = inspectionTaskGenService.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); + IPage pages = service.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); return R.data(pages); } @@ -96,7 +100,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 4) @Operation(summary = "新增", description = "传入inspectionTask") public R save(@Valid @RequestBody InspectionTask inspectionTask) { - return R.status(inspectionTaskGenService.save(inspectionTask)); + return R.status(service.save(inspectionTask)); } /** @@ -106,7 +110,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 5) @Operation(summary = "修改", description = "传入inspectionTask") public R update(@Valid @RequestBody InspectionTask inspectionTask) { - return R.status(inspectionTaskGenService.updateById(inspectionTask)); + return R.status(service.updateById(inspectionTask)); } /** @@ -116,7 +120,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 6) @Operation(summary = "新增或修改", description = "传入inspectionTask") public R submit(@Valid @RequestBody InspectionTask inspectionTask) { - return R.status(inspectionTaskGenService.saveOrUpdate(inspectionTask)); + return R.status(service.saveOrUpdate(inspectionTask)); } /** @@ -126,7 +130,7 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 7) @Operation(summary = "逻辑删除", description = "传入ids") public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(inspectionTaskGenService.deleteLogic(Func.toLongList(ids))); + return R.status(service.deleteLogic(Func.toLongList(ids))); } /** @@ -142,7 +146,7 @@ public class InspectionTaskController extends BladeController { // queryWrapper.lambda().eq(InspectionTask::getTenantId, bladeUser.getTenantId()); //} //queryWrapper.lambda().eq(InspectionTaskEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = inspectionTaskGenService.exportInspectionTask(queryWrapper); + List list = service.exportInspectionTask(queryWrapper); ExcelUtil.export(response, "[检验任务]数据" + DateUtil.time(), "[检验任务]数据表", list, InspectionTaskExcel.class); } @@ -155,6 +159,6 @@ public class InspectionTaskController extends BladeController { @ApiOperationSupport(order = 9) @Operation(summary = "", description = "传入inspectionTask") public R save(@Valid @RequestBody InspectionTaskStartNew start) { - return service.startNew(start); + return service2.startNew(start); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestStandardMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestStandardMapper.xml index d0fbcd77..8a58efa1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestStandardMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/CycleTestStandardMapper.xml @@ -4,7 +4,8 @@ - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IndicatorYearDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IndicatorYearDetailMapper.xml index 08038435..af226c01 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IndicatorYearDetailMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IndicatorYearDetailMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -12,10 +14,14 @@ - + SELECT * + FROM QA_INDICATOR_YEAR_DETAIL ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.xml index bc121284..7b7183b2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionItemMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -24,10 +26,14 @@ - + SELECT * + FROM QA_INSPECTION_ITEM ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionResultMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionResultMapper.xml index c602efe6..e30c5a02 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionResultMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionResultMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -23,10 +25,14 @@ - + SELECT * + FROM QA_INSPECTION_RESULT ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.xml index d8ce05a4..1f11d0dc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -17,10 +19,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml index e63aa6de..653c9a6e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -17,10 +19,14 @@ - + SELECT * + FROM QA_IOT_THICKNESS ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankMapper.xml index e4d45c86..28d23342 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/LiquidTankMapper.xml @@ -1,5 +1,6 @@ - + @@ -58,10 +59,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/PlanTestMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/PlanTestMapper.xml index 1ac0a75d..543fe787 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/PlanTestMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/PlanTestMapper.xml @@ -1,5 +1,6 @@ - + @@ -25,10 +26,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateDetailMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateDetailMapper.xml index 86704e55..54c52fd4 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateDetailMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateDetailMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -16,10 +18,14 @@ - + SELECT * + FROM QA_PRO_RE_TEMPLATE_DETAIL ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateTankMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateTankMapper.xml index 68f7091a..d443a5b1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateTankMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ProReTemplateTankMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -12,10 +14,14 @@ - + SELECT * + FROM QA_PRO_RE_TEMPLATE_TANK ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RemindMsgMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RemindMsgMapper.xml index 33deda73..19032093 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RemindMsgMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/RemindMsgMapper.xml @@ -1,5 +1,6 @@ - + @@ -26,10 +27,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml index 6af5e14f..f8e6c3cc 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewDutyMapper.xml @@ -1,5 +1,6 @@ - + @@ -15,10 +16,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml index 852c6f50..2effe1c1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewFaultMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -14,10 +16,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml index bf15a0bc..5d1e55b9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -44,10 +46,13 @@ diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardParamMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardParamMapper.xml index 8ccdb507..18a1e34b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardParamMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/StandardParamMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -30,10 +32,14 @@ - + SELECT * + FROM QA_STANDARD_PARAM ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/SupplyInspectionMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/SupplyInspectionMapper.xml index 7ad52e47..81150de8 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/SupplyInspectionMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/SupplyInspectionMapper.xml @@ -12,7 +12,7 @@ - + - SELECT * FROM QA_WORK_PLAN_ITEM_DETAIL WHERE is_deleted = 0 + SELECT * + FROM QA_WORK_PLAN_ITEM_DETAIL + WHERE is_deleted = 0 - + SELECT * + FROM QA_WORK_PLAN_ITEM_DETAIL ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml index 8abe8903..8945a7eb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/WorkPlanItemMapper.xml @@ -1,9 +1,11 @@ - + - + @@ -24,10 +26,14 @@ - + SELECT * + FROM QA_WORK_PLAN_ITEM ${ew.customSqlSegment} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java index 6c724cd9..130be04e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java @@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; import java.util.List; @@ -19,26 +21,29 @@ import java.util.List; * @since 2025-12-23 */ public interface IInspectionTaskService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param inspectionTask 查询参数 - * @return IPage - */ - IPage selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask); + /** + * 自定义分页 + * + * @param page 分页参数 + * @param inspectionTask 查询参数 + * @return IPage + */ + IPage selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask); - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportInspectionTask(Wrapper queryWrapper); + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportInspectionTask(Wrapper queryWrapper); /** * VO + * * @param vo */ - void setVOValue(InspectionTaskDetailVO vo); + void setVOValue(InspectionTaskDetailVO vo); + + List listTask(InspectionTaskSearch search); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index 61431ad4..845ce030 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -14,7 +14,9 @@ import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.mapper.InspectionTaskMapper; import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; import org.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; @@ -58,4 +60,9 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl listTask(InspectionTaskSearch search) { + return List.of(); + } } From 626531858d84f013c2485aae11d847d75fcd469e Mon Sep 17 00:00:00 2001 From: Tom Li Date: Fri, 9 Jan 2026 11:07:13 +0800 Subject: [PATCH 18/22] =?UTF-8?q?=E9=80=9A=E8=BF=87[=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=B8=AD=E5=BF=83]id=20=E6=9F=A5=E8=AF=A2=20=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=A7=BDList?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/basic/service/IWorkTankService.java | 7 ++++ .../service/impl/WorkTankServiceImpl.java | 40 +++++++++++++------ 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IWorkTankService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IWorkTankService.java index 068c8710..5501deb6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IWorkTankService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IWorkTankService.java @@ -35,4 +35,11 @@ public interface IWorkTankService extends BaseService { * @return List */ List exportWorkTank(Wrapper queryWrapper); + + /** + * 通过[作业中心]id 查询 作业槽List + * @param wcId + * @return + */ + List getListByWcId(Long wcId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/WorkTankServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/WorkTankServiceImpl.java index b5695424..8b4cdb59 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/WorkTankServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/WorkTankServiceImpl.java @@ -4,16 +4,21 @@ package org.springblade.desk.basic.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.common.constant.CommonConstant; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.mp.support.Condition; import org.springblade.desk.basic.excel.WorkTankExcel; import org.springblade.desk.basic.mapper.WorkTankMapper; import org.springblade.desk.basic.pojo.entity.WorkTank; import org.springblade.desk.basic.pojo.vo.WorkTankVO; import org.springblade.desk.basic.service.IWorkTankService; +import org.springblade.desk.order.pojo.entity.YieldOrderCraft; import org.springframework.stereotype.Service; import java.util.List; @@ -28,19 +33,28 @@ import java.util.List; @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) -public class WorkTankServiceImpl extends BaseServiceImpl implements IWorkTankService { +public class WorkTankServiceImpl extends BaseServiceImpl + implements IWorkTankService { - @Override - public IPage selectWorkTankPage(IPage page, WorkTankVO workTank) { - return page.setRecords(baseMapper.selectWorkTankPage(page, workTank)); - } + @Override + public IPage selectWorkTankPage(IPage page, WorkTankVO workTank) { + return page.setRecords(baseMapper.selectWorkTankPage(page, workTank)); + } - @Override - public List exportWorkTank(Wrapper queryWrapper) { - List workTankList = baseMapper.exportWorkTank(queryWrapper); - //workTankList.forEach(workTank -> { - // workTank.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkTank.getType())); - //}); - return workTankList; - } + @Override + public List exportWorkTank(Wrapper queryWrapper) { + List workTankList = baseMapper.exportWorkTank(queryWrapper); + //workTankList.forEach(workTank -> { + // workTank.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkTank.getType())); + //}); + return workTankList; + } + + @Override + public List getListByWcId(Long wcId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(WorkTank.class) + .eq(WorkTank::getWorkstationId, wcId) + .eq(WorkTank::getIsDeleted, CommonConstant.DELETE_FALSE); + return baseMapper.selectList(qw); + } } From bf9421931333577b6d2e456db1a2d0e1f47e9200 Mon Sep 17 00:00:00 2001 From: Tom Li Date: Fri, 9 Jan 2026 11:21:11 +0800 Subject: [PATCH 19/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E7=90=86?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/mapper/en/DeleteAbsoluteById.java | 36 +++++++++++++++++++ .../desk/basic/mapper/en/EnBaseMapper.java | 10 +++++- .../basic/mapper/en/EnCustomSqlInjector.java | 17 +++++++++ .../desk/basic/mapper/en/EnMyBatisConfig.java | 18 ++++++++++ 4 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/DeleteAbsoluteById.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnCustomSqlInjector.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnMyBatisConfig.java diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/DeleteAbsoluteById.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/DeleteAbsoluteById.java new file mode 100644 index 00000000..c4f4935f --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/DeleteAbsoluteById.java @@ -0,0 +1,36 @@ +package org.springblade.desk.basic.mapper.en; + +import com.baomidou.mybatisplus.core.enums.SqlMethod; +import com.baomidou.mybatisplus.core.injector.AbstractMethod; +import com.baomidou.mybatisplus.core.metadata.TableInfo; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.mapping.SqlSource; + +import java.beans.Introspector; + +/** + * deleteAbsoluteById + */ +public class DeleteAbsoluteById extends AbstractMethod { + + public DeleteAbsoluteById() { + this(Introspector.decapitalize(DeleteAbsoluteById.class.getSimpleName())); + } + + /** + * @param methodName 方法名 + * @since 3.5.0 + */ + protected DeleteAbsoluteById(String methodName) { + super(methodName); + } + + @Override + public MappedStatement injectMappedStatement(Class mapperClass, Class modelClass, TableInfo tableInfo) { + SqlMethod sqlMethod = SqlMethod.DELETE_BY_ID; + String sql = String.format(sqlMethod.getSql(), tableInfo.getTableName(), tableInfo.getKeyColumn(), + tableInfo.getKeyProperty()); + SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, Object.class); + return this.addDeleteMappedStatement(mapperClass, methodName, sqlSource); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java index 510a3c05..7d7df382 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java @@ -3,11 +3,19 @@ package org.springblade.desk.basic.mapper.en; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.springblade.core.mp.base.BaseEntity; +import java.io.Serializable; + /** * Enhance MyBatis Plus BaseMapper. * * @param */ public interface EnBaseMapper extends BaseMapper { - + + /** + * 根据 ID 物理删除 + * @param id + * @return + */ + int deleteAbsoluteById(Serializable id); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnCustomSqlInjector.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnCustomSqlInjector.java new file mode 100644 index 00000000..d42486f6 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnCustomSqlInjector.java @@ -0,0 +1,17 @@ +package org.springblade.desk.basic.mapper.en; + +import com.baomidou.mybatisplus.core.injector.AbstractMethod; +import com.baomidou.mybatisplus.core.injector.DefaultSqlInjector; +import com.baomidou.mybatisplus.core.metadata.TableInfo; + +import java.util.List; + +public class EnCustomSqlInjector extends DefaultSqlInjector { + + @Override + public List getMethodList(Class mapperClass, TableInfo tableInfo) { + List methodList = super.getMethodList(mapperClass, tableInfo); + methodList.add(new DeleteAbsoluteById()); + return methodList; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnMyBatisConfig.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnMyBatisConfig.java new file mode 100644 index 00000000..1678e3fa --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnMyBatisConfig.java @@ -0,0 +1,18 @@ +package org.springblade.desk.basic.mapper.en; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class EnMyBatisConfig { + + /** + * 注册自定义SQL注入器 + * + * @return + */ + @Bean + public EnCustomSqlInjector customSqlInjector() { + return new EnCustomSqlInjector(); + } +} From 407e58ccef420de53d4347029376fdf6a8620b6c Mon Sep 17 00:00:00 2001 From: Tom Li Date: Fri, 9 Jan 2026 11:27:48 +0800 Subject: [PATCH 20/22] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=A9=E7=90=86?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9B=B8=E5=85=B3=E6=96=B9=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springblade/desk/basic/mapper/en/DeleteAbsoluteById.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/DeleteAbsoluteById.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/DeleteAbsoluteById.java index c4f4935f..f448f6f2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/DeleteAbsoluteById.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/DeleteAbsoluteById.java @@ -9,7 +9,7 @@ import org.apache.ibatis.mapping.SqlSource; import java.beans.Introspector; /** - * deleteAbsoluteById + * deleteAbsoluteById 方法 */ public class DeleteAbsoluteById extends AbstractMethod { From b90ad7f9c4f6b8585a5425df14e24c65d4605adc Mon Sep 17 00:00:00 2001 From: Tom Li Date: Fri, 9 Jan 2026 11:36:41 +0800 Subject: [PATCH 21/22] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../quality/pojo/dto/IotThicknessDTO.java | 2 +- .../quality/pojo/entity/InspectionTask.java | 13 ++- .../quality/pojo/entity/IotThickness.java | 2 +- .../desk/quality/pojo/entity/ReviewSheet.java | 4 +- .../quality/pojo/entity/WorkPlanItem.java | 6 +- .../desk/quality/pojo/vo/IotThicknessVO.java | 2 +- .../desk/basic/util/StatusCountMap.java | 38 +++++++ .../quality/constant/InspectionItemConst.java | 14 +++ .../quality/constant/InspectionTaskConst.java | 8 +- .../controller/InspectionTaskController.java | 34 ++++-- .../InspectionTemplateController.java | 1 + .../controller/IotThicknessController.java | 36 +++---- .../controller/ReviewDutyController.java | 3 +- .../controller/ReviewFaultController.java | 3 +- .../controller/ReviewSheetController.java | 3 +- .../quality/controller/TestController.java | 10 ++ .../controller/WorkPlanItemController.java | 3 +- .../WorkPlanItemDetailController.java | 3 +- .../desk/quality/feign/IotHardnessClient.java | 4 +- .../quality/mapper/InspectionTaskMapper.java | 36 ++++--- .../quality/mapper/InspectionTaskMapper.xml | 35 ++++++ .../quality/mapper/IotHardnessMapper.java | 3 +- .../quality/mapper/IotThicknessMapper.java | 2 +- .../desk/quality/mapper/ReviewSheetMapper.xml | 2 +- .../service/IInspectionTaskService.java | 9 +- .../quality/service/IIotHardnessService.java | 42 +++++--- .../service/IIotHardnessSubService.java | 24 +++++ .../quality/service/IIotThicknessService.java | 2 +- .../quality/service/IWorkPlanItemService.java | 4 + .../quality/service/IotHardnessService2.java | 62 ----------- .../service/IotHardnessSubService2.java | 30 ------ .../impl/InspectionTaskServiceImpl.java | 74 ++++++++++--- .../service/impl/IotHardnessServiceImpl.java | 100 +++++++++++++++--- .../impl/IotHardnessSubServiceImpl.java | 17 +++ .../service/impl/IotThicknessServiceImpl.java | 2 +- .../service/impl/WorkPlanItemServiceImpl.java | 50 ++++++--- .../quality/wrapper/IotThicknessWrapper.java | 2 +- 37 files changed, 461 insertions(+), 224 deletions(-) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/StatusCountMap.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotHardnessSubService.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessService2.java delete mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessSubService2.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotHardnessSubServiceImpl.java diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java index b8a8286f..c21009c1 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/dto/IotThicknessDTO.java @@ -10,7 +10,7 @@ import org.springblade.desk.quality.pojo.entity.IotThickness; import java.io.Serial; /** - * [IOT硬度] 数据传输对象实体类 + * [IOT厚度] 数据传输对象实体类 * * @author Tom Shuo * @since 2025-12-23 diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java index 6961090a..bdec13ed 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java @@ -100,7 +100,7 @@ public class InspectionTask extends BaseEntity { */ public static final String COL_SIMPLE_COUNT = "SIMPLE_COUNT"; /** - * 检验结果-[1]:合格;[2]:不合格;[-1]:NA + * 检验结果-[0]:未检验;[1]:合格;[2]:不合格;[-1]:NA */ public static final String COL_CHECK_RESULT = "CHECK_RESULT"; /** @@ -151,6 +151,10 @@ public class InspectionTask extends BaseEntity { * [作业计划]id */ public static final String COL_WP_ID = "WP_ID"; + /** + * 来源类型 + */ + public static final String COL_FROM_TYPE = "FROM_TYPE"; /** * [检验任务]编码 @@ -245,7 +249,7 @@ public class InspectionTask extends BaseEntity { /** * 检验结果-[1]:合格;[2]:不合格;[3]:NA */ - @Schema(description = "检验结果-[1]:合格;[2]:不合格;[-1]:NA") + @Schema(description = "检验结果-[0]:未检验;[1]:合格;[2]:不合格;[-1]:NA") private Integer checkResult; /** * 检验数量 @@ -307,4 +311,9 @@ public class InspectionTask extends BaseEntity { */ @Schema(description = "[作业计划]id") private Long wpId; + /** + * 来源类型 + */ + @Schema(description = "来源类型") + private Integer fromType; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java index 55da8d76..fb1b95a5 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; /** - * [IOT硬度] 实体类 + * [IOT厚度] 实体类 * * @author Tom Shuo * @since 2025-12-23 diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java index 6a5cb806..bfa4cc21 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java @@ -158,7 +158,7 @@ public class ReviewSheet extends BaseEntity { /** * 总数量 */ - public static final String COL_NUM = "NUM"; + public static final String COL_TOTAL_NUM = "TOTAL_NUM"; /** * 返修数量 */ @@ -340,7 +340,7 @@ public class ReviewSheet extends BaseEntity { * 总数量 */ @Schema(description = "总数量") - private Short num; + private Short totalNum; /** * 返修数量 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java index 618dd7f3..133157b6 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java @@ -68,7 +68,7 @@ public class WorkPlanItem extends BaseEntity { */ public static final String COL_CHECK_DATE = "CHECK_DATE"; /** - * 检验结果-[1]:合格;[2]:不合格;[-1]:NA + * 检验结果-[0]:未检验;[1]:合格;[2]:不合格;[-1]:NA */ public static final String COL_CHECK_RESULT = "CHECK_RESULT"; /** @@ -149,8 +149,8 @@ public class WorkPlanItem extends BaseEntity { /** * 检验结果-[1]:合格;[2]:不合格;[-1]:NA */ - @Schema(description = "检验结果-[1]:合格;[2]:不合格;[-1]:NA") - private Short checkResult; + @Schema(description = "检验结果-[0]:未检验;[1]:合格;[2]:不合格;[-1]:NA") + private Integer checkResult; /** * 工时定额 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java index 99a7ae28..7c6dacd8 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/IotThicknessVO.java @@ -10,7 +10,7 @@ import org.springblade.desk.quality.pojo.entity.IotThickness; import java.io.Serial; /** - * [IOT硬度] 视图实体类 + * [IOT厚度] 视图实体类 * * @author Tom Shuo * @since 2025-12-23 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/StatusCountMap.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/StatusCountMap.java new file mode 100644 index 00000000..88424719 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/StatusCountMap.java @@ -0,0 +1,38 @@ +package org.springblade.desk.basic.util; + +import lombok.Getter; + +import java.util.HashMap; +import java.util.Map; + +/** + * + */ +@Getter +public class StatusCountMap { + + private Map map = new HashMap<>(); + + private static final Integer COUNT_DEFAULT = 0; + + /** + * 状态加一 + * + * @param status + * @return + */ + public int add1(Integer status) { + int newCount = map.getOrDefault(status, 0); + newCount = newCount + 1; + map.put(status, newCount); + return map.get(status); + } + + public void clear(Integer status) { + map.put(status, 0); + } + + public int get(Integer status) { + return map.getOrDefault(status, 0); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java new file mode 100644 index 00000000..ffc7bed8 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java @@ -0,0 +1,14 @@ +package org.springblade.desk.quality.constant; + +public interface InspectionItemConst { + + /** + * 测厚 + */ + Long ITEM_CEHOU_ID = 1L; + + /** + * 测硬 + */ + Long ITEM_CEYING_ID = 2L; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java index 9b1f1a9a..6dec351e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java @@ -15,7 +15,11 @@ public interface InspectionTaskConst { /** * 未检验 */ - Integer CHECK_RESULT_NOT = -1; + Integer CHECK_RESULT_TODO = 0; + /** + * NA + */ + Integer CHECK_RESULT_NA = -1; /** * 合格 */ @@ -24,4 +28,6 @@ public interface InspectionTaskConst { * 不合格 */ Integer CHECK_RESULT_NO = 2; + + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index acb0bdad..9ef2609e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -40,6 +40,7 @@ import java.util.Map; /** * [检验任务] 控制器 + * 工序级的检验任务 * mes v1: rb_pr_work_check * * @author Tom Shuo @@ -71,17 +72,15 @@ public class InspectionTaskController extends BladeController { /** * [检验任务] 分页 */ - @PostMapping("/listTask") + @PostMapping("/listSearch") @ApiOperationSupport(order = 2) @Operation(summary = "分页", description = "传入inspectionTask") - public R> listTask( - @Parameter(hidden = true) @RequestParam InspectionTaskSearch search, Query query) { - IPage pages = service.listTask(Condition.getPage(query), qw); - ???? - return R.data(InspectionTaskWrapper.build().pageVO(pages)); + public R> listSearch( + @Parameter(hidden = true) @RequestParam(required = false) InspectionTaskSearch search, Query query) { + IPage pagesVO = service.listSearch(Condition.getPage(query), search); + return R.data(pagesVO); } - /** * [检验任务] 自定义分页 */ @@ -136,7 +135,6 @@ public class InspectionTaskController extends BladeController { /** * 导出数据 */ - @IsAdmin @GetMapping("/export-inspectionTask") @ApiOperationSupport(order = 8) @Operation(summary = "导出数据", description = "传入inspectionTask") @@ -161,4 +159,24 @@ public class InspectionTaskController extends BladeController { public R save(@Valid @RequestBody InspectionTaskStartNew start) { return service2.startNew(start); } + + /** + * [检验任务] 同槽 检验结果应用 + */ + @GetMapping("/sameTankResultCopy") + @ApiOperationSupport(order = 101) + @Operation(summary = "同槽结果应用", description = "传入inspectionTask id") + public R sameTankResultCopy(@Parameter(hidden = true) @RequestParam Long id) { + return null; + } + + /** + * [检验任务] 同炉 检验结果应用 + */ + @GetMapping("/sameFurnaceResultCopy") + @ApiOperationSupport(order = 102) + @Operation(summary = "同槽结果应用", description = "传入inspectionTask id") + public R sameFurnaceResultCopy(@Parameter(hidden = true) @RequestParam Long id) { + return null; + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java index 2e5b06d8..92462e53 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTemplateController.java @@ -113,6 +113,7 @@ public class InspectionTemplateController extends BladeController { if (map.containsKey(BaseRequest.UPDATE_USER_REAL_NAME)) { search.setUpdateUserRealName((String) map.get(BaseRequest.UPDATE_USER_REAL_NAME)); } + // todo: // if (map.containsKey(BaseRequest.UP_TIME_START) && map.containsKey(BaseRequest.UP_TIME_END)) { Date upStart = RequestUtil.buildDateBeginOfDay(map, BaseRequest.UPDATE_TIME_START); Date upEnd = RequestUtil.buildDateEndOfDay(map, BaseRequest.UPDATE_TIME_END); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java index 070b87ee..a8958773 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/IotThicknessController.java @@ -40,7 +40,7 @@ import java.util.Map; import java.util.stream.Collectors; /** - * [IOT硬度] 控制器 + * [IOT厚度] 控制器 * * @author Tom Shuo * @since 2025-12-23 @@ -51,14 +51,14 @@ import java.util.stream.Collectors; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -@Tag(name = "[IOT硬度]", description = "[IOT硬度]接口") +@Tag(name = "[IOT厚度]", description = "[IOT厚度]接口") public class IotThicknessController extends BladeController { @Resource private IIotThicknessService service; /** - * [IOT硬度] 详情 + * [IOT厚度] 详情 */ @GetMapping("/detail") @ApiOperationSupport(order = 10) @@ -72,7 +72,7 @@ public class IotThicknessController extends BladeController { } /** - * [IOT硬度] list分页 + * [IOT厚度] list分页 */ @GetMapping("/list") @ApiOperationSupport(order = 20) @@ -91,7 +91,7 @@ public class IotThicknessController extends BladeController { /** - * [IOT硬度] page分页 + * [IOT厚度] page分页 */ @GetMapping("/page") @ApiOperationSupport(order = 21) @@ -104,7 +104,7 @@ public class IotThicknessController extends BladeController { } /** - * [IOT硬度] list下拉选择 + * [IOT厚度] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) @@ -116,7 +116,7 @@ public class IotThicknessController extends BladeController { } /** - * [IOT硬度] 新增一条 + * [IOT厚度] 新增一条 */ @PostMapping("/save") @ApiOperationSupport(order = 30) @@ -127,7 +127,7 @@ public class IotThicknessController extends BladeController { } /** - * [IOT硬度] 新增批量 + * [IOT厚度] 新增批量 */ @PostMapping("/saveBat") @ApiOperationSupport(order = 31) @@ -140,7 +140,7 @@ public class IotThicknessController extends BladeController { } /** - * [IOT硬度] 修改一条 + * [IOT厚度] 修改一条 */ @PostMapping("/update") @ApiOperationSupport(order = 40) @@ -150,7 +150,7 @@ public class IotThicknessController extends BladeController { } /** - * [IOT硬度] 修改批量 + * [IOT厚度] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) @@ -160,7 +160,7 @@ public class IotThicknessController extends BladeController { } /** - * [IOT硬度] 新增或修改一条 + * [IOT厚度] 新增或修改一条 */ @PostMapping("/submit") @ApiOperationSupport(order = 50) @@ -170,7 +170,7 @@ public class IotThicknessController extends BladeController { } /** - * [IOT硬度] 新增或修改批量 + * [IOT厚度] 新增或修改批量 */ @PostMapping("/submitBat") @ApiOperationSupport(order = 51) @@ -180,7 +180,7 @@ public class IotThicknessController extends BladeController { } /** - * [IOT硬度] 逻辑删除 + * [IOT厚度] 逻辑删除 */ @PostMapping("/remove") @ApiOperationSupport(order = 61) @@ -190,7 +190,7 @@ public class IotThicknessController extends BladeController { } /** - * [IOT硬度] 导出Excel + * [IOT厚度] 导出Excel */ @GetMapping("/exportExcel") @ApiOperationSupport(order = 70) @@ -203,12 +203,12 @@ public class IotThicknessController extends BladeController { //} //queryWrapper.lambda().eq(IotThicknessEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); List list = service.exportIotThickness(qw); - ExcelUtil.export(response, "[IOT硬度]数据" + DateUtil.time(), - "[IOT硬度]数据表", list, IotThicknessExcel.class); + ExcelUtil.export(response, "[IOT厚度]数据" + DateUtil.time(), + "[IOT厚度]数据表", list, IotThicknessExcel.class); } /** - * [IOT硬度] 下载Excel模板 + * [IOT厚度] 下载Excel模板 */ @GetMapping("/downloadExcelTemplate") @ApiOperationSupport(order = 71) @@ -220,7 +220,7 @@ public class IotThicknessController extends BladeController { } /** - * [IOT硬度] 导入Excel + * [IOT厚度] 导入Excel */ @PostMapping("/importExcel") @ApiOperationSupport(order = 72) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewDutyController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewDutyController.java index 4a01a98e..e30074c1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewDutyController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewDutyController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.ReviewDutyExcel; import org.springblade.desk.quality.pojo.entity.ReviewDuty; import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2026-01-06 */ @RestController -@RequestMapping("/ReviewDuty") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/ReviewDuty") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewFaultController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewFaultController.java index 582675bf..d46835d2 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewFaultController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewFaultController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.ReviewFaultExcel; import org.springblade.desk.quality.pojo.entity.ReviewFault; import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2026-01-06 */ @RestController -@RequestMapping("/ReviewFault") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/ReviewFault") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java index c4af8c40..e40f4b73 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.ReviewSheetExcel; import org.springblade.desk.quality.pojo.entity.ReviewSheet; import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2026-01-06 */ @RestController -@RequestMapping("/ReviewSheet") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/ReviewSheet") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java index cd708be6..2552adf5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/TestController.java @@ -10,6 +10,7 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.api.R; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.service.CycleTestTaskService2; +import org.springblade.desk.quality.service.IIotHardnessService; import org.springblade.desk.quality.service.TestService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -27,6 +28,8 @@ public class TestController extends BladeController { private TestService service; @Resource private CycleTestTaskService2 taskService2; + @Resource + private IIotHardnessService iIotHardnessService; // /** // * [] 详情 @@ -65,4 +68,11 @@ public class TestController extends BladeController { service.test1(); return R.success(); } + + @GetMapping("/test5") + @ApiOperationSupport(order = 5) + public R test5() { + iIotHardnessService.testDeleteDemo(); + return R.success(); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemController.java index 851db1d0..0cb9c2d9 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.WorkPlanItemExcel; import org.springblade.desk.quality.pojo.entity.WorkPlanItem; import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2026-01-06 */ @RestController -@RequestMapping("/WorkPlanItem") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/WorkPlanItem") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemDetailController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemDetailController.java index c9123893..fc7038db 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemDetailController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/WorkPlanItemDetailController.java @@ -25,6 +25,7 @@ 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.basic.util.ExcelExtUtil; +import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.WorkPlanItemDetailExcel; import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; @@ -45,7 +46,7 @@ import java.util.stream.Collectors; * @since 2026-01-06 */ @RestController -@RequestMapping("/WorkPlanItemDetail") +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/WorkPlanItemDetail") @Data @AllArgsConstructor @EqualsAndHashCode(callSuper = true) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/IotHardnessClient.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/IotHardnessClient.java index 6238f87f..52797d16 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/IotHardnessClient.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/feign/IotHardnessClient.java @@ -2,7 +2,7 @@ package org.springblade.desk.quality.feign; import io.swagger.v3.oas.annotations.Hidden; import jakarta.annotation.Resource; -import org.springblade.desk.quality.service.IotHardnessService2; +import org.springblade.desk.quality.service.IIotHardnessService; import org.springframework.web.bind.annotation.RestController; @RestController @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController; public class IotHardnessClient implements IIotHardnessClient { @Resource - private IotHardnessService2 service; + private IIotHardnessService service; @Override public Integer deleteHistory() { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java index 7b12f30f..6f854bfb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java @@ -9,7 +9,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.ibatis.annotations.Param; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; +import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; import java.util.List; @@ -21,20 +24,23 @@ import java.util.List; */ public interface InspectionTaskMapper extends BaseMapper { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param inspectionTask 查询参数 - * @return List - */ - List selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask); + /** + * 自定义分页 + * + * @param page 分页参数 + * @param inspectionTask 查询参数 + * @return List + */ + List selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask); - /** - * 获取导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportInspectionTask(@Param("ew") Wrapper queryWrapper); + /** + * 获取导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportInspectionTask(@Param("ew") Wrapper queryWrapper); + + + List listSearch(IPage page, @Param("q") InspectionTaskSearch search); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml index 54405acb..265df068 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml @@ -8,6 +8,7 @@ type="org.springblade.desk.quality.pojo.entity.InspectionTask"> + @@ -18,6 +19,12 @@ + + + + + + @@ -37,6 +44,7 @@ + + + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.java index b621d359..5e0770ea 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotHardnessMapper.java @@ -7,6 +7,7 @@ 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.basic.mapper.en.EnBaseMapper; import org.springblade.desk.quality.excel.IotHardnessExcel; import org.springblade.desk.quality.pojo.entity.IotHardness; import org.springblade.desk.quality.pojo.vo.IotHardnessVO; @@ -19,7 +20,7 @@ import java.util.List; * @author Tom Shuo * @since 2025-12-23 */ -public interface IotHardnessMapper extends BaseMapper { +public interface IotHardnessMapper extends EnBaseMapper { /** * 自定义分页 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.java index 5f134a00..38fd5479 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/IotThicknessMapper.java @@ -14,7 +14,7 @@ import org.springblade.desk.quality.pojo.vo.IotThicknessVO; import java.util.List; /** - * [IOT硬度] Mapper 接口 + * [IOT厚度] Mapper 接口 * * @author Tom Shuo * @since 2025-12-23 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml index 5d1e55b9..4f308b51 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -38,7 +38,7 @@ - + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java index 130be04e..f911a723 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java @@ -6,8 +6,10 @@ package org.springblade.desk.quality.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; +import org.springblade.core.mp.support.Query; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.entity.InspectionTemplate; import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; @@ -28,7 +30,8 @@ public interface IInspectionTaskService extends BaseService { * @param inspectionTask 查询参数 * @return IPage */ - IPage selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask); + IPage selectInspectionTaskPage(IPage page, + InspectionTaskDetailVO inspectionTask); /** * 导出数据 @@ -45,5 +48,7 @@ public interface IInspectionTaskService extends BaseService { */ void setVOValue(InspectionTaskDetailVO vo); - List listTask(InspectionTaskSearch search); + IPage listSearch(IPage page, InspectionTaskSearch search); + + Integer refreshStatusAndQty(Long id); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotHardnessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotHardnessService.java index 0067c78c..6bbb0310 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotHardnessService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotHardnessService.java @@ -19,26 +19,34 @@ import java.util.List; * @since 2025-12-23 */ public interface IIotHardnessService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param iotHardness 查询参数 - * @return IPage - */ - IPage selectIotHardnessPage(IPage page, IotHardnessVO iotHardness); - - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportIotHardness(Wrapper queryWrapper); + /** + * 自定义分页 + * + * @param page 分页参数 + * @param iotHardness 查询参数 + * @return IPage + */ + IPage selectIotHardnessPage(IPage page, IotHardnessVO iotHardness); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportIotHardness(Wrapper queryWrapper); /** * VO + * * @param vo */ - void setVOValue(IotHardnessVO vo); + void setVOValue(IotHardnessVO vo); + + + Integer deleteHistory(); + + Integer deleteHistoryOneBatch(List ids); + + void testDeleteDemo(); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotHardnessSubService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotHardnessSubService.java new file mode 100644 index 00000000..61ccde40 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotHardnessSubService.java @@ -0,0 +1,24 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.service; + +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.IotHardnessExcel; +import org.springblade.desk.quality.pojo.entity.IotHardness; +import org.springblade.desk.quality.pojo.vo.IotHardnessVO; + +import java.util.List; + +/** + * [IOT硬度] 服务类 + * + * @author Tom Shuo + * @since 2025-12-23 + */ +public interface IIotHardnessSubService extends BaseService { + + Integer deleteHistoryOneBatch(List ids); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotThicknessService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotThicknessService.java index 9204a51c..7d7afdd0 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotThicknessService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IIotThicknessService.java @@ -13,7 +13,7 @@ import org.springblade.desk.quality.pojo.vo.IotThicknessVO; import java.util.List; /** - * [IOT硬度] 服务类 + * [IOT厚度] 服务类 * * @author Tom Shuo * @since 2025-12-23 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java index a4c6e35b..f42b33ce 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java @@ -41,4 +41,8 @@ public interface IWorkPlanItemService extends BaseService { * @param vo */ void setVOValue(WorkPlanItemVO vo); + + List listByTaskId(Long taskId); + + List listByWorkPlanId(Long workPlanId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessService2.java deleted file mode 100644 index 89d24ec2..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessService2.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.springblade.desk.quality.service; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import jakarta.annotation.Resource; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springblade.desk.basic.constant.BaseCol; -import org.springblade.desk.quality.mapper.IotHardnessMapper; -import org.springblade.desk.quality.pojo.entity.IotHardness; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.util.List; - -@Service -@Data -@Slf4j -public class IotHardnessService2 { - - public static final Integer BATCH_SIZE = 1000; - - @Resource - private IotHardnessMapper genMapper; - @Resource - private IotHardnessSubService2 deleteService; - - /** - * 物理删除历史数据 - * - * @return - */ - public Integer deleteHistory() { - LocalDateTime day7ago = LocalDateTime.now().minusDays(7); - QueryWrapper qw = new QueryWrapper<>(); - qw.lt(BaseCol.CREATE_TIME, day7ago); - qw.select(BaseCol.ID); - List list = genMapper.selectList(qw); - if (list.isEmpty()) { - log.info("没有超过七天的删除数据。"); - return 0; - } - int totalDeleted = 0; - int currentPage = 1; - while (true) { - IPage page = new Page<>(currentPage, BATCH_SIZE); - IPage resultPage = genMapper.selectPage(page, qw); - List currentBatch = resultPage.getRecords(); - if (currentBatch.isEmpty()) { - break; - } - List ids = list.stream() - .map(IotHardness::getId) - .toList(); - int deletedCount = deleteService.deleteHistoryOneBatch(ids); - totalDeleted = totalDeleted + deletedCount; - currentPage = currentPage + 1; - } - return totalDeleted; - } -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessSubService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessSubService2.java deleted file mode 100644 index 53a1d041..00000000 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IotHardnessSubService2.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.springblade.desk.quality.service; - -import jakarta.annotation.Resource; -import lombok.Data; -import lombok.extern.slf4j.Slf4j; -import org.springblade.desk.quality.mapper.IotHardnessMapper; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; - -@Service -@Data -@Slf4j -public class IotHardnessSubService2 { - - @Resource - private IotHardnessMapper genMapper; - - /** - * 分批独立事务。 - * - * @param ids - * @return - */ - @Transactional(rollbackFor = Exception.class) - public Integer deleteHistoryOneBatch(List ids) { - return genMapper.deleteByIds(ids); - } -} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java index 845ce030..d82ec8df 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionTaskServiceImpl.java @@ -11,18 +11,25 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.util.StatusCountMap; +import org.springblade.desk.quality.constant.InspectionTaskConst; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.mapper.InspectionTaskMapper; +import org.springblade.desk.quality.pojo.entity.InspectionItem; import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; import org.springblade.desk.quality.service.IInspectionTaskService; +import org.springblade.desk.quality.service.IWorkPlanItemService; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * [检验任务] 服务实现类 @@ -35,34 +42,69 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -public class InspectionTaskServiceImpl extends BaseServiceImpl implements IInspectionTaskService { +public class InspectionTaskServiceImpl extends BaseServiceImpl + implements IInspectionTaskService { @Resource private IUserClient userClient; @Resource private IDictClient dictClient; + @Resource + private IWorkPlanItemService workPlanItemService; - @Override - public IPage selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask) { - return page.setRecords(baseMapper.selectInspectionTaskPage(page, inspectionTask)); - } + @Override + public IPage selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask) { + return page.setRecords(baseMapper.selectInspectionTaskPage(page, inspectionTask)); + } - @Override - public List exportInspectionTask(Wrapper queryWrapper) { - List inspectionTaskList = baseMapper.exportInspectionTask(queryWrapper); - //inspectionTaskList.forEach(inspectionTask -> { - // inspectionTask.setTypeName(DictCache.getValue(DictEnum.YES_NO, InspectionTask.getType())); - //}); - return inspectionTaskList; - } + @Override + public List exportInspectionTask(Wrapper queryWrapper) { + List inspectionTaskList = baseMapper.exportInspectionTask(queryWrapper); + //inspectionTaskList.forEach(inspectionTask -> { + // inspectionTask.setTypeName(DictCache.getValue(DictEnum.YES_NO, InspectionTask.getType())); + //}); + return inspectionTaskList; + } - @Override + @Override public void setVOValue(InspectionTaskDetailVO vo) { } @Override - public List listTask(InspectionTaskSearch search) { - return List.of(); + public IPage listSearch(IPage page, InspectionTaskSearch search) { + return page.setRecords(baseMapper.listSearch(page, search)); + } + + @Override + public Integer refreshStatusAndQty(Long id) { + InspectionTask task = getById(id); + if (null == task) { + throw new IllegalArgumentException("error id!"); + } + List itemList = workPlanItemService.listByTaskId(id); + StatusCountMap map = new StatusCountMap(); + int taskStatus = InspectionTaskConst.CHECK_RESULT_TODO; + for (WorkPlanItem item : itemList) { + map.add1(item.getStatus()); + } + int countToDo = map.getMap().get(InspectionTaskConst.CHECK_RESULT_TODO); + int countNA = map.getMap().get(InspectionTaskConst.CHECK_RESULT_NA); + int countOK = map.getMap().get(InspectionTaskConst.CHECK_RESULT_OK); + int countNO = map.getMap().get(InspectionTaskConst.CHECK_RESULT_NO); + // taskStatus 处理 + if (countToDo == 0) { // 未检验为0 + if (countOK == itemList.size()) { // 全部item 合格 + taskStatus = InspectionTaskConst.CHECK_RESULT_OK; + } else if (countNA == itemList.size()) { // 全部item NA + taskStatus = InspectionTaskConst.CHECK_RESULT_NA; + } else { + taskStatus = InspectionTaskConst.CHECK_RESULT_NO; + } + } + task.setStatus(taskStatus); + // 保存最新状态 + save(task); + return taskStatus; } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotHardnessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotHardnessServiceImpl.java index d1f07e50..439f91ee 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotHardnessServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotHardnessServiceImpl.java @@ -4,13 +4,16 @@ package org.springblade.desk.quality.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.constant.BaseCol; import org.springblade.desk.quality.excel.IotHardnessExcel; import org.springblade.desk.quality.mapper.IotHardnessMapper; import org.springblade.desk.quality.pojo.entity.IotHardness; @@ -18,8 +21,11 @@ import org.springblade.desk.quality.pojo.vo.IotHardnessVO; import org.springblade.desk.quality.service.IIotHardnessService; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.time.LocalDateTime; import java.util.List; /** @@ -33,29 +39,91 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -public class IotHardnessServiceImpl extends BaseServiceImpl implements IIotHardnessService { +public class IotHardnessServiceImpl extends BaseServiceImpl + implements IIotHardnessService { + + @Resource + private IotHardnessMapper mapper; + +// @Lazy +// @Resource +// private IIotHardnessService self; @Resource private IUserClient userClient; @Resource private IDictClient dictClient; - @Override - public IPage selectIotHardnessPage(IPage page, IotHardnessVO iotHardness) { - return page.setRecords(baseMapper.selectIotHardnessPage(page, iotHardness)); - } - - @Override - public List exportIotHardness(Wrapper queryWrapper) { - List iotHardnessList = baseMapper.exportIotHardness(queryWrapper); - //iotHardnessList.forEach(iotHardness -> { - // iotHardness.setTypeName(DictCache.getValue(DictEnum.YES_NO, IotHardness.getType())); - //}); - return iotHardnessList; - } - - @Override + + @Override + public IPage selectIotHardnessPage(IPage page, IotHardnessVO iotHardness) { + return page.setRecords(mapper.selectIotHardnessPage(page, iotHardness)); + } + + @Override + public List exportIotHardness(Wrapper queryWrapper) { + List iotHardnessList = mapper.exportIotHardness(queryWrapper); + //iotHardnessList.forEach(iotHardness -> { + // iotHardness.setTypeName(DictCache.getValue(DictEnum.YES_NO, IotHardness.getType())); + //}); + return iotHardnessList; + } + + @Override public void setVOValue(IotHardnessVO vo) { } + + public static final Integer BATCH_SIZE = 1000; + + /** + * 物理删除历史数据 + * + * @return + */ + @Override + public Integer deleteHistory() { + LocalDateTime day7ago = LocalDateTime.now().minusDays(7); + QueryWrapper qw = new QueryWrapper<>(); + qw.lt(BaseCol.CREATE_TIME, day7ago); + qw.select(BaseCol.ID); + List list = mapper.selectList(qw); + if (list.isEmpty()) { + log.info("没有超过七天的删除数据。"); + return 0; + } + int totalDeleted = 0; + int currentPage = 1; + while (true) { + IPage page = new Page<>(currentPage, BATCH_SIZE); + IPage resultPage = mapper.selectPage(page, qw); + List currentBatch = resultPage.getRecords(); + if (currentBatch.isEmpty()) { + break; + } + List ids = list.stream() + .map(IotHardness::getId) + .toList(); +// int deletedCount = self.deleteHistoryOneBatch(ids); +// totalDeleted = totalDeleted + deletedCount; +// currentPage = currentPage + 1; + } + return totalDeleted; + } + + /** + * 分批独立事务。 + * + * @param ids + * @return + */ + @Transactional(rollbackFor = Exception.class) + public Integer deleteHistoryOneBatch(List ids) { + return mapper.deleteByIds(ids); + } + + @Override + public void testDeleteDemo() { + mapper.deleteAbsoluteById(1L); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotHardnessSubServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotHardnessSubServiceImpl.java new file mode 100644 index 00000000..e13ab224 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotHardnessSubServiceImpl.java @@ -0,0 +1,17 @@ +package org.springblade.desk.quality.service.impl; + +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.quality.mapper.IotHardnessMapper; +import org.springblade.desk.quality.pojo.entity.IotHardness; +import org.springblade.desk.quality.service.IIotHardnessSubService; + +import java.util.List; + +public class IotHardnessSubServiceImpl extends BaseServiceImpl + implements IIotHardnessSubService { + + @Override + public Integer deleteHistoryOneBatch(List ids) { + return 0; + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotThicknessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotThicknessServiceImpl.java index 95d1a32a..dba54c09 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotThicknessServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotThicknessServiceImpl.java @@ -23,7 +23,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * [IOT硬度] 服务实现类 + * [IOT厚度] 服务实现类 * * @author Tom Shuo * @since 2025-12-23 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java index 3577e21a..12cd9c09 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java @@ -4,13 +4,16 @@ package org.springblade.desk.quality.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.core.mp.support.Condition; import org.springblade.desk.quality.excel.WorkPlanItemExcel; import org.springblade.desk.quality.mapper.WorkPlanItemMapper; import org.springblade.desk.quality.pojo.entity.WorkPlanItem; @@ -33,29 +36,44 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -public class WorkPlanItemServiceImpl extends BaseServiceImpl implements IWorkPlanItemService { +public class WorkPlanItemServiceImpl extends BaseServiceImpl + implements IWorkPlanItemService { @Resource private IUserClient userClient; @Resource private IDictClient dictClient; - @Override - public IPage selectWorkPlanItemPage(IPage page, WorkPlanItemVO workPlanItem) { - return page.setRecords(baseMapper.selectWorkPlanItemPage(page, workPlanItem)); - } - - @Override - public List exportWorkPlanItem(Wrapper queryWrapper) { - List workPlanItemList = baseMapper.exportWorkPlanItem(queryWrapper); - //workPlanItemList.forEach(workPlanItem -> { - // workPlanItem.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkPlanItem.getType())); - //}); - return workPlanItemList; - } - - @Override + @Override + public IPage selectWorkPlanItemPage(IPage page, WorkPlanItemVO workPlanItem) { + return page.setRecords(baseMapper.selectWorkPlanItemPage(page, workPlanItem)); + } + + @Override + public List exportWorkPlanItem(Wrapper queryWrapper) { + List workPlanItemList = baseMapper.exportWorkPlanItem(queryWrapper); + //workPlanItemList.forEach(workPlanItem -> { + // workPlanItem.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkPlanItem.getType())); + //}); + return workPlanItemList; + } + + @Override public void setVOValue(WorkPlanItemVO vo) { } + + @Override + public List listByTaskId(Long taskId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(WorkPlanItem::getTaskId, taskId); + return list(qw); + } + + @Override + public List listByWorkPlanId(Long wpId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(WorkPlanItem::getWpId, wpId); + return list(qw); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/IotThicknessWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/IotThicknessWrapper.java index bfbca869..4e28d5ea 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/IotThicknessWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/IotThicknessWrapper.java @@ -11,7 +11,7 @@ import org.springblade.desk.quality.pojo.vo.IotThicknessVO; import java.util.Objects; /** - * [IOT硬度] 包装类,返回视图层所需的字段 + * [IOT厚度] 包装类,返回视图层所需的字段 * * @author Tom Shuo * @since 2025-12-23 From 902d227e3111742cbb8d74f88fa0a2e46a11e15c Mon Sep 17 00:00:00 2001 From: Tom Li Date: Mon, 12 Jan 2026 11:28:25 +0800 Subject: [PATCH 22/22] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-service-api/blade-desk-api/pom.xml | 7 + .../common/model/dto/ErpReviewDutyDto.java | 71 ++ .../common/model/dto/ErpReviewFaultDto.java | 65 ++ .../common/model/dto/ErpReviewSheetDto.java | 138 ++++ .../desk/oldv1/constant/Constant.java | 23 + .../desk/oldv1/pojo/ResultInfo.java | 284 ++++++++ .../quality/pojo/entity/InspectionItem.java | 9 + .../quality/pojo/entity/InspectionTask.java | 19 +- .../quality/pojo/entity/IotThickness.java | 6 +- .../desk/quality/pojo/entity/ReviewSheet.java | 610 +++++++++--------- .../desk/quality/pojo/entity/Standard.java | 10 + .../quality/pojo/entity/SupplyInspection.java | 9 + .../quality/pojo/entity/WorkPlanItem.java | 10 +- .../pojo/request/InspectionTaskStartNew.java | 7 +- .../pojo/request/InspectionTaskSubmit.java | 9 - .../request/InspectionTaskSubmitCheck.java | 12 + .../pojo/vo/InspectionTaskDetailVO.java | 7 + .../quality/pojo/vo/InspectionTaskListVO.java | 27 + .../quality/pojo/vo/PpmReportDetailModel.java | 154 +++++ .../pojo/vo/PrintChildReviewSheet.java | 52 ++ .../desk/quality/pojo/vo/QAPrWorkOrderVO.java | 4 +- .../desk/quality/pojo/vo/QAPrWorkPlanVO.java | 9 +- .../desk/quality/pojo/vo/RemindMsgVO.java | 16 +- .../desk/quality/pojo/vo/ReviewSheetVO.java | 10 + .../desk/quality/pojo/vo/WorkPlanItemVO.java | 13 +- .../desk/basic/constant/BaseCol.java | 39 +- .../desk/basic/mapper/en/EnBaseMapper.java | 20 +- .../basic/mapper/en/EnCustomSqlInjector.java | 5 +- .../desk/basic/mapper/en/EnMethodConst.java | 24 + .../desk/basic/mapper/en/EnMyBatisConfig.java | 10 +- .../mapper/en/method/PhysicalDelete.java | 36 ++ .../en/method/PhysicalDeleteBatchByIds.java | 43 ++ .../PhysicalDeleteById.java} | 31 +- .../mapper/en/method/PhysicalDeleteByMap.java | 36 ++ .../desk/basic/service/IWorkTankService.java | 34 +- .../springblade/desk/basic/util/IdUtil.java | 3 +- .../quality/constant/InspectionItemConst.java | 10 +- .../quality/constant/InspectionTaskConst.java | 12 +- .../quality/constant/ReviewSheetConst.java | 68 ++ .../controller/InspectionTaskController.java | 41 +- .../controller/RemindMsgController.java | 1 + .../controller/ReviewRemoteController.java | 99 +++ .../controller/ReviewSheetController.java | 369 ++++++----- .../SupplyInspectionRemoteController.java | 52 ++ .../quality/mapper/InspectionTaskMapper.java | 3 +- .../quality/mapper/InspectionTaskMapper.xml | 25 +- .../desk/quality/mapper/ReviewSheetMapper.xml | 1 + .../desk/quality/mapper/StandardMapper.xml | 3 + .../service/IInspectionItemService.java | 8 + .../service/IInspectionTaskService.java | 64 +- .../quality/service/IReviewDutyService.java | 45 +- .../quality/service/IReviewFaultService.java | 44 +- .../quality/service/IReviewSheetService.java | 127 +++- .../service/IReviewSheetSubService.java | 9 + .../service/ISupplyInspectionService.java | 2 + .../service/IWorkPlanItemDetailService.java | 35 +- .../quality/service/IWorkPlanItemService.java | 4 +- .../service/InspectionTaskService2.java | 40 +- .../impl/InspectionItemServiceImpl.java | 5 + .../impl/InspectionTaskServiceImpl.java | 220 ++++++- .../service/impl/IotHardnessServiceImpl.java | 5 +- .../service/impl/RemindMsgServiceImpl.java | 42 +- .../service/impl/ReviewDutyServiceImpl.java | 45 +- .../service/impl/ReviewFaultServiceImpl.java | 15 +- .../service/impl/ReviewSheetServiceImpl.java | 155 ++++- .../impl/ReviewSheetSubServiceImpl.java | 29 + .../impl/SupplyInspectionServiceImpl.java | 42 +- .../impl/WorkPlanItemDetailServiceImpl.java | 49 +- .../service/impl/WorkPlanItemServiceImpl.java | 58 +- ....java => InspectionTaskDetailWrapper.java} | 6 +- .../wrapper/InspectionTaskListWrapper.java | 37 ++ 71 files changed, 2833 insertions(+), 799 deletions(-) create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewDutyDto.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewFaultDto.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewSheetDto.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/constant/Constant.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/pojo/ResultInfo.java delete mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmitCheck.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/PpmReportDetailModel.java create mode 100644 blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/PrintChildReviewSheet.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnMethodConst.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDelete.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDeleteBatchByIds.java rename blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/{DeleteAbsoluteById.java => method/PhysicalDeleteById.java} (51%) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDeleteByMap.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewRemoteController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/SupplyInspectionRemoteController.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetSubService.java create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetSubServiceImpl.java rename blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/{InspectionTaskWrapper.java => InspectionTaskDetailWrapper.java} (82%) create mode 100644 blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskListWrapper.java diff --git a/blade-service-api/blade-desk-api/pom.xml b/blade-service-api/blade-desk-api/pom.xml index ec72e80c..a47cc24d 100644 --- a/blade-service-api/blade-desk-api/pom.xml +++ b/blade-service-api/blade-desk-api/pom.xml @@ -28,6 +28,13 @@ org.springblade blade-resource-api + + + + com.alibaba + fastjson + 1.2.83 + diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewDutyDto.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewDutyDto.java new file mode 100644 index 00000000..32670d1a --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewDutyDto.java @@ -0,0 +1,71 @@ +package org.springblade.desk.oldv1.common.model.dto; + +import lombok.Data; + +/** + *

Description: 审理单责任零件

+ * + * @author lyj + * @date 2023-02-10 17:09 + */ +@Data +public class ErpReviewDutyDto { + + /** + * 审理单Id + */ + private String trialId; + + /** + * 序号 + */ + private String trialSeq; + + /** + * 物料号 + */ + private String mdsItemCode; + + /** + * 批次号 + */ + private String batchNo; + + /** + * 相关物料号 + */ + private String corrMdsItemCode; + + /** + * 相关批次号 + */ + private String corrBatchNo; + + /** + * 备注 + */ + private String note; + + /** + * 数量 + */ + private Integer reqQty; + + /** + * 单位 + */ + private String unit; + + public ErpReviewDutyDto(String trialId, String trialSeq, String mdsItemCode, String batchNo, String corrMdsItemCode, + String corrBatchNo, String note, Integer reqQty, String unit) { + this.trialId = trialId; + this.trialSeq = trialSeq; + this.mdsItemCode = mdsItemCode; + this.batchNo = batchNo; + this.corrMdsItemCode = corrMdsItemCode; + this.corrBatchNo = corrBatchNo; + this.note = note; + this.reqQty = reqQty; + this.unit = unit; + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewFaultDto.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewFaultDto.java new file mode 100644 index 00000000..dc32c757 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewFaultDto.java @@ -0,0 +1,65 @@ +package org.springblade.desk.oldv1.common.model.dto; + +import lombok.Data; + +/** + *

Description: 审理单问题故障

+ * + * @author lyj + * @date 2023-02-10 17:10 + */ +@Data +public class ErpReviewFaultDto { + + /** + * 审理单Id + */ + private String trialId; + + /** + * 序号 + */ + private String trialSeq; + + /** + * 故障类别 + */ + private String faultType; + + /** + * 问题大类 + */ + private String questClass; + + /** + * 问题小类 + */ + private String questSubclass; + + /** + * 比例 + */ + private String proportion; + + /** + * 数量 + */ + private Integer faultQty; + + /** + * 描述 + */ + private String describe; + + public ErpReviewFaultDto(String trialId, String trialSeq, String faultType, String questClass, String questSubclass, + String proportion, Integer faultQty, String describe) { + this.trialId = trialId; + this.trialSeq = trialSeq; + this.faultType = faultType; + this.questClass = questClass; + this.questSubclass = questSubclass; + this.proportion = proportion; + this.faultQty = faultQty; + this.describe = describe; + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewSheetDto.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewSheetDto.java new file mode 100644 index 00000000..9aa14b42 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/common/model/dto/ErpReviewSheetDto.java @@ -0,0 +1,138 @@ +package org.springblade.desk.oldv1.common.model.dto; + +import lombok.Data; + +/** + *

Description: 审理单主表

+ * + * @author lyj + * @date 2023-02-10 14:10 + */ +@Data +public class ErpReviewSheetDto { + + /** + * 批次号 + */ + private String batchNo; + + /** + * 车间订单号/外协交件号.业务号 + */ + private String businessNo; + + /** + * 检验员编码 + */ + private String checkUserCode; + + /** + * 物料编码 + */ + private String mdsItemCode; + + /** + * 物料名称 + */ + private String mdsItemName; + + /** + * 质量等级 + */ + private String levels; + + /** + * 发现部门 + */ + private String findWorkShop; + + /** + * 是否质量问题 + */ + private Boolean qualityquestion; + + /** + * 审理单状态 + */ + private String trialStatus = "21"; + + /** + * 总数量 + */ + private Double needQty; + + /** + * 上级编号 + */ + private String preCode; + + /** + * 比例 + */ + private String proporTion; + + /** + * 不合格数量 + */ + private Integer subQty; + + /** + * 简单原因 + */ + private String easyReason; + + /** + * 处置单类型（1-零件模式/2-装配模式/5-售后模式） + */ + private String trialType; + + /** + * 工序号 + */ + private String seqNo; + /** + * 工序名称 + */ + private String seqName; + + /** + * 发现人 + */ + private String findUserCode; + /** + * 处置单类型（1-提交质保/2-提交工艺/3-提交设计） + */ + private String hearDis; + /** + * 检验时间 + */ + private String checkDate; + + public ErpReviewSheetDto(String batchNo, String businessNo, String checkUserCode, String easyReason, String levels, + String mdsItemCode, String mdsItemName, Double needQty, String preCode, String proporTion, + Boolean qualityquestion, Integer subQty, String trialType, String seqNo, String seqName, String findUserCode, String hearDis) { //, String checkDate + this.batchNo = batchNo; + this.businessNo = businessNo; + this.checkUserCode = checkUserCode; + this.easyReason = easyReason; + this.findWorkShop = "3400"; + this.levels = levels; + this.mdsItemCode = mdsItemCode; + this.mdsItemName = mdsItemName; + this.needQty = needQty; + this.preCode = preCode; + this.proporTion = proporTion; + this.qualityquestion = qualityquestion; + this.subQty = subQty; + this.trialType = trialType; + this.hearDis = hearDis; + this.seqNo = seqNo; + this.seqName = seqName; + this.findUserCode = findUserCode; +// this.checkDate = checkDate; + } + + public ErpReviewSheetDto() { + + } +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/constant/Constant.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/constant/Constant.java new file mode 100644 index 00000000..a64dd99c --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/constant/Constant.java @@ -0,0 +1,23 @@ +package org.springblade.desk.oldv1.constant; + +/** + * copy from + * com.videasoft.webframework.model.Constant; + */ +public class Constant { + + public static final String LOGIN_INFO = "loginInfo"; + public static final String CONTEXT_ERROR = "contextError"; + public static final String LIMITS = "limit"; + public static final String MENUS = "menu"; + public static final String WEBAPI_REQUEST_PARAMETERS = "webapi_request_parameters"; + public static final String JASPER_HEAD_DATA = "jasper_head_data"; + public static final String CUSTOMER_LOGO_FILE_NAME = "customer_logo"; + public static final String JASPER_COMPANY_INFO = "companyInfo"; + public static final String READ_HEADER_KEY = "x-tsessid"; + public static final String WRITE_HEADER_KEY = "tsessid"; + public static final String ACCESS_CONTROL_EXPOSE_HEADER = "Access-Control-Expose-Headers"; + public static final String HEADER_TOKEN = "token"; + public static final String HEADER_UC_TOKEN = "uc-token"; + public static final String TENANT_ID = "tenant-id"; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/pojo/ResultInfo.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/pojo/ResultInfo.java new file mode 100644 index 00000000..ff6603d1 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/oldv1/pojo/ResultInfo.java @@ -0,0 +1,284 @@ +package org.springblade.desk.oldv1.pojo; + +import java.io.Serializable; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.annotation.JSONField; +import com.alibaba.fastjson.serializer.PropertyPreFilter; +import com.alibaba.fastjson.serializer.SimplePropertyPreFilter; + +/** + * copy from + * com.videasoft.webframework.common.model.ResultInfo + */ +public class ResultInfo implements Serializable { + private static final long serialVersionUID = -2024858098559225464L; + private int code; + private String message; + private Object data; + @JSONField(serialize = false) + private String i18n; + @JSONField(serialize = false) + private Object[] i18nParams; + @JSONField(serialize = false) + private String language; + private Map, PropertyPreFilter> propertyPreFilterMap; + public static final int OK = 0; + public static final int ERROR = -1; + public static final int MODULE_ACCESS = 999; + public static final int SESSION_INVALID = 998; + public static final int RESULT_CODE_10001 = 10001; + public static final int RESULT_CODE_10002 = 10002; + public static final int RESULT_CODE_10003 = 10003; + public static final int RESULT_CODE_10004 = 10004; + public static final int RESULT_CODE_10005 = 10005; + + public ResultInfo() { + this.propertyPreFilterMap = new HashMap(); + this.code = 0; + } + + private ResultInfo(Object data) { + this(); + this.data = data; + } + + private ResultInfo(int code, String message) { + this.propertyPreFilterMap = new HashMap(); + this.message = message; + this.code = code; + } + + private ResultInfo(int code, String i18n, Object[] i18nParams) { + this.propertyPreFilterMap = new HashMap(); + this.code = code; + this.i18n = i18n; + this.i18nParams = i18nParams; + } + + private ResultInfo(int code, String i18n, Object[] i18nParams, String language) { + this.propertyPreFilterMap = new HashMap(); + this.code = code; + this.i18n = i18n; + this.i18nParams = i18nParams; + this.language = language; + } + + public String getMessage() { + return this.message; + } + + public void setMessage(String message) { + this.message = message; + } + + public int getCode() { + return this.code; + } + + public void setCode(int code) { + this.code = code; + } + + public Object getData() { + return this.data; + } + + public void setData(Object data) { + this.data = data; + } + + @JSONField(serialize = false) + public boolean isOk() { + return 0 == this.code; + } + + @JSONField(serialize = false) + public boolean isError() { + return 0 != this.code; + } + + public String getI18n() { + return this.i18n; + } + + public Object[] getI18nParams() { + return this.i18nParams; + } + + public String getLanguage() { + return this.language; + } + + public void setLanguage(String language) { + this.language = language; + } + + public static ResultInfo ok() { + return new ResultInfo(); + } + + public static ResultInfo ok(Object data) { + return new ResultInfo(data); + } + + public static ResultInfo ok(String i18n, Object[] i18nParams) { + return new ResultInfo(0, i18n, i18nParams); + } + + public static ResultInfo ok(String i18n, Object[] i18nParams, String language) { + return new ResultInfo(0, i18n, i18nParams, language); + } + + public static ResultInfo ok(Object data, String i18n, Object[] i18nParams) { + ResultInfo resultInfo = new ResultInfo(0, i18n, i18nParams); + resultInfo.setData(data); + return resultInfo; + } + + public static ResultInfo ok(Object data, String i18n, Object[] i18nParams, String language) { + ResultInfo resultInfo = new ResultInfo(0, i18n, i18nParams, language); + resultInfo.setData(data); + return resultInfo; + } + + public static ResultInfo error(int code, String message) { + return new ResultInfo(code, message); + } + + public static ResultInfo error(int code, String i18n, Object[] i18nParams) { + return new ResultInfo(code, i18n, i18nParams); + } + + public static ResultInfo error(int code, String i18n, Object[] i18nParams, String language) { + return new ResultInfo(code, i18n, i18nParams, language); + } + + public static ResultInfo error(String message) { + return error(-1, message); + } + + public static ResultInfo error(String i18n, Object[] i18nParams, String language) { + return error(-1, i18n, i18nParams, language); + } + + public static ResultInfo error(String i18n, Object[] i18nParams) { + return error(-1, i18n, i18nParams); + } + + public static ResultInfo parse(String json) { + if (json != null && json.trim().length() != 0) { + JSONObject jobj = JSONObject.parseObject(json); + if (jobj == null) { + return null; + } else if (!jobj.containsKey("code")) { + return null; + } else { + ResultInfo rtn = new ResultInfo(); + rtn.setCode(jobj.getIntValue("code")); + rtn.setMessage(jobj.getString("message")); + rtn.setData(jobj.get("data")); + return rtn; + } + } else { + return null; + } + } + + @JSONField(serialize = false) + public Map, PropertyPreFilter> getPropertyPreFilters() { + return this.propertyPreFilterMap; + } + + public ResultInfo addInclude(Class cls, String... properties) { + SimplePropertyPreFilter sp = null; + Class subCls = null; + String fieldName = null; + + for (String item : properties) { + if (item != null) { + fieldName = item; + int dotIndex = item.indexOf("."); + if (dotIndex > 0) { + fieldName = item.substring(0, dotIndex); + subCls = this.getFeildClass(cls, fieldName); + this.addInclude(subCls, item.substring(dotIndex + 1)); + } + + sp = (SimplePropertyPreFilter) this.propertyPreFilterMap.get(cls); + if (sp == null) { + sp = new SimplePropertyPreFilter(cls, new String[0]); + this.propertyPreFilterMap.put(cls, sp); + } + + sp.getIncludes().add(fieldName); + } + } + + return this; + } + + public ResultInfo addExclude(Class cls, String... properties) { + SimplePropertyPreFilter sp = null; + + for (String item : properties) { + String fieldName = null; + Class objCls = cls; + if (item != null) { + fieldName = item; + int dotIndex = item.lastIndexOf("."); + if (dotIndex > 0) { + fieldName = item.substring(dotIndex + 1); + objCls = this.getFeildClass(cls, item.substring(0, dotIndex)); + } + + sp = (SimplePropertyPreFilter) this.propertyPreFilterMap.get(objCls); + if (sp == null) { + sp = new SimplePropertyPreFilter(objCls, new String[0]); + this.propertyPreFilterMap.put(objCls, sp); + } + + sp.getExcludes().add(fieldName); + } + } + + return this; + } + + private Class getFeildClass(Class objCls, String f) { + Class cls = null; + String ff = f; + String lf = null; + if (objCls == null) { + return null; + } else { + int dotIndex = f.indexOf("."); + if (dotIndex > 0) { + ff = f.substring(0, dotIndex); + lf = f.substring(dotIndex + 1); + } + + try { + String getterName = "get" + ff.substring(0, 1).toUpperCase() + (ff.length() == 1 ? "" : ff.substring(1)); + cls = objCls.getDeclaredMethod(getterName, (Class[]) null).getReturnType(); + if (lf != null) { + return this.getFeildClass(cls, lf); + } + } catch (NoSuchMethodException e) { + e.printStackTrace(); + } catch (SecurityException e) { + e.printStackTrace(); + } + + return cls; + } + } + + public String toString() { + return "ResultInfo{code=" + this.code + ", message='" + this.message + '\'' + ", data=" + this.data + ", i18n='" + this.i18n + '\'' + ", i18nParams=" + Arrays.toString(this.i18nParams) + ", language='" + this.language + '\'' + '}'; + } +} + diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java index a1dd0d2a..7299304e 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionItem.java @@ -95,6 +95,10 @@ public class InspectionItem extends BaseEntity { * [检验项目]编码 */ public static final String COL_CODE = "CODE"; + /** + * 特殊类型-[1]:测厚;[2]:测硬;[3]:尺寸; + */ + public static final String COL_SPECIAL_TYPE = "SPECIAL_TYPE"; /** * [检验项目]类型 @@ -181,4 +185,9 @@ public class InspectionItem extends BaseEntity { */ @Schema(description = "[检验项目]编码") private String code; + /** + * 特殊类型-[1]:测厚;[2]:测硬;[3]:尺寸; + */ + @Schema(description = "特殊类型") + private Integer specialType; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java index bdec13ed..3773ab5a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/InspectionTask.java @@ -155,6 +155,10 @@ public class InspectionTask extends BaseEntity { * 来源类型 */ public static final String COL_FROM_TYPE = "FROM_TYPE"; + /** + * 生产订单类型 + */ + public static final String COL_YIELD_ORDER_TYPE = "YIELD_ORDER_TYPE"; /** * [检验任务]编码 @@ -255,27 +259,27 @@ public class InspectionTask extends BaseEntity { * 检验数量 */ @Schema(description = "检验数量") - private Short checkQty; + private Double checkQty; /** * 消耗数量 */ @Schema(description = "消耗数量") - private Short lossQty; + private Double lossQty; /** * 合格数量 */ @Schema(description = "合格数量") - private Short qualifiedQty; + private Double qualifiedQty; /** * 报废数量 */ @Schema(description = "报废数量") - private Short scrapQty; + private Double scrapQty; /** * 不合格数量 */ @Schema(description = "不合格数量") - private Short unqualifiedQty; + private Double unqualifiedQty; /** * 不良原因 */ @@ -316,4 +320,9 @@ public class InspectionTask extends BaseEntity { */ @Schema(description = "来源类型") private Integer fromType; + /** + * 生产订单类型 + */ + @Schema(description = "生产订单类型") + private Integer yieldOrderType; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java index fb1b95a5..277bbbc0 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/IotThickness.java @@ -78,12 +78,12 @@ public class IotThickness extends BaseEntity { * 使用标记位 */ @Schema(description = "使用标记位") - private Long flagUse; + private Integer flagUse; /** * 读取标记位 */ @Schema(description = "读取标记位") - private Long flagRead; + private Integer flagRead; /** * 设备号 */ @@ -118,5 +118,5 @@ public class IotThickness extends BaseEntity { * [设备]id */ @Schema(description = "[设备]id") - private BigDecimal equipmentId; + private Long equipmentId; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java index bfa4cc21..79725ec0 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/ReviewSheet.java @@ -14,6 +14,11 @@ import java.time.LocalDateTime; /** * [生产处置单] 实体类 + * mes v1: + * qc_review_sheet QcReviewSheet 审理单 + * qc_review_sheet_internal QcReviewSheetInternal 热表内部审理记录表 + * qc_review_sheet_internalredo QcReviewSheetInternalredo 热表内部审理记录表（返修） + * qc_review_sheet_internalsj QcReviewSheetInternalsj 热表内部审理记录表（烧结） * * @author Tom Shuo * @since 2026-01-06 @@ -24,341 +29,350 @@ import java.time.LocalDateTime; @EqualsAndHashCode(callSuper = true) public class ReviewSheet extends BaseEntity { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; - /** - * [生产处置单]编码 - */ + /** + * [生产处置单]编码 + */ public static final String COL_REVIEW_ORDER_CODE = "REVIEW_ORDER_CODE"; - /** - * [生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式; - */ + /** + * [生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式; + */ public static final String COL_REVIEW_ORDER_MODE = "REVIEW_ORDER_MODE"; - /** - * 名称 - */ + /** + * 名称 + */ public static final String COL_NAME = "NAME"; - /** - * [检验任务]id - */ + /** + * [检验任务]id + */ public static final String COL_TASK_ID = "TASK_ID"; - /** - * 打回[用户]id - */ + /** + * 打回[用户]id + */ public static final String COL_BACK_USER_ID = "BACK_USER_ID"; - /** - * 审理[用户]id - */ + /** + * 审理[用户]id + */ public static final String COL_REVIEW_USER_ID = "REVIEW_USER_ID"; - /** - * [部门]id - */ + /** + * [部门]id + */ public static final String COL_DEPT_ID = "DEPT_ID"; - /** - * 比例 - */ + /** + * 比例 + */ public static final String COL_SCALE = "SCALE"; - /** - * 不合格数量 - */ + /** + * 不合格数量 + */ public static final String COL_UNQUALIFIED_QTY = "UNQUALIFIED_QTY"; - /** - * 上级编号 - */ + /** + * 上级编号 + */ public static final String COL_UP_CODE = "UP_CODE"; - /** - * 审理意见/审理结论 - */ + /** + * 审理意见/审理结论 + */ public static final String COL_MEMO = "MEMO"; - /** - * 打回原因 - */ + /** + * 打回原因 + */ public static final String COL_BACK_REASON = "BACK_REASON"; - /** - * 打回时间 - */ + /** + * 打回时间 + */ public static final String COL_BACK_DATE = "BACK_DATE"; - /** - * 新ERP返回审理单主键 - */ + /** + * 新ERP返回审理单主键 + */ public static final String COL_ERP_ID = "ERP_ID"; - /** - * 审理时间 - */ + /** + * 审理时间 + */ public static final String COL_REVIEW_DATE = "REVIEW_DATE"; - /** - * 排序 - */ + /** + * 排序 + */ public static final String COL_SORT = "SORT"; - /** - * 备注 - */ + /** + * 备注 + */ public static final String COL_REMARK = "REMARK"; - /** - * 是否批次性问题-[1]:是;[0]否; - */ + /** + * 是否批次性问题-[1]:是;[0]否; + */ public static final String COL_IS_BAT_PROBLEM = "IS_BAT_PROBLEM"; - /** - * 是否经典问题-[1]:是;[0]否; - */ + /** + * 是否经典问题-[1]:是;[0]否; + */ public static final String COL_IS_CLASSIC_PROBLEM = "IS_CLASSIC_PROBLEM"; - /** - * 是否低级错误-[1]:是;[0]否; - */ + /** + * 是否低级错误-[1]:是;[0]否; + */ public static final String COL_IS_LOW_ERROR = "IS_LOW_ERROR"; - /** - * 是否质量问题-[1]:是;[0]否; - */ + /** + * 是否质量问题-[1]:是;[0]否; + */ public static final String COL_IS_QUALITY_PROBLEM = "IS_QUALITY_PROBLEM"; - /** - * 审理单号 - */ + /** + * 审理单号 + */ public static final String COL_RS_CODE = "RS_CODE"; - /** - * 审理状态 - */ + /** + * 审理状态 + */ public static final String COL_REVIEW_STATUS = "REVIEW_STATUS"; - /** - * 业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废; - */ + /** + * 业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废; + */ public static final String COL_BIZ_TYPE = "BIZ_TYPE"; - /** - * 物料号 - */ + /** + * 物料号 + */ public static final String COL_PART_CODE = "PART_CODE"; - /** - * 批次号 - */ + /** + * 批次号 + */ public static final String COL_BATCH_NO = "BATCH_NO"; - /** - * [外协厂家]id - */ + /** + * [外协厂家]id + */ public static final String COL_OEM_ID = "OEM_ID"; - /** - * 生产标识 - */ + /** + * 生产标识 + */ public static final String COL_PROD_IDENT = "PROD_IDENT"; - /** - * 故障类别 - */ + /** + * 故障类别 + */ public static final String COL_FAULT_TYPE = "FAULT_TYPE"; - /** - * [车间订单]id - */ + /** + * [车间订单]id + */ public static final String COL_WO_ID = "WO_ID"; - /** - * [车间订单]编码 - */ + /** + * [车间订单]编码 + */ public static final String COL_WO_CODE = "WO_CODE"; - /** - * [车间作业计划]id - */ + /** + * [车间作业计划]id + */ public static final String COL_WP_ID = "WP_ID"; - /** - * 总数量 - */ + /** + * 总数量 + */ public static final String COL_TOTAL_NUM = "TOTAL_NUM"; - /** - * 返修数量 - */ + /** + * 返修数量 + */ public static final String COL_RE_DO_NUM = "RE_DO_NUM"; - /** - * 返修原因 - */ + /** + * 返修原因 + */ public static final String COL_RE_DO_REASON = "RE_DO_REASON"; - /** - * 返修建议 - */ + /** + * 返修建议 + */ public static final String COL_RE_DO_SUGGEST = "RE_DO_SUGGEST"; - /** - * 返修路线 - */ + /** + * 返修路线 + */ public static final String COL_RE_DO_PATH = "RE_DO_PATH"; + /** + * [作业中心]id + */ + public static final String COL_WC_ID = "WC_ID"; - /** - * [生产处置单]编码 - */ - @Schema(description = "[生产处置单]编码") - private String reviewOrderCode; - /** - * [生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式; - */ - @Schema(description = "[生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式;") - private Long reviewOrderMode; - /** - * 名称 - */ - @Schema(description = "名称") - private String name; - /** - * [检验任务]id - */ - @Schema(description = "[检验任务]id") - private Long taskId; - /** - * 打回[用户]id - */ - @Schema(description = "打回[用户]id") - private Long backUserId; - /** - * 审理[用户]id - */ - @Schema(description = "审理[用户]id") - private Long reviewUserId; - /** - * [部门]id - */ - @Schema(description = "[部门]id") - private Long deptId; - /** - * 比例 - */ - @Schema(description = "比例") - private Double scale; - /** - * 不合格数量 - */ - @Schema(description = "不合格数量") - private Short unqualifiedQty; - /** - * 上级编号 - */ - @Schema(description = "上级编号") - private String upCode; - /** - * 审理意见/审理结论 - */ - @Schema(description = "审理意见/审理结论") - private String memo; - /** - * 打回原因 - */ - @Schema(description = "打回原因") - private String backReason; - /** - * 打回时间 - */ - @Schema(description = "打回时间") - private LocalDateTime backDate; - /** - * 新ERP返回审理单主键 - */ - @Schema(description = "新ERP返回审理单主键") - private String erpId; - /** - * 审理时间 - */ - @Schema(description = "审理时间") - private LocalDateTime reviewDate; - /** - * 排序 - */ - @Schema(description = "排序") - private Long sort; - /** - * 备注 - */ - @Schema(description = "备注") - private String remark; - /** - * 是否批次性问题-[1]:是;[0]否; - */ - @Schema(description = "是否批次性问题-[1]:是;[0]否;") - private Long isBatProblem; - /** - * 是否经典问题-[1]:是;[0]否; - */ - @Schema(description = "是否经典问题-[1]:是;[0]否;") - private Long isClassicProblem; - /** - * 是否低级错误-[1]:是;[0]否; - */ - @Schema(description = "是否低级错误-[1]:是;[0]否;") - private Long isLowError; - /** - * 是否质量问题-[1]:是;[0]否; - */ - @Schema(description = "是否质量问题-[1]:是;[0]否;") - private Long isQualityProblem; - /** - * 审理单号 - */ - @Schema(description = "审理单号") - private String rsCode; - /** - * 审理状态 - */ - @Schema(description = "审理状态") - private Long reviewStatus; - /** - * 业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废; - */ - @Schema(description = "业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理返修;[4]:ERP审理报废;") - private Short bizType; - /** - * 物料号 - */ - @Schema(description = "物料号") - private String partCode; - /** - * 批次号 - */ - @Schema(description = "批次号") - private String batchNo; - /** - * [外协厂家]id - */ - @Schema(description = "[外协厂家]id") - private Long oemId; - /** - * 生产标识 - */ - @Schema(description = "生产标识") - private String prodIdent; - /** - * 故障类别 - */ - @Schema(description = "故障类别") - private String faultType; - /** - * [车间订单]id - */ - @Schema(description = "[车间订单]id") - private Long woId; - /** - * [车间订单]编码 - */ - @Schema(description = "[车间订单]编码") - private String woCode; - /** - * [车间作业计划]id - */ - @Schema(description = "[车间作业计划]id") - private Long wpId; - /** - * 总数量 - */ - @Schema(description = "总数量") - private Short totalNum; - /** - * 返修数量 - */ - @Schema(description = "返修数量") - private Short reDoNum; - /** - * 返修原因 - */ - @Schema(description = "返修原因") - private String reDoReason; - /** - * 返修建议 - */ - @Schema(description = "返修建议") - private String reDoSuggest; - /** - * 返修路线 - */ - @Schema(description = "返修路线") - private String reDoPath; + /** + * [生产处置单]编码 + */ + @Schema(description = "[生产处置单]编码") + private String reviewOrderCode; + /** + * [生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式; + */ + @Schema(description = "[生产处置单]模式-[1]:零件模式;[2]装配模式;[3]售后模式;") + private Integer reviewOrderMode; + /** + * 名称 + */ + @Schema(description = "名称") + private String name; + /** + * [检验任务]id + */ + @Schema(description = "[检验任务]id") + private Long taskId; + /** + * 打回[用户]id + */ + @Schema(description = "打回[用户]id") + private Long backUserId; + /** + * 审理[用户]id + */ + @Schema(description = "审理[用户]id") + private Long reviewUserId; + /** + * [部门]id + */ + @Schema(description = "[部门]id") + private Long deptId; + /** + * 比例 + */ + @Schema(description = "比例") + private Double scale; + /** + * 不合格数量 + */ + @Schema(description = "不合格数量") + private Short unqualifiedQty; + /** + * 上级编号 + */ + @Schema(description = "上级编号") + private String upCode; + /** + * 审理意见/审理结论 + */ + @Schema(description = "审理意见/审理结论") + private String memo; + /** + * 打回原因 + */ + @Schema(description = "打回原因") + private String backReason; + /** + * 打回时间 + */ + @Schema(description = "打回时间") + private LocalDateTime backDate; + /** + * 新ERP返回审理单主键 + */ + @Schema(description = "新ERP返回审理单主键") + private String erpId; + /** + * 审理时间 + */ + @Schema(description = "审理时间") + private LocalDateTime reviewDate; + /** + * 排序 + */ + @Schema(description = "排序") + private Long sort; + /** + * 备注 + */ + @Schema(description = "备注") + private String remark; + /** + * 是否批次性问题-[1]:是;[0]否; + */ + @Schema(description = "是否批次性问题-[1]:是;[0]否;") + private Long isBatProblem; + /** + * 是否经典问题-[1]:是;[0]否; + */ + @Schema(description = "是否经典问题-[1]:是;[0]否;") + private Long isClassicProblem; + /** + * 是否低级错误-[1]:是;[0]否; + */ + @Schema(description = "是否低级错误-[1]:是;[0]否;") + private Long isLowError; + /** + * 是否质量问题-[1]:是;[0]否; + */ + @Schema(description = "是否质量问题-[1]:是;[0]否;") + private Long isQualityProblem; + /** + * 审理单号 + */ + @Schema(description = "审理单号") + private String rsCode; + /** + * 审理状态 + */ + @Schema(description = "审理状态") + private Integer reviewStatus; + /** + * 业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理; + */ + @Schema(description = "业务类型-[1]:内部审理返修;[2]:内部审理报废;[3]:ERP审理;") + private Short bizType; + /** + * 物料号 + */ + @Schema(description = "物料号") + private String partCode; + /** + * 批次号 + */ + @Schema(description = "批次号") + private String batchNo; + /** + * [外协厂家]id + */ + @Schema(description = "[外协厂家]id") + private Long oemId; + /** + * 生产标识 + */ + @Schema(description = "生产标识") + private String prodIdent; + /** + * 故障类别 + */ + @Schema(description = "故障类别") + private String faultType; + /** + * [车间订单]id + */ + @Schema(description = "[车间订单]id") + private Long woId; + /** + * [车间订单]编码 + */ + @Schema(description = "[车间订单]编码") + private String woCode; + /** + * [车间作业计划]id + */ + @Schema(description = "[车间作业计划]id") + private Long wpId; + /** + * 总数量 + */ + @Schema(description = "总数量") + private Short totalNum; + /** + * 返修数量 + */ + @Schema(description = "返修数量") + private Short reDoNum; + /** + * 返修原因 + */ + @Schema(description = "返修原因") + private String reDoReason; + /** + * 返修建议 + */ + @Schema(description = "返修建议") + private String reDoSuggest; + /** + * 返修路线 + */ + @Schema(description = "返修路线") + private String reDoPath; + /** + * [作业中心]id + */ + @Schema(description = "[作业中心]id") + private Long wcId; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java index b828c141..d06bc5dc 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/Standard.java @@ -163,4 +163,14 @@ public class Standard extends BaseEntity { */ @Schema(description = "[质量标准]编码") private String code; + /** + * + */ + @Schema(description = "标准值") + private Double standardValue; + + @Schema(description = "上限值") + private Double upValue; + @Schema(description = "下限值") + private Double downValue; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java index 3324e3d2..b39cf257 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/SupplyInspection.java @@ -54,6 +54,10 @@ public class SupplyInspection extends BaseEntity { * 检验记录base64地址 */ public static final String COL_BASE_64_VALUE = "BASE_64_VALUE"; + /** + * 测厚内容 + */ + public static final String TEST_THICKNESS = "TEST_THICKNESS"; /** * 类型 @@ -90,4 +94,9 @@ public class SupplyInspection extends BaseEntity { */ // @Schema(description = "检验记录base64地址") todo: //private String base64Value; + /** + * 测厚内容 + */ + @Schema(description = "测厚内容") + private String testThickness; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java index 133157b6..99bd2a8c 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/entity/WorkPlanItem.java @@ -18,10 +18,10 @@ import java.time.LocalDateTime; * @author Tom Shuo * @since 2026-01-06 */ -@Data @TableName("QA_WORK_PLAN_ITEM") -@Schema(description = "WorkPlanItem Entity对象") +@Data @EqualsAndHashCode(callSuper = true) +@Schema(description = "WorkPlanItem Entity对象") public class WorkPlanItem extends BaseEntity { @Serial @@ -105,17 +105,17 @@ public class WorkPlanItem extends BaseEntity { * 检验数 */ @Schema(description = "检验数") - private Short checkQty; + private Double checkQty; /** * 试验数量 */ @Schema(description = "试验数量") - private Short testQty; + private Double testQty; /** * 消耗数量 */ @Schema(description = "消耗数量") - private Short lossQty; + private Double lossQty; /** * [检验项目]编码 */ diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java index 9b97efef..eaa25c0f 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskStartNew.java @@ -3,7 +3,6 @@ package org.springblade.desk.quality.pojo.request; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import java.math.BigDecimal; @Data public class InspectionTaskStartNew { @@ -12,17 +11,17 @@ public class InspectionTaskStartNew { * [工单]id */ @Schema(description = "[工单]id") - private BigDecimal workOrderId; + private Long workOrderId; /** * [工序]id */ @Schema(description = "[工序]id") - private BigDecimal processId; + private Long processId; /** * [制品]id */ @Schema(description = "[制品]id") - private BigDecimal productId; + private Long productId; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java deleted file mode 100644 index 773ea271..00000000 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmit.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.springblade.desk.quality.pojo.request; - -public class InspectionTaskSubmit { - - /** - * - */ - String id; -} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmitCheck.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmitCheck.java new file mode 100644 index 00000000..b3dc3a97 --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/request/InspectionTaskSubmitCheck.java @@ -0,0 +1,12 @@ +package org.springblade.desk.quality.pojo.request; + +public class InspectionTaskSubmitCheck { + + + + + + + + +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java index 74c68865..3adf5db3 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskDetailVO.java @@ -6,8 +6,10 @@ package org.springblade.desk.quality.pojo.vo; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.entity.RemindMsg; import java.io.Serial; +import java.util.List; /** * [检验任务] 视图实体类 @@ -25,4 +27,9 @@ public class InspectionTaskDetailVO extends InspectionTask { @Serial private static final long serialVersionUID = 1L; + private InspectionTaskListVO orderInfo; + + private List remindMsgList; + + private List wpItemList; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java index 3ce3aeea..59c82e74 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/InspectionTaskListVO.java @@ -68,4 +68,31 @@ public class InspectionTaskListVO extends InspectionTask { private Double poQty = 2002d; @Schema(description = "接收时间") private LocalDateTime receiveDate = LocalDateTime.now(); + + @Schema(description = "订单-产品号") + private String prodCode = "XXXX12345"; + @Schema(description = "订单-产品型号") + private String prodType = "XXXX12345"; + @Schema(description = "订单-产品名称") + private String prodName = "XXXX12345"; + @Schema(description = "订单-镀种信息") + private String platingInfo; + @Schema(description = "订单-工艺路线") + private String process; + @Schema(description = "订单-工艺规程") + private String processSpec; + @Schema(description = "订单-试验数量") + private Double orderCheckQty; + @Schema(description = "订单-消耗数量") + private Double orderLossQty; + @Schema(description = "订单-报废数量") + private Double orderScrapQty; + @Schema(description = "订单-硬度") + private String hardness; + @Schema(description = "订单-关键信息") + private String keyInfo; + @Schema(description = "订单-备注") + private String remark; + @Schema(description = "订单-提醒内容") + private String remindContent; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/PpmReportDetailModel.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/PpmReportDetailModel.java new file mode 100644 index 00000000..0239bc7c --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/PpmReportDetailModel.java @@ -0,0 +1,154 @@ +package org.springblade.desk.quality.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * @ClassName PpmReportDetailModel + * @Description: 出厂不合格率明细模型 + * @Author cdl + * @Date 2023/12/08 13:37 + * @Version 1.0 + * 注意：本内容仅限于内部传阅，禁止外泄及用于其他的商业目的 + */ +@Data +@Schema(description = "PpmReportDetailModel对象") +public class PpmReportDetailModel { + /** + * 班组 + */ + @Schema(description = "班组") + private String tsName; + /** + * 审理单号 + */ + private String sheetNo; + /** + * 审理单类型 + */ + private String billmodel; + /** + * 审理单状态 + */ + private String status; + /** + * 发生单位 + */ + private String deptcode; + /** + * 物料号 + */ + private String prtno; + /** + * 物料名称 + */ + private String name; + /** + * 型号 + */ + private String type; + /** + * 质量等级 + */ + private String qstandno; + /** + * 批次号 + */ + private String lotno; + /** + * 总数量 + */ + private String cntt; + /** + * 不合格数 + */ + private String cntn; + /** + * 检验员 + */ + private String checker; + /** + * 检验日期 + */ + private String checkdate; + /** + * 归档日期 + */ + private String finishdate; + /** + * 责任部门 + */ + private String layer1; + /** + * 审理单开始时间 + */ + private String judgestart; + /** + * + */ + private String opinion; + /** + * 审理级别 + */ + private String userlevel; + /** + * 审理意见 + */ + private String dispose; + /** + * 审理人 + */ + private String usercode; + /** + * 返修数 + */ + private String p6layer3; + /** + * 返工数 + */ + private String p6layer4; + /** + * 报废数 + */ + private String p6layer5; + /** + * 订单号 + */ + private String sono; + /** + * 完工数 + */ + private String avlqty; + /** + * 完工日期 + */ + private String date1; + /** + * 责任零件 + */ + private String p5layer1; + /** + * 责任批次 + */ + private String p5layer3; + /** + * 发生工序 + */ + private String process; + /** + * 发生工序名称 + */ + private String processName; + /** + * 上级编号 + */ + private String precode; + /** + * 返修路线 + */ + private String reworkLine; + /** + * 故障描述 + */ + private String memo; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/PrintChildReviewSheet.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/PrintChildReviewSheet.java new file mode 100644 index 00000000..cf59ed0b --- /dev/null +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/PrintChildReviewSheet.java @@ -0,0 +1,52 @@ +package org.springblade.desk.quality.pojo.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +/** + * PrintChildReviewSheet + */ +@Data +@Schema(description = "PrintChildReviewSheet对象") +public class PrintChildReviewSheet { + /** + * 单据编号 + */ + @Schema(description = "单据编号") + private String rsCode; + /** + * 零件号 + */ + @Schema(description = "") + private String partCode; + /** + * 批次号 + */ + @Schema(description = "") + private String batchNo; + /** + * 数量 + */ + @Schema(description = "") + private String makeQty; + /** + * 审理状态 + */ + @Schema(description = "") + private String sheetStatus; + /** + * 审理意见 + */ + @Schema(description = "") + private String detail; + /** + * 报废数量 + */ + @Schema(description = "") + private String scrapQty; + /** + * 归档日期 + */ + @Schema(description = "") + private String fileDate; +} diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java index 02d9db40..c5c2938a 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkOrderVO.java @@ -4,12 +4,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * mes v1: PrWorkOrder 车间订单 + * mes v1: PrWorkOrder 车间订单VO */ @Data @EqualsAndHashCode() public class QAPrWorkOrderVO { - - } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java index 909f6644..609ff6cd 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/QAPrWorkPlanVO.java @@ -3,15 +3,14 @@ package org.springblade.desk.quality.pojo.vo; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.Date; +import java.util.List; + /** - * mes v1: PrWorkPlan 车间作业计划 + * mes v1: PrWorkPlan 车间作业计划VO */ @Data @EqualsAndHashCode() public class QAPrWorkPlanVO { - - - - } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java index 76ab9074..b2e7df50 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/RemindMsgVO.java @@ -3,6 +3,7 @@ */ package org.springblade.desk.quality.pojo.vo; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.RemindMsg; @@ -18,7 +19,18 @@ import java.io.Serial; @Data @EqualsAndHashCode(callSuper = true) public class RemindMsgVO extends RemindMsg { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; + /** + * todo: + */ + @Schema(description = "零件名称") + private String partName = ""; + @Schema(description = "材料名称") + private String matName = ""; + @Schema(description = "镀种名称") + private String platingName = ""; + @Schema(description = "工艺一级路线") + private String processClazz1Name = ""; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java index e91a9fdd..88dd23bd 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/ReviewSheetVO.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import org.springblade.desk.quality.pojo.entity.ReviewSheet; import java.io.Serial; +import java.util.List; /** * [生产处置单] 视图实体类 @@ -21,4 +22,13 @@ public class ReviewSheetVO extends ReviewSheet { @Serial private static final long serialVersionUID = 1L; + private List dutyList; + + private String dutyDeleteIds; + + private List faultList; + + private String faultDeleteIds; + + private Integer submitErpType; } diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java index fff382d9..05732ce1 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/WorkPlanItemVO.java @@ -5,9 +5,13 @@ package org.springblade.desk.quality.pojo.vo; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.desk.quality.pojo.entity.InspectionItem; +import org.springblade.desk.quality.pojo.entity.Standard; import org.springblade.desk.quality.pojo.entity.WorkPlanItem; +import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; import java.io.Serial; +import java.util.List; /** * [工序检验项] 视图实体类 @@ -18,7 +22,12 @@ import java.io.Serial; @Data @EqualsAndHashCode(callSuper = true) public class WorkPlanItemVO extends WorkPlanItem { - @Serial - private static final long serialVersionUID = 1L; + @Serial + private static final long serialVersionUID = 1L; + private InspectionItemVO item; + + private StandardVO standard; + + private List wpItemDetailList; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseCol.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseCol.java index 31b41584..22d0c589 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseCol.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/constant/BaseCol.java @@ -5,23 +5,44 @@ package org.springblade.desk.basic.constant; */ public interface BaseCol { + /** + * + */ String ID = "ID"; - + /** + * + */ String CREATE_USER = "CREATE_USER"; - + /** + * + */ String CREATE_TIME = "CREATE_TIME"; - + /** + * + */ String CREATE_DEPT = "CREATE_DEPT"; - + /** + * + */ String UPDATE_USER = "UPDATE_USER"; - + /** + * + */ String UPDATE_TIME = "UPDATE_TIME"; - + /** + * + */ String STATUS = "STATUS"; - + /** + * + */ String IS_DELETED = "IS_DELETED"; - + /** + * + */ String SORT = "SORT"; - + /** + * + */ String TENANT_ID = "TENANT_ID"; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java index 7d7df382..9771e724 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnBaseMapper.java @@ -1,9 +1,12 @@ package org.springblade.desk.basic.mapper.en; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Param; import org.springblade.core.mp.base.BaseEntity; import java.io.Serializable; +import java.util.Collection; /** * Enhance MyBatis Plus BaseMapper. @@ -14,8 +17,23 @@ public interface EnBaseMapper extends BaseMapper { /** * 根据 ID 物理删除 + *

+ * 对应 deleteById + *

+ * * @param id * @return */ - int deleteAbsoluteById(Serializable id); + int physicalDeleteById(Serializable id); + + /** + * 删除（根据ID或实体 批量删除） + *

+ * 对应 deleteByIds + *

+ * + * @param idList idList 主键ID列表或实体列表(不能为 null 以及 empty) + * @return + */ + int physicalDeleteBatchByIds(@Param(Constants.COLL) Collection idList); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnCustomSqlInjector.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnCustomSqlInjector.java index d42486f6..13260bf5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnCustomSqlInjector.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnCustomSqlInjector.java @@ -11,7 +11,10 @@ public class EnCustomSqlInjector extends DefaultSqlInjector { @Override public List getMethodList(Class mapperClass, TableInfo tableInfo) { List methodList = super.getMethodList(mapperClass, tableInfo); - methodList.add(new DeleteAbsoluteById()); +// methodList.add(new PhysicalDeleteById()); +// methodList.add(new PhysicalDeleteBatchByIds()); +// methodList.add(new PhysicalDelete()); +// methodList.add(new PhysicalDeleteByMap()); return methodList; } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnMethodConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnMethodConst.java new file mode 100644 index 00000000..e07b9142 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnMethodConst.java @@ -0,0 +1,24 @@ +package org.springblade.desk.basic.mapper.en; + +/** + * 物理删除physicalDelete开头。 + */ +public interface EnMethodConst { + + /** + * 物理删除-根据ID todo: test + */ + String PHYSICAL_DELETE_BY_ID = "physicalDeleteById"; + /** + * 物理删除-批量ID todo: test + */ + String PHYSICAL_DELETE_BATCH_BY_IDS = "physicalDeleteBatchByIds"; + /** + * 物理删除-条件删除（Wrapper）todo: test + */ + String PHYSICAL_DELETE = "physicalDelete"; + /** + * 物理删除-Map条件删除 todo: test + */ + String PHYSICAL_DELETE_BY_MAP = "physicalDeleteByMap"; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnMyBatisConfig.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnMyBatisConfig.java index 1678e3fa..58eb0c78 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnMyBatisConfig.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/EnMyBatisConfig.java @@ -3,7 +3,7 @@ package org.springblade.desk.basic.mapper.en; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -@Configuration +//@Configuration public class EnMyBatisConfig { /** @@ -11,8 +11,8 @@ public class EnMyBatisConfig { * * @return */ - @Bean - public EnCustomSqlInjector customSqlInjector() { - return new EnCustomSqlInjector(); - } +// @Bean +// public EnCustomSqlInjector customSqlInjector() { +// return new EnCustomSqlInjector(); +// } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDelete.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDelete.java new file mode 100644 index 00000000..5f2febd7 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDelete.java @@ -0,0 +1,36 @@ +package org.springblade.desk.basic.mapper.en.method; + +import com.baomidou.mybatisplus.core.enums.SqlMethod; +import com.baomidou.mybatisplus.core.injector.AbstractMethod; +import com.baomidou.mybatisplus.core.metadata.TableInfo; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.mapping.SqlSource; +import org.springblade.desk.basic.mapper.en.EnMethodConst; + +public class PhysicalDelete extends AbstractMethod { + + public PhysicalDelete() { + this(EnMethodConst.PHYSICAL_DELETE); + } + + /** + * @param methodName 方法名 + * @since 3.5.0 + */ + protected PhysicalDelete(String methodName) { + super(methodName); + } + + @Override + public MappedStatement injectMappedStatement(Class mapperClass, Class modelClass, TableInfo tableInfo) { + // DELETE FROM %s %s %s + SqlMethod sqlMethod = SqlMethod.DELETE; + String sql = String.format( + sqlMethod.getSql(), + tableInfo.getTableName(), + sqlWhereEntityWrapper(true, tableInfo) // 拼接Wrapper条件（不含逻辑删除） + ); + SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass); + return this.addDeleteMappedStatement(mapperClass, methodName, sqlSource); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDeleteBatchByIds.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDeleteBatchByIds.java new file mode 100644 index 00000000..d4f1761a --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDeleteBatchByIds.java @@ -0,0 +1,43 @@ +package org.springblade.desk.basic.mapper.en.method; + +import com.baomidou.mybatisplus.core.enums.SqlMethod; +import com.baomidou.mybatisplus.core.injector.AbstractMethod; +import com.baomidou.mybatisplus.core.metadata.TableInfo; +import com.baomidou.mybatisplus.core.toolkit.sql.SqlScriptUtils; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.mapping.SqlSource; +import org.springblade.desk.basic.mapper.en.EnMethodConst; + +public class PhysicalDeleteBatchByIds extends AbstractMethod { + + + public PhysicalDeleteBatchByIds() { + this(EnMethodConst.PHYSICAL_DELETE_BATCH_BY_IDS); + } + + /** + * @param methodName 方法名 + * @since 3.5.0 + */ + protected PhysicalDeleteBatchByIds(String methodName) { + super(methodName); + } + + @Override + public MappedStatement injectMappedStatement(Class mapperClass, Class modelClass, TableInfo tableInfo) { + // DELETE FROM %s WHERE %s IN (%s) + SqlMethod sqlMethod = SqlMethod.DELETE_BY_IDS; + // 构建带foreach的集合解析脚本，而非直接使用#{coll} + String sqlScript = SqlScriptUtils.convertForeach("#{item}", "coll", null, "item", COMMA); + String sql = String.format( + sqlMethod.getSql(), + tableInfo.getTableName(), + tableInfo.getKeyColumn(), + sqlScript + ); + // 处理空集合防SQL注入（可选，增强健壮性） + sql = SqlScriptUtils.convertIf(sql, "coll != null and coll.size() > 0", true); + SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass); + return this.addDeleteMappedStatement(mapperClass, methodName, sqlSource); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/DeleteAbsoluteById.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDeleteById.java similarity index 51% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/DeleteAbsoluteById.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDeleteById.java index f448f6f2..2378a576 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/DeleteAbsoluteById.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDeleteById.java @@ -1,36 +1,33 @@ -package org.springblade.desk.basic.mapper.en; +package org.springblade.desk.basic.mapper.en.method; import com.baomidou.mybatisplus.core.enums.SqlMethod; import com.baomidou.mybatisplus.core.injector.AbstractMethod; import com.baomidou.mybatisplus.core.metadata.TableInfo; import org.apache.ibatis.mapping.MappedStatement; import org.apache.ibatis.mapping.SqlSource; +import org.springblade.desk.basic.mapper.en.EnMethodConst; -import java.beans.Introspector; +public class PhysicalDeleteById extends AbstractMethod { -/** - * deleteAbsoluteById 方法 - */ -public class DeleteAbsoluteById extends AbstractMethod { - - public DeleteAbsoluteById() { - this(Introspector.decapitalize(DeleteAbsoluteById.class.getSimpleName())); + public PhysicalDeleteById() { + this(EnMethodConst.PHYSICAL_DELETE_BY_ID); } - /** - * @param methodName 方法名 - * @since 3.5.0 - */ - protected DeleteAbsoluteById(String methodName) { + protected PhysicalDeleteById(String methodName) { super(methodName); } @Override public MappedStatement injectMappedStatement(Class mapperClass, Class modelClass, TableInfo tableInfo) { + // DELETE FROM %s WHERE %s=#{%s} SqlMethod sqlMethod = SqlMethod.DELETE_BY_ID; - String sql = String.format(sqlMethod.getSql(), tableInfo.getTableName(), tableInfo.getKeyColumn(), - tableInfo.getKeyProperty()); - SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, Object.class); + String sql = String.format( + sqlMethod.getSql(), + tableInfo.getTableName(), + tableInfo.getKeyColumn(), + tableInfo.getKeyProperty() + ); + SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass); return this.addDeleteMappedStatement(mapperClass, methodName, sqlSource); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDeleteByMap.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDeleteByMap.java new file mode 100644 index 00000000..87a321f1 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/mapper/en/method/PhysicalDeleteByMap.java @@ -0,0 +1,36 @@ +package org.springblade.desk.basic.mapper.en.method; + +import com.baomidou.mybatisplus.core.enums.SqlMethod; +import com.baomidou.mybatisplus.core.injector.AbstractMethod; +import com.baomidou.mybatisplus.core.metadata.TableInfo; +import org.apache.ibatis.mapping.MappedStatement; +import org.apache.ibatis.mapping.SqlSource; +import org.springblade.desk.basic.mapper.en.EnMethodConst; + +public class PhysicalDeleteByMap extends AbstractMethod { + + public PhysicalDeleteByMap() { + this(EnMethodConst.PHYSICAL_DELETE_BY_MAP); + } + + /** + * @param methodName 方法名 + * @since 3.5.0 + */ + protected PhysicalDeleteByMap(String methodName) { + super(methodName); + } + + @Override + public MappedStatement injectMappedStatement(Class mapperClass, Class modelClass, TableInfo tableInfo) { + // DELETE FROM %s %s + SqlMethod sqlMethod = SqlMethod.DELETE_BY_MAP; + String sql = String.format( + sqlMethod.getSql(), + tableInfo.getTableName(), + sqlWhereByMap(tableInfo) // 拼接Map条件（不含逻辑删除） + ); + SqlSource sqlSource = languageDriver.createSqlSource(configuration, sql, modelClass); + return this.addDeleteMappedStatement(mapperClass, methodName, sqlSource); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IWorkTankService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IWorkTankService.java index 5501deb6..7501a33f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IWorkTankService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/IWorkTankService.java @@ -19,26 +19,28 @@ import java.util.List; * @since 2025-12-16 */ public interface IWorkTankService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param workTank 查询参数 - * @return IPage - */ - IPage selectWorkTankPage(IPage page, WorkTankVO workTank); - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportWorkTank(Wrapper queryWrapper); + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workTank 查询参数 + * @return IPage + */ + IPage selectWorkTankPage(IPage page, WorkTankVO workTank); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkTank(Wrapper queryWrapper); /** * 通过[作业中心]id 查询 作业槽List - * @param wcId + * + * @param wcId [作业中心]id * @return */ List getListByWcId(Long wcId); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/IdUtil.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/IdUtil.java index 4fe156d0..eabd817b 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/IdUtil.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/util/IdUtil.java @@ -26,8 +26,9 @@ public class IdUtil { /** * e.g. 1123598817738675201 + * * @param id - * @return + * @return true 无效id,false 有效id */ public static Boolean isInvalid(Long id) { if (id == null || id <= 0L) { diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java index ffc7bed8..bce93ec5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionItemConst.java @@ -2,13 +2,17 @@ package org.springblade.desk.quality.constant; public interface InspectionItemConst { + Integer SPECIAL_TYPE_0 = 0; /** * 测厚 */ - Long ITEM_CEHOU_ID = 1L; - + Integer SPECIAL_TYPE_1 = 1; /** * 测硬 */ - Long ITEM_CEYING_ID = 2L; + Integer SPECIAL_TYPE_2 = 2; + /** + * 尺寸 + */ + Integer SPECIAL_TYPE_3 = 3; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java index 6dec351e..2eab8ee5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/InspectionTaskConst.java @@ -16,10 +16,6 @@ public interface InspectionTaskConst { * 未检验 */ Integer CHECK_RESULT_TODO = 0; - /** - * NA - */ - Integer CHECK_RESULT_NA = -1; /** * 合格 */ @@ -27,7 +23,9 @@ public interface InspectionTaskConst { /** * 不合格 */ - Integer CHECK_RESULT_NO = 2; - - + Integer CHECK_RESULT_NG = 2; + /** + * NA + */ + Integer CHECK_RESULT_NA = 3; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java new file mode 100644 index 00000000..c7b5d25b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/constant/ReviewSheetConst.java @@ -0,0 +1,68 @@ +package org.springblade.desk.quality.constant; + +/** + * + */ +public interface ReviewSheetConst { + + /** + * 新建 + */ + Integer S_NEW = 1; + /** + * 打回 + */ + Integer S_REPULSE = 3; + /** + * 审理中 + */ + Integer S_HEAR = 6; + /** + * 审理完成 + */ + Integer S_COMPLETE = 10; + + + /** + * 零件模式 + */ + Integer MODE_PART = 1; + /** + * 装配模式 + */ + Integer MODE_ASSEMBLY = 2; + /** + * 售后模式 + */ + Integer MODE_AFTER_SALES = 3; + + + /** + * 让步接收 + */ + Integer REVIEW_STATUS_3 = 3; + /** + * 返工 + */ + Integer REVIEW_STATUS_4 = 4; + /** + * 返修 + */ + Integer REVIEW_STATUS_5 = 5; + /** + * 报废 + */ + Integer REVIEW_STATUS_6 = 6; + /** + * 挑出报废 + */ + Integer REVIEW_STATUS_7 = 7; + /** + * 退库更换 + */ + Integer REVIEW_STATUS_8 = 8; + /** + * 退回 + */ + Integer REVIEW_STATUS_15 = 15; +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java index 9ef2609e..323f6203 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/InspectionTaskController.java @@ -19,7 +19,6 @@ 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; @@ -32,7 +31,7 @@ import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; import org.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.desk.quality.service.InspectionTaskService2; -import org.springblade.desk.quality.wrapper.InspectionTaskWrapper; +import org.springblade.desk.quality.wrapper.InspectionTaskDetailWrapper; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -41,7 +40,7 @@ import java.util.Map; /** * [检验任务] 控制器 * 工序级的检验任务 - * mes v1: rb_pr_work_check + * mes v1: rb_pr_work_check PrWorkCheck * * @author Tom Shuo * @since 2025-11-14 @@ -66,7 +65,9 @@ public class InspectionTaskController extends BladeController { @Operation(summary = "详情", description = "传入inspectionTask") public R detail(InspectionTask inspectionTask) { InspectionTask detail = service.getOne(Condition.getQueryWrapper(inspectionTask)); - return R.data(InspectionTaskWrapper.build().entityVO(detail)); + InspectionTaskDetailVO detailDetailVO = InspectionTaskDetailWrapper.build().entityVO(detail); + service.setDetailVOValue(detailDetailVO); + return R.data(detailDetailVO); } /** @@ -84,13 +85,13 @@ public class InspectionTaskController extends BladeController { /** * [检验任务] 自定义分页 */ - @GetMapping("/page") - @ApiOperationSupport(order = 3) - @Operation(summary = "分页", description = "传入inspectionTask") - public R> page(InspectionTaskDetailVO inspectionTask, Query query) { - IPage pages = service.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); - return R.data(pages); - } +// @GetMapping("/page") +// @ApiOperationSupport(order = 3) +// @Operation(summary = "分页", description = "传入inspectionTask") +// public R> page(InspectionTaskDetailVO inspectionTask, Query query) { +// IPage pages = service.selectInspectionTaskPage(Condition.getPage(query), inspectionTask); +// return R.data(pages); +// } /** * [检验任务] 新增 @@ -138,7 +139,8 @@ public class InspectionTaskController extends BladeController { @GetMapping("/export-inspectionTask") @ApiOperationSupport(order = 8) @Operation(summary = "导出数据", description = "传入inspectionTask") - public void exportInspectionTask(@Parameter(hidden = true) @RequestParam Map inspectionTask, BladeUser bladeUser, HttpServletResponse response) { + public void exportInspectionTask(@Parameter(hidden = true) @RequestParam Map inspectionTask, + BladeUser bladeUser, HttpServletResponse response) { QueryWrapper queryWrapper = Condition.getQueryWrapper(inspectionTask, InspectionTask.class); //if (!AuthUtil.isAdministrator()) { // queryWrapper.lambda().eq(InspectionTask::getTenantId, bladeUser.getTenantId()); @@ -150,14 +152,21 @@ public class InspectionTaskController extends BladeController { } /** - * todo:调用时机待定。talk to 李涛。 + * todo:调用时机待定。talk to 生产。 * 工序开始，新增[检验任务] */ @PostMapping("/startNew") @ApiOperationSupport(order = 9) - @Operation(summary = "", description = "传入inspectionTask") - public R save(@Valid @RequestBody InspectionTaskStartNew start) { - return service2.startNew(start); + @Operation(summary = "新生成检验任务", description = "传入inspectionTask") + public R startNew(@Valid @RequestBody InspectionTaskStartNew start) { + return service.startNew(start); + } + + @PostMapping("/fill") + @ApiOperationSupport(order = 9) + @Operation(summary = "", description = "传入taskDetailVO") + public R fill(@Valid @RequestBody InspectionTaskDetailVO taskDetailVO) { + return service.fill(taskDetailVO); } /** diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java index f692d46d..fc1c2013 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/RemindMsgController.java @@ -41,6 +41,7 @@ import java.util.stream.Collectors; /** * [提醒信息] 控制器 + * mes v1: bs_remind_redeem BsRemindRedeem * * @author Tom Shuo * @since 2025-12-22 diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewRemoteController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewRemoteController.java new file mode 100644 index 00000000..ea11bd64 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewRemoteController.java @@ -0,0 +1,99 @@ +package org.springblade.desk.quality.controller; + + +import com.alibaba.fastjson.JSONObject; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import jakarta.servlet.http.HttpServletRequest; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.exception.BusinessException; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.desk.oldv1.constant.Constant; +import org.springblade.desk.oldv1.pojo.ResultInfo; +import org.springblade.desk.quality.constant.QAModuleConst; +import org.springblade.desk.quality.service.IReviewSheetService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/ReviewRemote") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[生产处置单-外部调用]", description = "[生产处置单-回调]接口") +public class ReviewRemoteController extends BladeController { + + @Resource + private IReviewSheetService service; + + /** + * copy from mes v1 + * + * @param request + * @return + * @throws Exception + */ + @Operation(summary = "审理结束回调接口", description = "") + @PostMapping(value = "/reviewResult") + public ResultInfo reviewResult(HttpServletRequest request) throws Exception { + JSONObject params = (JSONObject) request.getAttribute(Constant.WEBAPI_REQUEST_PARAMETERS); + // 添加 调试log + log.info("审理结束回调接口 params = {}", params); + if (params == null || params.size() == 0) { + throw new BusinessException("参数传递异常!"); + } + try { + // 审理单ERPId + String trialId = params.getString("trialId"); + // 审理状态 + Short resultStatus = params.getShort("resultStatus"); + // 归档人员 + String reviewMan = params.getString("reviewMan"); + // 责任零件 + String liabilityPart = params.getString("liabilityPart"); + // 报废数量 + Integer scrapQty = params.getInteger("scrapQty"); + // 返工数量 + Integer reworkQty = params.getInteger("reworkQty"); + // 让步数量 + Integer concedeQty = params.getInteger("concedeQty"); + // 审理意见 + String memo = params.getString("memo"); + + // v1 实现 + // qcReviewSheetService.reviewResult(trialId, resultStatus, reviewMan, liabilityPart,scrapQty, reworkQty, concedeQty, memo); + // syDockingLogService.sendDockingLog("审理结束回调接口", params.getString("trialId"), params.toJSONString()); + + service.reviewResult(trialId, resultStatus, reviewMan, liabilityPart, scrapQty, reworkQty, concedeQty, memo); + } catch (Exception e) { + // syDockingLogService.sendDockingLog("审理结束回接口异常", params.getString("trialId"), e.getMessage()); + e.printStackTrace(); + } + return ResultInfo.ok(); + } + + @Operation(summary = "审理单删除调用接口", description = "") + @PostMapping(value = "/deleteReviewOrder") + public ResultInfo deleteReviewOrder(HttpServletRequest request) throws Exception { + JSONObject params = (JSONObject) request.getAttribute(Constant.WEBAPI_REQUEST_PARAMETERS); + // 添加 调试log + log.info("审理单删除调用接口 params = {}", params); + if (params == null || params.size() == 0) { + throw new BusinessException("参数传递异常!"); + } + // syDockingLogService.sendDockingLog("审理单删除调用接口", params.getString("trialId"), params.toJSONString()); + try { + String trialId = params.getString("trialId"); + service.deleteReviewOrder(trialId); + } catch (Exception e) { + // syDockingLogService.sendDockingLog("审理单删除调用接口", params.getString("trialId"), e.getMessage()); + } + return ResultInfo.ok(); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java index e40f4b73..a85f811f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/ReviewSheetController.java @@ -3,7 +3,9 @@ */ package org.springblade.desk.quality.controller; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.injector.methods.UpdateById; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.v3.oas.annotations.Operation; @@ -27,9 +29,16 @@ import org.springblade.core.tool.utils.Func; import org.springblade.desk.basic.util.ExcelExtUtil; import org.springblade.desk.quality.constant.QAModuleConst; import org.springblade.desk.quality.excel.ReviewSheetExcel; +import org.springblade.desk.quality.pojo.entity.ReviewDuty; +import org.springblade.desk.quality.pojo.entity.ReviewFault; import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; +import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; +import org.springblade.desk.quality.service.IReviewDutyService; +import org.springblade.desk.quality.service.IReviewFaultService; import org.springblade.desk.quality.service.IReviewSheetService; +import org.springblade.desk.quality.wrapper.ReviewDutyWrapper; import org.springblade.desk.quality.wrapper.ReviewSheetWrapper; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -55,184 +64,230 @@ import java.util.stream.Collectors; public class ReviewSheetController extends BladeController { @Resource - private IReviewSheetService service; - - /** - * [生产处置单] 详情 - */ - @GetMapping("/detail") - @ApiOperationSupport(order = 10) - @Operation(summary = "详情", description = "传入ReviewSheet Obj") - public R detail(ReviewSheet reviewSheet) { - QueryWrapper qw = Condition.getQueryWrapper(reviewSheet); - ReviewSheet detail = service.getOne(qw); - ReviewSheetVO detailVO = ReviewSheetWrapper.build().entityVO(detail); - service.setVOValue(detailVO); - return R.data(detailVO); - } - - /** - * [生产处置单] list分页 - */ - @GetMapping("/list") - @ApiOperationSupport(order = 20) - @Operation(summary = "list分页", description = "传入ReviewSheet Obj") - public R> list(@Parameter(hidden = true) @RequestParam Map reviewSheet, - Query query) { + private IReviewSheetService service; + @Resource + private IReviewDutyService dutyService; + @Resource + private IReviewFaultService faultService; + + /** + * [生产处置单] 详情 + */ + @GetMapping("/detail") + @ApiOperationSupport(order = 10) + @Operation(summary = "详情", description = "传入ReviewSheet Obj") + public R detail(ReviewSheet reviewSheet) { + QueryWrapper qw = Condition.getQueryWrapper(reviewSheet); + ReviewSheet detail = service.getOne(qw); + ReviewSheetVO detailVO = ReviewSheetWrapper.build().entityVO(detail); + service.setVOValue(detailVO); + return R.data(detailVO); + } + + /** + * [生产处置单] list分页 + */ + @GetMapping("/list") + @ApiOperationSupport(order = 20) + @Operation(summary = "list分页", description = "传入ReviewSheet Obj") + public R> list(@Parameter(hidden = true) @RequestParam Map reviewSheet, + Query query) { QueryWrapper qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class); - IPage pages = service.page(Condition.getPage(query), qw); - IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); - pagesVO.getRecords() - .stream() - .peek(service::setVOValue) - .collect(Collectors.toList()); - return R.data(pagesVO); - } - - - /** - * [生产处置单] page分页 - */ - @GetMapping("/page") - @ApiOperationSupport(order = 21) - @Operation(summary = "page分页", description = "传入ReviewSheet Obj") - public R> page(ReviewSheetVO reviewSheet, Query query) { - IPage pagesVO = service.selectReviewSheetPage( - Condition.getPage(query), reviewSheet - ); - return R.data(pagesVO); - } - - /** + IPage pages = service.page(Condition.getPage(query), qw); + IPage pagesVO = ReviewSheetWrapper.build().pageVO(pages); + pagesVO.getRecords() + .stream() + .peek(service::setVOValue) + .collect(Collectors.toList()); + return R.data(pagesVO); + } + + + /** + * [生产处置单] page分页 + */ + @GetMapping("/page") + @ApiOperationSupport(order = 21) + @Operation(summary = "page分页", description = "传入ReviewSheet Obj") + public R> page(ReviewSheetVO reviewSheet, Query query) { + IPage pagesVO = service.selectReviewSheetPage( + Condition.getPage(query), reviewSheet + ); + return R.data(pagesVO); + } + + /** * [生产处置单] list下拉选择 */ @GetMapping("/listForSelect") @ApiOperationSupport(order = 22) - @Operation(summary = "list下拉选择", description = "") + @Operation(summary = "list下拉选择", description = "") public R> listForSelect() { - List list = service.list(); - List listVO = ReviewSheetWrapper.build().listVO(list); - return R.data(listVO); - } - - /** - * [生产处置单] 新增一条 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 30) - @Operation(summary = "新增一条", description = "传入ReviewSheet Obj") - public R save(@Valid @RequestBody ReviewSheet addOne) { - addOne.setId(null); - return R.status(service.save(addOne)); - } - - /** + List list = service.list(); + List listVO = ReviewSheetWrapper.build().listVO(list); + return R.data(listVO); + } + + /** + * [生产处置单] 新增一条 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 30) + @Operation(summary = "新增一条", description = "传入ReviewSheet Obj") + public R save(@Valid @RequestBody ReviewSheet addOne) { + addOne.setId(null); + return R.status(service.save(addOne)); + } + + /** * [生产处置单] 新增批量 */ - @PostMapping("/saveBat") - @ApiOperationSupport(order = 31) - @Operation(summary = "新增批量", description = "传入ReviewSheet List") - public R saveBat(@Valid @RequestBody List addList) { - addList.forEach(one -> { - one.setId(null); - }); - return R.status(service.saveBatch(addList)); - } - - /** - * [生产处置单] 修改一条 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 40) - @Operation(summary = "修改一条", description = "传入ReviewSheet Obj") - public R update(@Valid @RequestBody ReviewSheet updateOne) { - return R.status(service.updateById(updateOne)); - } + @PostMapping("/saveBat") + @ApiOperationSupport(order = 31) + @Operation(summary = "新增批量", description = "传入ReviewSheet List") + public R saveBat(@Valid @RequestBody List addList) { + addList.forEach(one -> { + one.setId(null); + }); + return R.status(service.saveBatch(addList)); + } + + /** + * [生产处置单] 修改一条 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 40) + @Operation(summary = "修改一条", description = "传入ReviewSheet Obj") + public R update(@Valid @RequestBody ReviewSheet updateOne) { + return R.status(service.updateById(updateOne)); + } /** * [生产处置单] 修改批量 */ @PostMapping("/updateBat") @ApiOperationSupport(order = 41) - @Operation(summary = "修改批量", description = "传入ReviewSheet List") + @Operation(summary = "修改批量", description = "传入ReviewSheet List") public R updateBat(@Valid @RequestBody List updateList) { return R.status(service.updateBatchById(updateList)); } - /** - * [生产处置单] 新增或修改一条 - */ - @PostMapping("/submit") - @ApiOperationSupport(order = 50) - @Operation(summary = "新增或修改一条", description = "传入ReviewSheet Obj") - public R submit(@Valid @RequestBody ReviewSheet mergeOne) { - return R.status(service.saveOrUpdate(mergeOne)); - } + /** + * [生产处置单] 新增或修改一条 + */ + @PostMapping("/submitInternal") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入ReviewSheet Obj") + public R submitInternal(@Valid @RequestBody ReviewSheetVO vo) { + { + // + dutyService.saveOrUpdateBatch(BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class)); + dutyService.deleteLogic(Func.toLongList(vo.getDutyDeleteIds())); + } + { + // + faultService.saveOrUpdateBatch(BeanUtil.copyToList(vo.getFaultList(), ReviewFault.class)); + faultService.deleteLogic(Func.toLongList(vo.getFaultDeleteIds())); + } + return R.status(service.saveOrUpdate(vo)); + } + + /** + * [生产处置单] 新增或修改一条 + */ + @PostMapping("/submitErp") + @ApiOperationSupport(order = 50) + @Operation(summary = "新增或修改一条", description = "传入ReviewSheet Obj") + public R submitErp(@Valid @RequestBody ReviewSheetVO vo) { + { + // + dutyService.saveOrUpdateBatch(BeanUtil.copyToList(vo.getDutyList(), ReviewDuty.class)); + dutyService.deleteLogic(Func.toLongList(vo.getDutyDeleteIds())); + } + { + // + faultService.saveOrUpdateBatch(BeanUtil.copyToList(vo.getFaultList(), ReviewFault.class)); + faultService.deleteLogic(Func.toLongList(vo.getFaultDeleteIds())); + } + return R.status(service.saveOrUpdate(vo)); + } - /** + @GetMapping("/review") + @ApiOperationSupport(order = 22) + @Operation(summary = "审批", description = "") + public R review(@RequestParam Long id, + @RequestParam Integer status, + @RequestParam String memo) { + ReviewSheet rs = service.getById(id); + rs.setStatus(status); + rs.setMemo(memo); + return R.status(service.updateById(rs)); + } + + /** * [生产处置单] 新增或修改批量 */ - @PostMapping("/submitBat") - @ApiOperationSupport(order = 51) - @Operation(summary = "新增或修改批量", description = "传入ReviewSheet List") - public R submitBat(@Valid @RequestBody List mergeList) { - return R.status(service.saveOrUpdateBatch(mergeList)); - } - - /** - * [生产处置单] 逻辑删除 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 61) - @Operation(summary = "逻辑删除", description = "传入ids") - public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { - return R.status(service.deleteLogic(Func.toLongList(ids))); - } - - /** - * [生产处置单] 导出Excel - */ - @GetMapping("/exportExcel") - @ApiOperationSupport(order = 70) - @Operation(summary = "导出Excel", description = "传入ReviewSheet") - public void exportExcel(@Parameter(hidden = true) @RequestParam Map reviewSheet, - BladeUser bladeUser, HttpServletResponse response) { - QueryWrapper qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class); - //if (!AuthUtil.isAdministrator()) { - // queryWrapper.lambda().eq(ReviewSheet::getTenantId, bladeUser.getTenantId()); - //} - //queryWrapper.lambda().eq(ReviewSheetEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); - List list = service.exportReviewSheet(qw); - ExcelUtil.export(response, "[生产处置单]数据" + DateUtil.time(), - "[生产处置单]数据表", list, ReviewSheetExcel.class); - } - - /** + @PostMapping("/submitBat") + @ApiOperationSupport(order = 51) + @Operation(summary = "新增或修改批量", description = "传入ReviewSheet List") + public R submitBat(@Valid @RequestBody List mergeList) { + return R.status(service.saveOrUpdateBatch(mergeList)); + } + + /** + * [生产处置单] 逻辑删除 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 61) + @Operation(summary = "逻辑删除", description = "传入ids") + public R remove(@Parameter(description = "主键集合", required = true) @RequestParam String ids) { + return R.status(service.deleteLogic(Func.toLongList(ids))); + } + + /** + * [生产处置单] 导出Excel + */ + @GetMapping("/exportExcel") + @ApiOperationSupport(order = 70) + @Operation(summary = "导出Excel", description = "传入ReviewSheet") + public void exportExcel(@Parameter(hidden = true) @RequestParam Map reviewSheet, + BladeUser bladeUser, HttpServletResponse response) { + QueryWrapper qw = Condition.getQueryWrapper(reviewSheet, ReviewSheet.class); + //if (!AuthUtil.isAdministrator()) { + // queryWrapper.lambda().eq(ReviewSheet::getTenantId, bladeUser.getTenantId()); + //} + //queryWrapper.lambda().eq(ReviewSheetEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED); + List list = service.exportReviewSheet(qw); + ExcelUtil.export(response, "[生产处置单]数据" + DateUtil.time(), + "[生产处置单]数据表", list, ReviewSheetExcel.class); + } + + /** * [生产处置单] 下载Excel模板 */ - @GetMapping("/downloadExcelTemplate") - @ApiOperationSupport(order = 71) - @Operation(summary = "下载Excel模板", description = "") - public ResponseEntity downloadExcelTemplate() { - return ExcelExtUtil.downloadXlsTemplate( - "Excel/QA/ImportTemplate-CycleTestItem.xls", - "导入模版-周期试验项目.xls"); - } - - /** - * [生产处置单] 导入Excel - */ - @PostMapping("/importExcel") - @ApiOperationSupport(order = 72) - @Operation(summary = "导入Excel", description = "MultipartFile") - public R importExcel(@RequestParam("file") MultipartFile file) { - R checkR = ExcelExtUtil.importExcelCheck(file); - if (checkR != null) { - return checkR; - } - List importList = ExcelUtil.read( - file, 0, 1, ReviewSheet.class - ); - return R.status(service.saveBatch(importList)); - } + @GetMapping("/downloadExcelTemplate") + @ApiOperationSupport(order = 71) + @Operation(summary = "下载Excel模板", description = "") + public ResponseEntity downloadExcelTemplate() { + return ExcelExtUtil.downloadXlsTemplate( + "Excel/QA/ImportTemplate-CycleTestItem.xls", + "导入模版-周期试验项目.xls"); + } + + /** + * [生产处置单] 导入Excel + */ + @PostMapping("/importExcel") + @ApiOperationSupport(order = 72) + @Operation(summary = "导入Excel", description = "MultipartFile") + public R importExcel(@RequestParam("file") MultipartFile file) { + R checkR = ExcelExtUtil.importExcelCheck(file); + if (checkR != null) { + return checkR; + } + List importList = ExcelUtil.read( + file, 0, 1, ReviewSheet.class + ); + return R.status(service.saveBatch(importList)); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/SupplyInspectionRemoteController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/SupplyInspectionRemoteController.java new file mode 100644 index 00000000..508c0293 --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/controller/SupplyInspectionRemoteController.java @@ -0,0 +1,52 @@ +package org.springblade.desk.quality.controller; + + +import com.alibaba.fastjson.JSONObject; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.Resource; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.common.exception.BusinessException; +import org.springblade.core.boot.ctrl.BladeController; +import org.springblade.desk.oldv1.pojo.ResultInfo; +import org.springblade.desk.quality.constant.QAModuleConst; +import org.springblade.desk.quality.service.ISupplyInspectionService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping(QAModuleConst.CONTROLLER_PREFIX + "/SupplyInspectionRemote") +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +@Tag(name = "[供应链平台传递检验记录-外部调用]", description = "[供应链平台传递检验记录-外部调用]") +public class SupplyInspectionRemoteController extends BladeController { + + @Resource + private ISupplyInspectionService service; + + //zxh 20250429 获取供应链平台传递检验记录 + @Operation(summary = "获取供应链平台传递检验记录", description = "") + @PostMapping(value = "/saveSupplyInspection") + public ResultInfo saveSupplyInspection(@RequestBody JSONObject data) throws Exception { + if (data == null || data.size() == 0) { + throw new BusinessException("参数传递异常!"); + } + String woCode = data.getString("woCode"); + String partCode = data.getString("partCode"); + String batchNo = data.getString("batchNo"); + String value1 = data.getString("value1"); + + // + // qcSupplyInspectionService.saveSupplyInspection(woCode,partCode,batchNo,value1); + service.saveSupplyInspection(woCode, partCode, batchNo, value1); + return ResultInfo.ok(); + } + +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java index 6f854bfb..61b62582 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.java @@ -10,7 +10,6 @@ import org.apache.ibatis.annotations.Param; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; -import org.springblade.desk.quality.pojo.request.InspectionTemplateSearch; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; @@ -41,6 +40,6 @@ public interface InspectionTaskMapper extends BaseMapper { */ List exportInspectionTask(@Param("ew") Wrapper queryWrapper); - List listSearch(IPage page, @Param("q") InspectionTaskSearch search); + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml index 265df068..c482a35f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/InspectionTaskMapper.xml @@ -45,6 +45,7 @@ + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml index 4f308b51..3fbb2649 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/mapper/ReviewSheetMapper.xml @@ -43,6 +43,7 @@ + diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionItemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionItemService.java index 38c9bb2f..0326995e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionItemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionItemService.java @@ -9,6 +9,7 @@ import org.springblade.core.mp.base.BaseService; import org.springblade.desk.quality.excel.InspectionItemExcel; import org.springblade.desk.quality.pojo.entity.InspectionItem; import org.springblade.desk.quality.pojo.vo.InspectionItemVO; +import org.springblade.desk.quality.pojo.vo.ReviewDutyVO; import java.util.List; @@ -35,4 +36,11 @@ public interface IInspectionItemService extends BaseService { * @return List */ List exportInspectionItem(Wrapper queryWrapper); + + /** + * VO + * + * @param vo + */ + void setVOValue(InspectionItemVO vo); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java index f911a723..0cb6e2f1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IInspectionTaskService.java @@ -5,12 +5,13 @@ package org.springblade.desk.quality.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.common.exception.BusinessException; import org.springblade.core.mp.base.BaseService; -import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; import org.springblade.desk.quality.excel.InspectionTaskExcel; import org.springblade.desk.quality.pojo.entity.InspectionTask; -import org.springblade.desk.quality.pojo.entity.InspectionTemplate; import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; +import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; @@ -46,7 +47,64 @@ public interface IInspectionTaskService extends BaseService { * * @param vo */ - void setVOValue(InspectionTaskDetailVO vo); + void setDetailVOValue(InspectionTaskDetailVO vo); + + /** + * VO + * + * @param vo + */ + void setListVOValue(InspectionTaskListVO vo); + + /** + *

Description: 查询工序检验记录

+ * + * @param wpId + * @return: PrWorkCheck + * @Author qjh + * @Date: 2022-11-01 11:03 + */ + InspectionTask getPrWorkCheckByWpId(Long wpId); + + /** + *

方法名: checkCompleteErpBackFill

+ *

方法描述: 检验完成回填erp数据

+ * + * @param woCode + * @param deliverKey + * @param workQty + * @param unqualifiedQty + * @param userId + * @throws BusinessException 验证 + * @author lyj + * @date 2023-03-20 13:38 + */ + void checkCompleteErpBackFill(String woCode, String deliverKey, Double workQty, Integer unqualifiedQty, + Long userId) throws BusinessException; + + List getPrWorkCheckListByWpId(Long wpId); + + /** + * old mes v1: IPrWorkCheckService.saveOrEdit 方法 + *

方法名: saveOrEdit

+ *

方法描述: 新增修改工序检验

+ * + * @param task 检验结果 + * @param userId 检验人员 + * @author lyj + * @date 2022-11-03 9:51 + */ + void saveOrEdit(InspectionTask task, Long userId); + + /** + * todo: 生产模块调用 + * + * @param start + * @return + */ + public R startNew(InspectionTaskStartNew start); + + public R fill(InspectionTaskDetailVO detailVO); IPage listSearch(IPage page, InspectionTaskSearch search); diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java index 51b558e1..a43ccba6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewDutyService.java @@ -19,26 +19,39 @@ import java.util.List; * @since 2026-01-06 */ public interface IReviewDutyService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param reviewDuty 查询参数 - * @return IPage - */ - IPage selectReviewDutyPage(IPage page, ReviewDutyVO reviewDuty); + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewDuty 查询参数 + * @return IPage + */ + IPage selectReviewDutyPage(IPage page, ReviewDutyVO reviewDuty); - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportReviewDuty(Wrapper queryWrapper); + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewDuty(Wrapper queryWrapper); /** * VO + * * @param vo */ - void setVOValue(ReviewDutyVO vo); + void setVOValue(ReviewDutyVO vo); + + + /** + *

方法名: listByRsId

+ *

方法描述: 按审理但查询

+ * + * @param rsId 审理单 + * @return java.util.List + * @author lyj + * @date 2022-12-20 15:01 + */ + List listByRsId(Long rsId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java index 3ffd53f3..a110740e 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewFaultService.java @@ -19,26 +19,38 @@ import java.util.List; * @since 2026-01-06 */ public interface IReviewFaultService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param reviewFault 查询参数 - * @return IPage - */ - IPage selectReviewFaultPage(IPage page, ReviewFaultVO reviewFault); + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewFault 查询参数 + * @return IPage + */ + IPage selectReviewFaultPage(IPage page, ReviewFaultVO reviewFault); - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportReviewFault(Wrapper queryWrapper); + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewFault(Wrapper queryWrapper); /** * VO + * * @param vo */ - void setVOValue(ReviewFaultVO vo); + void setVOValue(ReviewFaultVO vo); + + /** + *

方法名: listByRsId

+ *

方法描述: 按审理单查询

+ * + * @param rsId 审理单Id + * @return java.util.List + * @author lyj + * @date 2022-12-20 15:06 + */ + List listByRsId(Long rsId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java index fa74e7c2..7378c107 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetService.java @@ -3,11 +3,15 @@ */ package org.springblade.desk.quality.service; +import com.alibaba.fastjson.JSONObject; 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.basic.service.en.EnBaseService; import org.springblade.desk.quality.excel.ReviewSheetExcel; import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.vo.PpmReportDetailModel; +import org.springblade.desk.quality.pojo.vo.PrintChildReviewSheet; import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; import java.util.List; @@ -18,27 +22,114 @@ import java.util.List; * @author Tom Shuo * @since 2026-01-06 */ -public interface IReviewSheetService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param reviewSheet 查询参数 - * @return IPage - */ - IPage selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet); - - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportReviewSheet(Wrapper queryWrapper); +public interface IReviewSheetService extends EnBaseService { + + /** + * 自定义分页 + * + * @param page 分页参数 + * @param reviewSheet 查询参数 + * @return IPage + */ + IPage selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet); + + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportReviewSheet(Wrapper queryWrapper); /** * VO + * * @param vo */ - void setVOValue(ReviewSheetVO vo); + void setVOValue(ReviewSheetVO vo); + + /** + *

方法名: getByTrialId

+ *

方法描述: 按审理单erpId查询

+ * + * @param trialId + * @return com.videasoft.quality.model.QcReviewSheet + * @author lyj + * @date 2023-03-27 17:23 + */ + ReviewSheet getByTrialId(String trialId); + + /** + * @param wcId + * @return List + * @Description: 根据检验记录查询未完成的审理单信息 + * @Author dxl + * @CreateTime 2023/9/19 14:06 + */ + List getNoCompleteByWcId(Long wcId); + + /** + *

方法描述: 根据车间作业计划查询超过三小时未审完的审理单

+ *

方法名: getByWpId

+ * + * @param wpId@return com.videasoft.quality.model.QcReviewSheet + * @author cdl + * @date 2023/10/16 17:05 + */ + ReviewSheet getByWpId(Long wpId); + + /** + *

方法描述: 根据零件号与批次号查询审理单

+ *

方法名: getQcReviewSheetList

+ * + * @param partCode + * @param batchNo + * @return void + * @author cdl + * @date 2024/2/21 18:55 + */ + List getQcReviewSheetList(String partCode, String batchNo); + + List reviewFormMess(JSONObject data); + + /** + *

方法描述: 通过返工单查询生产处置单

+ *

方法名: getByRsCode

+ * + * @param rsCode + * @return void + * @author cdl + * @date 2024/6/6 17:49 + */ + ReviewSheet getByRsCode(String rsCode); + + /** + *

方法名: reviewResult

+ *

方法描述: 审理结束

+ * + * @param trialId 审理单ERPId + * @param resultStatus 审理状态 + * @param reviewMan 归档人员 + * @param liabilityPart 责任零件 + * @param scrapQty 报废数量 + * @param reworkQty 返工数量 + * @param concedeQty 让步数量 + * @param memo 审理意见 + * @throws Exception 验证 + * @author lyj + * @date 2023-03-27 17:20 + */ + void reviewResult(String trialId, Short resultStatus, String reviewMan, String liabilityPart, + Integer scrapQty, Integer reworkQty, Integer concedeQty, String memo) throws Exception; + + /** + * @param trialId + * @return void + * @Description: 审理单删除接口 + * @Author dxl + * @CreateTime 2023/11/17 11:20 + */ + void deleteReviewOrder(String trialId) throws Exception; + + } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetSubService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetSubService.java new file mode 100644 index 00000000..92c3047d --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IReviewSheetSubService.java @@ -0,0 +1,9 @@ +package org.springblade.desk.quality.service; + +import org.springblade.desk.basic.service.en.EnBaseService; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; + +public interface IReviewSheetSubService extends EnBaseService { + + boolean existTaskId(Long taskId); +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ISupplyInspectionService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ISupplyInspectionService.java index 37add2cd..2fef3e26 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ISupplyInspectionService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/ISupplyInspectionService.java @@ -41,4 +41,6 @@ public interface ISupplyInspectionService extends BaseService * @param vo */ void setVOValue(SupplyInspectionVO vo); + + void saveSupplyInspection(String woCode, String partCode, String batchNo, String value1); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java index 581ef04c..f6ff0452 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemDetailService.java @@ -19,26 +19,29 @@ import java.util.List; * @since 2026-01-06 */ public interface IWorkPlanItemDetailService extends BaseService { - /** - * 自定义分页 - * - * @param page 分页参数 - * @param workPlanItemDetail 查询参数 - * @return IPage - */ - IPage selectWorkPlanItemDetailPage(IPage page, WorkPlanItemDetailVO workPlanItemDetail); + /** + * 自定义分页 + * + * @param page 分页参数 + * @param workPlanItemDetail 查询参数 + * @return IPage + */ + IPage selectWorkPlanItemDetailPage(IPage page, WorkPlanItemDetailVO workPlanItemDetail); - /** - * 导出数据 - * - * @param queryWrapper 查询条件 - * @return List - */ - List exportWorkPlanItemDetail(Wrapper queryWrapper); + /** + * 导出数据 + * + * @param queryWrapper 查询条件 + * @return List + */ + List exportWorkPlanItemDetail(Wrapper queryWrapper); /** * VO + * * @param vo */ - void setVOValue(WorkPlanItemDetailVO vo); + void setVOValue(WorkPlanItemDetailVO vo); + + List listVOByWorkPlanItemId(Long workPlanItemId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java index f42b33ce..8162838c 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/IWorkPlanItemService.java @@ -42,7 +42,9 @@ public interface IWorkPlanItemService extends BaseService { */ void setVOValue(WorkPlanItemVO vo); + List listByWorkPlanId(Long workPlanId); + List listByTaskId(Long taskId); - List listByWorkPlanId(Long workPlanId); + List listVOByTaskId(Long taskId); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService2.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService2.java index a3471165..bb13c8bf 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService2.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/InspectionTaskService2.java @@ -16,7 +16,7 @@ import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.request.InspectionTaskEditResult; import org.springblade.desk.quality.pojo.request.InspectionTaskSearch; import org.springblade.desk.quality.pojo.request.InspectionTaskStartNew; -import org.springblade.desk.quality.pojo.request.InspectionTaskSubmit; +import org.springblade.desk.quality.pojo.request.InspectionTaskSubmitCheck; import org.springframework.stereotype.Service; import java.util.List; @@ -48,42 +48,6 @@ public class InspectionTaskService2 { return true; } - /** - * - * @param start - * @return - */ - public R startNew(InspectionTaskStartNew start) { - // todo:check工单有效性 - - // todo:check工序有效性 - - // todo:check制品有效性 - InspectionTask taskNew = new InspectionTask(); - genMapper.insert(taskNew); - // 查询工艺用到的，所有启用的检验项目。 - List itemList = itemGenMapper.selectList( - new QueryWrapper() - .eq(BaseCol.STATUS, BaseValue.STATE_ENABLE) - .eq("PROCESS_ID", start.getProcessId()) - .orderByAsc(BaseCol.ID) - ); - if (itemList.isEmpty()) { - return R.fail("没有关联的检测项目!"); - } - // 创建关联的检验结果集合。 - for (InspectionItem item : itemList) { - InspectionResult result = new InspectionResult(); - result.setInspectionTaskId(taskNew.getId()); - result.setInspectionItemId(item.getId()); - resultGenMapper.insert(result); - } - // 最终返回R - R rFinal = R.success("成功生成检测任务！"); - rFinal.setData(taskNew); - return rFinal; - } - public R> searchListPage(InspectionTaskSearch search) { List list = genMapper.selectList( new QueryWrapper() @@ -113,7 +77,7 @@ public class InspectionTaskService2 { * @param submit * @return */ - public R submit(InspectionTaskSubmit submit) { + public R submit(InspectionTaskSubmitCheck submit) { return null; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionItemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionItemServiceImpl.java index 904f4015..432eff44 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionItemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/InspectionItemServiceImpl.java @@ -43,4 +43,9 @@ public class InspectionItemServiceImpl extends BaseServiceImpl implements IInspectionTaskService { + @Resource + private IInspectionItemService itemService; + @Resource + private IWorkPlanItemService wpItemService; + @Resource + private IWorkPlanItemDetailService wpItemDetailService; + @Resource + private IReviewSheetSubService rsSubService; + @Resource private IUserClient userClient; @Resource private IDictClient dictClient; - @Resource - private IWorkPlanItemService workPlanItemService; @Override public IPage selectInspectionTaskPage(IPage page, InspectionTaskDetailVO inspectionTask) { @@ -67,10 +86,147 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl msgList = new ArrayList<>(); + msgList.add(msg1); + vo.setRemindMsgList(msgList); + vo.setWpItemList(wpItemService.listVOByTaskId(vo.getId())); + } + + @Override + public void setListVOValue(InspectionTaskListVO vo) { } + @Override + public InspectionTask getPrWorkCheckByWpId(Long wpId) { + if (IdUtil.isInvalid(wpId)) { + return null; + } + LambdaQueryWrapper qw = Wrappers.lambdaQuery(InspectionTask.class) + .eq(InspectionTask::getWpId, wpId) + .eq(InspectionTask::getIsDeleted, CommonConstant.DELETE_FALSE) + .orderByDesc(InspectionTask::getId); + return baseMapper.selectOne(qw); + } + + @Override + public void checkCompleteErpBackFill(String woCode, String deliverKey, Double workQty, Integer unqualifiedQty, + Long userId) throws BusinessException { + // todo: 调用 erp 存储过程 + } + + @Override + public List getPrWorkCheckListByWpId(Long wpId) { + if (IdUtil.isInvalid(wpId)) { + return null; + } + LambdaQueryWrapper qw = Wrappers.lambdaQuery(InspectionTask.class) + .eq(InspectionTask::getWpId, wpId) + .eq(InspectionTask::getIsDeleted, CommonConstant.DELETE_FALSE) + .orderByDesc(InspectionTask::getId); + return baseMapper.selectList(qw); + } + + @Override + public void saveOrEdit(InspectionTask task, Long userId) { + if (task.getId() != null) { + updateById(task); + } else { + task.setCheckUserId(userId); + task.setCheckDate(LocalDateTime.now()); + save(task); + } + } + + /** + * + * @param start + * @return + */ + @Transactional + public R startNew(InspectionTaskStartNew start) { + // todo:check工单有效性 + + // todo:check工序有效性 + + // todo:check制品有效性 + // 新建 InspectionTask + InspectionTask task = new InspectionTask(); + task.setId(null); + task.setStatus(InspectionTaskConst.CHECK_RESULT_TODO); + // 新插入 Task + save(task); + // 查询工序用到的，所有启用的检验项目。 + List itemList = null; + { + itemList = itemService.getBaseMapper().selectList( + new QueryWrapper() + .eq(BaseCol.STATUS, BaseValue.STATE_ENABLE) + .orderByAsc(BaseCol.ID) + ); + } + if (itemList == null || itemList.isEmpty()) { + return R.fail("没有关联的检测项目!"); + } + // 创建关联的 WorkPlanItem 集合。 + for (InspectionItem iItem : itemList) { + WorkPlanItem wpItem = new WorkPlanItem(); + // 结果未检验 + wpItem.setCheckResult(InspectionTaskConst.CHECK_RESULT_TODO); + // 关联 + wpItem.setItemId(iItem.getId()); + wpItem.setTaskId(task.getId()); + wpItem.setWpId(1L); + wpItem.setCheckQty(0d); + wpItem.setTestQty(0d); + wpItem.setLossQty(0d); + // 新插入 WorkPlanItem + wpItemService.save(wpItem); + if (InspectionItemConst.SPECIAL_TYPE_1.equals(iItem.getSpecialType()) || + InspectionItemConst.SPECIAL_TYPE_2.equals(iItem.getSpecialType()) || + InspectionItemConst.SPECIAL_TYPE_3.equals(iItem.getSpecialType())) { + for (int i = 0; i < 4; i++) { + WorkPlanItemDetail wpItemDetail = new WorkPlanItemDetail(); + wpItemDetail.setWorkPlanItemId(wpItem.getId()); + // 新插入 WorkPlanItemDetail + wpItemDetailService.save(wpItemDetail); + } + } + } + // 最终返回R + R rFinal = R.success("成功生成检测任务！"); + rFinal.setData(task); + return rFinal; + } + + @Override + public R fill(InspectionTaskDetailVO detailVO) { + // 更新 Task + updateById(detailVO); + for (WorkPlanItemVO wpItemVO : detailVO.getWpItemList()) { + WorkPlanItem wpItem = new WorkPlanItem(); + BeanUtil.copyProperties(wpItemVO, wpItem); + // 更新 WorkPlanItem + wpItemService.updateById(wpItem); + for (WorkPlanItemDetailVO wpItemDetailVO : wpItemVO.getWpItemDetailList()) { + WorkPlanItemDetail wpItemDetail = new WorkPlanItemDetail(); + BeanUtil.copyProperties(wpItemDetailVO, wpItemDetail); + // 更新 WorkPlanItemDetail + wpItemDetailService.updateById(wpItemDetail); + } + } + // + refreshStatusAndQty(detailVO.getId()); + return R.success("检验填报"); + } + @Override public IPage listSearch(IPage page, InspectionTaskSearch search) { return page.setRecords(baseMapper.listSearch(page, search)); @@ -82,29 +238,41 @@ public class InspectionTaskServiceImpl extends BaseServiceImpl itemList = workPlanItemService.listByTaskId(id); + List itemList = wpItemService.listByTaskId(id); StatusCountMap map = new StatusCountMap(); - int taskStatus = InspectionTaskConst.CHECK_RESULT_TODO; for (WorkPlanItem item : itemList) { - map.add1(item.getStatus()); + map.add1(item.getCheckResult()); } - int countToDo = map.getMap().get(InspectionTaskConst.CHECK_RESULT_TODO); - int countNA = map.getMap().get(InspectionTaskConst.CHECK_RESULT_NA); - int countOK = map.getMap().get(InspectionTaskConst.CHECK_RESULT_OK); - int countNO = map.getMap().get(InspectionTaskConst.CHECK_RESULT_NO); - // taskStatus 处理 + int countToDo = map.get(InspectionTaskConst.CHECK_RESULT_TODO); + int countOK = map.get(InspectionTaskConst.CHECK_RESULT_OK); + int countNO = map.get(InspectionTaskConst.CHECK_RESULT_NG); + int countNA = map.get(InspectionTaskConst.CHECK_RESULT_NA); + log.info("countToDo = {}", countToDo); + log.info("countOK = {}", countOK); + log.info("countNO = {}", countNO); + log.info("countNA = {}", countNA); + // checkResult 处理 + int checkResult = InspectionTaskConst.CHECK_RESULT_TODO; // 默认TODO if (countToDo == 0) { // 未检验为0 if (countOK == itemList.size()) { // 全部item 合格 - taskStatus = InspectionTaskConst.CHECK_RESULT_OK; + checkResult = InspectionTaskConst.CHECK_RESULT_OK; } else if (countNA == itemList.size()) { // 全部item NA - taskStatus = InspectionTaskConst.CHECK_RESULT_NA; - } else { - taskStatus = InspectionTaskConst.CHECK_RESULT_NO; + checkResult = InspectionTaskConst.CHECK_RESULT_NA; + } else if (countNO >= 0 && countNO <= itemList.size()) { // 不合格 + checkResult = InspectionTaskConst.CHECK_RESULT_NG; } } - task.setStatus(taskStatus); + task.setCheckResult(checkResult); // 保存最新状态 - save(task); - return taskStatus; + updateById(task); + // + if (InspectionTaskConst.CHECK_RESULT_NG.equals(task.getCheckResult())) { + if (!rsSubService.existTaskId(id)) { + ReviewSheet rs = new ReviewSheet(); + rs.setTaskId(id); + rsSubService.save(rs); + } + } + return checkResult; } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotHardnessServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotHardnessServiceImpl.java index 439f91ee..0273a905 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotHardnessServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/IotHardnessServiceImpl.java @@ -21,11 +21,11 @@ import org.springblade.desk.quality.pojo.vo.IotHardnessVO; import org.springblade.desk.quality.service.IIotHardnessService; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; -import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; +import java.util.Arrays; import java.util.List; /** @@ -124,6 +124,7 @@ public class IotHardnessServiceImpl extends BaseServiceImpl idList = Arrays.asList(10L, 11L, 12L, 13L); + mapper.physicalDeleteBatchByIds(idList); } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/RemindMsgServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/RemindMsgServiceImpl.java index ca3d073a..9dff3c18 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/RemindMsgServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/RemindMsgServiceImpl.java @@ -11,6 +11,9 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.util.IdUtil; +import org.springblade.desk.dashboard.pojo.entity.DsPartEntity; +import org.springblade.desk.dashboard.service.IDsPartService; import org.springblade.desk.quality.excel.RemindMsgExcel; import org.springblade.desk.quality.mapper.RemindMsgMapper; import org.springblade.desk.quality.pojo.entity.RemindMsg; @@ -39,23 +42,34 @@ public class RemindMsgServiceImpl extends BaseServiceImpl selectRemindMsgPage(IPage page, RemindMsgVO remindMsg) { - return page.setRecords(baseMapper.selectRemindMsgPage(page, remindMsg)); - } + @Override + public IPage selectRemindMsgPage(IPage page, RemindMsgVO remindMsg) { + return page.setRecords(baseMapper.selectRemindMsgPage(page, remindMsg)); + } - @Override - public List exportRemindMsg(Wrapper queryWrapper) { - List remindMsgList = baseMapper.exportRemindMsg(queryWrapper); - //remindMsgList.forEach(remindMsg -> { - // remindMsg.setTypeName(DictCache.getValue(DictEnum.YES_NO, RemindMsg.getType())); - //}); - return remindMsgList; - } + @Override + public List exportRemindMsg(Wrapper queryWrapper) { + List remindMsgList = baseMapper.exportRemindMsg(queryWrapper); + //remindMsgList.forEach(remindMsg -> { + // remindMsg.setTypeName(DictCache.getValue(DictEnum.YES_NO, RemindMsg.getType())); + //}); + return remindMsgList; + } - @Override + @Override public void setVOValue(RemindMsgVO vo) { - + if (IdUtil.isValid(vo.getPartId())) { + // todo: DsPartEntity.quota +// DsPartEntity part = dsPartService.getById(vo.getPartId()); +// if (part != null) { +// vo.setPartName(part.getPartName()); +// vo.setMatName(part.getMaterial()); +// vo.setPlatingName(part.getPlate()); +// vo.setProcessClazz1Name(part.getCraftWay()); +// } + } } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewDutyServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewDutyServiceImpl.java index 1fcec63f..efb2f01f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewDutyServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewDutyServiceImpl.java @@ -4,13 +4,17 @@ package org.springblade.desk.quality.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.CommonConstant; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.order.pojo.entity.YieldOrderCraft; import org.springblade.desk.quality.excel.ReviewDutyExcel; import org.springblade.desk.quality.mapper.ReviewDutyMapper; import org.springblade.desk.quality.pojo.entity.ReviewDuty; @@ -33,29 +37,38 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -public class ReviewDutyServiceImpl extends BaseServiceImpl implements IReviewDutyService { +public class ReviewDutyServiceImpl extends BaseServiceImpl + implements IReviewDutyService { @Resource private IUserClient userClient; @Resource private IDictClient dictClient; - @Override - public IPage selectReviewDutyPage(IPage page, ReviewDutyVO reviewDuty) { - return page.setRecords(baseMapper.selectReviewDutyPage(page, reviewDuty)); - } - - @Override - public List exportReviewDuty(Wrapper queryWrapper) { - List reviewDutyList = baseMapper.exportReviewDuty(queryWrapper); - //reviewDutyList.forEach(reviewDuty -> { - // reviewDuty.setTypeName(DictCache.getValue(DictEnum.YES_NO, ReviewDuty.getType())); - //}); - return reviewDutyList; - } - - @Override + @Override + public IPage selectReviewDutyPage(IPage page, ReviewDutyVO reviewDuty) { + return page.setRecords(baseMapper.selectReviewDutyPage(page, reviewDuty)); + } + + @Override + public List exportReviewDuty(Wrapper queryWrapper) { + List reviewDutyList = baseMapper.exportReviewDuty(queryWrapper); + //reviewDutyList.forEach(reviewDuty -> { + // reviewDuty.setTypeName(DictCache.getValue(DictEnum.YES_NO, ReviewDuty.getType())); + //}); + return reviewDutyList; + } + + @Override public void setVOValue(ReviewDutyVO vo) { } + + @Override + public List listByRsId(Long rsId) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReviewDuty.class) + .eq(ReviewDuty::getReviewSheetId, rsId) + .eq(ReviewDuty::getIsDeleted, CommonConstant.DELETE_FALSE); + return baseMapper.selectList(queryWrapper); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java index b7bd11bc..e78428e5 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewFaultServiceImpl.java @@ -4,15 +4,19 @@ package org.springblade.desk.quality.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.CommonConstant; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.quality.excel.ReviewFaultExcel; import org.springblade.desk.quality.mapper.ReviewFaultMapper; +import org.springblade.desk.quality.pojo.entity.ReviewDuty; import org.springblade.desk.quality.pojo.entity.ReviewFault; import org.springblade.desk.quality.pojo.vo.ReviewFaultVO; import org.springblade.desk.quality.service.IReviewFaultService; @@ -33,7 +37,8 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -public class ReviewFaultServiceImpl extends BaseServiceImpl implements IReviewFaultService { +public class ReviewFaultServiceImpl extends BaseServiceImpl + implements IReviewFaultService { @Resource private IUserClient userClient; @@ -58,4 +63,12 @@ public class ReviewFaultServiceImpl extends BaseServiceImpl listByRsId(Long rsId) { + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(ReviewFault.class) + .eq(ReviewFault::getReviewSheetId, rsId) + .eq(ReviewFault::getIsDeleted, CommonConstant.DELETE_FALSE); + return baseMapper.selectList(queryWrapper); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java index 421a37e7..8abd11a1 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetServiceImpl.java @@ -3,23 +3,40 @@ */ package org.springblade.desk.quality.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springblade.common.exception.BusinessException; import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; +import org.springblade.desk.basic.util.IdUtil; +import org.springblade.desk.device.pojo.entity.FeiBaSetEntity; +import org.springblade.desk.quality.constant.InspectionTaskConst; +import org.springblade.desk.quality.constant.ReviewSheetConst; import org.springblade.desk.quality.excel.ReviewSheetExcel; import org.springblade.desk.quality.mapper.ReviewSheetMapper; +import org.springblade.desk.quality.pojo.entity.InspectionTask; import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.pojo.vo.PpmReportDetailModel; +import org.springblade.desk.quality.pojo.vo.PrintChildReviewSheet; import org.springblade.desk.quality.pojo.vo.ReviewSheetVO; +import org.springblade.desk.quality.service.IInspectionTaskService; import org.springblade.desk.quality.service.IReviewSheetService; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; +import java.time.LocalDateTime; +import java.util.Date; import java.util.List; /** @@ -33,29 +50,135 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @Slf4j -public class ReviewSheetServiceImpl extends BaseServiceImpl implements IReviewSheetService { +public class ReviewSheetServiceImpl extends EnBaseServiceImpl + implements IReviewSheetService { + + @Resource + private IInspectionTaskService taskService; @Resource private IUserClient userClient; @Resource private IDictClient dictClient; - @Override - public IPage selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet) { - return page.setRecords(baseMapper.selectReviewSheetPage(page, reviewSheet)); - } - - @Override - public List exportReviewSheet(Wrapper queryWrapper) { - List reviewSheetList = baseMapper.exportReviewSheet(queryWrapper); - //reviewSheetList.forEach(reviewSheet -> { - // reviewSheet.setTypeName(DictCache.getValue(DictEnum.YES_NO, ReviewSheet.getType())); - //}); - return reviewSheetList; - } - - @Override + @Override + public IPage selectReviewSheetPage(IPage page, ReviewSheetVO reviewSheet) { + return page.setRecords(baseMapper.selectReviewSheetPage(page, reviewSheet)); + } + + @Override + public List exportReviewSheet(Wrapper queryWrapper) { + List reviewSheetList = baseMapper.exportReviewSheet(queryWrapper); + //reviewSheetList.forEach(reviewSheet -> { + // reviewSheet.setTypeName(DictCache.getValue(DictEnum.YES_NO, ReviewSheet.getType())); + //}); + return reviewSheetList; + } + + @Override public void setVOValue(ReviewSheetVO vo) { } + + /** + *

方法名: getByTrialId

+ *

方法描述: 按审理单erpId查询

+ * + * @param trialId + * @return com.videasoft.quality.model.QcReviewSheet + * @author lyj + * @date 2023-03-27 17:23 + */ + @Override + public ReviewSheet getByTrialId(String trialId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(StringUtils.isNotBlank(trialId), ReviewSheet::getErpId, trialId); + return baseMapper.selectOne(qw); + } + + @Override + public List getNoCompleteByWcId(Long wcId) { + if (IdUtil.isInvalid(wcId)) { + return null; + } + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(ReviewSheet::getWcId, wcId); + qw.in(ReviewSheet::getStatus, ReviewSheetConst.S_NEW, ReviewSheetConst.S_HEAR); + qw.orderByAsc(ReviewSheet::getRsCode); + return baseMapper.selectList(qw); + } + + @Override + public ReviewSheet getByWpId(Long wpId) { + if (IdUtil.isInvalid(wpId)) { + return null; + } + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(ReviewSheet::getWpId, wpId); + qw.eq(ReviewSheet::getStatus, ReviewSheetConst.S_HEAR); + return baseMapper.selectOne(qw); + } + + @Override + public List getQcReviewSheetList(String partCode, String batchNo) { + // todo: getQcReviewSheetList + return List.of(); + } + + @Override + public List reviewFormMess(JSONObject data) { + // todo: + return List.of(); + } + + @Override + public void reviewResult(String trialId, Short resultStatus, String reviewMan, String liabilityPart, + Integer scrapQty, Integer reworkQty, Integer concedeQty, String memo) throws Exception { + ReviewSheet rs = getByTrialId(trialId); + if (rs == null) { + throw new BusinessException("审理单信息不存在！"); + } + + InspectionTask wc = taskService.getById(rs.getTaskId()); + + // rs.setReviewUserId(); "reviewMan" + rs.setMemo(memo); + rs.setReviewDate(LocalDateTime.now()); + rs.setReviewStatus((int) resultStatus); // todo: + rs.setStatus(ReviewSheetConst.S_COMPLETE); + + // 装配模式 + if (ReviewSheetConst.MODE_ASSEMBLY.equals(rs.getReviewOrderMode())) { + + } + // 零件模式 + if (ReviewSheetConst.MODE_PART.equals(rs.getReviewOrderMode())) { + + } + + //zxh 20250617 审理结论为让步接收时，将检验记录中不合格数清零，检验状态改为合格 + if (resultStatus == 3) { + wc.setUnqualifiedQty(0d); + wc.setCheckResult(InspectionTaskConst.CHECK_RESULT_OK); + } + } + + @Override + public void deleteReviewOrder(String trialId) throws Exception { + ReviewSheet reviewSheet = getByTrialId(trialId); + if (reviewSheet == null) { + throw new BusinessException("审理单信息不存在！"); + } + + + // todo: + } + + @Override + public ReviewSheet getByRsCode(String rsCode) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(ReviewSheet::getRsCode, rsCode); + qw.orderByDesc(ReviewSheet::getId); + return baseMapper.selectOne(qw); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetSubServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetSubServiceImpl.java new file mode 100644 index 00000000..3574f20c --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/ReviewSheetSubServiceImpl.java @@ -0,0 +1,29 @@ +package org.springblade.desk.quality.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.extern.slf4j.Slf4j; +import org.springblade.desk.basic.service.en.impl.EnBaseServiceImpl; +import org.springblade.desk.quality.mapper.ReviewSheetMapper; +import org.springblade.desk.quality.pojo.entity.ReviewSheet; +import org.springblade.desk.quality.service.IReviewSheetSubService; +import org.springframework.stereotype.Service; + +@Service +@Data +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +@Slf4j +public class ReviewSheetSubServiceImpl extends EnBaseServiceImpl + implements IReviewSheetSubService { + + @Override + public boolean existTaskId(Long taskId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(ReviewSheet::getTaskId, taskId); + return baseMapper.exists(qw); + } +} diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/SupplyInspectionServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/SupplyInspectionServiceImpl.java index bf1ad1bb..4547b201 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/SupplyInspectionServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/SupplyInspectionServiceImpl.java @@ -20,6 +20,7 @@ import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; /** @@ -40,22 +41,33 @@ public class SupplyInspectionServiceImpl extends BaseServiceImpl selectSupplyInspectionPage(IPage page, SupplyInspectionVO supplyInspection) { - return page.setRecords(baseMapper.selectSupplyInspectionPage(page, supplyInspection)); - } - - @Override - public List exportSupplyInspection(Wrapper queryWrapper) { - List supplyInspectionList = baseMapper.exportSupplyInspection(queryWrapper); - //supplyInspectionList.forEach(supplyInspection -> { - // supplyInspection.setTypeName(DictCache.getValue(DictEnum.YES_NO, SupplyInspection.getType())); - //}); - return supplyInspectionList; - } - - @Override + @Override + public IPage selectSupplyInspectionPage(IPage page, SupplyInspectionVO supplyInspection) { + return page.setRecords(baseMapper.selectSupplyInspectionPage(page, supplyInspection)); + } + + @Override + public List exportSupplyInspection(Wrapper queryWrapper) { + List supplyInspectionList = baseMapper.exportSupplyInspection(queryWrapper); + //supplyInspectionList.forEach(supplyInspection -> { + // supplyInspection.setTypeName(DictCache.getValue(DictEnum.YES_NO, SupplyInspection.getType())); + //}); + return supplyInspectionList; + } + + @Override public void setVOValue(SupplyInspectionVO vo) { } + + @Override + public void saveSupplyInspection(String woCode, String partCode, String batchNo, String value1) { + SupplyInspection si = new SupplyInspection(); + si.setWoCode(woCode); + si.setPartCode(partCode); + si.setBatchNo(batchNo); + si.setTestThickness(value1); + si.setCreateTime(new Date()); + save(si); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java index fa99427a..e0ead8fb 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemDetailServiceImpl.java @@ -4,7 +4,9 @@ package org.springblade.desk.quality.service.impl; import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import jakarta.annotation.Resource; import lombok.AllArgsConstructor; import lombok.Data; @@ -13,9 +15,13 @@ import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.desk.quality.excel.WorkPlanItemDetailExcel; import org.springblade.desk.quality.mapper.WorkPlanItemDetailMapper; +import org.springblade.desk.quality.pojo.entity.WorkPlanItem; import org.springblade.desk.quality.pojo.entity.WorkPlanItemDetail; import org.springblade.desk.quality.pojo.vo.WorkPlanItemDetailVO; +import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; import org.springblade.desk.quality.service.IWorkPlanItemDetailService; +import org.springblade.desk.quality.wrapper.WorkPlanItemDetailWrapper; +import org.springblade.desk.quality.wrapper.WorkPlanItemWrapper; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; @@ -40,22 +46,35 @@ public class WorkPlanItemDetailServiceImpl extends BaseServiceImpl selectWorkPlanItemDetailPage(IPage page, WorkPlanItemDetailVO workPlanItemDetail) { - return page.setRecords(baseMapper.selectWorkPlanItemDetailPage(page, workPlanItemDetail)); - } - - @Override - public List exportWorkPlanItemDetail(Wrapper queryWrapper) { - List workPlanItemDetailList = baseMapper.exportWorkPlanItemDetail(queryWrapper); - //workPlanItemDetailList.forEach(workPlanItemDetail -> { - // workPlanItemDetail.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkPlanItemDetail.getType())); - //}); - return workPlanItemDetailList; - } - - @Override + @Override + public IPage selectWorkPlanItemDetailPage(IPage page, WorkPlanItemDetailVO workPlanItemDetail) { + return page.setRecords(baseMapper.selectWorkPlanItemDetailPage(page, workPlanItemDetail)); + } + + @Override + public List exportWorkPlanItemDetail(Wrapper queryWrapper) { + List workPlanItemDetailList = baseMapper.exportWorkPlanItemDetail(queryWrapper); + //workPlanItemDetailList.forEach(workPlanItemDetail -> { + // workPlanItemDetail.setTypeName(DictCache.getValue(DictEnum.YES_NO, WorkPlanItemDetail.getType())); + //}); + return workPlanItemDetailList; + } + + @Override public void setVOValue(WorkPlanItemDetailVO vo) { } + + @Override + public List listVOByWorkPlanItemId(Long workPlanItemId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(WorkPlanItemDetail::getWorkPlanItemId, workPlanItemId); + qw.orderByAsc(WorkPlanItemDetail::getId); + List list = list(qw); + List listVO = WorkPlanItemDetailWrapper.build().listVO(list); + for (WorkPlanItemDetailVO vo : listVO) { + setVOValue(vo); + } + return listVO; + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java index 12cd9c09..208ac35a 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/WorkPlanItemServiceImpl.java @@ -14,16 +14,28 @@ import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.mp.support.Condition; +import org.springblade.desk.quality.constant.InspectionItemConst; import org.springblade.desk.quality.excel.WorkPlanItemExcel; import org.springblade.desk.quality.mapper.WorkPlanItemMapper; +import org.springblade.desk.quality.pojo.entity.InspectionItem; +import org.springblade.desk.quality.pojo.entity.Standard; import org.springblade.desk.quality.pojo.entity.WorkPlanItem; +import org.springblade.desk.quality.pojo.vo.InspectionItemVO; +import org.springblade.desk.quality.pojo.vo.StandardVO; import org.springblade.desk.quality.pojo.vo.WorkPlanItemVO; +import org.springblade.desk.quality.service.IInspectionItemService; +import org.springblade.desk.quality.service.IStandardService; +import org.springblade.desk.quality.service.IWorkPlanItemDetailService; import org.springblade.desk.quality.service.IWorkPlanItemService; +import org.springblade.desk.quality.wrapper.InspectionItemWrapper; +import org.springblade.desk.quality.wrapper.StandardWrapper; +import org.springblade.desk.quality.wrapper.WorkPlanItemWrapper; import org.springblade.system.feign.IDictClient; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import java.util.List; +import java.util.stream.Collectors; /** * [工序检验项] 服务实现类 @@ -43,6 +55,12 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl selectWorkPlanItemPage(IPage page, WorkPlanItemVO workPlanItem) { @@ -60,20 +78,54 @@ public class WorkPlanItemServiceImpl extends BaseServiceImpl listByWorkPlanId(Long wpId) { + LambdaQueryWrapper qw = Wrappers.lambdaQuery(); + qw.eq(WorkPlanItem::getWpId, wpId); + qw.orderByAsc(WorkPlanItem::getItemCode); + return list(qw); } @Override public List listByTaskId(Long taskId) { LambdaQueryWrapper qw = Wrappers.lambdaQuery(); qw.eq(WorkPlanItem::getTaskId, taskId); + qw.orderByAsc(WorkPlanItem::getItemCode); return list(qw); } @Override - public List listByWorkPlanId(Long wpId) { + public List listVOByTaskId(Long taskId) { LambdaQueryWrapper qw = Wrappers.lambdaQuery(); - qw.eq(WorkPlanItem::getWpId, wpId); - return list(qw); + qw.eq(WorkPlanItem::getTaskId, taskId); + qw.orderByAsc(WorkPlanItem::getItemCode); + List list = list(qw); + List listVO = WorkPlanItemWrapper.build().listVO(list); + for (WorkPlanItemVO vo : listVO) { + setVOValue(vo); + } + return listVO; } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskDetailWrapper.java similarity index 82% rename from blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskWrapper.java rename to blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskDetailWrapper.java index 57cf5cd9..e3d39b54 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskWrapper.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskDetailWrapper.java @@ -16,10 +16,10 @@ import java.util.Objects; * @author Tom Shuo * @since 2025-12-23 */ -public class InspectionTaskWrapper extends BaseEntityWrapper { +public class InspectionTaskDetailWrapper extends BaseEntityWrapper { - public static InspectionTaskWrapper build() { - return new InspectionTaskWrapper(); + public static InspectionTaskDetailWrapper build() { + return new InspectionTaskDetailWrapper(); } @Override diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskListWrapper.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskListWrapper.java new file mode 100644 index 00000000..83e4063b --- /dev/null +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/wrapper/InspectionTaskListWrapper.java @@ -0,0 +1,37 @@ +/** + * Author: Tom Shuo + */ +package org.springblade.desk.quality.wrapper; + +import org.springblade.core.mp.support.BaseEntityWrapper; +import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.desk.quality.pojo.entity.InspectionTask; +import org.springblade.desk.quality.pojo.vo.InspectionTaskDetailVO; +import org.springblade.desk.quality.pojo.vo.InspectionTaskListVO; + +import java.util.Objects; + +/** + * [检验任务] 包装类,返回视图层所需的字段 + * + * @author Tom Shuo + * @since 2025-12-23 + */ +public class InspectionTaskListWrapper extends BaseEntityWrapper { + + public static InspectionTaskListWrapper build() { + return new InspectionTaskListWrapper(); + } + + @Override + public InspectionTaskListVO entityVO(InspectionTask inspectionTask) { + InspectionTaskListVO VO = Objects.requireNonNull(BeanUtil.copyProperties(inspectionTask, InspectionTaskListVO.class)); + + //User createUser = UserCache.getUser(inspectionTask.getCreateUser()); + //User updateUser = UserCache.getUser(inspectionTask.getUpdateUser()); + //inspectionTaskVO.setCreateUserName(createUser.getName()); + //inspectionTaskVO.setUpdateUserName(updateUser.getName()); + + return VO; + } +}