feat(mes): 重构缺陷记录相关类的包结构，更新缺陷等级字段类型为整数，优化缺陷记录内联编辑组件

YunaiV
1 parent 1b0d0773
Showing 11 changed files with 28 additions and 26 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/MesQcDefectRecordController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectPageReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/defect/vo/MesQcDefectSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/qc/defect/MesQcDefectDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/qc/defect/MesQcDefectRecordMapper.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectRecordService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/defect/MesQcDefectRecordServiceImpl.java
@@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.mes.controller.admin.qc.defect;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordRespVO;
-import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordRespVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defect.MesQcDefectRecordDO;
 import cn.iocoder.yudao.module.mes.service.qc.defect.MesQcDefectRecordService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -31,14 +31,14 @@ public class MesQcDefectRecordController {
     // TODO @芋艿：说下 mes:qc-record 这个权限标识的情况
     @PostMapping("/create")
     @Operation(summary = "创建质检缺陷记录")
-    @PreAuthorize("@ss.hasPermission('mes:qc-record:create')")
+    @PreAuthorize("@ss.hasPermission('mes:qc-defect:create')")
     public CommonResult<Long> createDefectRecord(@Valid @RequestBody MesQcDefectRecordSaveReqVO createReqVO) {
         return success(defectRecordService.createDefectRecord(createReqVO));
     }
     @PutMapping("/update")
     @Operation(summary = "更新质检缺陷记录")
-    @PreAuthorize("@ss.hasPermission('mes:qc-record:update')")
+    @PreAuthorize("@ss.hasPermission('mes:qc-defect:update')")
     public CommonResult<Boolean> updateDefectRecord(@Valid @RequestBody MesQcDefectRecordSaveReqVO updateReqVO) {
         defectRecordService.updateDefectRecord(updateReqVO);
         return success(true);
@@ -47,7 +47,7 @@ public class MesQcDefectRecordController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除质检缺陷记录")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('mes:qc-record:update')")
+    @PreAuthorize("@ss.hasPermission('mes:qc-defect:update')")
     public CommonResult<Boolean> deleteDefectRecord(@RequestParam("id") Long id) {
         defectRecordService.deleteDefectRecord(id);
         return success(true);
@@ -55,7 +55,7 @@ public class MesQcDefectRecordController {
     @GetMapping("/page")
     @Operation(summary = "获得质检缺陷记录分页")
-    @PreAuthorize("@ss.hasPermission('mes:qc-record:query')")
+    @PreAuthorize("@ss.hasPermission('mes:qc-defect:query')")
     public CommonResult<PageResult<MesQcDefectRecordRespVO>> getDefectRecordPage(@Valid MesQcDefectRecordPageReqVO pageReqVO) {
         PageResult<MesQcDefectRecordDO> pageResult = defectRecordService.getDefectRecordPage(pageReqVO);
         return success(BeanUtils.toBean(pageResult, MesQcDefectRecordRespVO.class));
@@ -21,7 +21,7 @@ public class MesQcDefectPageReqVO extends PageParam {
     @Schema(description = "检测项类型", example = "APPEARANCE")
     private String type;
-    @Schema(description = "缺陷等级", example = "MIN")
-    private String level;
+    @Schema(description = "缺陷等级", example = "1")
+    private Integer level;
 }
@@ -32,10 +32,10 @@ public class MesQcDefectRespVO {
     @DictFormat(DictTypeConstants.MES_INDEX_TYPE)
     private String type;
-    @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "MIN")
+    @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     @ExcelProperty(value = "缺陷等级", converter = DictConvert.class)
     @DictFormat(DictTypeConstants.MES_DEFECT_LEVEL)
-    private String level;
+    private Integer level;
     @Schema(description = "备注", example = "备注")
     @ExcelProperty("备注")
 package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo;
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 @Schema(description = "管理后台 - MES 缺陷类型新增/修改 Request VO")
@@ -23,9 +26,10 @@ public class MesQcDefectSaveReqVO {
     @NotEmpty(message = "检测项类型不能为空")
     private String type;
-    @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "MIN")
-    @NotEmpty(message = "缺陷等级不能为空")
-    private String level;
+    @Schema(description = "缺陷等级", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "缺陷等级不能为空")
+    @InEnum(MesQcDefectLevelEnum.class)
+    private Integer level;
     @Schema(description = "备注", example = "备注")
     private String remark;
-package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo;
+package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import io.swagger.v3.oas.annotations.media.Schema;
-package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo;
+package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo;
+package cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record;
 import cn.iocoder.yudao.framework.common.validation.InEnum;
 import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum;
@@ -42,14 +42,12 @@ public class MesQcDefectDO extends BaseDO {
      * 字典类型 mes_index_type
      */
     private String type;
-    // TODO @AI：改成 mes_defect_level；另外，dict constants 里也写下
-    // TODO @AI：枚举类；
     /**
      * 缺陷等级
      *
-     * 字典类型 mes_defect_level
+     * 枚举 {@link cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum}
      */
-    private String level;
+    private Integer level;
     /**
      * 备注
      */
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.mes.dal.mysql.qc.defect;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
-import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordPageReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defect.MesQcDefectRecordDO;
 import org.apache.ibatis.annotations.Mapper;
 package cn.iocoder.yudao.module.mes.service.qc.defect;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defect.MesQcDefectRecordDO;
 import jakarta.validation.Valid;
@@ -2,8 +2,8 @@ package cn.iocoder.yudao.module.mes.service.qc.defect;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordPageReqVO;
-import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.MesQcDefectRecordSaveReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordPageReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.qc.defect.vo.record.MesQcDefectRecordSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defect.MesQcDefectRecordDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.qc.defect.MesQcDefectRecordMapper;
 import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;