From be0f19716047b9a44c901429453acc812e458f10 Mon Sep 17 00:00:00 2001 From: Administrator Date: Fri, 11 Aug 2023 22:35:57 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=90=9C=E7=B4=A2=EF=BC=8C?= =?UTF-8?q?=E5=85=AC=E5=8F=B8=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/constant/WebMasterConstants.java | 5 + .../controller/ClientBusinessController.java | 73 + .../webmaster/entity/ClientBusiness.java | 188 +++ .../entity/ClientBusinessExample.java | 1390 +++++++++++++++++ .../mashibing/webmaster/entity/SmsMenu.java | 3 +- .../mashibing/webmaster/entity/SmsRole.java | 3 +- .../mashibing/webmaster/entity/SmsUser.java | 3 +- .../mapper/ClientBusinessMapper.java | 30 + .../webmaster/mapper/SmsRoleMapper.java | 16 + .../service/ClientBusinessService.java | 24 + .../webmaster/service/SmsRoleService.java | 16 + .../impl/ClientBusinessServiceImpl.java | 36 + .../service/impl/SmsRoleServiceImpl.java | 27 + .../webmaster/vo/ClientBusinessVO.java | 15 + .../src/main/resources/generatorConfig.xml | 7 +- .../resources/mapper/ClientBusinessMapper.xml | 418 +++++ .../static/public/js/client/search.js | 2 +- .../webmaster/mapper/SmsRoleMapperTest.java | 26 + .../service/ClientBusinessServiceTest.java | 30 + 19 files changed, 2305 insertions(+), 7 deletions(-) create mode 100644 beacon-webmaster/src/main/java/com/mashibing/webmaster/controller/ClientBusinessController.java create mode 100644 beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/ClientBusiness.java create mode 100644 beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/ClientBusinessExample.java create mode 100644 beacon-webmaster/src/main/java/com/mashibing/webmaster/mapper/ClientBusinessMapper.java create mode 100644 beacon-webmaster/src/main/java/com/mashibing/webmaster/service/ClientBusinessService.java create mode 100644 beacon-webmaster/src/main/java/com/mashibing/webmaster/service/SmsRoleService.java create mode 100644 beacon-webmaster/src/main/java/com/mashibing/webmaster/service/impl/ClientBusinessServiceImpl.java create mode 100644 beacon-webmaster/src/main/java/com/mashibing/webmaster/service/impl/SmsRoleServiceImpl.java create mode 100644 beacon-webmaster/src/main/java/com/mashibing/webmaster/vo/ClientBusinessVO.java create mode 100644 beacon-webmaster/src/main/resources/mapper/ClientBusinessMapper.xml create mode 100644 beacon-webmaster/src/test/java/com/mashibing/webmaster/mapper/SmsRoleMapperTest.java create mode 100644 beacon-webmaster/src/test/java/com/mashibing/webmaster/service/ClientBusinessServiceTest.java diff --git a/beacon-common/src/main/java/com/mashibing/common/constant/WebMasterConstants.java b/beacon-common/src/main/java/com/mashibing/common/constant/WebMasterConstants.java index a2c08a0..6402760 100644 --- a/beacon-common/src/main/java/com/mashibing/common/constant/WebMasterConstants.java +++ b/beacon-common/src/main/java/com/mashibing/common/constant/WebMasterConstants.java @@ -11,5 +11,10 @@ public interface WebMasterConstants { */ String KAPTCHA = "kaptcha"; + /** + * 管理员角色 + */ + String ROOT = "管理员"; + } diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/controller/ClientBusinessController.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/controller/ClientBusinessController.java new file mode 100644 index 0000000..09cf905 --- /dev/null +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/controller/ClientBusinessController.java @@ -0,0 +1,73 @@ +package com.mashibing.webmaster.controller; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import com.alibaba.druid.util.StringUtils; +import com.mashibing.common.constant.WebMasterConstants; +import com.mashibing.common.enums.ExceptionEnums; +import com.mashibing.common.util.R; +import com.mashibing.common.vo.ResultVO; +import com.mashibing.webmaster.entity.ClientBusiness; +import com.mashibing.webmaster.entity.SmsUser; +import com.mashibing.webmaster.service.ClientBusinessService; +import com.mashibing.webmaster.service.SmsRoleService; +import com.mashibing.webmaster.vo.ClientBusinessVO; +import lombok.extern.slf4j.Slf4j; +import org.apache.shiro.SecurityUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * 客户信息Controller + * @author zjw + * @description + */ +@RestController +@Slf4j +public class ClientBusinessController { + + + @Autowired + private SmsRoleService roleService; + + @Autowired + private ClientBusinessService clientBusinessService; + + + @GetMapping("/sys/clientbusiness/all") + public ResultVO all(){ + //1、拿到当前登录用户的信息 + SmsUser smsUser = (SmsUser) SecurityUtils.getSubject().getPrincipal(); + if(smsUser == null){ + log.info("【获取客户信息】 用户未登录！！"); + return R.error(ExceptionEnums.NOT_LOGIN); + } + Integer userId = smsUser.getId(); + //2、查询当前用户的角色信息 + Set roleNameSet = roleService.getRoleName(userId); + + //3、根据角色信息查询数据即可。 + List list = null; + if(roleNameSet != null && roleNameSet.contains(WebMasterConstants.ROOT)){ + // 查询全部即可 + list = clientBusinessService.findAll(); + }else{ + // 根据用户id查询指定的公司信息 + list = clientBusinessService.findByUserId(userId); + } + List data = new ArrayList<>(); + for (ClientBusiness clientBusiness : list) { + ClientBusinessVO vo = new ClientBusinessVO(); + BeanUtils.copyProperties(clientBusiness,vo); + data.add(vo); + } + //4、响应数据 + return R.ok(data); + } + + +} diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/ClientBusiness.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/ClientBusiness.java new file mode 100644 index 0000000..03ee33a --- /dev/null +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/ClientBusiness.java @@ -0,0 +1,188 @@ +package com.mashibing.webmaster.entity; + +import lombok.ToString; + +import java.util.Date; + +@ToString +public class ClientBusiness { + private Long id; + + private String corpname; + + private String apikey; + + private String ipAddress; + + private Byte isCallback; + + private String callbackUrl; + + private String clientLinkname; + + private String clientPhone; + + private String clientFilters; + + private Date created; + + private Long createId; + + private Date updated; + + private Long updateId; + + private Byte isDelete; + + private String extend1; + + private String extend2; + + private String extend3; + + private String extend4; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getCorpname() { + return corpname; + } + + public void setCorpname(String corpname) { + this.corpname = corpname == null ? null : corpname.trim(); + } + + public String getApikey() { + return apikey; + } + + public void setApikey(String apikey) { + this.apikey = apikey == null ? null : apikey.trim(); + } + + public String getIpAddress() { + return ipAddress; + } + + public void setIpAddress(String ipAddress) { + this.ipAddress = ipAddress == null ? null : ipAddress.trim(); + } + + public Byte getIsCallback() { + return isCallback; + } + + public void setIsCallback(Byte isCallback) { + this.isCallback = isCallback; + } + + public String getCallbackUrl() { + return callbackUrl; + } + + public void setCallbackUrl(String callbackUrl) { + this.callbackUrl = callbackUrl == null ? null : callbackUrl.trim(); + } + + public String getClientLinkname() { + return clientLinkname; + } + + public void setClientLinkname(String clientLinkname) { + this.clientLinkname = clientLinkname == null ? null : clientLinkname.trim(); + } + + public String getClientPhone() { + return clientPhone; + } + + public void setClientPhone(String clientPhone) { + this.clientPhone = clientPhone == null ? null : clientPhone.trim(); + } + + public String getClientFilters() { + return clientFilters; + } + + public void setClientFilters(String clientFilters) { + this.clientFilters = clientFilters == null ? null : clientFilters.trim(); + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public Long getCreateId() { + return createId; + } + + public void setCreateId(Long createId) { + this.createId = createId; + } + + public Date getUpdated() { + return updated; + } + + public void setUpdated(Date updated) { + this.updated = updated; + } + + public Long getUpdateId() { + return updateId; + } + + public void setUpdateId(Long updateId) { + this.updateId = updateId; + } + + public Byte getIsDelete() { + return isDelete; + } + + public void setIsDelete(Byte isDelete) { + this.isDelete = isDelete; + } + + public String getExtend1() { + return extend1; + } + + public void setExtend1(String extend1) { + this.extend1 = extend1 == null ? null : extend1.trim(); + } + + public String getExtend2() { + return extend2; + } + + public void setExtend2(String extend2) { + this.extend2 = extend2 == null ? null : extend2.trim(); + } + + public String getExtend3() { + return extend3; + } + + public void setExtend3(String extend3) { + this.extend3 = extend3 == null ? null : extend3.trim(); + } + + public String getExtend4() { + return extend4; + } + + public void setExtend4(String extend4) { + this.extend4 = extend4 == null ? null : extend4.trim(); + } +} \ No newline at end of file diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/ClientBusinessExample.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/ClientBusinessExample.java new file mode 100644 index 0000000..9bfbccb --- /dev/null +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/ClientBusinessExample.java @@ -0,0 +1,1390 @@ +package com.mashibing.webmaster.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class ClientBusinessExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ClientBusinessExample() { + 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 andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andCorpnameIsNull() { + addCriterion("corpname is null"); + return (Criteria) this; + } + + public Criteria andCorpnameIsNotNull() { + addCriterion("corpname is not null"); + return (Criteria) this; + } + + public Criteria andCorpnameEqualTo(String value) { + addCriterion("corpname =", value, "corpname"); + return (Criteria) this; + } + + public Criteria andCorpnameNotEqualTo(String value) { + addCriterion("corpname <>", value, "corpname"); + return (Criteria) this; + } + + public Criteria andCorpnameGreaterThan(String value) { + addCriterion("corpname >", value, "corpname"); + return (Criteria) this; + } + + public Criteria andCorpnameGreaterThanOrEqualTo(String value) { + addCriterion("corpname >=", value, "corpname"); + return (Criteria) this; + } + + public Criteria andCorpnameLessThan(String value) { + addCriterion("corpname <", value, "corpname"); + return (Criteria) this; + } + + public Criteria andCorpnameLessThanOrEqualTo(String value) { + addCriterion("corpname <=", value, "corpname"); + return (Criteria) this; + } + + public Criteria andCorpnameLike(String value) { + addCriterion("corpname like", value, "corpname"); + return (Criteria) this; + } + + public Criteria andCorpnameNotLike(String value) { + addCriterion("corpname not like", value, "corpname"); + return (Criteria) this; + } + + public Criteria andCorpnameIn(List values) { + addCriterion("corpname in", values, "corpname"); + return (Criteria) this; + } + + public Criteria andCorpnameNotIn(List values) { + addCriterion("corpname not in", values, "corpname"); + return (Criteria) this; + } + + public Criteria andCorpnameBetween(String value1, String value2) { + addCriterion("corpname between", value1, value2, "corpname"); + return (Criteria) this; + } + + public Criteria andCorpnameNotBetween(String value1, String value2) { + addCriterion("corpname not between", value1, value2, "corpname"); + return (Criteria) this; + } + + public Criteria andApikeyIsNull() { + addCriterion("apikey is null"); + return (Criteria) this; + } + + public Criteria andApikeyIsNotNull() { + addCriterion("apikey is not null"); + return (Criteria) this; + } + + public Criteria andApikeyEqualTo(String value) { + addCriterion("apikey =", value, "apikey"); + return (Criteria) this; + } + + public Criteria andApikeyNotEqualTo(String value) { + addCriterion("apikey <>", value, "apikey"); + return (Criteria) this; + } + + public Criteria andApikeyGreaterThan(String value) { + addCriterion("apikey >", value, "apikey"); + return (Criteria) this; + } + + public Criteria andApikeyGreaterThanOrEqualTo(String value) { + addCriterion("apikey >=", value, "apikey"); + return (Criteria) this; + } + + public Criteria andApikeyLessThan(String value) { + addCriterion("apikey <", value, "apikey"); + return (Criteria) this; + } + + public Criteria andApikeyLessThanOrEqualTo(String value) { + addCriterion("apikey <=", value, "apikey"); + return (Criteria) this; + } + + public Criteria andApikeyLike(String value) { + addCriterion("apikey like", value, "apikey"); + return (Criteria) this; + } + + public Criteria andApikeyNotLike(String value) { + addCriterion("apikey not like", value, "apikey"); + return (Criteria) this; + } + + public Criteria andApikeyIn(List values) { + addCriterion("apikey in", values, "apikey"); + return (Criteria) this; + } + + public Criteria andApikeyNotIn(List values) { + addCriterion("apikey not in", values, "apikey"); + return (Criteria) this; + } + + public Criteria andApikeyBetween(String value1, String value2) { + addCriterion("apikey between", value1, value2, "apikey"); + return (Criteria) this; + } + + public Criteria andApikeyNotBetween(String value1, String value2) { + addCriterion("apikey not between", value1, value2, "apikey"); + return (Criteria) this; + } + + public Criteria andIpAddressIsNull() { + addCriterion("ip_address is null"); + return (Criteria) this; + } + + public Criteria andIpAddressIsNotNull() { + addCriterion("ip_address is not null"); + return (Criteria) this; + } + + public Criteria andIpAddressEqualTo(String value) { + addCriterion("ip_address =", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressNotEqualTo(String value) { + addCriterion("ip_address <>", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressGreaterThan(String value) { + addCriterion("ip_address >", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressGreaterThanOrEqualTo(String value) { + addCriterion("ip_address >=", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressLessThan(String value) { + addCriterion("ip_address <", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressLessThanOrEqualTo(String value) { + addCriterion("ip_address <=", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressLike(String value) { + addCriterion("ip_address like", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressNotLike(String value) { + addCriterion("ip_address not like", value, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressIn(List values) { + addCriterion("ip_address in", values, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressNotIn(List values) { + addCriterion("ip_address not in", values, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressBetween(String value1, String value2) { + addCriterion("ip_address between", value1, value2, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIpAddressNotBetween(String value1, String value2) { + addCriterion("ip_address not between", value1, value2, "ipAddress"); + return (Criteria) this; + } + + public Criteria andIsCallbackIsNull() { + addCriterion("is_callback is null"); + return (Criteria) this; + } + + public Criteria andIsCallbackIsNotNull() { + addCriterion("is_callback is not null"); + return (Criteria) this; + } + + public Criteria andIsCallbackEqualTo(Byte value) { + addCriterion("is_callback =", value, "isCallback"); + return (Criteria) this; + } + + public Criteria andIsCallbackNotEqualTo(Byte value) { + addCriterion("is_callback <>", value, "isCallback"); + return (Criteria) this; + } + + public Criteria andIsCallbackGreaterThan(Byte value) { + addCriterion("is_callback >", value, "isCallback"); + return (Criteria) this; + } + + public Criteria andIsCallbackGreaterThanOrEqualTo(Byte value) { + addCriterion("is_callback >=", value, "isCallback"); + return (Criteria) this; + } + + public Criteria andIsCallbackLessThan(Byte value) { + addCriterion("is_callback <", value, "isCallback"); + return (Criteria) this; + } + + public Criteria andIsCallbackLessThanOrEqualTo(Byte value) { + addCriterion("is_callback <=", value, "isCallback"); + return (Criteria) this; + } + + public Criteria andIsCallbackIn(List values) { + addCriterion("is_callback in", values, "isCallback"); + return (Criteria) this; + } + + public Criteria andIsCallbackNotIn(List values) { + addCriterion("is_callback not in", values, "isCallback"); + return (Criteria) this; + } + + public Criteria andIsCallbackBetween(Byte value1, Byte value2) { + addCriterion("is_callback between", value1, value2, "isCallback"); + return (Criteria) this; + } + + public Criteria andIsCallbackNotBetween(Byte value1, Byte value2) { + addCriterion("is_callback not between", value1, value2, "isCallback"); + return (Criteria) this; + } + + public Criteria andCallbackUrlIsNull() { + addCriterion("callback_url is null"); + return (Criteria) this; + } + + public Criteria andCallbackUrlIsNotNull() { + addCriterion("callback_url is not null"); + return (Criteria) this; + } + + public Criteria andCallbackUrlEqualTo(String value) { + addCriterion("callback_url =", value, "callbackUrl"); + return (Criteria) this; + } + + public Criteria andCallbackUrlNotEqualTo(String value) { + addCriterion("callback_url <>", value, "callbackUrl"); + return (Criteria) this; + } + + public Criteria andCallbackUrlGreaterThan(String value) { + addCriterion("callback_url >", value, "callbackUrl"); + return (Criteria) this; + } + + public Criteria andCallbackUrlGreaterThanOrEqualTo(String value) { + addCriterion("callback_url >=", value, "callbackUrl"); + return (Criteria) this; + } + + public Criteria andCallbackUrlLessThan(String value) { + addCriterion("callback_url <", value, "callbackUrl"); + return (Criteria) this; + } + + public Criteria andCallbackUrlLessThanOrEqualTo(String value) { + addCriterion("callback_url <=", value, "callbackUrl"); + return (Criteria) this; + } + + public Criteria andCallbackUrlLike(String value) { + addCriterion("callback_url like", value, "callbackUrl"); + return (Criteria) this; + } + + public Criteria andCallbackUrlNotLike(String value) { + addCriterion("callback_url not like", value, "callbackUrl"); + return (Criteria) this; + } + + public Criteria andCallbackUrlIn(List values) { + addCriterion("callback_url in", values, "callbackUrl"); + return (Criteria) this; + } + + public Criteria andCallbackUrlNotIn(List values) { + addCriterion("callback_url not in", values, "callbackUrl"); + return (Criteria) this; + } + + public Criteria andCallbackUrlBetween(String value1, String value2) { + addCriterion("callback_url between", value1, value2, "callbackUrl"); + return (Criteria) this; + } + + public Criteria andCallbackUrlNotBetween(String value1, String value2) { + addCriterion("callback_url not between", value1, value2, "callbackUrl"); + return (Criteria) this; + } + + public Criteria andClientLinknameIsNull() { + addCriterion("client_linkname is null"); + return (Criteria) this; + } + + public Criteria andClientLinknameIsNotNull() { + addCriterion("client_linkname is not null"); + return (Criteria) this; + } + + public Criteria andClientLinknameEqualTo(String value) { + addCriterion("client_linkname =", value, "clientLinkname"); + return (Criteria) this; + } + + public Criteria andClientLinknameNotEqualTo(String value) { + addCriterion("client_linkname <>", value, "clientLinkname"); + return (Criteria) this; + } + + public Criteria andClientLinknameGreaterThan(String value) { + addCriterion("client_linkname >", value, "clientLinkname"); + return (Criteria) this; + } + + public Criteria andClientLinknameGreaterThanOrEqualTo(String value) { + addCriterion("client_linkname >=", value, "clientLinkname"); + return (Criteria) this; + } + + public Criteria andClientLinknameLessThan(String value) { + addCriterion("client_linkname <", value, "clientLinkname"); + return (Criteria) this; + } + + public Criteria andClientLinknameLessThanOrEqualTo(String value) { + addCriterion("client_linkname <=", value, "clientLinkname"); + return (Criteria) this; + } + + public Criteria andClientLinknameLike(String value) { + addCriterion("client_linkname like", value, "clientLinkname"); + return (Criteria) this; + } + + public Criteria andClientLinknameNotLike(String value) { + addCriterion("client_linkname not like", value, "clientLinkname"); + return (Criteria) this; + } + + public Criteria andClientLinknameIn(List values) { + addCriterion("client_linkname in", values, "clientLinkname"); + return (Criteria) this; + } + + public Criteria andClientLinknameNotIn(List values) { + addCriterion("client_linkname not in", values, "clientLinkname"); + return (Criteria) this; + } + + public Criteria andClientLinknameBetween(String value1, String value2) { + addCriterion("client_linkname between", value1, value2, "clientLinkname"); + return (Criteria) this; + } + + public Criteria andClientLinknameNotBetween(String value1, String value2) { + addCriterion("client_linkname not between", value1, value2, "clientLinkname"); + return (Criteria) this; + } + + public Criteria andClientPhoneIsNull() { + addCriterion("client_phone is null"); + return (Criteria) this; + } + + public Criteria andClientPhoneIsNotNull() { + addCriterion("client_phone is not null"); + return (Criteria) this; + } + + public Criteria andClientPhoneEqualTo(String value) { + addCriterion("client_phone =", value, "clientPhone"); + return (Criteria) this; + } + + public Criteria andClientPhoneNotEqualTo(String value) { + addCriterion("client_phone <>", value, "clientPhone"); + return (Criteria) this; + } + + public Criteria andClientPhoneGreaterThan(String value) { + addCriterion("client_phone >", value, "clientPhone"); + return (Criteria) this; + } + + public Criteria andClientPhoneGreaterThanOrEqualTo(String value) { + addCriterion("client_phone >=", value, "clientPhone"); + return (Criteria) this; + } + + public Criteria andClientPhoneLessThan(String value) { + addCriterion("client_phone <", value, "clientPhone"); + return (Criteria) this; + } + + public Criteria andClientPhoneLessThanOrEqualTo(String value) { + addCriterion("client_phone <=", value, "clientPhone"); + return (Criteria) this; + } + + public Criteria andClientPhoneLike(String value) { + addCriterion("client_phone like", value, "clientPhone"); + return (Criteria) this; + } + + public Criteria andClientPhoneNotLike(String value) { + addCriterion("client_phone not like", value, "clientPhone"); + return (Criteria) this; + } + + public Criteria andClientPhoneIn(List values) { + addCriterion("client_phone in", values, "clientPhone"); + return (Criteria) this; + } + + public Criteria andClientPhoneNotIn(List values) { + addCriterion("client_phone not in", values, "clientPhone"); + return (Criteria) this; + } + + public Criteria andClientPhoneBetween(String value1, String value2) { + addCriterion("client_phone between", value1, value2, "clientPhone"); + return (Criteria) this; + } + + public Criteria andClientPhoneNotBetween(String value1, String value2) { + addCriterion("client_phone not between", value1, value2, "clientPhone"); + return (Criteria) this; + } + + public Criteria andClientFiltersIsNull() { + addCriterion("client_filters is null"); + return (Criteria) this; + } + + public Criteria andClientFiltersIsNotNull() { + addCriterion("client_filters is not null"); + return (Criteria) this; + } + + public Criteria andClientFiltersEqualTo(String value) { + addCriterion("client_filters =", value, "clientFilters"); + return (Criteria) this; + } + + public Criteria andClientFiltersNotEqualTo(String value) { + addCriterion("client_filters <>", value, "clientFilters"); + return (Criteria) this; + } + + public Criteria andClientFiltersGreaterThan(String value) { + addCriterion("client_filters >", value, "clientFilters"); + return (Criteria) this; + } + + public Criteria andClientFiltersGreaterThanOrEqualTo(String value) { + addCriterion("client_filters >=", value, "clientFilters"); + return (Criteria) this; + } + + public Criteria andClientFiltersLessThan(String value) { + addCriterion("client_filters <", value, "clientFilters"); + return (Criteria) this; + } + + public Criteria andClientFiltersLessThanOrEqualTo(String value) { + addCriterion("client_filters <=", value, "clientFilters"); + return (Criteria) this; + } + + public Criteria andClientFiltersLike(String value) { + addCriterion("client_filters like", value, "clientFilters"); + return (Criteria) this; + } + + public Criteria andClientFiltersNotLike(String value) { + addCriterion("client_filters not like", value, "clientFilters"); + return (Criteria) this; + } + + public Criteria andClientFiltersIn(List values) { + addCriterion("client_filters in", values, "clientFilters"); + return (Criteria) this; + } + + public Criteria andClientFiltersNotIn(List values) { + addCriterion("client_filters not in", values, "clientFilters"); + return (Criteria) this; + } + + public Criteria andClientFiltersBetween(String value1, String value2) { + addCriterion("client_filters between", value1, value2, "clientFilters"); + return (Criteria) this; + } + + public Criteria andClientFiltersNotBetween(String value1, String value2) { + addCriterion("client_filters not between", value1, value2, "clientFilters"); + return (Criteria) this; + } + + public Criteria andCreatedIsNull() { + addCriterion("created is null"); + return (Criteria) this; + } + + public Criteria andCreatedIsNotNull() { + addCriterion("created is not null"); + return (Criteria) this; + } + + public Criteria andCreatedEqualTo(Date value) { + addCriterion("created =", value, "created"); + return (Criteria) this; + } + + public Criteria andCreatedNotEqualTo(Date value) { + addCriterion("created <>", value, "created"); + return (Criteria) this; + } + + public Criteria andCreatedGreaterThan(Date value) { + addCriterion("created >", value, "created"); + return (Criteria) this; + } + + public Criteria andCreatedGreaterThanOrEqualTo(Date value) { + addCriterion("created >=", value, "created"); + return (Criteria) this; + } + + public Criteria andCreatedLessThan(Date value) { + addCriterion("created <", value, "created"); + return (Criteria) this; + } + + public Criteria andCreatedLessThanOrEqualTo(Date value) { + addCriterion("created <=", value, "created"); + return (Criteria) this; + } + + public Criteria andCreatedIn(List values) { + addCriterion("created in", values, "created"); + return (Criteria) this; + } + + public Criteria andCreatedNotIn(List values) { + addCriterion("created not in", values, "created"); + return (Criteria) this; + } + + public Criteria andCreatedBetween(Date value1, Date value2) { + addCriterion("created between", value1, value2, "created"); + return (Criteria) this; + } + + public Criteria andCreatedNotBetween(Date value1, Date value2) { + addCriterion("created not between", value1, value2, "created"); + return (Criteria) this; + } + + public Criteria andCreateIdIsNull() { + addCriterion("create_id is null"); + return (Criteria) this; + } + + public Criteria andCreateIdIsNotNull() { + addCriterion("create_id is not null"); + return (Criteria) this; + } + + public Criteria andCreateIdEqualTo(Long value) { + addCriterion("create_id =", value, "createId"); + return (Criteria) this; + } + + public Criteria andCreateIdNotEqualTo(Long value) { + addCriterion("create_id <>", value, "createId"); + return (Criteria) this; + } + + public Criteria andCreateIdGreaterThan(Long value) { + addCriterion("create_id >", value, "createId"); + return (Criteria) this; + } + + public Criteria andCreateIdGreaterThanOrEqualTo(Long value) { + addCriterion("create_id >=", value, "createId"); + return (Criteria) this; + } + + public Criteria andCreateIdLessThan(Long value) { + addCriterion("create_id <", value, "createId"); + return (Criteria) this; + } + + public Criteria andCreateIdLessThanOrEqualTo(Long value) { + addCriterion("create_id <=", value, "createId"); + return (Criteria) this; + } + + public Criteria andCreateIdIn(List values) { + addCriterion("create_id in", values, "createId"); + return (Criteria) this; + } + + public Criteria andCreateIdNotIn(List values) { + addCriterion("create_id not in", values, "createId"); + return (Criteria) this; + } + + public Criteria andCreateIdBetween(Long value1, Long value2) { + addCriterion("create_id between", value1, value2, "createId"); + return (Criteria) this; + } + + public Criteria andCreateIdNotBetween(Long value1, Long value2) { + addCriterion("create_id not between", value1, value2, "createId"); + return (Criteria) this; + } + + public Criteria andUpdatedIsNull() { + addCriterion("updated is null"); + return (Criteria) this; + } + + public Criteria andUpdatedIsNotNull() { + addCriterion("updated is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedEqualTo(Date value) { + addCriterion("updated =", value, "updated"); + return (Criteria) this; + } + + public Criteria andUpdatedNotEqualTo(Date value) { + addCriterion("updated <>", value, "updated"); + return (Criteria) this; + } + + public Criteria andUpdatedGreaterThan(Date value) { + addCriterion("updated >", value, "updated"); + return (Criteria) this; + } + + public Criteria andUpdatedGreaterThanOrEqualTo(Date value) { + addCriterion("updated >=", value, "updated"); + return (Criteria) this; + } + + public Criteria andUpdatedLessThan(Date value) { + addCriterion("updated <", value, "updated"); + return (Criteria) this; + } + + public Criteria andUpdatedLessThanOrEqualTo(Date value) { + addCriterion("updated <=", value, "updated"); + return (Criteria) this; + } + + public Criteria andUpdatedIn(List values) { + addCriterion("updated in", values, "updated"); + return (Criteria) this; + } + + public Criteria andUpdatedNotIn(List values) { + addCriterion("updated not in", values, "updated"); + return (Criteria) this; + } + + public Criteria andUpdatedBetween(Date value1, Date value2) { + addCriterion("updated between", value1, value2, "updated"); + return (Criteria) this; + } + + public Criteria andUpdatedNotBetween(Date value1, Date value2) { + addCriterion("updated not between", value1, value2, "updated"); + return (Criteria) this; + } + + public Criteria andUpdateIdIsNull() { + addCriterion("update_id is null"); + return (Criteria) this; + } + + public Criteria andUpdateIdIsNotNull() { + addCriterion("update_id is not null"); + return (Criteria) this; + } + + public Criteria andUpdateIdEqualTo(Long value) { + addCriterion("update_id =", value, "updateId"); + return (Criteria) this; + } + + public Criteria andUpdateIdNotEqualTo(Long value) { + addCriterion("update_id <>", value, "updateId"); + return (Criteria) this; + } + + public Criteria andUpdateIdGreaterThan(Long value) { + addCriterion("update_id >", value, "updateId"); + return (Criteria) this; + } + + public Criteria andUpdateIdGreaterThanOrEqualTo(Long value) { + addCriterion("update_id >=", value, "updateId"); + return (Criteria) this; + } + + public Criteria andUpdateIdLessThan(Long value) { + addCriterion("update_id <", value, "updateId"); + return (Criteria) this; + } + + public Criteria andUpdateIdLessThanOrEqualTo(Long value) { + addCriterion("update_id <=", value, "updateId"); + return (Criteria) this; + } + + public Criteria andUpdateIdIn(List values) { + addCriterion("update_id in", values, "updateId"); + return (Criteria) this; + } + + public Criteria andUpdateIdNotIn(List values) { + addCriterion("update_id not in", values, "updateId"); + return (Criteria) this; + } + + public Criteria andUpdateIdBetween(Long value1, Long value2) { + addCriterion("update_id between", value1, value2, "updateId"); + return (Criteria) this; + } + + public Criteria andUpdateIdNotBetween(Long value1, Long value2) { + addCriterion("update_id not between", value1, value2, "updateId"); + return (Criteria) this; + } + + public Criteria andIsDeleteIsNull() { + addCriterion("is_delete is null"); + return (Criteria) this; + } + + public Criteria andIsDeleteIsNotNull() { + addCriterion("is_delete is not null"); + return (Criteria) this; + } + + public Criteria andIsDeleteEqualTo(Byte value) { + addCriterion("is_delete =", value, "isDelete"); + return (Criteria) this; + } + + public Criteria andIsDeleteNotEqualTo(Byte value) { + addCriterion("is_delete <>", value, "isDelete"); + return (Criteria) this; + } + + public Criteria andIsDeleteGreaterThan(Byte value) { + addCriterion("is_delete >", value, "isDelete"); + return (Criteria) this; + } + + public Criteria andIsDeleteGreaterThanOrEqualTo(Byte value) { + addCriterion("is_delete >=", value, "isDelete"); + return (Criteria) this; + } + + public Criteria andIsDeleteLessThan(Byte value) { + addCriterion("is_delete <", value, "isDelete"); + return (Criteria) this; + } + + public Criteria andIsDeleteLessThanOrEqualTo(Byte value) { + addCriterion("is_delete <=", value, "isDelete"); + return (Criteria) this; + } + + public Criteria andIsDeleteIn(List values) { + addCriterion("is_delete in", values, "isDelete"); + return (Criteria) this; + } + + public Criteria andIsDeleteNotIn(List values) { + addCriterion("is_delete not in", values, "isDelete"); + return (Criteria) this; + } + + public Criteria andIsDeleteBetween(Byte value1, Byte value2) { + addCriterion("is_delete between", value1, value2, "isDelete"); + return (Criteria) this; + } + + public Criteria andIsDeleteNotBetween(Byte value1, Byte value2) { + addCriterion("is_delete not between", value1, value2, "isDelete"); + return (Criteria) this; + } + + public Criteria andExtend1IsNull() { + addCriterion("extend1 is null"); + return (Criteria) this; + } + + public Criteria andExtend1IsNotNull() { + addCriterion("extend1 is not null"); + return (Criteria) this; + } + + public Criteria andExtend1EqualTo(String value) { + addCriterion("extend1 =", value, "extend1"); + return (Criteria) this; + } + + public Criteria andExtend1NotEqualTo(String value) { + addCriterion("extend1 <>", value, "extend1"); + return (Criteria) this; + } + + public Criteria andExtend1GreaterThan(String value) { + addCriterion("extend1 >", value, "extend1"); + return (Criteria) this; + } + + public Criteria andExtend1GreaterThanOrEqualTo(String value) { + addCriterion("extend1 >=", value, "extend1"); + return (Criteria) this; + } + + public Criteria andExtend1LessThan(String value) { + addCriterion("extend1 <", value, "extend1"); + return (Criteria) this; + } + + public Criteria andExtend1LessThanOrEqualTo(String value) { + addCriterion("extend1 <=", value, "extend1"); + return (Criteria) this; + } + + public Criteria andExtend1Like(String value) { + addCriterion("extend1 like", value, "extend1"); + return (Criteria) this; + } + + public Criteria andExtend1NotLike(String value) { + addCriterion("extend1 not like", value, "extend1"); + return (Criteria) this; + } + + public Criteria andExtend1In(List values) { + addCriterion("extend1 in", values, "extend1"); + return (Criteria) this; + } + + public Criteria andExtend1NotIn(List values) { + addCriterion("extend1 not in", values, "extend1"); + return (Criteria) this; + } + + public Criteria andExtend1Between(String value1, String value2) { + addCriterion("extend1 between", value1, value2, "extend1"); + return (Criteria) this; + } + + public Criteria andExtend1NotBetween(String value1, String value2) { + addCriterion("extend1 not between", value1, value2, "extend1"); + return (Criteria) this; + } + + public Criteria andExtend2IsNull() { + addCriterion("extend2 is null"); + return (Criteria) this; + } + + public Criteria andExtend2IsNotNull() { + addCriterion("extend2 is not null"); + return (Criteria) this; + } + + public Criteria andExtend2EqualTo(String value) { + addCriterion("extend2 =", value, "extend2"); + return (Criteria) this; + } + + public Criteria andExtend2NotEqualTo(String value) { + addCriterion("extend2 <>", value, "extend2"); + return (Criteria) this; + } + + public Criteria andExtend2GreaterThan(String value) { + addCriterion("extend2 >", value, "extend2"); + return (Criteria) this; + } + + public Criteria andExtend2GreaterThanOrEqualTo(String value) { + addCriterion("extend2 >=", value, "extend2"); + return (Criteria) this; + } + + public Criteria andExtend2LessThan(String value) { + addCriterion("extend2 <", value, "extend2"); + return (Criteria) this; + } + + public Criteria andExtend2LessThanOrEqualTo(String value) { + addCriterion("extend2 <=", value, "extend2"); + return (Criteria) this; + } + + public Criteria andExtend2Like(String value) { + addCriterion("extend2 like", value, "extend2"); + return (Criteria) this; + } + + public Criteria andExtend2NotLike(String value) { + addCriterion("extend2 not like", value, "extend2"); + return (Criteria) this; + } + + public Criteria andExtend2In(List values) { + addCriterion("extend2 in", values, "extend2"); + return (Criteria) this; + } + + public Criteria andExtend2NotIn(List values) { + addCriterion("extend2 not in", values, "extend2"); + return (Criteria) this; + } + + public Criteria andExtend2Between(String value1, String value2) { + addCriterion("extend2 between", value1, value2, "extend2"); + return (Criteria) this; + } + + public Criteria andExtend2NotBetween(String value1, String value2) { + addCriterion("extend2 not between", value1, value2, "extend2"); + return (Criteria) this; + } + + public Criteria andExtend3IsNull() { + addCriterion("extend3 is null"); + return (Criteria) this; + } + + public Criteria andExtend3IsNotNull() { + addCriterion("extend3 is not null"); + return (Criteria) this; + } + + public Criteria andExtend3EqualTo(String value) { + addCriterion("extend3 =", value, "extend3"); + return (Criteria) this; + } + + public Criteria andExtend3NotEqualTo(String value) { + addCriterion("extend3 <>", value, "extend3"); + return (Criteria) this; + } + + public Criteria andExtend3GreaterThan(String value) { + addCriterion("extend3 >", value, "extend3"); + return (Criteria) this; + } + + public Criteria andExtend3GreaterThanOrEqualTo(String value) { + addCriterion("extend3 >=", value, "extend3"); + return (Criteria) this; + } + + public Criteria andExtend3LessThan(String value) { + addCriterion("extend3 <", value, "extend3"); + return (Criteria) this; + } + + public Criteria andExtend3LessThanOrEqualTo(String value) { + addCriterion("extend3 <=", value, "extend3"); + return (Criteria) this; + } + + public Criteria andExtend3Like(String value) { + addCriterion("extend3 like", value, "extend3"); + return (Criteria) this; + } + + public Criteria andExtend3NotLike(String value) { + addCriterion("extend3 not like", value, "extend3"); + return (Criteria) this; + } + + public Criteria andExtend3In(List values) { + addCriterion("extend3 in", values, "extend3"); + return (Criteria) this; + } + + public Criteria andExtend3NotIn(List values) { + addCriterion("extend3 not in", values, "extend3"); + return (Criteria) this; + } + + public Criteria andExtend3Between(String value1, String value2) { + addCriterion("extend3 between", value1, value2, "extend3"); + return (Criteria) this; + } + + public Criteria andExtend3NotBetween(String value1, String value2) { + addCriterion("extend3 not between", value1, value2, "extend3"); + return (Criteria) this; + } + + public Criteria andExtend4IsNull() { + addCriterion("extend4 is null"); + return (Criteria) this; + } + + public Criteria andExtend4IsNotNull() { + addCriterion("extend4 is not null"); + return (Criteria) this; + } + + public Criteria andExtend4EqualTo(String value) { + addCriterion("extend4 =", value, "extend4"); + return (Criteria) this; + } + + public Criteria andExtend4NotEqualTo(String value) { + addCriterion("extend4 <>", value, "extend4"); + return (Criteria) this; + } + + public Criteria andExtend4GreaterThan(String value) { + addCriterion("extend4 >", value, "extend4"); + return (Criteria) this; + } + + public Criteria andExtend4GreaterThanOrEqualTo(String value) { + addCriterion("extend4 >=", value, "extend4"); + return (Criteria) this; + } + + public Criteria andExtend4LessThan(String value) { + addCriterion("extend4 <", value, "extend4"); + return (Criteria) this; + } + + public Criteria andExtend4LessThanOrEqualTo(String value) { + addCriterion("extend4 <=", value, "extend4"); + return (Criteria) this; + } + + public Criteria andExtend4Like(String value) { + addCriterion("extend4 like", value, "extend4"); + return (Criteria) this; + } + + public Criteria andExtend4NotLike(String value) { + addCriterion("extend4 not like", value, "extend4"); + return (Criteria) this; + } + + public Criteria andExtend4In(List values) { + addCriterion("extend4 in", values, "extend4"); + return (Criteria) this; + } + + public Criteria andExtend4NotIn(List values) { + addCriterion("extend4 not in", values, "extend4"); + return (Criteria) this; + } + + public Criteria andExtend4Between(String value1, String value2) { + addCriterion("extend4 between", value1, value2, "extend4"); + return (Criteria) this; + } + + public Criteria andExtend4NotBetween(String value1, String value2) { + addCriterion("extend4 not between", value1, value2, "extend4"); + 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/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/SmsMenu.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/SmsMenu.java index 5224d47..520a5b9 100644 --- a/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/SmsMenu.java +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/SmsMenu.java @@ -1,8 +1,9 @@ package com.mashibing.webmaster.entity; +import java.io.Serializable; import java.util.Date; -public class SmsMenu { +public class SmsMenu implements Serializable { private Integer id; private String name; diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/SmsRole.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/SmsRole.java index a271e7d..ff17780 100644 --- a/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/SmsRole.java +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/SmsRole.java @@ -1,8 +1,9 @@ package com.mashibing.webmaster.entity; +import java.io.Serializable; import java.util.Date; -public class SmsRole { +public class SmsRole implements Serializable { private Integer id; private String name; diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/SmsUser.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/SmsUser.java index 1de1d14..701ea69 100644 --- a/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/SmsUser.java +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/entity/SmsUser.java @@ -1,8 +1,9 @@ package com.mashibing.webmaster.entity; +import java.io.Serializable; import java.util.Date; -public class SmsUser { +public class SmsUser implements Serializable { private Integer id; private String username; diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/mapper/ClientBusinessMapper.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/mapper/ClientBusinessMapper.java new file mode 100644 index 0000000..764d670 --- /dev/null +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/mapper/ClientBusinessMapper.java @@ -0,0 +1,30 @@ +package com.mashibing.webmaster.mapper; + +import com.mashibing.webmaster.entity.ClientBusiness; +import com.mashibing.webmaster.entity.ClientBusinessExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ClientBusinessMapper { + long countByExample(ClientBusinessExample example); + + int deleteByExample(ClientBusinessExample example); + + int deleteByPrimaryKey(Long id); + + int insert(ClientBusiness row); + + int insertSelective(ClientBusiness row); + + List selectByExample(ClientBusinessExample example); + + ClientBusiness selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("row") ClientBusiness row, @Param("example") ClientBusinessExample example); + + int updateByExample(@Param("row") ClientBusiness row, @Param("example") ClientBusinessExample example); + + int updateByPrimaryKeySelective(ClientBusiness row); + + int updateByPrimaryKey(ClientBusiness row); +} \ No newline at end of file diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/mapper/SmsRoleMapper.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/mapper/SmsRoleMapper.java index 4cdd5d0..5a3eee6 100644 --- a/beacon-webmaster/src/main/java/com/mashibing/webmaster/mapper/SmsRoleMapper.java +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/mapper/SmsRoleMapper.java @@ -3,7 +3,11 @@ package com.mashibing.webmaster.mapper; import com.mashibing.webmaster.entity.SmsRole; import com.mashibing.webmaster.entity.SmsRoleExample; import java.util.List; +import java.util.Set; + import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Service; public interface SmsRoleMapper { long countByExample(SmsRoleExample example); @@ -27,4 +31,16 @@ public interface SmsRoleMapper { int updateByPrimaryKeySelective(SmsRole row); int updateByPrimaryKey(SmsRole row); + + @Select("select \n" + + "\tname\n" + + "from \n" + + "\tsms_role sr\n" + + "inner join \n" + + "\tsms_user_role sur\n" + + "on\n" + + "\tsr.id = sur.user_id\n" + + "where \n" + + " sur.user_id = #{userId}") + Set findRoleNameByUserId(@Param("userId") Integer userId); } \ No newline at end of file diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/service/ClientBusinessService.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/service/ClientBusinessService.java new file mode 100644 index 0000000..6aefd49 --- /dev/null +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/service/ClientBusinessService.java @@ -0,0 +1,24 @@ +package com.mashibing.webmaster.service; + +import com.mashibing.webmaster.entity.ClientBusiness; + +import java.util.List; + +/** + * @author zjw + * @description + */ +public interface ClientBusinessService { + /** + * 查询全部客户信息 + * @return + */ + List findAll(); + + /** + * 根据用户id查询客户信息 + * @param userId + * @return + */ + List findByUserId(Integer userId); +} diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/service/SmsRoleService.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/service/SmsRoleService.java new file mode 100644 index 0000000..85b207a --- /dev/null +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/service/SmsRoleService.java @@ -0,0 +1,16 @@ +package com.mashibing.webmaster.service; + +import java.util.Set; + +/** + * @author zjw + * @description + */ +public interface SmsRoleService { + /** + * 根据用户id，查询角色名称 + * @param userId + * @return + */ + Set getRoleName(Integer userId); +} diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/service/impl/ClientBusinessServiceImpl.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/service/impl/ClientBusinessServiceImpl.java new file mode 100644 index 0000000..5c53563 --- /dev/null +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/service/impl/ClientBusinessServiceImpl.java @@ -0,0 +1,36 @@ +package com.mashibing.webmaster.service.impl; + +import com.mashibing.webmaster.entity.ClientBusiness; +import com.mashibing.webmaster.entity.ClientBusinessExample; +import com.mashibing.webmaster.mapper.ClientBusinessMapper; +import com.mashibing.webmaster.service.ClientBusinessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @author zjw + * @description + */ +@Service +public class ClientBusinessServiceImpl implements ClientBusinessService { + + @Resource + private ClientBusinessMapper clientBusinessMapper; + + @Override + public List findAll() { + List list = clientBusinessMapper.selectByExample(null); + return list; + } + + @Override + public List findByUserId(Integer userId) { + ClientBusinessExample example = new ClientBusinessExample(); + example.createCriteria().andExtend1EqualTo(userId + ""); + List list = clientBusinessMapper.selectByExample(example); + return list; + } +} diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/service/impl/SmsRoleServiceImpl.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/service/impl/SmsRoleServiceImpl.java new file mode 100644 index 0000000..fd7f1f8 --- /dev/null +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/service/impl/SmsRoleServiceImpl.java @@ -0,0 +1,27 @@ +package com.mashibing.webmaster.service.impl; + +import com.mashibing.webmaster.entity.SmsRoleExample; +import com.mashibing.webmaster.mapper.SmsRoleMapper; +import com.mashibing.webmaster.service.SmsRoleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Set; + +/** + * @author zjw + * @description + */ +@Service +public class SmsRoleServiceImpl implements SmsRoleService { + + @Resource + private SmsRoleMapper roleMapper; + + @Override + public Set getRoleName(Integer userId) { + Set roleNameSet = roleMapper.findRoleNameByUserId(userId); + return roleNameSet; + } +} diff --git a/beacon-webmaster/src/main/java/com/mashibing/webmaster/vo/ClientBusinessVO.java b/beacon-webmaster/src/main/java/com/mashibing/webmaster/vo/ClientBusinessVO.java new file mode 100644 index 0000000..d9fa882 --- /dev/null +++ b/beacon-webmaster/src/main/java/com/mashibing/webmaster/vo/ClientBusinessVO.java @@ -0,0 +1,15 @@ +package com.mashibing.webmaster.vo; + +import lombok.Data; + +/** + * @author zjw + * @description + */ +@Data +public class ClientBusinessVO { + + private Long id; + + private String corpname; +} diff --git a/beacon-webmaster/src/main/resources/generatorConfig.xml b/beacon-webmaster/src/main/resources/generatorConfig.xml index a87cfdd..d8046e0 100644 --- a/beacon-webmaster/src/main/resources/generatorConfig.xml +++ b/beacon-webmaster/src/main/resources/generatorConfig.xml @@ -40,9 +40,10 @@ - -
-
+ + + +
\ No newline at end of file diff --git a/beacon-webmaster/src/main/resources/mapper/ClientBusinessMapper.xml b/beacon-webmaster/src/main/resources/mapper/ClientBusinessMapper.xml new file mode 100644 index 0000000..7a06076 --- /dev/null +++ b/beacon-webmaster/src/main/resources/mapper/ClientBusinessMapper.xml @@ -0,0 +1,418 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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} + + + + + + + + + + + id, corpname, apikey, ip_address, is_callback, callback_url, client_linkname, client_phone, + client_filters, created, create_id, updated, update_id, is_delete, extend1, extend2, + extend3, extend4 + + + + + delete from client_business + where id = #{id,jdbcType=BIGINT} + + + delete from client_business + + + + + + insert into client_business (id, corpname, apikey, + ip_address, is_callback, callback_url, + client_linkname, client_phone, client_filters, + created, create_id, updated, + update_id, is_delete, extend1, + extend2, extend3, extend4 + ) + values (#{id,jdbcType=BIGINT}, #{corpname,jdbcType=VARCHAR}, #{apikey,jdbcType=VARCHAR}, + #{ipAddress,jdbcType=VARCHAR}, #{isCallback,jdbcType=TINYINT}, #{callbackUrl,jdbcType=VARCHAR}, + #{clientLinkname,jdbcType=VARCHAR}, #{clientPhone,jdbcType=VARCHAR}, #{clientFilters,jdbcType=VARCHAR}, + #{created,jdbcType=TIMESTAMP}, #{createId,jdbcType=BIGINT}, #{updated,jdbcType=TIMESTAMP}, + #{updateId,jdbcType=BIGINT}, #{isDelete,jdbcType=TINYINT}, #{extend1,jdbcType=VARCHAR}, + #{extend2,jdbcType=VARCHAR}, #{extend3,jdbcType=VARCHAR}, #{extend4,jdbcType=VARCHAR} + ) + + + insert into client_business + + + id, + + + corpname, + + + apikey, + + + ip_address, + + + is_callback, + + + callback_url, + + + client_linkname, + + + client_phone, + + + client_filters, + + + created, + + + create_id, + + + updated, + + + update_id, + + + is_delete, + + + extend1, + + + extend2, + + + extend3, + + + extend4, + + + + + #{id,jdbcType=BIGINT}, + + + #{corpname,jdbcType=VARCHAR}, + + + #{apikey,jdbcType=VARCHAR}, + + + #{ipAddress,jdbcType=VARCHAR}, + + + #{isCallback,jdbcType=TINYINT}, + + + #{callbackUrl,jdbcType=VARCHAR}, + + + #{clientLinkname,jdbcType=VARCHAR}, + + + #{clientPhone,jdbcType=VARCHAR}, + + + #{clientFilters,jdbcType=VARCHAR}, + + + #{created,jdbcType=TIMESTAMP}, + + + #{createId,jdbcType=BIGINT}, + + + #{updated,jdbcType=TIMESTAMP}, + + + #{updateId,jdbcType=BIGINT}, + + + #{isDelete,jdbcType=TINYINT}, + + + #{extend1,jdbcType=VARCHAR}, + + + #{extend2,jdbcType=VARCHAR}, + + + #{extend3,jdbcType=VARCHAR}, + + + #{extend4,jdbcType=VARCHAR}, + + + + + + update client_business + + + id = #{row.id,jdbcType=BIGINT}, + + + corpname = #{row.corpname,jdbcType=VARCHAR}, + + + apikey = #{row.apikey,jdbcType=VARCHAR}, + + + ip_address = #{row.ipAddress,jdbcType=VARCHAR}, + + + is_callback = #{row.isCallback,jdbcType=TINYINT}, + + + callback_url = #{row.callbackUrl,jdbcType=VARCHAR}, + + + client_linkname = #{row.clientLinkname,jdbcType=VARCHAR}, + + + client_phone = #{row.clientPhone,jdbcType=VARCHAR}, + + + client_filters = #{row.clientFilters,jdbcType=VARCHAR}, + + + created = #{row.created,jdbcType=TIMESTAMP}, + + + create_id = #{row.createId,jdbcType=BIGINT}, + + + updated = #{row.updated,jdbcType=TIMESTAMP}, + + + update_id = #{row.updateId,jdbcType=BIGINT}, + + + is_delete = #{row.isDelete,jdbcType=TINYINT}, + + + extend1 = #{row.extend1,jdbcType=VARCHAR}, + + + extend2 = #{row.extend2,jdbcType=VARCHAR}, + + + extend3 = #{row.extend3,jdbcType=VARCHAR}, + + + extend4 = #{row.extend4,jdbcType=VARCHAR}, + + + + + + + + update client_business + set id = #{row.id,jdbcType=BIGINT}, + corpname = #{row.corpname,jdbcType=VARCHAR}, + apikey = #{row.apikey,jdbcType=VARCHAR}, + ip_address = #{row.ipAddress,jdbcType=VARCHAR}, + is_callback = #{row.isCallback,jdbcType=TINYINT}, + callback_url = #{row.callbackUrl,jdbcType=VARCHAR}, + client_linkname = #{row.clientLinkname,jdbcType=VARCHAR}, + client_phone = #{row.clientPhone,jdbcType=VARCHAR}, + client_filters = #{row.clientFilters,jdbcType=VARCHAR}, + created = #{row.created,jdbcType=TIMESTAMP}, + create_id = #{row.createId,jdbcType=BIGINT}, + updated = #{row.updated,jdbcType=TIMESTAMP}, + update_id = #{row.updateId,jdbcType=BIGINT}, + is_delete = #{row.isDelete,jdbcType=TINYINT}, + extend1 = #{row.extend1,jdbcType=VARCHAR}, + extend2 = #{row.extend2,jdbcType=VARCHAR}, + extend3 = #{row.extend3,jdbcType=VARCHAR}, + extend4 = #{row.extend4,jdbcType=VARCHAR} + + + + + + update client_business + + + corpname = #{corpname,jdbcType=VARCHAR}, + + + apikey = #{apikey,jdbcType=VARCHAR}, + + + ip_address = #{ipAddress,jdbcType=VARCHAR}, + + + is_callback = #{isCallback,jdbcType=TINYINT}, + + + callback_url = #{callbackUrl,jdbcType=VARCHAR}, + + + client_linkname = #{clientLinkname,jdbcType=VARCHAR}, + + + client_phone = #{clientPhone,jdbcType=VARCHAR}, + + + client_filters = #{clientFilters,jdbcType=VARCHAR}, + + + created = #{created,jdbcType=TIMESTAMP}, + + + create_id = #{createId,jdbcType=BIGINT}, + + + updated = #{updated,jdbcType=TIMESTAMP}, + + + update_id = #{updateId,jdbcType=BIGINT}, + + + is_delete = #{isDelete,jdbcType=TINYINT}, + + + extend1 = #{extend1,jdbcType=VARCHAR}, + + + extend2 = #{extend2,jdbcType=VARCHAR}, + + + extend3 = #{extend3,jdbcType=VARCHAR}, + + + extend4 = #{extend4,jdbcType=VARCHAR}, + + + where id = #{id,jdbcType=BIGINT} + + + update client_business + set corpname = #{corpname,jdbcType=VARCHAR}, + apikey = #{apikey,jdbcType=VARCHAR}, + ip_address = #{ipAddress,jdbcType=VARCHAR}, + is_callback = #{isCallback,jdbcType=TINYINT}, + callback_url = #{callbackUrl,jdbcType=VARCHAR}, + client_linkname = #{clientLinkname,jdbcType=VARCHAR}, + client_phone = #{clientPhone,jdbcType=VARCHAR}, + client_filters = #{clientFilters,jdbcType=VARCHAR}, + created = #{created,jdbcType=TIMESTAMP}, + create_id = #{createId,jdbcType=BIGINT}, + updated = #{updated,jdbcType=TIMESTAMP}, + update_id = #{updateId,jdbcType=BIGINT}, + is_delete = #{isDelete,jdbcType=TINYINT}, + extend1 = #{extend1,jdbcType=VARCHAR}, + extend2 = #{extend2,jdbcType=VARCHAR}, + extend3 = #{extend3,jdbcType=VARCHAR}, + extend4 = #{extend4,jdbcType=VARCHAR} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/beacon-webmaster/src/main/resources/static/public/js/client/search.js b/beacon-webmaster/src/main/resources/static/public/js/client/search.js index b088149..ac05223 100644 --- a/beacon-webmaster/src/main/resources/static/public/js/client/search.js +++ b/beacon-webmaster/src/main/resources/static/public/js/client/search.js @@ -86,7 +86,7 @@ var vm = new Vue({ created: function () {// console.log(11) $.get("../sys/clientbusiness/all", function(r){ - vm.sites = r.sites; + vm.sites = r.data; }); } }); \ No newline at end of file diff --git a/beacon-webmaster/src/test/java/com/mashibing/webmaster/mapper/SmsRoleMapperTest.java b/beacon-webmaster/src/test/java/com/mashibing/webmaster/mapper/SmsRoleMapperTest.java new file mode 100644 index 0000000..0c4c10c --- /dev/null +++ b/beacon-webmaster/src/test/java/com/mashibing/webmaster/mapper/SmsRoleMapperTest.java @@ -0,0 +1,26 @@ +package com.mashibing.webmaster.mapper; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.AutoConfigurationPackage; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.Set; + +import static org.junit.Assert.*; + +@SpringBootTest +@RunWith(SpringRunner.class) +public class SmsRoleMapperTest { + + @Autowired + private SmsRoleMapper roleMapper; + + @Test + public void findRoleNameByUserId() { + Set set = roleMapper.findRoleNameByUserId(1); + System.out.println(set); + } +} \ No newline at end of file diff --git a/beacon-webmaster/src/test/java/com/mashibing/webmaster/service/ClientBusinessServiceTest.java b/beacon-webmaster/src/test/java/com/mashibing/webmaster/service/ClientBusinessServiceTest.java new file mode 100644 index 0000000..0df2833 --- /dev/null +++ b/beacon-webmaster/src/test/java/com/mashibing/webmaster/service/ClientBusinessServiceTest.java @@ -0,0 +1,30 @@ +package com.mashibing.webmaster.service; + +import com.mashibing.webmaster.entity.ClientBusiness; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import java.util.List; + +import static org.junit.Assert.*; + +@SpringBootTest +@RunWith(SpringRunner.class) +public class ClientBusinessServiceTest { + + @Autowired + private ClientBusinessService clientBusinessService; + + @Test + public void findAll() { + List list = clientBusinessService.findAll(); + System.out.println(list); + } + + @Test + public void findByUserId() { + } +} \ No newline at end of file