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; /**