DeXun/fad-l3
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: drop klp_pocketfactory/cgldb/double_rack and related code

Browse Source 
- Remove klp-pocket module entirely (acid/galvanize1/common)
- Remove klp-da OEE files (depended on pocket)
- Remove klp-wms Dr* files (double-rack)
- Strip double-rack code from WmsCoilPendingActionServiceImpl
- Remove acid/galvanize1/double-rack datasources from prod/dev yml
- Remove sql-server-api, da.oee, oee.acid config
This commit is contained in:
wangyu
2026-06-08 15:42:29 +08:00
parent 5cd31efef1
commit e793b19c41
2532 changed files with 13606 additions and 25940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
klp-generator/src/main/java/com/klp/generator/config/GenConfig.java
View File

@@ -1,4 +1,4 @@
package com.klp.generator.config;
package com.fad.generator.config;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;

20
klp-generator/src/main/java/com/klp/generator/controller/GenController.java
View File

@@ -1,17 +1,17 @@
package com.klp.generator.controller;
package com.fad.generator.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.io.IoUtil;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.enums.BusinessType;
import com.klp.generator.domain.GenTable;
import com.klp.generator.domain.GenTableColumn;
import com.klp.generator.service.IGenTableService;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.enums.BusinessType;
import com.fad.generator.domain.GenTable;
import com.fad.generator.domain.GenTableColumn;
import com.fad.generator.service.IGenTableService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

8
klp-generator/src/main/java/com/klp/generator/domain/GenTable.java
View File

@@ -1,9 +1,9 @@
package com.klp.generator.domain;
package com.fad.generator.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.constant.GenConstants;
import com.klp.common.core.domain.BaseEntity;
import com.klp.common.utils.StringUtils;
import com.fad.common.constant.GenConstants;
import com.fad.common.core.domain.BaseEntity;
import com.fad.common.utils.StringUtils;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.commons.lang3.ArrayUtils;

6
klp-generator/src/main/java/com/klp/generator/domain/GenTableColumn.java
View File

@@ -1,11 +1,11 @@
package com.klp.generator.domain;
package com.fad.generator.domain;
import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.klp.common.core.domain.BaseEntity;
import com.klp.common.utils.StringUtils;
import com.fad.common.core.domain.BaseEntity;
import com.fad.common.utils.StringUtils;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.apache.ibatis.type.JdbcType;

6
klp-generator/src/main/java/com/klp/generator/mapper/GenTableColumnMapper.java
View File

@@ -1,8 +1,8 @@
package com.klp.generator.mapper;
package com.fad.generator.mapper;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.klp.generator.domain.GenTableColumn;
import com.fad.common.core.mapper.BaseMapperPlus;
import com.fad.generator.domain.GenTableColumn;
import java.util.List;

6
klp-generator/src/main/java/com/klp/generator/mapper/GenTableMapper.java
View File

@@ -1,9 +1,9 @@
package com.klp.generator.mapper;
package com.fad.generator.mapper;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.klp.generator.domain.GenTable;
import com.fad.common.core.mapper.BaseMapperPlus;
import com.fad.generator.domain.GenTable;
import org.apache.ibatis.annotations.Param;
import java.util.List;

36
klp-generator/src/main/java/com/klp/generator/service/GenTableServiceImpl.java
View File

@@ -1,4 +1,4 @@
package com.klp.generator.service;
package com.fad.generator.service;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.io.IoUtil;
@@ -10,23 +10,23 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.incrementer.IdentifierGenerator;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.klp.common.constant.Constants;
import com.klp.common.constant.GenConstants;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.exception.ServiceException;
import com.klp.common.helper.LoginHelper;
import com.klp.common.utils.JsonUtils;
import com.klp.common.utils.StreamUtils;
import com.klp.common.utils.StringUtils;
import com.klp.common.utils.file.FileUtils;
import com.klp.generator.domain.GenTable;
import com.klp.generator.domain.GenTableColumn;
import com.klp.generator.mapper.GenTableColumnMapper;
import com.klp.generator.mapper.GenTableMapper;
import com.klp.generator.util.GenUtils;
import com.klp.generator.util.VelocityInitializer;
import com.klp.generator.util.VelocityUtils;
import com.fad.common.constant.Constants;
import com.fad.common.constant.GenConstants;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.exception.ServiceException;
import com.fad.common.helper.LoginHelper;
import com.fad.common.utils.JsonUtils;
import com.fad.common.utils.StreamUtils;
import com.fad.common.utils.StringUtils;
import com.fad.common.utils.file.FileUtils;
import com.fad.generator.domain.GenTable;
import com.fad.generator.domain.GenTableColumn;
import com.fad.generator.mapper.GenTableColumnMapper;
import com.fad.generator.mapper.GenTableMapper;
import com.fad.generator.util.GenUtils;
import com.fad.generator.util.VelocityInitializer;
import com.fad.generator.util.VelocityUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.velocity.Template;

10
klp-generator/src/main/java/com/klp/generator/service/IGenTableService.java
View File

@@ -1,9 +1,9 @@
package com.klp.generator.service;
package com.fad.generator.service;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.page.TableDataInfo;
import com.klp.generator.domain.GenTable;
import com.klp.generator.domain.GenTableColumn;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.generator.domain.GenTable;
import com.fad.generator.domain.GenTableColumn;
import java.util.List;
import java.util.Map;

12
klp-generator/src/main/java/com/klp/generator/util/GenUtils.java
View File

@@ -1,10 +1,10 @@
package com.klp.generator.util;
package com.fad.generator.util;
import com.klp.common.constant.GenConstants;
import com.klp.common.utils.StringUtils;
import com.klp.generator.config.GenConfig;
import com.klp.generator.domain.GenTable;
import com.klp.generator.domain.GenTableColumn;
import com.fad.common.constant.GenConstants;
import com.fad.common.utils.StringUtils;
import com.fad.generator.config.GenConfig;
import com.fad.generator.domain.GenTable;
import com.fad.generator.domain.GenTableColumn;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.commons.lang3.RegExUtils;

4
klp-generator/src/main/java/com/klp/generator/util/VelocityInitializer.java
View File

@@ -1,6 +1,6 @@
package com.klp.generator.util;
package com.fad.generator.util;
import com.klp.common.constant.Constants;
import com.fad.common.constant.Constants;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.velocity.app.Velocity;

16
klp-generator/src/main/java/com/klp/generator/util/VelocityUtils.java
View File

@@ -1,16 +1,16 @@
package com.klp.generator.util;
package com.fad.generator.util;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Dict;
import cn.hutool.core.util.ObjectUtil;
import com.klp.common.constant.GenConstants;
import com.klp.common.helper.DataBaseHelper;
import com.klp.common.utils.DateUtils;
import com.klp.common.utils.JsonUtils;
import com.klp.common.utils.StringUtils;
import com.klp.generator.domain.GenTable;
import com.klp.generator.domain.GenTableColumn;
import com.fad.common.constant.GenConstants;
import com.fad.common.helper.DataBaseHelper;
import com.fad.common.utils.DateUtils;
import com.fad.common.utils.JsonUtils;
import com.fad.common.utils.StringUtils;
import com.fad.generator.domain.GenTable;
import com.fad.generator.domain.GenTableColumn;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.velocity.VelocityContext;

10
klp-generator/src/main/resources/mapper/generator/GenTableColumnMapper.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.generator.mapper.GenTableColumnMapper">
<mapper namespace="com.fad.generator.mapper.GenTableColumnMapper">
<resultMap type="GenTableColumn" id="GenTableColumnResult">
<id property="columnId" column="column_id" />
@@ -30,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<select id="selectDbTableColumnsByName" parameterType="String" resultMap="GenTableColumnResult">
<if test="@com.klp.common.helper.DataBaseHelper@isMySql()">
<if test="@com.fad.common.helper.DataBaseHelper@isMySql()">
select column_name,
(case when (is_nullable = 'no' <![CDATA[ && ]]> column_key != 'PRI') then '1' else null end) as is_required,
(case when column_key = 'PRI' then '1' else '0' end) as is_pk,
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from information_schema.columns where table_schema = (select database()) and table_name = (#{tableName})
order by ordinal_position
</if>
<if test="@com.klp.common.helper.DataBaseHelper@isOracle()">
<if test="@com.fad.common.helper.DataBaseHelper@isOracle()">
select lower(temp.column_name) as column_name,
(case when (temp.nullable = 'N' and temp.constraint_type != 'P') then '1' else null end) as is_required,
(case when temp.constraint_type = 'P' then '1' else '0' end) as is_pk,
@@ -61,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE temp.row_flg = 1
ORDER BY temp.column_id
</if>
<if test="@com.klp.common.helper.DataBaseHelper@isPostgerSql()">
<if test="@com.fad.common.helper.DataBaseHelper@isPostgerSql()">
SELECT column_name, is_required, is_pk, sort, column_comment, is_increment, column_type
FROM (
SELECT c.relname AS table_name,
@@ -95,7 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
WHERE table_name = (#{tableName})
AND column_type <![CDATA[ <> ]]> '-'
</if>
<if test="@com.klp.common.helper.DataBaseHelper@isSqlServer()">
<if test="@com.fad.common.helper.DataBaseHelper@isSqlServer()">
SELECT
cast(A.NAME as nvarchar) as column_name,
cast(B.NAME as nvarchar) + (case when B.NAME = 'numeric' then '(' + cast(A.prec as nvarchar) + ',' + cast(A.scale as nvarchar) + ')' else '' end) as column_type,

26
klp-generator/src/main/resources/mapper/generator/GenTableMapper.xml
View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.generator.mapper.GenTableMapper">
<mapper namespace="com.fad.generator.mapper.GenTableMapper">
<resultMap type="GenTable" id="GenTableResult">
<id property="tableId" column="table_id" />
@@ -54,7 +54,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<select id="selectPageDbTableList" resultMap="GenTableResult">
<if test="@com.klp.common.helper.DataBaseHelper@isMySql()">
<if test="@com.fad.common.helper.DataBaseHelper@isMySql()">
select table_name, table_comment, create_time, update_time
from information_schema.tables
where table_schema = (select database())
@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
order by create_time desc
</if>
<if test="@com.klp.common.helper.DataBaseHelper@isOracle()">
<if test="@com.fad.common.helper.DataBaseHelper@isOracle()">
select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time
from user_tables dt, user_tab_comments dtc, user_objects uo
where dt.table_name = dtc.table_name
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
order by create_time desc
</if>
<if test="@com.klp.common.helper.DataBaseHelper@isPostgerSql()">
<if test="@com.fad.common.helper.DataBaseHelper@isPostgerSql()">
select table_name, table_comment, create_time, update_time
from (
SELECT c.relname AS table_name,
@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
order by create_time desc
</if>
<if test="@com.klp.common.helper.DataBaseHelper@isSqlServer()">
<if test="@com.fad.common.helper.DataBaseHelper@isSqlServer()">
SELECT cast(D.NAME as nvarchar) as table_name,
cast(F.VALUE as nvarchar) as table_comment,
crdate as create_time,
@@ -129,7 +129,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectDbTableListByNames" resultMap="GenTableResult">
<if test="@com.klp.common.helper.DataBaseHelper@isMySql()">
<if test="@com.fad.common.helper.DataBaseHelper@isMySql()">
select table_name, table_comment, create_time, update_time from information_schema.tables
where table_name NOT LIKE 'xxl_job_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
and table_name in
@@ -137,7 +137,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{name}
</foreach>
</if>
<if test="@com.klp.common.helper.DataBaseHelper@isOracle()">
<if test="@com.fad.common.helper.DataBaseHelper@isOracle()">
select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time
from user_tables dt, user_tab_comments dtc, user_objects uo
where dt.table_name = dtc.table_name
@@ -150,7 +150,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{name}
</foreach>
</if>
<if test="@com.klp.common.helper.DataBaseHelper@isPostgerSql()">
<if test="@com.fad.common.helper.DataBaseHelper@isPostgerSql()">
select table_name, table_comment, create_time, update_time
from (
SELECT c.relname AS table_name,
@@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{name}
</foreach>
</if>
<if test="@com.klp.common.helper.DataBaseHelper@isSqlServer()">
<if test="@com.fad.common.helper.DataBaseHelper@isSqlServer()">
SELECT cast(D.NAME as nvarchar) as table_name,
cast(F.VALUE as nvarchar) as table_comment,
crdate as create_time,
@@ -187,12 +187,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
<if test="@com.klp.common.helper.DataBaseHelper@isMySql()">
<if test="@com.fad.common.helper.DataBaseHelper@isMySql()">
select table_name, table_comment, create_time, update_time from information_schema.tables
where table_name NOT LIKE 'xxl_job_%' and table_name NOT LIKE 'gen_%' and table_schema = (select database())
and table_name = #{tableName}
</if>
<if test="@com.klp.common.helper.DataBaseHelper@isOracle()">
<if test="@com.fad.common.helper.DataBaseHelper@isOracle()">
select lower(dt.table_name) as table_name, dtc.comments as table_comment, uo.created as create_time, uo.last_ddl_time as update_time
from user_tables dt, user_tab_comments dtc, user_objects uo
where dt.table_name = dtc.table_name
@@ -202,7 +202,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND dt.table_name NOT IN (select table_name from gen_table)
and lower(dt.table_name) = #{tableName}
</if>
<if test="@com.klp.common.helper.DataBaseHelper@isPostgerSql()">
<if test="@com.fad.common.helper.DataBaseHelper@isPostgerSql()">
select table_name, table_comment, create_time, update_time
from (
SELECT c.relname AS table_name,
@@ -219,7 +219,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where table_name NOT LIKE 'xxl_job_%' and table_name NOT LIKE 'gen_%'
and table_name = #{tableName}
</if>
<if test="@com.klp.common.helper.DataBaseHelper@isSqlServer()">
<if test="@com.fad.common.helper.DataBaseHelper@isSqlServer()">
SELECT cast(D.NAME as nvarchar) as table_name,
cast(F.VALUE as nvarchar) as table_comment,
crdate as create_time,

2
klp-generator/src/main/resources/vm/java/bo.java.vm
View File

@@ -9,7 +9,7 @@ import ${import};
#end
#if($table.crud || $table.sub)
#elseif($table.tree)
import com.klp.common.core.domain.TreeEntity;
import com.fad.common.core.domain.TreeEntity;
#end
/**

20
klp-generator/src/main/resources/vm/java/controller.java.vm
View File

@@ -8,20 +8,20 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.*;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import com.klp.common.annotation.RepeatSubmit;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.R;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.fad.common.annotation.RepeatSubmit;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.domain.R;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import ${packageName}.domain.vo.${ClassName}Vo;
import ${packageName}.domain.bo.${ClassName}Bo;
import ${packageName}.service.I${ClassName}Service;
#if($table.crud || $table.sub)
import com.klp.common.core.page.TableDataInfo;
import com.fad.common.core.page.TableDataInfo;
#elseif($table.tree)
#end

2
klp-generator/src/main/resources/vm/java/domain.java.vm
View File

@@ -9,7 +9,7 @@ import ${import};
#end
#if($table.crud || $table.sub)
#elseif($table.tree)
import com.klp.common.core.domain.TreeEntity;
import com.fad.common.core.domain.TreeEntity;
#end
/**

2
klp-generator/src/main/resources/vm/java/mapper.java.vm
View File

@@ -2,7 +2,7 @@ package ${packageName}.mapper;
import ${packageName}.domain.${ClassName};
import ${packageName}.domain.vo.${ClassName}Vo;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.fad.common.core.mapper.BaseMapperPlus;
/**
* ${functionName}Mapper接口

4
klp-generator/src/main/resources/vm/java/service.java.vm
View File

@@ -4,8 +4,8 @@ import ${packageName}.domain.${ClassName};
import ${packageName}.domain.vo.${ClassName}Vo;
import ${packageName}.domain.bo.${ClassName}Bo;
#if($table.crud || $table.sub)
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
#end
import java.util.Collection;

4
klp-generator/src/main/resources/vm/java/serviceImpl.java.vm
View File

@@ -2,8 +2,8 @@ package ${packageName}.service.impl;
import cn.hutool.core.bean.BeanUtil;
#if($table.crud || $table.sub)
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.core.domain.PageQuery;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
#end
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

2
klp-generator/src/main/resources/vm/java/sub-domain.java.vm
View File

@@ -5,7 +5,7 @@ import ${import};
#end
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.klp.common.annotation.Excel;
import com.fad.common.annotation.Excel;
/**
* ${subTable.functionName}对象 ${subTableName}

4
klp-generator/src/main/resources/vm/java/vo.java.vm
View File

@@ -5,8 +5,8 @@ import ${import};
#end
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.fad.common.annotation.ExcelDictFormat;
import com.fad.common.convert.ExcelDictConvert;
import lombok.Data;