From 6eb4155645d96e812528d1741af2b652aa70f240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Thu, 23 Jul 2020 15:13:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=BF=97=E6=84=BF?= =?UTF-8?q?=E8=80=85=E5=88=97=E8=A1=A8v2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiAppUserController.java | 2 +- .../controller/v2/ApiAppUserV2Controller.java | 16 +++++++ .../esua/epdc/feign/UserFeignClient.java | 13 +++++- .../fallback/UserFeignClientFallback.java | 7 ++- .../esua/epdc/service/AppUserService.java | 13 +++++- .../epdc/service/impl/AppUserServiceImpl.java | 8 +++- .../EpdcAppVolunteerInfoController.java | 3 +- .../v2/EpdcAppVolunteerInfoV2Controller.java | 46 +++++++++++++++++++ .../epdc/service/VolunteerInfoService.java | 12 ++++- .../impl/VolunteerInfoServiceImpl.java | 10 +++- .../resources/mapper/VolunteerInfoDao.xml | 8 ++-- 11 files changed, 124 insertions(+), 14 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/v2/EpdcAppVolunteerInfoV2Controller.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index 1ba2b2d6..36b2c6ae 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -336,7 +336,7 @@ public class ApiAppUserController { * @Date 15:33 2020-05-18 **/ @GetMapping("volunteer/list") - public Result volunteerList(@LoginUser TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { + public Result> volunteerList(@LoginUser TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { ValidatorUtils.validateEntity(dto); return appUserService.listVolunteer(tokenDto, dto); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java index b86e3a5f..dc4cce65 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/v2/ApiAppUserV2Controller.java @@ -7,7 +7,9 @@ import com.elink.esua.epdc.commons.tools.constant.Constant; import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.epdc.form.EpdcAppVolunteerListFormDTO; import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListCountResultDTO; import com.elink.esua.epdc.dto.form.EpdcAppUserRegisterFormDTO; import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO; import com.elink.esua.epdc.dto.result.EpdcAppAuthorizationDTO; @@ -105,4 +107,18 @@ public class ApiAppUserV2Controller { return appUserService.volunteerV2Authenticate(tokenDto, formDto); } + + /*** + * 志愿者列表v2 + * @param tokenDto + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author qushutong + * @date 2020/7/23 13:31 + */ + @GetMapping("volunteer/"+ Constant.VERSION_CONTROL+"/list") + public Result volunteerList(@LoginUser TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return appUserService.listVolunteerV2(tokenDto, dto); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 431263c6..a250467a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -367,6 +367,17 @@ public interface UserFeignClient { @PostMapping(value = "app-user/epdc-app/user/needCachingUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO); + /* + * 志愿者列表 v2 + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:33 2020-05-18 + **/ + @GetMapping("app-user/epdc-app/volunteerinfo/V2/list") + Result listVolunteerV2(EpdcAppVolunteerListFormDTO dto); + + /* * 志愿者列表 * @param dto @@ -375,7 +386,7 @@ public interface UserFeignClient { * @Date 15:33 2020-05-18 **/ @GetMapping("app-user/epdc-app/volunteerinfo/list") - Result listVolunteer(EpdcAppVolunteerListFormDTO dto); + Result> listVolunteer(EpdcAppVolunteerListFormDTO dto); /** * 志愿者添加 V2接口 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index 2b22fc41..bc81a0ec 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -181,10 +181,13 @@ public class UserFeignClientFallback implements UserFeignClient { } @Override - public Result listVolunteer(EpdcAppVolunteerListFormDTO dto) { + public Result listVolunteerV2(EpdcAppVolunteerListFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listVolunteerV2", dto); + } + @Override + public Result> listVolunteer(EpdcAppVolunteerListFormDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listVolunteer", dto); } - @Override public Result insertV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "insertV2VolunteerInfo", dto); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 15e36ba7..88be1c36 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -258,6 +258,17 @@ public interface AppUserService { */ Result getUserWxPhone(EpdcAppUserMaInfoFormDTO formDto); + /* + * 志愿者列表 v2 + * @param tokenDto + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:33 2020-05-18 + **/ + Result listVolunteerV2(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto); + + /* * 志愿者列表 * @param tokenDto @@ -266,7 +277,7 @@ public interface AppUserService { * @Author zhangyong * @Date 15:33 2020-05-18 **/ - Result listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto); + Result> listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto); /** * 志愿者认证 V2接口 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index 75c0ae94..fe9d8dc0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -1443,7 +1443,13 @@ public class AppUserServiceImpl implements AppUserService { } @Override - public Result listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { + public Result listVolunteerV2(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { + dto.setGridId(tokenDto.getGridId()); + return userFeignClient.listVolunteerV2(dto); + } + + @Override + public Result> listVolunteer(TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { dto.setGridId(tokenDto.getGridId()); return userFeignClient.listVolunteer(dto); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java index ea87919e..dd7ef36f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppVolunteerInfoController.java @@ -72,10 +72,11 @@ public class EpdcAppVolunteerInfoController { * @Date 15:08 2020-05-18 **/ @GetMapping("list") - public Result volunteerList(@RequestBody EpdcAppVolunteerListFormDTO dto) { + public Result> volunteerList(@RequestBody EpdcAppVolunteerListFormDTO dto) { return volunteerInfoService.listVolunteer(dto); } + /** * 志愿者添加 V2接口 * diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/v2/EpdcAppVolunteerInfoV2Controller.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/v2/EpdcAppVolunteerInfoV2Controller.java new file mode 100644 index 00000000..c1069a1f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/v2/EpdcAppVolunteerInfoV2Controller.java @@ -0,0 +1,46 @@ +package com.elink.esua.epdc.controller.v2; + +import com.elink.esua.epdc.commons.tools.constant.Constant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.epdc.form.EpdcAppVolunteerListFormDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcCompleteVolunteerInfoFormDTO; +import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListCountResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; +import com.elink.esua.epdc.service.VolunteerInfoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 对移动端开放 + * + * @author wanggongfeng + * @date 2019/9/6 20:31 + */ +@RestController +@RequestMapping(Constant.EPDC_APP + "volunteerinfo"+Constant.VERSION_CONTROL) +public class EpdcAppVolunteerInfoV2Controller { + @Autowired + private VolunteerInfoService volunteerInfoService; + + /** + * 志愿者列表 v2 + * + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:08 2020-05-18 + **/ + @GetMapping("list") + public Result volunteerListV2(@RequestBody EpdcAppVolunteerListFormDTO dto) { + return volunteerInfoService.listVolunteerV2(dto); + } + + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java index a8a88de3..f51f6ed5 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/VolunteerInfoService.java @@ -209,6 +209,16 @@ public interface VolunteerInfoService extends BaseService { */ Result modifyVolunteerKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto); + /* + * 志愿者列表v2 + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:33 2020-05-18 + **/ + Result listVolunteerV2(EpdcAppVolunteerListFormDTO dto); + + /* * 志愿者列表 * @param dto @@ -216,7 +226,7 @@ public interface VolunteerInfoService extends BaseService { * @Author zhangyong * @Date 15:33 2020-05-18 **/ - Result listVolunteer(EpdcAppVolunteerListFormDTO dto); + Result> listVolunteer(EpdcAppVolunteerListFormDTO dto); /** * 插入一条志愿者数据 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java index 3a3895e9..9578085e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/VolunteerInfoServiceImpl.java @@ -392,7 +392,14 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl listVolunteer(EpdcAppVolunteerListFormDTO dto) { + public Result> listVolunteer(EpdcAppVolunteerListFormDTO dto) { + int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize(); + dto.setPageIndex(pageIndex); + List data = baseDao.selectListVolunteer(dto); + return new Result().ok(data); + } + @Override + public Result listVolunteerV2(EpdcAppVolunteerListFormDTO dto) { int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize(); dto.setPageIndex(pageIndex); List data = baseDao.selectListVolunteer(dto); @@ -401,7 +408,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl insertV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO) { diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml index ce7a0154..481c6856 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/VolunteerInfoDao.xml @@ -225,14 +225,14 @@ LIMIT #{pageIndex},#{pageSize} - SELECT - count (*) as volunteerCount + count(*) AS volunteerCount FROM epdc_volunteer_info v WHERE - v.DEL_FLAG = 0 - AND v.AUDIT_STATUS != 2 + v.DEL_FLAG = 0 + AND v.AUDIT_STATUS != 2