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

6
klp-admin/pom.xml
View File

@@ -94,16 +94,12 @@
<artifactId>klp-mes</artifactId>
</dependency>
<dependency>
<groupId>com.klp</groupId>
<artifactId>klp-pocket</artifactId>
</dependency>
<dependency>
<groupId>com.klp</groupId>
<artifactId>klp-erp</artifactId>
</dependency>
<!-- <dependency>-->
<!-- <groupId>com.klp</groupId>-->
<!-- <groupId>com.fad</groupId>-->
<!-- <artifactId>klp-hrm</artifactId>-->
<!-- </dependency>-->
<dependency>

2
klp-admin/src/main/java/com/klp/KLPApplication.java → klp-admin/src/main/java/com/fad/KLPApplication.java
View File

@@ -1,4 +1,4 @@
package com.klp;
package com.fad;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

2
klp-admin/src/main/java/com/klp/KLPServletInitializer.java → klp-admin/src/main/java/com/fad/KLPServletInitializer.java
View File

@@ -1,4 +1,4 @@
package com.klp;
package com.fad;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;

4
klp-admin/src/main/java/com/klp/framework/client/SqlServerApiClient.java → klp-admin/src/main/java/com/fad/framework/client/SqlServerApiClient.java
View File

@@ -1,7 +1,7 @@
package com.klp.framework.client;
package com.fad.framework.client;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.klp.framework.config.SqlServerApiProperties;
import com.fad.framework.config.SqlServerApiProperties;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpMethod;
import org.springframework.http.ResponseEntity;

2
klp-admin/src/main/java/com/klp/framework/config/SqlServerApiClientConfig.java → klp-admin/src/main/java/com/fad/framework/config/SqlServerApiClientConfig.java
View File

@@ -1,4 +1,4 @@
package com.klp.framework.config;
package com.fad.framework.config;
import org.springframework.boot.web.client.RestTemplateBuilder;
import org.springframework.context.annotation.Bean;

2
klp-admin/src/main/java/com/klp/framework/config/SqlServerApiProperties.java → klp-admin/src/main/java/com/fad/framework/config/SqlServerApiProperties.java
View File

@@ -1,4 +1,4 @@
package com.klp.framework.config;
package com.fad.framework.config;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;

12
klp-admin/src/main/java/com/klp/framework/controller/CoilComparisonController.java → klp-admin/src/main/java/com/fad/framework/controller/CoilComparisonController.java
View File

@@ -1,10 +1,10 @@
package com.klp.framework.controller;
package com.fad.framework.controller;
import com.klp.common.core.domain.R;
import com.klp.domain.bo.WmsMaterialCoilBo;
import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.framework.service.SqlServerApiBusinessService;
import com.klp.service.IWmsMaterialCoilService;
import com.fad.common.core.domain.R;
import com.fad.domain.bo.WmsMaterialCoilBo;
import com.fad.domain.vo.WmsMaterialCoilVo;
import com.fad.framework.service.SqlServerApiBusinessService;
import com.fad.service.IWmsMaterialCoilService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

4
klp-admin/src/main/java/com/klp/framework/service/SqlServerApiBusinessService.java → klp-admin/src/main/java/com/fad/framework/service/SqlServerApiBusinessService.java
View File

@@ -1,6 +1,6 @@
package com.klp.framework.service;
package com.fad.framework.service;
import com.klp.framework.client.SqlServerApiClient;
import com.fad.framework.client.SqlServerApiClient;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;

6
klp-admin/src/main/java/com/klp/framework/sqlserver/SqlServerApiController.java → klp-admin/src/main/java/com/fad/framework/sqlserver/SqlServerApiController.java
View File

@@ -1,7 +1,7 @@
package com.klp.framework.sqlserver;
package com.fad.framework.sqlserver;
import com.klp.common.core.domain.R;
import com.klp.framework.service.SqlServerApiBusinessService;
import com.fad.common.core.domain.R;
import com.fad.framework.service.SqlServerApiBusinessService;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;

32
klp-admin/src/main/java/com/klp/web/controller/common/CaptchaController.java → klp-admin/src/main/java/com/fad/web/controller/common/CaptchaController.java
View File

@@ -1,25 +1,25 @@
package com.klp.web.controller.common;
package com.fad.web.controller.common;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.captcha.AbstractCaptcha;
import cn.hutool.captcha.generator.CodeGenerator;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import com.klp.common.constant.CacheConstants;
import com.klp.common.constant.Constants;
import com.klp.common.core.domain.R;
import com.klp.common.enums.CaptchaType;
import com.klp.common.utils.StringUtils;
import com.klp.common.utils.email.MailUtils;
import com.klp.common.utils.redis.RedisUtils;
import com.klp.common.utils.reflect.ReflectUtils;
import com.klp.common.utils.spring.SpringUtils;
import com.klp.framework.config.properties.CaptchaProperties;
import com.klp.framework.config.properties.MailProperties;
import com.klp.sms.config.properties.SmsProperties;
import com.klp.sms.core.SmsTemplate;
import com.klp.sms.entity.SmsResult;
import com.klp.system.service.ISysConfigService;
import com.fad.common.constant.CacheConstants;
import com.fad.common.constant.Constants;
import com.fad.common.core.domain.R;
import com.fad.common.enums.CaptchaType;
import com.fad.common.utils.StringUtils;
import com.fad.common.utils.email.MailUtils;
import com.fad.common.utils.redis.RedisUtils;
import com.fad.common.utils.reflect.ReflectUtils;
import com.fad.common.utils.spring.SpringUtils;
import com.fad.framework.config.properties.CaptchaProperties;
import com.fad.framework.config.properties.MailProperties;
import com.fad.sms.config.properties.SmsProperties;
import com.fad.sms.core.SmsTemplate;
import com.fad.sms.entity.SmsResult;
import com.fad.system.service.ISysConfigService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.expression.Expression;

18
klp-admin/src/main/java/com/klp/web/controller/monitor/CacheController.java → klp-admin/src/main/java/com/fad/web/controller/monitor/CacheController.java
View File

@@ -1,15 +1,15 @@
package com.klp.web.controller.monitor;
package com.fad.web.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.collection.CollUtil;
import com.klp.common.constant.CacheConstants;
import com.klp.common.constant.CacheNames;
import com.klp.common.core.domain.R;
import com.klp.common.utils.JsonUtils;
import com.klp.common.utils.StringUtils;
import com.klp.common.utils.redis.CacheUtils;
import com.klp.common.utils.redis.RedisUtils;
import com.klp.system.domain.SysCache;
import com.fad.common.constant.CacheConstants;
import com.fad.common.constant.CacheNames;
import com.fad.common.core.domain.R;
import com.fad.common.utils.JsonUtils;
import com.fad.common.utils.StringUtils;
import com.fad.common.utils.redis.CacheUtils;
import com.fad.common.utils.redis.RedisUtils;
import com.fad.system.domain.SysCache;
import lombok.RequiredArgsConstructor;
import org.redisson.spring.data.connection.RedissonConnectionFactory;
import org.springframework.data.redis.connection.RedisConnection;

24
klp-admin/src/main/java/com/klp/web/controller/monitor/SysLogininforController.java → klp-admin/src/main/java/com/fad/web/controller/monitor/SysLogininforController.java
View File

@@ -1,17 +1,17 @@
package com.klp.web.controller.monitor;
package com.fad.web.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.klp.common.annotation.Log;
import com.klp.common.constant.CacheConstants;
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.common.utils.poi.ExcelUtil;
import com.klp.common.utils.redis.RedisUtils;
import com.klp.system.domain.SysLogininfor;
import com.klp.system.service.ISysLogininforService;
import com.fad.common.annotation.Log;
import com.fad.common.constant.CacheConstants;
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.common.utils.poi.ExcelUtil;
import com.fad.common.utils.redis.RedisUtils;
import com.fad.system.domain.SysLogininfor;
import com.fad.system.service.ISysLogininforService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

20
klp-admin/src/main/java/com/klp/web/controller/monitor/SysOperlogController.java → klp-admin/src/main/java/com/fad/web/controller/monitor/SysOperlogController.java
View File

@@ -1,15 +1,15 @@
package com.klp.web.controller.monitor;
package com.fad.web.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission;
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.common.utils.poi.ExcelUtil;
import com.klp.system.domain.SysOperLog;
import com.klp.system.service.ISysOperLogService;
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.common.utils.poi.ExcelUtil;
import com.fad.system.domain.SysOperLog;
import com.fad.system.service.ISysOperLogService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

24
klp-admin/src/main/java/com/klp/web/controller/monitor/SysUserOnlineController.java → klp-admin/src/main/java/com/fad/web/controller/monitor/SysUserOnlineController.java
View File

@@ -1,20 +1,20 @@
package com.klp.web.controller.monitor;
package com.fad.web.controller.monitor;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.exception.NotLoginException;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.bean.BeanUtil;
import com.klp.common.annotation.Log;
import com.klp.common.constant.CacheConstants;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.R;
import com.klp.common.core.domain.dto.UserOnlineDTO;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.StreamUtils;
import com.klp.common.utils.StringUtils;
import com.klp.common.utils.redis.RedisUtils;
import com.klp.system.domain.SysUserOnline;
import com.fad.common.annotation.Log;
import com.fad.common.constant.CacheConstants;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.R;
import com.fad.common.core.domain.dto.UserOnlineDTO;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.StreamUtils;
import com.fad.common.utils.StringUtils;
import com.fad.common.utils.redis.RedisUtils;
import com.fad.system.domain.SysUserOnline;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

20
klp-admin/src/main/java/com/klp/web/controller/system/SysConfigController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysConfigController.java
View File

@@ -1,15 +1,15 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
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.common.utils.poi.ExcelUtil;
import com.klp.system.domain.SysConfig;
import com.klp.system.service.ISysConfigService;
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.common.utils.poi.ExcelUtil;
import com.fad.system.domain.SysConfig;
import com.fad.system.service.ISysConfigService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

18
klp-admin/src/main/java/com/klp/web/controller/system/SysDeptController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysDeptController.java
View File

@@ -1,15 +1,15 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.convert.Convert;
import com.klp.common.annotation.Log;
import com.klp.common.constant.UserConstants;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.R;
import com.klp.common.core.domain.entity.SysDept;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.StringUtils;
import com.klp.system.service.ISysDeptService;
import com.fad.common.annotation.Log;
import com.fad.common.constant.UserConstants;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.R;
import com.fad.common.core.domain.entity.SysDept;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.StringUtils;
import com.fad.system.service.ISysDeptService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

20
klp-admin/src/main/java/com/klp/web/controller/system/SysDictDataController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysDictDataController.java
View File

@@ -1,16 +1,16 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil;
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.domain.entity.SysDictData;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.system.service.ISysDictDataService;
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.domain.entity.SysDictData;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.system.service.ISysDictDataService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

20
klp-admin/src/main/java/com/klp/web/controller/system/SysDictTypeController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysDictTypeController.java
View File

@@ -1,15 +1,15 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
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.domain.entity.SysDictType;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.system.service.ISysDictTypeService;
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.domain.entity.SysDictType;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.system.service.ISysDictTypeService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

6
klp-admin/src/main/java/com/klp/web/controller/system/SysIndexController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysIndexController.java
View File

@@ -1,8 +1,8 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.annotation.SaIgnore;
import com.klp.common.config.KLPConfig;
import com.klp.common.utils.StringUtils;
import com.fad.common.config.KLPConfig;
import com.fad.common.utils.StringUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;

28
klp-admin/src/main/java/com/klp/web/controller/system/SysLoginController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysLoginController.java
View File

@@ -1,19 +1,19 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.annotation.SaIgnore;
import com.klp.common.constant.Constants;
import com.klp.common.core.domain.R;
import com.klp.common.core.domain.entity.SysMenu;
import com.klp.common.core.domain.entity.SysUser;
import com.klp.common.core.domain.model.EmailLoginBody;
import com.klp.common.core.domain.model.LoginBody;
import com.klp.common.core.domain.model.LoginUser;
import com.klp.common.core.domain.model.SmsLoginBody;
import com.klp.common.helper.LoginHelper;
import com.klp.system.domain.vo.RouterVo;
import com.klp.system.service.ISysMenuService;
import com.klp.system.service.ISysUserService;
import com.klp.system.service.SysLoginService;
import com.fad.common.constant.Constants;
import com.fad.common.core.domain.R;
import com.fad.common.core.domain.entity.SysMenu;
import com.fad.common.core.domain.entity.SysUser;
import com.fad.common.core.domain.model.EmailLoginBody;
import com.fad.common.core.domain.model.LoginBody;
import com.fad.common.core.domain.model.LoginUser;
import com.fad.common.core.domain.model.SmsLoginBody;
import com.fad.common.helper.LoginHelper;
import com.fad.system.domain.vo.RouterVo;
import com.fad.system.service.ISysMenuService;
import com.fad.system.service.ISysUserService;
import com.fad.system.service.SysLoginService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;

18
klp-admin/src/main/java/com/klp/web/controller/system/SysMenuController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysMenuController.java
View File

@@ -1,15 +1,15 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.lang.tree.Tree;
import com.klp.common.annotation.Log;
import com.klp.common.constant.UserConstants;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.R;
import com.klp.common.core.domain.entity.SysMenu;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.StringUtils;
import com.klp.system.service.ISysMenuService;
import com.fad.common.annotation.Log;
import com.fad.common.constant.UserConstants;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.R;
import com.fad.common.core.domain.entity.SysMenu;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.StringUtils;
import com.fad.system.service.ISysMenuService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

18
klp-admin/src/main/java/com/klp/web/controller/system/SysNoticeController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysNoticeController.java
View File

@@ -1,14 +1,14 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
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.system.domain.SysNotice;
import com.klp.system.service.ISysNoticeService;
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.system.domain.SysNotice;
import com.fad.system.service.ISysNoticeService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

28
klp-admin/src/main/java/com/klp/web/controller/system/SysOssConfigController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysOssConfigController.java
View File

@@ -1,19 +1,19 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.klp.common.annotation.Log;
import com.klp.common.annotation.RepeatSubmit;
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.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.klp.common.core.validate.QueryGroup;
import com.klp.common.enums.BusinessType;
import com.klp.system.domain.bo.SysOssConfigBo;
import com.klp.system.domain.vo.SysOssConfigVo;
import com.klp.system.service.ISysOssConfigService;
import com.fad.common.annotation.Log;
import com.fad.common.annotation.RepeatSubmit;
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.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import com.fad.common.core.validate.QueryGroup;
import com.fad.common.enums.BusinessType;
import com.fad.system.domain.bo.SysOssConfigBo;
import com.fad.system.domain.vo.SysOssConfigVo;
import com.fad.system.service.ISysOssConfigService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

22
klp-admin/src/main/java/com/klp/web/controller/system/SysOssController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysOssController.java
View File

@@ -1,18 +1,18 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil;
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.core.validate.QueryGroup;
import com.klp.common.enums.BusinessType;
import com.klp.system.domain.bo.SysOssBo;
import com.klp.system.domain.vo.SysOssVo;
import com.klp.system.service.ISysOssService;
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.core.validate.QueryGroup;
import com.fad.common.enums.BusinessType;
import com.fad.system.domain.bo.SysOssBo;
import com.fad.system.domain.vo.SysOssVo;
import com.fad.system.service.ISysOssService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;

20
klp-admin/src/main/java/com/klp/web/controller/system/SysPostController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysPostController.java
View File

@@ -1,15 +1,15 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
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.common.utils.poi.ExcelUtil;
import com.klp.system.domain.SysPost;
import com.klp.system.service.ISysPostService;
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.common.utils.poi.ExcelUtil;
import com.fad.system.domain.SysPost;
import com.fad.system.service.ISysPostService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

24
klp-admin/src/main/java/com/klp/web/controller/system/SysProfileController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysProfileController.java
View File

@@ -1,18 +1,18 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.secure.BCrypt;
import cn.hutool.core.io.FileUtil;
import com.klp.common.annotation.Log;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.R;
import com.klp.common.core.domain.entity.SysUser;
import com.klp.common.enums.BusinessType;
import com.klp.common.helper.LoginHelper;
import com.klp.common.utils.StringUtils;
import com.klp.common.utils.file.MimeTypeUtils;
import com.klp.system.domain.vo.SysOssVo;
import com.klp.system.service.ISysOssService;
import com.klp.system.service.ISysUserService;
import com.fad.common.annotation.Log;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.R;
import com.fad.common.core.domain.entity.SysUser;
import com.fad.common.enums.BusinessType;
import com.fad.common.helper.LoginHelper;
import com.fad.common.utils.StringUtils;
import com.fad.common.utils.file.MimeTypeUtils;
import com.fad.system.domain.vo.SysOssVo;
import com.fad.system.service.ISysOssService;
import com.fad.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;

12
klp-admin/src/main/java/com/klp/web/controller/system/SysRegisterController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysRegisterController.java
View File

@@ -1,11 +1,11 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.annotation.SaIgnore;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.R;
import com.klp.common.core.domain.model.RegisterBody;
import com.klp.system.service.ISysConfigService;
import com.klp.system.service.SysRegisterService;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.R;
import com.fad.common.core.domain.model.RegisterBody;
import com.fad.system.service.ISysConfigService;
import com.fad.system.service.SysRegisterService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;

32
klp-admin/src/main/java/com/klp/web/controller/system/SysRoleController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysRoleController.java
View File

@@ -1,21 +1,21 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission;
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.domain.entity.SysDept;
import com.klp.common.core.domain.entity.SysRole;
import com.klp.common.core.domain.entity.SysUser;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.enums.BusinessType;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.system.domain.SysUserRole;
import com.klp.system.service.ISysDeptService;
import com.klp.system.service.ISysRoleService;
import com.klp.system.service.ISysUserService;
import com.klp.system.service.SysPermissionService;
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.domain.entity.SysDept;
import com.fad.common.core.domain.entity.SysRole;
import com.fad.common.core.domain.entity.SysUser;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.enums.BusinessType;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.system.domain.SysUserRole;
import com.fad.system.service.ISysDeptService;
import com.fad.system.service.ISysRoleService;
import com.fad.system.service.ISysUserService;
import com.fad.system.service.SysPermissionService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

44
klp-admin/src/main/java/com/klp/web/controller/system/SysUserController.java → klp-admin/src/main/java/com/fad/web/controller/system/SysUserController.java
View File

@@ -1,4 +1,4 @@
package com.klp.web.controller.system;
package com.fad.web.controller.system;
import cn.dev33.satoken.annotation.SaCheckLogin;
import cn.dev33.satoken.annotation.SaCheckPermission;
@@ -7,27 +7,27 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.lang.tree.Tree;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
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.domain.entity.SysDept;
import com.klp.common.core.domain.entity.SysRole;
import com.klp.common.core.domain.entity.SysUser;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.enums.BusinessType;
import com.klp.common.excel.ExcelResult;
import com.klp.common.helper.LoginHelper;
import com.klp.common.utils.StreamUtils;
import com.klp.common.utils.StringUtils;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.system.domain.vo.SysUserExportVo;
import com.klp.system.domain.vo.SysUserImportVo;
import com.klp.system.listener.SysUserImportListener;
import com.klp.system.service.ISysDeptService;
import com.klp.system.service.ISysPostService;
import com.klp.system.service.ISysRoleService;
import com.klp.system.service.ISysUserService;
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.domain.entity.SysDept;
import com.fad.common.core.domain.entity.SysRole;
import com.fad.common.core.domain.entity.SysUser;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.enums.BusinessType;
import com.fad.common.excel.ExcelResult;
import com.fad.common.helper.LoginHelper;
import com.fad.common.utils.StreamUtils;
import com.fad.common.utils.StringUtils;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.system.domain.vo.SysUserExportVo;
import com.fad.system.domain.vo.SysUserImportVo;
import com.fad.system.listener.SysUserImportListener;
import com.fad.system.service.ISysDeptService;
import com.fad.system.service.ISysPostService;
import com.fad.system.service.ISysRoleService;
import com.fad.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;

8
klp-admin/src/main/java/com/klp/web/controller/websocket/WebSocketTestController.java → klp-admin/src/main/java/com/fad/web/controller/websocket/WebSocketTestController.java
View File

@@ -1,9 +1,9 @@
package com.klp.web.controller.websocket;
package com.fad.web.controller.websocket;
import cn.dev33.satoken.annotation.SaIgnore;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.R;
import com.klp.framework.websocket.WebSocketUsers;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.R;
import com.fad.framework.websocket.WebSocketUsers;
import org.springframework.web.bind.annotation.*;
import javax.websocket.Session;

28
klp-admin/src/main/java/com/klp/wms/WmsSpecSyncController.java → klp-admin/src/main/java/com/fad/wms/WmsSpecSyncController.java
View File

@@ -1,21 +1,21 @@
package com.klp.wms;
package com.fad.wms;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.R;
import com.klp.domain.WmsCoilPendingAction;
import com.klp.domain.WmsProductionLine;
import com.klp.domain.bo.WmsMaterialCoilBo;
import com.klp.domain.vo.WmsCoilPendingActionVo;
import com.klp.domain.vo.WmsMaterialCoilVo;
import com.klp.domain.vo.WmsProcessSpecVersionVo;
import com.klp.framework.service.SqlServerApiBusinessService;
import com.klp.mapper.WmsCoilPendingActionMapper;
import com.klp.mapper.WmsProductionLineMapper;
import com.klp.service.IWmsMaterialCoilService;
import com.klp.service.IWmsProcessSpecVersionService;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.R;
import com.fad.domain.WmsCoilPendingAction;
import com.fad.domain.WmsProductionLine;
import com.fad.domain.bo.WmsMaterialCoilBo;
import com.fad.domain.vo.WmsCoilPendingActionVo;
import com.fad.domain.vo.WmsMaterialCoilVo;
import com.fad.domain.vo.WmsProcessSpecVersionVo;
import com.fad.framework.service.SqlServerApiBusinessService;
import com.fad.mapper.WmsCoilPendingActionMapper;
import com.fad.mapper.WmsProductionLineMapper;
import com.fad.service.IWmsMaterialCoilService;
import com.fad.service.IWmsProcessSpecVersionService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.util.StringUtils;

39
klp-admin/src/main/resources/application-dev.yml
View File

@@ -7,20 +7,6 @@ klp:
# 开发环境文件存储目录
directory-path: testDirectory
--- # sql-server-api 中间件配置（开发/测试环境）
sql-server-api:
host: 140.143.206.120
port: 15000
base-url: http://${sql-server-api.host}:${sql-server-api.port}
--- # OEE 聚合（klp-da）多服务地址配置
da:
oee:
# 酸轧线（klp-pocket）在同一套服务内时可指向本服务端口
acid-line-base-url: http://localhost:${server.port}
# 镀锌一线（Fizz）
galvanize-line-base-url: http://140.143.206.120:18081
--- # 监控中心配置
spring.boot.admin.client:
# 增加客户端开关
@@ -81,31 +67,6 @@ spring:
url: jdbc:mysql://140.143.206.120:13306/klp-oa-test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
username: klp
password: KeLunPu@123
# 从库数据源
acid:
lazy: true
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://140.143.206.120:13306/klp_pocketfactory?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
username: klp
password: KeLunPu@123
# 从库数据源（镀锌一库）
galvanize1:
lazy: true
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://140.143.206.120:3306/cgldb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
username: klp
password: KeLunPu123@
# 双机架数据源
double-rack:
lazy: true
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://140.143.206.120:13306/double-rack?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username: klp
password: KeLunPu@123
# Oracle 数据源
acid-l2:
lazy: true

39
klp-admin/src/main/resources/application-prod.yml
View File

@@ -7,20 +7,6 @@ klp:
# 生产环境文件存储目录
directory-path: /home/ubuntu/oa/folder
--- # sql-server-api 中间件配置（生产环境）
sql-server-api:
host: 140.143.206.120
port: 15000
base-url: http://${sql-server-api.host}:${sql-server-api.port}
--- # OEE 聚合（klp-da）多服务地址配置
da:
oee:
# 酸轧线（klp-pocket）在同一套服务内时可指向本服务端口（也可改成内网域名）
acid-line-base-url: http://127.0.0.1:${server.port}
# 镀锌一线（Fizz）
galvanize-line-base-url: http://140.143.206.120:18081
--- # 监控中心配置
spring.boot.admin.client:
# 增加客户端开关
@@ -75,23 +61,6 @@ spring:
url: jdbc:mysql://117.72.159.31:3307/fad_l3?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
username: root
password: 135827
# 从库数据源（酸轧库）
acid:
lazy: true
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://117.72.159.31:3307/klp_pocketfactory?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
username: root
password: 135827
# 从库数据源（镀锌一库）
galvanize1:
lazy: true
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://117.72.159.31:3307/cgldb?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true
username: root
password: 135827
# Oracle 数据源
acid-l2:
lazy: true
@@ -104,14 +73,6 @@ spring:
hikari:
connectionTestQuery: SELECT 1 FROM DUAL
# 双机架数据源
double-rack:
lazy: true
type: ${spring.datasource.type}
driverClassName: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://117.72.159.31:3307/double_rack?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
username: root
password: 135827
# postgres:
# type: ${spring.datasource.type}
# driverClassName: org.postgresql.Driver

5
klp-admin/src/main/resources/application.yml
View File

@@ -339,8 +339,3 @@ stamp:
api-key: changeme # 替换为实际鉴权信息
timeout-ms: 5000 # 可按需调整
# OEE配置
oee:
acid:
# 酸轧入场卷创建人（wms_material_coil.create_by）
coil-create-by: suanzhakuguan

4158
klp-admin/src/main/resources/db/migration/V1__init.sql
View File

File diff suppressed because it is too large Load Diff

2
klp-admin/src/test/java/com/klp/test/AssertUnitTest.java → klp-admin/src/test/java/com/fad/test/AssertUnitTest.java
View File

@@ -1,4 +1,4 @@
package com.klp.test;
package com.fad.test;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.DisplayName;

4
klp-admin/src/test/java/com/klp/test/DemoUnitTest.java → klp-admin/src/test/java/com/fad/test/DemoUnitTest.java
View File

@@ -1,6 +1,6 @@
package com.klp.test;
package com.fad.test;
import com.klp.common.config.KLPConfig;
import com.fad.common.config.KLPConfig;
import org.junit.jupiter.api.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;

4
klp-admin/src/test/java/com/klp/test/ParamUnitTest.java → klp-admin/src/test/java/com/fad/test/ParamUnitTest.java
View File

@@ -1,6 +1,6 @@
package com.klp.test;
package com.fad.test;
import com.klp.common.enums.UserType;
import com.fad.common.enums.UserType;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;

2
klp-admin/src/test/java/com/klp/test/TagUnitTest.java → klp-admin/src/test/java/com/fad/test/TagUnitTest.java
View File

@@ -1,4 +1,4 @@
package com.klp.test;
package com.fad.test;
import org.junit.jupiter.api.*;
import org.springframework.boot.test.context.SpringBootTest;