[Initial] 修改包名

src/main/java/com/tykj/base/aop/EntityHandle.java

-package com.tykj.datawarehouse.base.aop;
+package com.tykj.base.aop;
 
 
-import com.tykj.datawarehouse.base.entity.BaseEntity;
+
+import com.tykj.base.entity.BaseEntity;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
@@ -18,7 +19,7 @@ import static java.util.Objects.isNull;
 @Component
 public class EntityHandle {
 
-    @Before("execution(* org.springframework.data.repository.CrudRepository.save(..)) && args(com.tykj.datawarehouse.base.entity.BaseEntity))")
+    @Before("execution(* org.springframework.data.repository.CrudRepository.save(..)) && args(com.tykj.base.entity.BaseEntity))")
     public void checkTimes(JoinPoint point) {
         Object[] args = point.getArgs();
         for (Object arg : args) {

src/main/java/com/tykj/base/config/Java8TimeConfig.java

-package com.tykj.datawarehouse.base.config;
+package com.tykj.base.config;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
@@ -8,7 +8,8 @@ import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
 import com.fasterxml.jackson.module.paramnames.ParameterNamesModule;
-import com.tykj.datawarehouse.base.util.DateFormatUtil;
+
+import com.tykj.base.util.DateFormatUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/com/tykj/base/config/WebMvcConfig.java

-package com.tykj.datawarehouse.base.config;
+package com.tykj.base.config;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

src/main/java/com/tykj/base/consumer/FourComsumer.java

-package com.tykj.datawarehouse.base.consumer;
+package com.tykj.base.consumer;
 
 import java.util.Objects;
 

src/main/java/com/tykj/base/entity/BaseEntity.java

-package com.tykj.datawarehouse.base.entity;
+package com.tykj.base.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/tykj/base/entity/XMQGenerator.java

-package com.tykj.datawarehouse.base.entity;
+package com.tykj.base.entity;
 
 import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.id.SequenceGenerator;

src/main/java/com/tykj/base/page/JpaCustomOrder.java

-package com.tykj.datawarehouse.base.page;
+package com.tykj.base.page;
 
 import lombok.Data;
 import org.springframework.data.domain.Sort;

src/main/java/com/tykj/base/page/JpaCustomPage.java

-package com.tykj.datawarehouse.base.page;
+package com.tykj.base.page;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.tykj.base.page.JpaCustomOrder;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.util.Assert;

src/main/java/com/tykj/base/result/ApiException.java

-package com.tykj.datawarehouse.base.result;
+package com.tykj.base.result;
 
 import org.springframework.http.ResponseEntity;
 

src/main/java/com/tykj/base/result/GlobalExceptionHandler.java

-package com.tykj.datawarehouse.base.result;
+package com.tykj.base.result;
 
 import com.fasterxml.jackson.databind.exc.InvalidFormatException;
+import com.tykj.base.result.ApiException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;

src/main/java/com/tykj/base/result/ResultObj.java

-package com.tykj.datawarehouse.base.result;
+package com.tykj.base.result;
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.AllArgsConstructor;

src/main/java/com/tykj/base/result/ResultUtil.java

-package com.tykj.datawarehouse.base.result;
+package com.tykj.base.result;
 
+import com.tykj.base.result.ResultObj;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -18,7 +19,7 @@ public class ResultUtil<T> {
      *
      * @param data 获取的数据
      */
-    public static <T> ResponseEntity<ResultObj<T>> success(T data,String message) {
+    public static <T> ResponseEntity<ResultObj<T>> success(T data, String message) {
         return ResponseEntity.ok(new ResultObj<>(data,message));
     }
     /**

src/main/java/com/tykj/base/util/ClassUtil.java

-package com.tykj.datawarehouse.base.util;
-
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-
-public class ClassUtil {
-
-    /**
-     * 读取项目中所有Class 并以Class对象的集合返回
-     * @param load ClassLoader
-     * @return Class对象集合
-     */
-    public static List<Class<?>> loadClassByLoader(ClassLoader load) {
-        List<Class<?>> classes = new ArrayList<>();
-        try {
-            Enumeration<URL> urls = load.getResources("");
-            //放所有类型
-            while (urls.hasMoreElements()) {
-                URL url = urls.nextElement();
-                //文件类型（其实是文件夹）
-                if (url.getProtocol().equals("file")) {
-                    loadClassByPath(null, url.getPath(), classes, load);
-                }
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return classes;
-    }
-
-    /**
-     * 通过文件路径加载所有类 root 主要用来替换path中前缀（除包路径以外的路径）
-     */
-    private static void loadClassByPath(String root, String path, List<Class<?>> list, ClassLoader load) {
-        File f = new File(path);
-        if (root == null) {
-            root = f.getPath();
-        }
-        //判断是否是class文件
-        if (f.isFile() && f.getName().matches("^.*\\.class$")) {
-            try {
-                String classPath = f.getPath();
-                //截取出className 将路径分割符替换为.（windows是\ linux、mac是/）
-                String className = classPath.substring(root.length() + 1, classPath.length() - 6).replace('/', '.').replace('\\', '.');
-                list.add(load.loadClass(className));
-            } catch (Exception ex) {
-                ex.printStackTrace();
-            }
-        } else {
-            File[] fs = f.listFiles();
-            if (fs == null) {
-                return;
-            }
-            for (File file : fs) {
-                loadClassByPath(root, file.getPath(), list, load);
-            }
-        }
-    }
-
-}

src/main/java/com/tykj/base/util/DateFormatUtil.java

-package com.tykj.datawarehouse.base.util;
+package com.tykj.base.util;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.FastDateFormat;

src/main/java/com/tykj/base/util/FileUtil.java

-package com.tykj.datawarehouse.base.util;
-
-import java.io.*;
-
-/**
- * @author HuangXiahao
- * @version V1.0
- * @class FileUtil
- * @packageName com.tykj.workflowcore.base.util
- **/
-public class FileUtil {
-    public static File createFileByString(String filePath,String fileString){
-        File f = null;
-        try {
-            f = new File(filePath);
-            // 判断文件是否存在
-            if(!f.exists()){
-                f.createNewFile();
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        BufferedReader bufferedReader = null;
-        BufferedWriter bufferedWriter = null;
-        try {
-            bufferedReader = new BufferedReader(new StringReader(fileString));
-            bufferedWriter = new BufferedWriter(new FileWriter(f));
-            //字符缓冲区
-            char buf[] = new char[1024];
-            int len;
-            while ((len = bufferedReader.read(buf)) != -1) {
-                bufferedWriter.write(buf, 0, len);
-            }
-            bufferedWriter.flush();
-            bufferedReader.close();
-            bufferedWriter.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-
-        } finally {
-            if (bufferedReader != null) {
-                try {
-                    bufferedReader.close();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-        return f;
-    }
-}

src/main/java/com/tykj/model/controller/ModelController.java

-package com.tykj.datawarehouse.model.controller;
+package com.tykj.model.controller;
 
 
-import com.tykj.datawarehouse.base.result.ApiException;
-import com.tykj.datawarehouse.base.result.ResultUtil;
-import com.tykj.datawarehouse.model.dao.QuoteDao;
-import com.tykj.datawarehouse.model.dao.RuleDao;
-import com.tykj.datawarehouse.model.entity.ColumnInfo;
-import com.tykj.datawarehouse.model.entity.Quote;
-import com.tykj.datawarehouse.model.entity.Rule;
-import com.tykj.datawarehouse.model.entity.TableInfo;
-import com.tykj.datawarehouse.model.entity.vo.*;
-import com.tykj.datawarehouse.model.service.ModelService;
-import com.tykj.datawarehouse.model.service.impl.ModelHelper;
-import com.tykj.datawarehouse.model.utils.SessionUtil;
+
+import com.tykj.base.result.ApiException;
+import com.tykj.base.result.ResultUtil;
+
+import com.tykj.model.dao.QuoteDao;
+import com.tykj.model.dao.RuleDao;
+
+import com.tykj.model.entity.ColumnInfo;
+import com.tykj.model.entity.Quote;
+import com.tykj.model.entity.Rule;
+import com.tykj.model.entity.TableInfo;
+
+import com.tykj.model.entity.vo.*;
+
+import com.tykj.model.service.ModelService;
+import com.tykj.model.service.impl.ModelHelper;
+import com.tykj.model.utils.SessionUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -187,7 +192,7 @@ public class ModelController {
     @ApiOperation("复杂查询(分类)")
     @PostMapping("/complexQuery/group")
     public ResponseEntity complexQueryWithGroup(@RequestBody complexQueryVo complexQueryVo) {
-        CustomPage customPage = modelService.complexQueryWithGroup(complexQueryVo.getTableName(), complexQueryVo.getGroupCondition(), complexQueryVo.getColumnNames(), complexQueryVo.getQueryConditions(), complexQueryVo.getGroupByColumn(), complexQueryVo.getPage(), complexQueryVo.getSize());
+      CustomPage customPage = modelService.complexQueryWithGroup(complexQueryVo.getTableName(), complexQueryVo.getGroupCondition(), complexQueryVo.getColumnNames(), complexQueryVo.getQueryConditions(), complexQueryVo.getGroupByColumn(), complexQueryVo.getPage(), complexQueryVo.getSize());
         if (customPage.getContents() != null) {
             return ResultUtil.success(customPage, "查询成功!");
         }

src/main/java/com/tykj/model/controller/QuoteController.java

-package com.tykj.datawarehouse.model.controller;
-
-import com.tykj.datawarehouse.base.result.ResultUtil;
-import com.tykj.datawarehouse.model.dao.ColumnInfoDao;
-import com.tykj.datawarehouse.model.entity.Quote;
-import com.tykj.datawarehouse.model.entity.vo.SearchQuoteVO;
-import com.tykj.datawarehouse.model.entity.vo.UpdateQuoteVO;
-import com.tykj.datawarehouse.model.service.QuoteService;
-import com.tykj.datawarehouse.model.service.impl.ModelImpl;
+package com.tykj.model.controller;
+
+
+import com.tykj.base.result.ResultUtil;
+
+
+import com.tykj.model.entity.Quote;
+import com.tykj.model.entity.vo.SearchQuoteVO;
+import com.tykj.model.entity.vo.UpdateQuoteVO;
+import com.tykj.model.service.QuoteService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/tykj/model/controller/RuleController.java

-package com.tykj.datawarehouse.model.controller;
+package com.tykj.model.controller;
 
-import com.tykj.datawarehouse.base.result.ResultUtil;
-import com.tykj.datawarehouse.model.entity.vo.RuleVo;
-import com.tykj.datawarehouse.model.service.RuleService;
+import com.tykj.base.result.ResultUtil;
+import com.tykj.model.entity.vo.RuleVo;
+import com.tykj.model.service.RuleService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/tykj/model/dao/ColumnInfoDao.java

-package com.tykj.datawarehouse.model.dao;
+package com.tykj.model.dao;
 
 
-import com.tykj.datawarehouse.model.entity.ColumnInfo;
+
+import com.tykj.model.entity.ColumnInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

src/main/java/com/tykj/model/dao/QuoteDao.java

-package com.tykj.datawarehouse.model.dao;
+package com.tykj.model.dao;
 
 
-import com.tykj.datawarehouse.model.entity.Quote;
+import com.tykj.model.entity.Quote;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/tykj/model/dao/RuleDao.java

-package com.tykj.datawarehouse.model.dao;
+package com.tykj.model.dao;
 
-import com.tykj.datawarehouse.model.entity.Rule;
+
+import com.tykj.model.entity.Rule;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 
-import java.util.List;
-
 /**
  * @Description TODO
  * @Author WWW

src/main/java/com/tykj/model/dao/TableInfoDao.java

-package com.tykj.datawarehouse.model.dao;
+package com.tykj.model.dao;
 
 
-
-import com.tykj.datawarehouse.model.entity.TableInfo;
+import com.tykj.model.entity.TableInfo;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.data.jpa.repository.Modifying;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.List;
 
 /**
  * @ClassName TableInfoDao

src/main/java/com/tykj/model/entity/ColumnInfo.java

-package com.tykj.datawarehouse.model.entity;
+package com.tykj.model.entity;
 
 
-import com.tykj.datawarehouse.base.entity.BaseEntity;
+import com.tykj.base.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

src/main/java/com/tykj/model/entity/Quote.java

-package com.tykj.datawarehouse.model.entity;
+package com.tykj.model.entity;
 
-import com.tykj.datawarehouse.base.entity.BaseEntity;
+
+import com.tykj.base.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/tykj/model/entity/Rule.java

-package com.tykj.datawarehouse.model.entity;
+package com.tykj.model.entity;
 
-import com.tykj.datawarehouse.base.entity.BaseEntity;
+
+import com.tykj.base.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/tykj/model/entity/TableInfo.java

-package com.tykj.datawarehouse.model.entity;
+package com.tykj.model.entity;
 
 
-import com.tykj.datawarehouse.base.entity.BaseEntity;
+import com.tykj.base.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/tykj/model/entity/customEnums/ConnectionType.java

-package com.tykj.datawarehouse.model.entity.customEnums;
+package com.tykj.model.entity.customEnums;
 
 /**
  * @ClassName ModelType

src/main/java/com/tykj/model/entity/vo/ColumnTypeVO.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/tykj/model/entity/vo/ColumnVO.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
-import com.tykj.datawarehouse.model.entity.Quote;
-import com.tykj.datawarehouse.model.entity.Rule;
+
+import com.tykj.model.entity.Quote;
+import com.tykj.model.entity.Rule;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/tykj/model/entity/vo/ColumnWithQuoteVO.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
-import com.tykj.datawarehouse.model.entity.ColumnInfo;
-import com.tykj.datawarehouse.model.entity.Quote;
+
+import com.tykj.model.entity.ColumnInfo;
+import com.tykj.model.entity.Quote;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/tykj/model/entity/vo/CustomPage.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;

src/main/java/com/tykj/model/entity/vo/DelTableVO.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/tykj/model/entity/vo/GroupCondition.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/tykj/model/entity/vo/OrderCondition.java

-package com.tykj.datawarehouse.model.entity.vo;
-
+package com.tykj.model.entity.vo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/tykj/model/entity/vo/QueryCondition.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
-import com.tykj.datawarehouse.model.entity.customEnums.ConnectionType;
+
+import com.tykj.model.entity.customEnums.ConnectionType;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/tykj/model/entity/vo/RuleVo.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/tykj/model/entity/vo/SearchAllVO.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/tykj/model/entity/vo/SearchColumnInfoVo.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
 
-import com.tykj.datawarehouse.base.page.JpaCustomPage;
+
+import com.tykj.base.page.JpaCustomPage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/tykj/model/entity/vo/SearchQuoteVO.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/tykj/model/entity/vo/SearchTableInfoVo.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
 
-import com.tykj.datawarehouse.base.page.JpaCustomPage;
+
+import com.tykj.base.page.JpaCustomPage;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/tykj/model/entity/vo/TableAndColumnInfoVO.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
 
-import com.tykj.datawarehouse.model.entity.ColumnInfo;
-import com.tykj.datawarehouse.model.entity.TableInfo;
+
+import com.tykj.model.entity.ColumnInfo;
+import com.tykj.model.entity.TableInfo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

src/main/java/com/tykj/model/entity/vo/TableVO.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/tykj/model/entity/vo/UpdateQuoteVO.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
-import com.tykj.datawarehouse.model.entity.Quote;
+
+import com.tykj.model.entity.Quote;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/tykj/model/entity/vo/UpdateTableInfoVO.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/tykj/model/entity/vo/VersionVO.java

-package com.tykj.datawarehouse.model.entity.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import javax.persistence.Lob;
-
-/**
- * @Description TODO
- * @Author WWW
- * @Date 2021/5/19 15:42
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class VersionVO {
-    @ApiModelProperty("tableInfoID")
-    private Integer dbId;
-    @ApiModelProperty("版本号")
-    private String versionId;
-    @ApiModelProperty("版本号")
-    private String versionDesc;
-    @Lob
-    @ApiModelProperty("版本对应数据")
-    private String content;
-
-
-}

src/main/java/com/tykj/model/entity/vo/complexQueryVo.java

-package com.tykj.datawarehouse.model.entity.vo;
+package com.tykj.model.entity.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -27,7 +27,7 @@ public class complexQueryVo {
     List<String> columnNames;
 
     @ApiModelProperty("分类条件信息")
-    GroupCondition groupCondition;
+   GroupCondition groupCondition;
 
     @ApiModelProperty("查询条件")
     List<QueryCondition> queryConditions;

src/main/java/com/tykj/model/myEnum/ModelType.java

-package com.tykj.datawarehouse.model.myEnum;
+package com.tykj.model.entity.vo;
 
 
 /**

src/main/java/com/tykj/model/service/ModelService.java

-package com.tykj.datawarehouse.model.service;
+package com.tykj.model.service;
+
+
+
+import com.tykj.base.consumer.FourComsumer;
+import com.tykj.model.entity.ColumnInfo;
+import com.tykj.model.entity.TableInfo;
+import com.tykj.model.entity.vo.*;
 
 
-import com.tykj.datawarehouse.base.consumer.FourComsumer;
-import com.tykj.datawarehouse.model.entity.ColumnInfo;
-import com.tykj.datawarehouse.model.entity.TableInfo;
-import com.tykj.datawarehouse.model.entity.vo.*;
 import org.hibernate.internal.SessionImpl;
 import org.hibernate.type.Type;
 import org.springframework.data.domain.Page;

src/main/java/com/tykj/model/service/QuoteService.java

-package com.tykj.datawarehouse.model.service;
+package com.tykj.model.service;
 
 
 
-import com.tykj.datawarehouse.model.entity.Quote;
-import com.tykj.datawarehouse.model.entity.vo.SearchQuoteVO;
-import com.tykj.datawarehouse.model.entity.vo.UpdateQuoteVO;
+
+import com.tykj.model.entity.Quote;
+import com.tykj.model.entity.vo.SearchQuoteVO;
+import com.tykj.model.entity.vo.UpdateQuoteVO;
 
 import java.util.List;
 

src/main/java/com/tykj/model/service/RuleService.java

-package com.tykj.datawarehouse.model.service;
+package com.tykj.model.service;
+
+
+import com.tykj.model.entity.Rule;
+import com.tykj.model.entity.vo.RuleVo;
 
-import com.tykj.datawarehouse.model.entity.Rule;
-import com.tykj.datawarehouse.model.entity.vo.RuleVo;
 
 import java.util.List;
 

src/main/java/com/tykj/model/service/impl/ModelHelper.java

-package com.tykj.datawarehouse.model.service.impl;
+package com.tykj.model.service.impl;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.tykj.datawarehouse.base.result.ApiException;
-import com.tykj.datawarehouse.model.dao.ColumnInfoDao;
-import com.tykj.datawarehouse.model.dao.TableInfoDao;
-import com.tykj.datawarehouse.model.entity.ColumnInfo;
-import com.tykj.datawarehouse.model.entity.TableInfo;
+
+import com.tykj.base.result.ApiException;
+import com.tykj.model.dao.ColumnInfoDao;
+import com.tykj.model.dao.TableInfoDao;
+import com.tykj.model.entity.ColumnInfo;
+import com.tykj.model.entity.TableInfo;
+
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/tykj/model/service/impl/ModelImpl.java

-package com.tykj.datawarehouse.model.service.impl;
+package com.tykj.model.service.impl;
+
 
 import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
-import com.tykj.datawarehouse.base.consumer.FourComsumer;
-import com.tykj.datawarehouse.base.result.ApiException;
-import com.tykj.datawarehouse.base.result.ResultUtil;
-import com.tykj.datawarehouse.model.dao.ColumnInfoDao;
-import com.tykj.datawarehouse.model.dao.QuoteDao;
-import com.tykj.datawarehouse.model.dao.RuleDao;
-import com.tykj.datawarehouse.model.dao.TableInfoDao;
-import com.tykj.datawarehouse.model.entity.ColumnInfo;
-import com.tykj.datawarehouse.model.entity.Quote;
-import com.tykj.datawarehouse.model.entity.TableInfo;
-import com.tykj.datawarehouse.model.entity.customEnums.ConnectionType;
-import com.tykj.datawarehouse.model.entity.vo.*;
-import com.tykj.datawarehouse.model.service.ModelService;
-import com.tykj.datawarehouse.model.utils.SessionUtil;
-import com.tykj.datawarehouse.model.utils.SqlTypeUtil;
-import com.tykj.datawarehouse.model.utils.SqlUtil;
+import com.tykj.base.consumer.FourComsumer;
+import com.tykj.base.result.ApiException;
+import com.tykj.base.result.ResultUtil;
+import com.tykj.model.dao.ColumnInfoDao;
+import com.tykj.model.dao.QuoteDao;
+import com.tykj.model.dao.RuleDao;
+import com.tykj.model.dao.TableInfoDao;
+import com.tykj.model.entity.ColumnInfo;
+import com.tykj.model.entity.Quote;
+import com.tykj.model.entity.TableInfo;
+import com.tykj.model.entity.customEnums.ConnectionType;
+import com.tykj.model.entity.vo.*;
+
+
+
+import com.tykj.model.service.ModelService;
+import com.tykj.model.utils.SessionUtil;
+import com.tykj.model.utils.SqlTypeUtil;
+import com.tykj.model.utils.SqlUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.util.Strings;
@@ -42,10 +46,11 @@ import java.util.*;
 import java.util.function.BiConsumer;
 import java.util.stream.Collectors;
 
-import static com.tykj.datawarehouse.model.utils.CheckUtils.validationQuote;
-import static com.tykj.datawarehouse.model.utils.CheckUtils.validationRule;
-import static com.tykj.datawarehouse.model.utils.CreateTableUtil.createTable;
-import static com.tykj.datawarehouse.model.utils.HqlUtil.createQuery;
+
+import static com.tykj.model.utils.CheckUtils.validationQuote;
+import static com.tykj.model.utils.CheckUtils.validationRule;
+import static com.tykj.model.utils.CreateTableUtil.createTable;
+import static com.tykj.model.utils.HqlUtil.createQuery;
 import static java.util.Objects.isNull;
 import static java.util.Objects.nonNull;
 
@@ -193,7 +198,7 @@ public class ModelImpl implements ModelService {
      * @Date 16:17 2021/3/5
      **/
     @Override
-    public int operationValueByEntityName(Map<String, Object> map,SessionImpl session, BiConsumer<String,Object> saveOrDelete,FourComsumer<TableInfo, Object, Type , String > valitor) {
+    public int operationValueByEntityName(Map<String, Object> map, SessionImpl session, BiConsumer<String,Object> saveOrDelete, FourComsumer<TableInfo, Object, Type , String > valitor) {
         session.getTransaction().begin();
         for (String tableName :
                 map.keySet()) {

src/main/java/com/tykj/model/service/impl/QuoteServiceImpl.java

-package com.tykj.datawarehouse.model.service.impl;
+package com.tykj.model.service.impl;
 
 
 import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
 
-import com.tykj.datawarehouse.base.result.ApiException;
-import com.tykj.datawarehouse.model.dao.QuoteDao;
-import com.tykj.datawarehouse.model.entity.Quote;
-import com.tykj.datawarehouse.model.entity.vo.SearchQuoteVO;
-import com.tykj.datawarehouse.model.entity.vo.UpdateQuoteVO;
-import com.tykj.datawarehouse.model.service.QuoteService;
+import com.tykj.base.result.ApiException;
+import com.tykj.model.dao.QuoteDao;
+
+import com.tykj.model.entity.Quote;
+import com.tykj.model.entity.vo.SearchQuoteVO;
+import com.tykj.model.entity.vo.UpdateQuoteVO;
+import com.tykj.model.service.QuoteService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/tykj/model/service/impl/RuleServiceImpl.java

-package com.tykj.datawarehouse.model.service.impl;
+package com.tykj.model.service.impl;
 
-import com.tykj.datawarehouse.model.dao.RuleDao;
-import com.tykj.datawarehouse.model.entity.Rule;
-import com.tykj.datawarehouse.model.entity.vo.RuleVo;
-import com.tykj.datawarehouse.model.service.RuleService;
+
+import com.tykj.model.dao.RuleDao;
+import com.tykj.model.entity.Rule;
+import com.tykj.model.entity.vo.RuleVo;
+import com.tykj.model.service.RuleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/tykj/model/sqlType/MysqlSqlType.java

-package com.tykj.datawarehouse.model.sqlType;
+package com.tykj.model.sqlType;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/com/tykj/model/sqlType/OscarSqlType.java

-package com.tykj.datawarehouse.model.sqlType;
+package com.tykj.model.sqlType;
 
 import java.util.HashMap;
 import java.util.Map;

src/main/java/com/tykj/model/utils/CheckUtils.java

-package com.tykj.datawarehouse.model.utils;
+package com.tykj.model.utils;
 
-import com.tykj.datawarehouse.base.result.ApiException;
 
+
+import com.tykj.base.result.ApiException;
 import org.apache.commons.lang3.StringUtils;
 
 import java.util.List;

src/main/java/com/tykj/model/utils/ClassTypeLength.java

-package com.tykj.datawarehouse.model.utils;
+package com.tykj.model.utils;
 
 
 /**

src/main/java/com/tykj/model/utils/CreateTableUtil.java

-package com.tykj.datawarehouse.model.utils;
+package com.tykj.model.utils;
 
 
-import com.tykj.datawarehouse.base.result.ApiException;
-import com.tykj.datawarehouse.model.entity.vo.ColumnVO;
-import com.tykj.datawarehouse.model.entity.vo.TableVO;
+
+import com.tykj.base.result.ApiException;
+import com.tykj.model.entity.vo.ColumnVO;
+import com.tykj.model.entity.vo.TableVO;
 
 import java.util.HashMap;
 import java.util.List;

src/main/java/com/tykj/model/utils/GetIndexUtil.java

-package com.tykj.datawarehouse.model.utils;
+package com.tykj.model.utils;
 
 /**
  * @Description TODO

src/main/java/com/tykj/model/utils/HqlUtil.java

-package com.tykj.datawarehouse.model.utils;
+package com.tykj.model.utils;
 
-import com.tykj.datawarehouse.model.entity.vo.QueryCondition;
+import com.tykj.model.entity.vo.QueryCondition;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 

src/main/java/com/tykj/model/utils/ObjectUtil.java

-package com.tykj.datawarehouse.model.utils;
+package com.tykj.model.utils;
 
 import java.lang.reflect.Field;
 import java.util.HashMap;

src/main/java/com/tykj/model/utils/SessionUtil.java

-package com.tykj.datawarehouse.model.utils;
+package com.tykj.model.utils;
 
 import com.google.common.base.Strings;
-import com.tykj.datawarehouse.model.dao.TableInfoDao;
-import com.tykj.datawarehouse.model.entity.TableInfo;
+
+
+import com.tykj.model.dao.TableInfoDao;
+
+import com.tykj.model.entity.TableInfo;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.hibernate.boot.Metadata;

src/main/java/com/tykj/model/utils/SqlTypeUtil.java

-package com.tykj.datawarehouse.model.utils;
+package com.tykj.model.utils;
 
 
-import com.tykj.datawarehouse.model.sqlType.MysqlSqlType;
-import com.tykj.datawarehouse.model.sqlType.OscarSqlType;
+
+import com.tykj.model.sqlType.MysqlSqlType;
+import com.tykj.model.sqlType.OscarSqlType;
+
 
 import java.util.Map;
 

src/main/java/com/tykj/model/utils/SqlUtil.java

-package com.tykj.datawarehouse.model.utils;
+package com.tykj.model.utils;
 
 
 import com.google.common.base.Strings;