From eb4e269807249bae6898660e0750e7ae171fc900 Mon Sep 17 00:00:00 2001 From: Shaun Chyxion Date: Sun, 22 Nov 2020 22:43:21 +0800 Subject: [PATCH] use tigon-mybatis-0.0.2 --- README.md | 179 ----- .../service/impl/CallingListServiceImpl.java | 2 +- .../service/impl/CampaignServiceImpl.java | 2 +- .../service/CallingListServiceTest.java | 2 +- .../campaign/service/CampaignServiceTest.java | 2 +- .../pudonghot/yo/cms/auth/SessionAbility.java | 2 +- .../yo/cms/controller/AgentController.java | 2 +- .../cms/controller/AgentGroupController.java | 2 +- .../yo/cms/controller/AuthController.java | 2 +- .../CallDetailRecordController.java | 2 +- .../cms/controller/CallingListController.java | 2 +- .../yo/cms/controller/CampaignController.java | 2 +- .../yo/cms/controller/TenantQueryHook.java | 2 +- .../yo/cms/controller/TrunkController.java | 2 +- .../service/impl/AgentGroupServiceImpl.java | 2 +- .../yo/cms/service/impl/AgentServiceImpl.java | 2 +- .../cms/service/impl/AreaCodeServiceImpl.java | 2 +- .../impl/AuthPermissionServiceImpl.java | 2 +- .../cms/service/impl/AuthRoleServiceImpl.java | 2 +- .../cms/service/impl/AuthUserServiceImpl.java | 2 +- .../cms/service/impl/CampaignServiceImpl.java | 2 +- .../cms/service/impl/SequenceServiceImpl.java | 2 +- .../yo/cms/service/impl/SoundServiceImpl.java | 2 +- .../cms/service/impl/TaggableServiceImpl.java | 4 +- .../cms/service/impl/TenantServiceImpl.java | 2 +- .../service/impl/TrunkAttrServiceImpl.java | 2 +- .../yo/cms/service/impl/TrunkServiceImpl.java | 2 +- .../cms/service/CallingListServiceTest.java | 2 +- .../fsagent/controller/ConfigController.java | 2 +- .../controller/DialplanController.java | 2 +- .../controller/DialplanInboundController.java | 2 +- .../controller/DirectoryController.java | 2 +- .../service/dubbo/impl/DialServiceImpl.java | 2 +- .../service/impl/AgentServiceImpl.java | 2 +- .../service/impl/IvrMenuServiceImpl.java | 2 +- .../service/impl/TrunkServiceImpl.java | 2 +- lib/fs-mapper/pom.xml | 2 +- .../pudonghot/yo/fs/mapper/ChannelMapper.java | 2 +- .../yo/fs/mapper/CompleteMapper.java | 2 +- .../yo/fs/mapper/InterfaceMapper.java | 2 +- .../yo/fs/mapper/RegistrationMapper.java | 2 +- .../yo/fs/mapper/SipRegistrationMapper.java | 2 +- .../resources/spring/spring-yo-fs-mapper.xml | 2 +- .../yo/fs/mapper/ChannelMapperTest.java | 2 +- .../yo/fs/mapper/CompleteMapperTest.java | 2 +- .../yo/fs/mapper/InterfaceMapperTest.java | 2 +- .../yo/fs/mapper/RegistrationMapperTest.java | 2 +- .../src/test/resources/application.properties | 2 +- .../src/test/resources/spring/spring-test.xml | 1 + .../pudonghot/yo/fs/model/domain/Channel.java | 4 +- .../yo/fs/model/domain/Complete.java | 4 +- .../yo/fs/model/domain/Interface.java | 4 +- .../yo/fs/model/domain/Registration.java | 4 +- .../yo/fs/model/domain/SipRegistration.java | 4 +- lib/mapper/pom.xml | 2 +- .../pudonghot/yo/mapper/AgentGroupMapper.java | 5 +- .../mapper/AgentGroupTrunkStrategyMapper.java | 2 +- .../com/pudonghot/yo/mapper/AgentMapper.java | 5 +- .../yo/mapper/AgentStatusMapper.java | 2 +- .../pudonghot/yo/mapper/AreaCodeMapper.java | 8 +- .../yo/mapper/AuthPermissionMapper.java | 8 +- .../yo/mapper/AuthPermissionRoleMapper.java | 2 +- .../pudonghot/yo/mapper/AuthRoleMapper.java | 5 +- .../pudonghot/yo/mapper/AuthUserMapper.java | 5 +- .../yo/mapper/AuthUserRoleMapper.java | 2 +- .../yo/mapper/AuthUserTenantMapper.java | 2 +- .../yo/mapper/CallDetailRecordMapper.java | 2 +- .../yo/mapper/CallRecordingMapper.java | 2 +- .../yo/mapper/CallSatisfactionMapper.java | 2 +- .../mapper/CallingListHistoricalMapper.java | 2 +- .../yo/mapper/CallingListMapper.java | 2 +- .../yo/mapper/CallingListPreparedMapper.java | 2 +- .../pudonghot/yo/mapper/CampaignMapper.java | 5 +- .../mapper/CampaignTrunkStrategyMapper.java | 2 +- .../pudonghot/yo/mapper/GatewayMapper.java | 2 +- .../pudonghot/yo/mapper/IvrEntryMapper.java | 2 +- .../pudonghot/yo/mapper/IvrMenuMapper.java | 3 +- .../pudonghot/yo/mapper/ObjectTagMapper.java | 2 +- .../yo/mapper/PhoneBlacklistMapper.java | 2 +- .../yo/mapper/PhoneGreylistMapper.java | 2 +- .../yo/mapper/PhoneWhitelistMapper.java | 2 +- .../pudonghot/yo/mapper/QueueAgentMapper.java | 2 +- .../com/pudonghot/yo/mapper/QueueMapper.java | 2 +- .../pudonghot/yo/mapper/SequenceMapper.java | 4 +- .../com/pudonghot/yo/mapper/SoundMapper.java | 2 +- .../com/pudonghot/yo/mapper/TagMapper.java | 2 +- .../yo/mapper/TelecomVendorMapper.java | 2 +- .../com/pudonghot/yo/mapper/TenantMapper.java | 2 +- .../pudonghot/yo/mapper/TrunkAttrMapper.java | 2 +- .../com/pudonghot/yo/mapper/TrunkMapper.java | 5 +- .../mapper/TrunkProhibitedAreaCodeMapper.java | 2 +- .../yo/mapper/TrunkStrategyMapper.java | 2 +- .../yo/mapper/TrunkStrategyTrunkMapper.java | 2 +- .../yo/mapper/TrunkTrunkAttrMapper.java | 2 +- .../pudonghot/yo/mapper/WorkRecordMapper.java | 2 +- .../TableVarXmlContentProvider.java | 28 + .../resources/spring/spring-yo-mapper.xml | 2 +- .../yo/mapper/AgentStatusMapperTest.java | 5 +- .../yo/mapper/CallDetailRecordMapperTest.java | 3 +- .../yo/mapper/CallSatisfactionMapperTest.java | 2 +- .../CallingListHistoricalMapperTest.java | 2 +- .../yo/mapper/CallingListMapperTest.java | 2 +- .../mapper/CallingListPreparedMapperTest.java | 2 +- .../yo/mapper/CampaignMapperTest.java | 2 +- .../yo/mapper/PhoneBlacklistMapperTest.java | 2 +- .../yo/mapper/PhoneGreylistMapperTest.java | 2 +- .../yo/mapper/PhoneWhitelistMapperTest.java | 2 +- .../pudonghot/yo/mapper/SoundMapperTest.java | 2 +- .../pudonghot/yo/mapper/TrunkMapperTest.java | 2 +- .../src/test/resources/spring/spring-test.xml | 1 + .../com/pudonghot/yo/model/domain/Agent.java | 6 +- .../pudonghot/yo/model/domain/AgentGroup.java | 6 +- .../model/domain/AgentGroupTrunkStrategy.java | 4 +- .../yo/model/domain/AgentStatus.java | 4 +- .../pudonghot/yo/model/domain/AreaCode.java | 4 +- .../yo/model/domain/AuthPermission.java | 6 +- .../yo/model/domain/AuthPermissionRole.java | 4 +- .../pudonghot/yo/model/domain/AuthRole.java | 4 +- .../pudonghot/yo/model/domain/AuthUser.java | 6 +- .../yo/model/domain/AuthUserRole.java | 4 +- .../yo/model/domain/AuthUserTenant.java | 4 +- .../pudonghot/yo/model/domain/BaseDomain.java | 2 +- .../yo/model/domain/CallDetailRecord.java | 4 +- .../yo/model/domain/CallRecording.java | 6 +- .../yo/model/domain/CallSatisfaction.java | 4 +- .../yo/model/domain/CallingList.java | 4 +- .../model/domain/CallingListHistorical.java | 4 +- .../yo/model/domain/CallingListPrepared.java | 4 +- .../pudonghot/yo/model/domain/Campaign.java | 6 +- .../model/domain/CampaignTrunkStrategy.java | 4 +- .../pudonghot/yo/model/domain/Gateway.java | 2 +- .../pudonghot/yo/model/domain/IvrEntry.java | 4 +- .../pudonghot/yo/model/domain/IvrMenu.java | 2 +- .../pudonghot/yo/model/domain/ObjectTag.java | 4 +- .../yo/model/domain/PhoneBlacklist.java | 4 +- .../yo/model/domain/PhoneGreylist.java | 4 +- .../yo/model/domain/PhoneWhitelist.java | 4 +- .../com/pudonghot/yo/model/domain/Queue.java | 4 +- .../pudonghot/yo/model/domain/QueueAgent.java | 4 +- .../pudonghot/yo/model/domain/Sequence.java | 4 +- .../com/pudonghot/yo/model/domain/Sound.java | 2 +- .../com/pudonghot/yo/model/domain/Tag.java | 4 +- .../yo/model/domain/TaggableDomain.java | 4 +- .../yo/model/domain/TelecomVendor.java | 2 +- .../com/pudonghot/yo/model/domain/Tenant.java | 4 +- .../yo/model/domain/TenantDomain.java | 2 +- .../com/pudonghot/yo/model/domain/Trunk.java | 6 +- .../pudonghot/yo/model/domain/TrunkAttr.java | 4 +- .../model/domain/TrunkProhibitedAreaCode.java | 4 +- .../yo/model/domain/TrunkStrategy.java | 4 +- .../yo/model/domain/TrunkStrategyTrunk.java | 4 +- .../yo/model/domain/TrunkTrunkAttr.java | 4 +- .../pudonghot/yo/model/domain/WorkRecord.java | 4 +- .../java/com/pudonghot/yo/TestDriver.java | 2 +- .../impl/CommonAgentStatusServiceImpl.java | 2 +- .../impl/CommonCampaignServiceImpl.java | 2 +- lib/tigon/codegen/pom.xml | 2 +- .../support/CodeGenServiceSupport.java | 10 +- lib/tigon/model/pom.xml | 4 + .../main/java/com/wacai/tigon/model/M0.java | 2 +- .../com/wacai/tigon/mybatis/Criterion.java | 67 -- .../com/wacai/tigon/mybatis/NoPrimaryKey.java | 15 - .../com/wacai/tigon/mybatis/NotUpdate.java | 15 - .../tigon/mybatis/NotUpdateWhenNull.java | 15 - .../com/wacai/tigon/mybatis/PrimaryKey.java | 15 - .../com/wacai/tigon/mybatis/RawValue.java | 23 - .../java/com/wacai/tigon/mybatis/Search.java | 748 ------------------ .../wacai/tigon/mybatis/SearchProcArg.java | 118 --- .../com/wacai/tigon/mybatis/SqlFragment.java | 25 - .../com/wacai/tigon/mybatis/SqlParam.java | 26 - .../java/com/wacai/tigon/mybatis/Table.java | 16 - .../com/wacai/tigon/mybatis/Transient.java | 17 - .../wacai/tigon/mybatis/UseGeneratedKeys.java | 21 - .../java/com/wacai/tigon/test/TestDriver.java | 2 +- lib/tigon/pom.xml | 10 +- .../wacai/tigon/service/BaseCrudService.java | 2 +- .../tigon/service/BaseDeleteService.java | 2 +- .../wacai/tigon/service/BaseQueryService.java | 2 +- lib/tigon/service-support/pom.xml | 2 +- .../support/BaseCrudByFormServiceSupport.java | 2 +- .../support/BaseCrudServiceSupport.java | 4 +- .../support/BaseQueryServiceSupport.java | 4 +- .../service/support/BaseServiceSupport.java | 4 +- .../wacai/tigon/web/controller/ArgQuery.java | 2 +- .../tigon/web/controller/BaseController.java | 2 +- .../web/controller/BaseQueryController.java | 2 +- .../tigon/web/controller/BasicController.java | 2 +- .../web/service/impl/CustomerServiceImpl.java | 2 +- .../wacai/tigon/web/annotation/FilterCol.java | 4 +- .../com/wacai/tigon/web/annotation/Order.java | 2 +- .../yo/openapi/auth/SessionAbility.java | 2 +- .../yo/openapi/controller/CallController.java | 4 +- .../service/impl/AgentEventServiceImpl.java | 2 +- .../service/impl/AgentServiceImpl.java | 2 +- .../impl/AgentStatusScheduleServiceImpl.java | 2 +- 195 files changed, 310 insertions(+), 1541 deletions(-) create mode 100644 lib/mapper/src/main/java/com/pudonghot/yo/mapper/xmlcontentprovider/TableVarXmlContentProvider.java delete mode 100644 lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Criterion.java delete mode 100644 lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/NoPrimaryKey.java delete mode 100644 lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/NotUpdate.java delete mode 100644 lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/NotUpdateWhenNull.java delete mode 100644 lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/PrimaryKey.java delete mode 100644 lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/RawValue.java delete mode 100644 lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Search.java delete mode 100644 lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/SearchProcArg.java delete mode 100644 lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/SqlFragment.java delete mode 100644 lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/SqlParam.java delete mode 100644 lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Table.java delete mode 100644 lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Transient.java delete mode 100644 lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/UseGeneratedKeys.java diff --git a/README.md b/README.md index 805e3e70..2253b8d4 100644 --- a/README.md +++ b/README.md @@ -132,182 +132,3 @@ public Map errorCaused() { "message": "Oops, some error caused" } ``` - -#### MyBatis - -`MyBatis`做了启动期增强，实例`Mapper`继承了`BaseMapper`之后，会继承获得相关的增删改查等方法，如下例： - -##### Model - -```java -import lombok.Getter; -import lombok.Setter; -import java.util.Date; -import com.wacai.tigon.model.M0; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; -import lombok.experimental.FieldNameConstants; - -@Getter -@Setter -@Table("yo_customer") -@FieldNameConstants(prefix = "") -public class Customer extends M0 { - private String name; - private String account; - private String password; - private String note; - @NotUpdate - protected Date createdTime; - protected Date updatedTime; - @NotUpdate - protected String createdBy; - protected String updatedBy; - protected boolean active; -} -``` - -##### Mapper - -```java -import com.wacai.tigon.mybatis.BaseMapper; - -public interface CustomerMapper extends BaseMapper { -} -``` - -##### Mapper.xml -```xml - - - - -``` - -##### Usage - -```java -@Autowired -private CustomerMapper customerMapper; -``` - -I. 插入 - -```java -final Customer customer = new Customer(); -customer.setName("Uncle Donghuang"); -customer.setAccount("donghuang"); -customer.setPassword("qR$#FzM!z9W*"); -customer.setCreatedBy("SYS"); -customer.setCreatedTime(new Date()); -customer.setActive(true); -customerMapper.insert(customer); -``` - -II. 查询 - -Find by ID - -```java -final Integer id = 1154; -final Customer customer = customerMapper.find(id); -``` - -Find by `Search` - -```java -final Customer customer = customerMapper.find( - new Search(Customer.ACCOUNT, "donghuang") - .eq(Customer.ACTIVE, true)); -``` - -List by `Search` - -```java -final List customers = customerMapper.list( - new Search(Customer.ACTIVE, true) - .between(Customer.ID, 1, 1154) - .asc(Customer.ACCOUNT) - .limit(42)); -``` - -`Search` API - -- `and` And another `Search` -- `asc` Order ASC -- `between` Between two values -- `contains` Value contains string -- `desc` Order DSC -- `endsWith` Value ends with string -- `eq` Eqauls -- `gt` Greater than -- `gte` Eqauls or greater than -- `in` In values -- `isNull` Value is null -- `like` Value like -- `limit` Return rows limit -- `lt` Less than -- `lte` Eqauls or less than -- `ne` Not equals -- `notIn` Not in values -- `notNull` Value is not null -- `offset` Return rows offset -- `or` Or another `Search` -- `orderBy` Order by -- `startsWith` Value starts with string - -III. 更新 - -Update model - -```java -Customer customer = customerMapper.find( - new Search(Customer.ACCOUNT, "donghuang") - .eq(Customer.ACTIVE, true)); - -customer.setPassword("g!5KpWdXEB!^"); -customer.setUpdatedBy("SYS"); -customer.setUpdatedTime(new Date()); -customerMapper.update(customer); -``` - -Update with map - -```java -final Map update = new HashMap<>(4); -update.put(Customer.PASSWORD, "g!5KpWdXEB!^"); -update.put(Customer.UPDATED_BY, "SYS"); -update.put(Customer.UPDATED_TIME, new Date()); - -customerMapper.update(update, 1154); -// OR -// customerMapper.update(update, new Search(Customer.ID, 1154)); -``` - -Set null - -```java -// Update note to null of customer 1154 -customerMapper.setNull(Customer.NOTE, 1154); -// Update note to null of customer 1154 -customerMapper.setNull(Customer.NOTE, new Search(Customer.ID, 1154)); -// Update note to null of all -customerMapper.setNull(Customer.NOTE, new Search()); - -``` - -IV. 删除 - -Delete by ID - -```java -customerMapper.delete(1154); -``` - -Delete by `Search` - -```java -customerMapper.delete(new Search(Customer.ID, 1154)); -``` - diff --git a/campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java b/campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java index bb1181c3..bcc9e611 100644 --- a/campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java +++ b/campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CallingListServiceImpl.java @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.stream.Stream; import lombok.extern.slf4j.Slf4j; import java.util.stream.Collectors; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.util.TimeUtils; import com.wacai.tigon.sequence.IdSequence; import org.apache.commons.lang3.StringUtils; diff --git a/campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CampaignServiceImpl.java b/campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CampaignServiceImpl.java index ce960a10..5f248add 100644 --- a/campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CampaignServiceImpl.java +++ b/campaign/src/main/java/com/pudonghot/yo/campaign/service/impl/CampaignServiceImpl.java @@ -7,7 +7,7 @@ import lombok.extern.slf4j.Slf4j; import java.util.stream.Collectors; import com.pudonghot.yo.util.LogMDC; import lombok.RequiredArgsConstructor; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.util.TimeUtils; import com.pudonghot.yo.mapper.CampaignMapper; import org.springframework.stereotype.Service; diff --git a/campaign/src/test/java/com/pudonghot/yo/campaign/service/CallingListServiceTest.java b/campaign/src/test/java/com/pudonghot/yo/campaign/service/CallingListServiceTest.java index ced2c31f..89a64f83 100644 --- a/campaign/src/test/java/com/pudonghot/yo/campaign/service/CallingListServiceTest.java +++ b/campaign/src/test/java/com/pudonghot/yo/campaign/service/CallingListServiceTest.java @@ -4,7 +4,7 @@ import lombok.val; import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.sequence.IdSequence; import com.pudonghot.yo.campaign.YoCampaign; import com.pudonghot.yo.model.domain.Campaign; diff --git a/campaign/src/test/java/com/pudonghot/yo/campaign/service/CampaignServiceTest.java b/campaign/src/test/java/com/pudonghot/yo/campaign/service/CampaignServiceTest.java index 6edee2ca..3965c01e 100644 --- a/campaign/src/test/java/com/pudonghot/yo/campaign/service/CampaignServiceTest.java +++ b/campaign/src/test/java/com/pudonghot/yo/campaign/service/CampaignServiceTest.java @@ -4,7 +4,7 @@ import lombok.val; import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.campaign.YoCampaign; import com.pudonghot.yo.model.domain.Campaign; import org.springframework.boot.test.context.SpringBootTest; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/auth/SessionAbility.java b/cms/src/main/java/com/pudonghot/yo/cms/auth/SessionAbility.java index 6ca87c52..be7af668 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/auth/SessionAbility.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/auth/SessionAbility.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.cms.auth; import java.util.Set; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.apache.shiro.SecurityUtils; import org.springframework.util.Assert; import io.buji.pac4j.subject.Pac4jPrincipal; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/AgentController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/AgentController.java index bfc8371e..d469945e 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/controller/AgentController.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/AgentController.java @@ -5,7 +5,7 @@ import com.pudonghot.yo.cms.form.create.CreateFormAgent; import com.pudonghot.yo.cms.form.update.UpdateFormAgent; import com.pudonghot.yo.cms.service.AgentGroupService; import com.wacai.tigon.form.FormList; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; import com.pudonghot.yo.model.domain.Queue; import com.pudonghot.yo.model.domain.Agent; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/AgentGroupController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/AgentGroupController.java index daf3adfc..98a62ce3 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/controller/AgentGroupController.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/AgentGroupController.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.cms.controller; import com.wacai.tigon.form.FormList; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.web.controller.ArgQuery; import com.wacai.tigon.web.annotation.ListApi; import com.pudonghot.yo.cms.auth.SessionAbility; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/AuthController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/AuthController.java index 6d45af6b..32cd8074 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/controller/AuthController.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/AuthController.java @@ -4,7 +4,7 @@ import java.util.Map; import java.util.HashMap; import com.pudonghot.yo.cms.auth.SessionAbility; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.util.Assert; import javax.validation.constraints.NotBlank; import org.springframework.stereotype.Controller; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/CallDetailRecordController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/CallDetailRecordController.java index 160427b8..eb490306 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/controller/CallDetailRecordController.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/CallDetailRecordController.java @@ -4,7 +4,7 @@ import lombok.val; import java.util.List; import java.util.function.Function; import java.util.function.Supplier; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import java.util.function.BiFunction; import com.wacai.tigon.model.ViewModel; import org.apache.commons.lang3.StringUtils; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/CallingListController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/CallingListController.java index d38a0919..5feefb19 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/controller/CallingListController.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/CallingListController.java @@ -7,7 +7,7 @@ import java.util.HashMap; import java.util.ArrayList; import javax.validation.Valid; import com.wacai.tigon.form.FormList; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; import com.pudonghot.yo.model.domain.Campaign; import com.wacai.tigon.web.annotation.ListApi; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/CampaignController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/CampaignController.java index adbe84d1..2d3be568 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/controller/CampaignController.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/CampaignController.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.controller; import java.util.Arrays; import com.wacai.tigon.form.FormList; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; import org.springframework.util.Assert; import com.pudonghot.yo.model.DailyTime; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/TenantQueryHook.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/TenantQueryHook.java index d9a6feac..7af057f1 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/controller/TenantQueryHook.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/TenantQueryHook.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.controller; import com.pudonghot.yo.cms.auth.SessionAbility; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; import com.wacai.tigon.web.controller.ArgQuery; import com.pudonghot.yo.model.domain.Agent; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/controller/TrunkController.java b/cms/src/main/java/com/pudonghot/yo/cms/controller/TrunkController.java index 4861df61..98df0d9a 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/controller/TrunkController.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/controller/TrunkController.java @@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.controller; import com.pudonghot.yo.cms.service.*; import com.wacai.tigon.form.FormList; import com.wacai.tigon.model.ViewModel; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.model.domain.Agent; import com.pudonghot.yo.model.domain.Queue; import com.pudonghot.yo.model.domain.Trunk; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AgentGroupServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AgentGroupServiceImpl.java index 46193fc3..b5ae4f7e 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AgentGroupServiceImpl.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AgentGroupServiceImpl.java @@ -7,7 +7,7 @@ import com.pudonghot.yo.cms.form.create.CreateFormAgentGroup; import com.pudonghot.yo.cms.service.AgentGroupService; import lombok.extern.slf4j.Slf4j; import java.util.stream.Collectors; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.StringUtils; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AgentServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AgentServiceImpl.java index 63443a23..0b4107a4 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AgentServiceImpl.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AgentServiceImpl.java @@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.service.impl; import java.util.Set; import lombok.extern.slf4j.Slf4j; import java.util.stream.Collectors; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; import org.springframework.util.Assert; import org.apache.commons.lang3.tuple.Pair; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AreaCodeServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AreaCodeServiceImpl.java index 7f2c8d0c..f6a964c9 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AreaCodeServiceImpl.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AreaCodeServiceImpl.java @@ -9,7 +9,7 @@ import com.pudonghot.yo.cms.form.update.UpdateFormAreaCode; import lombok.extern.slf4j.Slf4j; import java.util.stream.Collectors; import org.apache.commons.io.IOUtils; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.util.Assert; import java.nio.charset.StandardCharsets; import org.apache.commons.io.LineIterator; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthPermissionServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthPermissionServiceImpl.java index 3c35fd18..2f70db51 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthPermissionServiceImpl.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthPermissionServiceImpl.java @@ -7,7 +7,7 @@ import com.pudonghot.yo.cms.form.SessionForm; import com.pudonghot.yo.cms.form.create.CreateFormAuthPermission; import lombok.extern.slf4j.Slf4j; import java.util.stream.Collectors; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.util.Assert; import com.wacai.tigon.model.ViewModel; import org.apache.commons.lang3.tuple.Pair; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthRoleServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthRoleServiceImpl.java index 649967c1..134c5fea 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthRoleServiceImpl.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthRoleServiceImpl.java @@ -4,7 +4,7 @@ import java.util.List; import com.pudonghot.yo.cms.form.create.CreateFormAuthRole; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.util.Assert; import org.springframework.stereotype.Service; import com.pudonghot.yo.mapper.AuthRoleMapper; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthUserServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthUserServiceImpl.java index b96f212e..cd00b180 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthUserServiceImpl.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/AuthUserServiceImpl.java @@ -6,7 +6,7 @@ import com.pudonghot.yo.mapper.*; import lombok.extern.slf4j.Slf4j; import java.util.stream.Collectors; import com.pudonghot.yo.model.domain.*; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.util.Assert; import com.wacai.tigon.model.ViewModel; import org.apache.commons.lang3.tuple.Pair; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/CampaignServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/CampaignServiceImpl.java index 3602df0f..bcadf03d 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/CampaignServiceImpl.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/CampaignServiceImpl.java @@ -3,7 +3,7 @@ package com.pudonghot.yo.cms.service.impl; import java.util.Set; import lombok.extern.slf4j.Slf4j; import java.util.stream.Collectors; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; import com.wacai.tigon.sequence.IdSequence; import org.apache.commons.lang3.tuple.Pair; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/SequenceServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/SequenceServiceImpl.java index c4d9249b..cb22c665 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/SequenceServiceImpl.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/SequenceServiceImpl.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.cms.service.impl; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.apache.commons.lang3.StringUtils; import org.springframework.util.Assert; import org.springframework.stereotype.Service; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/SoundServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/SoundServiceImpl.java index ab45467e..65db2c99 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/SoundServiceImpl.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/SoundServiceImpl.java @@ -5,7 +5,7 @@ import java.io.IOException; import lombok.extern.slf4j.Slf4j; import java.util.function.Consumer; import org.apache.shiro.util.Assert; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; import com.pudonghot.yo.mapper.SoundMapper; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TaggableServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TaggableServiceImpl.java index 1ed66d8c..b350d70d 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TaggableServiceImpl.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TaggableServiceImpl.java @@ -2,9 +2,11 @@ package com.pudonghot.yo.cms.service.impl; import java.util.*; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.*; +import me.chyxion.tigon.mybatis.*; import java.util.stream.Collectors; import com.wacai.tigon.model.ViewModel; +import me.chyxion.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.Search; import org.springframework.util.Assert; import com.pudonghot.yo.cms.util.SetUtils; import com.wacai.tigon.form.FormCreateApi; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TenantServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TenantServiceImpl.java index 4b77beb3..768c259c 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TenantServiceImpl.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TenantServiceImpl.java @@ -6,7 +6,7 @@ import com.pudonghot.yo.cms.form.create.CreateFormTenant; import com.pudonghot.yo.redis.RedisClientApi; import lombok.extern.slf4j.Slf4j; import java.util.stream.Collectors; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.util.Assert; import com.wacai.tigon.sequence.IdSequence; import org.apache.commons.lang3.StringUtils; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TrunkAttrServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TrunkAttrServiceImpl.java index 2a368a91..691d88c5 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TrunkAttrServiceImpl.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TrunkAttrServiceImpl.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.service.impl; import com.pudonghot.yo.cms.form.create.CreateFormTrunkAttr; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.util.Assert; import org.springframework.stereotype.Service; import com.pudonghot.yo.model.domain.TrunkAttr; diff --git a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TrunkServiceImpl.java b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TrunkServiceImpl.java index 0bce348f..4e441a21 100644 --- a/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TrunkServiceImpl.java +++ b/cms/src/main/java/com/pudonghot/yo/cms/service/impl/TrunkServiceImpl.java @@ -5,7 +5,7 @@ import com.pudonghot.yo.mapper.*; import lombok.extern.slf4j.Slf4j; import java.util.stream.Collectors; import java.util.function.BiConsumer; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.model.domain.*; import com.wacai.tigon.model.ViewModel; import org.springframework.util.Assert; diff --git a/cms/src/test/java/com/pudonghot/yo/cms/service/CallingListServiceTest.java b/cms/src/test/java/com/pudonghot/yo/cms/service/CallingListServiceTest.java index 4d4d7af9..17d1cb11 100644 --- a/cms/src/test/java/com/pudonghot/yo/cms/service/CallingListServiceTest.java +++ b/cms/src/test/java/com/pudonghot/yo/cms/service/CallingListServiceTest.java @@ -6,7 +6,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; import com.pudonghot.yo.cms.YoCMS; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.model.DailyTime; import com.pudonghot.yo.model.domain.Campaign; import org.springframework.boot.test.context.SpringBootTest; diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/ConfigController.java b/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/ConfigController.java index 1ef65dab..b6358fad 100644 --- a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/ConfigController.java +++ b/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/ConfigController.java @@ -4,7 +4,7 @@ import java.util.*; import javax.sql.DataSource; import java.util.regex.Pattern; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.apache.commons.lang3.StringUtils; import com.pudonghot.yo.model.domain.Gateway; import com.alibaba.druid.pool.DruidDataSource; diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanController.java b/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanController.java index e53928ac..7571c80e 100644 --- a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanController.java +++ b/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanController.java @@ -3,7 +3,7 @@ package com.pudonghot.yo.fsagent.controller; import java.util.Map; import java.util.List; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.model.domain.Agent; import com.pudonghot.yo.model.domain.Tenant; import org.apache.commons.lang3.StringUtils; diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanInboundController.java b/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanInboundController.java index a1cae098..b9abfc81 100644 --- a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanInboundController.java +++ b/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DialplanInboundController.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.fsagent.controller; import java.util.Map; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.fsagent.service.*; import com.pudonghot.yo.model.domain.Agent; import com.pudonghot.yo.model.domain.Trunk; diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DirectoryController.java b/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DirectoryController.java index 154cfaa7..a174ab80 100644 --- a/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DirectoryController.java +++ b/fsagent/src/main/java/com/pudonghot/yo/fsagent/controller/DirectoryController.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.fsagent.controller; import java.util.Map; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.model.domain.Agent; import com.pudonghot.yo.model.domain.Tenant; import com.pudonghot.yo.model.domain.AgentGroup; diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialServiceImpl.java b/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialServiceImpl.java index 344e1605..e403a783 100644 --- a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialServiceImpl.java +++ b/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/dubbo/impl/DialServiceImpl.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.fsagent.service.dubbo.impl; import com.pudonghot.yo.mapper.*; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.model.domain.*; import org.springframework.util.Assert; import org.apache.commons.lang3.tuple.Pair; diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/AgentServiceImpl.java b/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/AgentServiceImpl.java index e38a7328..c18de9f4 100644 --- a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/AgentServiceImpl.java +++ b/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/AgentServiceImpl.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.fsagent.service.impl; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.mapper.AgentMapper; import com.pudonghot.yo.model.domain.Agent; import org.apache.commons.lang3.StringUtils; diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/IvrMenuServiceImpl.java b/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/IvrMenuServiceImpl.java index 1b8a93d7..698d9744 100644 --- a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/IvrMenuServiceImpl.java +++ b/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/IvrMenuServiceImpl.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Collections; import lombok.extern.slf4j.Slf4j; import java.util.stream.Collectors; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.model.domain.Tenant; import com.pudonghot.yo.mapper.TenantMapper; import com.pudonghot.yo.mapper.IvrMenuMapper; diff --git a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/TrunkServiceImpl.java b/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/TrunkServiceImpl.java index 0a6ddd76..2ee73149 100644 --- a/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/TrunkServiceImpl.java +++ b/fsagent/src/main/java/com/pudonghot/yo/fsagent/service/impl/TrunkServiceImpl.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.fsagent.service.impl; import java.util.List; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.util.Assert; import com.pudonghot.yo.mapper.TrunkMapper; import com.pudonghot.yo.model.domain.Trunk; diff --git a/lib/fs-mapper/pom.xml b/lib/fs-mapper/pom.xml index 1771268a..a390ec8b 100644 --- a/lib/fs-mapper/pom.xml +++ b/lib/fs-mapper/pom.xml @@ -22,7 +22,7 @@ yo-fs-model - com.wacai.tigon + me.chyxion.tigon tigon-mybatis diff --git a/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/ChannelMapper.java b/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/ChannelMapper.java index b3cd1cce..32803a6d 100644 --- a/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/ChannelMapper.java +++ b/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/ChannelMapper.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.fs.mapper; import java.util.List; import org.apache.ibatis.annotations.Param; -import com.wacai.tigon.mybatis.BaseQueryMapper; +import me.chyxion.tigon.mybatis.BaseQueryMapper; import com.pudonghot.yo.fs.model.domain.Channel; /** diff --git a/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/CompleteMapper.java b/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/CompleteMapper.java index a2f4dc90..139fe4aa 100644 --- a/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/CompleteMapper.java +++ b/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/CompleteMapper.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.fs.mapper; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.fs.model.domain.Complete; /** diff --git a/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/InterfaceMapper.java b/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/InterfaceMapper.java index 548adfc7..3feb5357 100644 --- a/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/InterfaceMapper.java +++ b/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/InterfaceMapper.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.fs.mapper; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.fs.model.domain.Interface; /** diff --git a/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/RegistrationMapper.java b/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/RegistrationMapper.java index ff27df9a..c4206242 100644 --- a/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/RegistrationMapper.java +++ b/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/RegistrationMapper.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.fs.mapper; -import com.wacai.tigon.mybatis.BaseQueryMapper; +import me.chyxion.tigon.mybatis.BaseQueryMapper; import com.pudonghot.yo.fs.model.domain.Registration; /** diff --git a/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/SipRegistrationMapper.java b/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/SipRegistrationMapper.java index 81e9f3ca..6110ddfb 100644 --- a/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/SipRegistrationMapper.java +++ b/lib/fs-mapper/src/main/java/com/pudonghot/yo/fs/mapper/SipRegistrationMapper.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.fs.mapper; -import com.wacai.tigon.mybatis.BaseQueryMapper; +import me.chyxion.tigon.mybatis.BaseQueryMapper; import com.pudonghot.yo.fs.model.domain.SipRegistration; /** diff --git a/lib/fs-mapper/src/main/resources/spring/spring-yo-fs-mapper.xml b/lib/fs-mapper/src/main/resources/spring/spring-yo-fs-mapper.xml index 68f6c894..e6936d9f 100644 --- a/lib/fs-mapper/src/main/resources/spring/spring-yo-fs-mapper.xml +++ b/lib/fs-mapper/src/main/resources/spring/spring-yo-fs-mapper.xml @@ -23,7 +23,7 @@ diff --git a/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/ChannelMapperTest.java b/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/ChannelMapperTest.java index 29ac0f0d..8b0ced61 100644 --- a/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/ChannelMapperTest.java +++ b/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/ChannelMapperTest.java @@ -3,7 +3,7 @@ package com.pudonghot.yo.fs.mapper; import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/CompleteMapperTest.java b/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/CompleteMapperTest.java index 4118c9dd..559e3d97 100644 --- a/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/CompleteMapperTest.java +++ b/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/CompleteMapperTest.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.fs.mapper; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/InterfaceMapperTest.java b/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/InterfaceMapperTest.java index d9e8c79b..f0a72929 100644 --- a/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/InterfaceMapperTest.java +++ b/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/InterfaceMapperTest.java @@ -3,7 +3,7 @@ package com.pudonghot.yo.fs.mapper; import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/RegistrationMapperTest.java b/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/RegistrationMapperTest.java index 834eb4e4..7665b1ff 100644 --- a/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/RegistrationMapperTest.java +++ b/lib/fs-mapper/src/test/java/com/pudonghot/yo/fs/mapper/RegistrationMapperTest.java @@ -3,7 +3,7 @@ package com.pudonghot.yo.fs.mapper; import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/lib/fs-mapper/src/test/resources/application.properties b/lib/fs-mapper/src/test/resources/application.properties index 4b4b1904..26a97f21 100644 --- a/lib/fs-mapper/src/test/resources/application.properties +++ b/lib/fs-mapper/src/test/resources/application.properties @@ -1,6 +1,6 @@ spring.application.name=yo-fs-mapper # Datasource -yo.fs.datasource.url=jdbc:mysql://172.18.4.35/freeswitch?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai +yo.fs.datasource.url=jdbc:mysql://localhost:3310/freeswitch?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai yo.fs.datasource.username=freeswitch yo.fs.datasource.password=RR!h5IpirsnJ diff --git a/lib/fs-mapper/src/test/resources/spring/spring-test.xml b/lib/fs-mapper/src/test/resources/spring/spring-test.xml index b699d41c..e392a01e 100644 --- a/lib/fs-mapper/src/test/resources/spring/spring-test.xml +++ b/lib/fs-mapper/src/test/resources/spring/spring-test.xml @@ -7,4 +7,5 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + diff --git a/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Channel.java b/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Channel.java index 4dd4119b..10439f37 100644 --- a/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Channel.java +++ b/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Channel.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.fs.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NoPrimaryKey; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NoPrimaryKey; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Complete.java b/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Complete.java index b46dd610..4ec8727c 100644 --- a/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Complete.java +++ b/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Complete.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.fs.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NoPrimaryKey; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NoPrimaryKey; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Interface.java b/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Interface.java index e34f4da4..af882320 100644 --- a/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Interface.java +++ b/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Interface.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.fs.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NoPrimaryKey; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NoPrimaryKey; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Registration.java b/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Registration.java index 62e8b720..612a2bdb 100644 --- a/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Registration.java +++ b/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/Registration.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.fs.model.domain; import lombok.Setter; import lombok.Getter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NoPrimaryKey; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NoPrimaryKey; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/SipRegistration.java b/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/SipRegistration.java index 52fb5556..810fd8e1 100644 --- a/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/SipRegistration.java +++ b/lib/fs-model/src/main/java/com/pudonghot/yo/fs/model/domain/SipRegistration.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.fs.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NoPrimaryKey; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NoPrimaryKey; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/mapper/pom.xml b/lib/mapper/pom.xml index 20abba0b..77f208a8 100644 --- a/lib/mapper/pom.xml +++ b/lib/mapper/pom.xml @@ -22,7 +22,7 @@ yo-model - com.wacai.tigon + me.chyxion.tigon tigon-mybatis diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentGroupMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentGroupMapper.java index 0ed32ce5..8b8bd5ee 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentGroupMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentGroupMapper.java @@ -1,11 +1,14 @@ package com.pudonghot.yo.mapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.AgentGroup; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl; +import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider; /** * @author Donghuang
* Nov 16, 2019 12:27:23 */ +@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class) public interface AgentGroupMapper extends BaseMapper { } diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentGroupTrunkStrategyMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentGroupTrunkStrategyMapper.java index 0ebe0df3..596f978a 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentGroupTrunkStrategyMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentGroupTrunkStrategyMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.AgentGroupTrunkStrategy; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; /** * @author Donghuang
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentMapper.java index 7acae657..eb07febd 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentMapper.java @@ -1,14 +1,17 @@ package com.pudonghot.yo.mapper; import java.util.List; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import org.apache.ibatis.annotations.Param; import com.pudonghot.yo.model.domain.Agent; +import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl; +import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider; /** * @author Donghuang
* Nov 15, 2019 17:14:22 */ +@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class) public interface AgentMapper extends BaseMapper { /** diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentStatusMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentStatusMapper.java index d1ec20b8..0be711b7 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentStatusMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AgentStatusMapper.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.mapper; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import org.apache.ibatis.annotations.Param; import com.pudonghot.yo.model.domain.AgentStatus; diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AreaCodeMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AreaCodeMapper.java index 2172d993..3e7a9d40 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AreaCodeMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AreaCodeMapper.java @@ -1,12 +1,14 @@ package com.pudonghot.yo.mapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.AreaCode; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl; +import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider; /** * @author Donghuang
* Nov 15, 2019 17:53:54 */ -public interface AreaCodeMapper - extends BaseMapper { +@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class) +public interface AreaCodeMapper extends BaseMapper { } diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthPermissionMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthPermissionMapper.java index 4bec5600..a42e4fbf 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthPermissionMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthPermissionMapper.java @@ -1,15 +1,17 @@ package com.pudonghot.yo.mapper; import java.util.List; - -import com.pudonghot.yo.model.domain.AuthPermission; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import org.apache.ibatis.annotations.Param; +import com.pudonghot.yo.model.domain.AuthPermission; +import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl; +import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider; /** * @author Donghuang
* Nov 30, 2019 18:02:30 */ +@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class) public interface AuthPermissionMapper extends BaseMapper { /** diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthPermissionRoleMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthPermissionRoleMapper.java index fd73a39e..b53c512c 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthPermissionRoleMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthPermissionRoleMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.AuthPermissionRole; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; /** * @author Donghuang
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthRoleMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthRoleMapper.java index a5ee2aa3..dd25b973 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthRoleMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthRoleMapper.java @@ -1,11 +1,14 @@ package com.pudonghot.yo.mapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.AuthRole; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl; +import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider; /** * @author Donghuang
* Nov 30, 2019 17:59:55 */ +@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class) public interface AuthRoleMapper extends BaseMapper { } diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserMapper.java index 35283346..9838649a 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserMapper.java @@ -1,11 +1,14 @@ package com.pudonghot.yo.mapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.AuthUser; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl; +import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider; /** * @author Donghuang
* Nov 30, 2019 17:57:38 */ +@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class) public interface AuthUserMapper extends BaseMapper { } diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserRoleMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserRoleMapper.java index 6540c58c..92728ad2 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserRoleMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserRoleMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.AuthUserRole; -import com.wacai.tigon.mybatis.BaseMapper; /** * @author Donghuang
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserTenantMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserTenantMapper.java index b302673b..1b8caf82 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserTenantMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/AuthUserTenantMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.AuthUserTenant; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; /** * @author Donghuang
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallDetailRecordMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallDetailRecordMapper.java index 8fd40451..4f0ae6e1 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallDetailRecordMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallDetailRecordMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import java.util.List; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import org.apache.ibatis.annotations.Param; import com.pudonghot.yo.model.domain.CallDetailRecord; import com.pudonghot.yo.model.dbobject.CallDetailReport; diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallRecordingMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallRecordingMapper.java index e89fd696..31211641 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallRecordingMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallRecordingMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.CallRecording; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; /** * @author Donghuang
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallSatisfactionMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallSatisfactionMapper.java index c376dabf..58a34af5 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallSatisfactionMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallSatisfactionMapper.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.mapper; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.CallSatisfaction; /** diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListHistoricalMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListHistoricalMapper.java index 9ff50de1..c6e25d08 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListHistoricalMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListHistoricalMapper.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.mapper; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import org.apache.ibatis.annotations.Param; import com.pudonghot.yo.model.domain.CallingListHistorical; import com.pudonghot.yo.model.dbobject.CallingListHistoricalSummary; diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListMapper.java index 1ca6597d..4b73b603 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListMapper.java @@ -3,7 +3,7 @@ package com.pudonghot.yo.mapper; import java.util.List; import com.pudonghot.yo.model.DailyTime; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import org.apache.ibatis.annotations.Param; import com.pudonghot.yo.model.domain.CallingList; import com.pudonghot.yo.model.dbobject.CallingListSummary; diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListPreparedMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListPreparedMapper.java index 687ca028..592918d9 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListPreparedMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CallingListPreparedMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import java.util.List; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import org.apache.ibatis.annotations.Param; import com.pudonghot.yo.model.domain.CallingListPrepared; import com.pudonghot.yo.model.dbobject.CallingListPreparedSummary; diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CampaignMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CampaignMapper.java index 75ad1369..caeadb8c 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CampaignMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CampaignMapper.java @@ -1,11 +1,14 @@ package com.pudonghot.yo.mapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.Campaign; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl; +import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider; /** * @author Donghuang
* Jan 02, 2020 16:29:04 */ +@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class) public interface CampaignMapper extends BaseMapper { } diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CampaignTrunkStrategyMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CampaignTrunkStrategyMapper.java index 43e26dd2..da250345 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CampaignTrunkStrategyMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/CampaignTrunkStrategyMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.CampaignTrunkStrategy; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; /** * @author Donghuang
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/GatewayMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/GatewayMapper.java index 119246d6..cfbc872e 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/GatewayMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/GatewayMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.Gateway; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; /** * @author Donghuang
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/IvrEntryMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/IvrEntryMapper.java index 66f441f8..077f3fca 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/IvrEntryMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/IvrEntryMapper.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.mapper; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.IvrEntry; /** diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/IvrMenuMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/IvrMenuMapper.java index 6896ca9d..58ac2c83 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/IvrMenuMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/IvrMenuMapper.java @@ -1,7 +1,6 @@ package com.pudonghot.yo.mapper; -import com.pudonghot.yo.model.domain.Tag; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.IvrMenu; /** diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/ObjectTagMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/ObjectTagMapper.java index 90c54987..31bda95f 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/ObjectTagMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/ObjectTagMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.ObjectTag; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; /** * @author Donghuang
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneBlacklistMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneBlacklistMapper.java index fa562046..2e03fdd6 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneBlacklistMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneBlacklistMapper.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.mapper; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.PhoneBlacklist; /** diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneGreylistMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneGreylistMapper.java index 13cc1ffd..0c61be6b 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneGreylistMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneGreylistMapper.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.mapper; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.PhoneGreylist; /** diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneWhitelistMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneWhitelistMapper.java index 213a651b..670fa334 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneWhitelistMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/PhoneWhitelistMapper.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.mapper; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.PhoneWhitelist; /** diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/QueueAgentMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/QueueAgentMapper.java index e6a7e738..9e17bc06 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/QueueAgentMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/QueueAgentMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.QueueAgent; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; /** * @author Donghuang
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/QueueMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/QueueMapper.java index 9e9fec77..6070cc68 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/QueueMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/QueueMapper.java @@ -3,7 +3,7 @@ package com.pudonghot.yo.mapper; import java.util.List; import com.pudonghot.yo.model.domain.Queue; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import org.apache.ibatis.annotations.Param; /** diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/SequenceMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/SequenceMapper.java index 795ac2da..f0f6e29f 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/SequenceMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/SequenceMapper.java @@ -1,8 +1,8 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.Sequence; -import com.wacai.tigon.mybatis.Search; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.BaseMapper; import org.apache.ibatis.annotations.Param; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotBlank; diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/SoundMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/SoundMapper.java index ae58a678..cf53d2cf 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/SoundMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/SoundMapper.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.mapper; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.Sound; /** diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TagMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TagMapper.java index bd9ad509..da0fb3f9 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TagMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TagMapper.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.mapper; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.Tag; /** diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TelecomVendorMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TelecomVendorMapper.java index 596b9876..ad296ce1 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TelecomVendorMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TelecomVendorMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.TelecomVendor; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; /** * @author Donghuang
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TenantMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TenantMapper.java index 799273a7..f2bf494b 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TenantMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TenantMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.Tenant; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkAttrMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkAttrMapper.java index 8c06d1ef..85902f95 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkAttrMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkAttrMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.TrunkAttr; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; /** * @author Donghuang
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkMapper.java index eb13a3e2..3a41347e 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkMapper.java @@ -1,14 +1,17 @@ package com.pudonghot.yo.mapper; import java.util.List; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import org.apache.ibatis.annotations.Param; import com.pudonghot.yo.model.domain.Trunk; +import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl; +import com.pudonghot.yo.mapper.xmlcontentprovider.TableVarXmlContentProvider; /** * @author Donghuang
* Oct 28, 2019 14:13:28 */ +@MapperXmlEl(tag = MapperXmlEl.Tag.SQL, id = "tableVar", contentProvider = TableVarXmlContentProvider.class) public interface TrunkMapper extends BaseMapper { /** diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkProhibitedAreaCodeMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkProhibitedAreaCodeMapper.java index df62c3fc..525af1c1 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkProhibitedAreaCodeMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkProhibitedAreaCodeMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.TrunkProhibitedAreaCode; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; /** * @author Donghuang
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkStrategyMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkStrategyMapper.java index 40ab01dc..cdb39587 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkStrategyMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkStrategyMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import java.util.List; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import org.apache.ibatis.annotations.Param; import com.pudonghot.yo.model.domain.TrunkStrategy; diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkStrategyTrunkMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkStrategyTrunkMapper.java index 5df4eb17..1c9382ce 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkStrategyTrunkMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkStrategyTrunkMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.TrunkStrategyTrunk; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; /** * @author Donghuang
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkTrunkAttrMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkTrunkAttrMapper.java index cf3ebd32..ae393af5 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkTrunkAttrMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/TrunkTrunkAttrMapper.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.mapper; import com.pudonghot.yo.model.domain.TrunkTrunkAttr; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; /** * @author Donghuang
diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/WorkRecordMapper.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/WorkRecordMapper.java index cea4a5c9..d06904fd 100644 --- a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/WorkRecordMapper.java +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/WorkRecordMapper.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.mapper; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.pudonghot.yo.model.domain.WorkRecord; /** diff --git a/lib/mapper/src/main/java/com/pudonghot/yo/mapper/xmlcontentprovider/TableVarXmlContentProvider.java b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/xmlcontentprovider/TableVarXmlContentProvider.java new file mode 100644 index 00000000..c8dc8f4f --- /dev/null +++ b/lib/mapper/src/main/java/com/pudonghot/yo/mapper/xmlcontentprovider/TableVarXmlContentProvider.java @@ -0,0 +1,28 @@ +package com.pudonghot.yo.mapper.xmlcontentprovider; + +import lombok.val; +import org.w3c.dom.Element; +import org.w3c.dom.Document; +import lombok.extern.slf4j.Slf4j; +import me.chyxion.tigon.mybatis.xmlgen.XmlGenArg; +import me.chyxion.tigon.mybatis.xmlgen.contentprovider.XmlContentProvider; + +/** + * @author Donghuang
+ * Jan 09, 2020 18:01:55 + */ +@Slf4j +public class TableVarXmlContentProvider extends XmlContentProvider { + + /** + * {@inheritDoc} + */ + @Override + public Content content(final XmlGenArg arg) { + val doc = arg.getDocument(); + val bindEl = doc.createElement("bind"); + bindEl.setAttribute("name", "__table__"); + bindEl.setAttribute("value", "'" + arg.getTable() + "'"); + return new Content(bindEl); + } +} diff --git a/lib/mapper/src/main/resources/spring/spring-yo-mapper.xml b/lib/mapper/src/main/resources/spring/spring-yo-mapper.xml index 44f702be..2eb157dc 100644 --- a/lib/mapper/src/main/resources/spring/spring-yo-mapper.xml +++ b/lib/mapper/src/main/resources/spring/spring-yo-mapper.xml @@ -24,7 +24,7 @@ diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/AgentStatusMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/AgentStatusMapperTest.java index 3319baf9..6dcab511 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/AgentStatusMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/AgentStatusMapperTest.java @@ -1,7 +1,6 @@ package com.pudonghot.yo.mapper; -import com.pudonghot.yo.model.domain.AgentStatus; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import lombok.val; import org.junit.Test; import org.junit.runner.RunWith; @@ -10,8 +9,6 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import java.util.List; - /** * @author Donghuang
* Oct 26, 2019 15:31:51 diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallDetailRecordMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallDetailRecordMapperTest.java index ac7c0a6a..63f4c7cc 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallDetailRecordMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallDetailRecordMapperTest.java @@ -3,10 +3,9 @@ package com.pudonghot.yo.mapper; import com.fasterxml.jackson.databind.ObjectMapper; import com.pudonghot.yo.model.domain.CallDetailRecord; import com.pudonghot.yo.model.request.ReqCallDetailRecordAccountReport; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import lombok.val; import org.apache.commons.lang3.StringUtils; -import org.apache.commons.lang3.time.DateFormatUtils; import org.apache.commons.lang3.time.DateUtils; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallSatisfactionMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallSatisfactionMapperTest.java index a9183f40..3dce8666 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallSatisfactionMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallSatisfactionMapperTest.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.mapper; import org.junit.Test; import org.junit.runner.RunWith; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.test.context.ContextConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListHistoricalMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListHistoricalMapperTest.java index a382e362..0569bcca 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListHistoricalMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListHistoricalMapperTest.java @@ -4,7 +4,7 @@ import lombok.val; import org.junit.Test; import lombok.extern.slf4j.Slf4j; import org.junit.runner.RunWith; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.test.context.ContextConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListMapperTest.java index 61b6a73b..70a62133 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListMapperTest.java @@ -7,7 +7,7 @@ import lombok.val; import org.junit.Test; import lombok.extern.slf4j.Slf4j; import org.junit.runner.RunWith; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.test.context.ContextConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListPreparedMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListPreparedMapperTest.java index 46dc5ee1..751ebe8f 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListPreparedMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CallingListPreparedMapperTest.java @@ -4,7 +4,7 @@ import lombok.val; import org.junit.Test; import lombok.extern.slf4j.Slf4j; import org.junit.runner.RunWith; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CampaignMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CampaignMapperTest.java index 45e41b60..96735e5f 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CampaignMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/CampaignMapperTest.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.mapper; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.junit.Test; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/PhoneBlacklistMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/PhoneBlacklistMapperTest.java index d2db64e5..619c3964 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/PhoneBlacklistMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/PhoneBlacklistMapperTest.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.mapper; import org.junit.Test; import org.junit.runner.RunWith; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.test.context.ContextConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/PhoneGreylistMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/PhoneGreylistMapperTest.java index 7ec80617..79e6f497 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/PhoneGreylistMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/PhoneGreylistMapperTest.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.mapper; import org.junit.Test; import org.junit.runner.RunWith; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.test.context.ContextConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/PhoneWhitelistMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/PhoneWhitelistMapperTest.java index 10a55df5..075a79e1 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/PhoneWhitelistMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/PhoneWhitelistMapperTest.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.mapper; import org.junit.Test; import org.junit.runner.RunWith; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.test.context.ContextConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/SoundMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/SoundMapperTest.java index 60d8e0c8..41a2fa46 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/SoundMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/SoundMapperTest.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.mapper; import org.junit.Test; import org.junit.runner.RunWith; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.test.context.ContextConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/TrunkMapperTest.java b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/TrunkMapperTest.java index 1f02b541..1a32ac0c 100644 --- a/lib/mapper/src/test/java/com/pudonghot/yo/mapper/TrunkMapperTest.java +++ b/lib/mapper/src/test/java/com/pudonghot/yo/mapper/TrunkMapperTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import java.util.Arrays; import org.junit.runner.RunWith; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.model.domain.Trunk; import org.springframework.test.context.ContextConfiguration; import org.springframework.beans.factory.annotation.Autowired; diff --git a/lib/mapper/src/test/resources/spring/spring-test.xml b/lib/mapper/src/test/resources/spring/spring-test.xml index b699d41c..e392a01e 100644 --- a/lib/mapper/src/test/resources/spring/spring-test.xml +++ b/lib/mapper/src/test/resources/spring/spring-test.xml @@ -7,4 +7,5 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Agent.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Agent.java index 99a81854..937bed8e 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Agent.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Agent.java @@ -2,8 +2,12 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.*; +import me.chyxion.tigon.mybatis.*; import lombok.experimental.FieldNameConstants; +import me.chyxion.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.NotUpdateWhenNull; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.Transient; /** * @author Donghuang
diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AgentGroup.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AgentGroup.java index 2ac53f44..ccdcf204 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AgentGroup.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AgentGroup.java @@ -2,9 +2,9 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.Transient; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.Transient; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; import com.pudonghot.yo.basic.model.PrivacyLevel; diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AgentGroupTrunkStrategy.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AgentGroupTrunkStrategy.java index f916f231..18099bf2 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AgentGroupTrunkStrategy.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AgentGroupTrunkStrategy.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AgentStatus.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AgentStatus.java index 34c64883..85fc960b 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AgentStatus.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AgentStatus.java @@ -3,8 +3,10 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; import java.util.Date; -import com.wacai.tigon.mybatis.*; +import me.chyxion.tigon.mybatis.*; import lombok.experimental.FieldNameConstants; +import me.chyxion.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; /** * @author Donghuang diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AreaCode.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AreaCode.java index 4ef9333c..8c77c578 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AreaCode.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AreaCode.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthPermission.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthPermission.java index d986ffc3..d975871a 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthPermission.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthPermission.java @@ -2,9 +2,9 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; -import com.wacai.tigon.mybatis.Transient; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Transient; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthPermissionRole.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthPermissionRole.java index f7dd8b37..650d8eca 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthPermissionRole.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthPermissionRole.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthRole.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthRole.java index ec6b877e..7bd9683b 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthRole.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthRole.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthUser.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthUser.java index 8e2d76d2..0f537085 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthUser.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthUser.java @@ -2,9 +2,13 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.*; +import me.chyxion.tigon.mybatis.*; import lombok.experimental.FieldNameConstants; import com.fasterxml.jackson.annotation.JsonProperty; +import me.chyxion.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.NotUpdateWhenNull; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.Transient; /** * @author Donghuang
diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthUserRole.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthUserRole.java index a38c83d7..1d0da4a9 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthUserRole.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthUserRole.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthUserTenant.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthUserTenant.java index bc916239..e40caee9 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthUserTenant.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/AuthUserTenant.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/BaseDomain.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/BaseDomain.java index fe25bac2..e3921ede 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/BaseDomain.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/BaseDomain.java @@ -5,7 +5,7 @@ import lombok.Getter; import lombok.Setter; import java.util.Date; import com.wacai.tigon.model.M0; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.NotUpdate; import org.apache.commons.lang3.StringUtils; import lombok.experimental.FieldNameConstants; import org.apache.commons.lang3.builder.ToStringBuilder; diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallDetailRecord.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallDetailRecord.java index de83d258..5fe680fb 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallDetailRecord.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallDetailRecord.java @@ -4,8 +4,8 @@ import lombok.Getter; import lombok.Setter; import java.util.Date; import com.wacai.tigon.model.M0; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallRecording.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallRecording.java index ba1d2b7b..7c2a4d1d 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallRecording.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallRecording.java @@ -2,9 +2,9 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.Transient; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.Transient; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallSatisfaction.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallSatisfaction.java index d54d6555..33a18b2c 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallSatisfaction.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallSatisfaction.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallingList.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallingList.java index e588d755..93824cc6 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallingList.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallingList.java @@ -3,9 +3,9 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; import java.util.Date; -import com.wacai.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.Table; import com.pudonghot.yo.model.DailyTime; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallingListHistorical.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallingListHistorical.java index c73657cf..6d9515f2 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallingListHistorical.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallingListHistorical.java @@ -3,8 +3,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; import java.util.Date; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallingListPrepared.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallingListPrepared.java index 096f936f..45bb9639 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallingListPrepared.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallingListPrepared.java @@ -3,8 +3,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; import java.util.Date; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Campaign.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Campaign.java index 9ee824be..6b239b9e 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Campaign.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Campaign.java @@ -2,9 +2,13 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.*; +import me.chyxion.tigon.mybatis.*; import com.pudonghot.yo.model.DailyTime; import lombok.experimental.FieldNameConstants; +import me.chyxion.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.NotUpdateWhenNull; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.Transient; /** * @author Donghuang
diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CampaignTrunkStrategy.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CampaignTrunkStrategy.java index e166e369..de998720 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CampaignTrunkStrategy.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CampaignTrunkStrategy.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Gateway.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Gateway.java index 9cc00fe4..0da4f935 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Gateway.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Gateway.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.Table; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/IvrEntry.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/IvrEntry.java index 8fe2dc42..40e37645 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/IvrEntry.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/IvrEntry.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/IvrMenu.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/IvrMenu.java index 8c70ed9b..e66f260b 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/IvrMenu.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/IvrMenu.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.Table; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/ObjectTag.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/ObjectTag.java index 8ae87ff1..6f742d89 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/ObjectTag.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/ObjectTag.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/PhoneBlacklist.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/PhoneBlacklist.java index 579a4ca5..f1abc1ed 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/PhoneBlacklist.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/PhoneBlacklist.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/PhoneGreylist.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/PhoneGreylist.java index eb7ce581..1d3f5297 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/PhoneGreylist.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/PhoneGreylist.java @@ -3,8 +3,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; import java.util.Date; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/PhoneWhitelist.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/PhoneWhitelist.java index 68e4754d..c937a50b 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/PhoneWhitelist.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/PhoneWhitelist.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Queue.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Queue.java index f147c183..c9b53c21 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Queue.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Queue.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/QueueAgent.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/QueueAgent.java index a1361108..4685b0b3 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/QueueAgent.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/QueueAgent.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Sequence.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Sequence.java index 7c19bd74..d6b1b434 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Sequence.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Sequence.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Sound.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Sound.java index 14406336..5460ca1e 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Sound.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Sound.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.Table; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Tag.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Tag.java index e0f5688a..361a8469 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Tag.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Tag.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TaggableDomain.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TaggableDomain.java index 09d3cac5..097e6393 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TaggableDomain.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TaggableDomain.java @@ -2,9 +2,9 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Transient; +import me.chyxion.tigon.mybatis.Transient; import lombok.experimental.FieldNameConstants; -import com.wacai.tigon.mybatis.UseGeneratedKeys; +import me.chyxion.tigon.mybatis.UseGeneratedKeys; /** * @author Donghuang
diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TelecomVendor.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TelecomVendor.java index 75042792..72312db8 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TelecomVendor.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TelecomVendor.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.Table; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Tenant.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Tenant.java index 7b5e90d6..76f6a280 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Tenant.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Tenant.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TenantDomain.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TenantDomain.java index 5c97c3b6..dc12cabc 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TenantDomain.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TenantDomain.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Trunk.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Trunk.java index ed2ec899..281f4837 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/Trunk.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/Trunk.java @@ -2,9 +2,9 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; -import com.wacai.tigon.mybatis.Transient; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Transient; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkAttr.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkAttr.java index 3903c481..80cc102e 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkAttr.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkAttr.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkProhibitedAreaCode.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkProhibitedAreaCode.java index 5243b1a0..75015af7 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkProhibitedAreaCode.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkProhibitedAreaCode.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; /** * @author Donghuang
diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkStrategy.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkStrategy.java index 94902320..35789daa 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkStrategy.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkStrategy.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkStrategyTrunk.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkStrategyTrunk.java index 266f0886..7105c17b 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkStrategyTrunk.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkStrategyTrunk.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkTrunkAttr.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkTrunkAttr.java index af262c38..080ced77 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkTrunkAttr.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/TrunkTrunkAttr.java @@ -2,8 +2,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/WorkRecord.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/WorkRecord.java index 9f8b4c70..de4cc0eb 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/WorkRecord.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/WorkRecord.java @@ -3,8 +3,8 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; import java.util.Date; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.NotUpdate; import lombok.experimental.FieldNameConstants; /** diff --git a/lib/model/src/test/java/com/pudonghot/yo/TestDriver.java b/lib/model/src/test/java/com/pudonghot/yo/TestDriver.java index 8afe3325..c91b765d 100644 --- a/lib/model/src/test/java/com/pudonghot/yo/TestDriver.java +++ b/lib/model/src/test/java/com/pudonghot/yo/TestDriver.java @@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j; import com.pudonghot.yo.util.TimeUtils; import com.pudonghot.yo.model.DailyTime; import com.pudonghot.yo.model.domain.Agent; -import com.wacai.tigon.mybatis.UseGeneratedKeys; +import me.chyxion.tigon.mybatis.UseGeneratedKeys; import com.fasterxml.jackson.databind.ObjectMapper; import com.pudonghot.yo.model.agentevent.AgentEvent; import org.apache.commons.lang3.time.DateFormatUtils; diff --git a/lib/service-common/src/main/java/com/pudonghot/yo/service/impl/CommonAgentStatusServiceImpl.java b/lib/service-common/src/main/java/com/pudonghot/yo/service/impl/CommonAgentStatusServiceImpl.java index 3ff2f3b6..7f61eada 100644 --- a/lib/service-common/src/main/java/com/pudonghot/yo/service/impl/CommonAgentStatusServiceImpl.java +++ b/lib/service-common/src/main/java/com/pudonghot/yo/service/impl/CommonAgentStatusServiceImpl.java @@ -6,7 +6,7 @@ import lombok.Setter; import java.util.Date; import lombok.extern.slf4j.Slf4j; import java.util.function.Consumer; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.mapper.AgentMapper; import com.wacai.tigon.sequence.IdSequence; import com.pudonghot.yo.model.domain.Agent; diff --git a/lib/service-common/src/main/java/com/pudonghot/yo/service/impl/CommonCampaignServiceImpl.java b/lib/service-common/src/main/java/com/pudonghot/yo/service/impl/CommonCampaignServiceImpl.java index bfbfe9fa..dd899dc9 100644 --- a/lib/service-common/src/main/java/com/pudonghot/yo/service/impl/CommonCampaignServiceImpl.java +++ b/lib/service-common/src/main/java/com/pudonghot/yo/service/impl/CommonCampaignServiceImpl.java @@ -1,7 +1,7 @@ package com.pudonghot.yo.service.impl; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.util.Assert; import com.pudonghot.yo.mapper.QueueMapper; import com.pudonghot.yo.model.domain.Agent; diff --git a/lib/tigon/codegen/pom.xml b/lib/tigon/codegen/pom.xml index c935e737..4bede57c 100644 --- a/lib/tigon/codegen/pom.xml +++ b/lib/tigon/codegen/pom.xml @@ -57,7 +57,7 @@ - com.wacai.tigon + me.chyxion.tigon tigon-mybatis diff --git a/lib/tigon/codegen/src/main/java/com/wacai/tigon/codegen/service/support/CodeGenServiceSupport.java b/lib/tigon/codegen/src/main/java/com/wacai/tigon/codegen/service/support/CodeGenServiceSupport.java index 45f00dd0..2901452a 100644 --- a/lib/tigon/codegen/src/main/java/com/wacai/tigon/codegen/service/support/CodeGenServiceSupport.java +++ b/lib/tigon/codegen/src/main/java/com/wacai/tigon/codegen/service/support/CodeGenServiceSupport.java @@ -3,7 +3,7 @@ package com.wacai.tigon.codegen.service.support; import lombok.val; import java.io.File; import java.util.*; -import java.io.InputStream; + import lombok.SneakyThrows; import com.wacai.tigon.form.FC0; import com.wacai.tigon.form.FU0; @@ -13,13 +13,13 @@ import java.text.SimpleDateFormat; import java.util.stream.Collectors; import com.wacai.tigon.form.FormList; import org.apache.commons.io.IOUtils; -import com.wacai.tigon.mybatis.Table; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.util.WordUtils; import org.apache.commons.io.FileUtils; import org.springframework.util.Assert; import java.nio.charset.StandardCharsets; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; @@ -39,8 +39,6 @@ import com.wacai.tigon.codegen.configprop.ConfigProperties; import org.springframework.beans.factory.annotation.Autowired; import com.wacai.tigon.service.support.BaseCrudByFormServiceSupport; -import javax.validation.constraints.NotBlank; - /** * @version 0.0.1 * @since 0.0.1 diff --git a/lib/tigon/model/pom.xml b/lib/tigon/model/pom.xml index 936dfd98..c9c38f79 100644 --- a/lib/tigon/model/pom.xml +++ b/lib/tigon/model/pom.xml @@ -26,6 +26,10 @@ com.fasterxml.jackson.core jackson-databind + + me.chyxion.tigon + tigon-mybatis-common + org.springframework spring-core diff --git a/lib/tigon/model/src/main/java/com/wacai/tigon/model/M0.java b/lib/tigon/model/src/main/java/com/wacai/tigon/model/M0.java index a781bad9..79c69133 100644 --- a/lib/tigon/model/src/main/java/com/wacai/tigon/model/M0.java +++ b/lib/tigon/model/src/main/java/com/wacai/tigon/model/M0.java @@ -4,7 +4,7 @@ import lombok.Getter; import lombok.Setter; import java.io.Serializable; import com.wacai.tigon.entity.BasicEntity; -import com.wacai.tigon.mybatis.NotUpdate; +import me.chyxion.tigon.mybatis.NotUpdate; /** * @version 0.0.1 diff --git a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Criterion.java b/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Criterion.java deleted file mode 100644 index 0d1febd4..00000000 --- a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Criterion.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.wacai.tigon.mybatis; - -import lombok.Getter; -import java.util.Arrays; -import java.io.Serializable; -import java.util.Collection; -import java.util.Collections; - -/** - * @author Donghuang
- * 2017/1/24 10:23 - */ -@Getter -class Criterion implements Serializable { - private static final long serialVersionUID = 1L; - - private final Type type; - private final String col; - private final Collection values; - private final Search search; - - Criterion(Type type, Search search) { - this.type = type; - this.col = null; - this.values = Collections.emptyList(); - this.search = search; - } - - Criterion(Type type, String col, Object value) { - this(type, col, Arrays.asList(value)); - } - - Criterion(Type type, String col, Object[] values) { - this(type, col, Arrays.asList(values)); - } - - Criterion(Type type, String col, Collection values) { - this.type = type; - this.col = col; - this.values = values; - this.search = null; - } - - @SuppressWarnings("unchecked") - T getValue() { - return values.isEmpty() ? null : (T) values.iterator().next(); - } - - public enum Type { - EQ, - NE, - LIKE, - NOT_LIKE, - LT, - LTE, - GT, - GTE, - IS_NULL, - IS_NOT_NULL, - BETWEEN, - NOT_BETWEEN, - IN, - NOT_IN, - AND, - OR - } -} diff --git a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/NoPrimaryKey.java b/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/NoPrimaryKey.java deleted file mode 100644 index 6c670707..00000000 --- a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/NoPrimaryKey.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.wacai.tigon.mybatis; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * @author Donghuang - * @date Aug 31, 2020 21:43:38 - */ -@Target(TYPE) -@Retention(RUNTIME) -public @interface NoPrimaryKey { -} diff --git a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/NotUpdate.java b/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/NotUpdate.java deleted file mode 100644 index 375168cf..00000000 --- a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/NotUpdate.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.wacai.tigon.mybatis; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * @author Donghuang
- * Jun 25, 2017 09:57:32 - */ -@Target(FIELD) -@Retention(RUNTIME) -public @interface NotUpdate { -} diff --git a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/NotUpdateWhenNull.java b/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/NotUpdateWhenNull.java deleted file mode 100644 index 1257d48d..00000000 --- a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/NotUpdateWhenNull.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.wacai.tigon.mybatis; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * @author Donghuang
- * Mar 16, 2017 23:51:00 - */ -@Target(FIELD) -@Retention(RUNTIME) -public @interface NotUpdateWhenNull { -} diff --git a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/PrimaryKey.java b/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/PrimaryKey.java deleted file mode 100644 index 7f0dcb22..00000000 --- a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/PrimaryKey.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.wacai.tigon.mybatis; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * @author Donghuang
- * Feb 21, 2017 19:03:31 - */ -@Target(FIELD) -@Retention(RUNTIME) -public @interface PrimaryKey { -} diff --git a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/RawValue.java b/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/RawValue.java deleted file mode 100644 index cde09f06..00000000 --- a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/RawValue.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.wacai.tigon.mybatis; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Mark col raw - * - * @author Donghuang
- * Dec 13, 2018 20:15:03 - */ -@Target(FIELD) -@Retention(RUNTIME) -public @interface RawValue { - - /** - * value - * @return raw value - */ - String value() default ""; -} diff --git a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Search.java b/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Search.java deleted file mode 100644 index cb673007..00000000 --- a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Search.java +++ /dev/null @@ -1,748 +0,0 @@ -package com.wacai.tigon.mybatis; - -import java.util.*; -import java.io.Serializable; -import java.lang.reflect.Array; -import java.util.function.Consumer; -import com.wacai.tigon.util.WordUtils; -import org.springframework.util.Assert; -import org.apache.commons.lang3.StringUtils; -import static com.wacai.tigon.mybatis.Criterion.Type.*; - -/** - * @version 0.0.1 - * @author Donghuang
- * May 12, 2015 3:00:40 PM - */ -public class Search implements Serializable { - private static final long serialVersionUID = 1L; - - /** - * order - */ - public enum Order { - ASC, - DESC - } - - private final List criteria = - new LinkedList<>(); - private String table; - private Integer offset; - private Integer limit; - private final Map orders = - new LinkedHashMap<>(); - /** - * extended data - */ - private final Map attrs = - new HashMap<>(); - - private static final Map> PROCESSORS; - - static { - PROCESSORS = new HashMap<>(16); - - PROCESSORS.put(EQ, arg -> arg.addSql(arg.getCol() + " = ").addVal(arg.getValue())); - PROCESSORS.put(NE, arg -> arg.addSql(arg.getCol() + " <> ").addVal(arg.getValue())); - PROCESSORS.put(LIKE, arg -> arg.addSql(arg.getCol() + " like ").addVal(arg.getValue())); - PROCESSORS.put(NOT_LIKE, arg -> arg.addSql(arg.getCol() + " not like ").addVal(arg.getValue())); - PROCESSORS.put(LT, arg -> arg.addSql(arg.getCol() + " < ").addVal(arg.getValue())); - PROCESSORS.put(LTE, arg -> arg.addSql(arg.getCol() + " <= ").addVal(arg.getValue())); - PROCESSORS.put(GT, arg -> arg.addSql(arg.getCol() + " > ").addVal(arg.getValue())); - PROCESSORS.put(GTE, arg -> arg.addSql(arg.getCol() + " >= ").addVal(arg.getValue())); - PROCESSORS.put(IS_NULL, arg -> arg.addSql(arg.getCol() + " is null")); - PROCESSORS.put(IS_NOT_NULL, arg -> arg.addSql(arg.getCol() + " is not null")); - PROCESSORS.put(BETWEEN, arg -> { - final Iterator valIt = arg.getCriterion() - .getValues().iterator(); - arg.addSql(arg.getCol() + " between ") - .addVal(valIt.next()) - .addSql(" and ") - .addVal(valIt.next()); - }); - PROCESSORS.put(NOT_BETWEEN, arg -> { - final Iterator valIt = arg.getCriterion() - .getValues().iterator(); - arg.addSql(arg.getCol() + " not between ") - .addVal(valIt.next()) - .addSql(" and ") - .addVal(valIt.next()); - }); - PROCESSORS.put(IN, arg -> arg.addSql(arg.getCol() + " in ").addValCollection()); - PROCESSORS.put(NOT_IN, arg -> arg.addSql(arg.getCol() + " not in ").addValCollection()); - PROCESSORS.put(AND, arg -> arg.addSubsearch()); - PROCESSORS.put(OR, arg -> arg.addSubsearch()); - } - - /** - * default construct - */ - public Search() { - } - - /** - * @param value id value - */ - public Search(Object value) { - eq("id", value); - } - - /** - * construct by eq - * @param col col name - * @param value value - */ - public Search(String col, Object value) { - eq(col, value); - } - - /** - * construct by eq - * @param col col name - * @param values values - */ - public Search(String col, Collection values) { - in(col, values); - } - - /** - * construct by eq - * @param col col name - * @param values values - */ - public Search(String col, Object[] values) { - in(col, values); - } - - /** - * set table - * @param table table - * @return this - */ - public Search table(String table) { - this.table = table; - return this; - } - - /** - * clear criteria - * @return search - */ - public Search clearCriteria() { - criteria.clear(); - return this; - } - - /** - * clear orders - * @return search - */ - public Search clearOrders() { - orders.clear(); - return this; - } - - /** - * col eq - * @param col col name - * @param value value - * @return this - */ - public Search eq(String col, Object value) { - if (value == null) { - criteria.add(new Criterion(IS_NULL, col, value)); - } - else if (value instanceof Collection) { - in(col, (Collection) value); - } - else if (value.getClass().isArray()) { - // may primitive, (Object[]) causes exception - in(col, toList(value)); - } - else { - criteria.add(new Criterion(EQ, col, value)); - } - return this; - } - - /** - * same as #eq(col, null) - * @param col col name - * @return this - */ - public Search isNull(String col) { - return eq(col, null); - } - - /** - * col in values array - * @param col col name - * @param values values - * @return this - */ - public Search in(String col, Object[] values) { - criteria.add(new Criterion(IN, col, values)); - return this; - } - - /** - * col in values list - * @param col col name - * @param values values - * @return this - */ - public Search in(String col, Collection values) { - if (values != null && !values.isEmpty()) { - criteria.add(new Criterion(IN, col, values)); - } - return this; - } - - /** - * col like value - * - * @param col col name - * @param value value - * @return this - */ - public Search like(String col, String value) { - criteria.add(new Criterion(LIKE, col, value)); - return this; - } - - /** - * @param col col name - * - * @param value value - * @param wrapValue wrap value with % - * @return this - */ - public Search like(String col, String value, boolean wrapValue) { - return like(col, wrapValue ? "%" + value + "%" : value); - } - - /** - * col not like value - * - * @param col col name - * @param value value - * @return this - */ - public Search notLike(String col, String value) { - criteria.add(new Criterion(NOT_LIKE, col, value)); - return this; - } - - /** - * @param col col name - * - * @param value value - * @param wrapValue wrap value with % - * @return this - */ - public Search notLike(String col, String value, boolean wrapValue) { - return notLike(col, wrapValue ? "%" + value + "%" : value); - } - - /** - * col contains value - * @see #like - * @param col col name - * @param value value - * @return this - */ - public Search contains(final String col, final String value) { - return like(col, value, true); - } - - /** - * col not contains value - * @see #notLike - * @param col col name - * @param value value - * @return this - */ - public Search notContains(final String col, final String value) { - return notLike(col, value, true); - } - - /** - * col starts with value - * @see #like - * @param col col name - * @param value value - * @return this - */ - public Search startsWith(final String col, final String value) { - return like(col, value + "%"); - } - - /** - * col not starts with value - * - * @see #notLike - * @param col col name - * @param value value - * @return this - */ - public Search notStartsWith(final String col, final String value) { - return notLike(col, value + "%"); - } - - /** - * col ends with value - * - * @see #like(String, String) - * @param col col name - * @param value value - * @return this - */ - public Search endsWith(final String col, final String value) { - return like(col, "%" + value); - } - - /** - * col not ends with value - * - * @see #notLike(String, String) - * @param col col name - * @param value value - * @return this - */ - public Search notEndsWith(final String col, final String value) { - return notLike(col, "%" + value); - } - - /** - * col between value1 and value2 - * - * @param col col name - * @param bottom bottom value - * @param top top value - * @return this - */ - public Search between(String col, Object bottom, Object top) { - criteria.add(new Criterion( - BETWEEN, - col, - Arrays.asList(bottom, top))); - return this; - } - - /** - * col not between value1 and value2 - * - * @param col col name - * @param bottom bottom value - * @param top top value - * @return this - */ - public Search notBetween(String col, Object bottom, Object top) { - criteria.add(new Criterion( - NOT_BETWEEN, - col, - Arrays.asList(bottom, top))); - return this; - } - - /** - * @param col col name - * @param value value - * @return this - */ - public Search ne(String col, Object value) { - criteria.add(new Criterion( - value != null ? NE : IS_NOT_NULL, col, value)); - return this; - } - - /** - * col not null - * @param col col - * @return search - */ - public Search notNull(String col) { - criteria.add(new Criterion( - IS_NOT_NULL, col, (Object) null)); - return this; - } - - /** - * @param col col name - * @param values values - * @return this - */ - public Search notIn(String col, Object[] values) { - return notIn(col, Arrays.asList(values)); - } - - /** - * @param col col name - * @param values values - * @return this - */ - public Search notIn(String col, Collection values) { - criteria.add(new Criterion(NOT_IN, col, values)); - return this; - } - - /** - * @param col col name - * @param value value - * @return this - */ - public Search lt(String col, Object value) { - criteria.add(new Criterion(LT, col, value)); - return this; - } - - /** - * @param col col name - * @param value value - * @return this - */ - public Search lte(String col, Object value) { - criteria.add(new Criterion(LTE, col, value)); - return this; - } - - /** - * @param col col name - * @param value value - * @return this - */ - public Search gt(String col, Object value) { - criteria.add(new Criterion(GT, col, value)); - return this; - } - - /** - * @param col col name - * @param value value - * @return this - */ - public Search gte(String col, Object value) { - criteria.add(new Criterion(GTE, col, value)); - return this; - } - - /** - * @param search search - * @return this - */ - public Search and(Search search) { - Assert.notNull(search, "And search could not be null"); - if (StringUtils.isBlank(search.table)) { - search.table = table; - } - Assert.state(this != search, "And search could not be self"); - criteria.add(new Criterion(AND, search)); - return this; - } - - /** - * @param search search - * @return this - */ - public Search or(Search search) { - Assert.notNull(search, "Or search could not be null"); - if (StringUtils.isBlank(search.table)) { - search.table = table; - } - Assert.state(this != search, "Or Search could not be self"); - criteria.add(new Criterion(OR, search)); - return this; - } - - /** - * @param col col name - * @param value value - * @return this - */ - public Search or(String col, Object value) { - return or(new Search(col, value).table(table)); - } - - /** - * @param col col name - * @return this - */ - public Search asc(String col) { - return orderBy(col, Order.ASC); - } - - /** - * @param col col name - * @return this - */ - public Search desc(String col) { - return orderBy(col, Order.DESC); - } - - /** - * order by - * @param col col name - * @param order order - * @return this - */ - public Search orderBy(final String col, final Order order) { - Assert.hasText(col, "Order column could not be blank"); - - if (col.matches("^\\w+$")) { - orders.put(WordUtils.convertCamelCase(col), - order.name()); - } - else { - orders.put(col, order.name()); - } - return this; - } - - /** - * @param offset offset - * @return this - */ - public Search offset(Integer offset) { - if (offset != null) { - Assert.state(offset >= 0, "Offset may not be negative"); - } - this.offset = offset; - return this; - } - - /** - * @param offset offset - * @return this - */ - public Search offset(int offset) { - Assert.state(offset >= 0, "Offset may not be negative"); - this.offset = offset; - return this; - } - - /** - * @return offset - */ - public Integer offset() { - return offset; - } - - /** - * @param limit limit - * @return this - */ - public Search limit(Integer limit) { - if (limit != null) { - Assert.state(limit > 0, "Limit may not be negative or zero"); - } - this.limit = limit; - return this; - } - - /** - * @param limit limit - * @return this - */ - public Search limit(int limit) { - Assert.state(limit > 0, "Limit may not be negative or zero"); - this.limit = limit; - return this; - } - - /** - * @return limit - */ - public Integer limit() { - return limit; - } - - /** - * @return orders - */ - public Map orders() { - final Map ordersRtn = - new LinkedHashMap<>(orders.size()); - boolean hasTable = StringUtils.isNotBlank(table); - for (final Map.Entry order : orders.entrySet()) { - final String col = order.getKey(); - ordersRtn.put(hasTable && !col.contains(".") ? - table + "." + col : col, order.getValue()); - } - return ordersRtn; - } - - /** - * assemble to sql and value list - * @return sql and value list - */ - public List assemble() { - return assemble(false); - } - - /** - * @return true if has criterion - */ - public boolean hasCriterion() { - return !criteria.isEmpty(); - } - - /** - * @param col col - * @return true if has col criterion - */ - public boolean hasCriterion(final String col) { - for (final Criterion criterion : criteria) { - if (col.equals(criterion.getCol())) { - return true; - } - } - return false; - } - - /** - * @return true if has no criterion - */ - public boolean hasNoCriterion() { - return criteria.isEmpty(); - } - - /** - * @return true if has order - */ - public boolean hasOrder() { - return !orders.isEmpty(); - } - - /** - * @return true if has no order - */ - public boolean hasNoOrder() { - return orders.isEmpty(); - } - - /** - * check attrs data - * @param name name - * @return true if has attr - */ - public boolean hasAttr(final String name) { - return attrs.containsKey(name); - } - - /** - * check attr val is true - * @param name attr name - * @return true if attr is true - */ - public boolean trueAttr(final String name) { - final Object val = attr(name); - return (val instanceof Boolean) && (Boolean) val; - } - - /** - * get attrs data - * @param name name - * @param data type - * @return data - */ - @SuppressWarnings("unchecked") - public T getAttr(final String name) { - return (T) attrs.get(name); - } - - /** - * get attrs data - * @param name name - * @param data type - * @return data - */ - @SuppressWarnings("unchecked") - public T attr(final String name) { - return (T) attrs.get(name); - } - - /** - * set attrs data - * @param name name - * @param value value - * @return this - */ - public Search setAttr(final String name, final Object value) { - attrs.put(name, value); - return this; - } - - /** - * set attrs data - * @param name name - * @param value value - * @return this - */ - public Search attr(final String name, final Object value) { - attrs.put(name, value); - return this; - } - - // -- - // private methods - - /** - * get table - * @return table - */ - String table() { - return this.table; - } - - List assemble(boolean subSearch) { - final List result = new LinkedList<>(); - final SearchProcArg arg = - new SearchProcArg(table, result); - - for (final Criterion criterion : criteria) { - arg.setCriterion(criterion); - final Criterion.Type type = criterion.getType(); - - if (type == OR) { - if (arg.isHasPrevCol()) { - arg.addSql(" or "); - } - else { - arg.setHasPrevOrCol(true); - } - } - // and - else { - if (arg.isHasPrevOrCol()) { - arg.addSql(" or "); - arg.setHasPrevOrCol(false); - } - else if (arg.isHasPrevCol()) { - arg.addSql(" and "); - } - } - - PROCESSORS.get(type).accept(arg); - - if (!arg.isHasPrevCol()) { - arg.setHasPrevCol(true); - } - } - - if (subSearch && criteria.size() > 1) { - result.add(0, new SqlFragment("(")); - result.add(new SqlFragment(")")); - } - return result; - } - - List toList(Object source) { - final int length = Array.getLength(source); - final List list = new ArrayList<>(length); - for (int i = 0; i < length; ++i) { - list.add(Array.get(source, i)); - } - return list; - } -} diff --git a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/SearchProcArg.java b/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/SearchProcArg.java deleted file mode 100644 index db186254..00000000 --- a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/SearchProcArg.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.wacai.tigon.mybatis; - -import lombok.Getter; -import lombok.Setter; -import lombok.NonNull; - -import java.io.Serializable; -import java.util.List; -import java.util.Collection; -import com.wacai.tigon.util.WordUtils; -import lombok.RequiredArgsConstructor; -import org.apache.commons.lang3.StringUtils; - -/** - * @author Donghuang
- * 2017/1/23 16:58 - */ -@Getter -@RequiredArgsConstructor -public class SearchProcArg implements Serializable { - private static final long serialVersionUID = 1L; - - private final String table; - @NonNull - private final List result; - @Setter - private Criterion criterion; - @Setter - private boolean hasPrevCol; - @Setter - private boolean hasPrevOrCol; - - /** - * add SQL - * @param sql sql - * @return this - */ - public SearchProcArg addSql(final String sql) { - result.add(new SqlFragment(sql)); - return this; - } - - /** - * add value - * - * @param value value - * @return this - */ - public SearchProcArg addVal(final Object value) { - result.add(value); - return this; - } - - /** - * add subsearch and(search) or(search) - * - * @return this - */ - public SearchProcArg addSubsearch() { - final Search search = criterion.getSearch(); - if (StringUtils.isBlank(search.table())) { - search.table(table); - } - result.addAll(search.assemble(true)); - return this; - } - - /** - * add (1, 2, 3) - * - * @return this - */ - public SearchProcArg addValCollection() { - addSql("("); - final Collection values = criterion.getValues(); - final int size = values.size(); - int i = 0; - for (final Object value : values) { - addVal(value); - if (++i < size) { - addSql(", "); - } - } - addSql(")"); - return this; - } - - /** - * get criterion col - * @return col - */ - public String getCol() { - final String col = criterion.getCol(); - return tableAndCol(col.matches("^\\w+$") ? - WordUtils.convertCamelCase(col) : col); - } - - /** - * get criterion value - * - * @param value type - * @return value - */ - public T getValue() { - return criterion.getValue(); - } - - /** - * table.col - * - * @param col col - * @return table.col - */ - private String tableAndCol(final String col) { - return StringUtils.isNotBlank(table) ? - table + "." + col : col; - } -} diff --git a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/SqlFragment.java b/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/SqlFragment.java deleted file mode 100644 index e86fdefa..00000000 --- a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/SqlFragment.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.wacai.tigon.mybatis; - -import lombok.Getter; -import java.io.Serializable; -import lombok.RequiredArgsConstructor; - -/** - * @author Donghuang
- * 2017/2/6 9:48 - */ -@Getter -@RequiredArgsConstructor -public class SqlFragment implements Serializable { - private static final long serialVersionUID = 1L; - - private final String sql; - - /** - * {@inheritDoc} - */ - @Override - public String toString() { - return sql; - } -} diff --git a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/SqlParam.java b/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/SqlParam.java deleted file mode 100644 index 08e02b1e..00000000 --- a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/SqlParam.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.wacai.tigon.mybatis; - -import lombok.Getter; -import java.io.Serializable; -import lombok.RequiredArgsConstructor; - -/** - * @author Donghuang
- * 2017/2/6 9:48 - */ -@Getter -@RequiredArgsConstructor -public class SqlParam implements Serializable { - private static final long serialVersionUID = 1L; - - private final boolean raw; - private final Object value; - - /** - * {@inheritDoc} - */ - @Override - public String toString() { - return "SQL param [" + value + "], raw [" + raw + "]."; - } -} diff --git a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Table.java b/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Table.java deleted file mode 100644 index fffea8a9..00000000 --- a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Table.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.wacai.tigon.mybatis; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * @author Donghuang
- * Feb 21, 2017 19:18:34 - */ -@Target(TYPE) -@Retention(RUNTIME) -public @interface Table { - String value(); -} diff --git a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Transient.java b/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Transient.java deleted file mode 100644 index b6500863..00000000 --- a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/Transient.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.wacai.tigon.mybatis; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * Mark entity field as transient, do not insert or update - * - * @author Donghuang
- * Mar 16, 2017 23:57:44 - */ -@Target(FIELD) -@Retention(RUNTIME) -public @interface Transient { -} diff --git a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/UseGeneratedKeys.java b/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/UseGeneratedKeys.java deleted file mode 100644 index bcbb845c..00000000 --- a/lib/tigon/model/src/main/java/com/wacai/tigon/mybatis/UseGeneratedKeys.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.wacai.tigon.mybatis; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import static java.lang.annotation.ElementType.TYPE; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -/** - * @author Donghuang
- * Feb 21, 2017 19:27:09 - */ -@Target(TYPE) -@Retention(RUNTIME) -public @interface UseGeneratedKeys { - - /** - * keyProperty - * @return keyProperty - */ - String value() default ""; -} diff --git a/lib/tigon/model/src/test/java/com/wacai/tigon/test/TestDriver.java b/lib/tigon/model/src/test/java/com/wacai/tigon/test/TestDriver.java index 64b49ac7..131fd8e4 100644 --- a/lib/tigon/model/src/test/java/com/wacai/tigon/test/TestDriver.java +++ b/lib/tigon/model/src/test/java/com/wacai/tigon/test/TestDriver.java @@ -1,7 +1,7 @@ package com.wacai.tigon.test; import com.wacai.tigon.model.M0; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.apache.commons.lang3.StringUtils; import org.junit.Test; import org.slf4j.Logger; diff --git a/lib/tigon/pom.xml b/lib/tigon/pom.xml index 096536da..53aeabdb 100644 --- a/lib/tigon/pom.xml +++ b/lib/tigon/pom.xml @@ -26,7 +26,6 @@ common model - mybatis service-api service-support web @@ -78,9 +77,14 @@ ${project.version} - com.wacai.tigon + me.chyxion.tigon + tigon-mybatis-common + 0.0.2 + + + me.chyxion.tigon tigon-mybatis - ${project.version} + 0.0.2 com.wacai.tigon diff --git a/lib/tigon/service-api/src/main/java/com/wacai/tigon/service/BaseCrudService.java b/lib/tigon/service-api/src/main/java/com/wacai/tigon/service/BaseCrudService.java index b0a24292..4006706a 100644 --- a/lib/tigon/service-api/src/main/java/com/wacai/tigon/service/BaseCrudService.java +++ b/lib/tigon/service-api/src/main/java/com/wacai/tigon/service/BaseCrudService.java @@ -2,7 +2,7 @@ package com.wacai.tigon.service; import java.util.Map; import java.util.Collection; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; import javax.validation.constraints.NotNull; import javax.validation.constraints.NotEmpty; diff --git a/lib/tigon/service-api/src/main/java/com/wacai/tigon/service/BaseDeleteService.java b/lib/tigon/service-api/src/main/java/com/wacai/tigon/service/BaseDeleteService.java index 93fc00f2..fbfb2d53 100644 --- a/lib/tigon/service-api/src/main/java/com/wacai/tigon/service/BaseDeleteService.java +++ b/lib/tigon/service-api/src/main/java/com/wacai/tigon/service/BaseDeleteService.java @@ -1,6 +1,6 @@ package com.wacai.tigon.service; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import javax.validation.constraints.NotNull; import org.springframework.validation.annotation.Validated; import com.wacai.tigon.validation.annotation.NotNullOrBlank; diff --git a/lib/tigon/service-api/src/main/java/com/wacai/tigon/service/BaseQueryService.java b/lib/tigon/service-api/src/main/java/com/wacai/tigon/service/BaseQueryService.java index eb2d07fc..3e856237 100644 --- a/lib/tigon/service-api/src/main/java/com/wacai/tigon/service/BaseQueryService.java +++ b/lib/tigon/service-api/src/main/java/com/wacai/tigon/service/BaseQueryService.java @@ -3,7 +3,7 @@ package com.wacai.tigon.service; import java.util.List; import java.util.function.Consumer; import java.util.function.Function; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; import javax.validation.constraints.Min; import com.wacai.tigon.model.ListResult; diff --git a/lib/tigon/service-support/pom.xml b/lib/tigon/service-support/pom.xml index 3509ea57..a2f6860e 100644 --- a/lib/tigon/service-support/pom.xml +++ b/lib/tigon/service-support/pom.xml @@ -22,7 +22,7 @@ tigon-service-api - com.wacai.tigon + me.chyxion.tigon tigon-mybatis diff --git a/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseCrudByFormServiceSupport.java b/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseCrudByFormServiceSupport.java index 72e1917a..1a65ea7a 100644 --- a/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseCrudByFormServiceSupport.java +++ b/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseCrudByFormServiceSupport.java @@ -3,7 +3,7 @@ package com.wacai.tigon.service.support; import lombok.extern.slf4j.Slf4j; import org.springframework.util.Assert; import com.wacai.tigon.model.ViewModel; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.wacai.tigon.form.FormCreateApi; import com.wacai.tigon.form.FormUpdateApi; import com.wacai.tigon.service.BaseCrudByFormService; diff --git a/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseCrudServiceSupport.java b/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseCrudServiceSupport.java index 1620052a..c8ec22e1 100644 --- a/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseCrudServiceSupport.java +++ b/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseCrudServiceSupport.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.ArrayList; import java.util.Collection; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; -import com.wacai.tigon.mybatis.BaseMapper; +import me.chyxion.tigon.mybatis.BaseMapper; import com.wacai.tigon.service.BaseCrudService; /** diff --git a/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseQueryServiceSupport.java b/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseQueryServiceSupport.java index aa2903a4..472c8711 100644 --- a/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseQueryServiceSupport.java +++ b/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseQueryServiceSupport.java @@ -4,10 +4,10 @@ import java.util.List; import lombok.extern.slf4j.Slf4j; import java.util.function.Consumer; import java.util.function.Function; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; import com.wacai.tigon.model.ListResult; -import com.wacai.tigon.mybatis.BaseQueryMapper; +import me.chyxion.tigon.mybatis.BaseQueryMapper; import com.wacai.tigon.service.BaseQueryService; import org.springframework.beans.factory.annotation.Value; diff --git a/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseServiceSupport.java b/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseServiceSupport.java index 267d10b7..bc4c82a6 100644 --- a/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseServiceSupport.java +++ b/lib/tigon/service-support/src/main/java/com/wacai/tigon/service/support/BaseServiceSupport.java @@ -6,11 +6,11 @@ import java.util.List; import java.util.ArrayList; import java.util.Collections; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Table; +import me.chyxion.tigon.mybatis.Table; import com.wacai.tigon.model.ViewModel; import com.wacai.tigon.service.BaseService; import org.apache.commons.lang3.StringUtils; -import com.wacai.tigon.mybatis.BaseQueryMapper; +import me.chyxion.tigon.mybatis.BaseQueryMapper; import org.springframework.core.GenericTypeResolver; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/ArgQuery.java b/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/ArgQuery.java index caa5f199..1c48bc61 100644 --- a/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/ArgQuery.java +++ b/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/ArgQuery.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.HashMap; import lombok.NoArgsConstructor; import lombok.AllArgsConstructor; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; /** diff --git a/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/BaseController.java b/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/BaseController.java index 0651b873..2539281a 100644 --- a/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/BaseController.java +++ b/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/BaseController.java @@ -2,7 +2,7 @@ package com.wacai.tigon.web.controller; import java.util.*; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.web.annotation.*; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.StringUtils; diff --git a/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/BaseQueryController.java b/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/BaseQueryController.java index 594afacd..5b480830 100644 --- a/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/BaseQueryController.java +++ b/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/BaseQueryController.java @@ -5,7 +5,7 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import java.util.function.Function; import com.wacai.tigon.form.FormList; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; import com.wacai.tigon.model.ListResult; import com.wacai.tigon.service.BaseQueryService; diff --git a/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/BasicController.java b/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/BasicController.java index f8683bff..32b153cd 100644 --- a/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/BasicController.java +++ b/lib/tigon/web-controller/src/main/java/com/wacai/tigon/web/controller/BasicController.java @@ -15,7 +15,7 @@ import org.slf4j.LoggerFactory; import java.io.ByteArrayOutputStream; import com.wacai.tigon.form.FormList; import lombok.RequiredArgsConstructor; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import java.nio.charset.StandardCharsets; import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.StringUtils; diff --git a/lib/tigon/web-controller/src/test/java/com/wacai/tigon/web/service/impl/CustomerServiceImpl.java b/lib/tigon/web-controller/src/test/java/com/wacai/tigon/web/service/impl/CustomerServiceImpl.java index c86d723e..5f40a6ee 100644 --- a/lib/tigon/web-controller/src/test/java/com/wacai/tigon/web/service/impl/CustomerServiceImpl.java +++ b/lib/tigon/web-controller/src/test/java/com/wacai/tigon/web/service/impl/CustomerServiceImpl.java @@ -10,7 +10,7 @@ import java.util.function.Function; import com.wacai.tigon.web.form.CustomerCreateForm; import com.wacai.tigon.web.form.CustomerUpdateForm; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.wacai.tigon.model.ViewModel; import com.wacai.tigon.model.ListResult; diff --git a/lib/tigon/web/src/main/java/com/wacai/tigon/web/annotation/FilterCol.java b/lib/tigon/web/src/main/java/com/wacai/tigon/web/annotation/FilterCol.java index aa0752a1..590c0d3a 100644 --- a/lib/tigon/web/src/main/java/com/wacai/tigon/web/annotation/FilterCol.java +++ b/lib/tigon/web/src/main/java/com/wacai/tigon/web/annotation/FilterCol.java @@ -1,5 +1,7 @@ package com.wacai.tigon.web.annotation; +import me.chyxion.tigon.mybatis.Search; + import java.lang.annotation.Retention; import java.lang.annotation.Documented; import java.lang.annotation.RetentionPolicy; @@ -32,7 +34,7 @@ public @interface FilterCol { /** * set as search attr - * @see com.wacai.tigon.mybatis.Search#setAttr(String, Object) + * @see Search#setAttr(String, Object) * @return true if set as search attr */ boolean searchAttr() default false; diff --git a/lib/tigon/web/src/main/java/com/wacai/tigon/web/annotation/Order.java b/lib/tigon/web/src/main/java/com/wacai/tigon/web/annotation/Order.java index 9fbc1a31..cc5f7da3 100644 --- a/lib/tigon/web/src/main/java/com/wacai/tigon/web/annotation/Order.java +++ b/lib/tigon/web/src/main/java/com/wacai/tigon/web/annotation/Order.java @@ -1,6 +1,6 @@ package com.wacai.tigon.web.annotation; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import java.lang.annotation.Retention; import java.lang.annotation.Documented; import java.lang.annotation.RetentionPolicy; diff --git a/openapi/src/main/java/com/pudonghot/yo/openapi/auth/SessionAbility.java b/openapi/src/main/java/com/pudonghot/yo/openapi/auth/SessionAbility.java index 7b2a30f5..2c40d7d8 100644 --- a/openapi/src/main/java/com/pudonghot/yo/openapi/auth/SessionAbility.java +++ b/openapi/src/main/java/com/pudonghot/yo/openapi/auth/SessionAbility.java @@ -1,6 +1,6 @@ package com.pudonghot.yo.openapi.auth; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.util.Assert; import com.pudonghot.yo.model.domain.Tenant; import com.pudonghot.yo.openapi.service.TenantService; diff --git a/openapi/src/main/java/com/pudonghot/yo/openapi/controller/CallController.java b/openapi/src/main/java/com/pudonghot/yo/openapi/controller/CallController.java index 949a12d9..9ced1702 100644 --- a/openapi/src/main/java/com/pudonghot/yo/openapi/controller/CallController.java +++ b/openapi/src/main/java/com/pudonghot/yo/openapi/controller/CallController.java @@ -2,7 +2,7 @@ package com.pudonghot.yo.openapi.controller; import lombok.val; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.model.domain.*; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.lang3.tuple.Pair; @@ -31,7 +31,6 @@ import com.pudonghot.yo.service.CommonAgentStatusService; import org.springframework.beans.factory.annotation.Value; import com.pudonghot.yo.openapi.response.RespAgentDialout; import com.pudonghot.yo.openapi.service.AgentStatusService; -import org.springframework.util.Assert; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestParam; @@ -41,7 +40,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import java.util.Calendar; import java.util.Date; -import java.util.List; import static com.pudonghot.yo.model.domain.AgentStatus.State.*; import static com.pudonghot.yo.model.domain.AgentStatus.Status.*; diff --git a/openapi/src/main/java/com/pudonghot/yo/openapi/service/impl/AgentEventServiceImpl.java b/openapi/src/main/java/com/pudonghot/yo/openapi/service/impl/AgentEventServiceImpl.java index df73e9cd..2b33b2e3 100644 --- a/openapi/src/main/java/com/pudonghot/yo/openapi/service/impl/AgentEventServiceImpl.java +++ b/openapi/src/main/java/com/pudonghot/yo/openapi/service/impl/AgentEventServiceImpl.java @@ -5,7 +5,7 @@ import org.redisson.api.*; import lombok.extern.slf4j.Slf4j; import com.pudonghot.yo.util.LogMDC; import java.util.concurrent.TimeUnit; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.mapper.AgentMapper; import com.pudonghot.yo.model.domain.Agent; import org.apache.commons.lang3.StringUtils; diff --git a/openapi/src/main/java/com/pudonghot/yo/openapi/service/impl/AgentServiceImpl.java b/openapi/src/main/java/com/pudonghot/yo/openapi/service/impl/AgentServiceImpl.java index bf23c0c4..c4edf7c0 100644 --- a/openapi/src/main/java/com/pudonghot/yo/openapi/service/impl/AgentServiceImpl.java +++ b/openapi/src/main/java/com/pudonghot/yo/openapi/service/impl/AgentServiceImpl.java @@ -3,7 +3,7 @@ package com.pudonghot.yo.openapi.service.impl; import com.pudonghot.yo.model.exception.AssertUtils; import com.pudonghot.yo.model.exception.ErrorCode; import com.pudonghot.yo.openapi.service.AgentService; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import org.springframework.stereotype.Service; import com.pudonghot.yo.mapper.AgentMapper; import com.pudonghot.yo.model.domain.Agent; diff --git a/state/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusScheduleServiceImpl.java b/state/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusScheduleServiceImpl.java index 14cebce5..88f55166 100644 --- a/state/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusScheduleServiceImpl.java +++ b/state/src/main/java/com/pudonghot/yo/state/service/impl/AgentStatusScheduleServiceImpl.java @@ -5,7 +5,7 @@ import java.util.Map; import java.util.Date; import java.util.HashMap; import lombok.extern.slf4j.Slf4j; -import com.wacai.tigon.mybatis.Search; +import me.chyxion.tigon.mybatis.Search; import com.pudonghot.yo.mapper.AgentMapper; import com.wacai.tigon.sequence.IdSequence; import org.apache.commons.lang3.StringUtils;