From 5534d692683846932ff76d73cbf8626588014f5b Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 24 Sep 2021 16:22:55 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/UserController.java | 12 +++++++ .../java/com/elink/esua/epdc/dao/UserDao.java | 10 ++++-- .../elink/esua/epdc/service/UserService.java | 13 +++++--- .../epdc/service/impl/UserServiceImpl.java | 33 +++++-------------- .../src/main/resources/mapper/UserDao.xml | 5 +++ 5 files changed, 42 insertions(+), 31 deletions(-) diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java index f479fea..c9b7ab7 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -294,4 +294,16 @@ public class UserController { PageData page = userService.authenticatedpage(params); return new Result>().ok(page); } + + /** + * @describe: 通过手机号获取用户信息 + * @author wangtong + * @date 2021/9/23 16:39 + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getUserByMobile") + public Result getUserByMobile( String mobile) { + return userService.getUserByMobile(mobile); + } } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java index 2373c48..8f13aa8 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -20,7 +20,6 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.CachingUserInfoDTO; import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcAppQueryUserInfoFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcWorkUserFromDTO; @@ -249,5 +248,12 @@ public interface UserDao extends BaseDao { */ List selectWaitAuthenticatedListUserDto(Map params); - + /** + * @describe: 通过手机号获取用户信息 + * @author wangtong + * @date 2021/9/23 16:39 + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + UserDTO getUserByMobile(@Param("mobile") String mobile); } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java index 489766e..3ae0cea 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -20,10 +20,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.PartyMemberModifyFormDTO; -import com.elink.esua.epdc.dto.PartyMembersDTO; -import com.elink.esua.epdc.dto.CachingUserInfoDTO; -import com.elink.esua.epdc.dto.UserDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.entity.UserEntity; @@ -416,4 +413,12 @@ public interface UserService extends BaseService { */ List authenticatedExport(Map params); + /** + * @describe: 通过手机号获取用户信息 + * @author wangtong + * @date 2021/9/23 16:39 + * @params [dto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getUserByMobile(String mobile); } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index ed09a6b..3dc1e53 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -24,9 +24,9 @@ import com.alibaba.fastjson.JSON; 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.toolkit.SqlHelper; import com.elink.esua.epdc.commons.dynamic.datasource.annotation.DataSource; import com.elink.esua.epdc.commons.mybatis.enums.EpdcDelFlagEnum; -import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.mybatis.utils.DeptEntityUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; @@ -49,22 +49,9 @@ import com.elink.esua.epdc.dao.UserAuthenticateHistoryDao; import com.elink.esua.epdc.dao.UserDao; import com.elink.esua.epdc.datasources.DataSourceNames; import com.elink.esua.epdc.dto.*; -import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; -import com.elink.esua.epdc.dto.epdc.result.*; -import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; -import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.constant.AuthenticatedConsant; -import com.elink.esua.epdc.constant.UserFieldConsant; -import com.elink.esua.epdc.dao.*; -import com.elink.esua.epdc.dto.CachingUserInfoDTO; -import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.epdc.EpdcCompleteAppUserDTO; import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO; +import com.elink.esua.epdc.dto.epdc.UserCarInfoDTO; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.entity.*; @@ -78,12 +65,6 @@ import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.service.*; import com.elink.esua.epdc.util.AppUserUtils; import com.google.common.collect.Lists; -import com.elink.esua.epdc.exception.UserModuleErrorCode; -import com.elink.esua.epdc.feign.AdminFeignClient; -import com.elink.esua.epdc.service.PartyMembersService; -import com.elink.esua.epdc.service.UserGridRelationService; -import com.elink.esua.epdc.service.UserInvitationRecordService; -import com.elink.esua.epdc.service.UserService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -94,10 +75,6 @@ import java.io.File; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.*; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; /** * 用户信息表 @@ -1583,6 +1560,12 @@ public class UserServiceImpl extends BaseServiceImpl implem } } + @Override + public Result getUserByMobile(String mobile) { + UserDTO user = baseDao.getUserByMobile(mobile); + return new Result().ok(user); + } + /** * 用户信息校验 * diff --git a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml index eff21ce..96268bf 100644 --- a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml +++ b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml @@ -672,5 +672,10 @@ WHERE 1 = 1 ORDER BY u.register_time desc + From f045b57d5c3b2441990251f31b1b0e1bc816e683 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Tue, 28 Sep 2021 17:43:47 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BA=AE=E8=BA=AB=E4=BB=BD=E6=8E=A8=E8=8D=90?= =?UTF-8?q?sql=E6=9B=B4=E6=96=B0-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epdc-cloud-user/src/main/resources/mapper/UserInfoDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epdc-cloud-user/src/main/resources/mapper/UserInfoDao.xml b/epdc-cloud-user/src/main/resources/mapper/UserInfoDao.xml index f2b1e8c..a10d72b 100644 --- a/epdc-cloud-user/src/main/resources/mapper/UserInfoDao.xml +++ b/epdc-cloud-user/src/main/resources/mapper/UserInfoDao.xml @@ -27,7 +27,7 @@ ui.SERVICE_AREA, ui.RECOMMEND_FLAG FROM epdc_user u - LEFT JOIN epdc_user_info ui ON u.ID = ui.USER_ID + INNER JOIN epdc_user_info ui ON u.ID = ui.USER_ID WHERE u.DEL_FLAG = 0 AND ui.DEL_FLAG = 0 From 9d0ce91242eead3b8b80e6f74475ed4d1fb1a429 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 30 Sep 2021 09:55:17 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/controller/UserController.java | 13 +++++++++++++ .../main/java/com/elink/esua/epdc/dao/UserDao.java | 9 +++++++++ .../com/elink/esua/epdc/service/UserService.java | 9 +++++++++ .../esua/epdc/service/impl/UserServiceImpl.java | 14 ++++++++++++++ .../src/main/resources/mapper/UserDao.xml | 13 +++++++++++++ 5 files changed, 58 insertions(+) diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java index c9b7ab7..5f86217 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -306,4 +306,17 @@ public class UserController { public Result getUserByMobile( String mobile) { return userService.getUserByMobile(mobile); } + + /** + * @describe: 志愿组织模块获取用户列表 + * @author wangtong + * @date 2021/9/29 10:33 + * @params [mobile] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("getUserListForVolunteerOrg") + public Result> getUserListForVolunteerOrg(@RequestParam Map params) { + PageData page = userService.getUserListForVolunteerOrg(params); + return new Result>().ok(page); + } } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java index 8f13aa8..81271f4 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -256,4 +256,13 @@ public interface UserDao extends BaseDao { * @return com.elink.esua.epdc.commons.tools.utils.Result */ UserDTO getUserByMobile(@Param("mobile") String mobile); + + /** + * @describe: 志愿组织模块获取用户列表 + * @author wangtong + * @date 2021/9/29 10:35 + * @params [dto] + * @return java.util.List + */ + List getUserListForVolunteerOrg(Map params); } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java index 3ae0cea..948a2bc 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -421,4 +421,13 @@ public interface UserService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result getUserByMobile(String mobile); + + /** + * @describe: 志愿组织模块获取用户列表 + * @author wangtong + * @date 2021/9/29 10:33 + * @params [mobile] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + PageData getUserListForVolunteerOrg(Map params); } diff --git a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 3dc1e53..b971e1e 100644 --- a/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/epdc-cloud-user/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -1566,6 +1566,20 @@ public class UserServiceImpl extends BaseServiceImpl implem return new Result().ok(user); } + @Override + public PageData getUserListForVolunteerOrg(Map params) { + //分页 + IPage page = getPage(params); + //查询 + List list = baseDao.getUserListForVolunteerOrg(params); + return getPageData(list, page.getTotal(), UserDTO.class); +// +// int pageIndex = (dto.getPage() - NumConstant.ONE) * dto.getLimit(); +// dto.setPage(pageIndex); +// List user = baseDao.getUserListForVolunteerOrg(dto); +// return new Result().ok(user); + } + /** * 用户信息校验 * diff --git a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml index 96268bf..323c832 100644 --- a/epdc-cloud-user/src/main/resources/mapper/UserDao.xml +++ b/epdc-cloud-user/src/main/resources/mapper/UserDao.xml @@ -677,5 +677,18 @@ WHERE 1 = 1 where DEL_FLAG='0' and MOBILE=#{mobile} +