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-demo/src/main/java/com/klp/demo/controller/MailController.java
View File

@@ -1,7 +1,7 @@
package com.klp.demo.controller;
package com.fad.demo.controller;
import com.klp.common.core.domain.R;
import com.klp.common.utils.email.MailUtils;
import com.fad.common.core.domain.R;
import com.fad.common.utils.email.MailUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;

8
klp-demo/src/main/java/com/klp/demo/controller/RedisCacheController.java
View File

@@ -1,8 +1,8 @@
package com.klp.demo.controller;
package com.fad.demo.controller;
import com.klp.common.constant.CacheNames;
import com.klp.common.core.domain.R;
import com.klp.common.utils.redis.RedisUtils;
import com.fad.common.constant.CacheNames;
import com.fad.common.core.domain.R;
import com.fad.common.utils.redis.RedisUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.CachePut;

4
klp-demo/src/main/java/com/klp/demo/controller/RedisLockController.java
View File

@@ -1,10 +1,10 @@
package com.klp.demo.controller;
package com.fad.demo.controller;
import com.baomidou.lock.LockInfo;
import com.baomidou.lock.LockTemplate;
import com.baomidou.lock.annotation.Lock4j;
import com.baomidou.lock.executor.RedissonLockExecutor;
import com.klp.common.core.domain.R;
import com.fad.common.core.domain.R;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;

6
klp-demo/src/main/java/com/klp/demo/controller/RedisPubSubController.java
View File

@@ -1,7 +1,7 @@
package com.klp.demo.controller;
package com.fad.demo.controller;
import com.klp.common.core.domain.R;
import com.klp.common.utils.redis.RedisUtils;
import com.fad.common.core.domain.R;
import com.fad.common.utils.redis.RedisUtils;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

8
klp-demo/src/main/java/com/klp/demo/controller/RedisRateLimiterController.java
View File

@@ -1,8 +1,8 @@
package com.klp.demo.controller;
package com.fad.demo.controller;
import com.klp.common.annotation.RateLimiter;
import com.klp.common.core.domain.R;
import com.klp.common.enums.LimitType;
import com.fad.common.annotation.RateLimiter;
import com.fad.common.core.domain.R;
import com.fad.common.enums.LimitType;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

10
klp-demo/src/main/java/com/klp/demo/controller/SmsController.java
View File

@@ -1,9 +1,9 @@
package com.klp.demo.controller;
package com.fad.demo.controller;
import com.klp.common.core.domain.R;
import com.klp.common.utils.spring.SpringUtils;
import com.klp.sms.config.properties.SmsProperties;
import com.klp.sms.core.SmsTemplate;
import com.fad.common.core.domain.R;
import com.fad.common.utils.spring.SpringUtils;
import com.fad.sms.config.properties.SmsProperties;
import com.fad.sms.core.SmsTemplate;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;

4
klp-demo/src/main/java/com/klp/demo/controller/Swagger3DemoController.java
View File

@@ -1,6 +1,6 @@
package com.klp.demo.controller;
package com.fad.demo.controller;
import com.klp.common.core.domain.R;
import com.fad.common.core.domain.R;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;

10
klp-demo/src/main/java/com/klp/demo/controller/TestBatchController.java
View File

@@ -1,10 +1,10 @@
package com.klp.demo.controller;
package com.fad.demo.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.R;
import com.klp.demo.domain.TestDemo;
import com.klp.demo.mapper.TestDemoMapper;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.R;
import com.fad.demo.domain.TestDemo;
import com.fad.demo.mapper.TestDemoMapper;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;

38
klp-demo/src/main/java/com/klp/demo/controller/TestDemoController.java
View File

@@ -1,25 +1,25 @@
package com.klp.demo.controller;
package com.fad.demo.controller;
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.bean.BeanUtil;
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.common.excel.ExcelResult;
import com.klp.common.utils.ValidatorUtils;
import com.klp.common.utils.poi.ExcelUtil;
import com.klp.demo.domain.TestDemo;
import com.klp.demo.domain.bo.TestDemoBo;
import com.klp.demo.domain.bo.TestDemoImportVo;
import com.klp.demo.domain.vo.TestDemoVo;
import com.klp.demo.service.ITestDemoService;
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.common.excel.ExcelResult;
import com.fad.common.utils.ValidatorUtils;
import com.fad.common.utils.poi.ExcelUtil;
import com.fad.demo.domain.TestDemo;
import com.fad.demo.domain.bo.TestDemoBo;
import com.fad.demo.domain.bo.TestDemoImportVo;
import com.fad.demo.domain.vo.TestDemoVo;
import com.fad.demo.service.ITestDemoService;
import lombok.RequiredArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated;

8
klp-demo/src/main/java/com/klp/demo/controller/TestEncryptController.java
View File

@@ -1,8 +1,8 @@
package com.klp.demo.controller;
package com.fad.demo.controller;
import com.klp.common.core.domain.R;
import com.klp.demo.domain.TestDemoEncrypt;
import com.klp.demo.mapper.TestDemoEncryptMapper;
import com.fad.common.core.domain.R;
import com.fad.demo.domain.TestDemoEncrypt;
import com.fad.demo.mapper.TestDemoEncryptMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;

4
klp-demo/src/main/java/com/klp/demo/controller/TestExcelController.java
View File

@@ -1,7 +1,7 @@
package com.klp.demo.controller;
package com.fad.demo.controller;
import cn.hutool.core.collection.CollUtil;
import com.klp.common.utils.poi.ExcelUtil;
import com.fad.common.utils.poi.ExcelUtil;
import lombok.AllArgsConstructor;
import lombok.Data;
import org.springframework.web.bind.annotation.GetMapping;

6
klp-demo/src/main/java/com/klp/demo/controller/TestI18nController.java
View File

@@ -1,7 +1,7 @@
package com.klp.demo.controller;
package com.fad.demo.controller;
import com.klp.common.core.domain.R;
import com.klp.common.utils.MessageUtils;
import com.fad.common.core.domain.R;
import com.fad.common.utils.MessageUtils;
import lombok.Data;
import org.hibernate.validator.constraints.Range;
import org.springframework.validation.annotation.Validated;

12
klp-demo/src/main/java/com/klp/demo/controller/TestSensitiveController.java
View File

@@ -1,9 +1,9 @@
package com.klp.demo.controller;
package com.fad.demo.controller;
import com.klp.common.annotation.Sensitive;
import com.klp.common.core.controller.BaseController;
import com.klp.common.core.domain.R;
import com.klp.common.enums.SensitiveStrategy;
import com.fad.common.annotation.Sensitive;
import com.fad.common.core.controller.BaseController;
import com.fad.common.core.domain.R;
import com.fad.common.enums.SensitiveStrategy;
import lombok.Data;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
*
* @author Lion Li
* @version 3.6.0
* @see com.klp.common.core.service.SensitiveService
* @see com.fad.common.core.service.SensitiveService
*/
@RestController
@RequestMapping("/demo/sensitive")

26
klp-demo/src/main/java/com/klp/demo/controller/TestTreeController.java
View File

@@ -1,18 +1,18 @@
package com.klp.demo.controller;
package com.fad.demo.controller;
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.R;
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.common.utils.poi.ExcelUtil;
import com.klp.demo.domain.bo.TestTreeBo;
import com.klp.demo.domain.vo.TestTreeVo;
import com.klp.demo.service.ITestTreeService;
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.R;
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.common.utils.poi.ExcelUtil;
import com.fad.demo.domain.bo.TestTreeBo;
import com.fad.demo.domain.vo.TestTreeVo;
import com.fad.demo.service.ITestTreeService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

2
klp-demo/src/main/java/com/klp/demo/controller/package-info.java
View File

@@ -1 +1 @@
package com.klp.demo.controller;
package com.fad.demo.controller;

6
klp-demo/src/main/java/com/klp/demo/controller/queue/BoundedQueueController.java
View File

@@ -1,7 +1,7 @@
package com.klp.demo.controller.queue;
package com.fad.demo.controller.queue;
import com.klp.common.core.domain.R;
import com.klp.common.utils.redis.QueueUtils;
import com.fad.common.core.domain.R;
import com.fad.common.utils.redis.QueueUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;

6
klp-demo/src/main/java/com/klp/demo/controller/queue/DelayedQueueController.java
View File

@@ -1,7 +1,7 @@
package com.klp.demo.controller.queue;
package com.fad.demo.controller.queue;
import com.klp.common.core.domain.R;
import com.klp.common.utils.redis.QueueUtils;
import com.fad.common.core.domain.R;
import com.fad.common.utils.redis.QueueUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;

2
klp-demo/src/main/java/com/klp/demo/controller/queue/PriorityDemo.java
View File

@@ -1,4 +1,4 @@
package com.klp.demo.controller.queue;
package com.fad.demo.controller.queue;
import lombok.Data;
import lombok.NoArgsConstructor;

6
klp-demo/src/main/java/com/klp/demo/controller/queue/PriorityQueueController.java
View File

@@ -1,8 +1,8 @@
package com.klp.demo.controller.queue;
package com.fad.demo.controller.queue;
import cn.hutool.core.util.RandomUtil;
import com.klp.common.core.domain.R;
import com.klp.common.utils.redis.QueueUtils;
import com.fad.common.core.domain.R;
import com.fad.common.utils.redis.QueueUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;

4
klp-demo/src/main/java/com/klp/demo/domain/TestDemo.java
View File

@@ -1,7 +1,7 @@
package com.klp.demo.domain;
package com.fad.demo.domain;
import com.baomidou.mybatisplus.annotation.*;
import com.klp.common.core.domain.BaseEntity;
import com.fad.common.core.domain.BaseEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

6
klp-demo/src/main/java/com/klp/demo/domain/TestDemoEncrypt.java
View File

@@ -1,8 +1,8 @@
package com.klp.demo.domain;
package com.fad.demo.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.klp.common.annotation.EncryptField;
import com.klp.common.enums.AlgorithmType;
import com.fad.common.annotation.EncryptField;
import com.fad.common.enums.AlgorithmType;
import lombok.Data;
import lombok.EqualsAndHashCode;

4
klp-demo/src/main/java/com/klp/demo/domain/TestTree.java
View File

@@ -1,10 +1,10 @@
package com.klp.demo.domain;
package com.fad.demo.domain;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.Version;
import com.klp.common.core.domain.TreeEntity;
import com.fad.common.core.domain.TreeEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

8
klp-demo/src/main/java/com/klp/demo/domain/bo/TestDemoBo.java
View File

@@ -1,8 +1,8 @@
package com.klp.demo.domain.bo;
package com.fad.demo.domain.bo;
import com.klp.common.core.domain.BaseEntity;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.fad.common.core.domain.BaseEntity;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
klp-demo/src/main/java/com/klp/demo/domain/bo/TestDemoImportVo.java
View File

@@ -1,4 +1,4 @@
package com.klp.demo.domain.bo;
package com.fad.demo.domain.bo;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;

8
klp-demo/src/main/java/com/klp/demo/domain/bo/TestTreeBo.java
View File

@@ -1,8 +1,8 @@
package com.klp.demo.domain.bo;
package com.fad.demo.domain.bo;
import com.klp.common.core.domain.TreeEntity;
import com.klp.common.core.validate.AddGroup;
import com.klp.common.core.validate.EditGroup;
import com.fad.common.core.domain.TreeEntity;
import com.fad.common.core.validate.AddGroup;
import com.fad.common.core.validate.EditGroup;
import lombok.Data;
import lombok.EqualsAndHashCode;

2
klp-demo/src/main/java/com/klp/demo/domain/package-info.java
View File

@@ -1 +1 @@
package com.klp.demo.domain;
package com.fad.demo.domain;

2
klp-demo/src/main/java/com/klp/demo/domain/vo/TestDemoVo.java
View File

@@ -1,4 +1,4 @@
package com.klp.demo.domain.vo;
package com.fad.demo.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;

2
klp-demo/src/main/java/com/klp/demo/domain/vo/TestTreeVo.java
View File

@@ -1,4 +1,4 @@
package com.klp.demo.domain.vo;
package com.fad.demo.domain.vo;
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;

6
klp-demo/src/main/java/com/klp/demo/mapper/TestDemoEncryptMapper.java
View File

@@ -1,7 +1,7 @@
package com.klp.demo.mapper;
package com.fad.demo.mapper;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.klp.demo.domain.TestDemoEncrypt;
import com.fad.common.core.mapper.BaseMapperPlus;
import com.fad.demo.domain.TestDemoEncrypt;
/**
* 测试加密功能

12
klp-demo/src/main/java/com/klp/demo/mapper/TestDemoMapper.java
View File

@@ -1,14 +1,14 @@
package com.klp.demo.mapper;
package com.fad.demo.mapper;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.klp.common.annotation.DataColumn;
import com.klp.common.annotation.DataPermission;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.klp.demo.domain.TestDemo;
import com.klp.demo.domain.vo.TestDemoVo;
import com.fad.common.annotation.DataColumn;
import com.fad.common.annotation.DataPermission;
import com.fad.common.core.mapper.BaseMapperPlus;
import com.fad.demo.domain.TestDemo;
import com.fad.demo.domain.vo.TestDemoVo;
import org.apache.ibatis.annotations.Param;
import java.util.Collection;

12
klp-demo/src/main/java/com/klp/demo/mapper/TestTreeMapper.java
View File

@@ -1,10 +1,10 @@
package com.klp.demo.mapper;
package com.fad.demo.mapper;
import com.klp.common.annotation.DataColumn;
import com.klp.common.annotation.DataPermission;
import com.klp.common.core.mapper.BaseMapperPlus;
import com.klp.demo.domain.TestTree;
import com.klp.demo.domain.vo.TestTreeVo;
import com.fad.common.annotation.DataColumn;
import com.fad.common.annotation.DataPermission;
import com.fad.common.core.mapper.BaseMapperPlus;
import com.fad.demo.domain.TestTree;
import com.fad.demo.domain.vo.TestTreeVo;
/**
* 测试树表Mapper接口

2
klp-demo/src/main/java/com/klp/demo/mapper/package-info.java
View File

@@ -1 +1 @@
package com.klp.demo.mapper;
package com.fad.demo.mapper;

12
klp-demo/src/main/java/com/klp/demo/service/ITestDemoService.java
View File

@@ -1,10 +1,10 @@
package com.klp.demo.service;
package com.fad.demo.service;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.page.TableDataInfo;
import com.klp.demo.domain.TestDemo;
import com.klp.demo.domain.bo.TestDemoBo;
import com.klp.demo.domain.vo.TestDemoVo;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.demo.domain.TestDemo;
import com.fad.demo.domain.bo.TestDemoBo;
import com.fad.demo.domain.vo.TestDemoVo;
import java.util.Collection;
import java.util.List;

6
klp-demo/src/main/java/com/klp/demo/service/ITestTreeService.java
View File

@@ -1,7 +1,7 @@
package com.klp.demo.service;
package com.fad.demo.service;
import com.klp.demo.domain.bo.TestTreeBo;
import com.klp.demo.domain.vo.TestTreeVo;
import com.fad.demo.domain.bo.TestTreeBo;
import com.fad.demo.domain.vo.TestTreeVo;
import java.util.Collection;
import java.util.List;

18
klp-demo/src/main/java/com/klp/demo/service/impl/TestDemoServiceImpl.java
View File

@@ -1,17 +1,17 @@
package com.klp.demo.service.impl;
package com.fad.demo.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.utils.StringUtils;
import com.klp.demo.domain.TestDemo;
import com.klp.demo.domain.bo.TestDemoBo;
import com.klp.demo.domain.vo.TestDemoVo;
import com.klp.demo.mapper.TestDemoMapper;
import com.klp.demo.service.ITestDemoService;
import com.fad.common.core.domain.PageQuery;
import com.fad.common.core.page.TableDataInfo;
import com.fad.common.utils.StringUtils;
import com.fad.demo.domain.TestDemo;
import com.fad.demo.domain.bo.TestDemoBo;
import com.fad.demo.domain.vo.TestDemoVo;
import com.fad.demo.mapper.TestDemoMapper;
import com.fad.demo.service.ITestDemoService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

14
klp-demo/src/main/java/com/klp/demo/service/impl/TestTreeServiceImpl.java
View File

@@ -1,14 +1,14 @@
package com.klp.demo.service.impl;
package com.fad.demo.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.klp.common.utils.StringUtils;
import com.klp.demo.domain.TestTree;
import com.klp.demo.domain.bo.TestTreeBo;
import com.klp.demo.domain.vo.TestTreeVo;
import com.klp.demo.mapper.TestTreeMapper;
import com.klp.demo.service.ITestTreeService;
import com.fad.common.utils.StringUtils;
import com.fad.demo.domain.TestTree;
import com.fad.demo.domain.bo.TestTreeBo;
import com.fad.demo.domain.vo.TestTreeVo;
import com.fad.demo.mapper.TestTreeMapper;
import com.fad.demo.service.ITestTreeService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;

2
klp-demo/src/main/java/com/klp/demo/service/impl/package-info.java
View File

@@ -1 +1 @@
package com.klp.demo.service.impl;
package com.fad.demo.service.impl;

2
klp-demo/src/main/java/com/klp/demo/service/package-info.java
View File

@@ -1 +1 @@
package com.klp.demo.service;
package com.fad.demo.service;

6
klp-demo/src/main/resources/mapper/demo/TestDemoMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.demo.mapper.TestDemoMapper">
<mapper namespace="com.fad.demo.mapper.TestDemoMapper">
<resultMap type="com.klp.demo.domain.TestDemo" id="TestDemoResult">
<resultMap type="com.fad.demo.domain.TestDemo" id="TestDemoResult">
<result property="id" column="id"/>
<result property="deptId" column="dept_id"/>
<result property="userId" column="user_id"/>
@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateBy" column="update_by"/>
<result property="delFlag" column="del_flag"/>
</resultMap>
<select id="customPageList" resultType="com.klp.demo.domain.vo.TestDemoVo">
<select id="customPageList" resultType="com.fad.demo.domain.vo.TestDemoVo">
SELECT * FROM test_demo ${ew.customSqlSegment}
</select>

4
klp-demo/src/main/resources/mapper/demo/TestTreeMapper.xml
View File

@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.klp.demo.mapper.TestTreeMapper">
<mapper namespace="com.fad.demo.mapper.TestTreeMapper">
<resultMap type="com.klp.demo.domain.TestTree" id="TestTreeResult">
<resultMap type="com.fad.demo.domain.TestTree" id="TestTreeResult">
<result property="id" column="id"/>
<result property="parentId" column="parent_id"/>
<result property="deptId" column="dept_id"/>