From 759f0adf2cfa852ce6c0e3c9730f2bd4dee041f4 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 12 七月 2024 18:35:36 +0800
Subject: [PATCH] ‘’
---
server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java | 239 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 192 insertions(+), 47 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
index 8eba3c7..7d1c818 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UsersServiceImpl.java
@@ -1,20 +1,43 @@
package com.doumee.service.business.impl;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.config.Jwt.JwtPayLoad;
+import com.doumee.config.Jwt.JwtTokenUtil;
+import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
+import com.doumee.dao.business.ShopMapper;
+import com.doumee.core.wx.WxMiniConfig;
import com.doumee.dao.business.UsersMapper;
+import com.doumee.dao.business.model.Multifile;
+import com.doumee.dao.business.model.News;
+import com.doumee.dao.business.model.Shop;
+import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.Users;
+import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.web.response.AccountResponse;
import com.doumee.service.business.UsersService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import org.apache.catalina.User;
+import org.apache.commons.lang3.StringUtils;
+import me.chanjar.weixin.common.error.WxErrorException;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
+import java.util.Objects;
/**
* 鍛樺伐淇℃伅琛⊿ervice瀹炵幇
@@ -26,6 +49,10 @@
@Autowired
private UsersMapper usersMapper;
+ @Autowired
+ private ShopMapper shopMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
@Override
public Long create(Users users) {
@@ -87,123 +114,159 @@
@Override
public PageData<Users> findPage(PageWrap<Users> pageWrap) {
IPage<Users> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
- QueryWrapper<Users> queryWrapper = new QueryWrapper<>();
+ MPJLambdaWrapper<Users> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.leftJoin(Shop.class,Shop::getId,Users::getDepartmentId)
+ .selectAs(Shop::getNamePath,Users::getShopName)
+ .selectAs(Shop::getType,Users::getShopType)
+ .selectAs(Shop::getSecondType,Users::getShopSecType)
+ .selectAll(Users.class);
Utils.MP.blankToNull(pageWrap.getModel());
if (pageWrap.getModel().getId() != null) {
- queryWrapper.lambda().eq(Users::getId, pageWrap.getModel().getId());
+ queryWrapper.eq(Users::getId, pageWrap.getModel().getId());
}
if (pageWrap.getModel().getCreator() != null) {
- queryWrapper.lambda().eq(Users::getCreator, pageWrap.getModel().getCreator());
+ queryWrapper.eq(Users::getCreator, pageWrap.getModel().getCreator());
}
if (pageWrap.getModel().getCreateDate() != null) {
- queryWrapper.lambda().ge(Users::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
- queryWrapper.lambda().le(Users::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
+ queryWrapper.ge(Users::getCreateDate, Utils.Date.getStart(pageWrap.getModel().getCreateDate()));
+ queryWrapper.le(Users::getCreateDate, Utils.Date.getEnd(pageWrap.getModel().getCreateDate()));
}
if (pageWrap.getModel().getEditor() != null) {
- queryWrapper.lambda().eq(Users::getEditor, pageWrap.getModel().getEditor());
+ queryWrapper.eq(Users::getEditor, pageWrap.getModel().getEditor());
}
if (pageWrap.getModel().getEditDate() != null) {
- queryWrapper.lambda().ge(Users::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
- queryWrapper.lambda().le(Users::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
+ queryWrapper.ge(Users::getEditDate, Utils.Date.getStart(pageWrap.getModel().getEditDate()));
+ queryWrapper.le(Users::getEditDate, Utils.Date.getEnd(pageWrap.getModel().getEditDate()));
}
if (pageWrap.getModel().getIsdeleted() != null) {
- queryWrapper.lambda().eq(Users::getIsdeleted, pageWrap.getModel().getIsdeleted());
+ queryWrapper.eq(Users::getIsdeleted, pageWrap.getModel().getIsdeleted());
}
if (pageWrap.getModel().getRemark() != null) {
- queryWrapper.lambda().eq(Users::getRemark, pageWrap.getModel().getRemark());
+ queryWrapper.eq(Users::getRemark, pageWrap.getModel().getRemark());
}
if (pageWrap.getModel().getDepartmentId() != null) {
- queryWrapper.lambda().eq(Users::getDepartmentId, pageWrap.getModel().getDepartmentId());
+ queryWrapper.eq(Users::getDepartmentId, pageWrap.getModel().getDepartmentId());
}
if (pageWrap.getModel().getImgurl() != null) {
- queryWrapper.lambda().eq(Users::getImgurl, pageWrap.getModel().getImgurl());
+ queryWrapper.eq(Users::getImgurl, pageWrap.getModel().getImgurl());
}
if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(Users::getType, pageWrap.getModel().getType());
+ queryWrapper.eq(Users::getType, pageWrap.getModel().getType());
}
if (pageWrap.getModel().getName() != null) {
- queryWrapper.lambda().eq(Users::getName, pageWrap.getModel().getName());
+ queryWrapper.eq(Users::getName, pageWrap.getModel().getName());
}
if (pageWrap.getModel().getBirthday() != null) {
- queryWrapper.lambda().ge(Users::getBirthday, Utils.Date.getStart(pageWrap.getModel().getBirthday()));
- queryWrapper.lambda().le(Users::getBirthday, Utils.Date.getEnd(pageWrap.getModel().getBirthday()));
+ queryWrapper.ge(Users::getBirthday, Utils.Date.getStart(pageWrap.getModel().getBirthday()));
+ queryWrapper.le(Users::getBirthday, Utils.Date.getEnd(pageWrap.getModel().getBirthday()));
}
if (pageWrap.getModel().getPhone() != null) {
- queryWrapper.lambda().eq(Users::getPhone, pageWrap.getModel().getPhone());
+ queryWrapper.eq(Users::getPhone, pageWrap.getModel().getPhone());
}
if (pageWrap.getModel().getIdcardNo() != null) {
- queryWrapper.lambda().eq(Users::getIdcardNo, pageWrap.getModel().getIdcardNo());
+ queryWrapper.eq(Users::getIdcardNo, pageWrap.getModel().getIdcardNo());
}
if (pageWrap.getModel().getCode() != null) {
- queryWrapper.lambda().eq(Users::getCode, pageWrap.getModel().getCode());
+ queryWrapper.eq(Users::getCode, pageWrap.getModel().getCode());
}
if (pageWrap.getModel().getOpenid() != null) {
- queryWrapper.lambda().eq(Users::getOpenid, pageWrap.getModel().getOpenid());
+ queryWrapper.eq(Users::getOpenid, pageWrap.getModel().getOpenid());
}
if (pageWrap.getModel().getStatus() != null) {
- queryWrapper.lambda().eq(Users::getStatus, pageWrap.getModel().getStatus());
+ queryWrapper.eq(Users::getStatus, pageWrap.getModel().getStatus());
}
if (pageWrap.getModel().getIamStatus() != null) {
- queryWrapper.lambda().eq(Users::getIamStatus, pageWrap.getModel().getIamStatus());
+ queryWrapper.eq(Users::getIamStatus, pageWrap.getModel().getIamStatus());
}
if (pageWrap.getModel().getIamDate() != null) {
- queryWrapper.lambda().ge(Users::getIamDate, Utils.Date.getStart(pageWrap.getModel().getIamDate()));
- queryWrapper.lambda().le(Users::getIamDate, Utils.Date.getEnd(pageWrap.getModel().getIamDate()));
+ queryWrapper.ge(Users::getIamDate, Utils.Date.getStart(pageWrap.getModel().getIamDate()));
+ queryWrapper.le(Users::getIamDate, Utils.Date.getEnd(pageWrap.getModel().getIamDate()));
}
if (pageWrap.getModel().getIamId() != null) {
- queryWrapper.lambda().eq(Users::getIamId, pageWrap.getModel().getIamId());
+ queryWrapper.eq(Users::getIamId, pageWrap.getModel().getIamId());
}
if (pageWrap.getModel().getIamUsername() != null) {
- queryWrapper.lambda().eq(Users::getIamUsername, pageWrap.getModel().getIamUsername());
+ queryWrapper.like(Users::getIamUsername, pageWrap.getModel().getIamUsername());
}
if (pageWrap.getModel().getPassword() != null) {
- queryWrapper.lambda().eq(Users::getPassword, pageWrap.getModel().getPassword());
+ queryWrapper.eq(Users::getPassword, pageWrap.getModel().getPassword());
}
if (pageWrap.getModel().getSex() != null) {
- queryWrapper.lambda().eq(Users::getSex, pageWrap.getModel().getSex());
+ queryWrapper.eq(Users::getSex, pageWrap.getModel().getSex());
}
if (pageWrap.getModel().getLastLoginDate() != null) {
- queryWrapper.lambda().ge(Users::getLastLoginDate, Utils.Date.getStart(pageWrap.getModel().getLastLoginDate()));
- queryWrapper.lambda().le(Users::getLastLoginDate, Utils.Date.getEnd(pageWrap.getModel().getLastLoginDate()));
+ queryWrapper.ge(Users::getLastLoginDate, Utils.Date.getStart(pageWrap.getModel().getLastLoginDate()));
+ queryWrapper.le(Users::getLastLoginDate, Utils.Date.getEnd(pageWrap.getModel().getLastLoginDate()));
}
if (pageWrap.getModel().getLoginNum() != null) {
- queryWrapper.lambda().eq(Users::getLoginNum, pageWrap.getModel().getLoginNum());
+ queryWrapper.eq(Users::getLoginNum, pageWrap.getModel().getLoginNum());
}
if (pageWrap.getModel().getLastLoginPlat() != null) {
- queryWrapper.lambda().eq(Users::getLastLoginPlat, pageWrap.getModel().getLastLoginPlat());
+ queryWrapper.eq(Users::getLastLoginPlat, pageWrap.getModel().getLastLoginPlat());
}
if (pageWrap.getModel().getCostomerNum() != null) {
- queryWrapper.lambda().eq(Users::getCostomerNum, pageWrap.getModel().getCostomerNum());
+ queryWrapper.eq(Users::getCostomerNum, pageWrap.getModel().getCostomerNum());
}
if (pageWrap.getModel().getJobDate() != null) {
- queryWrapper.lambda().eq(Users::getJobDate, pageWrap.getModel().getJobDate());
+ queryWrapper.eq(Users::getJobDate, pageWrap.getModel().getJobDate());
}
if (pageWrap.getModel().getSlogans() != null) {
- queryWrapper.lambda().eq(Users::getSlogans, pageWrap.getModel().getSlogans());
+ queryWrapper.eq(Users::getSlogans, pageWrap.getModel().getSlogans());
}
if (pageWrap.getModel().getQrcodeImg() != null) {
- queryWrapper.lambda().eq(Users::getQrcodeImg, pageWrap.getModel().getQrcodeImg());
+ queryWrapper.eq(Users::getQrcodeImg, pageWrap.getModel().getQrcodeImg());
}
if (pageWrap.getModel().getEmail() != null) {
- queryWrapper.lambda().eq(Users::getEmail, pageWrap.getModel().getEmail());
+ queryWrapper.eq(Users::getEmail, pageWrap.getModel().getEmail());
}
if (pageWrap.getModel().getUserTypes() != null) {
- queryWrapper.lambda().eq(Users::getUserTypes, pageWrap.getModel().getUserTypes());
+ queryWrapper.eq(Users::getUserTypes, pageWrap.getModel().getUserTypes());
}
if (pageWrap.getModel().getRoleIds() != null) {
- queryWrapper.lambda().eq(Users::getRoleIds, pageWrap.getModel().getRoleIds());
+ queryWrapper.eq(Users::getRoleIds, pageWrap.getModel().getRoleIds());
}
- if (pageWrap.getModel().getRoleNames() != null) {
- queryWrapper.lambda().eq(Users::getRoleNames, pageWrap.getModel().getRoleNames());
+ if (StringUtils.isNotBlank(pageWrap.getModel().getRoleNames() )) {
+ queryWrapper.eq(Users::getRoleNames, pageWrap.getModel().getRoleNames());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ if (StringUtils.isNotBlank(pageWrap.getModel().getShopName() )) {
+ queryWrapper.eq(Shop::getName, pageWrap.getModel().getShopName());
+ }
+ queryWrapper.eq(pageWrap.getModel().getShopType()!=null,Shop::getType,pageWrap.getModel().getShopType());
+ queryWrapper.eq(pageWrap.getModel().getShopSecType()!=null,Shop::getSecondType,pageWrap.getModel().getShopSecType());
+ if(StringUtils.isNotBlank(pageWrap.getModel().getQueryKeyword())){
+ queryWrapper.and(w ->{
+ w.eq(Users::getName,pageWrap.getModel().getQueryKeyword())
+ .or().eq(Users::getPhone,pageWrap.getModel().getQueryKeyword())
+ .or().eq(Users::getCode,pageWrap.getModel().getQueryKeyword())
+ ;
+ } );
+ }
+ if(pageWrap.getModel().getIamOrgId()!=null){
+ if(pageWrap.getModel().getIncludeChild()!=null &&pageWrap.getModel().getIncludeChild() ){
+ //濡傛灉鍖呭惈涓嬬骇缁勭粐
+ Shop shop = shopMapper.selectOne(new QueryWrapper<Shop>().lambda().eq(Shop::getOrgId,pageWrap.getModel().getIamOrgId()).last("limit 1"));//鏌ヨ缁勭粐淇℃伅
+ queryWrapper.likeRight(Shop::getIdPath,shop.getIdPath());
+ }else{
+ //涓嶅寘鍚笅绾х粍缁�
+ queryWrapper.eq(Shop::getOrgId,pageWrap.getModel().getIamOrgId());
}
}
- return PageData.from(usersMapper.selectPage(page, queryWrapper));
+
+ PageData<Users> pageData = PageData.from(usersMapper.selectJoinPage(page,Users.class, queryWrapper));
+ if(pageData!=null && pageData.getRecords()!=null && pageData.getRecords().size()>0){
+ String path = systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.RESOURCE_PATH ).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OBJCET_STORAGE,Constants.USERS_FILE ).getCode();
+ for(Users f : pageData.getRecords()){
+ if(StringUtils.isNotBlank(f.getImgurl())){
+ f.setImgurlFull(path + f.getImgurl());
+ }
+ if(StringUtils.isNotBlank(f.getQrcodeImg())){
+ f.setQrcodeImgFull(path + f.getQrcodeImg());
+ }
+ }
+
+ }
+ return pageData;
}
@Override
@@ -211,4 +274,86 @@
QueryWrapper<Users> wrapper = new QueryWrapper<>(users);
return usersMapper.selectCount(wrapper);
}
+
+
+ @Override
+ public AccountResponse phoneLogin(String phone,String code){
+ if(StringUtils.isEmpty(phone)||StringUtils.isEmpty(code)){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Users users = usersMapper.selectOne(new QueryWrapper<Users>().lambda().eq(Users::getPhone,phone).last("limit 1"));
+ if(Objects.isNull(users)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌璐︽埛淇℃伅");
+ }
+ if(!Constants.equalsInteger(users.getIsdeleted(), Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璐︽埛宸插垹闄�");
+ }
+ if(!StringUtils.equals(users.getStatus(),Constants.ZERO+"")){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璐︽埛宸插仠鐢紝璇疯仈绯荤鐞嗗憳");
+ }
+ //TODO 楠岃瘉鐭俊淇℃伅
+ if(!StringUtils.equals(code,"123456")){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"楠岃瘉鐮侀敊璇�");
+ }
+ //鍒涘缓token
+ JwtPayLoad payLoad = new JwtPayLoad(users.getId(),Constants.ONE);
+ String token = JwtTokenUtil.generateToken(payLoad);
+ AccountResponse accountResponse = new AccountResponse();
+ accountResponse.setToken(token);
+ accountResponse.setUsers(users);
+ return accountResponse;
+ }
+
+ @Override
+ public AccountResponse wxLogin(String code){
+ try {
+ //鑾峰彇寰俊鏁忔劅鏁版嵁
+ WxMaJscode2SessionResult session = WxMiniConfig.wxPersonnelService.getUserService().getSessionInfo(code);
+ String openId = session.getOpenid();
+ if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
+ }
+ AccountResponse accountResponse = new AccountResponse();
+ accountResponse.setSessionKey(session.getSessionKey());
+ Users users = usersMapper.selectOne(new QueryWrapper<Users>().lambda().eq(Users::getOpenid,openId).last("limit 1"));
+ if(Objects.isNull(users)){
+ return accountResponse;
+ }
+ if(!Constants.equalsInteger(users.getIsdeleted(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璐︽埛宸插垹闄�");
+ }
+ if(!StringUtils.equals(users.getStatus(),Constants.ZERO+"")){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠璐︽埛宸插仠鐢紝璇疯仈绯荤鐞嗗憳");
+ }
+ //鍒涘缓token
+ JwtPayLoad payLoad = new JwtPayLoad(users.getId(),Constants.ONE);
+ String token = JwtTokenUtil.generateToken(payLoad);
+ accountResponse.setToken(token);
+ accountResponse.setUsers(users);
+ return accountResponse;
+ } catch (WxErrorException e) {
+ e.printStackTrace();
+ }
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"寰俊鐧诲綍寮傚父锛佽鑱旂郴绠＄悊鍛�");
+ }
+
+
+ @Override
+ public void bindingOpenid(String code,Long userId){
+ try {
+ //鑾峰彇寰俊鏁忔劅鏁版嵁
+ WxMaJscode2SessionResult session = WxMiniConfig.wxPersonnelService.getUserService().getSessionInfo(code);
+ String openId = session.getOpenid();
+ if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(openId)) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鑾峰彇openid澶辫触锛佽鑱旂郴绠＄悊鍛�");
+ }
+ usersMapper.update(new UpdateWrapper<Users>().lambda().set(Users::getOpenid,null).eq(Users::getOpenid,openId));
+ Users users = usersMapper.selectById(userId);
+ users.setOpenid(openId);
+ users.setEditDate(new Date());
+ usersMapper.updateById(users);
+ } catch (WxErrorException e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.9.3