From 888ff98ed656b7ba69cf8d1ab51ae98a32cbe508 Mon Sep 17 00:00:00 2001 From: LYX <2014338124@qq.com> Date: Wed, 19 Nov 2025 15:17:58 +0800 Subject: [PATCH] =?UTF-8?q?1119=E5=99=A8=E6=A2=B0=E5=88=86=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeviceCategoryController.java | 0 .../vo/DeviceCategoryPageReqVO.java | 10 ++--- .../vo/DeviceCategoryRespVO.java | 20 ++++----- .../vo/DeviceCategorySaveReqVO.java | 41 +++++++++++++++++++ .../devicecategory/DeviceCategoryDO.java | 0 .../devicecategory/DeviceCategoryMapper.java | 0 .../devicecategory/DeviceCategoryService.java | 0 .../DeviceCategoryServiceImpl.java | 0 .../statistics}/DeviceCategoryMapper.xml | 0 .../vo/DeviceCategorySaveReqVO.java | 41 ------------------- .../src/main/resources/application-local.yaml | 2 +- 11 files changed, 57 insertions(+), 57 deletions(-) rename yudao-module-erp/{yudao-module-erp => }/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/DeviceCategoryController.java (100%) rename yudao-module-erp/{yudao-module-erp => }/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java (66%) rename yudao-module-erp/{yudao-module-erp => }/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java (53%) create mode 100644 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java rename yudao-module-erp/{yudao-module-erp => }/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/devicecategory/DeviceCategoryDO.java (100%) rename yudao-module-erp/{yudao-module-erp => }/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/devicecategory/DeviceCategoryMapper.java (100%) rename yudao-module-erp/{yudao-module-erp => }/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryService.java (100%) rename yudao-module-erp/{yudao-module-erp => }/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryServiceImpl.java (100%) rename yudao-module-erp/{yudao-module-erp/src/main/resources/mapper/devicecategory => src/main/resources/mapper/statistics}/DeviceCategoryMapper.xml (100%) delete mode 100644 yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java diff --git a/yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/DeviceCategoryController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/DeviceCategoryController.java similarity index 100% rename from yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/DeviceCategoryController.java rename to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/DeviceCategoryController.java diff --git a/yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java similarity index 66% rename from yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java rename to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java index 891b560..1f9d5ad 100644 --- a/yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryPageReqVO.java @@ -13,23 +13,23 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @Data public class DeviceCategoryPageReqVO extends PageParam { - @Schema(description = "分类名称（如 "01 有源手术器械"），业务核心字段，必填", example = "芋艿") + @Schema(description = "分类名称（如 \"01 有源手术器械\"），业务核心字段，必填", example = "芋艿") private String categoryName; - @Schema(description = "分类编号（如 "1-8-8.2""1-10-10.4"），业务唯一标识（页面标*必填）") + @Schema(description = "分类编号（如 \"1-8-8.2\"\"1-10-10.4\"），业务唯一标识（页面标*必填）") private String categoryCode; - @Schema(description = "类别（如 "一类""二类""三类"），通过下拉选择，必填", example = "1") + @Schema(description = "类别（如 \"一类\"\"二类\"\"三类\"），通过下拉选择，必填", example = "1") private String deviceType; - @Schema(description = "品名举例（如 "移动式 LED 手术照明灯、LED 手术照明灯..."），可选填") + @Schema(description = "品名举例（如 \"移动式 LED 手术照明灯、LED 手术照明灯...\"），可选填") private String exampleNames; @Schema(description = "记录创建时间，自动生成，用于数据审计") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; - @Schema(description = "记录创建人（如 "admin"），用于追溯操作人") + @Schema(description = "记录创建人（如 \"admin\"），用于追溯操作人") private String createUser; @Schema(description = "记录最后更新人，数据首次创建时可为空，修改后自动填充") diff --git a/yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java similarity index 53% rename from yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java rename to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java index 28ffe36..5073a3d 100644 --- a/yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategoryRespVO.java @@ -16,28 +16,28 @@ public class DeviceCategoryRespVO { @ExcelProperty("记录唯一标识，系统自动生成，用于数据关联和查询") private Integer id; - @Schema(description = "分类名称（如 "01 有源手术器械"），业务核心字段，必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") - @ExcelProperty("分类名称（如 "01 有源手术器械"），业务核心字段，必填") + @Schema(description = "分类名称（如 \"01 有源手术器械\"），业务核心字段，必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @ExcelProperty("分类名称（如 \"01 有源手术器械\"），业务核心字段，必填") private String categoryName; - @Schema(description = "分类编号（如 "1-8-8.2""1-10-10.4"），业务唯一标识（页面标*必填）", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("分类编号（如 "1-8-8.2""1-10-10.4"），业务唯一标识（页面标*必填）") + @Schema(description = "分类编号（如 \"1-8-8.2\"\"1-10-10.4\"），业务唯一标识（页面标*必填）", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("分类编号（如 \"1-8-8.2\"\"1-10-10.4\"），业务唯一标识（页面标*必填）") private String categoryCode; - @Schema(description = "类别（如 "一类""二类""三类"），通过下拉选择，必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @ExcelProperty("类别（如 "一类""二类""三类"），通过下拉选择，必填") + @Schema(description = "类别（如 \"一类\"\"二类\"\"三类\"），通过下拉选择，必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @ExcelProperty("类别（如 \"一类\"\"二类\"\"三类\"），通过下拉选择，必填") private String deviceType; - @Schema(description = "品名举例（如 "移动式 LED 手术照明灯、LED 手术照明灯..."），可选填") - @ExcelProperty("品名举例（如 "移动式 LED 手术照明灯、LED 手术照明灯..."），可选填") + @Schema(description = "品名举例（如 \"移动式 LED 手术照明灯、LED 手术照明灯...\"），可选填") + @ExcelProperty("品名举例（如 \"移动式 LED 手术照明灯、LED 手术照明灯...\"），可选填") private String exampleNames; @Schema(description = "记录创建时间，自动生成，用于数据审计") @ExcelProperty("记录创建时间，自动生成，用于数据审计") private LocalDateTime createTime; - @Schema(description = "记录创建人（如 "admin"），用于追溯操作人", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("记录创建人（如 "admin"），用于追溯操作人") + @Schema(description = "记录创建人（如 \"admin\"），用于追溯操作人", requiredMode = Schema.RequiredMode.REQUIRED) + @ExcelProperty("记录创建人（如 \"admin\"），用于追溯操作人") private String createUser; @Schema(description = "记录最后更新人，数据首次创建时可为空，修改后自动填充") diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java new file mode 100644 index 0000000..1ce338d --- /dev/null +++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java @@ -0,0 +1,41 @@ +package cn.iocoder.yudao.module.erp.controller.admin.devicecategory.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.*; +import java.util.*; +import javax.validation.constraints.*; + +@Schema(description = "管理后台 - 进销存系统 - 器械分类新增/修改 Request VO") +@Data +public class DeviceCategorySaveReqVO { + + @Schema(description = "记录唯一标识，系统自动生成，用于数据关联和查询", requiredMode = Schema.RequiredMode.REQUIRED, example = "11153") + private Integer id; + + @Schema(description = "分类名称（如 \"01 有源手术器械\"），业务核心字段，必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @NotEmpty(message = "分类名称（如 \"01 有源手术器械\"），业务核心字段，必填不能为空") + private String categoryName; + + @Schema(description = "分类编号（如 \"1-8-8.2\"\"1-10-10.4\"），业务唯一标识（页面标*必填）", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "分类编号（如 \"1-8-8.2\"\"1-10-10.4\"），业务唯一标识（页面标*必填）不能为空") + private String categoryCode; + + @Schema(description = "类别（如 \"一类\"\"二类\"\"三类\"），通过下拉选择，必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @NotEmpty(message = "类别（如 \"一类\"\"二类\"\"三类\"），通过下拉选择，必填不能为空") + private String deviceType; + + @Schema(description = "品名举例（如 \"移动式 LED 手术照明灯、LED 手术照明灯...\"），可选填") + private String exampleNames; + + @Schema(description = "记录创建人（如 \"admin\"），用于追溯操作人", requiredMode = Schema.RequiredMode.REQUIRED) + @NotEmpty(message = "记录创建人（如 \"admin\"），用于追溯操作人不能为空") + private String createUser; + + @Schema(description = "记录最后更新人，数据首次创建时可为空，修改后自动填充") + private String updateUser; + + @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") + @NotNull(message = "状态不能为空") + private Integer status; + +} \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/devicecategory/DeviceCategoryDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/devicecategory/DeviceCategoryDO.java similarity index 100% rename from yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/devicecategory/DeviceCategoryDO.java rename to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/devicecategory/DeviceCategoryDO.java diff --git a/yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/devicecategory/DeviceCategoryMapper.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/devicecategory/DeviceCategoryMapper.java similarity index 100% rename from yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/devicecategory/DeviceCategoryMapper.java rename to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/devicecategory/DeviceCategoryMapper.java diff --git a/yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryService.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryService.java similarity index 100% rename from yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryService.java rename to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryService.java diff --git a/yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryServiceImpl.java similarity index 100% rename from yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryServiceImpl.java rename to yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/devicecategory/DeviceCategoryServiceImpl.java diff --git a/yudao-module-erp/yudao-module-erp/src/main/resources/mapper/devicecategory/DeviceCategoryMapper.xml b/yudao-module-erp/src/main/resources/mapper/statistics/DeviceCategoryMapper.xml similarity index 100% rename from yudao-module-erp/yudao-module-erp/src/main/resources/mapper/devicecategory/DeviceCategoryMapper.xml rename to yudao-module-erp/src/main/resources/mapper/statistics/DeviceCategoryMapper.xml diff --git a/yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java b/yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java deleted file mode 100644 index a7d39a2..0000000 --- a/yudao-module-erp/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/devicecategory/vo/DeviceCategorySaveReqVO.java +++ /dev/null @@ -1,41 +0,0 @@ -package cn.iocoder.yudao.module.erp.controller.admin.devicecategory.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import javax.validation.constraints.*; - -@Schema(description = "管理后台 - 进销存系统 - 器械分类新增/修改 Request VO") -@Data -public class DeviceCategorySaveReqVO { - - @Schema(description = "记录唯一标识，系统自动生成，用于数据关联和查询", requiredMode = Schema.RequiredMode.REQUIRED, example = "11153") - private Integer id; - - @Schema(description = "分类名称（如 "01 有源手术器械"），业务核心字段，必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") - @NotEmpty(message = "分类名称（如 "01 有源手术器械"），业务核心字段，必填不能为空") - private String categoryName; - - @Schema(description = "分类编号（如 "1-8-8.2""1-10-10.4"），业务唯一标识（页面标*必填）", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "分类编号（如 "1-8-8.2""1-10-10.4"），业务唯一标识（页面标*必填）不能为空") - private String categoryCode; - - @Schema(description = "类别（如 "一类""二类""三类"），通过下拉选择，必填", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotEmpty(message = "类别（如 "一类""二类""三类"），通过下拉选择，必填不能为空") - private String deviceType; - - @Schema(description = "品名举例（如 "移动式 LED 手术照明灯、LED 手术照明灯..."），可选填") - private String exampleNames; - - @Schema(description = "记录创建人（如 "admin"），用于追溯操作人", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "记录创建人（如 "admin"），用于追溯操作人不能为空") - private String createUser; - - @Schema(description = "记录最后更新人，数据首次创建时可为空，修改后自动填充") - private String updateUser; - - @Schema(description = "状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "2") - @NotNull(message = "状态不能为空") - private Integer status; - -} \ No newline at end of file diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index 828b43b..08c65a9 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -82,7 +82,7 @@ spring: host: 127.0.0.1 # 地址 port: 6379 # 端口 database: 0 # 数据库索引 -# password: dev # 密码，建议生产环境开启 + password: abc123456 # 密码，根据实际情况填写或者保持注释状态（如果不需要密码） --- #################### 定时任务相关配置 ####################