feat: update tigon framework

This commit is contained in:
Donghuang 2024-07-12 15:44:42 +08:00
parent 1f6628e741
commit 2072852777
242 changed files with 448 additions and 418 deletions

View File

@ -1,21 +1,30 @@
package com.pudonghot.yo.cms.common;
import me.chyxion.tigon.dal.hook.AuthHook;
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 {
public class TenantIdGetterImpl extends AuthHook<Long> implements SessionAbility {
/**
* {@inheritDoc}
*/
@Override
public Long getTenantId() {
return getTenant().getId();
protected Long doGetMemberId() {
return null;
}
/**
* {@inheritDoc}
*/
@Override
protected Long doGetTenantId() {
return SessionAbility.super.getTenantId();
}
}

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;
/**

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> tenantIdGetter;
/**

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> tenantIdGetter;
// Debug: EventExpressionEvaluator
@EventListener(value = EntityBatchDeletedEvent.class,
@ -256,18 +256,17 @@ public class AgentServiceImpl
() -> "Agent [" + form.getAccount() + "] existed");
}
/**
* {@inheritDoc}
*/
@Override
protected void beforeUpdate(final AgentUpdateServReq form, final Agent model) {
super.beforeUpdate(form, model);
protected boolean beforeUpdate(final AgentUpdateServReq req, final Agent agent, final AgentBO agentBO) {
super.beforeUpdate(req, agent, agentBO);
if (Boolean.TRUE.equals(form.getUpdatePassword()) ||
StringUtils.isBlank(model.getPassword())) {
log.info("Generate agent [{}] new password.", model.getAccount());
model.setPassword(RandomStringUtils.randomAlphanumeric(passwordLength));
if (Boolean.TRUE.equals(req.getUpdatePassword()) ||
StringUtils.isBlank(agent.getPassword())) {
log.info("Generate agent [{}] new password.", agent.getAccount());
agentBO.setPassword(RandomStringUtils.randomAlphanumeric(passwordLength));
}
return false;
}
/**

View File

@ -298,18 +298,22 @@ public class AuthUserServiceImpl
* {@inheritDoc}
*/
@Override
protected void beforeUpdate(final AuthUserUpdateServReq form, final AuthUser model) {
super.beforeUpdate(form, model);
val password = form.getPassword();
protected boolean beforeUpdate(final AuthUserUpdateServReq req,
final AuthUser authUser,
final AuthUserBO authUserBO) {
super.beforeUpdate(req, authUser, authUserBO);
val password = req.getPassword();
if (StringUtils.isNotBlank(password)) {
val length = password.length();
Assert.state(length >= 6 && length <= 32, "密码长度不合规");
model.setPassword(DigestUtils.md5Hex(password));
authUser.setPassword(DigestUtils.md5Hex(password));
}
else {
model.setPassword(null);
authUser.setPassword(null);
}
}
return false;
}
}

View File

@ -3,11 +3,11 @@ package com.pudonghot.yo.cms.service.callinglist.impl;
import lombok.val;
import java.util.*;
import lombok.extern.slf4j.Slf4j;
import me.chyxion.tigon.dal.hook.AuthHook;
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.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> tenantIdGetter;
/**
* {@inheritDoc}

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> tenantIdGetter;
/**
* {@inheritDoc}

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;

View File

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

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

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;

View File

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

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> tenantIdGetter;
/**
* {@inheritDoc}

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 req, final Tenant model, final TenantBO tenantBO) {
super.beforeUpdate(req, model, tenantBO);
if (Boolean.TRUE.equals(form.getRenewAccessSecret())) {
if (Boolean.TRUE.equals(req.getRenewAccessSecret())) {
log.info("Renew tenant [{}] access secret.", model);
model.setAccessSecret(
RandomStringUtils.randomAlphanumeric(accessSecretLength));
RandomStringUtils.randomAlphanumeric(accessSecretLength));
}
return false;
}
/**

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> tenantIdGetter;
@Override
protected void afterFind(FindServReq<Long> req, TrunkBO servModel) {

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);

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>

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;

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;

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;

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;

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;

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;

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;

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;
/**

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

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;
/**

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;

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;

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;

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

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;
/**

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;

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;
/**

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

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;

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;

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;

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;

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;

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;

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;
/**

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

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;
/**

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;
/**

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;
/**

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

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;

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

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

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;
/**

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

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;
/**

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;

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;

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;

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;

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;

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;
/**

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

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;

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;

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;
/**

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

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;

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

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;

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;

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;

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

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;
/**

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;

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

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

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;

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;

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

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;
/**

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;

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;

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;
/**

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;
/**

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;
/**

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

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;
/**

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;
/**

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

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;
/**

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;

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;

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;

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;
/**

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;

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

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

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

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

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;

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;
/**

View File

@ -1,6 +1,6 @@
package com.pudonghot.yo.dal.phone.impl;
import me.chyxion.tigon.mybatis.Search;
import com.pudonghot.tigon.mybatis.Search;
import me.chyxion.tigon.dal.annotation.FilterCol;
import me.chyxion.tigon.dal.annotation.ListApi;
import me.chyxion.tigon.dal.impl.BaseDalImpl;
@ -19,7 +19,7 @@ import com.pudonghot.yo.dal.phone.mapper.PhoneAliasMapper;
@ListApi(searchCols = {
PhoneAlias.NOTE
},
orderCols = {
sorterCols = {
PhoneAlias.CREATED_TIME
},
filterCols = {

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