fix:修正项目目录

pom.xml

@@ -4,13 +4,11 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	
-    <groupId>com.ruoyi</groupId>
-    <artifactId>ruoyi</artifactId>
+    <groupId>com.zkqy</groupId>
+    <artifactId>zkqy</artifactId>
     <version>3.8.5</version>
-
-    <name>ruoyi</name>
-    <url>http://www.ruoyi.vip</url>
-    <description>若依管理系统</description>
+    <name>zkqy</name>
+    <description>智能制造平台</description>
     
     <properties>
         <ruoyi.version>3.8.5</ruoyi.version>
@@ -35,7 +33,6 @@
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
-
             <!-- SpringBoot的依赖配置-->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
@@ -138,26 +135,26 @@
 
             <!-- 核心模块-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-framework</artifactId>
+                <groupId>com.zkqy</groupId>
+                <artifactId>zkqy-framework</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
             <!-- 核心模块-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-business</artifactId>
+                <groupId>com.zkqy</groupId>
+                <artifactId>zkqy-business</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
             <!-- 系统模块-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-system</artifactId>
+                <groupId>com.zkqy</groupId>
+                <artifactId>zkqy-system</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
             <!-- 通用工具-->
             <dependency>
-                <groupId>com.ruoyi</groupId>
-                <artifactId>ruoyi-common</artifactId>
+                <groupId>com.zkqy</groupId>
+                <artifactId>zkqy-common</artifactId>
                 <version>${ruoyi.version}</version>
             </dependency>
 
@@ -191,11 +188,11 @@
     </dependencyManagement>
 
     <modules>
-        <module>ruoyi-admin</module>
-        <module>ruoyi-framework</module>
-        <module>ruoyi-system</module>
-        <module>ruoyi-common</module>
-        <module>ruoyi-business</module>
+        <module>zkqy-admin</module>
+        <module>zkqy-framework</module>
+        <module>zkqy-system</module>
+        <module>zkqy-common</module>
+        <module>zkqy-business</module>
     </modules>
     <packaging>pom</packaging>
     <dependencies>

ruoyi-ui/.env.development

@@ -11,13 +11,13 @@ VUE_APP_BASE_API = '/dev-api'
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
 
 #本项目地址
-VUE_APP_BASE_API1 = 'http://192.168.110.70:8066/'
+VUE_APP_BASE_API1 = 'http://192.168.110.83:8066/'
 
 #数据引擎模块IP
-VUE_APP_BASE_API2 = 'http://192.168.110.59:8099/'
+VUE_APP_BASE_API2 = 'http://192.168.110.83:8099/'
 
 #表单引擎模块IPe
-VUE_APP_BASE_API3 = 'http://192.168.110.59:8088/'
+VUE_APP_BASE_API3 = 'http://192.168.110.83:8088/'
 
 #流程引擎模块IP
 VUE_APP_BASE_API4 = 'http://192.168.110.59:8055/'

ruoyi-ui/src/views/monitor/job/index.vue

@@ -301,7 +301,7 @@
                 <el-tooltip placement="top">
                   <div slot="content">
                     Bean调用示例：ryTask.ryParams('ry')
-                    <br />Class类调用示例：com.ruoyi.quartz.task.RyTask.ryParams('ry')
+                    <br />Class类调用示例：com.zkqy.quartz.task.RyTask.ryParams('ry')
                     <br />参数说明：支持字符串，布尔类型，长整型，浮点型，整型
                   </div>
                   <i class="el-icon-question"></i>

ruoyi-ui/src/views/tool/gen/genInfoForm.vue

@@ -15,7 +15,7 @@
         <el-form-item prop="packageName">
           <span slot="label">
             生成包路径
-            <el-tooltip content="生成在哪个java包下，例如 com.ruoyi.system" placement="top">
+            <el-tooltip content="生成在哪个java包下，例如 com.zkqy.system" placement="top">
               <i class="el-icon-question"></i>
             </el-tooltip>
           </span>

ruoyi-ui/vue.config.js

@@ -38,7 +38,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://192.168.110.70:8066`,
+        target: `http://192.168.110.83:8066`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

ruoyi-admin/pom.xml → zkqy-admin/pom.xml

@@ -2,15 +2,16 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
     <parent>
-        <artifactId>ruoyi</artifactId>
-        <groupId>com.ruoyi</groupId>
+        <artifactId>zkqy</artifactId>
+        <groupId>com.zkqy</groupId>
         <version>3.8.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
-    <artifactId>ruoyi-admin</artifactId>
-
+    <artifactId>zkqy-admin</artifactId>
+    <name>zkqy-admin</name>
     <description>
         web服务入口
     </description>
@@ -44,12 +45,12 @@
         </dependency>
         <!-- 核心模块-->
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-framework</artifactId>
+            <groupId>com.zkqy</groupId>
+            <artifactId>zkqy-framework</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-business</artifactId>
+            <groupId>com.zkqy</groupId>
+            <artifactId>zkqy-business</artifactId>
             <version>3.8.5</version>
         </dependency>
         <dependency>

ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java → zkqy-admin/src/main/java/com/zkqy/ZkqyApplication.java

@@ -1,4 +1,4 @@
-package com.ruoyi;
+package com.zkqy;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -10,13 +10,12 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
  * @author ruoyi
  */
 @SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
-public class RuoYiApplication
+public class ZkqyApplication
 {
     public static void main(String[] args)
     {
-        //System.setProperty("spring.devtools.restart.enabled", "false");
-        SpringApplication.run(RuoYiApplication.class, args);
-        System.out.println("(♥◠‿◠)ﾉﾞ  若依启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
+        SpringApplication.run(ZkqyApplication.class, args);
+        System.out.println("(♥◠‿◠)ﾉﾞ  中科擎云智能制造平台客户端后台启动成功   ლ(´ڡ`ლ)ﾞ  \n" +
                 " .-------.       ____     __        \n" +
                 " |  _ _   \\      \\   \\   /  /    \n" +
                 " | ( ' )  |       \\  _. /  '       \n" +

ruoyi-admin/src/main/java/com/ruoyi/RuoYiServletInitializer.java → zkqy-admin/src/main/java/com/zkqy/ZkqyServletInitializer.java

@@ -1,4 +1,4 @@
-package com.ruoyi;
+package com.zkqy;
 
 import org.springframework.boot.builder.SpringApplicationBuilder;
 import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
@@ -8,11 +8,11 @@ import org.springframework.boot.web.servlet.support.SpringBootServletInitializer
  * 
  * @author ruoyi
  */
-public class RuoYiServletInitializer extends SpringBootServletInitializer
+public class ZkqyServletInitializer extends SpringBootServletInitializer
 {
     @Override
     protected SpringApplicationBuilder configure(SpringApplicationBuilder application)
     {
-        return application.sources(RuoYiApplication.class);
+        return application.sources(ZkqyApplication.class);
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/common/CaptchaController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.common;
+package com.zkqy.web.controller.common;
 
 import java.awt.image.BufferedImage;
 import java.io.IOException;
@@ -11,14 +11,14 @@ import org.springframework.util.FastByteArrayOutputStream;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.google.code.kaptcha.Producer;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.sign.Base64;
-import com.ruoyi.common.utils.uuid.IdUtils;
-import com.ruoyi.system.service.ISysConfigService;
+import com.zkqy.common.config.RuoYiConfig;
+import com.zkqy.common.constant.CacheConstants;
+import com.zkqy.common.constant.Constants;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.redis.RedisCache;
+import com.zkqy.common.utils.sign.Base64;
+import com.zkqy.common.utils.uuid.IdUtils;
+import com.zkqy.system.service.ISysConfigService;
 
 /**
  * 验证码操作处理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonFileController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/common/CommonFileController.java

@@ -1,23 +1,23 @@
-package com.ruoyi.web.controller.common;
+package com.zkqy.web.controller.common;
 
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.TypeReference;
-import com.ruoyi.business.entity.CommonEntity;
-import com.ruoyi.business.entity.TableSql;
-import com.ruoyi.business.service.ICommonService;
-import com.ruoyi.business.service.ITableSqlService;
-import com.ruoyi.common.annotation.Anonymous;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.FileUtils;
-import com.ruoyi.framework.config.ServerConfig;
-import com.ruoyi.system.service.IDataSourceService;
-import com.ruoyi.web.controller.dragForm.CommonController;
+import com.zkqy.business.entity.CommonEntity;
+import com.zkqy.business.entity.TableSql;
+import com.zkqy.business.service.ICommonService;
+import com.zkqy.business.service.ITableSqlService;
+import com.zkqy.common.annotation.Anonymous;
+import com.zkqy.common.config.RuoYiConfig;
+import com.zkqy.common.constant.Constants;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.common.utils.file.FileUploadUtils;
+import com.zkqy.common.utils.file.FileUtils;
+import com.zkqy.framework.config.ServerConfig;
+import com.zkqy.system.service.IDataSourceService;
+import com.zkqy.web.controller.dragForm.CommonController;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,7 +33,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import static com.ruoyi.common.core.domain.AjaxResult.success;
+import static com.zkqy.common.core.domain.AjaxResult.success;
 
 /**
  * 通用请求处理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/CommonBtnController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/CommonBtnController.java

@@ -1,28 +1,27 @@
-package com.ruoyi.web.controller.dragForm;
+package com.zkqy.web.controller.dragForm;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.ruoyi.business.entity.CommonEntity;
-import com.ruoyi.business.entity.DragForm;
-import com.ruoyi.business.entity.DragTableBtn;
-import com.ruoyi.business.entity.DragTableGroup;
-import com.ruoyi.business.entity.vo.DragTableGroupVo;
-import com.ruoyi.business.entity.vo.DragTableVo;
-import com.ruoyi.business.mapper.DragTableBtnMapper;
-import com.ruoyi.business.mapper.DragTableBtnRelevanceMapper;
-import com.ruoyi.business.mapper.DragTableGroupMapper;
-import com.ruoyi.business.mapper.DragTableMapper;
-import com.ruoyi.business.service.ICommonService;
-import com.ruoyi.business.service.IDragFormService;
-import com.ruoyi.business.service.IDragTableBtnService;
-import com.ruoyi.business.service.IDragTableGroupService;
-import com.ruoyi.common.constant.ButtonTypeConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.bean.BeanUtils;
-import com.ruoyi.common.utils.form.FromUtils;
+import com.zkqy.business.entity.CommonEntity;
+import com.zkqy.business.entity.DragForm;
+import com.zkqy.business.entity.DragTableBtn;
+import com.zkqy.business.entity.DragTableGroup;
+import com.zkqy.business.entity.vo.DragTableGroupVo;
+import com.zkqy.business.entity.vo.DragTableVo;
+import com.zkqy.business.mapper.DragTableBtnMapper;
+import com.zkqy.business.mapper.DragTableBtnRelevanceMapper;
+import com.zkqy.business.mapper.DragTableGroupMapper;
+import com.zkqy.business.mapper.DragTableMapper;
+import com.zkqy.business.service.ICommonService;
+import com.zkqy.business.service.IDragFormService;
+import com.zkqy.business.service.IDragTableBtnService;
+import com.zkqy.common.constant.ButtonTypeConstants;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.utils.bean.BeanUtils;
+import com.zkqy.common.utils.form.FromUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/CommonController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/CommonController.java

@@ -1,15 +1,15 @@
-package com.ruoyi.web.controller.dragForm;
+package com.zkqy.web.controller.dragForm;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.ruoyi.business.entity.CommonEntity;
-import com.ruoyi.business.entity.DragForm;
-import com.ruoyi.business.entity.TableSql;
-import com.ruoyi.business.service.*;
-import com.ruoyi.common.constant.ButtonTypeConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.exception.tenantdatassource.TenantDataSource;
+import com.zkqy.business.entity.CommonEntity;
+import com.zkqy.business.entity.DragForm;
+import com.zkqy.business.entity.TableSql;
+import com.zkqy.business.service.*;
+import com.zkqy.common.constant.ButtonTypeConstants;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.exception.tenantdatassource.TenantDataSource;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import java.util.HashMap;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/DragFormController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/DragFormController.java

@@ -1,17 +1,13 @@
-package com.ruoyi.web.controller.dragForm;
+package com.zkqy.web.controller.dragForm;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.ruoyi.business.entity.DragForm;
-import com.ruoyi.business.service.IDragFormService;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.zkqy.business.entity.DragForm;
+import com.zkqy.business.service.IDragFormService;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/DragTableBtnController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/DragTableBtnController.java

@@ -1,17 +1,14 @@
-package com.ruoyi.web.controller.dragForm;
+package com.zkqy.web.controller.dragForm;
 
-import com.ruoyi.business.entity.DragTableBtn;
-import com.ruoyi.business.service.IDragTableBtnService;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.zkqy.business.entity.DragTableBtn;
+import com.zkqy.business.service.IDragTableBtnService;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+
 import java.util.List;
 
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/DragTableConditionController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/DragTableConditionController.java

@@ -1,12 +1,12 @@
-package com.ruoyi.web.controller.dragForm;
+package com.zkqy.web.controller.dragForm;
 
-import com.ruoyi.business.entity.CommonEntity;
-import com.ruoyi.business.service.IDragTableConditionService;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
+import com.zkqy.business.entity.CommonEntity;
+import com.zkqy.business.service.IDragTableConditionService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/DragTableController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/DragTableController.java

@@ -1,23 +1,17 @@
-package com.ruoyi.web.controller.dragForm;
+package com.zkqy.web.controller.dragForm;
 
-import com.ruoyi.business.entity.DragTable;
-import com.ruoyi.business.entity.vo.DragTableVo;
-import com.ruoyi.business.service.IDragTableBtnRelevanceService;
-import com.ruoyi.business.service.IDragTableService;
-import com.ruoyi.business.service.IDragTableStatisticService;
-import com.ruoyi.business.service.IDragTableStyleService;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.zkqy.business.entity.DragTable;
+import com.zkqy.business.service.IDragTableBtnRelevanceService;
+import com.zkqy.business.service.IDragTableService;
+import com.zkqy.business.service.IDragTableStatisticService;
+import com.zkqy.business.service.IDragTableStyleService;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 动态表格Controller

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/DragTableGroupController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/DragTableGroupController.java

@@ -1,21 +1,18 @@
-package com.ruoyi.web.controller.dragForm;
+package com.zkqy.web.controller.dragForm;
 
-import com.ruoyi.business.entity.CommonEntity;
-import com.ruoyi.business.entity.DragTableGroup;
-import com.ruoyi.business.entity.vo.DragTableGroupVo;
-import com.ruoyi.business.service.IDragTableGroupService;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.zkqy.business.entity.CommonEntity;
+import com.zkqy.business.entity.DragTableGroup;
+import com.zkqy.business.entity.vo.DragTableGroupVo;
+import com.zkqy.business.service.IDragTableGroupService;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+
 import java.util.List;
 
 /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/DragTableStatisticController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/DragTableStatisticController.java

@@ -1,15 +1,14 @@
-package com.ruoyi.web.controller.dragForm;
+package com.zkqy.web.controller.dragForm;
 
-import com.ruoyi.business.entity.CommonEntity;
-import com.ruoyi.business.entity.DragTableStatistic;
-import com.ruoyi.business.entity.vo.DragTableVo;
-import com.ruoyi.business.service.IDragTableStatisticService;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.zkqy.business.entity.CommonEntity;
+import com.zkqy.business.entity.DragTableStatistic;
+import com.zkqy.business.service.IDragTableStatisticService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/DragTableStyleController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/DragTableStyleController.java

@@ -1,14 +1,14 @@
-package com.ruoyi.web.controller.dragForm;
+package com.zkqy.web.controller.dragForm;
 
-import com.ruoyi.business.entity.DragTableStyle;
-import com.ruoyi.business.entity.vo.DragTableVo;
-import com.ruoyi.business.service.IDragTableStyleService;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.zkqy.business.entity.DragTableStyle;
+import com.zkqy.business.entity.vo.DragTableVo;
+import com.zkqy.business.service.IDragTableStyleService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/TableSqlController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/dragForm/TableSqlController.java

@@ -1,18 +1,14 @@
-package com.ruoyi.web.controller.dragForm;
+package com.zkqy.web.controller.dragForm;
 
-import com.ruoyi.business.entity.TableSql;
-import com.ruoyi.business.service.ITableSqlService;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.zkqy.business.entity.TableSql;
+import com.zkqy.business.service.ITableSqlService;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/CacheController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/CacheController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitor;
+package com.zkqy.web.controller.monitor;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -16,10 +16,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.SysCache;
+import com.zkqy.common.constant.CacheConstants;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.system.domain.SysCache;
 
 /**
  * 缓存监控

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/ServerController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/ServerController.java

@@ -1,11 +1,11 @@
-package com.ruoyi.web.controller.monitor;
+package com.zkqy.web.controller.monitor;
 
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.framework.web.domain.Server;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.framework.web.domain.Server;
 
 /**
  * 服务器监控

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysActivationLogController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysActivationLogController.java

@@ -1,13 +1,13 @@
-package com.ruoyi.web.controller.monitor;
+package com.zkqy.web.controller.monitor;
 
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysActivationCodeLog;
-import com.ruoyi.system.service.ISysActivationCodeLogService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.domain.SysActivationCodeLog;
+import com.zkqy.system.service.ISysActivationCodeLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysLogininforController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysLogininforController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitor;
+package com.zkqy.web.controller.monitor;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -10,15 +10,15 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.service.SysPasswordService;
-import com.ruoyi.system.domain.SysLogininfor;
-import com.ruoyi.system.service.ISysLogininforService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.framework.web.service.SysPasswordService;
+import com.zkqy.system.domain.SysLogininfor;
+import com.zkqy.system.service.ISysLogininforService;
 
 /**
  * 系统访问记录

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysOperlogController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitor;
+package com.zkqy.web.controller.monitor;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -10,14 +10,14 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysOperLog;
-import com.ruoyi.system.service.ISysOperLogService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.domain.SysOperLog;
+import com.zkqy.system.service.ISysOperLogService;
 
 /**
  * 操作日志记录

ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/monitor/SysUserOnlineController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.monitor;
+package com.zkqy.web.controller.monitor;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -11,17 +11,17 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.CacheConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.domain.SysUserOnline;
-import com.ruoyi.system.service.ISysUserOnlineService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.constant.CacheConstants;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.model.LoginUser;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.core.redis.RedisCache;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.system.domain.SysUserOnline;
+import com.zkqy.system.service.ISysUserOnlineService;
 
 /**
  * 在线用户监控

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/DataSourceController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/DataSourceController.java

@@ -1,12 +1,10 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.DataSource;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.system.service.IDataSourceService;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.DataSource;
+import com.zkqy.system.service.IDataSourceService;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysBpmNodeScriptController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysBpmNodeScriptController.java

@@ -1,10 +1,9 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -14,14 +13,14 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.SysBpmNodeScript;
-import com.ruoyi.system.service.ISysBpmNodeScriptService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.system.domain.SysBpmNodeScript;
+import com.zkqy.system.service.ISysBpmNodeScriptService;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.common.core.page.TableDataInfo;
 
 /**
  * 流程节点脚本Controller

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysConfigController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysConfig;
-import com.ruoyi.system.service.ISysConfigService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.domain.SysConfig;
+import com.zkqy.system.service.ISysConfigService;
 
 /**
  * 参数配置 信息操作处理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDeptController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 import org.apache.commons.lang3.ArrayUtils;
@@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.service.ISysDeptService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.constant.UserConstants;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.SysDept;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.system.service.ISysDeptService;
 
 /**
  * 部门信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDictDataController.java

@@ -1,10 +1,10 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.ArrayList;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.common.annotation.Anonymous;
+import com.zkqy.common.annotation.Anonymous;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
@@ -16,16 +16,16 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDictData;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.service.ISysDictDataService;
-import com.ruoyi.system.service.ISysDictTypeService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.SysDictData;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.service.ISysDictDataService;
+import com.zkqy.system.service.ISysDictTypeService;
 
 /**
  * 数据字典信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysDictTypeController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDictType;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.service.ISysDictTypeService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.SysDictType;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.service.ISysDictTypeService;
 
 /**
  * 数据字典信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysIndexController.java

@@ -1,10 +1,10 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.utils.StringUtils;
+import com.zkqy.common.config.RuoYiConfig;
+import com.zkqy.common.utils.StringUtils;
 
 /**
  * 首页

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysLoginController.java

@@ -1,31 +1,32 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 import java.util.Set;
 
-import com.ruoyi.common.core.domain.entity.DataSource;
-import com.ruoyi.common.core.domain.entity.SysTenant;
-import com.ruoyi.system.service.IDataSourceService;
-import com.ruoyi.system.service.impl.SysLogininforServiceImpl;
-import com.ruoyi.system.service.impl.SysTenantServiceImpl;
+import com.zkqy.common.core.domain.entity.DataSource;
+import com.zkqy.common.core.domain.entity.SysTenant;
+import com.zkqy.system.service.IDataSourceService;
+import com.zkqy.system.service.impl.SysTenantServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginBody;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.framework.web.service.SysLoginService;
-import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.system.service.ISysMenuService;
+import com.zkqy.common.constant.Constants;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.SysMenu;
+import com.zkqy.common.core.domain.entity.SysUser;
+import com.zkqy.common.core.domain.model.LoginBody;
+import com.zkqy.common.utils.SecurityUtils;
+import com.zkqy.framework.web.service.SysLoginService;
+import com.zkqy.framework.web.service.SysPermissionService;
+import com.zkqy.system.service.ISysMenuService;
 import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 
 /**
  * 登录验证
@@ -79,7 +80,10 @@ public class SysLoginController {
      * @return 结果
      */
     @PostMapping("/login")
-    public AjaxResult login(@RequestBody LoginBody loginBody) {
+    public AjaxResult login(@Valid @RequestBody LoginBody loginBody, BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return AjaxResult.error(bindingResult.getFieldError().getDefaultMessage());
+        }
         //校验租户状态?生成token
         AjaxResult ajax = AjaxResult.success();
         //校验不能是admin

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysMenuController.java

@@ -1,20 +1,19 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 
-import com.ruoyi.common.annotation.Anonymous;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.UserConstants;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysMenu;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.service.ISysMenuService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.constant.UserConstants;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.SysMenu;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.system.service.ISysMenuService;
 
 /**
  * 菜单信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysNoticeController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -12,13 +12,13 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.SysNotice;
-import com.ruoyi.system.service.ISysNoticeService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.system.domain.SysNotice;
+import com.zkqy.system.service.ISysNoticeService;
 
 /**
  * 公告 信息操作处理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysPostController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -13,14 +13,14 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.domain.SysPost;
-import com.ruoyi.system.service.ISysPostService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.domain.SysPost;
+import com.zkqy.system.service.ISysPostService;
 
 /**
  * 岗位信息操作处理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysProfileController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -9,19 +9,19 @@ 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.multipart.MultipartFile;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.config.RuoYiConfig;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.file.FileUploadUtils;
-import com.ruoyi.common.utils.file.MimeTypeUtils;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.service.ISysUserService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.config.RuoYiConfig;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.SysUser;
+import com.zkqy.common.core.domain.model.LoginUser;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.SecurityUtils;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.common.utils.file.FileUploadUtils;
+import com.zkqy.common.utils.file.MimeTypeUtils;
+import com.zkqy.framework.web.service.TokenService;
+import com.zkqy.system.service.ISysUserService;
 
 /**
  * 个人信息 业务处理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRegisterController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysRegisterController.java

@@ -1,15 +1,15 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.model.RegisterBody;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.framework.web.service.SysRegisterService;
-import com.ruoyi.system.service.ISysConfigService;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.model.RegisterBody;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.framework.web.service.SysRegisterService;
+import com.zkqy.system.service.ISysConfigService;
 
 /**
  * 注册验证

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysRoleController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
@@ -13,23 +13,23 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.domain.model.LoginUser;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.service.SysPermissionService;
-import com.ruoyi.framework.web.service.TokenService;
-import com.ruoyi.system.domain.SysUserRole;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.ISysUserService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.SysDept;
+import com.zkqy.common.core.domain.entity.SysRole;
+import com.zkqy.common.core.domain.entity.SysUser;
+import com.zkqy.common.core.domain.model.LoginUser;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.framework.web.service.SysPermissionService;
+import com.zkqy.framework.web.service.TokenService;
+import com.zkqy.system.domain.SysUserRole;
+import com.zkqy.system.service.ISysDeptService;
+import com.zkqy.system.service.ISysRoleService;
+import com.zkqy.system.service.ISysUserService;
 
 /**
  * 角色信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysTenantController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysTenantController.java

@@ -1,9 +1,9 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ruoyi.common.annotation.Anonymous;
+import com.zkqy.common.annotation.Anonymous;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -14,14 +14,14 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.core.domain.entity.SysTenant;
-import com.ruoyi.system.service.ISysTenantService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.core.domain.entity.SysTenant;
+import com.zkqy.system.service.ISysTenantService;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.common.core.page.TableDataInfo;
 
 /**
  * 租户信息Controller

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/system/SysUserController.java

@@ -1,11 +1,11 @@
-package com.ruoyi.web.controller.system;
+package com.zkqy.web.controller.system;
 
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 import com.alibaba.fastjson2.JSON;
-import com.ruoyi.common.annotation.Anonymous;
+import com.zkqy.common.annotation.Anonymous;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -19,21 +19,21 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.service.ISysDeptService;
-import com.ruoyi.system.service.ISysPostService;
-import com.ruoyi.system.service.ISysRoleService;
-import com.ruoyi.system.service.ISysUserService;
+import com.zkqy.common.annotation.Log;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.AjaxResult;
+import com.zkqy.common.core.domain.entity.SysDept;
+import com.zkqy.common.core.domain.entity.SysRole;
+import com.zkqy.common.core.domain.entity.SysUser;
+import com.zkqy.common.core.page.TableDataInfo;
+import com.zkqy.common.enums.BusinessType;
+import com.zkqy.common.utils.SecurityUtils;
+import com.zkqy.common.utils.StringUtils;
+import com.zkqy.common.utils.poi.ExcelUtil;
+import com.zkqy.system.service.ISysDeptService;
+import com.zkqy.system.service.ISysPostService;
+import com.zkqy.system.service.ISysRoleService;
+import com.zkqy.system.service.ISysUserService;
 
 /**
  * 用户信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java → zkqy-admin/src/main/java/com/zkqy/web/controller/tool/TestController.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.controller.tool;
+package com.zkqy.web.controller.tool;
 
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
@@ -12,9 +12,9 @@ import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.utils.StringUtils;
+import com.zkqy.common.core.controller.BaseController;
+import com.zkqy.common.core.domain.R;
+import com.zkqy.common.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

ruoyi-admin/src/main/java/com/ruoyi/web/core/config/SwaggerConfig.java → zkqy-admin/src/main/java/com/zkqy/web/core/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
-package com.ruoyi.web.core.config;
+package com.zkqy.web.core.config;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import com.ruoyi.common.config.RuoYiConfig;
+import com.zkqy.common.config.RuoYiConfig;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import springfox.documentation.builders.ApiInfoBuilder;

ruoyi-admin/src/main/resources/banner.txt → zkqy-admin/src/main/resources/banner.txt

@@ -1,4 +1,4 @@
-Application Version: ${ruoyi.version}
+Application Version: ${zkqy.version}
 Spring Boot Version: ${spring-boot.version}
 ////////////////////////////////////////////////////////////////////
 //                          _ooOoo_                               //

ruoyi-admin/src/main/resources/logback.xml → zkqy-admin/src/main/resources/logback.xml

@@ -72,7 +72,7 @@
     </appender>
 	
 	<!-- 系统模块日志级别控制  -->
-	<logger name="com.ruoyi" level="info" />
+	<logger name="com.zkqy" level="info" />
 	<!-- Spring日志级别控制  -->
 	<logger name="org.springframework" level="warn" />
 

ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml → zkqy-admin/src/main/resources/mybatis/mybatis-config.xml

@@ -17,6 +17,6 @@ PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
 		<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
 	</settings>
     <plugins>
-        <plugin interceptor="com.ruoyi.framework.aspectj.SqlInterceptor"/>
+        <plugin interceptor="com.zkqy.framework.aspectj.SqlInterceptor"/>
     </plugins>
 </configuration>

ruoyi-business/pom.xml → zkqy-business/pom.xml

@@ -3,22 +3,23 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>ruoyi</artifactId>
-        <groupId>com.ruoyi</groupId>
+        <artifactId>zkqy</artifactId>
+        <groupId>com.zkqy</groupId>
         <version>3.8.5</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <artifactId>zkqy-business</artifactId>
+    <name>zkqy-business</name>
 
-    <artifactId>ruoyi-business</artifactId>
     <dependencies>
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common</artifactId>
+            <groupId>com.zkqy</groupId>
+            <artifactId>zkqy-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-framework</artifactId>
+            <groupId>com.zkqy</groupId>
+            <artifactId>zkqy-framework</artifactId>
         </dependency>
         <dependency>
             <groupId>com.alibaba</groupId>

ruoyi-business/src/main/java/com/ruoyi/business/entity/CommonEntity.java → zkqy-business/src/main/java/com/zkqy/business/entity/CommonEntity.java

@@ -1,16 +1,10 @@
-package com.ruoyi.business.entity;
+package com.zkqy.business.entity;
 
-import com.alibaba.fastjson2.JSON;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.zkqy.common.core.domain.BaseEntity;
 
 import java.util.List;
 import java.util.Map;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-
 
 /**
  * 通用实体

ruoyi-business/src/main/java/com/ruoyi/business/entity/DragForm.java → zkqy-business/src/main/java/com/zkqy/business/entity/DragForm.java

@@ -1,7 +1,7 @@
-package com.ruoyi.business.entity;
+package com.zkqy.business.entity;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.zkqy.common.annotation.Excel;
+import com.zkqy.common.core.domain.BaseEntity;
 
 /**
  * 动态表单

ruoyi-business/src/main/java/com/ruoyi/business/entity/DragTable.java → zkqy-business/src/main/java/com/zkqy/business/entity/DragTable.java

@@ -1,7 +1,7 @@
-package com.ruoyi.business.entity;
+package com.zkqy.business.entity;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.zkqy.common.annotation.Excel;
+import com.zkqy.common.core.domain.BaseEntity;
 
 /**
  * 动态表格对象 drag_table

ruoyi-business/src/main/java/com/ruoyi/business/entity/DragTableBtn.java → zkqy-business/src/main/java/com/zkqy/business/entity/DragTableBtn.java

@@ -1,6 +1,6 @@
-package com.ruoyi.business.entity;
+package com.zkqy.business.entity;
 
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.zkqy.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

ruoyi-business/src/main/java/com/ruoyi/business/entity/DragTableBtnRelevance.java → zkqy-business/src/main/java/com/zkqy/business/entity/DragTableBtnRelevance.java

@@ -1,7 +1,7 @@
-package com.ruoyi.business.entity;
+package com.zkqy.business.entity;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.zkqy.common.annotation.Excel;
+import com.zkqy.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

ruoyi-business/src/main/java/com/ruoyi/business/entity/DragTableCondition.java → zkqy-business/src/main/java/com/zkqy/business/entity/DragTableCondition.java

@@ -1,7 +1,7 @@
-package com.ruoyi.business.entity;
+package com.zkqy.business.entity;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.zkqy.common.annotation.Excel;
+import com.zkqy.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

ruoyi-business/src/main/java/com/ruoyi/business/entity/DragTableForm.java → zkqy-business/src/main/java/com/zkqy/business/entity/DragTableForm.java

@@ -1,6 +1,6 @@
-package com.ruoyi.business.entity;
+package com.zkqy.business.entity;
 
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.zkqy.common.core.domain.BaseEntity;
 
 /**
  * 动态表格表达关联表 drag_table_form

ruoyi-business/src/main/java/com/ruoyi/business/entity/DragTableGroup.java → zkqy-business/src/main/java/com/zkqy/business/entity/DragTableGroup.java

@@ -1,7 +1,7 @@
-package com.ruoyi.business.entity;
+package com.zkqy.business.entity;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.zkqy.common.annotation.Excel;
+import com.zkqy.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

ruoyi-business/src/main/java/com/ruoyi/business/entity/DragTableStatistic.java → zkqy-business/src/main/java/com/zkqy/business/entity/DragTableStatistic.java

@@ -1,7 +1,7 @@
-package com.ruoyi.business.entity;
+package com.zkqy.business.entity;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.zkqy.common.annotation.Excel;
+import com.zkqy.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

ruoyi-business/src/main/java/com/ruoyi/business/entity/DragTableStyle.java → zkqy-business/src/main/java/com/zkqy/business/entity/DragTableStyle.java

@@ -1,6 +1,6 @@
-package com.ruoyi.business.entity;
+package com.zkqy.business.entity;
 
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.zkqy.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

ruoyi-business/src/main/java/com/ruoyi/business/entity/TableInfo.java → zkqy-business/src/main/java/com/zkqy/business/entity/TableInfo.java

@@ -1,4 +1,4 @@
-package com.ruoyi.business.entity;
+package com.zkqy.business.entity;
 
 
 

ruoyi-business/src/main/java/com/ruoyi/business/entity/TableSql.java → zkqy-business/src/main/java/com/zkqy/business/entity/TableSql.java

@@ -1,7 +1,7 @@
-package com.ruoyi.business.entity;
+package com.zkqy.business.entity;
 
-import com.ruoyi.common.annotation.Excel;
-import com.ruoyi.common.core.domain.BaseEntity;
+import com.zkqy.common.annotation.Excel;
+import com.zkqy.common.core.domain.BaseEntity;
 
 /**
  * table 联合查询sql存储对象 table_sql

ruoyi-business/src/main/java/com/ruoyi/business/entity/vo/DragTableGroupVo.java → zkqy-business/src/main/java/com/zkqy/business/entity/vo/DragTableGroupVo.java

@@ -1,5 +1,5 @@
-package com.ruoyi.business.entity.vo;
-import com.ruoyi.common.core.domain.BaseEntity;
+package com.zkqy.business.entity.vo;
+import com.zkqy.common.core.domain.BaseEntity;
 
 import java.util.List;
 

ruoyi-business/src/main/java/com/ruoyi/business/entity/vo/DragTableVo.java → zkqy-business/src/main/java/com/zkqy/business/entity/vo/DragTableVo.java

@@ -1,6 +1,6 @@
-package com.ruoyi.business.entity.vo;
+package com.zkqy.business.entity.vo;
 
-import com.ruoyi.business.entity.*;
+import com.zkqy.business.entity.*;
 
 import java.util.List;
 import java.util.Map;

ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/MetaVo.java → zkqy-business/src/main/java/com/zkqy/business/entity/vo/MetaVo.java

@@ -1,6 +1,6 @@
-package com.ruoyi.system.domain.vo;
+package com.zkqy.business.entity.vo;
 
-import com.ruoyi.common.utils.StringUtils;
+import com.zkqy.common.utils.StringUtils;
 
 /**
  * 路由显示信息

ruoyi-business/src/main/java/com/ruoyi/business/entity/vo/RouterVo.java → zkqy-business/src/main/java/com/zkqy/business/entity/vo/RouterVo.java

@@ -1,4 +1,4 @@
-package com.ruoyi.business.entity.vo;
+package com.zkqy.business.entity.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 

ruoyi-business/src/main/java/com/ruoyi/business/entity/vo/TableInfoVO.java → zkqy-business/src/main/java/com/zkqy/business/entity/vo/TableInfoVO.java

@@ -1,4 +1,4 @@
-package com.ruoyi.business.entity.vo;
+package com.zkqy.business.entity.vo;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;

ruoyi-business/src/main/java/com/ruoyi/business/mapper/CommonMapper.java → zkqy-business/src/main/java/com/zkqy/business/mapper/CommonMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.business.mapper;
+package com.zkqy.business.mapper;
 
-import com.ruoyi.business.entity.CommonEntity;
+import com.zkqy.business.entity.CommonEntity;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

ruoyi-business/src/main/java/com/ruoyi/business/mapper/DragFormMapper.java → zkqy-business/src/main/java/com/zkqy/business/mapper/DragFormMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.business.mapper;
+package com.zkqy.business.mapper;
 
-import com.ruoyi.business.entity.DragForm;
+import com.zkqy.business.entity.DragForm;
 
 import java.util.List;
 

ruoyi-business/src/main/java/com/ruoyi/business/mapper/DragTableBtnMapper.java → zkqy-business/src/main/java/com/zkqy/business/mapper/DragTableBtnMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.business.mapper;
+package com.zkqy.business.mapper;
 
 
-import com.ruoyi.business.entity.DragTableBtn;
+import com.zkqy.business.entity.DragTableBtn;
 
 import java.util.List;
 

ruoyi-business/src/main/java/com/ruoyi/business/mapper/DragTableBtnRelevanceMapper.java → zkqy-business/src/main/java/com/zkqy/business/mapper/DragTableBtnRelevanceMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.business.mapper;
+package com.zkqy.business.mapper;
 
 
-import com.ruoyi.business.entity.DragTableBtnRelevance;
+import com.zkqy.business.entity.DragTableBtnRelevance;
 
 import java.util.List;
 

ruoyi-business/src/main/java/com/ruoyi/business/mapper/DragTableConditionMapper.java → zkqy-business/src/main/java/com/zkqy/business/mapper/DragTableConditionMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.business.mapper;
+package com.zkqy.business.mapper;
 
-import com.ruoyi.business.entity.CommonEntity;
-import com.ruoyi.business.entity.DragTableCondition;
+import com.zkqy.business.entity.CommonEntity;
+import com.zkqy.business.entity.DragTableCondition;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.Map;

ruoyi-business/src/main/java/com/ruoyi/business/mapper/DragTableFormMapper.java → zkqy-business/src/main/java/com/zkqy/business/mapper/DragTableFormMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.business.mapper;
+package com.zkqy.business.mapper;
 
-import com.ruoyi.business.entity.DragTableForm;
+import com.zkqy.business.entity.DragTableForm;
 
 public interface DragTableFormMapper {
 

ruoyi-business/src/main/java/com/ruoyi/business/mapper/DragTableGroupMapper.java → zkqy-business/src/main/java/com/zkqy/business/mapper/DragTableGroupMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.business.mapper;
+package com.zkqy.business.mapper;
 
-import com.ruoyi.business.entity.DragTableGroup;
+import com.zkqy.business.entity.DragTableGroup;
 
 import java.util.List;
 

ruoyi-business/src/main/java/com/ruoyi/business/mapper/DragTableMapper.java → zkqy-business/src/main/java/com/zkqy/business/mapper/DragTableMapper.java

@@ -1,8 +1,7 @@
-package com.ruoyi.business.mapper;
+package com.zkqy.business.mapper;
 
-import com.ruoyi.business.entity.DragTable;
-import com.ruoyi.business.entity.DragTableGroup;
-import com.ruoyi.business.entity.vo.DragTableVo;
+import com.zkqy.business.entity.DragTable;
+import com.zkqy.business.entity.vo.DragTableVo;
 import java.util.List;
 
 /**

ruoyi-business/src/main/java/com/ruoyi/business/mapper/DragTableStatisticMapper.java → zkqy-business/src/main/java/com/zkqy/business/mapper/DragTableStatisticMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.business.mapper;
+package com.zkqy.business.mapper;
 
 
-import com.ruoyi.business.entity.DragTableStatistic;
+import com.zkqy.business.entity.DragTableStatistic;
 
 import java.util.List;
 

ruoyi-business/src/main/java/com/ruoyi/business/mapper/DragTableStyleMapper.java → zkqy-business/src/main/java/com/zkqy/business/mapper/DragTableStyleMapper.java

@@ -1,7 +1,7 @@
-package com.ruoyi.business.mapper;
+package com.zkqy.business.mapper;
 
 
-import com.ruoyi.business.entity.DragTableStyle;
+import com.zkqy.business.entity.DragTableStyle;
 
 import java.util.List;
 

ruoyi-business/src/main/java/com/ruoyi/business/mapper/TableInfoMapper.java → zkqy-business/src/main/java/com/zkqy/business/mapper/TableInfoMapper.java

@@ -1,8 +1,8 @@
-package com.ruoyi.business.mapper;
+package com.zkqy.business.mapper;
 
 
-import com.ruoyi.business.entity.TableInfo;
-import com.ruoyi.business.entity.vo.TableInfoVO;
+import com.zkqy.business.entity.TableInfo;
+import com.zkqy.business.entity.vo.TableInfoVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;

ruoyi-business/src/main/java/com/ruoyi/business/mapper/TableSqlMapper.java → zkqy-business/src/main/java/com/zkqy/business/mapper/TableSqlMapper.java

@@ -1,6 +1,6 @@
-package com.ruoyi.business.mapper;
+package com.zkqy.business.mapper;
 
-import com.ruoyi.business.entity.TableSql;
+import com.zkqy.business.entity.TableSql;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

ruoyi-business/src/main/java/com/ruoyi/business/service/ICommonService.java → zkqy-business/src/main/java/com/zkqy/business/service/ICommonService.java

@@ -1,8 +1,8 @@
-package com.ruoyi.business.service;
+package com.zkqy.business.service;
 
 
-import com.ruoyi.business.entity.CommonEntity;
-import com.ruoyi.business.entity.TableSql;
+import com.zkqy.business.entity.CommonEntity;
+import com.zkqy.business.entity.TableSql;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;

ruoyi-business/src/main/java/com/ruoyi/business/service/IDragFormService.java → zkqy-business/src/main/java/com/zkqy/business/service/IDragFormService.java

@@ -1,10 +1,9 @@
-package com.ruoyi.business.service;
+package com.zkqy.business.service;
 
 
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.ruoyi.business.entity.DragForm;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.zkqy.business.entity.DragForm;
 
 import java.util.List;
 

ruoyi-business/src/main/java/com/ruoyi/business/service/IDragTableBtnRelevanceService.java → zkqy-business/src/main/java/com/zkqy/business/service/IDragTableBtnRelevanceService.java

@@ -1,8 +1,8 @@
-package com.ruoyi.business.service;
+package com.zkqy.business.service;
 
 
-import com.ruoyi.business.entity.DragTableBtnRelevance;
-import com.ruoyi.business.entity.vo.DragTableVo;
+import com.zkqy.business.entity.DragTableBtnRelevance;
+import com.zkqy.business.entity.vo.DragTableVo;
 
 import java.util.List;
 

ruoyi-business/src/main/java/com/ruoyi/business/service/IDragTableBtnService.java → zkqy-business/src/main/java/com/zkqy/business/service/IDragTableBtnService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.business.service;
+package com.zkqy.business.service;
 
 
-import com.ruoyi.business.entity.DragTableBtn;
+import com.zkqy.business.entity.DragTableBtn;
 
 import java.util.List;
 

ruoyi-business/src/main/java/com/ruoyi/business/service/IDragTableConditionService.java → zkqy-business/src/main/java/com/zkqy/business/service/IDragTableConditionService.java

@@ -1,7 +1,7 @@
-package com.ruoyi.business.service;
+package com.zkqy.business.service;
 
 
-import com.ruoyi.business.entity.CommonEntity;
+import com.zkqy.business.entity.CommonEntity;
 
 import java.util.List;
 

ruoyi-business/src/main/java/com/ruoyi/business/service/IDragTableGroupService.java → zkqy-business/src/main/java/com/zkqy/business/service/IDragTableGroupService.java

@@ -1,8 +1,8 @@
-package com.ruoyi.business.service;
+package com.zkqy.business.service;
 
 
-import com.ruoyi.business.entity.DragTableGroup;
-import com.ruoyi.business.entity.vo.DragTableGroupVo;
+import com.zkqy.business.entity.DragTableGroup;
+import com.zkqy.business.entity.vo.DragTableGroupVo;
 
 import java.util.List;
 

ruoyi-business/src/main/java/com/ruoyi/business/service/IDragTableService.java → zkqy-business/src/main/java/com/zkqy/business/service/IDragTableService.java

@@ -1,10 +1,9 @@
-package com.ruoyi.business.service;
+package com.zkqy.business.service;
 
 
-import com.ruoyi.business.entity.CommonEntity;
-import com.ruoyi.business.entity.DragTable;
-import com.ruoyi.business.entity.vo.DragTableGroupVo;
-import com.ruoyi.business.entity.vo.DragTableVo;
+import com.zkqy.business.entity.CommonEntity;
+import com.zkqy.business.entity.DragTable;
+import com.zkqy.business.entity.vo.DragTableVo;
 
 import java.util.List;
 

ruoyi-business/src/main/java/com/ruoyi/business/service/IDragTableStatisticService.java → zkqy-business/src/main/java/com/zkqy/business/service/IDragTableStatisticService.java

@@ -1,8 +1,7 @@
-package com.ruoyi.business.service;
+package com.zkqy.business.service;
 
-import com.ruoyi.business.entity.CommonEntity;
-import com.ruoyi.business.entity.DragTableStatistic;
-import com.ruoyi.business.entity.vo.DragTableVo;
+import com.zkqy.business.entity.CommonEntity;
+import com.zkqy.business.entity.DragTableStatistic;
 
 import java.util.List;
 import java.util.Map;

ruoyi-business/src/main/java/com/ruoyi/business/service/IDragTableStyleService.java → zkqy-business/src/main/java/com/zkqy/business/service/IDragTableStyleService.java

@@ -1,9 +1,9 @@
-package com.ruoyi.business.service;
+package com.zkqy.business.service;
 
 
 
-import com.ruoyi.business.entity.DragTableStyle;
-import com.ruoyi.business.entity.vo.DragTableVo;
+import com.zkqy.business.entity.DragTableStyle;
+import com.zkqy.business.entity.vo.DragTableVo;
 
 import java.util.List;
 

ruoyi-business/src/main/java/com/ruoyi/business/service/ITableSqlService.java → zkqy-business/src/main/java/com/zkqy/business/service/ITableSqlService.java

@@ -1,9 +1,9 @@
-package com.ruoyi.business.service;
+package com.zkqy.business.service;
 
 
 
 
-import com.ruoyi.business.entity.TableSql;
+import com.zkqy.business.entity.TableSql;
 import java.util.List;
 
 /**

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/CommonServiceImpl.java → zkqy-business/src/main/java/com/zkqy/business/service/impl/CommonServiceImpl.java

@@ -1,17 +1,17 @@
-package com.ruoyi.business.service.impl;
+package com.zkqy.business.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ruoyi.business.entity.CommonEntity;
-import com.ruoyi.business.entity.TableSql;
-import com.ruoyi.business.mapper.CommonMapper;
-import com.ruoyi.business.mapper.TableSqlMapper;
-import com.ruoyi.business.service.ICommonService;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.zkqy.business.entity.CommonEntity;
+import com.zkqy.business.entity.TableSql;
+import com.zkqy.business.mapper.CommonMapper;
+import com.zkqy.business.mapper.TableSqlMapper;
+import com.zkqy.business.service.ICommonService;
+import com.zkqy.common.utils.DateUtils;
+import com.zkqy.common.utils.SecurityUtils;
 import org.apache.poi.xssf.usermodel.XSSFRow;
 import org.apache.poi.xssf.usermodel.XSSFSheet;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -23,7 +23,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static com.ruoyi.common.utils.StringUtils.*;
+import static com.zkqy.common.utils.StringUtils.*;
 
 
 @Service

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/DragFormServiceImpl.java → zkqy-business/src/main/java/com/zkqy/business/service/impl/DragFormServiceImpl.java

@@ -1,12 +1,12 @@
-package com.ruoyi.business.service.impl;
+package com.zkqy.business.service.impl;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.gson.Gson;
-import com.ruoyi.business.entity.DragForm;
-import com.ruoyi.business.mapper.CommonMapper;
-import com.ruoyi.business.mapper.DragFormMapper;
-import com.ruoyi.business.service.IDragFormService;
+import com.zkqy.business.entity.DragForm;
+import com.zkqy.business.mapper.CommonMapper;
+import com.zkqy.business.mapper.DragFormMapper;
+import com.zkqy.business.service.IDragFormService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/DragTableBtnRelevanceServiceImpl.java → zkqy-business/src/main/java/com/zkqy/business/service/impl/DragTableBtnRelevanceServiceImpl.java

@@ -1,10 +1,10 @@
-package com.ruoyi.business.service.impl;
+package com.zkqy.business.service.impl;
 
 
-import com.ruoyi.business.entity.DragTableBtnRelevance;
-import com.ruoyi.business.entity.vo.DragTableVo;
-import com.ruoyi.business.mapper.DragTableBtnRelevanceMapper;
-import com.ruoyi.business.service.IDragTableBtnRelevanceService;
+import com.zkqy.business.entity.DragTableBtnRelevance;
+import com.zkqy.business.entity.vo.DragTableVo;
+import com.zkqy.business.mapper.DragTableBtnRelevanceMapper;
+import com.zkqy.business.service.IDragTableBtnRelevanceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/DragTableBtnServiceImpl.java → zkqy-business/src/main/java/com/zkqy/business/service/impl/DragTableBtnServiceImpl.java

@@ -1,10 +1,10 @@
-package com.ruoyi.business.service.impl;
+package com.zkqy.business.service.impl;
 
-import com.ruoyi.business.entity.DragTableBtn;
-import com.ruoyi.business.mapper.DragTableBtnMapper;
-import com.ruoyi.business.service.IDragTableBtnService;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.zkqy.business.entity.DragTableBtn;
+import com.zkqy.business.mapper.DragTableBtnMapper;
+import com.zkqy.business.service.IDragTableBtnService;
+import com.zkqy.common.utils.DateUtils;
+import com.zkqy.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/DragTableConditionServiceImpl.java → zkqy-business/src/main/java/com/zkqy/business/service/impl/DragTableConditionServiceImpl.java

@@ -1,10 +1,10 @@
-package com.ruoyi.business.service.impl;
+package com.zkqy.business.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.business.entity.CommonEntity;
-import com.ruoyi.business.mapper.DragTableConditionMapper;
-import com.ruoyi.business.service.IDragTableConditionService;
+import com.zkqy.business.entity.CommonEntity;
+import com.zkqy.business.mapper.DragTableConditionMapper;
+import com.zkqy.business.service.IDragTableConditionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/DragTableGroupServiceImpl.java → zkqy-business/src/main/java/com/zkqy/business/service/impl/DragTableGroupServiceImpl.java

@@ -1,19 +1,19 @@
-package com.ruoyi.business.service.impl;
+package com.zkqy.business.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.business.entity.DragTable;
-import com.ruoyi.business.entity.DragTableCondition;
-import com.ruoyi.business.entity.DragTableGroup;
-import com.ruoyi.business.entity.TableSql;
-import com.ruoyi.business.entity.vo.DragTableGroupVo;
-import com.ruoyi.business.entity.vo.DragTableVo;
-import com.ruoyi.business.mapper.DragTableConditionMapper;
-import com.ruoyi.business.mapper.DragTableGroupMapper;
-import com.ruoyi.business.mapper.DragTableMapper;
-import com.ruoyi.business.mapper.TableSqlMapper;
-import com.ruoyi.business.service.IDragTableGroupService;
+import com.zkqy.business.entity.DragTable;
+import com.zkqy.business.entity.DragTableCondition;
+import com.zkqy.business.entity.DragTableGroup;
+import com.zkqy.business.entity.TableSql;
+import com.zkqy.business.entity.vo.DragTableGroupVo;
+import com.zkqy.business.entity.vo.DragTableVo;
+import com.zkqy.business.mapper.DragTableConditionMapper;
+import com.zkqy.business.mapper.DragTableGroupMapper;
+import com.zkqy.business.mapper.DragTableMapper;
+import com.zkqy.business.mapper.TableSqlMapper;
+import com.zkqy.business.service.IDragTableGroupService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/DragTableServiceImpl.java → zkqy-business/src/main/java/com/zkqy/business/service/impl/DragTableServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.business.service.impl;
+package com.zkqy.business.service.impl;
 
-import com.ruoyi.business.entity.*;
-import com.ruoyi.business.entity.vo.DragTableVo;
-import com.ruoyi.business.mapper.*;
-import com.ruoyi.business.service.IDragTableService;
+import com.zkqy.business.entity.*;
+import com.zkqy.business.entity.vo.DragTableVo;
+import com.zkqy.business.mapper.*;
+import com.zkqy.business.service.IDragTableService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.Resource;

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/DragTableStatisticServiceImpl.java → zkqy-business/src/main/java/com/zkqy/business/service/impl/DragTableStatisticServiceImpl.java

@@ -1,20 +1,16 @@
-package com.ruoyi.business.service.impl;
+package com.zkqy.business.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
-import com.ruoyi.business.entity.CommonEntity;
-import com.ruoyi.business.entity.DragTableStatistic;
-import com.ruoyi.business.entity.TableSql;
-import com.ruoyi.business.entity.vo.DragTableVo;
-import com.ruoyi.business.mapper.CommonMapper;
-import com.ruoyi.business.mapper.DragTableStatisticMapper;
-import com.ruoyi.business.mapper.TableSqlMapper;
-import com.ruoyi.business.service.IDragTableStatisticService;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.zkqy.business.entity.CommonEntity;
+import com.zkqy.business.entity.DragTableStatistic;
+import com.zkqy.business.entity.TableSql;
+import com.zkqy.business.mapper.CommonMapper;
+import com.zkqy.business.mapper.DragTableStatisticMapper;
+import com.zkqy.business.mapper.TableSqlMapper;
+import com.zkqy.business.service.IDragTableStatisticService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/DragTableStyleServiceImpl.java → zkqy-business/src/main/java/com/zkqy/business/service/impl/DragTableStyleServiceImpl.java

@@ -1,11 +1,11 @@
-package com.ruoyi.business.service.impl;
+package com.zkqy.business.service.impl;
 
-import com.ruoyi.business.entity.DragTableStyle;
-import com.ruoyi.business.entity.vo.DragTableVo;
-import com.ruoyi.business.mapper.DragTableStyleMapper;
-import com.ruoyi.business.service.IDragTableStyleService;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.zkqy.business.entity.DragTableStyle;
+import com.zkqy.business.entity.vo.DragTableVo;
+import com.zkqy.business.mapper.DragTableStyleMapper;
+import com.zkqy.business.service.IDragTableStyleService;
+import com.zkqy.common.utils.DateUtils;
+import com.zkqy.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/TableSqlServiceImpl.java → zkqy-business/src/main/java/com/zkqy/business/service/impl/TableSqlServiceImpl.java

@@ -1,10 +1,8 @@
-package com.ruoyi.business.service.impl;
+package com.zkqy.business.service.impl;
 
-import com.ruoyi.business.entity.TableSql;
-import com.ruoyi.business.mapper.TableSqlMapper;
-import com.ruoyi.business.service.ITableSqlService;
-import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.common.utils.SecurityUtils;
+import com.zkqy.business.entity.TableSql;
+import com.zkqy.business.mapper.TableSqlMapper;
+import com.zkqy.business.service.ITableSqlService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

ruoyi-business/src/main/resources/mapper/common/CommonMapper.xml → zkqy-business/src/main/resources/mapper/common/CommonMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.business.mapper.CommonMapper">
+<mapper namespace="com.zkqy.business.mapper.CommonMapper">
 
-    <resultMap id="retMap" type="com.ruoyi.business.entity.CommonEntity" autoMapping="true">
+    <resultMap id="retMap" type="com.zkqy.business.entity.CommonEntity" autoMapping="true">
         <collection property="resultMap" ofType="map" autoMapping="true"
                     javaType="map"></collection>
     </resultMap>