diff --git a/pom.xml b/pom.xml index 1fe186c5ed..3a16ca83bc 100644 --- a/pom.xml +++ b/pom.xml @@ -20,7 +20,7 @@ - + yudao-module-pay diff --git a/sql/mysql/haoka_demo.sql b/sql/mysql/haoka_demo.sql new file mode 100644 index 0000000000..190a0e7570 --- /dev/null +++ b/sql/mysql/haoka_demo.sql @@ -0,0 +1,38 @@ +/* + Navicat Premium Dump SQL + + Source Server : 120.46.194.67 + Source Server Type : MySQL + Source Server Version : 50744 (5.7.44) + Source Host : 120.46.194.67:3306 + Source Schema : haoka + + Target Server Type : MySQL + Target Server Version : 50744 (5.7.44) + File Encoding : 65001 + + Date: 11/12/2024 13:56:34 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for haoka_demo +-- ---------------------------- +DROP TABLE IF EXISTS `haoka_demo`; +CREATE TABLE `haoka_demo` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '编号', + `name` text CHARACTER SET latin1 COLLATE latin1_swedish_ci NOT NULL COMMENT '名字', + `age` int(11) NOT NULL COMMENT '年龄', + `agent` tinyint(4) NOT NULL COMMENT '性别', + `creator` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '创建者', + `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间', + `updater` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT '' COMMENT '更新者', + `update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', + `deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除', + `tenant_id` bigint(20) NOT NULL DEFAULT 0 COMMENT '租户编号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = latin1 COLLATE = latin1_swedish_ci COMMENT = '好卡案例' ROW_FORMAT = Dynamic; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/yudao-module-haoka/yudao-module-haoka-api/pom.xml b/yudao-module-haoka/yudao-module-haoka-api/pom.xml index 7ae586b522..0fc6233b9d 100644 --- a/yudao-module-haoka/yudao-module-haoka-api/pom.xml +++ b/yudao-module-haoka/yudao-module-haoka-api/pom.xml @@ -10,14 +10,13 @@ yudao-module-haoka-api - jar + jar - ${project.artifactId} + ${project.artifactId} - haoka api 模块 API，暴露给其它模块调用 + demo 模块 API，暴露给其它模块调用 - - + cn.iocoder.boot yudao-common diff --git a/yudao-module-haoka/yudao-module-haoka-biz/pom.xml b/yudao-module-haoka/yudao-module-haoka-biz/pom.xml index d392a36291..faad50ee8a 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/pom.xml +++ b/yudao-module-haoka/yudao-module-haoka-biz/pom.xml @@ -14,7 +14,6 @@ haoka biz 模块，主要实现haoka 等功能。 - cn.iocoder.boot diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/DemoController.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/HaokaDemoController.java similarity index 65% rename from yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/DemoController.java rename to yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/HaokaDemoController.java index bb0bedd135..1ef0f923e3 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/DemoController.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/HaokaDemoController.java @@ -1,52 +1,54 @@ package cn.iocoder.yudao.module.haoka.controller.admin.demo; -import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; -import cn.iocoder.yudao.framework.common.pojo.CommonResult; +import org.springframework.web.bind.annotation.*; +import jakarta.annotation.Resource; +import org.springframework.validation.annotation.Validated; +import org.springframework.security.access.prepost.PreAuthorize; +import io.swagger.v3.oas.annotations.tags.Tag; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Operation; + +import jakarta.validation.constraints.*; +import jakarta.validation.*; +import jakarta.servlet.http.*; +import java.util.*; +import java.io.IOException; + import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; -import cn.iocoder.yudao.module.haoka.controller.admin.demo.vo.DemoPageReqVO; -import cn.iocoder.yudao.module.haoka.controller.admin.demo.vo.DemoRespVO; -import cn.iocoder.yudao.module.haoka.controller.admin.demo.vo.DemoSaveReqVO; -import cn.iocoder.yudao.module.haoka.dal.dataobject.demo.DemoDO; -import cn.iocoder.yudao.module.haoka.service.demo.DemoService; -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.annotation.Resource; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.Valid; -import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.io.IOException; -import java.util.List; - -import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; +import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils; + +import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog; +import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*; + +import cn.iocoder.yudao.module.haoka.controller.admin.demo.vo.*; +import cn.iocoder.yudao.module.haoka.dal.dataobject.demo.HaokaDemoDO; +import cn.iocoder.yudao.module.haoka.service.demo.HaokaDemoService; + @Tag(name = "管理后台 - 好卡案例") @RestController @RequestMapping("/haoka/demo") @Validated -public class DemoController { +public class HaokaDemoController { @Resource - private DemoService demoService; + private HaokaDemoService demoService; @PostMapping("/create") @Operation(summary = "创建好卡案例") @PreAuthorize("@ss.hasPermission('haoka:demo:create')") - public CommonResult createDemo(@Valid @RequestBody DemoSaveReqVO createReqVO) { + public CommonResult createDemo(@Valid @RequestBody HaokaDemoSaveReqVO createReqVO) { return success(demoService.createDemo(createReqVO)); } @PutMapping("/update") @Operation(summary = "更新好卡案例") @PreAuthorize("@ss.hasPermission('haoka:demo:update')") - public CommonResult updateDemo(@Valid @RequestBody DemoSaveReqVO updateReqVO) { + public CommonResult updateDemo(@Valid @RequestBody HaokaDemoSaveReqVO updateReqVO) { demoService.updateDemo(updateReqVO); return success(true); } @@ -64,30 +66,30 @@ public class DemoController { @Operation(summary = "获得好卡案例") @Parameter(name = "id", description = "编号", required = true, example = "1024") @PreAuthorize("@ss.hasPermission('haoka:demo:query')") - public CommonResult getDemo(@RequestParam("id") Long id) { - DemoDO demo = demoService.getDemo(id); - return success(BeanUtils.toBean(demo, DemoRespVO.class)); + public CommonResult getDemo(@RequestParam("id") Long id) { + HaokaDemoDO demo = demoService.getDemo(id); + return success(BeanUtils.toBean(demo, HaokaDemoRespVO.class)); } @GetMapping("/page") @Operation(summary = "获得好卡案例分页") @PreAuthorize("@ss.hasPermission('haoka:demo:query')") - public CommonResult> getDemoPage(@Valid DemoPageReqVO pageReqVO) { - PageResult pageResult = demoService.getDemoPage(pageReqVO); - return success(BeanUtils.toBean(pageResult, DemoRespVO.class)); + public CommonResult> getDemoPage(@Valid HaokaDemoPageReqVO pageReqVO) { + PageResult pageResult = demoService.getDemoPage(pageReqVO); + return success(BeanUtils.toBean(pageResult, HaokaDemoRespVO.class)); } @GetMapping("/export-excel") @Operation(summary = "导出好卡案例 Excel") @PreAuthorize("@ss.hasPermission('haoka:demo:export')") @ApiAccessLog(operateType = EXPORT) - public void exportDemoExcel(@Valid DemoPageReqVO pageReqVO, - HttpServletResponse response) throws IOException { + public void exportDemoExcel(@Valid HaokaDemoPageReqVO pageReqVO, + HttpServletResponse response) throws IOException { pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE); - List list = demoService.getDemoPage(pageReqVO).getList(); + List list = demoService.getDemoPage(pageReqVO).getList(); // 导出 Excel - ExcelUtils.write(response, "好卡案例.xls", "数据", DemoRespVO.class, - BeanUtils.toBean(list, DemoRespVO.class)); + ExcelUtils.write(response, "好卡案例.xls", "数据", HaokaDemoRespVO.class, + BeanUtils.toBean(list, HaokaDemoRespVO.class)); } -} +} \ No newline at end of file diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/DemoPageReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/HaokaDemoPageReqVO.java similarity index 81% rename from yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/DemoPageReqVO.java rename to yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/HaokaDemoPageReqVO.java index 32835cbdda..740419c82f 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/DemoPageReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/HaokaDemoPageReqVO.java @@ -1,12 +1,10 @@ package cn.iocoder.yudao.module.haoka.controller.admin.demo.vo; -import cn.iocoder.yudao.framework.common.pojo.PageParam; +import lombok.*; +import java.util.*; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; +import cn.iocoder.yudao.framework.common.pojo.PageParam; import org.springframework.format.annotation.DateTimeFormat; - import java.time.LocalDateTime; import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -15,9 +13,9 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @Data @EqualsAndHashCode(callSuper = true) @ToString(callSuper = true) -public class DemoPageReqVO extends PageParam { +public class HaokaDemoPageReqVO extends PageParam { - @Schema(description = "名字", example = "芋艿") + @Schema(description = "名字", example = "李四") private String name; @Schema(description = "年龄") @@ -30,4 +28,4 @@ public class DemoPageReqVO extends PageParam { @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; -} +} \ No newline at end of file diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/DemoRespVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/HaokaDemoRespVO.java similarity index 61% rename from yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/DemoRespVO.java rename to yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/HaokaDemoRespVO.java index caf2772b98..fa4341ddd0 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/DemoRespVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/HaokaDemoRespVO.java @@ -1,22 +1,24 @@ package cn.iocoder.yudao.module.haoka.controller.admin.demo.vo; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; - +import lombok.*; +import java.util.*; +import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; +import com.alibaba.excel.annotation.*; +import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; +import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; @Schema(description = "管理后台 - 好卡案例 Response VO") @Data @ExcelIgnoreUnannotated -public class DemoRespVO { +public class HaokaDemoRespVO { - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "21448") + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "28384") @ExcelProperty("编号") private Long id; - @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") @ExcelProperty("名字") private String name; @@ -25,11 +27,12 @@ public class DemoRespVO { private Integer age; @Schema(description = "性别", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("性别") + @ExcelProperty(value = "性别", converter = DictConvert.class) + @DictFormat("system_user_sex") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 private Integer agent; @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; -} +} \ No newline at end of file diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/DemoSaveReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/HaokaDemoSaveReqVO.java similarity index 76% rename from yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/DemoSaveReqVO.java rename to yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/HaokaDemoSaveReqVO.java index d43422053b..64f69972cb 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/DemoSaveReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/demo/vo/HaokaDemoSaveReqVO.java @@ -1,18 +1,18 @@ package cn.iocoder.yudao.module.haoka.controller.admin.demo.vo; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import lombok.Data; +import lombok.*; +import java.util.*; +import jakarta.validation.constraints.*; @Schema(description = "管理后台 - 好卡案例新增/修改 Request VO") @Data -public class DemoSaveReqVO { +public class HaokaDemoSaveReqVO { - @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "21448") + @Schema(description = "编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "28384") private Long id; - @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿") + @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "李四") @NotEmpty(message = "名字不能为空") private String name; @@ -24,4 +24,4 @@ public class DemoSaveReqVO { @NotNull(message = "性别不能为空") private Integer agent; -} +} \ No newline at end of file diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/demo/DemoDO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/demo/HaokaDemoDO.java similarity index 75% rename from yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/demo/DemoDO.java rename to yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/demo/HaokaDemoDO.java index 5f773fadd4..01265d5684 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/demo/DemoDO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/demo/HaokaDemoDO.java @@ -1,10 +1,11 @@ package cn.iocoder.yudao.module.haoka.dal.dataobject.demo; -import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; -import com.baomidou.mybatisplus.annotation.KeySequence; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import lombok.*; +import java.util.*; +import java.time.LocalDateTime; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.*; +import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO; /** * 好卡案例 DO @@ -19,7 +20,7 @@ import lombok.*; @Builder @NoArgsConstructor @AllArgsConstructor -public class DemoDO extends BaseDO { +public class HaokaDemoDO extends BaseDO { /** * 编号 @@ -36,7 +37,9 @@ public class DemoDO extends BaseDO { private Integer age; /** * 性别 + * + * 枚举 {@link TODO system_user_sex 对应的类} */ private Integer agent; -} +} \ No newline at end of file diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/demo/DemoMapper.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/demo/DemoMapper.java deleted file mode 100644 index c6c0a6c6d0..0000000000 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/demo/DemoMapper.java +++ /dev/null @@ -1,27 +0,0 @@ -package cn.iocoder.yudao.module.haoka.dal.mysql.demo; - -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.haoka.controller.admin.demo.vo.DemoPageReqVO; -import cn.iocoder.yudao.module.haoka.dal.dataobject.demo.DemoDO; -import org.apache.ibatis.annotations.Mapper; - -/** - * 好卡案例 Mapper - * - * @author 芋道源码 - */ -@Mapper -public interface DemoMapper extends BaseMapperX { - - default PageResult selectPage(DemoPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(DemoDO::getName, reqVO.getName()) - .eqIfPresent(DemoDO::getAge, reqVO.getAge()) - .eqIfPresent(DemoDO::getAgent, reqVO.getAgent()) - .betweenIfPresent(DemoDO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(DemoDO::getId)); - } - -} diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/demo/HaokaDemoMapper.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/demo/HaokaDemoMapper.java new file mode 100644 index 0000000000..08adb64d83 --- /dev/null +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/demo/HaokaDemoMapper.java @@ -0,0 +1,29 @@ +package cn.iocoder.yudao.module.haoka.dal.mysql.demo; + +import java.util.*; + +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX; +import cn.iocoder.yudao.module.haoka.dal.dataobject.demo.HaokaDemoDO; +import org.apache.ibatis.annotations.Mapper; +import cn.iocoder.yudao.module.haoka.controller.admin.demo.vo.*; + +/** + * 好卡案例 Mapper + * + * @author 芋道源码 + */ +@Mapper +public interface HaokaDemoMapper extends BaseMapperX { + + default PageResult selectPage(HaokaDemoPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .likeIfPresent(HaokaDemoDO::getName, reqVO.getName()) + .eqIfPresent(HaokaDemoDO::getAge, reqVO.getAge()) + .eqIfPresent(HaokaDemoDO::getAgent, reqVO.getAgent()) + .betweenIfPresent(HaokaDemoDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(HaokaDemoDO::getId)); + } + +} \ No newline at end of file diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/package-info.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/package-info.java index c92db1b327..f064b92ccd 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/package-info.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/package-info.java @@ -1,4 +1,10 @@ /** - * haoka system + * erp 包下，企业资源管理（Enterprise Resource Planning）。 + * 例如说：采购、销售、库存、财务、产品等等 + * + * 1. Controller URL：以 /erp/ 开头，避免和其它 Module 冲突 + * 2. DataObject 表名：以 erp_ 开头，方便在数据库中区分 + * + * 注意，由于 Erp 模块下，容易和其它模块重名，所以类名都加载 Erp 的前缀~ */ package cn.iocoder.yudao.module.haoka; diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/demo/DemoService.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/demo/HaokaDemoService.java similarity index 58% rename from yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/demo/DemoService.java rename to yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/demo/HaokaDemoService.java index 6049b7c769..a44abd3ced 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/demo/DemoService.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/demo/HaokaDemoService.java @@ -1,17 +1,18 @@ package cn.iocoder.yudao.module.haoka.service.demo; +import java.util.*; +import jakarta.validation.*; +import cn.iocoder.yudao.module.haoka.controller.admin.demo.vo.*; +import cn.iocoder.yudao.module.haoka.dal.dataobject.demo.HaokaDemoDO; import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.module.haoka.controller.admin.demo.vo.DemoPageReqVO; -import cn.iocoder.yudao.module.haoka.controller.admin.demo.vo.DemoSaveReqVO; -import cn.iocoder.yudao.module.haoka.dal.dataobject.demo.DemoDO; -import jakarta.validation.Valid; +import cn.iocoder.yudao.framework.common.pojo.PageParam; /** * 好卡案例 Service 接口 * * @author 芋道源码 */ -public interface DemoService { +public interface HaokaDemoService { /** * 创建好卡案例 @@ -19,14 +20,14 @@ public interface DemoService { * @param createReqVO 创建信息 * @return 编号 */ - Long createDemo(@Valid DemoSaveReqVO createReqVO); + Long createDemo(@Valid HaokaDemoSaveReqVO createReqVO); /** * 更新好卡案例 * * @param updateReqVO 更新信息 */ - void updateDemo(@Valid DemoSaveReqVO updateReqVO); + void updateDemo(@Valid HaokaDemoSaveReqVO updateReqVO); /** * 删除好卡案例 @@ -41,7 +42,7 @@ public interface DemoService { * @param id 编号 * @return 好卡案例 */ - DemoDO getDemo(Long id); + HaokaDemoDO getDemo(Long id); /** * 获得好卡案例分页 @@ -49,6 +50,6 @@ public interface DemoService { * @param pageReqVO 分页查询 * @return 好卡案例分页 */ - PageResult getDemoPage(DemoPageReqVO pageReqVO); + PageResult getDemoPage(HaokaDemoPageReqVO pageReqVO); -} +} \ No newline at end of file diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/demo/DemoServiceImpl.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/demo/HaokaDemoServiceImpl.java similarity index 60% rename from yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/demo/DemoServiceImpl.java rename to yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/demo/HaokaDemoServiceImpl.java index 03760dc1c5..0ae6d11e0f 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/demo/DemoServiceImpl.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/demo/HaokaDemoServiceImpl.java @@ -1,17 +1,21 @@ package cn.iocoder.yudao.module.haoka.service.demo; -import cn.iocoder.yudao.framework.common.pojo.PageResult; -import cn.iocoder.yudao.framework.common.util.object.BeanUtils; -import cn.iocoder.yudao.module.haoka.controller.admin.demo.vo.DemoPageReqVO; -import cn.iocoder.yudao.module.haoka.controller.admin.demo.vo.DemoSaveReqVO; -import cn.iocoder.yudao.module.haoka.dal.dataobject.demo.DemoDO; -import cn.iocoder.yudao.module.haoka.dal.mysql.demo.DemoMapper; -import jakarta.annotation.Resource; import org.springframework.stereotype.Service; +import jakarta.annotation.Resource; import org.springframework.validation.annotation.Validated; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import cn.iocoder.yudao.module.haoka.controller.admin.demo.vo.*; +import cn.iocoder.yudao.module.haoka.dal.dataobject.demo.HaokaDemoDO; +import cn.iocoder.yudao.framework.common.pojo.PageResult; +import cn.iocoder.yudao.framework.common.pojo.PageParam; +import cn.iocoder.yudao.framework.common.util.object.BeanUtils; + +import cn.iocoder.yudao.module.haoka.dal.mysql.demo.HaokaDemoMapper; import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception; -import static cn.iocoder.yudao.module.haoka.enums.ErrorCodeConstants.DEMO_NOT_EXISTS; +import static cn.iocoder.yudao.module.haoka.enums.ErrorCodeConstants.*; /** * 好卡案例 Service 实现类 @@ -20,26 +24,26 @@ import static cn.iocoder.yudao.module.haoka.enums.ErrorCodeConstants.DEMO_NOT_EX */ @Service @Validated -public class DemoServiceImpl implements DemoService { +public class HaokaDemoServiceImpl implements HaokaDemoService { @Resource - private DemoMapper demoMapper; + private HaokaDemoMapper demoMapper; @Override - public Long createDemo(DemoSaveReqVO createReqVO) { + public Long createDemo(HaokaDemoSaveReqVO createReqVO) { // 插入 - DemoDO demo = BeanUtils.toBean(createReqVO, DemoDO.class); + HaokaDemoDO demo = BeanUtils.toBean(createReqVO, HaokaDemoDO.class); demoMapper.insert(demo); // 返回 return demo.getId(); } @Override - public void updateDemo(DemoSaveReqVO updateReqVO) { + public void updateDemo(HaokaDemoSaveReqVO updateReqVO) { // 校验存在 validateDemoExists(updateReqVO.getId()); // 更新 - DemoDO updateObj = BeanUtils.toBean(updateReqVO, DemoDO.class); + HaokaDemoDO updateObj = BeanUtils.toBean(updateReqVO, HaokaDemoDO.class); demoMapper.updateById(updateObj); } @@ -58,13 +62,13 @@ public class DemoServiceImpl implements DemoService { } @Override - public DemoDO getDemo(Long id) { + public HaokaDemoDO getDemo(Long id) { return demoMapper.selectById(id); } @Override - public PageResult getDemoPage(DemoPageReqVO pageReqVO) { + public PageResult getDemoPage(HaokaDemoPageReqVO pageReqVO) { return demoMapper.selectPage(pageReqVO); } -} +} \ No newline at end of file diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/resources/mapper/demo/DemoMapper.xml b/yudao-module-haoka/yudao-module-haoka-biz/src/main/resources/mapper/demo/HaokaDemoMapper.xml similarity index 95% rename from yudao-module-haoka/yudao-module-haoka-biz/src/main/resources/mapper/demo/DemoMapper.xml rename to yudao-module-haoka/yudao-module-haoka-biz/src/main/resources/mapper/demo/HaokaDemoMapper.xml index 89d4314bad..191b497b97 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/resources/mapper/demo/DemoMapper.xml +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/resources/mapper/demo/HaokaDemoMapper.xml @@ -1,6 +1,6 @@ - +