From 00f898ab7ebc1ed34fae372c31720bd9b3d9cfc5 Mon Sep 17 00:00:00 2001 From: lizhengwei Date: Thu, 13 Nov 2025 16:59:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E8=A1=A8=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-site/ruoyi-h5/doc/h5_groups.sql | 63 +++++++++++-------- ruoyi-site/ruoyi-h5/doc/h5_project_groups.sql | 28 +++++---- ruoyi-site/ruoyi-h5/doc/h5_projects.sql | 40 ++++++------ .../luban/api/controller/FontController.java | 14 ++--- .../java/com/luban/api/entity/H5Group.java | 4 +- .../java/com/luban/api/entity/H5Project.java | 4 +- .../com/luban/api/entity/H5ProjectGroup.java | 4 +- 7 files changed, 87 insertions(+), 70 deletions(-) diff --git a/ruoyi-site/ruoyi-h5/doc/h5_groups.sql b/ruoyi-site/ruoyi-h5/doc/h5_groups.sql index 2dc5d2437..eced48e08 100644 --- a/ruoyi-site/ruoyi-h5/doc/h5_groups.sql +++ b/ruoyi-site/ruoyi-h5/doc/h5_groups.sql @@ -18,46 +18,59 @@ SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- --- Table structure for h5_groups +-- Table structure for h5_group -- ---------------------------- -DROP TABLE IF EXISTS `h5_groups`; -CREATE TABLE `h5_groups` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '分组名称', - `parent_id` bigint NOT NULL DEFAULT 0 COMMENT '父级分组ID，0表示一级分组', - `type` int NOT NULL COMMENT '分组类型：1-物料 2-用途 3-行业', - `sort` int NOT NULL DEFAULT 0 COMMENT '排序', - `status` int NOT NULL DEFAULT 1 COMMENT '状态：0-禁用 1-启用', - `create_time` bigint NULL DEFAULT NULL COMMENT '创建时间戳', - `update_time` bigint NULL DEFAULT NULL COMMENT '更新时间戳', - PRIMARY KEY (`id`) USING BTREE, - INDEX `idx_parent_id`(`parent_id`) USING BTREE, - INDEX `idx_type`(`type`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'H5分组表' ROW_FORMAT = Dynamic; +DROP TABLE IF EXISTS `h5_group`; +CREATE TABLE `h5_group` +( + `id` bigint PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '分组名称', + `parent_id` bigint NOT NULL DEFAULT 0 COMMENT '父级分组ID，0表示一级分组', + `type` int NOT NULL COMMENT '分组类型：1-物料 2-用途 3-行业', + `sort` int NOT NULL DEFAULT 0 COMMENT '排序', + `status` int NOT NULL DEFAULT 1 COMMENT '状态：0-禁用 1-启用', + `create_time` bigint NOT NULL COMMENT '创建时间戳', + `update_time` bigint NULL DEFAULT NULL COMMENT '更新时间戳', + INDEX `idx_parent_id` (`parent_id`) USING BTREE, + INDEX `idx_type` (`type`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 1 + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_general_ci COMMENT = 'H5分组表' + ROW_FORMAT = Dynamic; -- ---------------------------- -- 插入默认分组数据 -- ---------------------------- -INSERT INTO `h5_groups` VALUES (1, '物料', 0, 1, 1, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); -INSERT INTO `h5_groups` VALUES (2, '用途', 0, 2, 2, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); -INSERT INTO `h5_groups` VALUES (3, '行业', 0, 3, 3, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); +INSERT INTO `h5_group` +VALUES (1, '物料', 0, 1, 1, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); +INSERT INTO `h5_group` +VALUES (2, '用途', 0, 2, 2, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); +INSERT INTO `h5_group` +VALUES (3, '行业', 0, 3, 3, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); -- ---------------------------- -- 插入二级分组数据 - 物料 -- ---------------------------- -INSERT INTO `h5_groups` VALUES (4, '长页', 1, 1, 1, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); -INSERT INTO `h5_groups` VALUES (5, '翻页', 1, 1, 2, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); +INSERT INTO `h5_group` +VALUES (4, '长页', 1, 1, 1, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); +INSERT INTO `h5_group` +VALUES (5, '翻页', 1, 1, 2, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); -- ---------------------------- -- 插入二级分组数据 - 用途 -- ---------------------------- -INSERT INTO `h5_groups` VALUES (6, '通用', 2, 2, 1, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); -INSERT INTO `h5_groups` VALUES (7, '祝福问候', 2, 2, 2, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); +INSERT INTO `h5_group` +VALUES (6, '通用', 2, 2, 1, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); +INSERT INTO `h5_group` +VALUES (7, '祝福问候', 2, 2, 2, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); -- ---------------------------- -- 插入二级分组数据 - 行业 -- ---------------------------- -INSERT INTO `h5_groups` VALUES (8, '金融', 3, 3, 1, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); -INSERT INTO `h5_groups` VALUES (9, '医疗', 3, 3, 2, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); +INSERT INTO `h5_group` +VALUES (8, '金融', 3, 3, 1, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); +INSERT INTO `h5_group` +VALUES (9, '医疗', 3, 3, 2, 1, UNIX_TIMESTAMP(), UNIX_TIMESTAMP()); -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file +SET FOREIGN_KEY_CHECKS = 1; diff --git a/ruoyi-site/ruoyi-h5/doc/h5_project_groups.sql b/ruoyi-site/ruoyi-h5/doc/h5_project_groups.sql index fd59790b0..49e5d463d 100644 --- a/ruoyi-site/ruoyi-h5/doc/h5_project_groups.sql +++ b/ruoyi-site/ruoyi-h5/doc/h5_project_groups.sql @@ -18,17 +18,21 @@ SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- --- Table structure for h5_project_groups +-- Table structure for h5_project_group -- ---------------------------- -DROP TABLE IF EXISTS `h5_project_groups`; -CREATE TABLE `h5_project_groups` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `project_id` bigint NOT NULL COMMENT '项目ID', - `group_id` bigint NOT NULL COMMENT '分组ID', - `create_time` bigint NULL DEFAULT NULL COMMENT '创建时间戳', - PRIMARY KEY (`id`) USING BTREE, - INDEX `idx_project_id`(`project_id`) USING BTREE, - INDEX `idx_group_id`(`group_id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'H5项目与分组关联表' ROW_FORMAT = Dynamic; +DROP TABLE IF EXISTS `h5_project_group`; +CREATE TABLE `h5_project_group` +( + `id` bigint PRIMARY KEY AUTO_INCREMENT COMMENT '主键ID', + `project_id` bigint NOT NULL COMMENT '项目ID', + `group_id` bigint NOT NULL COMMENT '分组ID', + `create_time` bigint NOT NULL COMMENT '创建时间戳', + INDEX `idx_project_id` (`project_id`) USING BTREE, + INDEX `idx_group_id` (`group_id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 1 + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_general_ci COMMENT = 'H5项目与分组关联表' + ROW_FORMAT = Dynamic; -SET FOREIGN_KEY_CHECKS = 1; \ No newline at end of file +SET FOREIGN_KEY_CHECKS = 1; diff --git a/ruoyi-site/ruoyi-h5/doc/h5_projects.sql b/ruoyi-site/ruoyi-h5/doc/h5_projects.sql index cb7a72579..9318c0966 100644 --- a/ruoyi-site/ruoyi-h5/doc/h5_projects.sql +++ b/ruoyi-site/ruoyi-h5/doc/h5_projects.sql @@ -18,24 +18,28 @@ SET NAMES utf8mb4; SET FOREIGN_KEY_CHECKS = 0; -- ---------------------------- --- Table structure for h5_projects +-- Table structure for h5_project -- ---------------------------- -DROP TABLE IF EXISTS `h5_projects`; -CREATE TABLE `h5_projects` ( - `id` bigint NOT NULL AUTO_INCREMENT COMMENT '主键ID', - `type` varchar(10) NULL DEFAULT NULL COMMENT '类型', - `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '标题', - `content_id` varchar(255) not NULL DEFAULT NULL COMMENT '内容在MongoDB中的ID', - `content_updated_at` bigint NULL DEFAULT NULL COMMENT '内容更新时间戳', - `description` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', - `preview_url` varchar(500) NULL DEFAULT NULL COMMENT '预览图URL', - `preview_url_watermark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水印预览图URL', - `preview_width` int NULL DEFAULT NULL COMMENT '预览图宽度', - `preview_height` int NULL DEFAULT NULL COMMENT '预览图高度', - `status` tinyint NULL DEFAULT NULL COMMENT '状态', - `create_time` bigint NULL DEFAULT NULL COMMENT '创建时间戳', - `update_time` bigint NULL DEFAULT NULL COMMENT '更新时间戳', - PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = 'H5项目表' ROW_FORMAT = Dynamic; +DROP TABLE IF EXISTS `h5_project`; +CREATE TABLE `h5_project` +( + `id` bigint PRIMARY KEY NOT NULL AUTO_INCREMENT COMMENT '主键ID', + `type` varchar(10) NOT NULL COMMENT '类型', + `title` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题', + `content_id` varchar(255) NOT NULL COMMENT '内容在MongoDB中的ID', + `content_updated_at` bigint NULL DEFAULT NULL COMMENT '内容更新时间戳', + `description` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '描述', + `preview_url` varchar(500) NULL DEFAULT NULL COMMENT '预览图URL', + `preview_url_watermark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '水印预览图URL', + `preview_width` int NOT NULL COMMENT '预览图宽度', + `preview_height` int NOT NULL COMMENT '预览图高度', + `status` tinyint NOT NULL COMMENT '状态', + `create_time` bigint NOT NULL COMMENT '创建时间戳', + `update_time` bigint NULL DEFAULT NULL COMMENT '更新时间戳' +) ENGINE = InnoDB + AUTO_INCREMENT = 1 + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_general_ci COMMENT = 'H5项目表' + ROW_FORMAT = Dynamic; SET FOREIGN_KEY_CHECKS = 1; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FontController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FontController.java index 5caa83b43..6a3a937b8 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FontController.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FontController.java @@ -3,11 +3,7 @@ package com.luban.api.controller; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.ArrayList; import java.util.List; @@ -22,21 +18,21 @@ public class FontController { @Operation(summary = "批量上传字体") @PostMapping("create") - public List create(@Validated List list) { + public List create(@RequestBody List list) { return new ArrayList<>(); } @Operation(summary = "分页查询字体") @GetMapping("page") - public List page(String type//中文、英文 - , @Validated String name) { + public List page(@RequestParam String type//中文、英文 + , @RequestParam String name) { return new ArrayList<>(); } @Operation(summary = "查询字体") @GetMapping("list") - public List list(@Validated List nameLike) { + public List list(@RequestParam List nameLike) { return new ArrayList<>(); } diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Group.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Group.java index 8b1e4e310..a5e57a812 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Group.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Group.java @@ -16,7 +16,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode @Accessors(chain = true) -@TableName("h5_groups") +@TableName("h5_group") @Schema(title = "H5分组对象") public class H5Group implements Serializable { @@ -63,4 +63,4 @@ public class H5Group implements Serializable { */ private Long updateTime; -} \ No newline at end of file +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Project.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Project.java index ea4907bee..197c332f0 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Project.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Project.java @@ -16,7 +16,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode @Accessors(chain = true) -@TableName("h5_projects") +@TableName("h5_project") @Schema(title = "H5项目对象") public class H5Project implements Serializable { @@ -88,4 +88,4 @@ public class H5Project implements Serializable { */ private Long updateTime; -} \ No newline at end of file +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ProjectGroup.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ProjectGroup.java index 1b78a6e6e..ecdd1e0aa 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ProjectGroup.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ProjectGroup.java @@ -16,7 +16,7 @@ import java.io.Serializable; @Data @EqualsAndHashCode @Accessors(chain = true) -@TableName("h5_project_groups") +@TableName("h5_project_group") @Schema(title = "H5项目与分组关联对象") public class H5ProjectGroup implements Serializable { @@ -43,4 +43,4 @@ public class H5ProjectGroup implements Serializable { */ private Long createTime; -} \ No newline at end of file +}