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

ruoyi-modules/pom.xml

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

ruoyi-modules/ruoyi-md-form/pom.xml

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/pom.xml

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/constant/BaseConstant.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/constant/FormFieldDictType.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/constant/FormTemplateFieldType.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/DictCodesDTO.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormDictDTO.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormFieldDictDTO.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormFieldDictQ.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintConfigDTO.java

@@ -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 io.swagger.annotations.ApiModel;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintConfigModeDTO.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintConfigUploadDTO.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormPrintDTO.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/FormTemplateDTO.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/dto/ModifyLogRecordDTO.java

@@ -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 io.swagger.annotations.ApiModel;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormDictVO.java

@@ -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 io.swagger.annotations.ApiModel;
@@ -47,4 +47,4 @@ public class FormDictVO implements Serializable {
     @ApiModelProperty(value = "字典项列表")
     private List<FormFieldDictVO> items;
 
-}
+}

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormFieldDictDifyVo.java

@@ -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 lombok.Getter;
@@ -16,4 +16,4 @@ public class FormFieldDictDifyVo {
     private String name;
 
 
-}
+}

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormFieldDictVO.java

@@ -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 lombok.Getter;
@@ -41,4 +41,4 @@ public class FormFieldDictVO {
 
     private List<FormFieldDictVO> children;
 
-}
+}

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormPrintConfigVO.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-api/src/main/java/com/dromara/md/form/api/vo/FormTemplateVO.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/pom.xml

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/FormFieldDictFeignClient.java

@@ -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.pcloud.booksflow.form.api.dto.FormFieldDictQ;
-import com.pcloud.booksflow.form.api.vo.FormFieldDictDifyVo;
-import com.pcloud.booksflow.form.api.vo.FormFieldDictVO;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.dto.FormFieldDictQ;
+import com.dromara.md.form.api.vo.FormFieldDictDifyVo;
+import com.dromara.md.form.api.vo.FormFieldDictVO;
 import io.swagger.annotations.Api;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -84,4 +84,4 @@ public interface FormFieldDictFeignClient {
                                                 @RequestParam String configType,
                                                 @RequestParam(required = false) List<Long> parentIds);
 
-}
+}

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/FormPrintConfigFeignClient.java

@@ -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.pcloud.booksflow.form.api.vo.FormPrintConfigVO;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.vo.FormPrintConfigVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -23,4 +23,4 @@ public interface FormPrintConfigFeignClient {
     FormPrintConfigVO get(@RequestParam Long agentId, @RequestParam String formCode);
 
 
-}
+}

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/FormTemplateFeignClient.java

@@ -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.pcloud.booksflow.form.api.vo.FormTemplateVO;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.vo.FormTemplateVO;
 import io.swagger.annotations.Api;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -42,4 +42,4 @@ public interface FormTemplateFeignClient {
                            @RequestParam(required = false) Boolean show,
                            @RequestParam(required = false) Boolean tree);
 
-}
+}

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/ModifyLogRecordFeignClient.java

@@ -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.pcloud.booksflow.form.api.dto.ModifyLogRecordDTO;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.dto.ModifyLogRecordDTO;
 import io.swagger.annotations.Api;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,4 +27,4 @@ public interface ModifyLogRecordFeignClient {
     Integer batchCreate(@RequestParam("agent_id") Long agentId,  @RequestBody List<ModifyLogRecordDTO> dtos);
 
 
-}
+}

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-feign/src/main/java/com/dromara/md/form/feign/SystemDictFeignClient.java

@@ -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.pcloud.booksflow.form.api.dto.FormFieldDictQ;
-import com.pcloud.booksflow.form.api.vo.FormFieldDictVO;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.dto.FormFieldDictQ;
+import com.dromara.md.form.api.vo.FormFieldDictVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/pom.xml

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/Form.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormDict.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormFieldDict.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormPrintConfig.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormTemplate.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/FormTemplateField.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/ModifyLogRecord.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/entity/TenantInitStatus.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormDictMapper.java

@@ -1,12 +1,12 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
+package com.dromara.md.form.mybatis.mapper;
 
 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;
 
 /**
  * 表单字典Mapper接口
- * 
+ *
  * @author lizhw
  */
 @Mapper

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormFieldDictMapper.java

@@ -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.pcloud.booksflow.form.api.dto.DictCodesDTO;
-import com.pcloud.booksflow.form.mybatis.entity.FormFieldDict;
+import com.dromara.md.form.api.dto.DictCodesDTO;
+import com.dromara.md.form.mybatis.entity.FormFieldDict;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormMapper.java

@@ -1,12 +1,12 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
+package com.dromara.md.form.mybatis.mapper;
 
 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;
 
 /**
  * 表单Mapper接口
- * 
+ *
  * @author lizhw
  */
 @Mapper

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormPrintConfigMapper.java

@@ -1,12 +1,12 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
+package com.dromara.md.form.mybatis.mapper;
 
 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;
 
 /**
  * 表单打印配置Mapper接口
- * 
+ *
  * @author lizhw
  */
 @Mapper

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormTemplateFieldMapper.java

@@ -1,12 +1,12 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
+package com.dromara.md.form.mybatis.mapper;
 
 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;
 
 /**
  * 表单模板字段Mapper接口
- * 
+ *
  * @author lizhw
  */
 @Mapper

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/FormTemplateMapper.java

@@ -1,12 +1,12 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
+package com.dromara.md.form.mybatis.mapper;
 
 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;
 
 /**
  * 表单模板Mapper接口
- * 
+ *
  * @author lizhw
  */
 @Mapper

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/ModifyLogRecordMapper.java

@@ -1,12 +1,12 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
+package com.dromara.md.form.mybatis.mapper;
 
 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;
 
 /**
  * 修改日志记录Mapper接口
- * 
+ *
  * @author lizhw
  */
 @Mapper

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/java/com/dromara/md/form/mybatis/mapper/TenantInitStatusMapper.java

@@ -1,12 +1,12 @@
-package com.pcloud.booksflow.form.mybatis.mapper;
+package com.dromara.md.form.mybatis.mapper;
 
 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;
 
 /**
  * 租户初始化状态Mapper接口
- * 
+ *
  * @author lizhw
  */
 @Mapper

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormDictMapper.xml

@@ -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.pcloud.booksflow.form.mybatis.mapper.FormDictMapperExt">
-    <resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.FormDict">
+<mapper namespace="com.dromara.md.form.mybatis.mapper.FormDictMapper">
+    <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormDict">
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="code" jdbcType="VARCHAR" property="code"/>

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormFieldDictMapper.xml

@@ -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.pcloud.booksflow.form.mybatis.mapper.FormFieldDictMapper">
-    <resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.FormFieldDict">
+<mapper namespace="com.dromara.md.form.mybatis.mapper.FormFieldDictMapper">
+    <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormFieldDict">
         <!--
           WARNING - @mbg.generated
           This element is automatically generated by MyBatis Generator, do not modify.
@@ -20,7 +20,7 @@
         <result column="deleted" jdbcType="TINYINT" property="deleted"/>
     </resultMap>
     <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"/>
     </resultMap>
     <sql id="Base_Column_List">
@@ -28,8 +28,9 @@
         , config_type, `name`, code, parent_id, check_ids, sort_order, `status`, created_by,
     updated_by, create_time, update_time, deleted
     </sql>
-
-
+    <sql id="Blob_Column_List">
+        other_fields
+    </sql>
     <select id="getByCodes" resultMap="ResultMapWithBLOBs">
         select
         <include refid="Base_Column_List"/>

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormMapper.xml

@@ -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.pcloud.booksflow.form.mybatis.mapper.FormMapperExt">
-    <resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.Form">
+<mapper namespace="com.dromara.md.form.mybatis.mapper.FormMapper">
+    <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.Form">
         <id column="id" jdbcType="BIGINT" property="id"/>
         <result column="name" jdbcType="VARCHAR" property="name"/>
         <result column="code" jdbcType="VARCHAR" property="code"/>

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormPrintConfigMapper.xml

@@ -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.pcloud.booksflow.form.mybatis.mapper.FormPrintConfigMapperExt">
-  <resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.FormPrintConfig">
+<mapper namespace="com.dromara.md.form.mybatis.mapper.FormPrintConfigMapper">
+  <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormPrintConfig">
     <!--
       WARNING - @mbg.generated
       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="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </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
       This element is automatically generated by MyBatis Generator, do not modify.

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormTemplateFieldMapper.xml

@@ -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.pcloud.booksflow.form.mybatis.mapper.FormTemplateFieldMapperExt">
-  <resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.FormTemplateField">
+<mapper namespace="com.dromara.md.form.mybatis.mapper.FormTemplateFieldMapper">
+  <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormTemplateField">
     <!--
       WARNING - @mbg.generated
       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="update_time" jdbcType="TIMESTAMP" property="updateTime" />
   </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" />
   </resultMap>
   <sql id="Base_Column_List">

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/FormTemplateMapper.xml

@@ -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.pcloud.booksflow.form.mybatis.mapper.FormTemplateMapperExt">
-  <resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.FormTemplate">
+<mapper namespace="com.dromara.md.form.mybatis.mapper.FormTemplateMapper">
+  <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.FormTemplate">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/ModifyLogRecordMapper.xml

@@ -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.pcloud.booksflow.form.mybatis.mapper.ModifyLogRecordMapperExt">
-  <resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecord">
+<mapper namespace="com.dromara.md.form.mybatis.mapper.ModifyLogRecordMapper">
+  <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.ModifyLogRecord">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-mapper/src/main/resources/mapper/md-form/TenantInitStatusMapper.xml

@@ -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.pcloud.booksflow.form.mybatis.mapper.TenantInitStatusMapperExt">
-  <resultMap id="BaseResultMap" type="com.pcloud.booksflow.form.mybatis.entity.TenantInitStatus">
+<mapper namespace="com.dromara.md.form.mybatis.mapper.TenantInitStatusMapper">
+  <resultMap id="BaseResultMap" type="com.dromara.md.form.mybatis.entity.TenantInitStatus">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/pom.xml

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormController.java

@@ -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.pcloud.booksflow.form.mybatis.entity.Form;
-import com.pcloud.booksflow.form.mybatis.entity.FormTemplate;
-import com.pcloud.booksflow.form.mybatis.entity.FormTemplateField;
-import com.pcloud.booksflow.form.service.FormService;
-import com.pcloud.booksflow.form.service.FormTemplateFieldService;
-import com.pcloud.booksflow.form.service.FormTemplateService;
-import com.pcloud.booksflow.form.service.TenantInitializationService;
-import com.pcloud.booksflow.form.utils.TenantHelper;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.mybatis.entity.Form;
+import com.dromara.md.form.mybatis.entity.FormTemplate;
+import com.dromara.md.form.mybatis.entity.FormTemplateField;
+import com.dromara.md.form.service.FormService;
+import com.dromara.md.form.service.FormTemplateFieldService;
+import com.dromara.md.form.service.FormTemplateService;
+import com.dromara.md.form.service.TenantInitializationService;
+import com.dromara.md.form.utils.TenantHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormDictController.java

@@ -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.pcloud.booksflow.form.api.constant.BaseConstant;
-import com.pcloud.booksflow.form.api.dto.FormDictDTO;
-import com.pcloud.booksflow.form.api.dto.FormFieldDictDTO;
-import com.pcloud.booksflow.form.api.dto.FormFieldDictQ;
-import com.pcloud.booksflow.form.api.vo.FormDictVO;
-import com.pcloud.booksflow.form.api.vo.FormFieldDictVO;
-import com.pcloud.booksflow.form.mybatis.entity.FormDict;
-import com.pcloud.booksflow.form.service.FormDictService;
-import com.pcloud.booksflow.form.service.FormFieldDictService;
-import com.pcloud.booksflow.form.service.TenantInitializationService;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.dto.FormDictDTO;
+import com.dromara.md.form.api.dto.FormFieldDictDTO;
+import com.dromara.md.form.api.dto.FormFieldDictQ;
+import com.dromara.md.form.api.vo.FormDictVO;
+import com.dromara.md.form.api.vo.FormFieldDictVO;
+import com.dromara.md.form.mybatis.entity.FormDict;
+import com.dromara.md.form.service.FormDictService;
+import com.dromara.md.form.service.FormFieldDictService;
+import com.dromara.md.form.service.TenantInitializationService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormFieldDictController.java

@@ -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.pcloud.booksflow.form.api.constant.BaseConstant;
-import com.pcloud.booksflow.form.api.constant.FormFieldDictType;
-import com.pcloud.booksflow.form.api.dto.FormFieldDictDTO;
-import com.pcloud.booksflow.form.api.dto.FormFieldDictQ;
-import com.pcloud.booksflow.form.api.vo.FormFieldDictVO;
-import com.pcloud.booksflow.form.mybatis.entity.FormFieldDict;
-import com.pcloud.booksflow.form.service.FormDictService;
-import com.pcloud.booksflow.form.service.FormFieldDictService;
-import com.pcloud.booksflow.form.utils.TenantHelper;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.constant.FormFieldDictType;
+import com.dromara.md.form.api.dto.FormFieldDictDTO;
+import com.dromara.md.form.api.dto.FormFieldDictQ;
+import com.dromara.md.form.api.vo.FormFieldDictVO;
+import com.dromara.md.form.mybatis.entity.FormFieldDict;
+import com.dromara.md.form.service.FormDictService;
+import com.dromara.md.form.service.FormFieldDictService;
+import com.dromara.md.form.utils.TenantHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormPrintConfigController.java

@@ -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.pcloud.booksflow.form.api.dto.FormPrintConfigDTO;
-import com.pcloud.booksflow.form.api.dto.FormPrintConfigModeDTO;
-import com.pcloud.booksflow.form.api.dto.FormPrintConfigUploadDTO;
-import com.pcloud.booksflow.form.api.dto.FormPrintDTO;
-import com.pcloud.booksflow.form.api.vo.FormPrintConfigVO;
-import com.pcloud.booksflow.form.mybatis.entity.FormPrintConfig;
-import com.pcloud.booksflow.form.service.FormPrintConfigService;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.dto.FormPrintConfigDTO;
+import com.dromara.md.form.api.dto.FormPrintConfigModeDTO;
+import com.dromara.md.form.api.dto.FormPrintConfigUploadDTO;
+import com.dromara.md.form.api.dto.FormPrintDTO;
+import com.dromara.md.form.api.vo.FormPrintConfigVO;
+import com.dromara.md.form.mybatis.entity.FormPrintConfig;
+import com.dromara.md.form.service.FormPrintConfigService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.dromara.common.oss.entity.UploadResult;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormTemplateController.java

@@ -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.pcloud.booksflow.form.api.dto.FormTemplateDTO;
-import com.pcloud.booksflow.form.api.vo.FormTemplateVO;
-import com.pcloud.booksflow.form.service.FormTemplateService;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.dto.FormTemplateDTO;
+import com.dromara.md.form.api.vo.FormTemplateVO;
+import com.dromara.md.form.service.FormTemplateService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/FormTemplateFieldController.java

@@ -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.pcloud.booksflow.form.mybatis.entity.FormTemplateField;
-import com.pcloud.booksflow.form.service.FormTemplateFieldService;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.mybatis.entity.FormTemplateField;
+import com.dromara.md.form.service.FormTemplateFieldService;
 
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/ModifyLogRecordController.java

@@ -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.pcloud.booksflow.form.api.constant.BaseConstant;
-import com.pcloud.booksflow.form.api.dto.ModifyLogRecordDTO;
-import com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecord;
-import com.pcloud.booksflow.form.service.ModifyLogRecordService;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.dto.ModifyLogRecordDTO;
+import com.dromara.md.form.mybatis.entity.ModifyLogRecord;
+import com.dromara.md.form.service.ModifyLogRecordService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/SysFormDictController.java

@@ -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.pcloud.booksflow.form.api.constant.BaseConstant;
-import com.pcloud.booksflow.form.api.dto.FormDictDTO;
-import com.pcloud.booksflow.form.mybatis.entity.FormDict;
-import com.pcloud.booksflow.form.service.FormDictService;
-import com.pcloud.booksflow.form.utils.TenantHelper;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.dto.FormDictDTO;
+import com.dromara.md.form.mybatis.entity.FormDict;
+import com.dromara.md.form.service.FormDictService;
+import com.dromara.md.form.utils.TenantHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/SysFormFieldDictController.java

@@ -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.pcloud.booksflow.form.api.constant.BaseConstant;
-import com.pcloud.booksflow.form.api.dto.FormFieldDictDTO;
-import com.pcloud.booksflow.form.api.dto.FormFieldDictQ;
-import com.pcloud.booksflow.form.api.vo.FormFieldDictDifyVo;
-import com.pcloud.booksflow.form.api.vo.FormFieldDictVO;
-import com.pcloud.booksflow.form.mybatis.entity.FormFieldDict;
-import com.pcloud.booksflow.form.service.FormFieldDictService;
-import com.pcloud.booksflow.form.utils.TenantHelper;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.dto.FormFieldDictDTO;
+import com.dromara.md.form.api.dto.FormFieldDictQ;
+import com.dromara.md.form.api.vo.FormFieldDictDifyVo;
+import com.dromara.md.form.api.vo.FormFieldDictVO;
+import com.dromara.md.form.mybatis.entity.FormFieldDict;
+import com.dromara.md.form.service.FormFieldDictService;
+import com.dromara.md.form.utils.TenantHelper;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/FormFieldDictFeignController.java

@@ -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 com.pcloud.booksflow.form.api.constant.BaseConstant;
-import com.pcloud.booksflow.form.api.dto.FormFieldDictQ;
-import com.pcloud.booksflow.form.api.vo.FormFieldDictDifyVo;
-import com.pcloud.booksflow.form.api.vo.FormFieldDictVO;
-import com.pcloud.booksflow.form.feign.FormFieldDictFeignClient;
-import com.pcloud.booksflow.form.service.FormDictService;
-import com.pcloud.booksflow.form.service.FormFieldDictService;
-import com.pcloud.booksflow.form.utils.TenantHelper;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.dto.FormFieldDictQ;
+import com.dromara.md.form.api.vo.FormFieldDictDifyVo;
+import com.dromara.md.form.api.vo.FormFieldDictVO;
+import com.dromara.md.form.feign.FormFieldDictFeignClient;
+import com.dromara.md.form.service.FormDictService;
+import com.dromara.md.form.service.FormFieldDictService;
+import com.dromara.md.form.utils.TenantHelper;
 import jodd.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/FormPrintConfigFeignController.java

@@ -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.pcloud.booksflow.form.api.vo.FormPrintConfigVO;
-import com.pcloud.booksflow.form.feign.FormPrintConfigFeignClient;
-import com.pcloud.booksflow.form.service.FormPrintConfigService;
-import com.pcloud.booksflow.form.utils.TenantHelper;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.vo.FormPrintConfigVO;
+import com.dromara.md.form.feign.FormPrintConfigFeignClient;
+import com.dromara.md.form.service.FormPrintConfigService;
+import com.dromara.md.form.utils.TenantHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,4 +31,4 @@ public class FormPrintConfigFeignController implements FormPrintConfigFeignClien
         return TenantHelper.dynamic(agentId.toString(), () -> formPrintConfigService.getByFormCode(formCode));
     }
 
-}
+}

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/FormTemplateFeignController.java

@@ -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.pcloud.booksflow.form.api.vo.FormTemplateVO;
-import com.pcloud.booksflow.form.feign.FormTemplateFeignClient;
-import com.pcloud.booksflow.form.service.FormTemplateService;
-import com.pcloud.booksflow.form.utils.TenantHelper;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.vo.FormTemplateVO;
+import com.dromara.md.form.feign.FormTemplateFeignClient;
+import com.dromara.md.form.utils.TenantHelper;
+import com.dromara.md.form.service.FormTemplateService;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -55,4 +53,4 @@ public class FormTemplateFeignController implements FormTemplateFeignClient {
         return TenantHelper.dynamic(agentId.toString(), () -> formTemplateService.getVOById(id, show, tree));
     }
 
-}
+}

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/ModifyLogRecordFeignController.java

@@ -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.pcloud.booksflow.form.api.dto.ModifyLogRecordDTO;
-import com.pcloud.booksflow.form.feign.ModifyLogRecordFeignClient;
-import com.pcloud.booksflow.form.service.ModifyLogRecordService;
-import com.pcloud.booksflow.form.utils.TenantHelper;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.dto.ModifyLogRecordDTO;
+import com.dromara.md.form.feign.ModifyLogRecordFeignClient;
+import com.dromara.md.form.service.ModifyLogRecordService;
+import com.dromara.md.form.utils.TenantHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -28,4 +28,4 @@ public class ModifyLogRecordFeignController implements ModifyLogRecordFeignClien
         return TenantHelper.dynamic(agentId.toString(), () -> modifyLogRecordService.batchCreate(dtos));
     }
 
-}
+}

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/controller/feign/SystemDictFeignController.java

@@ -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.pcloud.booksflow.form.api.dto.FormFieldDictQ;
-import com.pcloud.booksflow.form.api.vo.FormFieldDictVO;
-import com.pcloud.booksflow.form.feign.SystemDictFeignClient;
-import com.pcloud.booksflow.form.service.FormFieldDictService;
-import com.pcloud.booksflow.form.utils.TenantHelper;
+import com.dromara.md.form.api.constant.BaseConstant;
+import com.dromara.md.form.api.dto.FormFieldDictQ;
+import com.dromara.md.form.api.vo.FormFieldDictVO;
+import com.dromara.md.form.feign.SystemDictFeignClient;
+import com.dromara.md.form.service.FormFieldDictService;
+import com.dromara.md.form.utils.TenantHelper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -36,4 +36,4 @@ public class SystemDictFeignController implements SystemDictFeignClient {
     }
 
 
-}
+}

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormDictService.java

@@ -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.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.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pcloud.booksflow.form.api.dto.FormDictDTO;
-import com.pcloud.booksflow.form.mybatis.entity.FormDict;
-import com.pcloud.booksflow.form.mybatis.mapper.FormDictMapper;
+import com.dromara.md.form.api.dto.FormDictDTO;
+import com.dromara.md.form.mybatis.entity.FormDict;
+import com.dromara.md.form.mybatis.mapper.FormDictMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.tenant.helper.LoginHelper;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormFieldDictService.java

@@ -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.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.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pcloud.booksflow.form.api.constant.FormFieldDictType;
-import com.pcloud.booksflow.form.api.dto.DictCodesDTO;
-import com.pcloud.booksflow.form.api.dto.FormFieldDictDTO;
-import com.pcloud.booksflow.form.api.dto.FormFieldDictQ;
-import com.pcloud.booksflow.form.api.vo.FormFieldDictDifyVo;
-import com.pcloud.booksflow.form.api.vo.FormFieldDictVO;
-import com.pcloud.booksflow.form.mybatis.entity.FormFieldDict;
-import com.pcloud.booksflow.form.mybatis.mapper.FormFieldDictMapper;
+import com.dromara.md.form.api.constant.FormFieldDictType;
+import com.dromara.md.form.api.dto.DictCodesDTO;
+import com.dromara.md.form.api.dto.FormFieldDictDTO;
+import com.dromara.md.form.api.dto.FormFieldDictQ;
+import com.dromara.md.form.api.vo.FormFieldDictDifyVo;
+import com.dromara.md.form.api.vo.FormFieldDictVO;
+import com.dromara.md.form.mybatis.entity.FormFieldDict;
+import com.dromara.md.form.mybatis.mapper.FormFieldDictMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.json.utils.JsonUtils;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormPrintConfigService.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormService.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormTemplateFieldService.java

@@ -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.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pcloud.booksflow.form.api.constant.FormTemplateFieldType;
-import com.pcloud.booksflow.form.api.dto.FormTemplateDTO;
-import com.pcloud.booksflow.form.mybatis.entity.FormTemplateField;
-import com.pcloud.booksflow.form.mybatis.mapper.FormTemplateFieldMapper;
+import com.dromara.md.form.api.constant.FormTemplateFieldType;
+import com.dromara.md.form.api.dto.FormTemplateDTO;
+import com.dromara.md.form.mybatis.entity.FormTemplateField;
+import com.dromara.md.form.mybatis.mapper.FormTemplateFieldMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.json.utils.JsonUtils;
 import org.dromara.common.tenant.helper.LoginHelper;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/FormTemplateService.java

@@ -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.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.toolkit.EncryptUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pcloud.booksflow.form.api.dto.FormTemplateDTO;
-import com.pcloud.booksflow.form.api.vo.FormTemplateVO;
-import com.pcloud.booksflow.form.mybatis.entity.Form;
-import com.pcloud.booksflow.form.mybatis.entity.FormTemplate;
-import com.pcloud.booksflow.form.mybatis.entity.FormTemplateField;
-import com.pcloud.booksflow.form.mybatis.mapper.FormTemplateMapper;
+import com.dromara.md.form.api.dto.FormTemplateDTO;
+import com.dromara.md.form.api.vo.FormTemplateVO;
+import com.dromara.md.form.mybatis.entity.Form;
+import com.dromara.md.form.mybatis.entity.FormTemplate;
+import com.dromara.md.form.mybatis.entity.FormTemplateField;
+import com.dromara.md.form.mybatis.mapper.FormTemplateMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.json.utils.JsonUtils;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/ModifyLogRecordService.java

@@ -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.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.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pcloud.booksflow.form.api.dto.ModifyLogRecordDTO;
-import com.pcloud.booksflow.form.mybatis.entity.ModifyLogRecord;
-import com.pcloud.booksflow.form.mybatis.mapper.ModifyLogRecordMapper;
+import com.dromara.md.form.api.dto.ModifyLogRecordDTO;
+import com.dromara.md.form.mybatis.entity.ModifyLogRecord;
+import com.dromara.md.form.mybatis.mapper.ModifyLogRecordMapper;
 import org.dromara.common.core.exception.ServiceException;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -72,13 +72,13 @@ public class ModifyLogRecordService extends ServiceImpl<ModifyLogRecordMapper, M
             .eq(ModifyLogRecord::getEntityId, entityId)
             .eq(ModifyLogRecord::getDeleted, 0)
             .orderByDesc(ModifyLogRecord::getId);
-        
+
         if (StrUtil.isNotBlank(formCode)) {
             queryWrapper.eq(ModifyLogRecord::getFormCode, formCode);
         }
-        
+
         Page<ModifyLogRecord> page = new Page<>(currentPage, numPerPage);
         return baseMapper.selectPage(page, queryWrapper);
     }
 
-}
+}

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/TenantInitStatusService.java

@@ -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.extension.service.impl.ServiceImpl;
-import com.pcloud.booksflow.form.mybatis.entity.TenantInitStatus;
-import com.pcloud.booksflow.form.mybatis.mapper.TenantInitStatusMapper;
+import com.dromara.md.form.mybatis.entity.TenantInitStatus;
+import com.dromara.md.form.mybatis.mapper.TenantInitStatusMapper;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/service/TenantInitializationService.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/TenantHelper.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/poi/ExcelTemplateProcessor.java

@@ -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.xssf.usermodel.XSSFCell;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/poi/ProcessorUtils.java

@@ -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.text.ParseException;

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-service/src/main/java/com/dromara/md/form/utils/poi/WordTemplateProcessor.java

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/pom.xml

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

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/com/dromara/md/form/AppContext.java

@@ -24,6 +24,6 @@
 //@EnableScheduling
 //@EnableEurekaClient
 //@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 {
 //}

ruoyi-modules/ruoyi-md-form/ruoyi-md-form-starter/src/main/java/com/dromara/md/form/config/BooksflowFormDataSourceConfig.java

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