diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index b04da9243..57ccc5364 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -19,6 +19,7 @@ ruoyi-system-saas ruoyi-workflow ruoyi-md-form + ruoyi-md-h5 ruoyi-ai diff --git a/ruoyi-modules/ruoyi-md-h5/pom.xml b/ruoyi-modules/ruoyi-md-h5/pom.xml new file mode 100644 index 000000000..45a6386e3 --- /dev/null +++ b/ruoyi-modules/ruoyi-md-h5/pom.xml @@ -0,0 +1,24 @@ + + + + org.dromara + ruoyi-modules + ${revision} + + 4.0.0 + + ruoyi-md-h5 + + pom + + h5模块 + + + + ruoyi-md-h5-api + ruoyi-md-h5-mapper + ruoyi-md-h5-service + + diff --git a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/pom.xml b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/pom.xml new file mode 100644 index 000000000..fab923b74 --- /dev/null +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/pom.xml @@ -0,0 +1,39 @@ + + + + org.dromara + ruoyi-md-h5 + ${revision} + + 4.0.0 + + ruoyi-md-h5-api + ${revision} + jar + + + ruoyi-api-system系统接口模块 + + + + + + + org.dromara + ruoyi-common-core + + + + org.dromara + ruoyi-common-doc + + + io.swagger + swagger-annotations + 1.5.13 + + + + diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/util/TimestampToLocalDateTimeDeserializer.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/TimestampToLocalDateTimeDeserializer.java similarity index 96% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/util/TimestampToLocalDateTimeDeserializer.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/TimestampToLocalDateTimeDeserializer.java index 119a11339..77eee3794 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/util/TimestampToLocalDateTimeDeserializer.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/TimestampToLocalDateTimeDeserializer.java @@ -1,4 +1,4 @@ -package com.luban.api.util; +package org.dromara.md.h5.api; import com.fasterxml.jackson.core.JacksonException; import com.fasterxml.jackson.core.JsonParser; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/constant/PackageConstant.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/constant/PackageConstant.java similarity index 88% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/constant/PackageConstant.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/constant/PackageConstant.java index 47f9055c0..76fcf208b 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/constant/PackageConstant.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/constant/PackageConstant.java @@ -1,4 +1,4 @@ -package com.luban.api.constant; +package org.dromara.md.h5.api.constant; /** * 包名常量 diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/constant/ProjectStatus.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/constant/ProjectStatus.java similarity index 94% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/constant/ProjectStatus.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/constant/ProjectStatus.java index c801f87f0..161852252 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/constant/ProjectStatus.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/constant/ProjectStatus.java @@ -1,4 +1,4 @@ -package com.luban.api.constant; +package org.dromara.md.h5.api.constant; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/FontDTO.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/FontDTO.java similarity index 96% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/FontDTO.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/FontDTO.java index 28d159ddd..b420a9a6f 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/FontDTO.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/FontDTO.java @@ -1,8 +1,8 @@ -package com.luban.api.dto; +package org.dromara.md.h5.api.dto; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.luban.api.util.TimestampToLocalDateTimeDeserializer; +import org.dromara.md.h5.api.TimestampToLocalDateTimeDeserializer; import lombok.Data; import java.time.LocalDateTime; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ComponentCategoryQueryDTO.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ComponentCategoryQueryDTO.java similarity index 93% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ComponentCategoryQueryDTO.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ComponentCategoryQueryDTO.java index 0d9758b0c..70522f8ba 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ComponentCategoryQueryDTO.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ComponentCategoryQueryDTO.java @@ -1,4 +1,4 @@ -package com.luban.api.dto; +package org.dromara.md.h5.api.dto; import lombok.Data; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ComponentDTO.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ComponentDTO.java similarity index 98% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ComponentDTO.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ComponentDTO.java index 3b611998d..d9e673367 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ComponentDTO.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ComponentDTO.java @@ -1,5 +1,5 @@ -package com.luban.api.dto; +package org.dromara.md.h5.api.dto; import io.swagger.v3.oas.annotations.Parameter; import jakarta.validation.constraints.NotBlank; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ComponentTopQueryDTO.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ComponentTopQueryDTO.java similarity index 94% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ComponentTopQueryDTO.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ComponentTopQueryDTO.java index 97ef7d98e..e4a65fda2 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ComponentTopQueryDTO.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ComponentTopQueryDTO.java @@ -1,4 +1,4 @@ -package com.luban.api.dto; +package org.dromara.md.h5.api.dto; import io.swagger.v3.oas.annotations.Parameter; import jakarta.validation.constraints.NotNull; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5FormSubmissionDTO.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5FormSubmissionDTO.java similarity index 97% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5FormSubmissionDTO.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5FormSubmissionDTO.java index 9eb7b06e0..d933332c9 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5FormSubmissionDTO.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5FormSubmissionDTO.java @@ -1,4 +1,4 @@ -package com.luban.api.dto; +package org.dromara.md.h5.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ProjectContentDTO.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ProjectContentDTO.java similarity index 99% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ProjectContentDTO.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ProjectContentDTO.java index 4b0a85e46..e7bf01bc2 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ProjectContentDTO.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ProjectContentDTO.java @@ -1,10 +1,10 @@ -package com.luban.api.dto; +package org.dromara.md.h5.api.dto; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.luban.api.util.TimestampToLocalDateTimeDeserializer; +import org.dromara.md.h5.api.TimestampToLocalDateTimeDeserializer; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/PageDtoBase.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/PageDtoBase.java similarity index 94% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/PageDtoBase.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/PageDtoBase.java index 976a41df1..4c9289294 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/PageDtoBase.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/PageDtoBase.java @@ -1,4 +1,4 @@ -package com.luban.api.dto; +package org.dromara.md.h5.api.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/query/H5ComponentPageQueryDTO.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/query/H5ComponentPageQueryDTO.java similarity index 96% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/query/H5ComponentPageQueryDTO.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/query/H5ComponentPageQueryDTO.java index 732aa39a1..04a48093f 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/query/H5ComponentPageQueryDTO.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/query/H5ComponentPageQueryDTO.java @@ -1,4 +1,4 @@ -package com.luban.api.dto.query; +package org.dromara.md.h5.api.dto.query; import io.swagger.v3.oas.annotations.Parameter; import jakarta.validation.constraints.NotNull; @@ -50,4 +50,4 @@ public class H5ComponentPageQueryDTO { */ @Parameter(description = "标签 ID") private Long tagId; -} \ No newline at end of file +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/query/H5ProjectQueryDTO.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/query/H5ProjectQueryDTO.java similarity index 88% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/query/H5ProjectQueryDTO.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/query/H5ProjectQueryDTO.java index 6f867e6d8..4937855b9 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/query/H5ProjectQueryDTO.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/query/H5ProjectQueryDTO.java @@ -1,6 +1,6 @@ -package com.luban.api.dto.query; +package org.dromara.md.h5.api.dto.query; -import com.luban.api.dto.PageDtoBase; +import org.dromara.md.h5.api.dto.PageDtoBase; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; import lombok.Setter; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ComponentCategoryTreeVO.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/H5ComponentCategoryTreeVO.java similarity index 96% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ComponentCategoryTreeVO.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/H5ComponentCategoryTreeVO.java index c1b475568..141c2d4a9 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ComponentCategoryTreeVO.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/H5ComponentCategoryTreeVO.java @@ -1,4 +1,4 @@ -package com.luban.api.vo; +package org.dromara.md.h5.api.vo; import lombok.Data; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ComponentVO.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/H5ComponentVO.java similarity index 97% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ComponentVO.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/H5ComponentVO.java index 4100a6d96..ac85affd7 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ComponentVO.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/H5ComponentVO.java @@ -1,4 +1,4 @@ -package com.luban.api.vo; +package org.dromara.md.h5.api.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ProjectVO.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/H5ProjectVO.java similarity index 97% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ProjectVO.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/H5ProjectVO.java index 6ad989a8d..b3169a22c 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ProjectVO.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/H5ProjectVO.java @@ -1,4 +1,4 @@ -package com.luban.api.vo; +package org.dromara.md.h5.api.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/Result.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/Result.java similarity index 98% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/Result.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/Result.java index e3b2e2e5c..276410e02 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/Result.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/Result.java @@ -1,4 +1,4 @@ -package com.luban.api.vo; +package org.dromara.md.h5.api.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/pom.xml b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/pom.xml new file mode 100644 index 000000000..20550bfef --- /dev/null +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/pom.xml @@ -0,0 +1,25 @@ + + + 4.0.0 + + org.dromara + ruoyi-md-h5 + ${revision} + + + ruoyi-md-h5-mapper + + + + org.dromara + ruoyi-md-h5-api + ${revision} + + + com.baomidou + mybatis-plus-spring-boot3-starter + provided + + + + diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Font.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/Font.java similarity index 96% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Font.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/Font.java index a1c7a4b67..ccbe65c31 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Font.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/Font.java @@ -1,4 +1,4 @@ -package com.luban.api.entity; +package org.dromara.md.h5.mapper.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/FormSubmission.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/FormSubmission.java similarity index 96% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/FormSubmission.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/FormSubmission.java index 6f61f5aa8..25088a46a 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/FormSubmission.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/FormSubmission.java @@ -1,4 +1,4 @@ -package com.luban.api.entity; +package org.dromara.md.h5.mapper.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Component.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Component.java similarity index 96% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Component.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Component.java index ad985ca83..3d78d026a 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Component.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Component.java @@ -1,4 +1,4 @@ -package com.luban.api.entity; +package org.dromara.md.h5.mapper.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -8,8 +8,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; -import java.util.Map; - /** * H5 组件实体 * diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ComponentCategory.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ComponentCategory.java similarity index 96% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ComponentCategory.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ComponentCategory.java index 2a75a7e66..c1e16567b 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ComponentCategory.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ComponentCategory.java @@ -1,4 +1,4 @@ -package com.luban.api.entity; +package org.dromara.md.h5.mapper.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ComponentCategoryRel.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ComponentCategoryRel.java similarity index 95% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ComponentCategoryRel.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ComponentCategoryRel.java index 842d8a5bd..d0f2e129c 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ComponentCategoryRel.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ComponentCategoryRel.java @@ -1,4 +1,4 @@ -package com.luban.api.entity; +package org.dromara.md.h5.mapper.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ComponentTagRel.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ComponentTagRel.java similarity index 95% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ComponentTagRel.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ComponentTagRel.java index 9a1979919..f36ce5621 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ComponentTagRel.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ComponentTagRel.java @@ -1,4 +1,4 @@ -package com.luban.api.entity; +package org.dromara.md.h5.mapper.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Form.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Form.java similarity index 96% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Form.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Form.java index d12d7d594..b77e2ca8f 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Form.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Form.java @@ -1,4 +1,4 @@ -package com.luban.api.entity; +package org.dromara.md.h5.mapper.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Group.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Group.java similarity index 96% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Group.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Group.java index b6b8694e4..24e19c418 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Group.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Group.java @@ -1,4 +1,4 @@ -package com.luban.api.entity; +package org.dromara.md.h5.mapper.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Project.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Project.java similarity index 97% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Project.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Project.java index d49e6925f..eef3fc0f1 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Project.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Project.java @@ -1,4 +1,4 @@ -package com.luban.api.entity; +package org.dromara.md.h5.mapper.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ProjectGroup.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ProjectGroup.java similarity index 95% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ProjectGroup.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ProjectGroup.java index 223f9301d..7bdc89e09 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ProjectGroup.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ProjectGroup.java @@ -1,4 +1,4 @@ -package com.luban.api.entity; +package org.dromara.md.h5.mapper.entity; import com.baomidou.mybatisplus.annotation.*; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Tag.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Tag.java similarity index 96% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Tag.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Tag.java index e225f8069..041fec7dc 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Tag.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Tag.java @@ -1,4 +1,4 @@ -package com.luban.api.entity; +package org.dromara.md.h5.mapper.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Scripts.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/Scripts.java similarity index 95% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Scripts.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/Scripts.java index dcd1fa149..fcef85cc3 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Scripts.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/Scripts.java @@ -1,4 +1,4 @@ -package com.luban.api.entity; +package org.dromara.md.h5.mapper.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/FontDao.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/FontDao.java similarity index 67% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/FontDao.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/FontDao.java index 5d6b31713..d868cea79 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/FontDao.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/FontDao.java @@ -1,7 +1,7 @@ -package com.luban.api.dao; +package org.dromara.md.h5.mapper.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.luban.api.entity.Font; +import org.dromara.md.h5.mapper.entity.Font; /** *

@@ -12,4 +12,4 @@ import com.luban.api.entity.Font; */ public interface FontDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/FormSubmissionDao.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/FormSubmissionDao.java similarity index 89% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/FormSubmissionDao.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/FormSubmissionDao.java index f5c97fa70..2fb695ce0 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/FormSubmissionDao.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/FormSubmissionDao.java @@ -1,8 +1,8 @@ -package com.luban.api.dao; +package org.dromara.md.h5.mapper.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.luban.api.entity.FormSubmission; +import org.dromara.md.h5.mapper.entity.FormSubmission; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentCategoryDao.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentCategoryDao.java similarity index 73% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentCategoryDao.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentCategoryDao.java index 58651237f..2c39f47e9 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentCategoryDao.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentCategoryDao.java @@ -1,7 +1,7 @@ -package com.luban.api.dao; +package org.dromara.md.h5.mapper.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.luban.api.entity.H5ComponentCategory; +import org.dromara.md.h5.mapper.entity.H5ComponentCategory; import org.apache.ibatis.annotations.Mapper; /** diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentCategoryRelDao.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentCategoryRelDao.java similarity index 73% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentCategoryRelDao.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentCategoryRelDao.java index 338c38208..7675ea614 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentCategoryRelDao.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentCategoryRelDao.java @@ -1,7 +1,7 @@ -package com.luban.api.dao; +package org.dromara.md.h5.mapper.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.luban.api.entity.H5ComponentCategoryRel; +import org.dromara.md.h5.mapper.entity.H5ComponentCategoryRel; import org.apache.ibatis.annotations.Mapper; /** diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentDao.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentDao.java similarity index 90% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentDao.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentDao.java index 33d7ccf3f..e4bdc809a 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentDao.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentDao.java @@ -1,7 +1,7 @@ -package com.luban.api.dao; +package org.dromara.md.h5.mapper.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.luban.api.entity.H5Component; +import org.dromara.md.h5.mapper.entity.H5Component; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -24,13 +24,13 @@ public interface H5ComponentDao extends BaseMapper { * @return 组件列表 */ List selectTopComponentsByCategory(@Param("categoryId") Long categoryId, @Param("pageSize") Integer pageSize); - + /** * 分页查询组件列表 * @param page 分页对象 * @param params 查询参数 * @return 组件列表 */ - List selectPageList(@Param("page") com.baomidou.mybatisplus.extension.plugins.pagination.Page page, + List selectPageList(@Param("page") com.baomidou.mybatisplus.extension.plugins.pagination.Page page, @Param("params") Map params); -} \ No newline at end of file +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentTagRelDao.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentTagRelDao.java similarity index 74% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentTagRelDao.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentTagRelDao.java index fc46a66f0..c26a3124f 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentTagRelDao.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentTagRelDao.java @@ -1,7 +1,7 @@ -package com.luban.api.dao; +package org.dromara.md.h5.mapper.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.luban.api.entity.H5ComponentTagRel; +import org.dromara.md.h5.mapper.entity.H5ComponentTagRel; import org.apache.ibatis.annotations.Mapper; /** diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5FormDao.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5FormDao.java similarity index 65% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5FormDao.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5FormDao.java index 7b348dd09..de9186d58 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5FormDao.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5FormDao.java @@ -1,7 +1,7 @@ -package com.luban.api.dao; +package org.dromara.md.h5.mapper.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.luban.api.entity.H5Form; +import org.dromara.md.h5.mapper.entity.H5Form; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5GroupDao.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5GroupDao.java similarity index 72% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5GroupDao.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5GroupDao.java index fca886c74..e69f8fa3a 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5GroupDao.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5GroupDao.java @@ -1,7 +1,7 @@ -package com.luban.api.dao; +package org.dromara.md.h5.mapper.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.luban.api.entity.H5Group; +import org.dromara.md.h5.mapper.entity.H5Group; import org.apache.ibatis.annotations.Mapper; /** @@ -14,4 +14,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface H5GroupDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ProjectDao.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ProjectDao.java similarity index 80% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ProjectDao.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ProjectDao.java index eb514c9ca..3af09d79a 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ProjectDao.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ProjectDao.java @@ -1,9 +1,9 @@ -package com.luban.api.dao; +package org.dromara.md.h5.mapper.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.luban.api.entity.H5Project; -import com.luban.api.dto.query.H5ProjectQueryDTO; +import org.dromara.md.h5.mapper.entity.H5Project; +import org.dromara.md.h5.api.dto.query.H5ProjectQueryDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ProjectGroupDao.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ProjectGroupDao.java similarity index 73% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ProjectGroupDao.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ProjectGroupDao.java index 8227f8c3f..098e168dc 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ProjectGroupDao.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ProjectGroupDao.java @@ -1,7 +1,7 @@ -package com.luban.api.dao; +package org.dromara.md.h5.mapper.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.luban.api.entity.H5ProjectGroup; +import org.dromara.md.h5.mapper.entity.H5ProjectGroup; import org.apache.ibatis.annotations.Mapper; /** @@ -14,4 +14,4 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface H5ProjectGroupDao extends BaseMapper { -} \ No newline at end of file +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5TagDao.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5TagDao.java similarity index 74% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5TagDao.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5TagDao.java index 79a2adceb..a34d48f98 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5TagDao.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5TagDao.java @@ -1,7 +1,7 @@ -package com.luban.api.dao; +package org.dromara.md.h5.mapper.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.luban.api.entity.H5Tag; +import org.dromara.md.h5.mapper.entity.H5Tag; import org.apache.ibatis.annotations.Mapper; /** diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/ScriptsDao.java b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/ScriptsDao.java similarity index 74% rename from ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/ScriptsDao.java rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/ScriptsDao.java index fdcb108a3..e5e221b7a 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/ScriptsDao.java +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/ScriptsDao.java @@ -1,6 +1,6 @@ -package com.luban.api.dao; +package org.dromara.md.h5.mapper.mapper; -import com.luban.api.entity.Scripts; +import org.dromara.md.h5.mapper.entity.Scripts; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/FormSubmissionDao.xml b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/FormSubmissionDao.xml similarity index 75% rename from ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/FormSubmissionDao.xml rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/FormSubmissionDao.xml index 922ae45c3..58f0196e5 100644 --- a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/FormSubmissionDao.xml +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/FormSubmissionDao.xml @@ -1,8 +1,8 @@ - + - SELECT * FROM h5_form_submission project_id = #{projectId} @@ -14,4 +14,4 @@ ORDER BY create_time DESC - \ No newline at end of file + diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5ComponentDao.xml b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/H5ComponentDao.xml similarity index 68% rename from ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5ComponentDao.xml rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/H5ComponentDao.xml index 5b96206de..05ed9d7b9 100644 --- a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5ComponentDao.xml +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/H5ComponentDao.xml @@ -1,23 +1,23 @@ - + - SELECT * FROM h5_component WHERE status = 1 AND id IN ( - SELECT component_id - FROM h5_component_category_rel + SELECT component_id + FROM h5_component_category_rel WHERE category_id = #{categoryId} ) ORDER BY usage_count DESC, create_time DESC LIMIT #{pageSize} - + - + SELECT hc.* FROM h5_component hc WHERE hc.status = 1 @@ -30,9 +30,9 @@ AND EXISTS ( - SELECT 1 - FROM h5_component_category_rel hccr - WHERE hccr.component_id = hc.id + SELECT 1 + FROM h5_component_category_rel hccr + WHERE hccr.component_id = hc.id AND hccr.category_id IN #{categoryId} @@ -41,13 +41,13 @@ AND EXISTS ( - SELECT 1 - FROM h5_component_tag_rel hctr - WHERE hctr.component_id = hc.id + SELECT 1 + FROM h5_component_tag_rel hctr + WHERE hctr.component_id = hc.id AND hctr.tag_id = #{params.tagId} ) ORDER BY hc.create_time DESC - \ No newline at end of file + diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5FormDao.xml b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/H5FormDao.xml similarity index 71% rename from ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5FormDao.xml rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/H5FormDao.xml index cdac445af..b1acb917c 100644 --- a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5FormDao.xml +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/H5FormDao.xml @@ -1,5 +1,5 @@ - + diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5ProjectMapper.xml b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/H5ProjectMapper.xml similarity index 93% rename from ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5ProjectMapper.xml rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/H5ProjectMapper.xml index 30da07285..736f60504 100644 --- a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5ProjectMapper.xml +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/H5ProjectMapper.xml @@ -1,7 +1,7 @@ - - + + diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/ScriptsDao.xml b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/ScriptsDao.xml similarity index 76% rename from ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/ScriptsDao.xml rename to ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/ScriptsDao.xml index 0f8adb627..8fbbaf3e7 100644 --- a/ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/ScriptsDao.xml +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/ScriptsDao.xml @@ -1,9 +1,9 @@ - + - + diff --git a/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/pom.xml b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/pom.xml new file mode 100644 index 000000000..c13230b88 --- /dev/null +++ b/ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/pom.xml @@ -0,0 +1,51 @@ + + + + org.dromara + ruoyi-md-h5 + ${revision} + + 4.0.0 + + ruoyi-md-h5-service + + + system系统模块 + + + + + org.dromara + ruoyi-md-h5-api + ${revision} + + + org.dromara + ruoyi-md-h5-mapper + ${revision} + + + org.dromara + ruoyi-common-core + + + org.dromara + ruoyi-common-mybatis + + + org.dromara + ruoyi-common-json + + + org.dromara + ruoyi-common-oss + + + org.dromara + ruoyi-common-tenant + + + + diff --git a/ruoyi-modules/ruoyi-modules-bom/pom.xml b/ruoyi-modules/ruoyi-modules-bom/pom.xml index 611c83faf..83dd15207 100644 --- a/ruoyi-modules/ruoyi-modules-bom/pom.xml +++ b/ruoyi-modules/ruoyi-modules-bom/pom.xml @@ -70,6 +70,21 @@ ruoyi-md-form-feign ${revision} + + org.dromara + ruoyi-md-h5-api + ${revision} + + + org.dromara + ruoyi-md-h5-mapper + ${revision} + + + org.dromara + ruoyi-md-h5-service + ${revision} + diff --git a/ruoyi-site/ruoyi-h5/pom.xml b/ruoyi-site/ruoyi-h5/pom.xml index 4b73d9698..5d8b3a82b 100644 --- a/ruoyi-site/ruoyi-h5/pom.xml +++ b/ruoyi-site/ruoyi-h5/pom.xml @@ -70,6 +70,11 @@ ruoyi-md-form-service + + org.dromara + ruoyi-md-h5-service + + com.alibaba.cloud 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 d81701dae..18a7d71cd 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 @@ -1,8 +1,8 @@ package com.luban.api.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.luban.api.entity.Font; -import com.luban.api.dto.FontDTO; +import org.dromara.md.h5.mapper.entity.Font; +import org.dromara.md.h5.api.dto.FontDTO; import com.luban.api.service.FontService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -10,7 +10,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; import java.util.List; @RestController diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentCategoryController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentCategoryController.java index 62ead985c..db25593a3 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentCategoryController.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentCategoryController.java @@ -1,10 +1,10 @@ package com.luban.api.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.luban.api.dto.H5ComponentCategoryQueryDTO; -import com.luban.api.entity.H5ComponentCategory; +import org.dromara.md.h5.api.dto.H5ComponentCategoryQueryDTO; +import org.dromara.md.h5.mapper.entity.H5ComponentCategory; import com.luban.api.service.H5ComponentCategoryService; -import com.luban.api.vo.H5ComponentCategoryTreeVO; +import org.dromara.md.h5.api.vo.H5ComponentCategoryTreeVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentController.java index 227660886..e2ff8faeb 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentController.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentController.java @@ -2,10 +2,10 @@ package com.luban.api.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.luban.api.dto.H5ComponentDTO; -import com.luban.api.dto.query.H5ComponentPageQueryDTO; +import org.dromara.md.h5.api.dto.H5ComponentDTO; +import org.dromara.md.h5.api.dto.query.H5ComponentPageQueryDTO; import com.luban.api.service.H5ComponentService; -import com.luban.api.vo.H5ComponentVO; +import org.dromara.md.h5.api.vo.H5ComponentVO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -105,4 +105,4 @@ public class H5ComponentController { return h5ComponentService.getHotComponents(type, limit); } -} \ No newline at end of file +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5FormController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5FormController.java index 0843d54ab..70e1664c3 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5FormController.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5FormController.java @@ -1,7 +1,7 @@ package com.luban.api.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.luban.api.dto.H5FormSubmissionDTO; +import org.dromara.md.h5.api.dto.H5FormSubmissionDTO; import com.luban.api.service.H5FormService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5GroupController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5GroupController.java index 072df98b7..0a82c20ed 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5GroupController.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5GroupController.java @@ -3,7 +3,7 @@ package com.luban.api.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.luban.api.entity.H5Group; +import org.dromara.md.h5.mapper.entity.H5Group; import com.luban.api.service.H5GroupService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java index 7f2222422..bd435bb40 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java @@ -4,10 +4,10 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.dromara.md.form.api.constant.BaseConstant; import com.dromara.md.form.utils.TenantHelper; -import com.luban.api.constant.ProjectStatus; -import com.luban.api.dto.H5ProjectContentDTO; -import com.luban.api.dto.query.H5ProjectQueryDTO; -import com.luban.api.entity.H5Project; +import org.dromara.md.h5.api.constant.ProjectStatus; +import org.dromara.md.h5.api.dto.H5ProjectContentDTO; +import org.dromara.md.h5.api.dto.query.H5ProjectQueryDTO; +import org.dromara.md.h5.mapper.entity.H5Project; import com.luban.api.service.H5ProjectService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5TagController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5TagController.java index 11c2c1669..3df2f8e41 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5TagController.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5TagController.java @@ -1,8 +1,8 @@ package com.luban.api.controller; -import com.luban.api.entity.H5Tag; +import org.dromara.md.h5.mapper.entity.H5Tag; import com.luban.api.service.H5TagService; -import com.luban.api.vo.Result; +import org.dromara.md.h5.api.vo.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/ScriptsController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/ScriptsController.java index cf5fb50af..c443bc4a3 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/ScriptsController.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/ScriptsController.java @@ -2,7 +2,7 @@ // // //import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -//import com.luban.api.entity.Scripts; +//import org.dromara.md.h5.mapper.entity.Scripts; //import com.luban.api.convert.ScriptsConvert; //import com.luban.api.service.ScriptsService; //import com.luban.api.vo.ScriptsVO; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkController.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkController.java index f5a456ec8..f543a4a26 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkController.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkController.java @@ -4,10 +4,10 @@ package com.luban.api.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.dromara.md.form.api.constant.BaseConstant; import com.dromara.md.form.utils.TenantHelper; -import com.luban.api.constant.ProjectStatus; -import com.luban.api.dto.H5ProjectContentDTO; -import com.luban.api.dto.query.H5ProjectQueryDTO; -import com.luban.api.entity.H5Project; +import org.dromara.md.h5.api.constant.ProjectStatus; +import org.dromara.md.h5.api.dto.H5ProjectContentDTO; +import org.dromara.md.h5.api.dto.query.H5ProjectQueryDTO; +import org.dromara.md.h5.mapper.entity.H5Project; import com.luban.api.service.H5ProjectService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/FormSubmissionConvert.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/FormSubmissionConvert.java index 25831ccba..5c4edda9b 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/FormSubmissionConvert.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/FormSubmissionConvert.java @@ -3,8 +3,8 @@ package com.luban.api.convert; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.luban.api.dto.H5FormSubmissionDTO; -import com.luban.api.entity.FormSubmission; +import org.dromara.md.h5.api.dto.H5FormSubmissionDTO; +import org.dromara.md.h5.mapper.entity.FormSubmission; import org.springframework.beans.BeanUtils; import java.util.ArrayList; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ComponentConvert.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ComponentConvert.java index 77bc56425..61ebd64ff 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ComponentConvert.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ComponentConvert.java @@ -1,9 +1,9 @@ package com.luban.api.convert; import cn.hutool.json.JSONUtil; -import com.luban.api.dto.H5ComponentDTO; -import com.luban.api.entity.H5Component; -import com.luban.api.vo.H5ComponentVO; +import org.dromara.md.h5.api.dto.H5ComponentDTO; +import org.dromara.md.h5.mapper.entity.H5Component; +import org.dromara.md.h5.api.vo.H5ComponentVO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5FormConvert.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5FormConvert.java index 1d7620c84..47bc4c992 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5FormConvert.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5FormConvert.java @@ -1,10 +1,9 @@ package com.luban.api.convert; -import cn.hutool.core.bean.BeanUtil; import cn.hutool.json.JSONUtil; -import com.luban.api.dto.H5FormSubmissionDTO; -import com.luban.api.entity.FormSubmission; -import com.luban.api.entity.H5Form; +import org.dromara.md.h5.api.dto.H5FormSubmissionDTO; +import org.dromara.md.h5.mapper.entity.FormSubmission; +import org.dromara.md.h5.mapper.entity.H5Form; import java.util.List; import java.util.Map; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ProjectConvert.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ProjectConvert.java index 5b8ec8d1f..dc1334e38 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ProjectConvert.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ProjectConvert.java @@ -1,7 +1,7 @@ package com.luban.api.convert; -import com.luban.api.entity.H5Project; -import com.luban.api.vo.H5ProjectVO; +import org.dromara.md.h5.mapper.entity.H5Project; +import org.dromara.md.h5.api.vo.H5ProjectVO; import org.springframework.beans.BeanUtils; import java.util.ArrayList; @@ -51,4 +51,4 @@ public class H5ProjectConvert { BeanUtils.copyProperties(vo, entity); return entity; } -} \ No newline at end of file +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/ScriptsConvert.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/ScriptsConvert.java deleted file mode 100644 index 6e31e01e1..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/ScriptsConvert.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.luban.api.convert; - -import com.luban.api.entity.Scripts; -import com.luban.api.vo.ScriptsVO; -import org.springframework.beans.BeanUtils; - -/** - * Scripts 转换器 - * - * @author WeiHongBin - */ -public class ScriptsConvert { - - - public static ScriptsVO toVO(Scripts entity) { - ScriptsVO vo = new ScriptsVO(); - BeanUtils.copyProperties(entity, vo); - return vo; - } - -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/exception/ExceptionHandle.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/exception/ExceptionHandle.java index c644dc320..ef862fdef 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/exception/ExceptionHandle.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/exception/ExceptionHandle.java @@ -2,7 +2,7 @@ package com.luban.api.exception; import com.luban.api.util.JSON; -import com.luban.api.vo.Result; +import org.dromara.md.h5.api.vo.Result; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/FontService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/FontService.java index de8bc1865..25122cdde 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/FontService.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/FontService.java @@ -2,8 +2,8 @@ package com.luban.api.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.luban.api.entity.Font; -import com.luban.api.dto.FontDTO; +import org.dromara.md.h5.mapper.entity.Font; +import org.dromara.md.h5.api.dto.FontDTO; // Removed MongoDB import import java.util.List; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentCategoryService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentCategoryService.java index 71426298c..6a88c5b57 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentCategoryService.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentCategoryService.java @@ -1,9 +1,9 @@ package com.luban.api.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.luban.api.dto.H5ComponentCategoryQueryDTO; -import com.luban.api.entity.H5ComponentCategory; -import com.luban.api.vo.H5ComponentCategoryTreeVO; +import org.dromara.md.h5.api.dto.H5ComponentCategoryQueryDTO; +import org.dromara.md.h5.mapper.entity.H5ComponentCategory; +import org.dromara.md.h5.api.vo.H5ComponentCategoryTreeVO; import java.util.List; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentService.java index 6c9daed56..03bad2655 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentService.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentService.java @@ -1,9 +1,9 @@ package com.luban.api.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.luban.api.dto.H5ComponentDTO; -import com.luban.api.dto.query.H5ComponentPageQueryDTO; -import com.luban.api.vo.H5ComponentVO; +import org.dromara.md.h5.api.dto.H5ComponentDTO; +import org.dromara.md.h5.api.dto.query.H5ComponentPageQueryDTO; +import org.dromara.md.h5.api.vo.H5ComponentVO; import java.util.List; import java.util.Map; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormDefinitionService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormDefinitionService.java index 9a4d87ad8..84023085c 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormDefinitionService.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormDefinitionService.java @@ -1,7 +1,7 @@ package com.luban.api.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.luban.api.entity.H5Form; +import org.dromara.md.h5.mapper.entity.H5Form; import java.util.List; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormService.java index 796d76c33..dff04ad77 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormService.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormService.java @@ -2,9 +2,9 @@ package com.luban.api.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.luban.api.dto.H5FormSubmissionDTO; -import com.luban.api.dto.H5ProjectContentDTO; -import com.luban.api.entity.FormSubmission; +import org.dromara.md.h5.api.dto.H5FormSubmissionDTO; +import org.dromara.md.h5.api.dto.H5ProjectContentDTO; +import org.dromara.md.h5.mapper.entity.FormSubmission; import java.util.List; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5GroupService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5GroupService.java index 3fc00be80..460494320 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5GroupService.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5GroupService.java @@ -1,7 +1,7 @@ package com.luban.api.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.luban.api.entity.H5Group; +import org.dromara.md.h5.mapper.entity.H5Group; /** *

@@ -12,4 +12,4 @@ import com.luban.api.entity.H5Group; */ public interface H5GroupService extends IService { -} \ No newline at end of file +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectGroupService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectGroupService.java index 07665979f..6a9eb263f 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectGroupService.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectGroupService.java @@ -1,7 +1,7 @@ package com.luban.api.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.luban.api.entity.H5ProjectGroup; +import org.dromara.md.h5.mapper.entity.H5ProjectGroup; /** *

@@ -12,4 +12,4 @@ import com.luban.api.entity.H5ProjectGroup; */ public interface H5ProjectGroupService extends IService { -} \ No newline at end of file +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectService.java index eda4bd5e3..68889e41f 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectService.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectService.java @@ -2,9 +2,9 @@ package com.luban.api.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; -import com.luban.api.entity.H5Project; -import com.luban.api.dto.H5ProjectContentDTO; -import com.luban.api.dto.query.H5ProjectQueryDTO; +import org.dromara.md.h5.mapper.entity.H5Project; +import org.dromara.md.h5.api.dto.H5ProjectContentDTO; +import org.dromara.md.h5.api.dto.query.H5ProjectQueryDTO; import java.util.List; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5TagService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5TagService.java index 23857cea2..f96b525dc 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5TagService.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5TagService.java @@ -1,6 +1,6 @@ package com.luban.api.service; -import com.luban.api.entity.H5Tag; +import org.dromara.md.h5.mapper.entity.H5Tag; import java.util.List; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/ScriptsService.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/ScriptsService.java index c7bc9bc73..76e0fe24a 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/ScriptsService.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/ScriptsService.java @@ -1,6 +1,6 @@ package com.luban.api.service; -import com.luban.api.entity.Scripts; +import org.dromara.md.h5.mapper.entity.Scripts; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/FontServiceImpl.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/FontServiceImpl.java index 1ea92895d..b70563ffb 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/FontServiceImpl.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/FontServiceImpl.java @@ -6,10 +6,10 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.luban.api.dao.FontDao; -import com.luban.api.entity.Font; +import org.dromara.md.h5.mapper.mapper.FontDao; +import org.dromara.md.h5.mapper.entity.Font; // Removed MongoDB imports -import com.luban.api.dto.FontDTO; +import org.dromara.md.h5.api.dto.FontDTO; import com.luban.api.service.FontService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentCategoryServiceImpl.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentCategoryServiceImpl.java index b113faa23..a67f9978c 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentCategoryServiceImpl.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentCategoryServiceImpl.java @@ -3,11 +3,11 @@ package com.luban.api.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.luban.api.dao.H5ComponentCategoryDao; -import com.luban.api.dto.H5ComponentCategoryQueryDTO; -import com.luban.api.entity.H5ComponentCategory; +import org.dromara.md.h5.mapper.mapper.H5ComponentCategoryDao; +import org.dromara.md.h5.api.dto.H5ComponentCategoryQueryDTO; +import org.dromara.md.h5.mapper.entity.H5ComponentCategory; import com.luban.api.service.H5ComponentCategoryService; -import com.luban.api.vo.H5ComponentCategoryTreeVO; +import org.dromara.md.h5.api.vo.H5ComponentCategoryTreeVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentServiceImpl.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentServiceImpl.java index d462af2b5..5e266fdeb 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentServiceImpl.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentServiceImpl.java @@ -4,19 +4,19 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.luban.api.dao.H5ComponentCategoryDao; -import com.luban.api.dao.H5ComponentCategoryRelDao; -import com.luban.api.dao.H5ComponentDao; -import com.luban.api.dao.H5ComponentTagRelDao; -import com.luban.api.dto.H5ComponentDTO; -import com.luban.api.dto.query.H5ComponentPageQueryDTO; -import com.luban.api.entity.H5Component; -import com.luban.api.entity.H5ComponentCategory; -import com.luban.api.entity.H5ComponentCategoryRel; -import com.luban.api.entity.H5ComponentTagRel; +import org.dromara.md.h5.mapper.mapper.H5ComponentCategoryDao; +import org.dromara.md.h5.mapper.mapper.H5ComponentCategoryRelDao; +import org.dromara.md.h5.mapper.mapper.H5ComponentDao; +import org.dromara.md.h5.mapper.mapper.H5ComponentTagRelDao; +import org.dromara.md.h5.api.dto.H5ComponentDTO; +import org.dromara.md.h5.api.dto.query.H5ComponentPageQueryDTO; +import org.dromara.md.h5.mapper.entity.H5Component; +import org.dromara.md.h5.mapper.entity.H5ComponentCategory; +import org.dromara.md.h5.mapper.entity.H5ComponentCategoryRel; +import org.dromara.md.h5.mapper.entity.H5ComponentTagRel; import com.luban.api.service.H5ComponentService; import com.luban.api.convert.H5ComponentConvert; -import com.luban.api.vo.H5ComponentVO; +import org.dromara.md.h5.api.vo.H5ComponentVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -79,7 +79,7 @@ public class H5ComponentServiceImpl extends ServiceImpl() .select(H5ComponentCategory::getId, H5ComponentCategory::getParentId) ); - + // 构建父分类到子分类的映射 Map> parentChildMap = allCategories.stream() .collect(Collectors.groupingBy( H5ComponentCategory::getParentId, Collectors.mapping(H5ComponentCategory::getId, Collectors.toList()) )); - + // 收集所有子分类ID Set allChildIds = new HashSet<>(); collectChildIds(parentId, parentChildMap, allChildIds); - + return new ArrayList<>(allChildIds); } - + /** * 递归收集子分类ID * @param parentId 父分类ID @@ -308,4 +308,4 @@ public class H5ComponentServiceImpl extends ServiceImpl implements H5GroupService { -} \ No newline at end of file +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectGroupServiceImpl.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectGroupServiceImpl.java index 7b57a6b88..9cb1f20ba 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectGroupServiceImpl.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectGroupServiceImpl.java @@ -1,8 +1,8 @@ package com.luban.api.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.luban.api.dao.H5ProjectGroupDao; -import com.luban.api.entity.H5ProjectGroup; +import org.dromara.md.h5.mapper.mapper.H5ProjectGroupDao; +import org.dromara.md.h5.mapper.entity.H5ProjectGroup; import com.luban.api.service.H5ProjectGroupService; import org.springframework.stereotype.Service; @@ -16,4 +16,4 @@ import org.springframework.stereotype.Service; @Service public class H5ProjectGroupServiceImpl extends ServiceImpl implements H5ProjectGroupService { -} \ No newline at end of file +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectServiceImpl.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectServiceImpl.java index 43532bbe5..bb7a368c7 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectServiceImpl.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectServiceImpl.java @@ -6,12 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.luban.api.dao.H5ProjectDao; -import com.luban.api.dao.H5ProjectGroupDao; -import com.luban.api.entity.H5Project; -import com.luban.api.entity.H5ProjectGroup; -import com.luban.api.dto.H5ProjectContentDTO; -import com.luban.api.dto.query.H5ProjectQueryDTO; +import org.dromara.md.h5.mapper.mapper.H5ProjectDao; +import org.dromara.md.h5.mapper.mapper.H5ProjectGroupDao; +import org.dromara.md.h5.mapper.entity.H5Project; +import org.dromara.md.h5.mapper.entity.H5ProjectGroup; +import org.dromara.md.h5.api.dto.H5ProjectContentDTO; +import org.dromara.md.h5.api.dto.query.H5ProjectQueryDTO; import com.luban.api.service.H5ProjectService; import com.luban.api.util.JSON; import org.springframework.beans.factory.annotation.Autowired; @@ -161,4 +161,4 @@ public class H5ProjectServiceImpl extends ServiceImpl i // 执行分页查询 return baseMapper.selectH5ProjectPage(page, queryDTO); } -} \ No newline at end of file +} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5TagServiceImpl.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5TagServiceImpl.java index e038a9ea5..f9fa26df3 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5TagServiceImpl.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5TagServiceImpl.java @@ -3,8 +3,8 @@ package com.luban.api.service.impl; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.luban.api.dao.H5TagDao; -import com.luban.api.entity.H5Tag; +import org.dromara.md.h5.mapper.mapper.H5TagDao; +import org.dromara.md.h5.mapper.entity.H5Tag; import com.luban.api.service.H5TagService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -30,7 +30,7 @@ public class H5TagServiceImpl extends ServiceImpl implements H5 public List getAllTags() { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.orderByAsc(H5Tag::getSort, H5Tag::getId); - + return baseMapper.selectList(wrapper); } @@ -40,7 +40,7 @@ public class H5TagServiceImpl extends ServiceImpl implements H5 wrapper.eq(H5Tag::getIsHot, 1) .orderByDesc(H5Tag::getUseCount) .last("LIMIT " + limit); - + return baseMapper.selectList(wrapper); } @@ -49,20 +49,20 @@ public class H5TagServiceImpl extends ServiceImpl implements H5 LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.and(StrUtil.isNotBlank(type), w -> w.eq(H5Tag::getType, type).isNull(H5Tag::getType)); wrapper.orderByAsc(H5Tag::getSort, H5Tag::getId); - + return baseMapper.selectList(wrapper); } @Override public Long create(H5Tag tag) { long now = Instant.now().getEpochSecond(); - + tag.setCreateTime(now); tag.setUpdateTime(now); tag.setUseCount(0L); - + baseMapper.insert(tag); - + return tag.getId(); } diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/ScriptsServiceImpl.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/ScriptsServiceImpl.java index 70db2c4b7..4ebe332b6 100644 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/ScriptsServiceImpl.java +++ b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/ScriptsServiceImpl.java @@ -1,7 +1,7 @@ package com.luban.api.service.impl; -import com.luban.api.dao.ScriptsDao; -import com.luban.api.entity.Scripts; +import org.dromara.md.h5.mapper.mapper.ScriptsDao; +import org.dromara.md.h5.mapper.entity.Scripts; import com.luban.api.service.ScriptsService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/FileVO.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/FileVO.java deleted file mode 100644 index 0921ee88e..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/FileVO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.luban.api.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - * @author WeiHongBin - */ -@Data -@EqualsAndHashCode -@Accessors(chain = true) -@Schema(title = "文件视图对象") -public class FileVO { - private String url; -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ComponentCategoryPageVO.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ComponentCategoryPageVO.java deleted file mode 100644 index d38d3754e..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ComponentCategoryPageVO.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.luban.api.vo; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.Data; - -import java.util.List; - -/** - * H5 组件分类分页查询结果 VO - * - * @author system - * @since 2026-03-06 - */ -@Data -public class H5ComponentCategoryPageVO { - - /** - * 分类列表 - */ - private List list; - - /** - * 总记录数 - */ - private Long total; - - /** - * 当前页码 - */ - private Integer pageNum; - - /** - * 每页大小 - */ - private Integer pageSize; - - /** - * 总页数 - */ - private Integer pages; - -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ProjectDetailVO.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ProjectDetailVO.java deleted file mode 100644 index 3ec89a036..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ProjectDetailVO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.luban.api.vo; - -import com.luban.api.entity.H5Project; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.util.List; - -/** - * H5项目详情VO - */ -@Data -@EqualsAndHashCode -@Accessors(chain = true) -@Schema(title = "H5项目详情") -public class H5ProjectDetailVO { - - /** - * 项目基本信息 - */ - @Schema(title = "项目基本信息") - private H5Project project; - - /** - * 项目关联的分组ID列表 - */ - @Schema(title = "项目关联的分组ID列表") - private List groupIds; -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/ScriptsVO.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/ScriptsVO.java deleted file mode 100644 index 7c3edc831..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/ScriptsVO.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.luban.api.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; -import java.time.LocalDateTime; - -@Data -@EqualsAndHashCode -@Accessors(chain = true) -@Schema(title = "Script视图对象") -public class ScriptsVO implements Serializable { - - private static final long serialVersionUID = 1L; - - private Integer id; - - private String title; - - private String content; - - private LocalDateTime createTime; - - private LocalDateTime updateTime; -} diff --git a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/WorkVO.java b/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/WorkVO.java deleted file mode 100644 index b97ed012c..000000000 --- a/ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/WorkVO.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.luban.api.vo; - -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.time.LocalDateTime; -import java.util.List; - -/** - * @author WeiHongBin - */ -@Data -@EqualsAndHashCode -@Accessors(chain = true) -@Schema(title = "Work视图对象") -public class WorkVO { - - private Long id; - - private String title; - - private String description; - - private String coverImageUrl; - - private List pages; - - private LocalDateTime createTime; - - private LocalDateTime updateTime; - - private boolean isPublish; - - private boolean isTemplate; -} diff --git a/ruoyi-site/ruoyi-h5/src/main/resources/application.yml b/ruoyi-site/ruoyi-h5/src/main/resources/application.yml index a877505ae..e6070d7a0 100644 --- a/ruoyi-site/ruoyi-h5/src/main/resources/application.yml +++ b/ruoyi-site/ruoyi-h5/src/main/resources/application.yml @@ -82,7 +82,7 @@ tenant: # https://baomidou.com/config/ mybatis-plus: # 多包名使用 例如 org.dromara.**.mapper,org.xxx.**.mapper - mapperPackage: com.luban.api.dao,com.dromara.**.mapper + mapperPackage: org.dromara.**.mapper,com.dromara.**.mapper # # 实体扫描，多个package用逗号或者分号分隔 # typeAliasesPackage: com.luban.api.entity global-config: diff --git a/ruoyi-site/ruoyi-h5/src/test/java/com/luban/api/ImportH5Project.java b/ruoyi-site/ruoyi-h5/src/test/java/com/luban/api/ImportH5Project.java index ede085710..6d7efed88 100644 --- a/ruoyi-site/ruoyi-h5/src/test/java/com/luban/api/ImportH5Project.java +++ b/ruoyi-site/ruoyi-h5/src/test/java/com/luban/api/ImportH5Project.java @@ -6,8 +6,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.exc.MismatchedInputException; -import com.luban.api.dto.H5ProjectContentDTO; -import com.luban.api.entity.H5Project; +import org.dromara.md.h5.api.dto.H5ProjectContentDTO; +import org.dromara.md.h5.mapper.entity.H5Project; import com.luban.api.service.H5ProjectService; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test;