h5 动态表单折腾包名,防止以后同路径的出现

This commit is contained in:
lizhengwei 2026-02-14 00:12:36 +08:00
parent 9faffb111d
commit ae28e3a46e
111 changed files with 289 additions and 294 deletions

View File

@ -17,7 +17,7 @@
<module>ruoyi-system</module> <module>ruoyi-system</module>
<module>ruoyi-system-saas</module> <module>ruoyi-system-saas</module>
<module>ruoyi-workflow</module> <module>ruoyi-workflow</module>
<module>ruoyi-form</module> <module>ruoyi-md-form</module>
</modules> </modules>
<artifactId>ruoyi-modules</artifactId> <artifactId>ruoyi-modules</artifactId>

View File

@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-form</artifactId> <artifactId>ruoyi-md-form</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<description> <description>
@ -17,10 +17,10 @@
</description> </description>
<modules> <modules>
<module>booksflow-form-api</module> <module>ruoyi-md-form-api</module>
<module>booksflow-form-mapper</module> <module>ruoyi-md-form-mapper</module>
<module>booksflow-form-service</module> <module>ruoyi-md-form-service</module>
<module>booksflow-form-starter</module> <module>ruoyi-md-form-starter</module>
<module>booksflow-form-feign</module> <module>ruoyi-md-form-feign</module>
</modules> </modules>
</project> </project>

View File

@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-form</artifactId> <artifactId>ruoyi-md-form</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<artifactId>booksflow-form-api</artifactId> <artifactId>ruoyi-md-form-api</artifactId>
<dependencies> <dependencies>
<dependency> <dependency>

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.constant; package com.dromara.md.form.api.constant;
public interface BaseConstant { public interface BaseConstant {
/** /**

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.constant; package com.dromara.md.form.api.constant;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.constant; package com.dromara.md.form.api.constant;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.dto; package com.dromara.md.form.api.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Getter; import lombok.Getter;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.dto; package com.dromara.md.form.api.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.dto; package com.dromara.md.form.api.dto;
import com.fasterxml.jackson.annotation.JsonSubTypes; import com.fasterxml.jackson.annotation.JsonSubTypes;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.dto; package com.dromara.md.form.api.dto;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.dto; package com.dromara.md.form.api.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.dto; package com.dromara.md.form.api.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.dto; package com.dromara.md.form.api.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.dto; package com.dromara.md.form.api.dto;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.dto; package com.dromara.md.form.api.dto;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.dto; package com.dromara.md.form.api.dto;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.vo; package com.dromara.md.form.api.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.vo; package com.dromara.md.form.api.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.vo; package com.dromara.md.form.api.vo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter; import lombok.Getter;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.vo; package com.dromara.md.form.api.vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.api.vo; package com.dromara.md.form.api.vo;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Getter; import lombok.Getter;

View File

@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-form</artifactId> <artifactId>ruoyi-md-form</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<artifactId>booksflow-form-feign</artifactId> <artifactId>ruoyi-md-form-feign</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>

View File

@ -1,9 +1,9 @@
package com.pcloud.booksflow.form.feign; package com.dromara.md.form.feign;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.dto.FormFieldDictQ; import com.dromara.md.form.api.dto.FormFieldDictQ;
import com.pcloud.booksflow.form.api.vo.FormFieldDictDifyVo; import com.dromara.md.form.api.vo.FormFieldDictDifyVo;
import com.pcloud.booksflow.form.api.vo.FormFieldDictVO; import com.dromara.md.form.api.vo.FormFieldDictVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

View File

@ -1,7 +1,7 @@
package com.pcloud.booksflow.form.feign; package com.dromara.md.form.feign;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.vo.FormPrintConfigVO; import com.dromara.md.form.api.vo.FormPrintConfigVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;

View File

@ -1,7 +1,7 @@
package com.pcloud.booksflow.form.feign; package com.dromara.md.form.feign;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.vo.FormTemplateVO; import com.dromara.md.form.api.vo.FormTemplateVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;

View File

@ -1,7 +1,7 @@
package com.pcloud.booksflow.form.feign; package com.dromara.md.form.feign;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.dto.ModifyLogRecordDTO; import com.dromara.md.form.api.dto.ModifyLogRecordDTO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;

View File

@ -1,8 +1,8 @@
package com.pcloud.booksflow.form.feign; package com.dromara.md.form.feign;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.dto.FormFieldDictQ; import com.dromara.md.form.api.dto.FormFieldDictQ;
import com.pcloud.booksflow.form.api.vo.FormFieldDictVO; import com.dromara.md.form.api.vo.FormFieldDictVO;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.FeignClient;

View File

@ -3,11 +3,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-form</artifactId> <artifactId>ruoyi-md-form</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<artifactId>booksflow-form-mapper</artifactId> <artifactId>ruoyi-md-form-mapper</artifactId>
<dependencies> <dependencies>
<dependency> <dependency>

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.mybatis.entity; package com.dromara.md.form.mybatis.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.mybatis.entity; package com.dromara.md.form.mybatis.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.mybatis.entity; package com.dromara.md.form.mybatis.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.mybatis.entity; package com.dromara.md.form.mybatis.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.mybatis.entity; package com.dromara.md.form.mybatis.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.mybatis.entity; package com.dromara.md.form.mybatis.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.mybatis.entity; package com.dromara.md.form.mybatis.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.mybatis.entity; package com.dromara.md.form.mybatis.entity;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

View File

@ -1,7 +1,7 @@
package com.pcloud.booksflow.form.mybatis.mapper; package com.dromara.md.form.mybatis.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pcloud.booksflow.form.mybatis.entity.FormDict; import com.dromara.md.form.mybatis.entity.FormDict;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**

View File

@ -1,8 +1,8 @@
package com.pcloud.booksflow.form.mybatis.mapper; package com.dromara.md.form.mybatis.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pcloud.booksflow.form.api.dto.DictCodesDTO; import com.dromara.md.form.api.dto.DictCodesDTO;
import com.pcloud.booksflow.form.mybatis.entity.FormFieldDict; import com.dromara.md.form.mybatis.entity.FormFieldDict;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;

View File

@ -1,7 +1,7 @@
package com.pcloud.booksflow.form.mybatis.mapper; package com.dromara.md.form.mybatis.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pcloud.booksflow.form.mybatis.entity.Form; import com.dromara.md.form.mybatis.entity.Form;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**

View File

@ -1,7 +1,7 @@
package com.pcloud.booksflow.form.mybatis.mapper; package com.dromara.md.form.mybatis.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfig; import com.dromara.md.form.mybatis.entity.FormPrintConfig;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**

View File

@ -1,7 +1,7 @@
package com.pcloud.booksflow.form.mybatis.mapper; package com.dromara.md.form.mybatis.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pcloud.booksflow.form.mybatis.entity.FormTemplateField; import com.dromara.md.form.mybatis.entity.FormTemplateField;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**

View File

@ -1,7 +1,7 @@
package com.pcloud.booksflow.form.mybatis.mapper; package com.dromara.md.form.mybatis.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pcloud.booksflow.form.mybatis.entity.FormTemplate; import com.dromara.md.form.mybatis.entity.FormTemplate;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**

View File

@ -1,7 +1,7 @@
package com.pcloud.booksflow.form.mybatis.mapper; package com.dromara.md.form.mybatis.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecord; import com.dromara.md.form.mybatis.entity.ModifyLogRecord;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**

View File

@ -1,7 +1,7 @@
package com.pcloud.booksflow.form.mybatis.mapper; package com.dromara.md.form.mybatis.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.pcloud.booksflow.form.mybatis.entity.TenantInitStatus; import com.dromara.md.form.mybatis.entity.TenantInitStatus;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormDictMapperExt"> <mapper namespace="com.dromara.md.form.mybatis.mapper.FormDictMapper">
<resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.FormDict"> <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormDict">
<id column="id" jdbcType="BIGINT" property="id"/> <id column="id" jdbcType="BIGINT" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/> <result column="name" jdbcType="VARCHAR" property="name"/>
<result column="code" jdbcType="VARCHAR" property="code"/> <result column="code" jdbcType="VARCHAR" property="code"/>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormFieldDictMapper"> <mapper namespace="com.dromara.md.form.mybatis.mapper.FormFieldDictMapper">
<resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.FormFieldDict"> <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormFieldDict">
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@ -20,7 +20,7 @@
<result column="deleted" jdbcType="TINYINT" property="deleted"/> <result column="deleted" jdbcType="TINYINT" property="deleted"/>
</resultMap> </resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs"
type="com.pcloud.booksflow.form.mybatis.entity.FormFieldDict"> type="com.dromara.md.form.mybatis.entity.FormFieldDict">
<result column="other_fields" jdbcType="LONGVARCHAR" property="otherFields"/> <result column="other_fields" jdbcType="LONGVARCHAR" property="otherFields"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
@ -28,8 +28,9 @@
, config_type, `name`, code, parent_id, check_ids, sort_order, `status`, created_by, , config_type, `name`, code, parent_id, check_ids, sort_order, `status`, created_by,
updated_by, create_time, update_time, deleted updated_by, create_time, update_time, deleted
</sql> </sql>
<sql id="Blob_Column_List">
other_fields
</sql>
<select id="getByCodes" resultMap="ResultMapWithBLOBs"> <select id="getByCodes" resultMap="ResultMapWithBLOBs">
select select
<include refid="Base_Column_List"/> <include refid="Base_Column_List"/>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormMapperExt"> <mapper namespace="com.dromara.md.form.mybatis.mapper.FormMapper">
<resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.Form"> <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.Form">
<id column="id" jdbcType="BIGINT" property="id"/> <id column="id" jdbcType="BIGINT" property="id"/>
<result column="name" jdbcType="VARCHAR" property="name"/> <result column="name" jdbcType="VARCHAR" property="name"/>
<result column="code" jdbcType="VARCHAR" property="code"/> <result column="code" jdbcType="VARCHAR" property="code"/>

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormPrintConfigMapperExt"> <mapper namespace="com.dromara.md.form.mybatis.mapper.FormPrintConfigMapper">
<resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfig"> <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormPrintConfig">
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@ -29,7 +29,7 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap> </resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfigTpl"> <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.dromara.md.form.mybatis.entity.FormPrintConfig">
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormTemplateFieldMapperExt"> <mapper namespace="com.dromara.md.form.mybatis.mapper.FormTemplateFieldMapper">
<resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.FormTemplateField"> <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormTemplateField">
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.
@ -32,7 +32,7 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" /> <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" /> <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap> </resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.pcloud.booksflow.form.mybatis.entity.FormTemplateField"> <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.dromara.md.form.mybatis.entity.FormTemplateField">
<result column="ext" jdbcType="LONGVARCHAR" property="ext" /> <result column="ext" jdbcType="LONGVARCHAR" property="ext" />
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.FormTemplateMapperExt"> <mapper namespace="com.dromara.md.form.mybatis.mapper.FormTemplateMapper">
<resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.FormTemplate"> <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormTemplate">
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.ModifyLogRecordMapperExt"> <mapper namespace="com.dromara.md.form.mybatis.mapper.ModifyLogRecordMapper">
<resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecord"> <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.ModifyLogRecord">
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.pcloud.booksflow.form.mybatis.mapper.TenantInitStatusMapperExt"> <mapper namespace="com.dromara.md.form.mybatis.mapper.TenantInitStatusMapper">
<resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.TenantInitStatus"> <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.TenantInitStatus">
<!-- <!--
WARNING - @mbg.generated WARNING - @mbg.generated
This element is automatically generated by MyBatis Generator, do not modify. This element is automatically generated by MyBatis Generator, do not modify.

View File

@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-form</artifactId> <artifactId>ruoyi-md-form</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<artifactId>booksflow-form-service</artifactId> <artifactId>ruoyi-md-form-service</artifactId>
<dependencies> <dependencies>
<dependency> <dependency>

View File

@ -1,14 +1,14 @@
package com.pcloud.booksflow.form.controller; package com.dromara.md.form.controller;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.mybatis.entity.Form; import com.dromara.md.form.mybatis.entity.Form;
import com.pcloud.booksflow.form.mybatis.entity.FormTemplate; import com.dromara.md.form.mybatis.entity.FormTemplate;
import com.pcloud.booksflow.form.mybatis.entity.FormTemplateField; import com.dromara.md.form.mybatis.entity.FormTemplateField;
import com.pcloud.booksflow.form.service.FormService; import com.dromara.md.form.service.FormService;
import com.pcloud.booksflow.form.service.FormTemplateFieldService; import com.dromara.md.form.service.FormTemplateFieldService;
import com.pcloud.booksflow.form.service.FormTemplateService; import com.dromara.md.form.service.FormTemplateService;
import com.pcloud.booksflow.form.service.TenantInitializationService; import com.dromara.md.form.service.TenantInitializationService;
import com.pcloud.booksflow.form.utils.TenantHelper; import com.dromara.md.form.utils.TenantHelper;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

View File

@ -1,16 +1,16 @@
package com.pcloud.booksflow.form.controller; package com.dromara.md.form.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.dto.FormDictDTO; import com.dromara.md.form.api.dto.FormDictDTO;
import com.pcloud.booksflow.form.api.dto.FormFieldDictDTO; import com.dromara.md.form.api.dto.FormFieldDictDTO;
import com.pcloud.booksflow.form.api.dto.FormFieldDictQ; import com.dromara.md.form.api.dto.FormFieldDictQ;
import com.pcloud.booksflow.form.api.vo.FormDictVO; import com.dromara.md.form.api.vo.FormDictVO;
import com.pcloud.booksflow.form.api.vo.FormFieldDictVO; import com.dromara.md.form.api.vo.FormFieldDictVO;
import com.pcloud.booksflow.form.mybatis.entity.FormDict; import com.dromara.md.form.mybatis.entity.FormDict;
import com.pcloud.booksflow.form.service.FormDictService; import com.dromara.md.form.service.FormDictService;
import com.pcloud.booksflow.form.service.FormFieldDictService; import com.dromara.md.form.service.FormFieldDictService;
import com.pcloud.booksflow.form.service.TenantInitializationService; import com.dromara.md.form.service.TenantInitializationService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

View File

@ -1,15 +1,15 @@
package com.pcloud.booksflow.form.controller; package com.dromara.md.form.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.constant.FormFieldDictType; import com.dromara.md.form.api.constant.FormFieldDictType;
import com.pcloud.booksflow.form.api.dto.FormFieldDictDTO; import com.dromara.md.form.api.dto.FormFieldDictDTO;
import com.pcloud.booksflow.form.api.dto.FormFieldDictQ; import com.dromara.md.form.api.dto.FormFieldDictQ;
import com.pcloud.booksflow.form.api.vo.FormFieldDictVO; import com.dromara.md.form.api.vo.FormFieldDictVO;
import com.pcloud.booksflow.form.mybatis.entity.FormFieldDict; import com.dromara.md.form.mybatis.entity.FormFieldDict;
import com.pcloud.booksflow.form.service.FormDictService; import com.dromara.md.form.service.FormDictService;
import com.pcloud.booksflow.form.service.FormFieldDictService; import com.dromara.md.form.service.FormFieldDictService;
import com.pcloud.booksflow.form.utils.TenantHelper; import com.dromara.md.form.utils.TenantHelper;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

View File

@ -1,13 +1,13 @@
package com.pcloud.booksflow.form.controller; package com.dromara.md.form.controller;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.dto.FormPrintConfigDTO; import com.dromara.md.form.api.dto.FormPrintConfigDTO;
import com.pcloud.booksflow.form.api.dto.FormPrintConfigModeDTO; import com.dromara.md.form.api.dto.FormPrintConfigModeDTO;
import com.pcloud.booksflow.form.api.dto.FormPrintConfigUploadDTO; import com.dromara.md.form.api.dto.FormPrintConfigUploadDTO;
import com.pcloud.booksflow.form.api.dto.FormPrintDTO; import com.dromara.md.form.api.dto.FormPrintDTO;
import com.pcloud.booksflow.form.api.vo.FormPrintConfigVO; import com.dromara.md.form.api.vo.FormPrintConfigVO;
import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfig; import com.dromara.md.form.mybatis.entity.FormPrintConfig;
import com.pcloud.booksflow.form.service.FormPrintConfigService; import com.dromara.md.form.service.FormPrintConfigService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.dromara.common.oss.entity.UploadResult; import org.dromara.common.oss.entity.UploadResult;

View File

@ -1,9 +1,9 @@
package com.pcloud.booksflow.form.controller; package com.dromara.md.form.controller;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.dto.FormTemplateDTO; import com.dromara.md.form.api.dto.FormTemplateDTO;
import com.pcloud.booksflow.form.api.vo.FormTemplateVO; import com.dromara.md.form.api.vo.FormTemplateVO;
import com.pcloud.booksflow.form.service.FormTemplateService; import com.dromara.md.form.service.FormTemplateService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;

View File

@ -1,8 +1,8 @@
package com.pcloud.booksflow.form.controller; package com.dromara.md.form.controller;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.mybatis.entity.FormTemplateField; import com.dromara.md.form.mybatis.entity.FormTemplateField;
import com.pcloud.booksflow.form.service.FormTemplateFieldService; import com.dromara.md.form.service.FormTemplateFieldService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

View File

@ -1,10 +1,10 @@
package com.pcloud.booksflow.form.controller; package com.dromara.md.form.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.dto.ModifyLogRecordDTO; import com.dromara.md.form.api.dto.ModifyLogRecordDTO;
import com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecord; import com.dromara.md.form.mybatis.entity.ModifyLogRecord;
import com.pcloud.booksflow.form.service.ModifyLogRecordService; import com.dromara.md.form.service.ModifyLogRecordService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

View File

@ -1,11 +1,11 @@
package com.pcloud.booksflow.form.controller; package com.dromara.md.form.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.dto.FormDictDTO; import com.dromara.md.form.api.dto.FormDictDTO;
import com.pcloud.booksflow.form.mybatis.entity.FormDict; import com.dromara.md.form.mybatis.entity.FormDict;
import com.pcloud.booksflow.form.service.FormDictService; import com.dromara.md.form.service.FormDictService;
import com.pcloud.booksflow.form.utils.TenantHelper; import com.dromara.md.form.utils.TenantHelper;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

View File

@ -1,14 +1,14 @@
package com.pcloud.booksflow.form.controller; package com.dromara.md.form.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.dto.FormFieldDictDTO; import com.dromara.md.form.api.dto.FormFieldDictDTO;
import com.pcloud.booksflow.form.api.dto.FormFieldDictQ; import com.dromara.md.form.api.dto.FormFieldDictQ;
import com.pcloud.booksflow.form.api.vo.FormFieldDictDifyVo; import com.dromara.md.form.api.vo.FormFieldDictDifyVo;
import com.pcloud.booksflow.form.api.vo.FormFieldDictVO; import com.dromara.md.form.api.vo.FormFieldDictVO;
import com.pcloud.booksflow.form.mybatis.entity.FormFieldDict; import com.dromara.md.form.mybatis.entity.FormFieldDict;
import com.pcloud.booksflow.form.service.FormFieldDictService; import com.dromara.md.form.service.FormFieldDictService;
import com.pcloud.booksflow.form.utils.TenantHelper; import com.dromara.md.form.utils.TenantHelper;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

View File

@ -1,14 +1,14 @@
package com.pcloud.booksflow.form.controller.feign; package com.dromara.md.form.controller.feign;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.dto.FormFieldDictQ; import com.dromara.md.form.api.dto.FormFieldDictQ;
import com.pcloud.booksflow.form.api.vo.FormFieldDictDifyVo; import com.dromara.md.form.api.vo.FormFieldDictDifyVo;
import com.pcloud.booksflow.form.api.vo.FormFieldDictVO; import com.dromara.md.form.api.vo.FormFieldDictVO;
import com.pcloud.booksflow.form.feign.FormFieldDictFeignClient; import com.dromara.md.form.feign.FormFieldDictFeignClient;
import com.pcloud.booksflow.form.service.FormDictService; import com.dromara.md.form.service.FormDictService;
import com.pcloud.booksflow.form.service.FormFieldDictService; import com.dromara.md.form.service.FormFieldDictService;
import com.pcloud.booksflow.form.utils.TenantHelper; import com.dromara.md.form.utils.TenantHelper;
import jodd.util.StringUtil; import jodd.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;

View File

@ -1,10 +1,10 @@
package com.pcloud.booksflow.form.controller.feign; package com.dromara.md.form.controller.feign;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.vo.FormPrintConfigVO; import com.dromara.md.form.api.vo.FormPrintConfigVO;
import com.pcloud.booksflow.form.feign.FormPrintConfigFeignClient; import com.dromara.md.form.feign.FormPrintConfigFeignClient;
import com.pcloud.booksflow.form.service.FormPrintConfigService; import com.dromara.md.form.service.FormPrintConfigService;
import com.pcloud.booksflow.form.utils.TenantHelper; import com.dromara.md.form.utils.TenantHelper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;

View File

@ -1,14 +1,12 @@
package com.pcloud.booksflow.form.controller.feign; package com.dromara.md.form.controller.feign;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.vo.FormTemplateVO; import com.dromara.md.form.api.vo.FormTemplateVO;
import com.pcloud.booksflow.form.feign.FormTemplateFeignClient; import com.dromara.md.form.feign.FormTemplateFeignClient;
import com.pcloud.booksflow.form.service.FormTemplateService; import com.dromara.md.form.utils.TenantHelper;
import com.pcloud.booksflow.form.utils.TenantHelper; import com.dromara.md.form.service.FormTemplateService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
/** /**

View File

@ -1,10 +1,10 @@
package com.pcloud.booksflow.form.controller.feign; package com.dromara.md.form.controller.feign;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.dto.ModifyLogRecordDTO; import com.dromara.md.form.api.dto.ModifyLogRecordDTO;
import com.pcloud.booksflow.form.feign.ModifyLogRecordFeignClient; import com.dromara.md.form.feign.ModifyLogRecordFeignClient;
import com.pcloud.booksflow.form.service.ModifyLogRecordService; import com.dromara.md.form.service.ModifyLogRecordService;
import com.pcloud.booksflow.form.utils.TenantHelper; import com.dromara.md.form.utils.TenantHelper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;

View File

@ -1,11 +1,11 @@
package com.pcloud.booksflow.form.controller.feign; package com.dromara.md.form.controller.feign;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.api.dto.FormFieldDictQ; import com.dromara.md.form.api.dto.FormFieldDictQ;
import com.pcloud.booksflow.form.api.vo.FormFieldDictVO; import com.dromara.md.form.api.vo.FormFieldDictVO;
import com.pcloud.booksflow.form.feign.SystemDictFeignClient; import com.dromara.md.form.feign.SystemDictFeignClient;
import com.pcloud.booksflow.form.service.FormFieldDictService; import com.dromara.md.form.service.FormFieldDictService;
import com.pcloud.booksflow.form.utils.TenantHelper; import com.dromara.md.form.utils.TenantHelper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.service; package com.dromara.md.form.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pcloud.booksflow.form.api.dto.FormDictDTO; import com.dromara.md.form.api.dto.FormDictDTO;
import com.pcloud.booksflow.form.mybatis.entity.FormDict; import com.dromara.md.form.mybatis.entity.FormDict;
import com.pcloud.booksflow.form.mybatis.mapper.FormDictMapper; import com.dromara.md.form.mybatis.mapper.FormDictMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.tenant.helper.LoginHelper; import org.dromara.common.tenant.helper.LoginHelper;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.service; package com.dromara.md.form.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
@ -7,14 +7,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pcloud.booksflow.form.api.constant.FormFieldDictType; import com.dromara.md.form.api.constant.FormFieldDictType;
import com.pcloud.booksflow.form.api.dto.DictCodesDTO; import com.dromara.md.form.api.dto.DictCodesDTO;
import com.pcloud.booksflow.form.api.dto.FormFieldDictDTO; import com.dromara.md.form.api.dto.FormFieldDictDTO;
import com.pcloud.booksflow.form.api.dto.FormFieldDictQ; import com.dromara.md.form.api.dto.FormFieldDictQ;
import com.pcloud.booksflow.form.api.vo.FormFieldDictDifyVo; import com.dromara.md.form.api.vo.FormFieldDictDifyVo;
import com.pcloud.booksflow.form.api.vo.FormFieldDictVO; import com.dromara.md.form.api.vo.FormFieldDictVO;
import com.pcloud.booksflow.form.mybatis.entity.FormFieldDict; import com.dromara.md.form.mybatis.entity.FormFieldDict;
import com.pcloud.booksflow.form.mybatis.mapper.FormFieldDictMapper; import com.dromara.md.form.mybatis.mapper.FormFieldDictMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.json.utils.JsonUtils;

View File

@ -1,16 +1,16 @@
package com.pcloud.booksflow.form.service; package com.dromara.md.form.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pcloud.booksflow.form.api.dto.FormPrintConfigDTO; import com.dromara.md.form.api.dto.FormPrintConfigDTO;
import com.pcloud.booksflow.form.api.dto.FormPrintConfigModeDTO; import com.dromara.md.form.api.dto.FormPrintConfigModeDTO;
import com.pcloud.booksflow.form.api.dto.FormPrintConfigUploadDTO; import com.dromara.md.form.api.dto.FormPrintConfigUploadDTO;
import com.pcloud.booksflow.form.api.dto.FormPrintDTO; import com.dromara.md.form.api.dto.FormPrintDTO;
import com.pcloud.booksflow.form.api.vo.FormPrintConfigVO; import com.dromara.md.form.api.vo.FormPrintConfigVO;
import com.pcloud.booksflow.form.mybatis.entity.Form; import com.dromara.md.form.mybatis.entity.Form;
import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfig; import com.dromara.md.form.mybatis.entity.FormPrintConfig;
import com.pcloud.booksflow.form.mybatis.mapper.FormPrintConfigMapper; import com.dromara.md.form.mybatis.mapper.FormPrintConfigMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.StringUtils;

View File

@ -1,16 +1,12 @@
package com.pcloud.booksflow.form.service; package com.dromara.md.form.service;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.mybatis.entity.Form;
import com.pcloud.booksflow.form.mybatis.entity.*; import com.dromara.md.form.mybatis.mapper.FormMapper;
import com.pcloud.booksflow.form.mybatis.mapper.FormMapper;
import com.pcloud.booksflow.form.utils.TenantHelper;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;

View File

@ -1,14 +1,14 @@
package com.pcloud.booksflow.form.service; package com.dromara.md.form.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pcloud.booksflow.form.api.constant.FormTemplateFieldType; import com.dromara.md.form.api.constant.FormTemplateFieldType;
import com.pcloud.booksflow.form.api.dto.FormTemplateDTO; import com.dromara.md.form.api.dto.FormTemplateDTO;
import com.pcloud.booksflow.form.mybatis.entity.FormTemplateField; import com.dromara.md.form.mybatis.entity.FormTemplateField;
import com.pcloud.booksflow.form.mybatis.mapper.FormTemplateFieldMapper; import com.dromara.md.form.mybatis.mapper.FormTemplateFieldMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.json.utils.JsonUtils;
import org.dromara.common.tenant.helper.LoginHelper; import org.dromara.common.tenant.helper.LoginHelper;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.service; package com.dromara.md.form.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
@ -6,12 +6,12 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.EncryptUtils; import com.baomidou.mybatisplus.core.toolkit.EncryptUtils;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pcloud.booksflow.form.api.dto.FormTemplateDTO; import com.dromara.md.form.api.dto.FormTemplateDTO;
import com.pcloud.booksflow.form.api.vo.FormTemplateVO; import com.dromara.md.form.api.vo.FormTemplateVO;
import com.pcloud.booksflow.form.mybatis.entity.Form; import com.dromara.md.form.mybatis.entity.Form;
import com.pcloud.booksflow.form.mybatis.entity.FormTemplate; import com.dromara.md.form.mybatis.entity.FormTemplate;
import com.pcloud.booksflow.form.mybatis.entity.FormTemplateField; import com.dromara.md.form.mybatis.entity.FormTemplateField;
import com.pcloud.booksflow.form.mybatis.mapper.FormTemplateMapper; import com.dromara.md.form.mybatis.mapper.FormTemplateMapper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.json.utils.JsonUtils;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.service; package com.dromara.md.form.service;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pcloud.booksflow.form.api.dto.ModifyLogRecordDTO; import com.dromara.md.form.api.dto.ModifyLogRecordDTO;
import com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecord; import com.dromara.md.form.mybatis.entity.ModifyLogRecord;
import com.pcloud.booksflow.form.mybatis.mapper.ModifyLogRecordMapper; import com.dromara.md.form.mybatis.mapper.ModifyLogRecordMapper;
import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.exception.ServiceException;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

View File

@ -1,9 +1,9 @@
package com.pcloud.booksflow.form.service; package com.dromara.md.form.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pcloud.booksflow.form.mybatis.entity.TenantInitStatus; import com.dromara.md.form.mybatis.entity.TenantInitStatus;
import com.pcloud.booksflow.form.mybatis.mapper.TenantInitStatusMapper; import com.dromara.md.form.mybatis.mapper.TenantInitStatusMapper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Date; import java.util.Date;

View File

@ -1,12 +1,12 @@
package com.pcloud.booksflow.form.service; package com.dromara.md.form.service;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.pcloud.booksflow.form.api.constant.BaseConstant; import com.dromara.md.form.api.constant.BaseConstant;
import com.pcloud.booksflow.form.mybatis.entity.Form; import com.dromara.md.form.mybatis.entity.Form;
import com.pcloud.booksflow.form.mybatis.entity.FormDict; import com.dromara.md.form.mybatis.entity.FormDict;
import com.pcloud.booksflow.form.mybatis.entity.FormTemplate; import com.dromara.md.form.mybatis.entity.FormTemplate;
import com.pcloud.booksflow.form.mybatis.entity.FormTemplateField; import com.dromara.md.form.mybatis.entity.FormTemplateField;
import com.pcloud.booksflow.form.utils.TenantHelper; import com.dromara.md.form.utils.TenantHelper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.redis.utils.RedisUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.utils; package com.dromara.md.form.utils;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy; import com.baomidou.mybatisplus.core.plugins.IgnoreStrategy;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.utils.poi; package com.dromara.md.form.utils.poi;
import org.apache.poi.poifs.crypt.HashAlgorithm; import org.apache.poi.poifs.crypt.HashAlgorithm;
import org.apache.poi.xssf.usermodel.XSSFCell; import org.apache.poi.xssf.usermodel.XSSFCell;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.utils.poi; package com.dromara.md.form.utils.poi;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.text.ParseException; import java.text.ParseException;

View File

@ -1,4 +1,4 @@
package com.pcloud.booksflow.form.utils.poi; package com.dromara.md.form.utils.poi;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

View File

@ -4,11 +4,11 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-form</artifactId> <artifactId>ruoyi-md-form</artifactId>
<version>${revision}</version> <version>${revision}</version>
</parent> </parent>
<artifactId>booksflow-form-starter</artifactId> <artifactId>ruoyi-md-form-starter</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<dependencies> <dependencies>

View File

@ -24,6 +24,6 @@
//@EnableScheduling //@EnableScheduling
//@EnableEurekaClient //@EnableEurekaClient
//@EnableFeignClients({"com.pcloud", "com.commons.weboffice.api.service", "com.pcloud.llm.cockpit.client"}) //@EnableFeignClients({"com.pcloud", "com.commons.weboffice.api.service", "com.pcloud.llm.cockpit.client"})
//@MapperScan(basePackages = "com.pcloud.booksflow.form.mybatis.mapper", sqlSessionFactoryRef = BooksflowFormDataSourceConfig.SESSION_FACTORY_NAME) //@MapperScan(basePackages = "com.dromara.md.form.mybatis.mapper", sqlSessionFactoryRef = BooksflowFormDataSourceConfig.SESSION_FACTORY_NAME)
//public class AppContext { //public class AppContext {
//} //}

View File

@ -39,7 +39,7 @@
//import java.util.*; //import java.util.*;
// //
//@Configuration //@Configuration
//@MapperScan(basePackages = "com.pcloud.booksflow.form.mybatis.mapper") //@MapperScan(basePackages = "com.dromara.md.form.mybatis.mapper")
//public class BooksflowFormDataSourceConfig { //public class BooksflowFormDataSourceConfig {
// private final Logger logger = LoggerFactory.getLogger(getClass()); // private final Logger logger = LoggerFactory.getLogger(getClass());
// //

Some files were not shown because too many files have changed in this diff Show More