donghuang/yoqw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update tigon-mybatis

Browse Source
This commit is contained in:
Donghuang 2024-09-23 21:36:15 +08:00
parent 1f6628e741
commit e2c0a62924
242 changed files with 443 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cms/src/main/java/com/pudonghot/yo/cms/common/AuthHookImpl.java Normal file
View File

@ -0,0 +1,29 @@
package com.pudonghot.yo.cms.common;
import me.chyxion.tigon.dal.hook.AuthHook;
import com.pudonghot.yo.webauth.SessionAbility;
import org.springframework.stereotype.Component;
/**
* @author Donghuang
* @date 9月 12, 2023 16:51:16
*/
@Component
public class AuthHookImpl extends AuthHook<Long> implements SessionAbility {
/**
* {@inheritDoc}
*/
@Override
protected Long doGetTenantId() {
return getTenantId();
}
/**
* {@inheritDoc}
*/
@Override
protected Long doGetMemberId() {
return getMemberId();
}
}

21
cms/src/main/java/com/pudonghot/yo/cms/common/TenantIdGetterImpl.java
View File

@ -1,21 +0,0 @@
package com.pudonghot.yo.cms.common;
import com.pudonghot.yo.webauth.SessionAbility;
import org.springframework.stereotype.Component;
import me.chyxion.tigon.dal.tenant.TenantIdGetter;
/**
* @author Donghuang
* @date 9月 12, 2023 16:51:16
*/
@Component
public class TenantIdGetterImpl implements TenantIdGetter<Long>, SessionAbility {
/**
* {@inheritDoc}
*/
@Override
public Long getTenantId() {
return getTenant().getId();
}
}

2
cms/src/main/java/com/pudonghot/yo/cms/controller/trunk/model/TrunkProhibitedAreaCodeVO.java
View File

@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.controller.trunk.model;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.yo.cms.model.BaseCtrlModel;
/**

8
cms/src/main/java/com/pudonghot/yo/cms/service/agent/impl/AgentGroupServiceImpl.java
View File

@ -14,7 +14,7 @@ import lombok.extern.slf4j.Slf4j;
import java.util.Map;
import java.util.stream.Collectors;
import me.chyxion.tigon.dal.tenant.TenantIdGetter;
import me.chyxion.tigon.dal.hook.AuthHook;
import me.chyxion.tigon.service.request.DeleteServReq;
import me.chyxion.tigon.service.request.FindServReq;
import me.chyxion.tigon.service.request.ListServReq;
@ -65,7 +65,7 @@ public class AgentGroupServiceImpl
@Autowired
private TrunkStrategyDal trunkStrategyDal;
@Autowired
private TenantIdGetter<Long> tenantIdGetter;
private AuthHook<Long> authHook;
/**
@ -76,7 +76,7 @@ public class AgentGroupServiceImpl
super.afterFind(req, servModel);
val extAttrs = servModel.getExtAttrs();
extAttrs.put("trunkStrategiesList", trunkStrategyDal.listAll(tenantIdGetter.getTenantId()));
extAttrs.put("trunkStrategiesList", trunkStrategyDal.listAll(authHook.getTenantId()));
extAttrs.put("privacyLevelsList", PrivacyLevelEnum.values());
}
@ -88,7 +88,7 @@ public class AgentGroupServiceImpl
super.afterList(req, servModel);
val extAttrs = servModel.getExtAttrs();
extAttrs.put("trunkStrategiesList", trunkStrategyDal.listAll(tenantIdGetter.getTenantId()));
extAttrs.put("trunkStrategiesList", trunkStrategyDal.listAll(authHook.getTenantId()));
extAttrs.put("privacyLevelsList", PrivacyLevelEnum.values());
}

14
cms/src/main/java/com/pudonghot/yo/cms/service/agent/impl/AgentServiceImpl.java
View File

@ -16,7 +16,7 @@ import com.pudonghot.yo.dal.agent.AgentGroupDal;
import com.pudonghot.yo.dal.queue.QueueAgentDal;
import com.pudonghot.yo.dal.agent.AgentStatusDal;
import org.apache.commons.lang3.RandomStringUtils;
import me.chyxion.tigon.dal.tenant.TenantIdGetter;
import me.chyxion.tigon.dal.hook.AuthHook;
import com.pudonghot.yo.dal.queue.model.QueueAgent;
import me.chyxion.tigon.service.request.FindServReq;
import me.chyxion.tigon.service.request.ListServReq;
@ -64,7 +64,7 @@ public class AgentServiceImpl
@Autowired
private QueueAgentDal queueAgentDal;
@Autowired
private TenantIdGetter<Long> tenantIdGetter;
private AuthHook<Long> authHook;
// Debug: EventExpressionEvaluator
@EventListener(value = EntityBatchDeletedEvent.class,
@ -181,7 +181,7 @@ public class AgentServiceImpl
super.afterFind(req, servModel);
val extAttrs = servModel.getExtAttrs();
val tenantId = tenantIdGetter.getTenantId();
val tenantId = authHook.getTenantId();
extAttrs.put("groupsList", agentGroupDal.listAll(tenantId));
extAttrs.put("queuesList", queueDal.listAll(tenantId));
}
@ -194,7 +194,7 @@ public class AgentServiceImpl
super.afterList(req, servModel);
val extAttrs = servModel.getExtAttrs();
val tenantId = tenantIdGetter.getTenantId();
val tenantId = authHook.getTenantId();
extAttrs.put("groupsList", agentGroupDal.listAll(tenantId));
extAttrs.put("queuesList", queueDal.listAll(tenantId));
}
@ -260,14 +260,16 @@ public class AgentServiceImpl
* {@inheritDoc}
*/
@Override
protected void beforeUpdate(final AgentUpdateServReq form, final Agent model) {
super.beforeUpdate(form, model);
protected boolean beforeUpdate(final AgentUpdateServReq form, final Agent model, AgentBO bo) {
super.beforeUpdate(form, model, bo);
if (Boolean.TRUE.equals(form.getUpdatePassword()) ||
StringUtils.isBlank(model.getPassword())) {
log.info("Generate agent [{}] new password.", model.getAccount());
model.setPassword(RandomStringUtils.randomAlphanumeric(passwordLength));
}
return true;
}
/**

6
cms/src/main/java/com/pudonghot/yo/cms/service/auth/impl/AuthUserServiceImpl.java
View File

@ -298,8 +298,8 @@ public class AuthUserServiceImpl
* {@inheritDoc}
*/
@Override
protected void beforeUpdate(final AuthUserUpdateServReq form, final AuthUser model) {
super.beforeUpdate(form, model);
protected boolean beforeUpdate(final AuthUserUpdateServReq form, final AuthUser model, AuthUserBO bo) {
super.beforeUpdate(form, model, bo);
val password = form.getPassword();
if (StringUtils.isNotBlank(password)) {
@ -310,6 +310,8 @@ public class AuthUserServiceImpl
else {
model.setPassword(null);
}
return true;
}
}

8
cms/src/main/java/com/pudonghot/yo/cms/service/callinglist/impl/CallingListServiceImpl.java
View File

@ -7,7 +7,7 @@ import org.springframework.util.Assert;
import org.springframework.stereotype.Service;
import me.chyxion.tigon.kit.sequence.IdSequence;
import com.pudonghot.yo.dal.campaign.CampaignDal;
import me.chyxion.tigon.dal.tenant.TenantIdGetter;
import me.chyxion.tigon.dal.hook.AuthHook;
import me.chyxion.tigon.service.request.FindServReq;
import me.chyxion.tigon.service.request.ListServReq;
import me.chyxion.tigon.service.impl.TigonServiceImpl;
@ -55,7 +55,7 @@ public class CallingListServiceImpl
@Autowired
private IdSequence idSeq;
@Autowired
private TenantIdGetter<Long> tenantIdGetter;
private AuthHook<Long> authHook;
/**
* {@inheritDoc}
@ -65,7 +65,7 @@ public class CallingListServiceImpl
super.afterFind(req, servModel);
val extAttrs = servModel.getExtAttrs();
extAttrs.put("campaignList", campaignDal.listAll(tenantIdGetter.getTenantId()));
extAttrs.put("campaignList", campaignDal.listAll(authHook.getTenantId()));
extAttrs.put("callingListStatus", status());
}
@ -81,7 +81,7 @@ public class CallingListServiceImpl
item.getExtAttrs().put("campaign", campaignDal.find(item.getCampaignId()));
}
extAttrs.put("campaignList", campaignDal.listAll(tenantIdGetter.getTenantId()));
extAttrs.put("campaignList", campaignDal.listAll(authHook.getTenantId()));
extAttrs.put("callingListStatus", status());
}

8
cms/src/main/java/com/pudonghot/yo/cms/service/campaign/impl/CampaignServiceImpl.java
View File

@ -18,7 +18,7 @@ import org.springframework.stereotype.Service;
import me.chyxion.tigon.kit.sequence.IdSequence;
import com.pudonghot.yo.dal.campaign.CampaignDal;
import com.fasterxml.jackson.annotation.JsonAlias;
import me.chyxion.tigon.dal.tenant.TenantIdGetter;
import me.chyxion.tigon.dal.hook.AuthHook;
import com.pudonghot.yo.dal.trunk.TrunkStrategyDal;
import com.pudonghot.yo.dal.campaign.model.Campaign;
import me.chyxion.tigon.service.request.FindServReq;
@ -67,7 +67,7 @@ public class CampaignServiceImpl extends TaggableServiceImpl<CampaignBO,
@Autowired
private TagDal tagDal;
@Autowired
private TenantIdGetter<Long> tenantIdGetter;
private AuthHook<Long> authHook;
/**
* {@inheritDoc}
@ -171,7 +171,7 @@ public class CampaignServiceImpl extends TaggableServiceImpl<CampaignBO,
public CampaignCreateDataServResp createData() {
val resp = beanService.convert(buildEntityExtData(), CampaignCreateDataServResp.class);
resp.setActive(true);
resp.setTagsList(beanService.convert(tagDal.listOfTenant(tenantIdGetter.getTenantId()), TagBO.class));
resp.setTagsList(beanService.convert(tagDal.listOfTenant(authHook.getTenantId()), TagBO.class));
resp.setType(CampaignTypeEnum.AGENT);
resp.setTargetType(CampaignTargetTypeEnum.QUEUE);
@ -186,7 +186,7 @@ public class CampaignServiceImpl extends TaggableServiceImpl<CampaignBO,
}
EntityExtData buildEntityExtData() {
val tenantId = tenantIdGetter.getTenantId();
val tenantId = authHook.getTenantId();
val entityExtData = new EntityExtData();
entityExtData.setTrunkStrategiesList(beanService.convert(trunkStrategyDal.listAll(tenantId), TrunkStrategyBO.class));

2
cms/src/main/java/com/pudonghot/yo/cms/service/cdr/model/CallDetailRecordBO.java
View File

@ -7,7 +7,7 @@ import lombok.Getter;
import lombok.Setter;
import java.io.Serializable;
import me.chyxion.tigon.mybatis.BasicEntity;
import com.pudonghot.tigon.mybatis.BasicEntity;
import com.pudonghot.yo.basic.model.enumeration.CallTypeEnum;
import com.pudonghot.yo.basic.model.enumeration.DialTypeEnum;
import com.pudonghot.yo.basic.model.enumeration.AgentTypeEnum;

6
cms/src/main/java/com/pudonghot/yo/cms/service/ivr/impl/SoundServiceImpl.java
View File

@ -84,14 +84,16 @@ public class SoundServiceImpl
* {@inheritDoc}
*/
@Override
protected void beforeUpdate(final SoundUpdateServReq form, final Sound model) {
super.beforeUpdate(form, model);
protected boolean beforeUpdate(final SoundUpdateServReq form, final Sound model, SoundBO bo) {
super.beforeUpdate(form, model, bo);
val file = form.getFile();
if (file != null && !file.isEmpty()) {
delete(beanService.convert(model, servModelType));
saveFile(file, model);
}
return true;
}
/**

4
cms/src/main/java/com/pudonghot/yo/cms/service/misc/impl/AreaCodeServiceImpl.java
View File

@ -8,7 +8,7 @@ import java.io.IOException;
import lombok.extern.slf4j.Slf4j;
import java.util.stream.Collectors;
import org.apache.commons.io.IOUtils;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import org.springframework.util.Assert;
import java.nio.charset.StandardCharsets;
import org.apache.commons.lang3.StringUtils;
@ -19,7 +19,7 @@ import com.pudonghot.yo.cms.service.misc.AreaCodeService;
import org.springframework.context.ApplicationListener;
import com.pudonghot.yo.cms.service.misc.request.AreaCodeCreateServReq;
import com.pudonghot.yo.cms.service.misc.request.AreaCodeUpdateServReq;
import me.chyxion.tigon.mybatis.event.TigonMyBatisReadyEvent;
import com.pudonghot.tigon.mybatis.event.TigonMyBatisReadyEvent;
/**
* @author Donghuang

2
cms/src/main/java/com/pudonghot/yo/cms/service/misc/impl/SequenceServiceImpl.java
View File

@ -2,7 +2,7 @@ package com.pudonghot.yo.cms.service.misc.impl;
import lombok.val;
import lombok.extern.slf4j.Slf4j;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import org.springframework.util.Assert;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;

6
cms/src/main/java/com/pudonghot/yo/cms/service/tag/impl/TagServiceImpl.java
View File

@ -39,9 +39,11 @@ public class TagServiceImpl
* {@inheritDoc}
*/
@Override
protected void beforeUpdate(final TagUpdateServReq form, final Tag model) {
super.beforeUpdate(form, model);
protected boolean beforeUpdate(final TagUpdateServReq form, final Tag model, final TagBO tagBO) {
super.beforeUpdate(form, model, tagBO);
model.setOwner(form.getScope() == TagScopeEnum.USER ?
form.getUpdatedBy() : Tag.OWNER_COMMON);
return true;
}
}

8
cms/src/main/java/com/pudonghot/yo/cms/service/tag/impl/TaggableServiceImpl.java
View File

@ -11,7 +11,7 @@ import org.apache.commons.lang3.tuple.Pair;
import com.pudonghot.yo.dal.tag.ObjectTagDal;
import com.pudonghot.yo.dal.model.BaseDbEntity;
import com.pudonghot.yo.dal.tag.model.ObjectTag;
import me.chyxion.tigon.dal.tenant.TenantIdGetter;
import me.chyxion.tigon.dal.hook.AuthHook;
import me.chyxion.tigon.service.request.FindServReq;
import me.chyxion.tigon.service.request.ListServReq;
import me.chyxion.tigon.service.response.ListServResp;
@ -42,7 +42,7 @@ public abstract class TaggableServiceImpl<
@Autowired
private ObjectTagDal objectTagDal;
@Autowired
private TenantIdGetter<Long> tenantIdGetter;
private AuthHook<Long> authHook;
/**
* {@inheritDoc}
@ -52,7 +52,7 @@ public abstract class TaggableServiceImpl<
super.afterFind(req, servModel);
if (servModel != null) {
servModel.getExtAttrs().put("tagsList", tagDal.listOfTenant(tenantIdGetter.getTenantId()));
servModel.getExtAttrs().put("tagsList", tagDal.listOfTenant(authHook.getTenantId()));
}
}
@ -62,7 +62,7 @@ public abstract class TaggableServiceImpl<
@Override
protected void afterList(final ListServReq req, final ListServResp<ServModel> servModel) {
super.afterList(req, servModel);
servModel.getExtAttrs().put("tagsList", tagDal.listOfTenant(tenantIdGetter.getTenantId()));
servModel.getExtAttrs().put("tagsList", tagDal.listOfTenant(authHook.getTenantId()));
}
/**

6
cms/src/main/java/com/pudonghot/yo/cms/service/tenant/impl/TenantServiceImpl.java
View File

@ -38,14 +38,16 @@ public class TenantServiceImpl
* {@inheritDoc}
*/
@Override
protected void beforeUpdate(final TenantUpdateServReq form, final Tenant model) {
super.beforeUpdate(form, model);
protected boolean beforeUpdate(final TenantUpdateServReq form, final Tenant model, TenantBO bo) {
super.beforeUpdate(form, model, bo);
if (Boolean.TRUE.equals(form.getRenewAccessSecret())) {
log.info("Renew tenant [{}] access secret.", model);
model.setAccessSecret(
RandomStringUtils.randomAlphanumeric(accessSecretLength));
}
return true;
}
/**

6
cms/src/main/java/com/pudonghot/yo/cms/service/trunk/impl/TrunkServiceImpl.java
View File

@ -24,7 +24,7 @@ import com.pudonghot.yo.dal.gateway.GatewayDal;
import com.pudonghot.yo.dal.agent.AgentGroupDal;
import com.fasterxml.jackson.annotation.JsonAlias;
import com.pudonghot.yo.dal.misc.TelecomVendorDal;
import me.chyxion.tigon.dal.tenant.TenantIdGetter;
import me.chyxion.tigon.dal.hook.AuthHook;
import me.chyxion.tigon.service.request.FindServReq;
import me.chyxion.tigon.service.request.ListServReq;
import me.chyxion.tigon.service.response.ListServResp;
@ -96,7 +96,7 @@ public class TrunkServiceImpl
@Autowired
private AgentGroupDal agentGroupDal;
@Autowired
private TenantIdGetter<Long> tenantIdGetter;
private AuthHook<Long> authHook;
@Override
protected void afterFind(FindServReq<Long> req, TrunkBO servModel) {
@ -292,7 +292,7 @@ public class TrunkServiceImpl
EntityExtData buildEntityExtData() {
val entityExtData = new EntityExtData();
val tenantId = tenantIdGetter.getTenantId();
val tenantId = authHook.getTenantId();
entityExtData.setGatewaysList(beanService.convert(gatewayDal.listActive(), GatewayBO.class));
entityExtData.setTelecomVendorsList(beanService.convert(telecomVendorDal.listAll(), TelecomVendorBO.class));
entityExtData.setTrunkStrategiesList(beanService.convert(trunkStrategyDal.listAll(tenantId), TrunkStrategyBO.class));

14
cms/src/test/java/com/pudonghot/yo/cms/service/BeanCopyTest.java
View File

@ -48,13 +48,13 @@ public class BeanCopyTest {
public void testCopy() {
log.info("Copy.");
val tagListReq = new TagListReqVO();
tagListReq.setFilters("""
[{
"col": "active",
"op": "in",
"val": ["true"]
}]
""");
// tagListReq.setFilters("""
// [{
// "col": "active",
// "op": "in",
// "val": ["true"]
// }]
// """);
// val serialize = beanService.serialize(tagListReq);
// log.info("List req [{}].", serialize);
// val servReq = beanService.deserialize(serialize, ListServReq.class);

2
lib/dal/pom.xml
View File

@ -54,7 +54,7 @@
<artifactId>yo-util</artifactId>
</dependency>
<dependency>
<groupId>me.chyxion.tigon</groupId>
<groupId>com.pudonghot.tigon</groupId>
<artifactId>tigon-mybatis</artifactId>
</dependency>
<dependency>

2
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/AgentStatusDal.java
View File

@ -2,7 +2,7 @@ package com.pudonghot.yo.dal.agent;
import java.util.function.Consumer;
import me.chyxion.tigon.dal.BaseDal;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.agent.model.AgentStatus;
import com.pudonghot.yo.dal.agent.request.ReqLockIdleOfQueue;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentDalImpl.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.agent.impl;
import java.util.List;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.agent.AgentDal;
import com.pudonghot.yo.dal.agent.model.Agent;
import me.chyxion.tigon.dal.annotation.ListApi;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupCampaignWeightDalImpl.java
View File

@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.agent.impl;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.agent.model.AgentGroupCampaignWeight;
import com.pudonghot.yo.dal.agent.mapper.AgentGroupCampaignWeightMapper;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupDalImpl.java
View File

@ -4,7 +4,7 @@ import java.util.List;
import me.chyxion.tigon.dal.request.FindDalReq;
import me.chyxion.tigon.dal.request.ListDalReq;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import me.chyxion.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.agent.AgentGroupDal;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentGroupTrunkStrategyDalImpl.java
View File

@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.agent.impl;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.agent.model.AgentGroupTrunkStrategy;
import com.pudonghot.yo.dal.agent.mapper.AgentGroupTrunkStrategyMapper;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/impl/AgentStatusDalImpl.java
View File

@ -4,7 +4,7 @@ import lombok.val;
import java.util.HashMap;
import lombok.extern.slf4j.Slf4j;
import java.util.function.Consumer;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import me.chyxion.tigon.dal.impl.BaseDalImpl;
import me.chyxion.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/mapper/AgentGroupCampaignWeightMapper.java
View File

@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.agent.mapper;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import com.pudonghot.yo.dal.agent.model.AgentGroupCampaignWeight;

4
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/mapper/AgentGroupMapper.java
View File

@ -1,8 +1,8 @@
package com.pudonghot.yo.dal.agent.mapper;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import com.pudonghot.yo.dal.agent.model.AgentGroup;
import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
import com.pudonghot.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
import com.pudonghot.yo.dal.mapper.xmlcontentprovider.TableVarXmlContentProvider;
/**

2
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/mapper/AgentGroupTrunkStrategyMapper.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.agent.mapper;
import com.pudonghot.yo.dal.agent.model.AgentGroupTrunkStrategy;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
/**
* @author Donghuang

4
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/mapper/AgentMapper.java
View File

@ -1,10 +1,10 @@
package com.pudonghot.yo.dal.agent.mapper;
import java.util.List;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.pudonghot.yo.dal.agent.model.Agent;
import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
import com.pudonghot.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
import com.pudonghot.yo.dal.mapper.xmlcontentprovider.TableVarXmlContentProvider;
/**

2
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/mapper/AgentStatusMapper.java
View File

@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.agent.mapper;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.pudonghot.yo.dal.agent.model.AgentStatus;
import com.pudonghot.yo.dal.agent.request.ReqLockIdleOfQueue;

8
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/model/Agent.java
View File

@ -2,10 +2,10 @@ package com.pudonghot.yo.dal.agent.model;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import me.chyxion.tigon.mybatis.Transient;
import me.chyxion.tigon.mybatis.NotUpdateWhenNull;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Transient;
import com.pudonghot.tigon.mybatis.NotUpdateWhenNull;
import com.pudonghot.yo.dal.model.TaggableDbEntity;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.pudonghot.yo.basic.model.enumeration.AgentTypeEnum;

6
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/model/AgentGroup.java
View File

@ -2,9 +2,9 @@ package com.pudonghot.yo.dal.agent.model;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.Transient;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.Transient;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.yo.dal.model.TaggableDbEntity;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.pudonghot.yo.basic.model.enumeration.PrivacyLevelEnum;

4
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/model/AgentGroupCampaignWeight.java
View File

@ -3,8 +3,8 @@ package com.pudonghot.yo.dal.agent.model;
import com.pudonghot.yo.dal.model.BaseDbEntity;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
/**
* @author Donghuang

4
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/model/AgentGroupTrunkStrategy.java
View File

@ -2,8 +2,8 @@ package com.pudonghot.yo.dal.agent.model;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.yo.dal.model.BaseDbEntity;
/**

4
lib/dal/src/main/java/com/pudonghot/yo/dal/agent/model/AgentStatus.java
View File

@ -3,8 +3,8 @@ package com.pudonghot.yo.dal.agent.model;
import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.yo.dal.model.BaseDbEntity;
import com.pudonghot.yo.basic.model.enumeration.AgentStatusStateEnum;
import com.pudonghot.yo.basic.model.enumeration.AgentStatusStatusEnum;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/agentcase/mapper/WorkRecordMapper.java
View File

@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.agentcase.mapper;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import com.pudonghot.yo.dal.agentcase.model.WorkRecord;
/**

4
lib/dal/src/main/java/com/pudonghot/yo/dal/agentcase/model/WorkRecord.java
View File

@ -5,8 +5,8 @@ import java.util.Date;
import com.pudonghot.yo.dal.model.BaseDbEntity;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
/**
* @author Donghuang

2
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthPermissionDalImpl.java
View File

@ -3,7 +3,7 @@ package com.pudonghot.yo.dal.auth.impl;
import java.util.List;
import me.chyxion.tigon.dal.annotation.FilterCol;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import me.chyxion.tigon.dal.impl.BaseDalImpl;
import me.chyxion.tigon.dal.request.FindDalReq;
import me.chyxion.tigon.dal.request.ListDalReq;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthPermissionRoleDalImpl.java
View File

@ -2,7 +2,7 @@ package com.pudonghot.yo.dal.auth.impl;
import java.util.List;
import java.util.Collection;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import me.chyxion.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.auth.AuthPermissionRoleDal;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthRoleDalImpl.java
View File

@ -2,7 +2,7 @@ package com.pudonghot.yo.dal.auth.impl;
import me.chyxion.tigon.dal.annotation.FilterCol;
import me.chyxion.tigon.dal.annotation.ListApi;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.auth.model.AuthRole;
import com.pudonghot.yo.dal.auth.mapper.AuthRoleMapper;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthUserDalImpl.java
View File

@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.auth.impl;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.auth.AuthUserDal;
import me.chyxion.tigon.dal.request.FindDalReq;
import me.chyxion.tigon.dal.request.ListDalReq;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthUserRoleDalImpl.java
View File

@ -2,7 +2,7 @@ package com.pudonghot.yo.dal.auth.impl;
import java.util.List;
import java.util.Collection;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.auth.AuthUserRoleDal;
import com.pudonghot.yo.dal.common.TaggableDalImpl;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/impl/AuthUserTenantDalImpl.java
View File

@ -2,7 +2,7 @@ package com.pudonghot.yo.dal.auth.impl;
import java.util.List;
import java.util.Collection;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import me.chyxion.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.auth.AuthUserTenantDal;

4
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/mapper/AuthPermissionMapper.java
View File

@ -1,10 +1,10 @@
package com.pudonghot.yo.dal.auth.mapper;
import java.util.List;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.pudonghot.yo.dal.auth.model.AuthPermission;
import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
import com.pudonghot.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
import com.pudonghot.yo.dal.mapper.xmlcontentprovider.TableVarXmlContentProvider;
/**

2
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/mapper/AuthPermissionRoleMapper.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.auth.mapper;
import com.pudonghot.yo.dal.auth.model.AuthPermissionRole;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
/**
* @author Donghuang

4
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/mapper/AuthRoleMapper.java
View File

@ -1,8 +1,8 @@
package com.pudonghot.yo.dal.auth.mapper;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import com.pudonghot.yo.dal.auth.model.AuthRole;
import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
import com.pudonghot.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
import com.pudonghot.yo.dal.mapper.xmlcontentprovider.TableVarXmlContentProvider;
/**

4
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/mapper/AuthUserMapper.java
View File

@ -1,8 +1,8 @@
package com.pudonghot.yo.dal.auth.mapper;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import com.pudonghot.yo.dal.auth.model.AuthUser;
import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
import com.pudonghot.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
import com.pudonghot.yo.dal.mapper.xmlcontentprovider.TableVarXmlContentProvider;
/**

2
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/mapper/AuthUserRoleMapper.java
View File

@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.auth.mapper;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import com.pudonghot.yo.dal.auth.model.AuthUserRole;
/**

2
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/mapper/AuthUserTenantMapper.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.auth.mapper;
import com.pudonghot.yo.dal.auth.model.AuthUserTenant;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
/**
* @author Donghuang

6
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/model/AuthPermission.java
View File

@ -2,9 +2,9 @@ package com.pudonghot.yo.dal.auth.model;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import me.chyxion.tigon.mybatis.Transient;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Transient;
import com.pudonghot.yo.dal.model.TaggableDbEntity;
import com.fasterxml.jackson.annotation.JsonProperty;

4
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/model/AuthPermissionRole.java
View File

@ -3,8 +3,8 @@ package com.pudonghot.yo.dal.auth.model;
import com.pudonghot.yo.dal.model.BaseDbEntity;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
/**
* @author Donghuang

4
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/model/AuthRole.java
View File

@ -3,8 +3,8 @@ package com.pudonghot.yo.dal.auth.model;
import com.pudonghot.yo.dal.model.TaggableDbEntity;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
/**
* @author Donghuang

8
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/model/AuthUser.java
View File

@ -2,11 +2,11 @@ package com.pudonghot.yo.dal.auth.model;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.Transient;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.Transient;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.yo.dal.model.TaggableDbEntity;
import me.chyxion.tigon.mybatis.NotUpdateWhenNull;
import com.pudonghot.tigon.mybatis.NotUpdateWhenNull;
import com.fasterxml.jackson.annotation.JsonProperty;
/**

4
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/model/AuthUserRole.java
View File

@ -3,8 +3,8 @@ package com.pudonghot.yo.dal.auth.model;
import com.pudonghot.yo.dal.model.BaseDbEntity;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
/**
* @author Donghuang

4
lib/dal/src/main/java/com/pudonghot/yo/dal/auth/model/AuthUserTenant.java
View File

@ -2,8 +2,8 @@ package com.pudonghot.yo.dal.auth.model;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.yo.dal.model.BaseDbEntity;
/**

2
lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/impl/CallingListDalImpl.java
View File

@ -8,7 +8,7 @@ import java.util.HashMap;
import me.chyxion.tigon.dal.annotation.FilterCol;
import me.chyxion.tigon.dal.annotation.ListApi;
import me.chyxion.tigon.dal.annotation.TenantResource;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import me.chyxion.tigon.dal.impl.BaseDalImpl;
import com.pudonghot.yo.basic.model.DailyTime;
import org.springframework.stereotype.Component;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/mapper/CallingListHistoricalMapper.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.callinglist.mapper;
import com.pudonghot.yo.dal.callinglist.request.ReqCallingListRevert;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.pudonghot.yo.dal.callinglist.model.CallingListHistorical;
import com.pudonghot.yo.dal.callinglist.response.CallingListHistoricalSummaryDalResp;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/mapper/CallingListMapper.java
View File

@ -2,7 +2,7 @@ package com.pudonghot.yo.dal.callinglist.mapper;
import java.util.List;
import com.pudonghot.yo.basic.model.DailyTime;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.pudonghot.yo.dal.callinglist.model.CallingList;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/mapper/CallingListPreparedMapper.java
View File

@ -3,7 +3,7 @@ package com.pudonghot.yo.dal.callinglist.mapper;
import java.util.List;
import com.pudonghot.yo.dal.callinglist.request.ReqCallingListRevert;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.pudonghot.yo.dal.callinglist.model.CallingListPrepared;
import com.pudonghot.yo.dal.callinglist.response.CallingListPreparedSummaryDalResp;

4
lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/model/CallingList.java
View File

@ -3,8 +3,8 @@ package com.pudonghot.yo.dal.callinglist.model;
import java.util.Date;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.yo.basic.model.DailyTime;
import com.pudonghot.yo.dal.model.BaseDbEntity;

4
lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/model/CallingListHistorical.java
View File

@ -3,8 +3,8 @@ package com.pudonghot.yo.dal.callinglist.model;
import java.util.Date;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.yo.dal.model.BaseDbEntity;
/**

4
lib/dal/src/main/java/com/pudonghot/yo/dal/callinglist/model/CallingListPrepared.java
View File

@ -5,8 +5,8 @@ import java.util.Date;
import com.pudonghot.yo.dal.model.BaseDbEntity;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
/**
* @author Donghuang

2
lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/impl/CampaignDalImpl.java
View File

@ -7,7 +7,7 @@ import me.chyxion.tigon.dal.annotation.ListApi;
import me.chyxion.tigon.dal.annotation.TenantResource;
import me.chyxion.tigon.dal.request.FindDalReq;
import me.chyxion.tigon.dal.request.ListDalReq;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.campaign.model.Campaign;
import com.pudonghot.yo.dal.campaign.mapper.CampaignMapper;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/impl/CampaignTrunkStrategyDalImpl.java
View File

@ -2,7 +2,7 @@ package com.pudonghot.yo.dal.campaign.impl;
import java.util.List;
import java.util.Collection;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import me.chyxion.tigon.dal.impl.BaseDalImpl;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.campaign.CampaignTrunkStrategyDal;

4
lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/mapper/CampaignMapper.java
View File

@ -1,8 +1,8 @@
package com.pudonghot.yo.dal.campaign.mapper;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import com.pudonghot.yo.dal.campaign.model.Campaign;
import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
import com.pudonghot.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
import com.pudonghot.yo.dal.mapper.xmlcontentprovider.TableVarXmlContentProvider;
/**

2
lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/mapper/CampaignTrunkStrategyMapper.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.campaign.mapper;
import com.pudonghot.yo.dal.campaign.model.CampaignTrunkStrategy;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
/**
* @author Donghuang

8
lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/model/Campaign.java
View File

@ -3,11 +3,11 @@ package com.pudonghot.yo.dal.campaign.model;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.yo.basic.model.DailyTime;
import me.chyxion.tigon.mybatis.NotUpdate;
import me.chyxion.tigon.mybatis.Transient;
import me.chyxion.tigon.mybatis.NotUpdateWhenNull;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Transient;
import com.pudonghot.tigon.mybatis.NotUpdateWhenNull;
import com.pudonghot.yo.dal.model.TaggableDbEntity;
import com.pudonghot.yo.basic.model.campaign.enumeration.CampaignTypeEnum;
import com.pudonghot.yo.basic.model.campaign.enumeration.CampaignStatusEnum;

4
lib/dal/src/main/java/com/pudonghot/yo/dal/campaign/model/CampaignTrunkStrategy.java
View File

@ -3,8 +3,8 @@ package com.pudonghot.yo.dal.campaign.model;
import com.pudonghot.yo.dal.model.BaseDbEntity;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
/**
* @author Donghuang

2
lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/impl/CallDetailRecordDalImpl.java
View File

@ -7,7 +7,7 @@ import lombok.Setter;
import java.util.Date;
import lombok.ToString;
import java.io.Serializable;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import javax.validation.constraints.NotNull;
import org.apache.commons.lang3.StringUtils;
import me.chyxion.tigon.kit.bean.BeanService;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/impl/CallRecordingDalImpl.java
View File

@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.cdr.impl;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import org.springframework.stereotype.Component;
import com.pudonghot.yo.dal.cdr.model.CallRecording;
import com.pudonghot.yo.dal.cdr.mapper.CallRecordingMapper;

6
lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/mapper/CallDetailRecordMapper.java
View File

@ -1,9 +1,9 @@
package com.pudonghot.yo.dal.cdr.mapper;
import java.util.List;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.Search;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.BaseMapper;
import org.apache.ibatis.annotations.Param;
import com.pudonghot.yo.dal.cdr.model.CallDetailRecord;
import com.pudonghot.yo.dal.callinglist.response.CallDetailReportDalResp;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/mapper/CallRecordingMapper.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.cdr.mapper;
import com.pudonghot.yo.dal.cdr.model.CallRecording;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
/**
* @author Donghuang

2
lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/mapper/CallSatisfactionMapper.java
View File

@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.cdr.mapper;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import com.pudonghot.yo.dal.cdr.model.CallSatisfaction;
/**

4
lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/model/CallDetailRecord.java
View File

@ -5,8 +5,8 @@ import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import lombok.ToString;
import me.chyxion.tigon.mybatis.NotUpdate;
import me.chyxion.tigon.mybatis.BasicEntity;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.BasicEntity;
import org.apache.commons.lang3.StringUtils;
import static com.pudonghot.yo.dal.model.BaseDbEntity.SYSTEM;
import com.pudonghot.yo.basic.model.enumeration.CallTypeEnum;

6
lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/model/CallRecording.java
View File

@ -3,9 +3,9 @@ package com.pudonghot.yo.dal.cdr.model;
import com.pudonghot.yo.dal.model.BaseDbEntity;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.Transient;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.Transient;
import com.pudonghot.tigon.mybatis.NotUpdate;
/**
* @author Donghuang

4
lib/dal/src/main/java/com/pudonghot/yo/dal/cdr/model/CallSatisfaction.java
View File

@ -3,8 +3,8 @@ package com.pudonghot.yo.dal.cdr.model;
import com.pudonghot.yo.dal.model.BaseDbEntity;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
/**
* @author Donghuang

4
lib/dal/src/main/java/com/pudonghot/yo/dal/common/TaggableDalImpl.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.common;
import me.chyxion.tigon.mybatis.Search;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.BaseMapper;
import me.chyxion.tigon.dal.impl.BaseDalImpl;
import me.chyxion.tigon.dal.request.FindDalReq;
import me.chyxion.tigon.dal.request.ListDalReq;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/gateway/impl/GatewayDalImpl.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.gateway.impl;
import java.util.List;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import me.chyxion.tigon.dal.annotation.ListApi;
import me.chyxion.tigon.dal.annotation.FilterCol;
import org.springframework.stereotype.Component;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/gateway/mapper/GatewayMapper.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.gateway.mapper;
import com.pudonghot.yo.dal.gateway.model.Gateway;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
/**
* @author Donghuang

2
lib/dal/src/main/java/com/pudonghot/yo/dal/gateway/model/Gateway.java
View File

@ -2,7 +2,7 @@ package com.pudonghot.yo.dal.gateway.model;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.yo.dal.model.BaseDbEntity;
/**

2
lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/impl/IvrEntryDalImpl.java
View File

@ -3,7 +3,7 @@ package com.pudonghot.yo.dal.ivr.impl;
import java.util.List;
import me.chyxion.tigon.dal.request.ListDalReq;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.ivr.IvrEntryDal;
import me.chyxion.tigon.dal.impl.BaseDalImpl;
import me.chyxion.tigon.dal.annotation.ListApi;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/impl/IvrMenuDalImpl.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.ivr.impl;
import java.util.List;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.ivr.IvrMenuDal;
import me.chyxion.tigon.dal.impl.BaseDalImpl;
import com.pudonghot.yo.dal.ivr.model.IvrMenu;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/mapper/IvrEntryMapper.java
View File

@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.ivr.mapper;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import com.pudonghot.yo.dal.ivr.model.IvrEntry;
/**

2
lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/mapper/IvrMenuMapper.java
View File

@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.ivr.mapper;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import com.pudonghot.yo.dal.ivr.model.IvrMenu;
/**

2
lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/mapper/SoundMapper.java
View File

@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.ivr.mapper;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import com.pudonghot.yo.dal.ivr.model.Sound;
/**

4
lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/model/IvrEntry.java
View File

@ -3,8 +3,8 @@ package com.pudonghot.yo.dal.ivr.model;
import com.pudonghot.yo.dal.model.BaseDbEntity;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
/**
* @author Donghuang

4
lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/model/IvrMenu.java
View File

@ -2,8 +2,8 @@ package com.pudonghot.yo.dal.ivr.model;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.yo.dal.model.BaseDbEntity;
/**

4
lib/dal/src/main/java/com/pudonghot/yo/dal/ivr/model/Sound.java
View File

@ -2,8 +2,8 @@ package com.pudonghot.yo.dal.ivr.model;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.yo.dal.model.BaseDbEntity;
/**

4
lib/dal/src/main/java/com/pudonghot/yo/dal/mapper/xmlcontentprovider/TableVarXmlContentProvider.java
View File

@ -2,8 +2,8 @@ package com.pudonghot.yo.dal.mapper.xmlcontentprovider;
import lombok.val;
import lombok.extern.slf4j.Slf4j;
import me.chyxion.tigon.mybatis.xmlgen.XmlGenArg;
import me.chyxion.tigon.mybatis.xmlgen.contentprovider.XmlContentProvider;
import com.pudonghot.tigon.mybatis.xmlgen.XmlGenArg;
import com.pudonghot.tigon.mybatis.xmlgen.contentprovider.XmlContentProvider;
/**
* @author Donghuang

2
lib/dal/src/main/java/com/pudonghot/yo/dal/misc/SequenceDal.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.misc;
import me.chyxion.tigon.dal.BaseDal;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.misc.model.Sequence;
/**

2
lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/AreaCodeDalImpl.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.misc.impl;
import java.util.List;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.misc.AreaCodeDal;
import me.chyxion.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/SequenceDalImpl.java
View File

@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.misc.impl;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.yo.dal.misc.SequenceDal;
import me.chyxion.tigon.dal.impl.BaseDalImpl;
import me.chyxion.tigon.dal.annotation.ListApi;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/misc/impl/TelecomVendorDalImpl.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.misc.impl;
import java.util.List;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import me.chyxion.tigon.dal.impl.BaseDalImpl;
import me.chyxion.tigon.dal.annotation.ListApi;
import org.springframework.stereotype.Component;

4
lib/dal/src/main/java/com/pudonghot/yo/dal/misc/mapper/AreaCodeMapper.java
View File

@ -1,8 +1,8 @@
package com.pudonghot.yo.dal.misc.mapper;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
import com.pudonghot.yo.dal.misc.model.AreaCode;
import me.chyxion.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
import com.pudonghot.tigon.mybatis.xmlgen.annotation.MapperXmlEl;
import com.pudonghot.yo.dal.mapper.xmlcontentprovider.TableVarXmlContentProvider;
/**

4
lib/dal/src/main/java/com/pudonghot/yo/dal/misc/mapper/SequenceMapper.java
View File

@ -1,8 +1,8 @@
package com.pudonghot.yo.dal.misc.mapper;
import com.pudonghot.yo.dal.misc.model.Sequence;
import me.chyxion.tigon.mybatis.Search;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.BaseMapper;
import org.apache.ibatis.annotations.Param;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.NotBlank;

2
lib/dal/src/main/java/com/pudonghot/yo/dal/misc/mapper/TelecomVendorMapper.java
View File

@ -1,7 +1,7 @@
package com.pudonghot.yo.dal.misc.mapper;
import com.pudonghot.yo.dal.misc.model.TelecomVendor;
import me.chyxion.tigon.mybatis.BaseMapper;
import com.pudonghot.tigon.mybatis.BaseMapper;
/**
* @author Donghuang

4
lib/dal/src/main/java/com/pudonghot/yo/dal/misc/model/AreaCode.java
View File

@ -3,8 +3,8 @@ package com.pudonghot.yo.dal.misc.model;
import com.pudonghot.yo.dal.model.TaggableDbEntity;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
/**
* @author Donghuang

4
lib/dal/src/main/java/com/pudonghot/yo/dal/misc/model/Sequence.java
View File

@ -3,8 +3,8 @@ package com.pudonghot.yo.dal.misc.model;
import com.pudonghot.yo.dal.model.BaseDbEntity;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import me.chyxion.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.NotUpdate;
/**
* @author Donghuang

2
lib/dal/src/main/java/com/pudonghot/yo/dal/misc/model/TelecomVendor.java
View File

@ -3,7 +3,7 @@ package com.pudonghot.yo.dal.misc.model;
import com.pudonghot.yo.dal.model.BaseDbEntity;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Table;
import com.pudonghot.tigon.mybatis.Table;
/**
* @author Donghuang

4
lib/dal/src/main/java/com/pudonghot/yo/dal/model/BaseDbEntity.java
View File

@ -5,8 +5,8 @@ import lombok.Getter;
import lombok.Setter;
import java.util.Date;
import java.io.Serializable;
import me.chyxion.tigon.mybatis.NotUpdate;
import me.chyxion.tigon.mybatis.BasicEntity;
import com.pudonghot.tigon.mybatis.NotUpdate;
import com.pudonghot.tigon.mybatis.BasicEntity;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.ToStringBuilder;

4
lib/dal/src/main/java/com/pudonghot/yo/dal/model/TaggableDbEntity.java
View File

@ -2,8 +2,8 @@ package com.pudonghot.yo.dal.model;
import lombok.Getter;
import lombok.Setter;
import me.chyxion.tigon.mybatis.Transient;
import me.chyxion.tigon.mybatis.UseGeneratedKeys;
import com.pudonghot.tigon.mybatis.Transient;
import com.pudonghot.tigon.mybatis.UseGeneratedKeys;
import com.fasterxml.jackson.annotation.JsonProperty;
/**

Some files were not shown because too many files have changed in this diff Show More