opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 09:35:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

在线h5 位置移动

Browse Source
This commit is contained in:
lizhengwei 2026-04-01 17:08:31 +08:00
parent d48445ff3b
commit c422799e92
94 changed files with 357 additions and 377 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-modules/pom.xml
View File

@ -19,6 +19,7 @@
<module>ruoyi-system-saas</module>
<module>ruoyi-workflow</module>
<module>ruoyi-md-form</module>
<module>ruoyi-md-h5</module>
<module>ruoyi-ai</module>
</modules>

24
ruoyi-modules/ruoyi-md-h5/pom.xml Normal file
View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-modules</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-md-h5</artifactId>
<packaging>pom</packaging>
<description>
h5模块
</description>
<modules>
<module>ruoyi-md-h5-api</module>
<module>ruoyi-md-h5-mapper</module>
<module>ruoyi-md-h5-service</module>
</modules>
</project>

39
ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/pom.xml Normal file
View File

@ -0,0 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-h5</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-md-h5-api</artifactId>
<version>${revision}</version>
<packaging>jar</packaging>
<description>
ruoyi-api-system系统接口模块
</description>
<dependencies>
<!-- RuoYi Common Core-->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-core</artifactId>
</dependency>
<!-- RuoYi Common Core-->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-doc</artifactId>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
<version>1.5.13</version>
</dependency>
</dependencies>
</project>

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/util/TimestampToLocalDateTimeDeserializer.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/TimestampToLocalDateTimeDeserializer.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/constant/PackageConstant.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/constant/PackageConstant.java
View File

@ -1,4 +1,4 @@
package com.luban.api.constant;
package org.dromara.md.h5.api.constant;
/**
* 包名常量

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/constant/ProjectStatus.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/constant/ProjectStatus.java
View File

@ -1,4 +1,4 @@
package com.luban.api.constant;
package org.dromara.md.h5.api.constant;
import lombok.AllArgsConstructor;
import lombok.Getter;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/FontDTO.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/FontDTO.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ComponentCategoryQueryDTO.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ComponentCategoryQueryDTO.java
View File

@ -1,4 +1,4 @@
package com.luban.api.dto;
package org.dromara.md.h5.api.dto;
import lombok.Data;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ComponentDTO.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ComponentDTO.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ComponentTopQueryDTO.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ComponentTopQueryDTO.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5FormSubmissionDTO.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5FormSubmissionDTO.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/H5ProjectContentDTO.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/H5ProjectContentDTO.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/PageDtoBase.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/PageDtoBase.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/query/H5ComponentPageQueryDTO.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/query/H5ComponentPageQueryDTO.java
View File

@ -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;
}
}

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dto/query/H5ProjectQueryDTO.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/dto/query/H5ProjectQueryDTO.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ComponentCategoryTreeVO.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/H5ComponentCategoryTreeVO.java
View File

@ -1,4 +1,4 @@
package com.luban.api.vo;
package org.dromara.md.h5.api.vo;
import lombok.Data;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ComponentVO.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/H5ComponentVO.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ProjectVO.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/H5ProjectVO.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/Result.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-api/src/main/java/org/dromara/md/h5/api/vo/Result.java
View File

@ -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;

25
ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/pom.xml Normal file
View File

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-h5</artifactId>
<version>${revision}</version>
</parent>
<artifactId>ruoyi-md-h5-mapper</artifactId>
<dependencies>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-h5-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Font.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/Font.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/FormSubmission.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/FormSubmission.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Component.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Component.java
View File

@ -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 组件实体
*

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ComponentCategory.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ComponentCategory.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ComponentCategoryRel.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ComponentCategoryRel.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ComponentTagRel.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ComponentTagRel.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Form.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Form.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Group.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Group.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Project.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Project.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5ProjectGroup.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5ProjectGroup.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/H5Tag.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/H5Tag.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/entity/Scripts.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/entity/Scripts.java
View File

@ -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;

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/FontDao.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/FontDao.java
View File

@ -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;
/**
* <p>
@ -12,4 +12,4 @@ import com.luban.api.entity.Font;
*/
public interface FontDao extends BaseMapper<Font> {
}
}

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/FormSubmissionDao.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/FormSubmissionDao.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentCategoryDao.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentCategoryDao.java
View File

@ -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;
/**

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentCategoryRelDao.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentCategoryRelDao.java
View File

@ -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;
/**

10
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentDao.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentDao.java
View File

@ -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<H5Component> {
* @return 组件列表
*/
List<H5Component> selectTopComponentsByCategory(@Param("categoryId") Long categoryId, @Param("pageSize") Integer pageSize);
/**
* 分页查询组件列表
* @param page 分页对象
* @param params 查询参数
* @return 组件列表
*/
List<H5Component> selectPageList(@Param("page") com.baomidou.mybatisplus.extension.plugins.pagination.Page<H5Component> page,
List<H5Component> selectPageList(@Param("page") com.baomidou.mybatisplus.extension.plugins.pagination.Page<H5Component> page,
@Param("params") Map<String, Object> params);
}
}

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ComponentTagRelDao.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ComponentTagRelDao.java
View File

@ -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;
/**

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5FormDao.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5FormDao.java
View File

@ -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

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5GroupDao.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5GroupDao.java
View File

@ -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<H5Group> {
}
}

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ProjectDao.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ProjectDao.java
View File

@ -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;

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5ProjectGroupDao.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5ProjectGroupDao.java
View File

@ -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<H5ProjectGroup> {
}
}

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/H5TagDao.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/H5TagDao.java
View File

@ -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;
/**

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/dao/ScriptsDao.java → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/java/org/dromara/md/h5/mapper/mapper/ScriptsDao.java
View File

@ -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;

6
ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/FormSubmissionDao.xml → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/FormSubmissionDao.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.luban.api.dao.FormSubmissionDao">
<mapper namespace="org.dromara.md.h5.mapper.mapper.FormSubmissionDao">
<select id="selectByProjectIdWithFieldFilters" resultType="com.luban.api.entity.FormSubmission">
<select id="selectByProjectIdWithFieldFilters" resultType="org.dromara.md.h5.mapper.entity.FormSubmission">
SELECT * FROM h5_form_submission
<where>
project_id = #{projectId}
@ -14,4 +14,4 @@
</where>
ORDER BY create_time DESC
</select>
</mapper>
</mapper>

28
ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5ComponentDao.xml → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/H5ComponentDao.xml
View File

@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.luban.api.dao.H5ComponentDao">
<mapper namespace="org.dromara.md.h5.mapper.mapper.H5ComponentDao">
<!-- 查询指定分类下的热门组件 -->
<select id="selectTopComponentsByCategory" resultType="com.luban.api.entity.H5Component">
<select id="selectTopComponentsByCategory" resultType="org.dromara.md.h5.mapper.entity.H5Component">
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>
<!-- 分页查询组件列表 -->
<select id="selectPageList" resultType="com.luban.api.entity.H5Component">
SELECT hc.*
<select id="selectPageList" resultType="org.dromara.md.h5.mapper.entity.H5Component">
SELECT hc.*
FROM h5_component hc
WHERE hc.status = 1
<if test="params.type != null and params.type != ''">
@ -30,9 +30,9 @@
</if>
<if test="params.categoryIds != null and params.categoryIds.size() > 0">
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
<foreach collection="params.categoryIds" item="categoryId" open="(" separator="," close=")">
#{categoryId}
@ -41,13 +41,13 @@
</if>
<if test="params.tagId != null">
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}
)
</if>
ORDER BY hc.create_time DESC
</select>
</mapper>
</mapper>

2
ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5FormDao.xml → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/H5FormDao.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.luban.api.dao.H5FormDao">
<mapper namespace="org.dromara.md.h5.mapper.mapper.H5FormDao">
</mapper>

4
ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/H5ProjectMapper.xml → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/H5ProjectMapper.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.luban.api.dao.H5ProjectDao">
<resultMap id="BaseResultMap" type="com.luban.api.entity.H5Project">
<mapper namespace="org.dromara.md.h5.mapper.mapper.H5ProjectDao">
<resultMap id="BaseResultMap" type="org.dromara.md.h5.mapper.entity.H5Project">
<id column="id" property="id" />
<result column="type" property="type" />
<result column="title" property="title" />

4
ruoyi-site/ruoyi-h5/src/main/resources/mapper/ruoyi-h5/ScriptsDao.xml → ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-mapper/src/main/resources/mapper/md-h5/ScriptsDao.xml
View File

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.luban.api.dao.ScriptsDao">
<mapper namespace="org.dromara.md.h5.mapper.mapper.ScriptsDao">
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.luban.api.entity.Scripts">
<resultMap id="BaseResultMap" type="org.dromara.md.h5.mapper.entity.Scripts">
<id column="id" property="id" />
<result column="title" property="title" />
<result column="content" property="content" />

51
ruoyi-modules/ruoyi-md-h5/ruoyi-md-h5-service/pom.xml Normal file
View File

@ -0,0 +1,51 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-h5</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-md-h5-service</artifactId>
<description>
system系统模块
</description>
<dependencies>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-h5-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-h5-mapper</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-core</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-mybatis</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-json</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-oss</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-tenant</artifactId>
</dependency>
</dependencies>
</project>

15
ruoyi-modules/ruoyi-modules-bom/pom.xml
View File

@ -70,6 +70,21 @@
<artifactId>ruoyi-md-form-feign</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-h5-api</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-h5-mapper</artifactId>
<version>${revision}</version>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-h5-service</artifactId>
<version>${revision}</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>

5
ruoyi-site/ruoyi-h5/pom.xml
View File

@ -70,6 +70,11 @@
<artifactId>ruoyi-md-form-service</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-md-h5-service</artifactId>
</dependency>
<!-- SpringCloud Alibaba Nacos -->
<dependency>
<groupId>com.alibaba.cloud</groupId>

5
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/FontController.java
View File

@ -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

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentCategoryController.java
View File

@ -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;

8
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ComponentController.java
View File

@ -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);
}
}
}

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5FormController.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5GroupController.java
View File

@ -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;

8
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5ProjectController.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/H5TagController.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/ScriptsController.java
View File

@ -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;

8
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/controller/WorkController.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/FormSubmissionConvert.java
View File

@ -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;

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ComponentConvert.java
View File

@ -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;

7
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5FormConvert.java
View File

@ -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;

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/H5ProjectConvert.java
View File

@ -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;
}
}
}

21
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/convert/ScriptsConvert.java
View File

@ -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;
}
}

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/exception/ExceptionHandle.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/FontService.java
View File

@ -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;

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentCategoryService.java
View File

@ -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;

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ComponentService.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormDefinitionService.java
View File

@ -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;

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5FormService.java
View File

@ -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;

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5GroupService.java
View File

@ -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;
/**
* <p>
@ -12,4 +12,4 @@ import com.luban.api.entity.H5Group;
*/
public interface H5GroupService extends IService<H5Group> {
}
}

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectGroupService.java
View File

@ -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;
/**
* <p>
@ -12,4 +12,4 @@ import com.luban.api.entity.H5ProjectGroup;
*/
public interface H5ProjectGroupService extends IService<H5ProjectGroup> {
}
}

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5ProjectService.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/H5TagService.java
View File

@ -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;

2
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/ScriptsService.java
View File

@ -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;
/**

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/FontServiceImpl.java
View File

@ -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;

8
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentCategoryServiceImpl.java
View File

@ -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;

34
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ComponentServiceImpl.java
View File

@ -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<H5ComponentDao, H5Compon
return voPage;
}
/**
* 获取指定分类的所有子分类ID（优化版本-无缓存）
* @param parentId 父分类ID
@ -92,21 +92,21 @@ public class H5ComponentServiceImpl extends ServiceImpl<H5ComponentDao, H5Compon
new LambdaQueryWrapper<H5ComponentCategory>()
.select(H5ComponentCategory::getId, H5ComponentCategory::getParentId)
);
// 构建父分类到子分类的映射
Map<Long, List<Long>> parentChildMap = allCategories.stream()
.collect(Collectors.groupingBy(
H5ComponentCategory::getParentId,
Collectors.mapping(H5ComponentCategory::getId, Collectors.toList())
));
// 收集所有子分类ID
Set<Long> allChildIds = new HashSet<>();
collectChildIds(parentId, parentChildMap, allChildIds);
return new ArrayList<>(allChildIds);
}
/**
* 递归收集子分类ID
* @param parentId 父分类ID
@ -308,4 +308,4 @@ public class H5ComponentServiceImpl extends ServiceImpl<H5ComponentDao, H5Compon
wrapper.eq(H5ComponentTagRel::getComponentId, componentId);
h5ComponentTagRelDao.delete(wrapper);
}
}
}

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5FormDefinitionServiceImpl.java
View File

@ -2,8 +2,8 @@ package com.luban.api.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.luban.api.dao.H5FormDao;
import com.luban.api.entity.H5Form;
import org.dromara.md.h5.mapper.mapper.H5FormDao;
import org.dromara.md.h5.mapper.entity.H5Form;
import com.luban.api.service.H5FormDefinitionService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

10
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5FormServiceImpl.java
View File

@ -6,11 +6,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dromara.md.form.service.FormService;
import com.luban.api.convert.FormSubmissionConvert;
import com.luban.api.convert.H5FormConvert;
import com.luban.api.dao.FormSubmissionDao;
import com.luban.api.dto.H5FormSubmissionDTO;
import com.luban.api.dto.H5ProjectContentDTO;
import com.luban.api.entity.FormSubmission;
import com.luban.api.entity.H5Form;
import org.dromara.md.h5.mapper.mapper.FormSubmissionDao;
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 org.dromara.md.h5.mapper.entity.H5Form;
import com.luban.api.service.H5FormDefinitionService;
import com.luban.api.service.H5FormService;
import lombok.RequiredArgsConstructor;

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5GroupServiceImpl.java
View File

@ -1,8 +1,8 @@
package com.luban.api.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.luban.api.dao.H5GroupDao;
import com.luban.api.entity.H5Group;
import org.dromara.md.h5.mapper.mapper.H5GroupDao;
import org.dromara.md.h5.mapper.entity.H5Group;
import com.luban.api.service.H5GroupService;
import org.springframework.stereotype.Service;
@ -16,4 +16,4 @@ import org.springframework.stereotype.Service;
@Service
public class H5GroupServiceImpl extends ServiceImpl<H5GroupDao, H5Group> implements H5GroupService {
}
}

6
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectGroupServiceImpl.java
View File

@ -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<H5ProjectGroupDao, H5ProjectGroup> implements H5ProjectGroupService {
}
}

14
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5ProjectServiceImpl.java
View File

@ -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<H5ProjectDao, H5Project> i
// 执行分页查询
return baseMapper.selectH5ProjectPage(page, queryDTO);
}
}
}

16
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/H5TagServiceImpl.java
View File

@ -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<H5TagDao, H5Tag> implements H5
public List<H5Tag> getAllTags() {
LambdaQueryWrapper<H5Tag> wrapper = new LambdaQueryWrapper<>();
wrapper.orderByAsc(H5Tag::getSort, H5Tag::getId);
return baseMapper.selectList(wrapper);
}
@ -40,7 +40,7 @@ public class H5TagServiceImpl extends ServiceImpl<H5TagDao, H5Tag> 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<H5TagDao, H5Tag> implements H5
LambdaQueryWrapper<H5Tag> 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();
}

4
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/service/impl/ScriptsServiceImpl.java
View File

@ -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;

17
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/FileVO.java
View File

@ -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;
}

42
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ComponentCategoryPageVO.java
View File

@ -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<H5ComponentCategoryTreeVO> list;
/**
* 总记录数
*/
private Long total;
/**
* 当前页码
*/
private Integer pageNum;
/**
* 每页大小
*/
private Integer pageSize;
/**
* 总页数
*/
private Integer pages;
}

31
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/H5ProjectDetailVO.java
View File

@ -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<Long> groupIds;
}

28
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/ScriptsVO.java
View File

@ -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;
}

37
ruoyi-site/ruoyi-h5/src/main/java/com/luban/api/vo/WorkVO.java
View File

@ -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<Object> pages;
private LocalDateTime createTime;
private LocalDateTime updateTime;
private boolean isPublish;
private boolean isTemplate;
}

2
ruoyi-site/ruoyi-h5/src/main/resources/application.yml
View File

@ -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:

4
ruoyi-site/ruoyi-h5/src/test/java/com/luban/api/ImportH5Project.java
View File

@ -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;