diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/DemoTestController.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/DemoTestController.java index e0ea321..764765f 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/DemoTestController.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/DemoTestController.java @@ -4,12 +4,12 @@ import com.yunxi.scm.framework.common.pojo.CommonResult; import com.yunxi.scm.framework.excel.core.util.ExcelUtils; import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX; import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog; -import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialExportTestVO; -import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialImportTestVO; -import com.yunxi.scm.module.demo.convert.material.MaterialXConvert; -import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialXDO; -import com.yunxi.scm.module.demo.dal.mysql.material.MaterialXMapper; -import com.yunxi.scm.module.demo.enums.material.CategoryEnum; +import com.yunxi.scm.module.demo.controller.admin.pmaterial.vo.PMaterialExportTestVO; +import com.yunxi.scm.module.demo.controller.admin.pmaterial.vo.PMaterialImportTestVO; +import com.yunxi.scm.module.demo.convert.pmaterial.PMaterialXConvert; +import com.yunxi.scm.module.demo.dal.dataobject.pmaterial.PMaterialXDO; +import com.yunxi.scm.module.demo.dal.mysql.pmaterial.PMaterialXMapper; +import com.yunxi.scm.module.demo.enums.pmaterial.CategoryEnum; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Parameters; @@ -51,13 +51,13 @@ public class DemoTestController { @PermitAll @OperateLog(type = EXPORT) public void testExport(HttpServletResponse response) throws IOException { - MaterialXDO xdo1 = new MaterialXDO(1L,"80inu5yxl3",Arrays.asList("1","2")); - MaterialXDO xdo2 = new MaterialXDO(2L,"Q2ZY1I9cCBf0YKvDUlzCbw==",Arrays.asList("1","3")); - List xdos = new ArrayList<>(); + PMaterialXDO xdo1 = new PMaterialXDO(1L,"80inu5yxl3",Arrays.asList("1","2")); + PMaterialXDO xdo2 = new PMaterialXDO(2L,"Q2ZY1I9cCBf0YKvDUlzCbw==",Arrays.asList("1","3")); + List xdos = new ArrayList<>(); xdos.add(xdo1); xdos.add(xdo2); - List datas = MaterialXConvert.INSTANCE.convertList03(xdos); - ExcelUtils.write(response, "测试导出.xls", "数据", MaterialExportTestVO.class, datas); + List datas = PMaterialXConvert.INSTANCE.convertList03(xdos); + ExcelUtils.write(response, "测试导出.xls", "数据", PMaterialExportTestVO.class, datas); } @@ -69,9 +69,9 @@ public class DemoTestController { @Parameter(name = "file", description = "Excel 文件", required = true), @Parameter(name = "updateSupport", description = "是否支持更新，默认为 false", example = "true") }) - public CommonResult> testImport(@RequestParam("file") MultipartFile file, - @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws IOException { - List list = ExcelUtils.read(file, MaterialImportTestVO.class); + public CommonResult> testImport(@RequestParam("file") MultipartFile file, + @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws IOException { + List list = ExcelUtils.read(file, PMaterialImportTestVO.class); return success(list); } @@ -83,23 +83,23 @@ public class DemoTestController { List values = Stream.of(CategoryEnum.COMMON.getCode(),CategoryEnum.KANJIA.getCode()) .map(String::valueOf).collect(Collectors.toList()); // 手动创建导出 demo - List list = Arrays.asList( - MaterialImportTestVO.builder().category(values).build() + List list = Arrays.asList( + PMaterialImportTestVO.builder().category(values).build() ); // 输出 - ExcelUtils.write(response, "导入模板.xls", "物料标准模版", MaterialImportTestVO.class, list); + ExcelUtils.write(response, "导入模板.xls", "物料标准模版", PMaterialImportTestVO.class, list); } @Resource - MaterialXMapper materialXMapper; + PMaterialXMapper materialXMapper; @GetMapping("/test_encrypt") @Operation(summary = "测试字段加密") @PermitAll public CommonResult testEncrypt() { - MaterialXDO xdo1 = new MaterialXDO(1L,"80inu5yxl3",Arrays.asList("1","2")); - MaterialXDO xdo2 = new MaterialXDO(2L,"80inu5yxl3",Arrays.asList("1","3")); - List xdos = new ArrayList<>(); + PMaterialXDO xdo1 = new PMaterialXDO(1L,"80inu5yxl3",Arrays.asList("1","2")); + PMaterialXDO xdo2 = new PMaterialXDO(2L,"80inu5yxl3",Arrays.asList("1","3")); + List xdos = new ArrayList<>(); xdos.add(xdo1); xdos.add(xdo2); materialXMapper.insertBatch(xdos); @@ -109,11 +109,11 @@ public class DemoTestController { @GetMapping("/test_decrypt") @Operation(summary = "测试字段解密") @PermitAll - public CommonResult testDecrypt() { - LambdaQueryWrapperX wrapperX = new LambdaQueryWrapperX<>(); - wrapperX.eq(MaterialXDO::getId, 1); - MaterialXDO xdo = materialXMapper.selectOne(wrapperX); - return success(MaterialXConvert.INSTANCE.convert(xdo)); + public CommonResult testDecrypt() { + LambdaQueryWrapperX wrapperX = new LambdaQueryWrapperX<>(); + wrapperX.eq(PMaterialXDO::getId, 1); + PMaterialXDO xdo = materialXMapper.selectOne(wrapperX); + return success(PMaterialXConvert.INSTANCE.convert(xdo)); } } diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/PMaterialController.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/PMaterialController.java similarity index 68% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/PMaterialController.java rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/PMaterialController.java index aa3121b..310ed69 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/PMaterialController.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/PMaterialController.java @@ -1,14 +1,14 @@ -package com.yunxi.scm.module.demo.controller.admin.material; +package com.yunxi.scm.module.demo.controller.admin.pmaterial; import com.yunxi.scm.framework.common.pojo.CommonResult; import com.yunxi.scm.framework.common.pojo.PageResult; import com.yunxi.scm.framework.datapermission.core.annotation.DataPermission; import com.yunxi.scm.framework.excel.core.util.ExcelUtils; import com.yunxi.scm.framework.operatelog.core.annotations.OperateLog; -import com.yunxi.scm.module.demo.controller.admin.material.vo.*; -import com.yunxi.scm.module.demo.convert.material.MaterialConvert; -import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDO; -import com.yunxi.scm.module.demo.service.material.PMaterialService; +import com.yunxi.scm.module.demo.controller.admin.pmaterial.vo.*; +import com.yunxi.scm.module.demo.convert.pmaterial.PMaterialConvert; +import com.yunxi.scm.module.demo.dal.dataobject.pmaterial.PMaterialDO; +import com.yunxi.scm.module.demo.service.pmaterial.PMaterialService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -38,14 +38,14 @@ public class PMaterialController { @PostMapping("/create") @Operation(summary = "创建物料管理") @PreAuthorize("@ss.hasPermission('demo:material:create')") - public CommonResult createMaterial(@Valid @RequestBody MaterialCreateReqVO createReqVO) { + public CommonResult createMaterial(@Valid @RequestBody PMaterialCreateReqVO createReqVO) { return success(materialService.createMaterial(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新物料管理") @PreAuthorize("@ss.hasPermission('demo:material:update')") - public CommonResult updateMaterial(@Valid @RequestBody MaterialUpdateReqVO updateReqVO) { + public CommonResult updateMaterial(@Valid @RequestBody PMaterialUpdateReqVO updateReqVO) { materialService.updateMaterial(updateReqVO); return success(true); } @@ -63,39 +63,39 @@ public class PMaterialController { @Operation(summary = "获得物料管理") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('demo:material:query')") - public CommonResult getMaterial(@RequestParam("id") Long id) { - MaterialDO material = materialService.getMaterial(id); - return success(MaterialConvert.INSTANCE.convert(material)); + public CommonResult getMaterial(@RequestParam("id") Long id) { + PMaterialDO material = materialService.getMaterial(id); + return success(PMaterialConvert.INSTANCE.convert(material)); } @GetMapping("/list") @Operation(summary = "获得物料管理列表") @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048") @PreAuthorize("@ss.hasPermission('demo:material:query')") - public CommonResult> getMaterialList(@RequestParam("ids") Collection ids) { - List list = materialService.getMaterialList(ids); - return success(MaterialConvert.INSTANCE.convertList(list)); + public CommonResult> getMaterialList(@RequestParam("ids") Collection ids) { + List list = materialService.getMaterialList(ids); + return success(PMaterialConvert.INSTANCE.convertList(list)); } @GetMapping("/page") @Operation(summary = "获得物料管理分页") @PreAuthorize("@ss.hasPermission('demo:material:query')") @DataPermission // 数据权限功能，默认是开启的 - public CommonResult> getMaterialPage(@Valid MaterialPageReqVO pageVO) { - PageResult pageResult = materialService.getMaterialPage(pageVO); - return success(MaterialConvert.INSTANCE.convertPage(pageResult)); + public CommonResult> getMaterialPage(@Valid PMaterialPageReqVO pageVO) { + PageResult pageResult = materialService.getMaterialPage(pageVO); + return success(PMaterialConvert.INSTANCE.convertPage(pageResult)); } @GetMapping("/export-excel") @Operation(summary = "导出物料管理 Excel") @PreAuthorize("@ss.hasPermission('demo:material:export')") @OperateLog(type = EXPORT) - public void exportMaterialExcel(@Valid MaterialExportReqVO exportReqVO, + public void exportMaterialExcel(@Valid PMaterialExportReqVO exportReqVO, HttpServletResponse response) throws IOException { - List list = materialService.getMaterialList(exportReqVO); + List list = materialService.getMaterialList(exportReqVO); // 导出 Excel - List datas = MaterialConvert.INSTANCE.convertList02(list); - ExcelUtils.write(response, "物料管理.xls", "数据", MaterialExcelVO.class, datas); + List datas = PMaterialConvert.INSTANCE.convertList02(list); + ExcelUtils.write(response, "物料管理.xls", "数据", PMaterialExcelVO.class, datas); } } diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialBaseVO.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialBaseVO.java similarity index 94% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialBaseVO.java rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialBaseVO.java index 24bd461..efd55e7 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialBaseVO.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialBaseVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.demo.controller.admin.material.vo; +package com.yunxi.scm.module.demo.controller.admin.pmaterial.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -12,7 +12,7 @@ import java.util.List; * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成 */ @Data -public class MaterialBaseVO { +public class PMaterialBaseVO { @Schema(description = "名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") @NotNull(message = "名称不能为空") diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialCreateReqVO.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialCreateReqVO.java similarity index 54% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialCreateReqVO.java rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialCreateReqVO.java index 5c33d46..b5c9c90 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialCreateReqVO.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialCreateReqVO.java @@ -1,14 +1,12 @@ -package com.yunxi.scm.module.demo.controller.admin.material.vo; +package com.yunxi.scm.module.demo.controller.admin.pmaterial.vo; import lombok.*; -import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import javax.validation.constraints.*; @Schema(description = "管理后台 - 物料管理创建 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class MaterialCreateReqVO extends MaterialBaseVO { +public class PMaterialCreateReqVO extends PMaterialBaseVO { } diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialExcelVO.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialExcelVO.java similarity index 92% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialExcelVO.java rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialExcelVO.java index d289090..bc17317 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialExcelVO.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialExcelVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.demo.controller.admin.material.vo; +package com.yunxi.scm.module.demo.controller.admin.pmaterial.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.yunxi.scm.framework.excel.core.annotations.DictFormat; @@ -18,7 +18,7 @@ import java.util.List; * @author ccongli */ @Data -public class MaterialExcelVO { +public class PMaterialExcelVO { @ExcelProperty("编号") private Long id; diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialExportReqVO.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialExportReqVO.java similarity index 83% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialExportReqVO.java rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialExportReqVO.java index 52b645b..a7eebc4 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialExportReqVO.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialExportReqVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.demo.controller.admin.material.vo; +package com.yunxi.scm.module.demo.controller.admin.pmaterial.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -8,9 +8,9 @@ import java.time.LocalDateTime; import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; -@Schema(description = "管理后台 - 物料管理 Excel 导出 Request VO，参数和 MaterialPageReqVO 是一致的") +@Schema(description = "管理后台 - 物料管理 Excel 导出 Request VO，参数和 PMaterialPageReqVO 是一致的") @Data -public class MaterialExportReqVO { +public class PMaterialExportReqVO { @Schema(description = "名称", example = "李四") private String name; diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialExportTestVO.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialExportTestVO.java similarity index 84% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialExportTestVO.java rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialExportTestVO.java index 55330c8..065301b 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialExportTestVO.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialExportTestVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.demo.controller.admin.material.vo; +package com.yunxi.scm.module.demo.controller.admin.pmaterial.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.yunxi.scm.framework.excel.core.annotations.DictFormat; @@ -10,7 +10,7 @@ import java.util.List; // 测试转换 @Data -public class MaterialExportTestVO { +public class PMaterialExportTestVO { @ExcelProperty(value = "密码") private String password; diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialImportTestVO.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialImportTestVO.java similarity index 87% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialImportTestVO.java rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialImportTestVO.java index 63ddb9c..0da6e1c 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialImportTestVO.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialImportTestVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.demo.controller.admin.material.vo; +package com.yunxi.scm.module.demo.controller.admin.pmaterial.vo; import com.alibaba.excel.annotation.ExcelProperty; import com.yunxi.scm.framework.excel.core.annotations.DictFormat; @@ -17,7 +17,7 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor @Accessors(chain = false) // 设置 chain = false，避免用户导入有问题 -public class MaterialImportTestVO { +public class PMaterialImportTestVO { diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialPageReqVO.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialPageReqVO.java similarity index 89% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialPageReqVO.java rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialPageReqVO.java index 1f97dfa..e9b00d2 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialPageReqVO.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialPageReqVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.demo.controller.admin.material.vo; +package com.yunxi.scm.module.demo.controller.admin.pmaterial.vo; import com.yunxi.scm.framework.common.pojo.PageParam; import io.swagger.v3.oas.annotations.media.Schema; @@ -15,7 +15,7 @@ import static com.yunxi.scm.framework.common.util.date.DateUtils.FORMAT_YEAR_MON @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class MaterialPageReqVO extends PageParam { +public class PMaterialPageReqVO extends PageParam { @Schema(description = "名称", example = "李四") private String name; diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialRespVO.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialRespVO.java similarity index 80% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialRespVO.java rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialRespVO.java index cb1ff3d..465c32b 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialRespVO.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialRespVO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.demo.controller.admin.material.vo; +package com.yunxi.scm.module.demo.controller.admin.pmaterial.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -8,7 +8,7 @@ import java.time.LocalDateTime; @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class MaterialRespVO extends MaterialBaseVO { +public class PMaterialRespVO extends PMaterialBaseVO { @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14541") private Long id; diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialUpdateReqVO.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialUpdateReqVO.java similarity index 74% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialUpdateReqVO.java rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialUpdateReqVO.java index 33089ba..9c5a218 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/material/vo/MaterialUpdateReqVO.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/controller/admin/pmaterial/vo/PMaterialUpdateReqVO.java @@ -1,15 +1,15 @@ -package com.yunxi.scm.module.demo.controller.admin.material.vo; +package com.yunxi.scm.module.demo.controller.admin.pmaterial.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; -import java.util.*; + import javax.validation.constraints.*; @Schema(description = "管理后台 - 物料管理更新 Request VO") @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class MaterialUpdateReqVO extends MaterialBaseVO { +public class PMaterialUpdateReqVO extends PMaterialBaseVO { @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "14541") @NotNull(message = "ID不能为空") diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/convert/material/MaterialConvert.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/convert/material/MaterialConvert.java deleted file mode 100644 index 0c6b6cb..0000000 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/convert/material/MaterialConvert.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.yunxi.scm.module.demo.convert.material; - -import com.yunxi.scm.framework.common.pojo.PageResult; -import com.yunxi.scm.module.demo.controller.admin.material.vo.*; -import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDO; -import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialXDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 物料管理 Convert - * - * @author ccongli - */ -@Mapper -public interface MaterialConvert { - - MaterialConvert INSTANCE = Mappers.getMapper(MaterialConvert.class); - - MaterialDO convert(MaterialCreateReqVO bean); - - MaterialDO convert(MaterialUpdateReqVO bean); - - MaterialRespVO convert(MaterialDO bean); - - List convertList(List list); - - PageResult convertPage(PageResult page); - - List convertList02(List list); - - - List convertList03(List list); - -} diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/convert/material/MaterialXConvert.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/convert/material/MaterialXConvert.java deleted file mode 100644 index b59f25f..0000000 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/convert/material/MaterialXConvert.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.yunxi.scm.module.demo.convert.material; - -import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialExportTestVO; -import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialXDO; -import org.mapstruct.Mapper; -import org.mapstruct.factory.Mappers; - -import java.util.List; - -/** - * 物料管理 Convert - * - * @author ccongli - */ -@Mapper -public interface MaterialXConvert { - - MaterialXConvert INSTANCE = Mappers.getMapper(MaterialXConvert.class); - - MaterialExportTestVO convert(MaterialXDO xdo); - - List convertList03(List list); - -} diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/convert/pmaterial/PMaterialConvert.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/convert/pmaterial/PMaterialConvert.java new file mode 100644 index 0000000..53d717e --- /dev/null +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/convert/pmaterial/PMaterialConvert.java @@ -0,0 +1,37 @@ +package com.yunxi.scm.module.demo.convert.pmaterial; + +import com.yunxi.scm.framework.common.pojo.PageResult; +import com.yunxi.scm.module.demo.controller.admin.pmaterial.vo.*; +import com.yunxi.scm.module.demo.dal.dataobject.pmaterial.PMaterialDO; +import com.yunxi.scm.module.demo.dal.dataobject.pmaterial.PMaterialXDO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * 物料管理 Convert + * + * @author ccongli + */ +@Mapper +public interface PMaterialConvert { + + PMaterialConvert INSTANCE = Mappers.getMapper(PMaterialConvert.class); + + PMaterialDO convert(PMaterialCreateReqVO bean); + + PMaterialDO convert(PMaterialUpdateReqVO bean); + + PMaterialRespVO convert(PMaterialDO bean); + + List convertList(List list); + + PageResult convertPage(PageResult page); + + List convertList02(List list); + + + List convertList03(List list); + +} diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/convert/pmaterial/PMaterialXConvert.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/convert/pmaterial/PMaterialXConvert.java new file mode 100644 index 0000000..d8693b7 --- /dev/null +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/convert/pmaterial/PMaterialXConvert.java @@ -0,0 +1,24 @@ +package com.yunxi.scm.module.demo.convert.pmaterial; + +import com.yunxi.scm.module.demo.controller.admin.pmaterial.vo.PMaterialExportTestVO; +import com.yunxi.scm.module.demo.dal.dataobject.pmaterial.PMaterialXDO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +import java.util.List; + +/** + * 物料管理 Convert + * + * @author ccongli + */ +@Mapper +public interface PMaterialXConvert { + + PMaterialXConvert INSTANCE = Mappers.getMapper(PMaterialXConvert.class); + + PMaterialExportTestVO convert(PMaterialXDO xdo); + + List convertList03(List list); + +} diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/dataobject/material/MaterialDO.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/dataobject/pmaterial/PMaterialDO.java similarity index 93% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/dataobject/material/MaterialDO.java rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/dataobject/pmaterial/PMaterialDO.java index 3eb3e1f..ab6b00e 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/dataobject/material/MaterialDO.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/dataobject/pmaterial/PMaterialDO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.demo.dal.dataobject.material; +package com.yunxi.scm.module.demo.dal.dataobject.pmaterial; import com.baomidou.mybatisplus.annotation.KeySequence; import com.baomidou.mybatisplus.annotation.TableField; @@ -24,7 +24,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -public class MaterialDO extends BaseDO { +public class PMaterialDO extends BaseDO { /** * ID diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/dataobject/material/MaterialXDO.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/dataobject/pmaterial/PMaterialXDO.java similarity index 87% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/dataobject/material/MaterialXDO.java rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/dataobject/pmaterial/PMaterialXDO.java index f0c246e..52f6419 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/dataobject/material/MaterialXDO.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/dataobject/pmaterial/PMaterialXDO.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.demo.dal.dataobject.material; +package com.yunxi.scm.module.demo.dal.dataobject.pmaterial; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; @@ -16,7 +16,7 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @TableName(value = "demo_xxx", autoResultMap = true) -public class MaterialXDO implements Serializable { +public class PMaterialXDO implements Serializable { @TableId private Long id; diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/mysql/material/MaterialXMapper.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/mysql/material/MaterialXMapper.java deleted file mode 100644 index ea31e5b..0000000 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/mysql/material/MaterialXMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.yunxi.scm.module.demo.dal.mysql.material; - -import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX; -import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialXDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 测试专用 Mapper - * - * @author ccongli - */ -@Mapper -public interface MaterialXMapper extends BaseMapperX { - -} diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/mysql/material/PMaterialMapper.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/mysql/material/PMaterialMapper.java deleted file mode 100644 index 297bf07..0000000 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/mysql/material/PMaterialMapper.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.yunxi.scm.module.demo.dal.mysql.material; - -import com.yunxi.scm.framework.common.pojo.PageResult; -import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX; -import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX; -import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialExportReqVO; -import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialPageReqVO; -import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDO; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 物料管理 Mapper - * - * @author ccongli - */ -@Mapper -public interface PMaterialMapper extends BaseMapperX { - - default PageResult selectPage(MaterialPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(MaterialDO::getName, reqVO.getName()) - .eqIfPresent(MaterialDO::getStatus, reqVO.getStatus()) - .eqIfPresent(MaterialDO::getType, reqVO.getType()) - .likeIfPresent(MaterialDO::getCategories, reqVO.getCategory()) - .betweenIfPresent(MaterialDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MaterialDO::getId)); - } - - default List selectList(MaterialExportReqVO reqVO) { - return selectList(new LambdaQueryWrapperX() - .likeIfPresent(MaterialDO::getName, reqVO.getName()) - .eqIfPresent(MaterialDO::getStatus, reqVO.getStatus()) - .eqIfPresent(MaterialDO::getType, reqVO.getType()) - .likeIfPresent(MaterialDO::getCategories, reqVO.getCategory()) - .betweenIfPresent(MaterialDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(MaterialDO::getId)); - } - -} diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/mysql/pmaterial/PMaterialMapper.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/mysql/pmaterial/PMaterialMapper.java new file mode 100644 index 0000000..40f4a54 --- /dev/null +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/mysql/pmaterial/PMaterialMapper.java @@ -0,0 +1,41 @@ +package com.yunxi.scm.module.demo.dal.mysql.pmaterial; + +import com.yunxi.scm.framework.common.pojo.PageResult; +import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX; +import com.yunxi.scm.framework.mybatis.core.query.LambdaQueryWrapperX; +import com.yunxi.scm.module.demo.controller.admin.pmaterial.vo.PMaterialExportReqVO; +import com.yunxi.scm.module.demo.controller.admin.pmaterial.vo.PMaterialPageReqVO; +import com.yunxi.scm.module.demo.dal.dataobject.pmaterial.PMaterialDO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 物料管理 Mapper + * + * @author ccongli + */ +@Mapper +public interface PMaterialMapper extends BaseMapperX { + + default PageResult selectPage(PMaterialPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(PMaterialDO::getName, reqVO.getName()) + .eqIfPresent(PMaterialDO::getStatus, reqVO.getStatus()) + .eqIfPresent(PMaterialDO::getType, reqVO.getType()) + .likeIfPresent(PMaterialDO::getCategories, reqVO.getCategory()) + .betweenIfPresent(PMaterialDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(PMaterialDO::getId)); + } + + default List selectList(PMaterialExportReqVO reqVO) { + return selectList(new LambdaQueryWrapperX() + .likeIfPresent(PMaterialDO::getName, reqVO.getName()) + .eqIfPresent(PMaterialDO::getStatus, reqVO.getStatus()) + .eqIfPresent(PMaterialDO::getType, reqVO.getType()) + .likeIfPresent(PMaterialDO::getCategories, reqVO.getCategory()) + .betweenIfPresent(PMaterialDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(PMaterialDO::getId)); + } + +} diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/mysql/pmaterial/PMaterialXMapper.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/mysql/pmaterial/PMaterialXMapper.java new file mode 100644 index 0000000..b81c9b1 --- /dev/null +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/dal/mysql/pmaterial/PMaterialXMapper.java @@ -0,0 +1,15 @@ +package com.yunxi.scm.module.demo.dal.mysql.pmaterial; + +import com.yunxi.scm.framework.mybatis.core.mapper.BaseMapperX; +import com.yunxi.scm.module.demo.dal.dataobject.pmaterial.PMaterialXDO; +import org.apache.ibatis.annotations.Mapper; + +/** + * 测试专用 Mapper + * + * @author ccongli + */ +@Mapper +public interface PMaterialXMapper extends BaseMapperX { + +} diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/enums/material/CategoryEnum.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/enums/pmaterial/CategoryEnum.java similarity index 92% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/enums/material/CategoryEnum.java rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/enums/pmaterial/CategoryEnum.java index 881e37f..d473c79 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/enums/material/CategoryEnum.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/enums/pmaterial/CategoryEnum.java @@ -1,4 +1,4 @@ -package com.yunxi.scm.module.demo.enums.material; +package com.yunxi.scm.module.demo.enums.pmaterial; import com.yunxi.scm.framework.common.core.IntArrayValuable; import lombok.AllArgsConstructor; diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/service/material/PMaterialServiceImpl.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/service/material/PMaterialServiceImpl.java deleted file mode 100644 index 5b51fb2..0000000 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/service/material/PMaterialServiceImpl.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.yunxi.scm.module.demo.service.material; - -import com.yunxi.scm.framework.common.pojo.PageResult; -import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialCreateReqVO; -import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialExportReqVO; -import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialPageReqVO; -import com.yunxi.scm.module.demo.controller.admin.material.vo.MaterialUpdateReqVO; -import com.yunxi.scm.module.demo.convert.material.MaterialConvert; -import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDO; -import com.yunxi.scm.module.demo.dal.mysql.material.PMaterialMapper; -import org.springframework.stereotype.Service; -import org.springframework.validation.annotation.Validated; - -import javax.annotation.Resource; -import java.util.Collection; -import java.util.List; - -import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception; -import static com.yunxi.scm.module.demo.enums.ErrorCodeConstants.MATERIAL_NOT_EXISTS; - -/** - * 物料管理 Service 实现类 - * - * @author ccongli - */ -@Service -@Validated -public class PMaterialServiceImpl implements PMaterialService { - - @Resource - private PMaterialMapper materialMapper; - - @Override - public Long createMaterial(MaterialCreateReqVO createReqVO) { - // 插入 - MaterialDO material = MaterialConvert.INSTANCE.convert(createReqVO); - materialMapper.insert(material); - // 返回 - return material.getId(); - } - - @Override - public void updateMaterial(MaterialUpdateReqVO updateReqVO) { - // 校验存在 - validateMaterialExists(updateReqVO.getId()); - // 更新 - MaterialDO updateObj = MaterialConvert.INSTANCE.convert(updateReqVO); - materialMapper.updateById(updateObj); - } - - @Override - public void deleteMaterial(Long id) { - // 校验存在 - validateMaterialExists(id); - // 删除 - materialMapper.deleteById(id); - } - - private void validateMaterialExists(Long id) { - if (materialMapper.selectById(id) == null) { - throw exception(MATERIAL_NOT_EXISTS); - } - } - - @Override - public MaterialDO getMaterial(Long id) { - return materialMapper.selectById(id); - } - - @Override - public List getMaterialList(Collection ids) { - return materialMapper.selectBatchIds(ids); - } - - @Override - public PageResult getMaterialPage(MaterialPageReqVO pageReqVO) { - return materialMapper.selectPage(pageReqVO); - } - - @Override - public List getMaterialList(MaterialExportReqVO exportReqVO) { - return materialMapper.selectList(exportReqVO); - } - -} diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/service/material/PMaterialService.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/service/pmaterial/PMaterialService.java similarity index 63% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/service/material/PMaterialService.java rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/service/pmaterial/PMaterialService.java index f318e18..c951a66 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/service/material/PMaterialService.java +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/service/pmaterial/PMaterialService.java @@ -1,9 +1,9 @@ -package com.yunxi.scm.module.demo.service.material; +package com.yunxi.scm.module.demo.service.pmaterial; import java.util.*; import javax.validation.*; -import com.yunxi.scm.module.demo.controller.admin.material.vo.*; -import com.yunxi.scm.module.demo.dal.dataobject.material.MaterialDO; +import com.yunxi.scm.module.demo.controller.admin.pmaterial.vo.*; +import com.yunxi.scm.module.demo.dal.dataobject.pmaterial.PMaterialDO; import com.yunxi.scm.framework.common.pojo.PageResult; /** @@ -19,14 +19,14 @@ public interface PMaterialService { * @param createReqVO 创建信息 * @return 编号 */ - Long createMaterial(@Valid MaterialCreateReqVO createReqVO); + Long createMaterial(@Valid PMaterialCreateReqVO createReqVO); /** * 更新物料管理 * * @param updateReqVO 更新信息 */ - void updateMaterial(@Valid MaterialUpdateReqVO updateReqVO); + void updateMaterial(@Valid PMaterialUpdateReqVO updateReqVO); /** * 删除物料管理 @@ -41,7 +41,7 @@ public interface PMaterialService { * @param id 编号 * @return 物料管理 */ - MaterialDO getMaterial(Long id); + PMaterialDO getMaterial(Long id); /** * 获得物料管理列表 @@ -49,7 +49,7 @@ public interface PMaterialService { * @param ids 编号 * @return 物料管理列表 */ - List getMaterialList(Collection ids); + List getMaterialList(Collection ids); /** * 获得物料管理分页 @@ -57,7 +57,7 @@ public interface PMaterialService { * @param pageReqVO 分页查询 * @return 物料管理分页 */ - PageResult getMaterialPage(MaterialPageReqVO pageReqVO); + PageResult getMaterialPage(PMaterialPageReqVO pageReqVO); /** * 获得物料管理列表, 用于 Excel 导出 @@ -65,6 +65,6 @@ public interface PMaterialService { * @param exportReqVO 查询条件 * @return 物料管理列表 */ - List getMaterialList(MaterialExportReqVO exportReqVO); + List getMaterialList(PMaterialExportReqVO exportReqVO); } diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/service/pmaterial/PMaterialServiceImpl.java b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/service/pmaterial/PMaterialServiceImpl.java new file mode 100644 index 0000000..2dbd082 --- /dev/null +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/java/com/yunxi/scm/module/demo/service/pmaterial/PMaterialServiceImpl.java @@ -0,0 +1,85 @@ +package com.yunxi.scm.module.demo.service.pmaterial; + +import com.yunxi.scm.framework.common.pojo.PageResult; +import com.yunxi.scm.module.demo.controller.admin.pmaterial.vo.PMaterialCreateReqVO; +import com.yunxi.scm.module.demo.controller.admin.pmaterial.vo.PMaterialExportReqVO; +import com.yunxi.scm.module.demo.controller.admin.pmaterial.vo.PMaterialPageReqVO; +import com.yunxi.scm.module.demo.controller.admin.pmaterial.vo.PMaterialUpdateReqVO; +import com.yunxi.scm.module.demo.convert.pmaterial.PMaterialConvert; +import com.yunxi.scm.module.demo.dal.dataobject.pmaterial.PMaterialDO; +import com.yunxi.scm.module.demo.dal.mysql.pmaterial.PMaterialMapper; +import org.springframework.stereotype.Service; +import org.springframework.validation.annotation.Validated; + +import javax.annotation.Resource; +import java.util.Collection; +import java.util.List; + +import static com.yunxi.scm.framework.common.exception.util.ServiceExceptionUtil.exception; +import static com.yunxi.scm.module.demo.enums.ErrorCodeConstants.MATERIAL_NOT_EXISTS; + +/** + * 物料管理 Service 实现类 + * + * @author ccongli + */ +@Service +@Validated +public class PMaterialServiceImpl implements PMaterialService { + + @Resource + private PMaterialMapper pMaterialMapper; + + @Override + public Long createMaterial(PMaterialCreateReqVO createReqVO) { + // 插入 + PMaterialDO material = PMaterialConvert.INSTANCE.convert(createReqVO); + pMaterialMapper.insert(material); + // 返回 + return material.getId(); + } + + @Override + public void updateMaterial(PMaterialUpdateReqVO updateReqVO) { + // 校验存在 + validateMaterialExists(updateReqVO.getId()); + // 更新 + PMaterialDO updateObj = PMaterialConvert.INSTANCE.convert(updateReqVO); + pMaterialMapper.updateById(updateObj); + } + + @Override + public void deleteMaterial(Long id) { + // 校验存在 + validateMaterialExists(id); + // 删除 + pMaterialMapper.deleteById(id); + } + + private void validateMaterialExists(Long id) { + if (pMaterialMapper.selectById(id) == null) { + throw exception(MATERIAL_NOT_EXISTS); + } + } + + @Override + public PMaterialDO getMaterial(Long id) { + return pMaterialMapper.selectById(id); + } + + @Override + public List getMaterialList(Collection ids) { + return pMaterialMapper.selectBatchIds(ids); + } + + @Override + public PageResult getMaterialPage(PMaterialPageReqVO pageReqVO) { + return pMaterialMapper.selectPage(pageReqVO); + } + + @Override + public List getMaterialList(PMaterialExportReqVO exportReqVO) { + return pMaterialMapper.selectList(exportReqVO); + } + +} diff --git a/yunxi-module-demo/yunxi-module-demo-biz/src/main/resources/mapper/material/MaterialMapper.xml b/yunxi-module-demo/yunxi-module-demo-biz/src/main/resources/mapper/pmaterial/PMaterialMapper.xml similarity index 86% rename from yunxi-module-demo/yunxi-module-demo-biz/src/main/resources/mapper/material/MaterialMapper.xml rename to yunxi-module-demo/yunxi-module-demo-biz/src/main/resources/mapper/pmaterial/PMaterialMapper.xml index f2091d2..ac95f03 100644 --- a/yunxi-module-demo/yunxi-module-demo-biz/src/main/resources/mapper/material/MaterialMapper.xml +++ b/yunxi-module-demo/yunxi-module-demo-biz/src/main/resources/mapper/pmaterial/PMaterialMapper.xml @@ -1,6 +1,6 @@ - +