From f4cdf8f17c6c0f1897cb03e276fe8f91b1b53f94 Mon Sep 17 00:00:00 2001 From: khalil Date: Tue, 2 Jul 2024 15:02:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E8=AE=B0=E5=BD=95-=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0ipRegion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/AccountLoginRecordService.java | 26 +- .../service/block/BlockAdminService.java | 17 +- .../core/model/AccountLoginRecord.java | 168 +- .../core/model/AccountLoginRecordExample.java | 1571 ----------------- .../AccountLoginRecordMapper.java | 25 +- .../AccountLoginRecordMapperExpand.java | 4 - .../service/account/LoginRecordService.java | 11 +- .../oauth/AccountLoginRecordMapper.xml | 443 +---- .../oauth/AccountLoginRecordMapperExpand.xml | 9 - .../service/AccountLoginRecordService.java | 32 +- .../service/user/UserLoginService.java | 22 +- .../business/service/user/UsersService.java | 2 - .../service/MyUserDetailsServiceImpl.java | 10 +- 13 files changed, 61 insertions(+), 2279 deletions(-) delete mode 100644 accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/AccountLoginRecordExample.java diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/AccountLoginRecordService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/AccountLoginRecordService.java index 20eb86ed2..e52c3fc3b 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/AccountLoginRecordService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/AccountLoginRecordService.java @@ -3,10 +3,11 @@ package com.accompany.admin.service; import com.accompany.admin.service.base.BaseService; import com.accompany.common.utils.StringUtils; import com.accompany.core.model.AccountLoginRecord; -import com.accompany.core.model.AccountLoginRecordExample; import com.accompany.core.model.Users; import com.accompany.core.mybatismapper.AccountLoginRecordMapper; import com.accompany.core.service.user.UsersBaseService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; @@ -29,27 +30,22 @@ public class AccountLoginRecordService extends BaseService { public PageInfo getAccountLoginRecordList(Integer pageSize, Integer pageNum, Long erbanNo, String phone, Integer loginType, String deviceId) { - AccountLoginRecordExample accountLoginRecordExample = new AccountLoginRecordExample(); - AccountLoginRecordExample.Criteria criteria = accountLoginRecordExample.createCriteria(); - if (StringUtils.isNotBlank(deviceId)) { - criteria.andDeviceIdEqualTo(deviceId); - } - if (StringUtils.isNotBlank(phone)) { - criteria.andPhoneEqualTo(phone); - } + Long uid = null; if (erbanNo != null) { Users u = usersBaseService.getUsersByErBanNo(erbanNo); if (null == u){ return new PageInfo<>(Collections.EMPTY_LIST); } - criteria.andUidEqualTo(u.getUid()); + uid = u.getUid(); } - if (loginType != null) { - criteria.andLoginTypeEqualTo(loginType.byteValue()); - } - accountLoginRecordExample.setOrderByClause("create_time desc"); + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery() + .eq(null != uid, AccountLoginRecord::getUid, uid) + .eq(StringUtils.isNotBlank(deviceId), AccountLoginRecord::getDeviceId, deviceId) + .eq(StringUtils.isNotBlank(phone), AccountLoginRecord::getPhone, deviceId) + .eq(null != loginType, AccountLoginRecord::getLoginType, loginType) + .orderByDesc(AccountLoginRecord::getCreateTime); PageHelper.startPage(pageNum, pageSize); - List accountLoginRecord = accountLoginRecordMapper.selectByExample(accountLoginRecordExample); + List accountLoginRecord = accountLoginRecordMapper.selectList(queryWrapper); return new PageInfo<>(accountLoginRecord); } diff --git a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/block/BlockAdminService.java b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/block/BlockAdminService.java index 8a4bef8ce..657eb3e68 100644 --- a/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/block/BlockAdminService.java +++ b/accompany-admin/accompany-admin-service/src/main/java/com/accompany/admin/service/block/BlockAdminService.java @@ -11,9 +11,10 @@ import com.accompany.common.result.BusiResult; import com.accompany.common.status.BusiStatus; import com.accompany.core.constant.BlockTypeEnum; import com.accompany.core.model.AccountLoginRecord; -import com.accompany.core.model.AccountLoginRecordExample; import com.accompany.core.mybatismapper.AccountLoginRecordMapper; import com.accompany.core.util.StringUtils; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; @@ -109,20 +110,18 @@ public class BlockAdminService extends BaseService { } public List searchUser(String phone, String deviceId, String ip) { - AccountLoginRecordExample example = new AccountLoginRecordExample(); - AccountLoginRecordExample.Criteria criteria = example.createCriteria(); + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(); if (StringUtils.isNotBlank(phone)) { - criteria.andPhoneEqualTo(phone); + queryWrapper.eq(AccountLoginRecord::getPhone, phone); } if (StringUtils.isNotBlank(deviceId)) { - criteria.andDeviceIdEqualTo(deviceId); + queryWrapper.eq(AccountLoginRecord::getDeviceId, deviceId); } if (StringUtils.isNotBlank(ip)) { - criteria.andLoginIpEqualTo(ip); + queryWrapper.eq(AccountLoginRecord::getLoginIp, ip); } - List users = accountLoginRecordMapper.selectByExample(example); - List collect = users.stream().filter(distinctByKey((u) -> u.getErbanNo())).collect(Collectors.toList()); - return collect; + List users = accountLoginRecordMapper.selectList(queryWrapper); + return users.stream().filter(distinctByKey((u) -> u.getErbanNo())).collect(Collectors.toList()); } } diff --git a/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/AccountLoginRecord.java b/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/AccountLoginRecord.java index 85a21c7d1..8cae595a5 100644 --- a/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/AccountLoginRecord.java +++ b/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/AccountLoginRecord.java @@ -1,7 +1,10 @@ package com.accompany.core.model; +import lombok.Data; + import java.util.Date; +@Data public class AccountLoginRecord { private Long recordId; @@ -15,11 +18,7 @@ public class AccountLoginRecord { private String loginIp; - private String loginPort; - - private String weixinOpenid; - - private String qqOpenid; + private String loginIpRegion; private String appleUid; @@ -43,163 +42,4 @@ public class AccountLoginRecord { private Date createTime; - public Long getRecordId() { - return recordId; - } - - public void setRecordId(Long recordId) { - this.recordId = recordId; - } - - public Long getUid() { - return uid; - } - - public void setUid(Long uid) { - this.uid = uid; - } - - public Long getErbanNo() { - return erbanNo; - } - - public void setErbanNo(Long erbanNo) { - this.erbanNo = erbanNo; - } - - public String getPhone() { - return phone; - } - - public void setPhone(String phone) { - this.phone = phone == null ? null : phone.trim(); - } - - public Byte getLoginType() { - return loginType; - } - - public void setLoginType(Byte loginType) { - this.loginType = loginType; - } - - public String getLoginIp() { - return loginIp; - } - - public void setLoginIp(String loginIp) { - this.loginIp = loginIp == null ? null : loginIp.trim(); - } - - public String getLoginPort() { - return loginPort; - } - - public void setLoginPort(String loginPort) { - this.loginPort = loginPort == null ? null : loginPort.trim(); - } - - public String getWeixinOpenid() { - return weixinOpenid; - } - - public void setWeixinOpenid(String weixinOpenid) { - this.weixinOpenid = weixinOpenid == null ? null : weixinOpenid.trim(); - } - - public String getQqOpenid() { - return qqOpenid; - } - - public void setQqOpenid(String qqOpenid) { - this.qqOpenid = qqOpenid == null ? null : qqOpenid.trim(); - } - - public String getAppleUid() { - return appleUid; - } - - public void setAppleUid(String appleUid) { - this.appleUid = appleUid == null ? null : appleUid.trim(); - } - - public String getOs() { - return os; - } - - public void setOs(String os) { - this.os = os == null ? null : os.trim(); - } - - public String getOsversion() { - return osversion; - } - - public void setOsversion(String osversion) { - this.osversion = osversion == null ? null : osversion.trim(); - } - - public String getApp() { - return app; - } - - public void setApp(String app) { - this.app = app == null ? null : app.trim(); - } - - public String getImei() { - return imei; - } - - public void setImei(String imei) { - this.imei = imei == null ? null : imei.trim(); - } - - public String getIspType() { - return ispType; - } - - public void setIspType(String ispType) { - this.ispType = ispType == null ? null : ispType.trim(); - } - - public String getNetType() { - return netType; - } - - public void setNetType(String netType) { - this.netType = netType == null ? null : netType.trim(); - } - - public String getModel() { - return model; - } - - public void setModel(String model) { - this.model = model == null ? null : model.trim(); - } - - public String getDeviceId() { - return deviceId; - } - - public void setDeviceId(String deviceId) { - this.deviceId = deviceId == null ? null : deviceId.trim(); - } - - public String getAppVersion() { - return appVersion; - } - - public void setAppVersion(String appVersion) { - this.appVersion = appVersion == null ? null : appVersion.trim(); - } - - public Date getCreateTime() { - return createTime; - } - - public void setCreateTime(Date createTime) { - this.createTime = createTime; - } } \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/AccountLoginRecordExample.java b/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/AccountLoginRecordExample.java deleted file mode 100644 index 437cbab1e..000000000 --- a/accompany-base/accompany-basic/accompany-basic-sdk/src/main/java/com/accompany/core/model/AccountLoginRecordExample.java +++ /dev/null @@ -1,1571 +0,0 @@ -package com.accompany.core.model; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -public class AccountLoginRecordExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - private Integer limit; - - private Integer offset; - - public Integer getLimit() { - return limit; - } - - public void setLimit(Integer limit) { - this.limit = limit; - } - - public Integer getOffset() { - return offset; - } - - public void setOffset(Integer offset) { - this.offset = offset; - } - - public AccountLoginRecordExample() { - oredCriteria = new ArrayList(); - } - - public void setOrderByClause(String orderByClause) { - this.orderByClause = orderByClause; - } - - public String getOrderByClause() { - return orderByClause; - } - - public void setDistinct(boolean distinct) { - this.distinct = distinct; - } - - public boolean isDistinct() { - return distinct; - } - - public List getOredCriteria() { - return oredCriteria; - } - - public void or(Criteria criteria) { - oredCriteria.add(criteria); - } - - public Criteria or() { - Criteria criteria = createCriteriaInternal(); - oredCriteria.add(criteria); - return criteria; - } - - public Criteria createCriteria() { - Criteria criteria = createCriteriaInternal(); - if (oredCriteria.size() == 0) { - oredCriteria.add(criteria); - } - return criteria; - } - - protected Criteria createCriteriaInternal() { - Criteria criteria = new Criteria(); - return criteria; - } - - public void clear() { - oredCriteria.clear(); - orderByClause = null; - distinct = false; - } - - protected abstract static class GeneratedCriteria { - protected List criteria; - - protected GeneratedCriteria() { - super(); - criteria = new ArrayList(); - } - - public boolean isValid() { - return criteria.size() > 0; - } - - public List getAllCriteria() { - return criteria; - } - - public List getCriteria() { - return criteria; - } - - protected void addCriterion(String condition) { - if (condition == null) { - throw new RuntimeException("Value for condition cannot be null"); - } - criteria.add(new Criterion(condition)); - } - - protected void addCriterion(String condition, Object value, String property) { - if (value == null) { - throw new RuntimeException("Value for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value)); - } - - protected void addCriterion(String condition, Object value1, Object value2, String property) { - if (value1 == null || value2 == null) { - throw new RuntimeException("Between values for " + property + " cannot be null"); - } - criteria.add(new Criterion(condition, value1, value2)); - } - - public Criteria andRecordIdIsNull() { - addCriterion("record_id is null"); - return (Criteria) this; - } - - public Criteria andRecordIdIsNotNull() { - addCriterion("record_id is not null"); - return (Criteria) this; - } - - public Criteria andRecordIdEqualTo(Long value) { - addCriterion("record_id =", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotEqualTo(Long value) { - addCriterion("record_id <>", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThan(Long value) { - addCriterion("record_id >", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdGreaterThanOrEqualTo(Long value) { - addCriterion("record_id >=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThan(Long value) { - addCriterion("record_id <", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdLessThanOrEqualTo(Long value) { - addCriterion("record_id <=", value, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdIn(List values) { - addCriterion("record_id in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotIn(List values) { - addCriterion("record_id not in", values, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdBetween(Long value1, Long value2) { - addCriterion("record_id between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andRecordIdNotBetween(Long value1, Long value2) { - addCriterion("record_id not between", value1, value2, "recordId"); - return (Criteria) this; - } - - public Criteria andUidIsNull() { - addCriterion("`uid` is null"); - return (Criteria) this; - } - - public Criteria andUidIsNotNull() { - addCriterion("`uid` is not null"); - return (Criteria) this; - } - - public Criteria andUidEqualTo(Long value) { - addCriterion("`uid` =", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotEqualTo(Long value) { - addCriterion("`uid` <>", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThan(Long value) { - addCriterion("`uid` >", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidGreaterThanOrEqualTo(Long value) { - addCriterion("`uid` >=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThan(Long value) { - addCriterion("`uid` <", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidLessThanOrEqualTo(Long value) { - addCriterion("`uid` <=", value, "uid"); - return (Criteria) this; - } - - public Criteria andUidIn(List values) { - addCriterion("`uid` in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotIn(List values) { - addCriterion("`uid` not in", values, "uid"); - return (Criteria) this; - } - - public Criteria andUidBetween(Long value1, Long value2) { - addCriterion("`uid` between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andUidNotBetween(Long value1, Long value2) { - addCriterion("`uid` not between", value1, value2, "uid"); - return (Criteria) this; - } - - public Criteria andErbanNoIsNull() { - addCriterion("erban_no is null"); - return (Criteria) this; - } - - public Criteria andErbanNoIsNotNull() { - addCriterion("erban_no is not null"); - return (Criteria) this; - } - - public Criteria andErbanNoEqualTo(Long value) { - addCriterion("erban_no =", value, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoNotEqualTo(Long value) { - addCriterion("erban_no <>", value, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoGreaterThan(Long value) { - addCriterion("erban_no >", value, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoGreaterThanOrEqualTo(Long value) { - addCriterion("erban_no >=", value, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoLessThan(Long value) { - addCriterion("erban_no <", value, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoLessThanOrEqualTo(Long value) { - addCriterion("erban_no <=", value, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoIn(List values) { - addCriterion("erban_no in", values, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoNotIn(List values) { - addCriterion("erban_no not in", values, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoBetween(Long value1, Long value2) { - addCriterion("erban_no between", value1, value2, "erbanNo"); - return (Criteria) this; - } - - public Criteria andErbanNoNotBetween(Long value1, Long value2) { - addCriterion("erban_no not between", value1, value2, "erbanNo"); - return (Criteria) this; - } - - public Criteria andPhoneIsNull() { - addCriterion("phone is null"); - return (Criteria) this; - } - - public Criteria andPhoneIsNotNull() { - addCriterion("phone is not null"); - return (Criteria) this; - } - - public Criteria andPhoneEqualTo(String value) { - addCriterion("phone =", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotEqualTo(String value) { - addCriterion("phone <>", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneGreaterThan(String value) { - addCriterion("phone >", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneGreaterThanOrEqualTo(String value) { - addCriterion("phone >=", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLessThan(String value) { - addCriterion("phone <", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLessThanOrEqualTo(String value) { - addCriterion("phone <=", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneLike(String value) { - addCriterion("phone like", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotLike(String value) { - addCriterion("phone not like", value, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneIn(List values) { - addCriterion("phone in", values, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotIn(List values) { - addCriterion("phone not in", values, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneBetween(String value1, String value2) { - addCriterion("phone between", value1, value2, "phone"); - return (Criteria) this; - } - - public Criteria andPhoneNotBetween(String value1, String value2) { - addCriterion("phone not between", value1, value2, "phone"); - return (Criteria) this; - } - - public Criteria andLoginTypeIsNull() { - addCriterion("login_type is null"); - return (Criteria) this; - } - - public Criteria andLoginTypeIsNotNull() { - addCriterion("login_type is not null"); - return (Criteria) this; - } - - public Criteria andLoginTypeEqualTo(Byte value) { - addCriterion("login_type =", value, "loginType"); - return (Criteria) this; - } - - public Criteria andLoginTypeNotEqualTo(Byte value) { - addCriterion("login_type <>", value, "loginType"); - return (Criteria) this; - } - - public Criteria andLoginTypeGreaterThan(Byte value) { - addCriterion("login_type >", value, "loginType"); - return (Criteria) this; - } - - public Criteria andLoginTypeGreaterThanOrEqualTo(Byte value) { - addCriterion("login_type >=", value, "loginType"); - return (Criteria) this; - } - - public Criteria andLoginTypeLessThan(Byte value) { - addCriterion("login_type <", value, "loginType"); - return (Criteria) this; - } - - public Criteria andLoginTypeLessThanOrEqualTo(Byte value) { - addCriterion("login_type <=", value, "loginType"); - return (Criteria) this; - } - - public Criteria andLoginTypeIn(List values) { - addCriterion("login_type in", values, "loginType"); - return (Criteria) this; - } - - public Criteria andLoginTypeNotIn(List values) { - addCriterion("login_type not in", values, "loginType"); - return (Criteria) this; - } - - public Criteria andLoginTypeBetween(Byte value1, Byte value2) { - addCriterion("login_type between", value1, value2, "loginType"); - return (Criteria) this; - } - - public Criteria andLoginTypeNotBetween(Byte value1, Byte value2) { - addCriterion("login_type not between", value1, value2, "loginType"); - return (Criteria) this; - } - - public Criteria andLoginIpIsNull() { - addCriterion("login_ip is null"); - return (Criteria) this; - } - - public Criteria andLoginIpIsNotNull() { - addCriterion("login_ip is not null"); - return (Criteria) this; - } - - public Criteria andLoginIpEqualTo(String value) { - addCriterion("login_ip =", value, "loginIp"); - return (Criteria) this; - } - - public Criteria andLoginIpNotEqualTo(String value) { - addCriterion("login_ip <>", value, "loginIp"); - return (Criteria) this; - } - - public Criteria andLoginIpGreaterThan(String value) { - addCriterion("login_ip >", value, "loginIp"); - return (Criteria) this; - } - - public Criteria andLoginIpGreaterThanOrEqualTo(String value) { - addCriterion("login_ip >=", value, "loginIp"); - return (Criteria) this; - } - - public Criteria andLoginIpLessThan(String value) { - addCriterion("login_ip <", value, "loginIp"); - return (Criteria) this; - } - - public Criteria andLoginIpLessThanOrEqualTo(String value) { - addCriterion("login_ip <=", value, "loginIp"); - return (Criteria) this; - } - - public Criteria andLoginIpLike(String value) { - addCriterion("login_ip like", value, "loginIp"); - return (Criteria) this; - } - - public Criteria andLoginIpNotLike(String value) { - addCriterion("login_ip not like", value, "loginIp"); - return (Criteria) this; - } - - public Criteria andLoginIpIn(List values) { - addCriterion("login_ip in", values, "loginIp"); - return (Criteria) this; - } - - public Criteria andLoginIpNotIn(List values) { - addCriterion("login_ip not in", values, "loginIp"); - return (Criteria) this; - } - - public Criteria andLoginIpBetween(String value1, String value2) { - addCriterion("login_ip between", value1, value2, "loginIp"); - return (Criteria) this; - } - - public Criteria andLoginIpNotBetween(String value1, String value2) { - addCriterion("login_ip not between", value1, value2, "loginIp"); - return (Criteria) this; - } - - public Criteria andLoginPortIsNull() { - addCriterion("login_port is null"); - return (Criteria) this; - } - - public Criteria andLoginPortIsNotNull() { - addCriterion("login_port is not null"); - return (Criteria) this; - } - - public Criteria andLoginPortEqualTo(String value) { - addCriterion("login_port =", value, "loginPort"); - return (Criteria) this; - } - - public Criteria andLoginPortNotEqualTo(String value) { - addCriterion("login_port <>", value, "loginPort"); - return (Criteria) this; - } - - public Criteria andLoginPortGreaterThan(String value) { - addCriterion("login_port >", value, "loginPort"); - return (Criteria) this; - } - - public Criteria andLoginPortGreaterThanOrEqualTo(String value) { - addCriterion("login_port >=", value, "loginPort"); - return (Criteria) this; - } - - public Criteria andLoginPortLessThan(String value) { - addCriterion("login_port <", value, "loginPort"); - return (Criteria) this; - } - - public Criteria andLoginPortLessThanOrEqualTo(String value) { - addCriterion("login_port <=", value, "loginPort"); - return (Criteria) this; - } - - public Criteria andLoginPortLike(String value) { - addCriterion("login_port like", value, "loginPort"); - return (Criteria) this; - } - - public Criteria andLoginPortNotLike(String value) { - addCriterion("login_port not like", value, "loginPort"); - return (Criteria) this; - } - - public Criteria andLoginPortIn(List values) { - addCriterion("login_port in", values, "loginPort"); - return (Criteria) this; - } - - public Criteria andLoginPortNotIn(List values) { - addCriterion("login_port not in", values, "loginPort"); - return (Criteria) this; - } - - public Criteria andLoginPortBetween(String value1, String value2) { - addCriterion("login_port between", value1, value2, "loginPort"); - return (Criteria) this; - } - - public Criteria andLoginPortNotBetween(String value1, String value2) { - addCriterion("login_port not between", value1, value2, "loginPort"); - return (Criteria) this; - } - - public Criteria andWeixinOpenidIsNull() { - addCriterion("weixin_openid is null"); - return (Criteria) this; - } - - public Criteria andWeixinOpenidIsNotNull() { - addCriterion("weixin_openid is not null"); - return (Criteria) this; - } - - public Criteria andWeixinOpenidEqualTo(String value) { - addCriterion("weixin_openid =", value, "weixinOpenid"); - return (Criteria) this; - } - - public Criteria andWeixinOpenidNotEqualTo(String value) { - addCriterion("weixin_openid <>", value, "weixinOpenid"); - return (Criteria) this; - } - - public Criteria andWeixinOpenidGreaterThan(String value) { - addCriterion("weixin_openid >", value, "weixinOpenid"); - return (Criteria) this; - } - - public Criteria andWeixinOpenidGreaterThanOrEqualTo(String value) { - addCriterion("weixin_openid >=", value, "weixinOpenid"); - return (Criteria) this; - } - - public Criteria andWeixinOpenidLessThan(String value) { - addCriterion("weixin_openid <", value, "weixinOpenid"); - return (Criteria) this; - } - - public Criteria andWeixinOpenidLessThanOrEqualTo(String value) { - addCriterion("weixin_openid <=", value, "weixinOpenid"); - return (Criteria) this; - } - - public Criteria andWeixinOpenidLike(String value) { - addCriterion("weixin_openid like", value, "weixinOpenid"); - return (Criteria) this; - } - - public Criteria andWeixinOpenidNotLike(String value) { - addCriterion("weixin_openid not like", value, "weixinOpenid"); - return (Criteria) this; - } - - public Criteria andWeixinOpenidIn(List values) { - addCriterion("weixin_openid in", values, "weixinOpenid"); - return (Criteria) this; - } - - public Criteria andWeixinOpenidNotIn(List values) { - addCriterion("weixin_openid not in", values, "weixinOpenid"); - return (Criteria) this; - } - - public Criteria andWeixinOpenidBetween(String value1, String value2) { - addCriterion("weixin_openid between", value1, value2, "weixinOpenid"); - return (Criteria) this; - } - - public Criteria andWeixinOpenidNotBetween(String value1, String value2) { - addCriterion("weixin_openid not between", value1, value2, "weixinOpenid"); - return (Criteria) this; - } - - public Criteria andQqOpenidIsNull() { - addCriterion("qq_openid is null"); - return (Criteria) this; - } - - public Criteria andQqOpenidIsNotNull() { - addCriterion("qq_openid is not null"); - return (Criteria) this; - } - - public Criteria andQqOpenidEqualTo(String value) { - addCriterion("qq_openid =", value, "qqOpenid"); - return (Criteria) this; - } - - public Criteria andQqOpenidNotEqualTo(String value) { - addCriterion("qq_openid <>", value, "qqOpenid"); - return (Criteria) this; - } - - public Criteria andQqOpenidGreaterThan(String value) { - addCriterion("qq_openid >", value, "qqOpenid"); - return (Criteria) this; - } - - public Criteria andQqOpenidGreaterThanOrEqualTo(String value) { - addCriterion("qq_openid >=", value, "qqOpenid"); - return (Criteria) this; - } - - public Criteria andQqOpenidLessThan(String value) { - addCriterion("qq_openid <", value, "qqOpenid"); - return (Criteria) this; - } - - public Criteria andQqOpenidLessThanOrEqualTo(String value) { - addCriterion("qq_openid <=", value, "qqOpenid"); - return (Criteria) this; - } - - public Criteria andQqOpenidLike(String value) { - addCriterion("qq_openid like", value, "qqOpenid"); - return (Criteria) this; - } - - public Criteria andQqOpenidNotLike(String value) { - addCriterion("qq_openid not like", value, "qqOpenid"); - return (Criteria) this; - } - - public Criteria andQqOpenidIn(List values) { - addCriterion("qq_openid in", values, "qqOpenid"); - return (Criteria) this; - } - - public Criteria andQqOpenidNotIn(List values) { - addCriterion("qq_openid not in", values, "qqOpenid"); - return (Criteria) this; - } - - public Criteria andQqOpenidBetween(String value1, String value2) { - addCriterion("qq_openid between", value1, value2, "qqOpenid"); - return (Criteria) this; - } - - public Criteria andQqOpenidNotBetween(String value1, String value2) { - addCriterion("qq_openid not between", value1, value2, "qqOpenid"); - return (Criteria) this; - } - - public Criteria andAppleUidIsNull() { - addCriterion("apple_uid is null"); - return (Criteria) this; - } - - public Criteria andAppleUidIsNotNull() { - addCriterion("apple_uid is not null"); - return (Criteria) this; - } - - public Criteria andAppleUidEqualTo(String value) { - addCriterion("apple_uid =", value, "appleUid"); - return (Criteria) this; - } - - public Criteria andAppleUidNotEqualTo(String value) { - addCriterion("apple_uid <>", value, "appleUid"); - return (Criteria) this; - } - - public Criteria andAppleUidGreaterThan(String value) { - addCriterion("apple_uid >", value, "appleUid"); - return (Criteria) this; - } - - public Criteria andAppleUidGreaterThanOrEqualTo(String value) { - addCriterion("apple_uid >=", value, "appleUid"); - return (Criteria) this; - } - - public Criteria andAppleUidLessThan(String value) { - addCriterion("apple_uid <", value, "appleUid"); - return (Criteria) this; - } - - public Criteria andAppleUidLessThanOrEqualTo(String value) { - addCriterion("apple_uid <=", value, "appleUid"); - return (Criteria) this; - } - - public Criteria andAppleUidLike(String value) { - addCriterion("apple_uid like", value, "appleUid"); - return (Criteria) this; - } - - public Criteria andAppleUidNotLike(String value) { - addCriterion("apple_uid not like", value, "appleUid"); - return (Criteria) this; - } - - public Criteria andAppleUidIn(List values) { - addCriterion("apple_uid in", values, "appleUid"); - return (Criteria) this; - } - - public Criteria andAppleUidNotIn(List values) { - addCriterion("apple_uid not in", values, "appleUid"); - return (Criteria) this; - } - - public Criteria andAppleUidBetween(String value1, String value2) { - addCriterion("apple_uid between", value1, value2, "appleUid"); - return (Criteria) this; - } - - public Criteria andAppleUidNotBetween(String value1, String value2) { - addCriterion("apple_uid not between", value1, value2, "appleUid"); - return (Criteria) this; - } - - public Criteria andOsIsNull() { - addCriterion("os is null"); - return (Criteria) this; - } - - public Criteria andOsIsNotNull() { - addCriterion("os is not null"); - return (Criteria) this; - } - - public Criteria andOsEqualTo(String value) { - addCriterion("os =", value, "os"); - return (Criteria) this; - } - - public Criteria andOsNotEqualTo(String value) { - addCriterion("os <>", value, "os"); - return (Criteria) this; - } - - public Criteria andOsGreaterThan(String value) { - addCriterion("os >", value, "os"); - return (Criteria) this; - } - - public Criteria andOsGreaterThanOrEqualTo(String value) { - addCriterion("os >=", value, "os"); - return (Criteria) this; - } - - public Criteria andOsLessThan(String value) { - addCriterion("os <", value, "os"); - return (Criteria) this; - } - - public Criteria andOsLessThanOrEqualTo(String value) { - addCriterion("os <=", value, "os"); - return (Criteria) this; - } - - public Criteria andOsLike(String value) { - addCriterion("os like", value, "os"); - return (Criteria) this; - } - - public Criteria andOsNotLike(String value) { - addCriterion("os not like", value, "os"); - return (Criteria) this; - } - - public Criteria andOsIn(List values) { - addCriterion("os in", values, "os"); - return (Criteria) this; - } - - public Criteria andOsNotIn(List values) { - addCriterion("os not in", values, "os"); - return (Criteria) this; - } - - public Criteria andOsBetween(String value1, String value2) { - addCriterion("os between", value1, value2, "os"); - return (Criteria) this; - } - - public Criteria andOsNotBetween(String value1, String value2) { - addCriterion("os not between", value1, value2, "os"); - return (Criteria) this; - } - - public Criteria andOsversionIsNull() { - addCriterion("osVersion is null"); - return (Criteria) this; - } - - public Criteria andOsversionIsNotNull() { - addCriterion("osVersion is not null"); - return (Criteria) this; - } - - public Criteria andOsversionEqualTo(String value) { - addCriterion("osVersion =", value, "osversion"); - return (Criteria) this; - } - - public Criteria andOsversionNotEqualTo(String value) { - addCriterion("osVersion <>", value, "osversion"); - return (Criteria) this; - } - - public Criteria andOsversionGreaterThan(String value) { - addCriterion("osVersion >", value, "osversion"); - return (Criteria) this; - } - - public Criteria andOsversionGreaterThanOrEqualTo(String value) { - addCriterion("osVersion >=", value, "osversion"); - return (Criteria) this; - } - - public Criteria andOsversionLessThan(String value) { - addCriterion("osVersion <", value, "osversion"); - return (Criteria) this; - } - - public Criteria andOsversionLessThanOrEqualTo(String value) { - addCriterion("osVersion <=", value, "osversion"); - return (Criteria) this; - } - - public Criteria andOsversionLike(String value) { - addCriterion("osVersion like", value, "osversion"); - return (Criteria) this; - } - - public Criteria andOsversionNotLike(String value) { - addCriterion("osVersion not like", value, "osversion"); - return (Criteria) this; - } - - public Criteria andOsversionIn(List values) { - addCriterion("osVersion in", values, "osversion"); - return (Criteria) this; - } - - public Criteria andOsversionNotIn(List values) { - addCriterion("osVersion not in", values, "osversion"); - return (Criteria) this; - } - - public Criteria andOsversionBetween(String value1, String value2) { - addCriterion("osVersion between", value1, value2, "osversion"); - return (Criteria) this; - } - - public Criteria andOsversionNotBetween(String value1, String value2) { - addCriterion("osVersion not between", value1, value2, "osversion"); - return (Criteria) this; - } - - public Criteria andAppIsNull() { - addCriterion("app is null"); - return (Criteria) this; - } - - public Criteria andAppIsNotNull() { - addCriterion("app is not null"); - return (Criteria) this; - } - - public Criteria andAppEqualTo(String value) { - addCriterion("app =", value, "app"); - return (Criteria) this; - } - - public Criteria andAppNotEqualTo(String value) { - addCriterion("app <>", value, "app"); - return (Criteria) this; - } - - public Criteria andAppGreaterThan(String value) { - addCriterion("app >", value, "app"); - return (Criteria) this; - } - - public Criteria andAppGreaterThanOrEqualTo(String value) { - addCriterion("app >=", value, "app"); - return (Criteria) this; - } - - public Criteria andAppLessThan(String value) { - addCriterion("app <", value, "app"); - return (Criteria) this; - } - - public Criteria andAppLessThanOrEqualTo(String value) { - addCriterion("app <=", value, "app"); - return (Criteria) this; - } - - public Criteria andAppLike(String value) { - addCriterion("app like", value, "app"); - return (Criteria) this; - } - - public Criteria andAppNotLike(String value) { - addCriterion("app not like", value, "app"); - return (Criteria) this; - } - - public Criteria andAppIn(List values) { - addCriterion("app in", values, "app"); - return (Criteria) this; - } - - public Criteria andAppNotIn(List values) { - addCriterion("app not in", values, "app"); - return (Criteria) this; - } - - public Criteria andAppBetween(String value1, String value2) { - addCriterion("app between", value1, value2, "app"); - return (Criteria) this; - } - - public Criteria andAppNotBetween(String value1, String value2) { - addCriterion("app not between", value1, value2, "app"); - return (Criteria) this; - } - - public Criteria andImeiIsNull() { - addCriterion("imei is null"); - return (Criteria) this; - } - - public Criteria andImeiIsNotNull() { - addCriterion("imei is not null"); - return (Criteria) this; - } - - public Criteria andImeiEqualTo(String value) { - addCriterion("imei =", value, "imei"); - return (Criteria) this; - } - - public Criteria andImeiNotEqualTo(String value) { - addCriterion("imei <>", value, "imei"); - return (Criteria) this; - } - - public Criteria andImeiGreaterThan(String value) { - addCriterion("imei >", value, "imei"); - return (Criteria) this; - } - - public Criteria andImeiGreaterThanOrEqualTo(String value) { - addCriterion("imei >=", value, "imei"); - return (Criteria) this; - } - - public Criteria andImeiLessThan(String value) { - addCriterion("imei <", value, "imei"); - return (Criteria) this; - } - - public Criteria andImeiLessThanOrEqualTo(String value) { - addCriterion("imei <=", value, "imei"); - return (Criteria) this; - } - - public Criteria andImeiLike(String value) { - addCriterion("imei like", value, "imei"); - return (Criteria) this; - } - - public Criteria andImeiNotLike(String value) { - addCriterion("imei not like", value, "imei"); - return (Criteria) this; - } - - public Criteria andImeiIn(List values) { - addCriterion("imei in", values, "imei"); - return (Criteria) this; - } - - public Criteria andImeiNotIn(List values) { - addCriterion("imei not in", values, "imei"); - return (Criteria) this; - } - - public Criteria andImeiBetween(String value1, String value2) { - addCriterion("imei between", value1, value2, "imei"); - return (Criteria) this; - } - - public Criteria andImeiNotBetween(String value1, String value2) { - addCriterion("imei not between", value1, value2, "imei"); - return (Criteria) this; - } - - public Criteria andIspTypeIsNull() { - addCriterion("isp_type is null"); - return (Criteria) this; - } - - public Criteria andIspTypeIsNotNull() { - addCriterion("isp_type is not null"); - return (Criteria) this; - } - - public Criteria andIspTypeEqualTo(String value) { - addCriterion("isp_type =", value, "ispType"); - return (Criteria) this; - } - - public Criteria andIspTypeNotEqualTo(String value) { - addCriterion("isp_type <>", value, "ispType"); - return (Criteria) this; - } - - public Criteria andIspTypeGreaterThan(String value) { - addCriterion("isp_type >", value, "ispType"); - return (Criteria) this; - } - - public Criteria andIspTypeGreaterThanOrEqualTo(String value) { - addCriterion("isp_type >=", value, "ispType"); - return (Criteria) this; - } - - public Criteria andIspTypeLessThan(String value) { - addCriterion("isp_type <", value, "ispType"); - return (Criteria) this; - } - - public Criteria andIspTypeLessThanOrEqualTo(String value) { - addCriterion("isp_type <=", value, "ispType"); - return (Criteria) this; - } - - public Criteria andIspTypeLike(String value) { - addCriterion("isp_type like", value, "ispType"); - return (Criteria) this; - } - - public Criteria andIspTypeNotLike(String value) { - addCriterion("isp_type not like", value, "ispType"); - return (Criteria) this; - } - - public Criteria andIspTypeIn(List values) { - addCriterion("isp_type in", values, "ispType"); - return (Criteria) this; - } - - public Criteria andIspTypeNotIn(List values) { - addCriterion("isp_type not in", values, "ispType"); - return (Criteria) this; - } - - public Criteria andIspTypeBetween(String value1, String value2) { - addCriterion("isp_type between", value1, value2, "ispType"); - return (Criteria) this; - } - - public Criteria andIspTypeNotBetween(String value1, String value2) { - addCriterion("isp_type not between", value1, value2, "ispType"); - return (Criteria) this; - } - - public Criteria andNetTypeIsNull() { - addCriterion("net_type is null"); - return (Criteria) this; - } - - public Criteria andNetTypeIsNotNull() { - addCriterion("net_type is not null"); - return (Criteria) this; - } - - public Criteria andNetTypeEqualTo(String value) { - addCriterion("net_type =", value, "netType"); - return (Criteria) this; - } - - public Criteria andNetTypeNotEqualTo(String value) { - addCriterion("net_type <>", value, "netType"); - return (Criteria) this; - } - - public Criteria andNetTypeGreaterThan(String value) { - addCriterion("net_type >", value, "netType"); - return (Criteria) this; - } - - public Criteria andNetTypeGreaterThanOrEqualTo(String value) { - addCriterion("net_type >=", value, "netType"); - return (Criteria) this; - } - - public Criteria andNetTypeLessThan(String value) { - addCriterion("net_type <", value, "netType"); - return (Criteria) this; - } - - public Criteria andNetTypeLessThanOrEqualTo(String value) { - addCriterion("net_type <=", value, "netType"); - return (Criteria) this; - } - - public Criteria andNetTypeLike(String value) { - addCriterion("net_type like", value, "netType"); - return (Criteria) this; - } - - public Criteria andNetTypeNotLike(String value) { - addCriterion("net_type not like", value, "netType"); - return (Criteria) this; - } - - public Criteria andNetTypeIn(List values) { - addCriterion("net_type in", values, "netType"); - return (Criteria) this; - } - - public Criteria andNetTypeNotIn(List values) { - addCriterion("net_type not in", values, "netType"); - return (Criteria) this; - } - - public Criteria andNetTypeBetween(String value1, String value2) { - addCriterion("net_type between", value1, value2, "netType"); - return (Criteria) this; - } - - public Criteria andNetTypeNotBetween(String value1, String value2) { - addCriterion("net_type not between", value1, value2, "netType"); - return (Criteria) this; - } - - public Criteria andModelIsNull() { - addCriterion("model is null"); - return (Criteria) this; - } - - public Criteria andModelIsNotNull() { - addCriterion("model is not null"); - return (Criteria) this; - } - - public Criteria andModelEqualTo(String value) { - addCriterion("model =", value, "model"); - return (Criteria) this; - } - - public Criteria andModelNotEqualTo(String value) { - addCriterion("model <>", value, "model"); - return (Criteria) this; - } - - public Criteria andModelGreaterThan(String value) { - addCriterion("model >", value, "model"); - return (Criteria) this; - } - - public Criteria andModelGreaterThanOrEqualTo(String value) { - addCriterion("model >=", value, "model"); - return (Criteria) this; - } - - public Criteria andModelLessThan(String value) { - addCriterion("model <", value, "model"); - return (Criteria) this; - } - - public Criteria andModelLessThanOrEqualTo(String value) { - addCriterion("model <=", value, "model"); - return (Criteria) this; - } - - public Criteria andModelLike(String value) { - addCriterion("model like", value, "model"); - return (Criteria) this; - } - - public Criteria andModelNotLike(String value) { - addCriterion("model not like", value, "model"); - return (Criteria) this; - } - - public Criteria andModelIn(List values) { - addCriterion("model in", values, "model"); - return (Criteria) this; - } - - public Criteria andModelNotIn(List values) { - addCriterion("model not in", values, "model"); - return (Criteria) this; - } - - public Criteria andModelBetween(String value1, String value2) { - addCriterion("model between", value1, value2, "model"); - return (Criteria) this; - } - - public Criteria andModelNotBetween(String value1, String value2) { - addCriterion("model not between", value1, value2, "model"); - return (Criteria) this; - } - - public Criteria andDeviceIdIsNull() { - addCriterion("device_id is null"); - return (Criteria) this; - } - - public Criteria andDeviceIdIsNotNull() { - addCriterion("device_id is not null"); - return (Criteria) this; - } - - public Criteria andDeviceIdEqualTo(String value) { - addCriterion("device_id =", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdNotEqualTo(String value) { - addCriterion("device_id <>", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdGreaterThan(String value) { - addCriterion("device_id >", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdGreaterThanOrEqualTo(String value) { - addCriterion("device_id >=", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdLessThan(String value) { - addCriterion("device_id <", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdLessThanOrEqualTo(String value) { - addCriterion("device_id <=", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdLike(String value) { - addCriterion("device_id like", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdNotLike(String value) { - addCriterion("device_id not like", value, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdIn(List values) { - addCriterion("device_id in", values, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdNotIn(List values) { - addCriterion("device_id not in", values, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdBetween(String value1, String value2) { - addCriterion("device_id between", value1, value2, "deviceId"); - return (Criteria) this; - } - - public Criteria andDeviceIdNotBetween(String value1, String value2) { - addCriterion("device_id not between", value1, value2, "deviceId"); - return (Criteria) this; - } - - public Criteria andAppVersionIsNull() { - addCriterion("app_version is null"); - return (Criteria) this; - } - - public Criteria andAppVersionIsNotNull() { - addCriterion("app_version is not null"); - return (Criteria) this; - } - - public Criteria andAppVersionEqualTo(String value) { - addCriterion("app_version =", value, "appVersion"); - return (Criteria) this; - } - - public Criteria andAppVersionNotEqualTo(String value) { - addCriterion("app_version <>", value, "appVersion"); - return (Criteria) this; - } - - public Criteria andAppVersionGreaterThan(String value) { - addCriterion("app_version >", value, "appVersion"); - return (Criteria) this; - } - - public Criteria andAppVersionGreaterThanOrEqualTo(String value) { - addCriterion("app_version >=", value, "appVersion"); - return (Criteria) this; - } - - public Criteria andAppVersionLessThan(String value) { - addCriterion("app_version <", value, "appVersion"); - return (Criteria) this; - } - - public Criteria andAppVersionLessThanOrEqualTo(String value) { - addCriterion("app_version <=", value, "appVersion"); - return (Criteria) this; - } - - public Criteria andAppVersionLike(String value) { - addCriterion("app_version like", value, "appVersion"); - return (Criteria) this; - } - - public Criteria andAppVersionNotLike(String value) { - addCriterion("app_version not like", value, "appVersion"); - return (Criteria) this; - } - - public Criteria andAppVersionIn(List values) { - addCriterion("app_version in", values, "appVersion"); - return (Criteria) this; - } - - public Criteria andAppVersionNotIn(List values) { - addCriterion("app_version not in", values, "appVersion"); - return (Criteria) this; - } - - public Criteria andAppVersionBetween(String value1, String value2) { - addCriterion("app_version between", value1, value2, "appVersion"); - return (Criteria) this; - } - - public Criteria andAppVersionNotBetween(String value1, String value2) { - addCriterion("app_version not between", value1, value2, "appVersion"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Date value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Date value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Date value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Date value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Date value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Date value1, Date value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Date value1, Date value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - } - - public static class Criteria extends GeneratedCriteria { - - protected Criteria() { - super(); - } - } - - public static class Criterion { - private String condition; - - private Object value; - - private Object secondValue; - - private boolean noValue; - - private boolean singleValue; - - private boolean betweenValue; - - private boolean listValue; - - private String typeHandler; - - public String getCondition() { - return condition; - } - - public Object getValue() { - return value; - } - - public Object getSecondValue() { - return secondValue; - } - - public boolean isNoValue() { - return noValue; - } - - public boolean isSingleValue() { - return singleValue; - } - - public boolean isBetweenValue() { - return betweenValue; - } - - public boolean isListValue() { - return listValue; - } - - public String getTypeHandler() { - return typeHandler; - } - - protected Criterion(String condition) { - super(); - this.condition = condition; - this.typeHandler = null; - this.noValue = true; - } - - protected Criterion(String condition, Object value, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.typeHandler = typeHandler; - if (value instanceof List) { - this.listValue = true; - } else { - this.singleValue = true; - } - } - - protected Criterion(String condition, Object value) { - this(condition, value, null); - } - - protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { - super(); - this.condition = condition; - this.value = value; - this.secondValue = secondValue; - this.typeHandler = typeHandler; - this.betweenValue = true; - } - - protected Criterion(String condition, Object value, Object secondValue) { - this(condition, value, secondValue, null); - } - } -} \ No newline at end of file diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/AccountLoginRecordMapper.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/AccountLoginRecordMapper.java index da64122d6..724ea66dc 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/AccountLoginRecordMapper.java +++ b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/AccountLoginRecordMapper.java @@ -1,33 +1,12 @@ package com.accompany.core.mybatismapper; import com.accompany.core.model.AccountLoginRecord; -import com.accompany.core.model.AccountLoginRecordExample; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import java.util.List; -public interface AccountLoginRecordMapper { - int countByExample(AccountLoginRecordExample example); - - int deleteByExample(AccountLoginRecordExample example); - - int deleteByPrimaryKey(Long recordId); - - int insert(AccountLoginRecord record); - - int insertSelective(AccountLoginRecord record); - - List selectByExample(AccountLoginRecordExample example); - - AccountLoginRecord selectByPrimaryKey(Long recordId); - - int updateByExampleSelective(@Param("record") AccountLoginRecord record, @Param("example") AccountLoginRecordExample example); - - int updateByExample(@Param("record") AccountLoginRecord record, @Param("example") AccountLoginRecordExample example); - - int updateByPrimaryKeySelective(AccountLoginRecord record); - - int updateByPrimaryKey(AccountLoginRecord record); +public interface AccountLoginRecordMapper extends BaseMapper { String getLastDeviceId(Long uid); diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/AccountLoginRecordMapperExpand.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/AccountLoginRecordMapperExpand.java index ddb58f354..c8970ba6c 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/AccountLoginRecordMapperExpand.java +++ b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/mybatismapper/AccountLoginRecordMapperExpand.java @@ -8,14 +8,10 @@ import java.util.List; public interface AccountLoginRecordMapperExpand { - Long countLoginDay(@Param("uid") Long uid, @Param("startDay") Date startDay, @Param("endDay") Date endDay); - List getRecentLoginUids(@Param("startDay") Date startDay, @Param("partitionId") Integer partitionId); List listUserLoginDevice(Long uid); - Integer countLoginRecord(@Param("uid") Long uid); - List getUidByRecent60Day(@Param("channel") String channel, @Param("ignoreVersion") String ignoreVersion, @Param("ignoreChannel") String ignoreChannel, @Param("partitionId") Integer partitionId, @Param("index") Integer index, @Param("offset") Integer offset); /** diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/LoginRecordService.java b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/LoginRecordService.java index 35aa5f019..bb1ec0050 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/LoginRecordService.java +++ b/accompany-base/accompany-basic/accompany-basic-service/src/main/java/com/accompany/core/service/account/LoginRecordService.java @@ -2,8 +2,9 @@ package com.accompany.core.service.account; import com.accompany.common.utils.DateTimeUtil; import com.accompany.core.model.AccountLoginRecord; -import com.accompany.core.model.AccountLoginRecordExample; import com.accompany.core.mybatismapper.AccountLoginRecordMapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -34,9 +35,9 @@ public class LoginRecordService { } public int countLoginRecordBetweenQueryTime(Long uid, Date startTime, Date endTime) { - AccountLoginRecordExample example = new AccountLoginRecordExample(); - example.createCriteria().andUidEqualTo(uid) - .andCreateTimeBetween(startTime, endTime); - return accountLoginRecordMapper.countByExample(example); + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery() + .eq(AccountLoginRecord::getUid, uid) + .between(AccountLoginRecord::getCreateTime, startTime, endTime); + return accountLoginRecordMapper.selectCount(wrapper); } } diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/oauth/AccountLoginRecordMapper.xml b/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/oauth/AccountLoginRecordMapper.xml index ff9c6c611..cf1cee1ec 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/oauth/AccountLoginRecordMapper.xml +++ b/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/oauth/AccountLoginRecordMapper.xml @@ -1,455 +1,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - - - - - - - - and ${criterion.condition} - - - and ${criterion.condition} #{criterion.value} - - - and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} - - - and ${criterion.condition} - - #{listItem} - - - - - - - - - - - record_id, `uid`, erban_no, phone, login_type, login_ip, login_port, weixin_openid, - qq_openid, apple_uid, os, osVersion, app, imei, isp_type, net_type, model, device_id, - app_version, create_time - - - - - delete from account_login_record - where record_id = #{recordId,jdbcType=BIGINT} - - - delete from account_login_record - - - - - - insert into account_login_record (`uid`, erban_no, phone, - login_type, login_ip, login_port, - weixin_openid, qq_openid, apple_uid, - os, osVersion, app, - imei, isp_type, net_type, - model, device_id, app_version, - create_time) - values (#{uid,jdbcType=BIGINT}, #{erbanNo,jdbcType=BIGINT}, #{phone,jdbcType=VARCHAR}, - #{loginType,jdbcType=TINYINT}, #{loginIp,jdbcType=VARCHAR}, #{loginPort,jdbcType=VARCHAR}, - #{weixinOpenid,jdbcType=VARCHAR}, #{qqOpenid,jdbcType=VARCHAR}, #{appleUid,jdbcType=VARCHAR}, - #{os,jdbcType=VARCHAR}, #{osversion,jdbcType=VARCHAR}, #{app,jdbcType=VARCHAR}, - #{imei,jdbcType=VARCHAR}, #{ispType,jdbcType=VARCHAR}, #{netType,jdbcType=VARCHAR}, - #{model,jdbcType=VARCHAR}, #{deviceId,jdbcType=VARCHAR}, #{appVersion,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}) - - - insert into account_login_record - - - `uid`, - - - erban_no, - - - phone, - - - login_type, - - - login_ip, - - - login_port, - - - weixin_openid, - - - qq_openid, - - - apple_uid, - - - os, - - - osVersion, - - - app, - - - imei, - - - isp_type, - - - net_type, - - - model, - - - device_id, - - - app_version, - - - create_time, - - - - - #{uid,jdbcType=BIGINT}, - - - #{erbanNo,jdbcType=BIGINT}, - - - #{phone,jdbcType=VARCHAR}, - - - #{loginType,jdbcType=TINYINT}, - - - #{loginIp,jdbcType=VARCHAR}, - - - #{loginPort,jdbcType=VARCHAR}, - - - #{weixinOpenid,jdbcType=VARCHAR}, - - - #{qqOpenid,jdbcType=VARCHAR}, - - - #{appleUid,jdbcType=VARCHAR}, - - - #{os,jdbcType=VARCHAR}, - - - #{osversion,jdbcType=VARCHAR}, - - - #{app,jdbcType=VARCHAR}, - - - #{imei,jdbcType=VARCHAR}, - - - #{ispType,jdbcType=VARCHAR}, - - - #{netType,jdbcType=VARCHAR}, - - - #{model,jdbcType=VARCHAR}, - - - #{deviceId,jdbcType=VARCHAR}, - - - #{appVersion,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=TIMESTAMP}, - - - - - - update account_login_record - - - record_id = #{record.recordId,jdbcType=BIGINT}, - - - `uid` = #{record.uid,jdbcType=BIGINT}, - - - erban_no = #{record.erbanNo,jdbcType=BIGINT}, - - - phone = #{record.phone,jdbcType=VARCHAR}, - - - login_type = #{record.loginType,jdbcType=TINYINT}, - - - login_ip = #{record.loginIp,jdbcType=VARCHAR}, - - - login_port = #{record.loginPort,jdbcType=VARCHAR}, - - - weixin_openid = #{record.weixinOpenid,jdbcType=VARCHAR}, - - - qq_openid = #{record.qqOpenid,jdbcType=VARCHAR}, - - - apple_uid = #{record.appleUid,jdbcType=VARCHAR}, - - - os = #{record.os,jdbcType=VARCHAR}, - - - osVersion = #{record.osversion,jdbcType=VARCHAR}, - - - app = #{record.app,jdbcType=VARCHAR}, - - - imei = #{record.imei,jdbcType=VARCHAR}, - - - isp_type = #{record.ispType,jdbcType=VARCHAR}, - - - net_type = #{record.netType,jdbcType=VARCHAR}, - - - model = #{record.model,jdbcType=VARCHAR}, - - - device_id = #{record.deviceId,jdbcType=VARCHAR}, - - - app_version = #{record.appVersion,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=TIMESTAMP}, - - - - - - - - update account_login_record - set record_id = #{record.recordId,jdbcType=BIGINT}, - `uid` = #{record.uid,jdbcType=BIGINT}, - erban_no = #{record.erbanNo,jdbcType=BIGINT}, - phone = #{record.phone,jdbcType=VARCHAR}, - login_type = #{record.loginType,jdbcType=TINYINT}, - login_ip = #{record.loginIp,jdbcType=VARCHAR}, - login_port = #{record.loginPort,jdbcType=VARCHAR}, - weixin_openid = #{record.weixinOpenid,jdbcType=VARCHAR}, - qq_openid = #{record.qqOpenid,jdbcType=VARCHAR}, - apple_uid = #{record.appleUid,jdbcType=VARCHAR}, - os = #{record.os,jdbcType=VARCHAR}, - osVersion = #{record.osversion,jdbcType=VARCHAR}, - app = #{record.app,jdbcType=VARCHAR}, - imei = #{record.imei,jdbcType=VARCHAR}, - isp_type = #{record.ispType,jdbcType=VARCHAR}, - net_type = #{record.netType,jdbcType=VARCHAR}, - model = #{record.model,jdbcType=VARCHAR}, - device_id = #{record.deviceId,jdbcType=VARCHAR}, - app_version = #{record.appVersion,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=TIMESTAMP} - - - - - - update account_login_record - - - `uid` = #{uid,jdbcType=BIGINT}, - - - erban_no = #{erbanNo,jdbcType=BIGINT}, - - - phone = #{phone,jdbcType=VARCHAR}, - - - login_type = #{loginType,jdbcType=TINYINT}, - - - login_ip = #{loginIp,jdbcType=VARCHAR}, - - - login_port = #{loginPort,jdbcType=VARCHAR}, - - - weixin_openid = #{weixinOpenid,jdbcType=VARCHAR}, - - - qq_openid = #{qqOpenid,jdbcType=VARCHAR}, - - - apple_uid = #{appleUid,jdbcType=VARCHAR}, - - - os = #{os,jdbcType=VARCHAR}, - - - osVersion = #{osversion,jdbcType=VARCHAR}, - - - app = #{app,jdbcType=VARCHAR}, - - - imei = #{imei,jdbcType=VARCHAR}, - - - isp_type = #{ispType,jdbcType=VARCHAR}, - - - net_type = #{netType,jdbcType=VARCHAR}, - - - model = #{model,jdbcType=VARCHAR}, - - - device_id = #{deviceId,jdbcType=VARCHAR}, - - - app_version = #{appVersion,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=TIMESTAMP}, - - - where record_id = #{recordId,jdbcType=BIGINT} - - - update account_login_record - set `uid` = #{uid,jdbcType=BIGINT}, - erban_no = #{erbanNo,jdbcType=BIGINT}, - phone = #{phone,jdbcType=VARCHAR}, - login_type = #{loginType,jdbcType=TINYINT}, - login_ip = #{loginIp,jdbcType=VARCHAR}, - login_port = #{loginPort,jdbcType=VARCHAR}, - weixin_openid = #{weixinOpenid,jdbcType=VARCHAR}, - qq_openid = #{qqOpenid,jdbcType=VARCHAR}, - apple_uid = #{appleUid,jdbcType=VARCHAR}, - os = #{os,jdbcType=VARCHAR}, - osVersion = #{osversion,jdbcType=VARCHAR}, - app = #{app,jdbcType=VARCHAR}, - imei = #{imei,jdbcType=VARCHAR}, - isp_type = #{ispType,jdbcType=VARCHAR}, - net_type = #{netType,jdbcType=VARCHAR}, - model = #{model,jdbcType=VARCHAR}, - device_id = #{deviceId,jdbcType=VARCHAR}, - app_version = #{appVersion,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=TIMESTAMP} - where record_id = #{recordId,jdbcType=BIGINT} - - SELECT * from account_login_record where uid = #{uid} ORDER BY create_time DESC limit 1; - select alr.uid, login_ip from account_login_record alr inner join (select `uid`, max(create_time) create_time from account_login_record alr diff --git a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/oauth/AccountLoginRecordMapperExpand.xml b/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/oauth/AccountLoginRecordMapperExpand.xml index 5717d87bd..3e6c0ac50 100644 --- a/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/oauth/AccountLoginRecordMapperExpand.xml +++ b/accompany-base/accompany-basic/accompany-basic-service/src/main/resources/oauth/AccountLoginRecordMapperExpand.xml @@ -1,12 +1,6 @@ - select device_id from account_login_record where uid = #{uid} group by device_id; -