From c9021afa8f8a42a141540e202687c5b4b3582503 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 25 May 2020 17:23:53 +0800 Subject: [PATCH 01/20] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=20-=20banner?= =?UTF-8?q?=E7=AE=A1=E7=90=86=EF=BC=8C=E9=A1=B5=E9=9D=A2=E9=87=8D=E6=9E=84?= =?UTF-8?q?=EF=BC=8C=E5=8F=8A=E5=BF=97=E6=84=BF=E8=80=85=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/NumConstant.java | 1 + .../esua/epdc/activity/ActBannerDTO.java | 7 +++-- .../controller/ActBannerController.java | 7 +++-- .../modules/activity/dao/ActBannerDao.java | 26 +++++++++++++------ .../activity/entity/ActBannerEntity.java | 6 ++++- .../activity/service/ActBannerService.java | 4 +-- .../service/impl/ActBannerServiceImpl.java | 22 +++++++++++----- .../mapper/activity/ActBannerDao.xml | 21 ++++++++++----- .../resources/mapper/VolunteerInfoDao.xml | 4 +-- 9 files changed, 67 insertions(+), 31 deletions(-) diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java index de7a5042..eec5c228 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java @@ -14,6 +14,7 @@ public interface NumConstant { int TWO = 2; int THREE = 3; int FOUR = 4; + int FIVE = 5; int SIX = 6; int ONE_NEG = -1; diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java index fcf5644e..1bfff225 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/ActBannerDTO.java @@ -98,5 +98,8 @@ public class ActBannerDTO implements Serializable { */ private Date createdTime; - -} \ No newline at end of file + /** + * banner排序 + */ + private String sort; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java index a0a9a2ad..40d0d321 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActBannerController.java @@ -46,7 +46,7 @@ import java.util.Map; @RestController @RequestMapping("actbanner") public class ActBannerController { - + @Autowired private ActBannerService actBannerService; @@ -78,8 +78,7 @@ public class ActBannerController { public Result save(@RequestBody ActBannerDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - actBannerService.save(dto); - return new Result(); + return actBannerService.save(dto); } @PutMapping @@ -104,4 +103,4 @@ public class ActBannerController { ExcelUtils.exportExcelToTarget(response, null, list, ActBannerExcel.class); } -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java index 19006032..d5741774 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java @@ -67,12 +67,22 @@ public interface ActBannerDao extends BaseDao { */ void updateBannerByActId(String actId); - /** - * @Description: 手机端banner查询，根据创建时间 正序排列 - * @Param: [params] - * @return: java.util.List - * @Author: zy - * @Date: 2020-02-08 - */ + /** + * @Description: 手机端banner查询，根据创建时间 正序排列 + * @Param: [params] + * @return: java.util.List + * @Author: zy + * @Date: 2020-02-08 + */ List getAppActBannerlist(Map params); -} \ No newline at end of file + + /** + * 获取已经上架的banner数量 + * + * @param + * @return int + * @Author zhangyong + * @Date 16:47 2020-05-25 + **/ + int getBannerStatusNumber(); +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java index ac696aad..7e895f91 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/entity/ActBannerEntity.java @@ -87,4 +87,8 @@ public class ActBannerEntity extends BaseEpdcEntity { */ private Long deptId; -} \ No newline at end of file + /** + * banner排序 + */ + private String sort; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java index 40b4d88c..63d381ae 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java @@ -77,7 +77,7 @@ public interface ActBannerService extends BaseService { * @author generator * @date 2019-12-19 */ - void save(ActBannerDTO dto); + Result save(ActBannerDTO dto); /** * 默认更新 @@ -130,4 +130,4 @@ public interface ActBannerService extends BaseService { * @since 2020/2/6 21:22 */ void takeOffBannerByActId(String actId); -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java index 4a16fe7b..19559958 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.activity.ActBannerDTO; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; @@ -101,10 +102,13 @@ public class ActBannerServiceImpl extends BaseServiceImpl baseDao.getBannerStatusNumber()) { + updateEntity.setStatus(ActStateConstant.ACT_BANNER_STATUS_GROUNDING); + updateById(updateEntity); + } else { + return new Result().error("Banner上架数量不能超过5条"); + } // 下架 } else if (ActStateConstant.ACT_BANNER_STATUS_GROUNDING.equals(entity.getStatus())) { updateEntity.setStatus(ActStateConstant.ACT_BANNER_STATUS_UNDERCARRIAGE); @@ -115,9 +119,15 @@ public class ActBannerServiceImpl extends BaseServiceImpl baseDao.getBannerStatusNumber()) { + insert(entity); + } else { + return new Result().error("Banner上架数量不能超过5条"); + } + return new Result(); } @Override diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml index 096b6f50..3b655831 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml @@ -21,6 +21,7 @@ + - \ No newline at end of file + + + 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 73ba68b5..6b3201d2 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 @@ -178,8 +178,8 @@ DATE_FORMAT(NOW(),'%Y-%m-%d') generate_date, vi.ID volunteer_id, vi.USER_ID, - eu.FACE_IMG, - eu.NICKNAME, + vi.VOLUNTEER_FACE_IMG as FACE_IMG, + vi.VOLUNTEER_NICKNAME as NICKNAME, eu.PARTY_FLAG, vi.KINDNESS_TIME, vi.PARTICIPATION_NUM From eb7ec3bdbdec139d7977df0fa9f397171ea7bcc9 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 25 May 2020 17:42:37 +0800 Subject: [PATCH 02/20] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=8A=A5=E5=90=8D=20?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=20=E4=B8=8A=E4=BC=A0banner=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/activity/service/impl/ActInfoServiceImpl.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java index db2a4ded..cf255f09 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActInfoServiceImpl.java @@ -128,10 +128,6 @@ public class ActInfoServiceImpl extends BaseServiceImpl Date: Mon, 25 May 2020 18:03:25 +0800 Subject: [PATCH 03/20] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91=EF=BC=8C=E5=BF=97=E6=84=BF=E8=80=85?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=EF=BC=9A=E5=BF=97=E6=84=BF=E8=80=85?= =?UTF-8?q?=E7=AD=BE=E5=90=8D=E6=98=B5=E7=A7=B0/=E5=BF=97=E6=84=BF?= =?UTF-8?q?=E8=80=85=E5=A4=B4=E5=83=8F/=E5=BF=97=E6=84=BF=E8=80=85?= =?UTF-8?q?=E7=AD=BE=E5=90=8D=20=20=20=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiAppUserController.java | 14 +++++++++ .../esua/epdc/feign/UserFeignClient.java | 10 ++++++ .../fallback/UserFeignClientFallback.java | 5 +++ .../esua/epdc/service/AppUserService.java | 10 ++++++ .../epdc/service/impl/AppUserServiceImpl.java | 10 +++--- .../elink/esua/epdc/dto/VolunteerInfoDTO.java | 17 +++++++++- .../form/EpdcAppVolunteerListFormDTO.java | 27 ++++++++++++++++ .../result/EpdcAppVolunteerListResultDTO.java | 31 +++++++++++++++++++ .../EpdcAppVolunteerInfoController.java | 14 ++++++++- .../elink/esua/epdc/dao/VolunteerInfoDao.java | 11 +++++++ .../esua/epdc/entity/VolunteerInfoEntity.java | 16 +++++++++- .../epdc/service/VolunteerInfoService.java | 11 +++++++ .../impl/VolunteerInfoServiceImpl.java | 9 ++++++ .../resources/mapper/VolunteerInfoDao.xml | 17 ++++++++++ 14 files changed, 195 insertions(+), 7 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppVolunteerListResultDTO.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 6843aeb5..73682fcb 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 @@ -6,6 +6,7 @@ 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.*; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO; @@ -328,4 +329,17 @@ public class ApiAppUserController { ValidatorUtils.validateEntity(formDto); return appUserService.getUserWxPhone(formDto); } + + /* + * 志愿者列表 + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:33 2020-05-18 + **/ + @GetMapping("volunteer/list") + public Result> volunteerList(EpdcAppVolunteerListFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return appUserService.listVolunteer(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 0b49de4d..b24d0f18 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,4 +367,14 @@ public interface UserFeignClient { */ @PostMapping(value = "app-user/epdc-app/user/needCachingUserInfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO); + + /* + * 志愿者列表 + * @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/list") + Result> listVolunteer(EpdcAppVolunteerListFormDTO dto); } 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 cd942c73..568a0ea6 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 @@ -180,4 +180,9 @@ public class UserFeignClientFallback implements UserFeignClient { public Result needCachingUserInfo(EpdcAppQueryUserInfoFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "needCachingUserInfo", formDTO); } + + @Override + public Result> listVolunteer(EpdcAppVolunteerListFormDTO dto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "listVolunteer", 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 ef9ce9f4..f84435b0 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 @@ -3,6 +3,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.*; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO; @@ -258,4 +259,13 @@ public interface AppUserService { * @date 2020/2/20 17:24 */ Result getUserWxPhone(EpdcAppUserMaInfoFormDTO formDto); + + /* + * 志愿者列表 + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:33 2020-05-18 + **/ + Result> listVolunteer(EpdcAppVolunteerListFormDTO dto); } 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 79cd6cd7..90208211 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 @@ -24,10 +24,7 @@ import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterFormDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.*; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; -import com.elink.esua.epdc.dto.epdc.result.UserInvitationRecordResultDTO; +import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.dto.form.*; import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO; import com.elink.esua.epdc.dto.group.form.GroupUserFormDTO; @@ -1415,4 +1412,9 @@ public class AppUserServiceImpl implements AppUserService { } return new Result().ok(authorizationDto); } + + @Override + public Result> listVolunteer(EpdcAppVolunteerListFormDTO dto) { + return userFeignClient.listVolunteer(dto); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java index b66da6c4..1dca804e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java @@ -196,4 +196,19 @@ public class VolunteerInfoDTO implements Serializable { * 志愿者注册时间 */ private String registTimeString; -} \ No newline at end of file + + /** + * 志愿者签名昵称 + */ + private String volunteerNickname; + + /** + * 志愿者头像 + */ + private String volunteerFaceImg; + + /** + * 志愿者签名 + */ + private String volunteerSignature; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java new file mode 100644 index 00000000..a8f85884 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java @@ -0,0 +1,27 @@ +package com.elink.esua.epdc.dto.epdc.form; + +import lombok.Data; + +import javax.validation.constraints.Min; + +/** + * 志愿者列表 + * + * @author zhangyong + * @since v1.0.0 2020-05-18 + */ +@Data +public class EpdcAppVolunteerListFormDTO { + + /** + * 页码 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量 + */ + @Min(value = 1, message = "页容量必须大于0") + private Integer pageSize; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppVolunteerListResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppVolunteerListResultDTO.java new file mode 100644 index 00000000..d98014d8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppVolunteerListResultDTO.java @@ -0,0 +1,31 @@ +package com.elink.esua.epdc.dto.epdc.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 移动端接口-志愿者列表接口返回值 + * @Author zhangyong + * @Date 2020-05-18 + */ +@Data +public class EpdcAppVolunteerListResultDTO implements Serializable { + + private static final long serialVersionUID = 3908231797102233188L; + + /** + * 志愿者ID + */ + private String id; + + /** + * 用户昵称 + */ + private String nickname; + + /** + * 头像 + */ + private String faceImg; +} 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 99306f05..e2a59ad3 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 @@ -5,7 +5,9 @@ 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.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; @@ -60,6 +62,16 @@ public class EpdcAppVolunteerInfoController { return volunteerInfoService.getRankingList(); } - + /** + * 志愿者列表 + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:08 2020-05-18 + **/ + @GetMapping("list") + public Result> volunteerList(@RequestBody EpdcAppVolunteerListFormDTO dto) { + return volunteerInfoService.listVolunteer(dto); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java index ad70599b..57189782 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java @@ -20,8 +20,10 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.UserTagDTO; import com.elink.esua.epdc.dto.VolunteerInfoDTO; +import com.elink.esua.epdc.dto.epdc.form.EpdcAppVolunteerListFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; import com.elink.esua.epdc.entity.VolunteerInfoEntity; import org.apache.ibatis.annotations.Mapper; @@ -128,4 +130,13 @@ public interface VolunteerInfoDao extends BaseDao { * @since 2020/2/7 18:34 */ void updateVolunteerKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto); + + /** + * 志愿者列表 + * @param dto + * @return java.util.List + * @Author zhangyong + * @Date 15:08 2020-05-18 + **/ + List selectListVolunteer(EpdcAppVolunteerListFormDTO dto); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java index 6d331802..a7221948 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java @@ -134,4 +134,18 @@ public class VolunteerInfoEntity extends DeptScope { */ private Long auditor; -} \ No newline at end of file + /** + * 志愿者签名昵称 + */ + private String volunteerNickname; + + /** + * 志愿者头像 + */ + private String volunteerFaceImg; + + /** + * 志愿者签名 + */ + private String volunteerSignature; +} 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 4f02ec83..ceb66f39 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 @@ -22,9 +22,11 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.UserTagDTO; import com.elink.esua.epdc.dto.VolunteerInfoDTO; +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.EpdcVolunteerKindnessTimeFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; import com.elink.esua.epdc.entity.VolunteerInfoEntity; @@ -204,4 +206,13 @@ public interface VolunteerInfoService extends BaseService { * @since 2020/2/7 18:37 */ Result modifyVolunteerKindnessTime(EpdcVolunteerKindnessTimeFormDTO formDto); + + /* + * 志愿者列表 + * @param dto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:33 2020-05-18 + **/ + 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 7156605c..067dcbc4 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 @@ -36,10 +36,12 @@ import com.elink.esua.epdc.dao.VolunteerInfoDao; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.UserTagDTO; import com.elink.esua.epdc.dto.VolunteerInfoDTO; +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.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; import com.elink.esua.epdc.entity.VolunteerInfoEntity; import com.elink.esua.epdc.feign.AdminFeignClient; @@ -386,4 +388,11 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl> listVolunteer(EpdcAppVolunteerListFormDTO dto) { + int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize(); + dto.setPageIndex(pageIndex); + List data = baseDao.selectListVolunteer(dto); + return new Result().ok(data); + } } 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 6b3201d2..6958cb75 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 @@ -34,6 +34,9 @@ + + + @@ -206,4 +209,18 @@ USER_ID = #{userId} AND DEL_FLAG = '0' + + From 46175d1865674c65d983b025634533df623e0c0d Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 26 May 2020 09:31:39 +0800 Subject: [PATCH 04/20] =?UTF-8?q?Banner=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=20-=20=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiActBannerController.java | 41 +++++++++++++++ .../esua/epdc/feign/ActBannerFeignClient.java | 32 ++++++++++++ .../ActBannerFeignClientFallback.java | 25 +++++++++ .../esua/epdc/service/ActBannerService.java | 26 ++++++++++ .../service/impl/ActBannerServiceImpl.java | 23 ++++++++ .../form/EpdcAppActBannerFormDTO.java | 30 +++++++++++ .../result/EpdcAppActBannerResultDTO.java | 27 ++++++++++ .../controller/EpdcActBannerController.java | 52 +++++++++++++++++++ .../modules/activity/dao/ActBannerDao.java | 12 +++++ .../activity/service/ActBannerService.java | 12 +++++ .../service/impl/ActBannerServiceImpl.java | 10 ++++ .../mapper/activity/ActBannerDao.xml | 12 +++++ 12 files changed, 302 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActBannerController.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActBannerFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActBannerFeignClientFallback.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActBannerService.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActBannerServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppActBannerFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/EpdcAppActBannerResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/EpdcActBannerController.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActBannerController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActBannerController.java new file mode 100644 index 00000000..b639fe2d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActBannerController.java @@ -0,0 +1,41 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO; +import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.service.ActBannerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * APP 活动Banner相关接口 + * + * @author zhangyong + * @date 2020/05/25 18:30 + */ +@RestController +@RequestMapping("heart/actbanner") +public class ApiActBannerController { + + @Autowired + private ActBannerService actBannerService; + + /** + * 获取上架的banner列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 18:27 2020-05-25 + **/ + @GetMapping("banner/list") + public Result> bannerList(EpdcAppActBannerFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return actBannerService.getBannerList(formDto); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActBannerFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActBannerFeignClient.java new file mode 100644 index 00000000..8775e71f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActBannerFeignClient.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.feign; + +import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO; +import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO; +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.feign.fallback.ActBannerFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.List; + +/** + * Banner-移动app端 + * @Author zhangyong + * @Date 18:27 2020-05-25 + */ +@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = ActBannerFeignClientFallback.class) +public interface ActBannerFeignClient { + + /** + * 获取上架的banner列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 18:27 2020-05-25 + **/ + @GetMapping(value = "heart/epdc-app/actbanner/banner/list", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> selectBannerList(EpdcAppActBannerFormDTO formDto); +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActBannerFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActBannerFeignClientFallback.java new file mode 100644 index 00000000..e834e5e9 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ActBannerFeignClientFallback.java @@ -0,0 +1,25 @@ +package com.elink.esua.epdc.feign.fallback; + +import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO; +import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO; +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.feign.ActBannerFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Banner-移动app端 + * @Author zhangyong + * @Date 18:27 2020-05-25 + */ +@Component +public class ActBannerFeignClientFallback implements ActBannerFeignClient { + + @Override + public Result> selectBannerList(EpdcAppActBannerFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "selectBannerList", formDto); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActBannerService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActBannerService.java new file mode 100644 index 00000000..d0a4d258 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActBannerService.java @@ -0,0 +1,26 @@ +package com.elink.esua.epdc.service; + +import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO; +import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO; +import com.elink.esua.epdc.commons.tools.utils.Result; + +import java.util.List; + +/** + * APP 活动Banner相关接口 + * + * @author zhangyong + * @date 2020/05/25 18:30 + */ +public interface ActBannerService { + + /** + * 获取上架的banner列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 18:27 2020-05-25 + **/ + Result> getBannerList(EpdcAppActBannerFormDTO formDto); +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActBannerServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActBannerServiceImpl.java new file mode 100644 index 00000000..9808ee05 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActBannerServiceImpl.java @@ -0,0 +1,23 @@ +package com.elink.esua.epdc.service.impl; + +import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO; +import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.feign.ActBannerFeignClient; +import com.elink.esua.epdc.service.ActBannerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class ActBannerServiceImpl implements ActBannerService { + + @Autowired + private ActBannerFeignClient actBannerFeignClient; + + @Override + public Result> getBannerList(EpdcAppActBannerFormDTO formDto) { + return actBannerFeignClient.selectBannerList(formDto); + } +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppActBannerFormDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppActBannerFormDTO.java new file mode 100644 index 00000000..2a3146bd --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/form/EpdcAppActBannerFormDTO.java @@ -0,0 +1,30 @@ +package com.elink.esua.epdc.activity.form; + +import lombok.Data; + +import javax.validation.constraints.Min; +import java.io.Serializable; + +/** + * banner 列表入参 + * + * @author zhangyong + * @since v1.0.0 2020-05-25 + */ +@Data +public class EpdcAppActBannerFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 页码 + */ + @Min(value = 1, message = "页码必须大于0") + private Integer pageIndex; + + /** + * 页容量 + */ + @Min(value = 1, message = "页容量必须大于0") + private Integer pageSize; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/EpdcAppActBannerResultDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/EpdcAppActBannerResultDTO.java new file mode 100644 index 00000000..ca958060 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/result/EpdcAppActBannerResultDTO.java @@ -0,0 +1,27 @@ +package com.elink.esua.epdc.activity.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * banner 列表返回列表 + * + * @author zhangyong + * @since v1.0.0 2020-05-25 + */ +@Data +public class EpdcAppActBannerResultDTO implements Serializable { + + private static final long serialVersionUID = 3908231797102233188L; + + /** + * banner标题 + */ + private String title; + + /** + * banner图片 + */ + private String bannerImg; +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/EpdcActBannerController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/EpdcActBannerController.java new file mode 100644 index 00000000..cbb560ce --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/EpdcActBannerController.java @@ -0,0 +1,52 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.activity.controller; + +import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO; +import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO; +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.modules.activity.service.ActBannerService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +@RestController +@RequestMapping(Constant.EPDC_APP + "actbanner") +public class EpdcActBannerController { + + @Autowired + private ActBannerService actBannerService; + + /** + * 获取上架的banner列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 18:27 2020-05-25 + **/ + @GetMapping("banner/list") + public Result> bannerList(@RequestBody EpdcAppActBannerFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return actBannerService.getBannerList(formDto); + } +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java index d5741774..408fae91 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActBannerDao.java @@ -18,6 +18,8 @@ package com.elink.esua.epdc.modules.activity.dao; import com.elink.esua.epdc.activity.ActBannerDTO; +import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO; +import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.modules.activity.entity.ActBannerEntity; import org.apache.ibatis.annotations.Mapper; @@ -85,4 +87,14 @@ public interface ActBannerDao extends BaseDao { * @Date 16:47 2020-05-25 **/ int getBannerStatusNumber(); + + /** + * 获取上架的banner列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 18:27 2020-05-25 + **/ + List selectListBannerList(EpdcAppActBannerFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java index 63d381ae..b9180038 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActBannerService.java @@ -18,6 +18,8 @@ package com.elink.esua.epdc.modules.activity.service; import com.elink.esua.epdc.activity.ActBannerDTO; +import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO; +import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO; 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; @@ -130,4 +132,14 @@ public interface ActBannerService extends BaseService { * @since 2020/2/6 21:22 */ void takeOffBannerByActId(String actId); + + /** + * 获取上架的banner列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 18:27 2020-05-25 + **/ + Result> getBannerList(EpdcAppActBannerFormDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java index 19559958..6476371d 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActBannerServiceImpl.java @@ -20,6 +20,8 @@ package com.elink.esua.epdc.modules.activity.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.activity.ActBannerDTO; +import com.elink.esua.epdc.activity.form.EpdcAppActBannerFormDTO; +import com.elink.esua.epdc.activity.result.EpdcAppActBannerResultDTO; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; @@ -162,4 +164,12 @@ public class ActBannerServiceImpl extends BaseServiceImpl> getBannerList(EpdcAppActBannerFormDTO formDto) { + int pageIndex = (formDto.getPageIndex() - NumConstant.ONE) * formDto.getPageSize(); + formDto.setPageIndex(pageIndex); + List data = baseDao.selectListBannerList(formDto); + return new Result().ok(data); + } + } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml index 3b655831..75ae833d 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActBannerDao.xml @@ -118,4 +118,16 @@ WHERE b.DEL_FLAG = 0 AND b.`STATUS` = 1 + + From 69aca03ccbe1476fbc76860362d714ee17128e15 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Tue, 26 May 2020 13:53:33 +0800 Subject: [PATCH 05/20] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E9=A1=B5=E9=9D=A2=E3=80=81=E4=B8=AA=E4=BA=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=E3=80=81=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=8F=90=E4=BA=A4=E6=8E=A5=E5=8F=A3v2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v2/ApiAppUserV2Controller.java | 17 +++ .../esua/epdc/feign/UserFeignClient.java | 12 ++ .../fallback/UserFeignClientFallback.java | 6 + .../esua/epdc/service/AppUserService.java | 12 ++ .../epdc/service/impl/AppUserServiceImpl.java | 63 +++++++++ .../elink/esua/epdc/dto/VolunteerInfoDTO.java | 2 +- .../EpdcCompleteVolunteerInfoV2FormDTO.java | 123 ++++++++++++++++++ .../epdc/result/EpdcUserInfoResultDTO.java | 20 +++ .../EpdcAppVolunteerInfoController.java | 16 +++ .../esua/epdc/entity/VolunteerInfoEntity.java | 2 +- .../epdc/service/VolunteerInfoService.java | 10 ++ .../impl/VolunteerInfoServiceImpl.java | 32 +++++ .../src/main/resources/mapper/UserDao.xml | 7 +- 13 files changed, 319 insertions(+), 3 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java 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 e5a2ed91..9145382a 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,6 +7,7 @@ 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.v2.EpdcCompleteVolunteerInfoV2FormDTO; 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; @@ -89,4 +90,20 @@ public class ApiAppUserV2Controller { ValidatorUtils.validateEntity(formDto); return appUserService.completeUserInfo(tokenDto, formDto); } + + /** + * 志愿者认证 V2接口 + * + * @param tokenDto + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 09:49 2020-05-26 + **/ + @PostMapping("volunteer/" + Constant.VERSION_CONTROL + "/authenticate") + public Result volunteerAuthenticate(@LoginUser TokenDto tokenDto, @RequestBody EpdcCompleteVolunteerInfoV2FormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return appUserService.volunteerV2Authenticate(tokenDto, formDto); + + } } 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 b24d0f18..db8b9542 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 @@ -7,6 +7,7 @@ import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.UserWxFormIdDTO; import com.elink.esua.epdc.dto.epdc.form.*; +import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO; import com.elink.esua.epdc.feign.fallback.UserFeignClientFallback; @@ -377,4 +378,15 @@ public interface UserFeignClient { **/ @GetMapping("app-user/epdc-app/volunteerinfo/list") Result> listVolunteer(EpdcAppVolunteerListFormDTO dto); + + /** + * 志愿者添加 V2接口 + * + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 09:49 2020-05-26 + **/ + @PostMapping(value = "app-user/epdc-app/volunteerinfo/v2/insertVolunteerInfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result insertV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO); } 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 568a0ea6..6fd7bd47 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 @@ -8,6 +8,7 @@ import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.UserGridRelationDTO; import com.elink.esua.epdc.dto.UserWxFormIdDTO; import com.elink.esua.epdc.dto.epdc.form.*; +import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.feign.UserFeignClient; import org.springframework.stereotype.Component; @@ -185,4 +186,9 @@ public class UserFeignClientFallback implements UserFeignClient { 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 f84435b0..1c973010 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 @@ -3,6 +3,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.*; +import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserGridResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; @@ -268,4 +269,15 @@ public interface AppUserService { * @Date 15:33 2020-05-18 **/ Result> listVolunteer(EpdcAppVolunteerListFormDTO dto); + + /** + * 志愿者认证 V2接口 + * + * @param tokenDto + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 09:49 2020-05-26 + **/ + Result volunteerV2Authenticate(TokenDto tokenDto, EpdcCompleteVolunteerInfoV2FormDTO formDto); } 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 90208211..8b2251c1 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 @@ -24,6 +24,7 @@ import com.elink.esua.epdc.dto.epdc.EpdcGridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcGridLeaderRegisterFormDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.*; +import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; import com.elink.esua.epdc.dto.epdc.result.*; import com.elink.esua.epdc.dto.form.*; import com.elink.esua.epdc.dto.form.v2.EpdcCompleteUserInfoFormV2DTO; @@ -1417,4 +1418,66 @@ public class AppUserServiceImpl implements AppUserService { public Result> listVolunteer(EpdcAppVolunteerListFormDTO dto) { return userFeignClient.listVolunteer(dto); } + + @Override + public Result volunteerV2Authenticate(TokenDto tokenDto, EpdcCompleteVolunteerInfoV2FormDTO formDto) { + logger.info("志愿者认证wxCode=" + formDto.getWxCode() + ";userId=" + tokenDto.getUserId()); + + if (StringUtils.isNotBlank(formDto.getSmsCode())) { + this.checkSmsCode(formDto.getMobile(), formDto.getSmsCode()); + } + // 是否为志愿者 + boolean volunteerFlag = UserTagUtils.containIdentity(tokenDto.getUserTagInfos(), UserTagEnum.VOLUNTEER); + // 当前是否为党员 + boolean partyFlag = UserTagUtils.containIdentity(tokenDto.getUserTagInfos(), UserTagEnum.PARTY_MEMBER); + // 此次完善信息后是否变为党员 + boolean newPartyFlag = Boolean.FALSE; + + UserDTO user = getUserInfoById(tokenDto.getUserId()); + if (!volunteerFlag) { + // 处理和验证身份证号码 + String identityNo = fixAndCheckIdentityNo(formDto.getIdentityNo()); + String realName = ModuleUtils.replaceIllegalCharacter(formDto.getRealName()); + if (partyFlag) { + // 如果是党员，不再进行完善个人信息处理 + if (!user.getIdentityNo().equals(identityNo) || !user.getRealName().equals(realName)) { + return new Result().error("姓名或身份证号码有误，请核实信息"); + } + } else { + // 非党员，调用用户完善个人信息接口 + EpdcCompleteUserInfoFormV2DTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormV2DTO.class); + // set 党员标识，将志愿者完善信息视为党员完善信息，方便身份证号码唯一校验等操作 + epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.YES.value()); + epdcCompleteUserInfoFormDTO.setUserAuthType(UserAuthTypeEnum.VOLUNTEER_AUTH.value()); + Result result = completeUserInfoCore(tokenDto, epdcCompleteUserInfoFormDTO); + + UserDTO completeUser = result.getData(); + user.setGrid(completeUser.getGrid()); + user.setState(completeUser.getState()); + if (YesOrNoEnum.YES.value().equals(completeUser.getPartyFlag())) { + newPartyFlag = Boolean.TRUE; + } + } + formDto.setSex(IdentityNoUtils.getSex(identityNo)); + formDto.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(identityNo), DateUtils.DATE_PATTERN)); + formDto.setUserId(tokenDto.getUserId()); + formDto.setGridId(tokenDto.getGridId()); + // 新增志愿者 + Result insertCountResult = userFeignClient.insertV2VolunteerInfo(formDto); + if (!insertCountResult.success()) { + return insertCountResult; + } + } + + // 更新用户缓存信息 + Result cachingUserResult = userFeignClient.needCachingUserInfoByUserId(tokenDto.getUserId()); + CachingUserInfoDTO cachingUserInfoDTO = cachingUserResult.getData(); + + EpdcAppAuthorizationDTO authorizationDto = cachingUserInfoForAuthorization(cachingUserInfoDTO, user.getGrid(), user.getState()); + if (!partyFlag && newPartyFlag) { + initPartyGroupInfo(cachingUserInfoDTO); + } + + return new Result().ok(authorizationDto); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java index 1dca804e..c96e068e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/VolunteerInfoDTO.java @@ -198,7 +198,7 @@ public class VolunteerInfoDTO implements Serializable { private String registTimeString; /** - * 志愿者签名昵称 + * 志愿者昵称 */ private String volunteerNickname; diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java new file mode 100644 index 00000000..9eb612f0 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java @@ -0,0 +1,123 @@ +package com.elink.esua.epdc.dto.epdc.form.v2; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.io.Serializable; +import java.util.Date; + +/** + * 移动端完善用户信息 v2接口 + * + * @author zhangyong + * @date 2020/05/26 10:56 + */ +@Data +public class EpdcCompleteVolunteerInfoV2FormDTO implements Serializable { + + private static final long serialVersionUID = 8364421744640317634L; + + /** + * 用户Id + */ + private String userId; + + /** + * 真实姓名 + */ + @NotBlank(message = "真实姓名不能为空") + private String realName; + + /** + * 手机号 + */ + @NotBlank(message = "手机号不能为空") + private String mobile; + + /** + * 短信验证码 + * 移动端决定是否上送验证码。 + */ + private String smsCode; + + /** + * 身份证号码 + */ + @NotBlank(message = "身份证号码不能为空") + private String identityNo; + + /** + * 所在道路 + */ + @NotBlank(message = "所在道路不能为空") + private String road; + + /** + * 小区名 + */ + private String villageName; + + /** + * 住处（楼栋-单元-房间） + */ + private String dwellingPlace; + + /** + * 居住网格id + */ + private Long gridId; + + /** + * 微信code + */ + private String wxCode; + + /** + * 用户信息 + */ + private String encryptedData; + + /** + * 加密算法的初始向量 + */ + private String iv; + + /** + * 自我介绍 + */ + private String introduce; + + /*----------------------志愿者新增所需字段---------------------------*/ + + /** + * 出生日期 + */ + private Date birthday; + + /*----------------------用户认证所需字段-----------------------------*/ + + /** + * 0女，1男 + */ + private String sex; + + /** + * 志愿者昵称 + */ + @Size(min = 1, max = 10, message = "志愿者昵称不能为空,不能超过10字") + private String volunteerNickname; + + /** + * 志愿者头像 + */ + @NotBlank(message = "志愿者头像不能为空") + private String volunteerFaceImg; + + /** + * 志愿者签名 + */ + @Size(min = 1, max = 30, message = "评论内容不能为空,不能超过30字") + private String volunteerSignature; +} + diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java index bb1f0937..6cfc457e 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java @@ -30,4 +30,24 @@ public class EpdcUserInfoResultDTO implements Serializable { * 用户积分等级 */ private Integer grade; + + /** + * 志愿者昵称 + */ + private String volunteerNickname; + + /** + * 志愿者头像 + */ + private String volunteerFaceImg; + + /** + * 志愿者签名 + */ + private String volunteerSignature; + + /** + * 自我介绍 + */ + private String introduce; } 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 e2a59ad3..70c80c92 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 @@ -7,6 +7,7 @@ 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.EpdcAppVolunteerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; import com.elink.esua.epdc.service.VolunteerInfoService; @@ -74,4 +75,19 @@ public class EpdcAppVolunteerInfoController { return volunteerInfoService.listVolunteer(dto); } + /** + * 志愿者添加 V2接口 + * + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 09:49 2020-05-26 + **/ + @GetMapping("v2/insertVolunteerInfo") + public Result insertV2VolunteerInfo(@RequestBody EpdcCompleteVolunteerInfoV2FormDTO formDTO) { + //效验数据 + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + Result result = volunteerInfoService.insertV2VolunteerInfo(formDTO); + return result; + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java index a7221948..c8a84e04 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/entity/VolunteerInfoEntity.java @@ -135,7 +135,7 @@ public class VolunteerInfoEntity extends DeptScope { private Long auditor; /** - * 志愿者签名昵称 + * 志愿者昵称 */ private String volunteerNickname; 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 ceb66f39..d0d1e289 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 @@ -25,6 +25,7 @@ import com.elink.esua.epdc.dto.VolunteerInfoDTO; 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.EpdcVolunteerKindnessTimeFormDTO; +import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; @@ -215,4 +216,13 @@ public interface VolunteerInfoService extends BaseService { * @Date 15:33 2020-05-18 **/ Result> listVolunteer(EpdcAppVolunteerListFormDTO dto); + + /** + * 插入一条志愿者数据 + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 09:49 2020-05-26 + */ + Result insertV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO); } 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 067dcbc4..89717654 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 @@ -40,6 +40,7 @@ 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.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO; +import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; @@ -395,4 +396,35 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl data = baseDao.selectListVolunteer(dto); return new Result().ok(data); } + + @Override + @Transactional(rollbackFor = Exception.class) + public Result insertV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO) { + + VolunteerInfoEntity volunteerEntity = ConvertUtils.sourceToTarget(formDTO, VolunteerInfoEntity.class); + + // 补全其他字段 + volunteerEntity.setRegistTime(new Date());// 注册时间 + volunteerEntity.setAuditStatus(NumConstant.ZERO_STR); // 审核状态 默认自动审核通过 + volunteerEntity.setAuditTime(volunteerEntity.getRegistTime()); // 审核时间 + String address = volunteerEntity.getRoad() + .concat(StringUtils.isNotBlank(volunteerEntity.getVillageName()) ? volunteerEntity.getVillageName() : StringUtils.EMPTY) + .concat(StringUtils.isNotBlank(volunteerEntity.getDwellingPlace()) ? volunteerEntity.getDwellingPlace() : StringUtils.EMPTY); + volunteerEntity.setAddress(address); // 居住地址 + + // 获取部门信息 + Result dtoResult = adminFeignClient.getParentAndAllDept(String.valueOf(volunteerEntity.getGridId())); + + // 机构信息 + DeptEntityUtils.loadDeptInfo( + ConvertUtils.sourceToTarget(dtoResult.getData(), DeptEntityUtils.DeptDto.class), + volunteerEntity + ); + + deleteVolunteerByUserId(volunteerEntity.getUserId()); + insert(volunteerEntity); + this.sendNotice(volunteerEntity); + userTagRelationService.addUserTagRelation(volunteerEntity.getUserId(), UserTagEnum.VOLUNTEER.value()); + return new Result().ok(NumConstant.ONE); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 838fe42a..d1959148 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -25,12 +25,17 @@ WHEN IFNULL(eu.POINTS_TOTLE,0) <= 0 THEN 0 ELSE IFNULL(FLOOR(IFNULL(eu.POINTS_TOTLE,0) / IFNULL(g.POINTS,0) * IFNULL(g.GRADE,0)),0) - END grade + END grade, + v.VOLUNTEER_NICKNAME volunteerNickname, + v.VOLUNTEER_FACE_IMG volunteerFaceImg, + v.VOLUNTEER_SIGNATURE volunteerSignature, + v.INTRODUCE introduce FROM epdc_user eu Left Join (select * from epdc_user_grid_relation where USER_ID = #{id} order by UPDATED_TIME desc limit 0,1) eugr on(eu.id=eugr.USER_ID) left join epdc_points_grade g ON 1=1 AND g.DEL_FLAG = 0 + LEFT JOIN epdc_volunteer_info v ON eu.id = v.USER_ID AND v.DEL_FLAG = 0 WHERE eu.ID = #{id} From 27b6f17861c11c8818c0456e0a001d518d048fd8 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 27 May 2020 14:12:39 +0800 Subject: [PATCH 06/20] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3:=E5=A2=9E=E5=8A=A0=20=E5=BF=97?= =?UTF-8?q?=E6=84=BF=E8=80=85=E7=AD=BE=E5=90=8D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/epdc/result/EpdcAppVolunteerListResultDTO.java | 5 +++++ .../src/main/resources/mapper/VolunteerInfoDao.xml | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppVolunteerListResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppVolunteerListResultDTO.java index d98014d8..08f4fe0f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppVolunteerListResultDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcAppVolunteerListResultDTO.java @@ -28,4 +28,9 @@ public class EpdcAppVolunteerListResultDTO implements Serializable { * 头像 */ private String faceImg; + + /** + * 志愿者签名 + */ + private String volunteerSignature; } 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 6958cb75..38648772 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 @@ -214,7 +214,8 @@ SELECT v.ID id, v.VOLUNTEER_NICKNAME nickname, - v.VOLUNTEER_FACE_IMG faceImg + v.VOLUNTEER_FACE_IMG faceImg, + v.VOLUNTEER_SIGNATURE volunteerSignature FROM epdc_volunteer_info v WHERE From 24f60b3c19b4d83cae4296ba9d91ec661a1532be Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 27 May 2020 16:34:53 +0800 Subject: [PATCH 07/20] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/dto/ImgConfigDTO.java | 86 +++++++++++++ .../epdc/controller/ImgConfigController.java | 107 +++++++++++++++++ .../com/elink/esua/epdc/dao/ImgConfigDao.java | 39 ++++++ .../esua/epdc/entity/ImgConfigEntity.java | 56 +++++++++ .../elink/esua/epdc/excel/ImgConfigExcel.java | 65 ++++++++++ .../esua/epdc/feign/AdminFeignClient.java | 16 ++- .../fallback/AdminFeignClientFallback.java | 10 +- .../elink/esua/epdc/redis/ImgConfigRedis.java | 47 ++++++++ .../esua/epdc/service/ImgConfigService.java | 107 +++++++++++++++++ .../service/impl/ImgConfigServiceImpl.java | 113 ++++++++++++++++++ .../main/resources/mapper/ImgConfigDao.xml | 34 ++++++ 11 files changed, 672 insertions(+), 8 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ImgConfigDTO.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ImgConfigController.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ImgConfigDao.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ImgConfigEntity.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/excel/ImgConfigExcel.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/redis/ImgConfigRedis.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ImgConfigService.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ImgConfigServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ImgConfigDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ImgConfigDTO.java new file mode 100644 index 00000000..9f41c5a7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ImgConfigDTO.java @@ -0,0 +1,86 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 图片配置表 + * + * @author zhangyong + * @since v1.0.0 2020-05-27 + */ +@Data +public class ImgConfigDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 类型(0-志愿者咨询热线) + */ + private String imgType; + + /** + * 图片地址 + */ + private String imgUrl; + + /** + * 排序 + */ + private Integer sort; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 删除标识 0：未删除 1：删除 + */ + private String delFlag; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ImgConfigController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ImgConfigController.java new file mode 100644 index 00000000..b9ff6f45 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ImgConfigController.java @@ -0,0 +1,107 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.AssertUtils; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ImgConfigDTO; +import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.excel.ImgConfigExcel; +import com.elink.esua.epdc.service.ImgConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 图片配置表 + * + * @author zhangyong + * @since v1.0.0 2020-05-27 + */ +@RestController +@RequestMapping("imgconfig") +public class ImgConfigController { + + @Autowired + private ImgConfigService imgConfigService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = imgConfigService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + ImgConfigDTO data = imgConfigService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody ImgConfigDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + imgConfigService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody ImgConfigDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + imgConfigService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + imgConfigService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = imgConfigService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, ImgConfigExcel.class); + } + + /** + * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单 + * + * @param dictType + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:27 2020-05-27 + **/ + @GetMapping("heartImgType/{dictType}") + public Result> listSimpleDictInfo(@PathVariable("dictType") String dictType){ + return imgConfigService.getListSimpleDictInfo(dictType); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ImgConfigDao.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ImgConfigDao.java new file mode 100644 index 00000000..05595161 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ImgConfigDao.java @@ -0,0 +1,39 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.ImgConfigDTO; +import com.elink.esua.epdc.entity.ImgConfigEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + + +/** + * 图片配置表 + * + * @author zhangyong + * @since v1.0.0 2020-05-27 + */ +@Mapper +public interface ImgConfigDao extends BaseDao { + + List selectListImgConfig(Map params); +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ImgConfigEntity.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ImgConfigEntity.java new file mode 100644 index 00000000..17012679 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ImgConfigEntity.java @@ -0,0 +1,56 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 图片配置表 + * + * @author zhangyong + * @since v1.0.0 2020-05-27 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_img_config") +public class ImgConfigEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 类型(0-志愿者咨询热线) + */ + private String imgType; + + /** + * 图片地址 + */ + private String imgUrl; + + /** + * 排序 + */ + private Integer sort; + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/excel/ImgConfigExcel.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/excel/ImgConfigExcel.java new file mode 100644 index 00000000..d797c58f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/excel/ImgConfigExcel.java @@ -0,0 +1,65 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 图片配置表 + * + * @author zhangyong + * @since v1.0.0 2020-05-27 + */ +@Data +public class ImgConfigExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "类型(0-志愿者咨询热线)") + private String imgType; + + @Excel(name = "图片地址") + private String imgUrl; + + @Excel(name = "排序") + private Integer sort; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "删除标识 0：未删除 1：删除") + private String delFlag; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index 9b41b246..93a7813b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -2,10 +2,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CompleteDeptDTO; -import com.elink.esua.epdc.dto.DeptOption; -import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.SysUserDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO; import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback; @@ -90,4 +87,15 @@ public interface AdminFeignClient { **/ @GetMapping("sys/dept/party/getDeptTreeForEpiDemic") Result getDeptTreeForEpiDemic(); + + /** + * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单 + * + * @param dictType + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:27 2020-05-27 + **/ + @GetMapping("sys/dict/listSimple/{dictType}") + Result> getListSimpleDictInfo(@PathVariable("dictType") String dictType); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index e7f13a42..d3f757a0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -3,10 +3,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CompleteDeptDTO; -import com.elink.esua.epdc.dto.DeptOption; -import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; -import com.elink.esua.epdc.dto.SysUserDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO; import com.elink.esua.epdc.feign.AdminFeignClient; @@ -51,4 +48,9 @@ public class AdminFeignClientFallback implements AdminFeignClient { public Result getDeptTreeForEpiDemic() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getDeptTreeForEpiDemic"); } + + @Override + public Result> getListSimpleDictInfo(String dictType) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "getListSimpleDictInfo", dictType); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/redis/ImgConfigRedis.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/redis/ImgConfigRedis.java new file mode 100644 index 00000000..edd6478c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/redis/ImgConfigRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.redis; + +import com.elink.esua.epdc.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 图片配置表 + * + * @author zhangyong + * @since v1.0.0 2020-05-27 + */ +@Component +public class ImgConfigRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ImgConfigService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ImgConfigService.java new file mode 100644 index 00000000..d0b4de43 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ImgConfigService.java @@ -0,0 +1,107 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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.ImgConfigDTO; +import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.entity.ImgConfigEntity; + +import java.util.List; +import java.util.Map; + +/** + * 图片配置表 + * + * @author zhangyong + * @since v1.0.0 2020-05-27 + */ +public interface ImgConfigService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-05-27 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-05-27 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return ImgConfigDTO + * @author generator + * @date 2020-05-27 + */ + ImgConfigDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-27 + */ + void save(ImgConfigDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-05-27 + */ + void update(ImgConfigDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-05-27 + */ + void delete(String[] ids); + + /** + * 根据数据字典类型获取简版数据字典列表，用于页面下拉菜单 + * + * @param dictType + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 15:27 2020-05-27 + **/ + Result> getListSimpleDictInfo(String dictType); +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ImgConfigServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ImgConfigServiceImpl.java new file mode 100644 index 00000000..e2110d01 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ImgConfigServiceImpl.java @@ -0,0 +1,113 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dao.ImgConfigDao; +import com.elink.esua.epdc.dto.ImgConfigDTO; +import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.entity.ImgConfigEntity; +import com.elink.esua.epdc.feign.AdminFeignClient; +import com.elink.esua.epdc.redis.ImgConfigRedis; +import com.elink.esua.epdc.service.ImgConfigService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 图片配置表 + * + * @author zhangyong + * @since v1.0.0 2020-05-27 + */ +@Service +public class ImgConfigServiceImpl extends BaseServiceImpl implements ImgConfigService { + + @Autowired + private ImgConfigRedis imgConfigRedis; + + @Autowired + private AdminFeignClient adminFeignClient; + + @Override + public PageData page(Map params) { + IPage page = getPage(params); + List list = baseDao.selectListImgConfig(params); + return new PageData<>(list, page.getTotal()); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, ImgConfigDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public ImgConfigDTO get(String id) { + ImgConfigEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, ImgConfigDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(ImgConfigDTO dto) { + ImgConfigEntity entity = ConvertUtils.sourceToTarget(dto, ImgConfigEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(ImgConfigDTO dto) { + ImgConfigEntity entity = ConvertUtils.sourceToTarget(dto, ImgConfigEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public Result> getListSimpleDictInfo(String dictType) { + return adminFeignClient.getListSimpleDictInfo(dictType); + } + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml new file mode 100644 index 00000000..44f5781d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + From b8c42bae0917b1d8b4099d4e35743d13c3bf753b Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 27 May 2020 17:11:18 +0800 Subject: [PATCH 08/20] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=85=8D=E7=BD=AE=20?= =?UTF-8?q?=20=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/EpdcImgConfigResultDTO.java | 22 +++++++++++ .../controller/ApiImgConfigController.java | 38 +++++++++++++++++++ .../com/elink/esua/epdc/dao/ImgConfigDao.java | 3 ++ .../esua/epdc/service/ImgConfigService.java | 10 +++++ .../service/impl/ImgConfigServiceImpl.java | 7 ++++ .../main/resources/mapper/ImgConfigDao.xml | 10 +++++ 6 files changed, 90 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcImgConfigResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiImgConfigController.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcImgConfigResultDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcImgConfigResultDTO.java new file mode 100644 index 00000000..428c438f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcImgConfigResultDTO.java @@ -0,0 +1,22 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * APP 获取咨询热线图片 返回参数 + * + * @author zhangyong + * @date 2020/05/27 18:30 + */ +@Data +public class EpdcImgConfigResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 图片地址 + */ + private String imgUrl; +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiImgConfigController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiImgConfigController.java new file mode 100644 index 00000000..5abb67e0 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiImgConfigController.java @@ -0,0 +1,38 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.result.EpdcImgConfigResultDTO; +import com.elink.esua.epdc.service.ImgConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * APP 获取咨询热线图片 + * + * @author zhangyong + * @date 2020/05/27 18:30 + */ +@RestController +@RequestMapping("heart/imgConfig") +public class ApiImgConfigController { + + @Autowired + private ImgConfigService imgConfigService; + + /** + * 根据 志愿者模块图片类型 查询图片列表 + * @param imgType 志愿者模块图片类型 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 17:04 2020-05-27 + **/ + @GetMapping("getImgUrl/{imgType}") + public Result> getImgUrlList(@PathVariable("imgType") String imgType){ + return imgConfigService.listImgUrl(imgType); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ImgConfigDao.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ImgConfigDao.java index 05595161..5f1c7d6d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ImgConfigDao.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ImgConfigDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.ImgConfigDTO; +import com.elink.esua.epdc.dto.result.EpdcImgConfigResultDTO; import com.elink.esua.epdc.entity.ImgConfigEntity; import org.apache.ibatis.annotations.Mapper; @@ -36,4 +37,6 @@ import java.util.Map; public interface ImgConfigDao extends BaseDao { List selectListImgConfig(Map params); + + List selectListImgConfigByImgType(String imgType); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ImgConfigService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ImgConfigService.java index d0b4de43..d5eea760 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ImgConfigService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ImgConfigService.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.ImgConfigDTO; import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.dto.result.EpdcImgConfigResultDTO; import com.elink.esua.epdc.entity.ImgConfigEntity; import java.util.List; @@ -104,4 +105,13 @@ public interface ImgConfigService extends BaseService { * @Date 15:27 2020-05-27 **/ Result> getListSimpleDictInfo(String dictType); + + /** + * 根据 志愿者模块图片类型 查询图片列表 + * @param imgType 志愿者模块图片类型 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 17:04 2020-05-27 + **/ + Result> listImgUrl(String imgType); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ImgConfigServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ImgConfigServiceImpl.java index e2110d01..13d0f3f5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ImgConfigServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ImgConfigServiceImpl.java @@ -27,6 +27,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.ImgConfigDao; import com.elink.esua.epdc.dto.ImgConfigDTO; import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.dto.result.EpdcImgConfigResultDTO; import com.elink.esua.epdc.entity.ImgConfigEntity; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.redis.ImgConfigRedis; @@ -110,4 +111,10 @@ public class ImgConfigServiceImpl extends BaseServiceImpl> listImgUrl(String imgType) { + List list = baseDao.selectListImgConfigByImgType(imgType); + return new Result>().ok(list); + } + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml index 44f5781d..4fae1725 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ImgConfigDao.xml @@ -31,4 +31,14 @@ ORDER BY SORT,CREATED_TIME DESC + + From 21b98b25bcbd82643ae1508b3878819c92ec0241 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 27 May 2020 17:25:42 +0800 Subject: [PATCH 09/20] =?UTF-8?q?=E5=9B=BE=E7=89=87=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/elink/esua/epdc/dao/ImgConfigDao.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ImgConfigDao.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ImgConfigDao.java index 5f1c7d6d..d12a9a0f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ImgConfigDao.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ImgConfigDao.java @@ -36,7 +36,21 @@ import java.util.Map; @Mapper public interface ImgConfigDao extends BaseDao { + /** + * 图片配置 首页查询 + * @param params + * @return java.util.List + * @Author zhangyong + * @Date 17:25 2020-05-27 + **/ List selectListImgConfig(Map params); + /** + * 根据 志愿者模块图片类型 查询图片列表 + * @param imgType 志愿者模块图片类型 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 17:04 2020-05-27 + **/ List selectListImgConfigByImgType(String imgType); } From 99068a4c76d9ef709c27ae8917eace30fa865970 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 27 May 2020 20:58:46 +0800 Subject: [PATCH 10/20] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2/EpdcCompleteUserInfoFormV2DTO.java | 24 +++++++++ .../dto/result/EpdcCompleteUserInfoDTO.java | 21 ++++++++ .../esua/epdc/feign/UserFeignClient.java | 27 ++++++++-- .../fallback/UserFeignClientFallback.java | 15 ++++-- .../epdc/service/impl/AppUserServiceImpl.java | 18 +++++++ .../form/EpdcAppVolunteerListFormDTO.java | 6 +++ .../epdc/result/EpdcUserInfoResultDTO.java | 20 ------- .../EpdcAppVolunteerInfoController.java | 18 ++++++- .../elink/esua/epdc/dao/VolunteerInfoDao.java | 10 ++++ .../epdc/service/VolunteerInfoService.java | 10 ++++ .../impl/VolunteerInfoServiceImpl.java | 14 +++++ .../src/main/resources/mapper/UserDao.xml | 7 +-- .../resources/mapper/VolunteerInfoDao.xml | 53 +++++++++++++++++++ 13 files changed, 208 insertions(+), 35 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/v2/EpdcCompleteUserInfoFormV2DTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/v2/EpdcCompleteUserInfoFormV2DTO.java index 30262ad2..393f2339 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/v2/EpdcCompleteUserInfoFormV2DTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/v2/EpdcCompleteUserInfoFormV2DTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.form.v2; import lombok.Data; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; import java.io.Serializable; /** @@ -78,4 +79,27 @@ public class EpdcCompleteUserInfoFormV2DTO implements Serializable { * 认证类型 参考 UserAuthTypeEnum */ private String userAuthType; + + /** + * 志愿者昵称 + */ + @Size(min = 1, max = 10, message = "志愿者昵称不能为空,不能超过10字") + private String volunteerNickname; + + /** + * 志愿者头像 + */ + @NotBlank(message = "志愿者头像不能为空") + private String volunteerFaceImg; + + /** + * 志愿者签名 + */ + @Size(min = 1, max = 30, message = "评论内容不能为空,不能超过30字") + private String volunteerSignature; + + /** + * 自我介绍 + */ + private String introduce; } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java index 7fe641f4..a2ba7ae8 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcCompleteUserInfoDTO.java @@ -72,4 +72,25 @@ public class EpdcCompleteUserInfoDTO implements Serializable { * 居住网格名称 */ private String gridName; + + + /** + * 志愿者昵称 + */ + private String volunteerNickname; + + /** + * 志愿者头像 + */ + private String volunteerFaceImg; + + /** + * 志愿者签名 + */ + private String volunteerSignature; + + /** + * 自我介绍 + */ + private String introduce; } 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 db8b9542..8f897336 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 @@ -2,10 +2,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CachingUserInfoDTO; -import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.UserGridRelationDTO; -import com.elink.esua.epdc.dto.UserWxFormIdDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; import com.elink.esua.epdc.dto.epdc.result.*; @@ -389,4 +386,26 @@ public interface UserFeignClient { **/ @PostMapping(value = "app-user/epdc-app/volunteerinfo/v2/insertVolunteerInfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result insertV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO); + + /** + * 志愿者修改 V2接口 + * + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 09:49 2020-05-26 + **/ + @PostMapping(value = "app-user/epdc-app/volunteerinfo/v2/updateVolunteerInfo", consumes = MediaType.APPLICATION_JSON_VALUE) + Result updateV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO); + + /** + * 根据用户id，获取志愿者详情 + * + * @param userId + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 09:49 2020-05-26 + **/ + @GetMapping(value = "app-user/volunteerinfo/getVolunteerInfoDTOByUserId/{userId}") + Result selectUserVolunteerInfo(@PathVariable("userId") String userId); } 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 6fd7bd47..3dc3ec73 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 @@ -3,10 +3,7 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.CachingUserInfoDTO; -import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.UserGridRelationDTO; -import com.elink.esua.epdc.dto.UserWxFormIdDTO; +import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.epdc.form.*; import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; import com.elink.esua.epdc.dto.epdc.result.*; @@ -191,4 +188,14 @@ public class UserFeignClientFallback implements UserFeignClient { public Result insertV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO dto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "insertV2VolunteerInfo", dto); } + + @Override + public Result updateV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateV2VolunteerInfo", formDTO); + } + + @Override + public Result selectUserVolunteerInfo(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "selectUserVolunteerInfo", "userId"); + } } 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 8b2251c1..a36c424a 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 @@ -16,6 +16,9 @@ import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; import com.elink.esua.epdc.commons.tools.enums.YesOrNoEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.redis.RedisUtils; +import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.*; import com.elink.esua.epdc.dto.*; import com.elink.esua.epdc.dto.enums.GroupUserStateEnum; @@ -877,6 +880,14 @@ public class AppUserServiceImpl implements AppUserService { Result result = userFeignClient.getUserInfoById(tokenDto.getUserId()); if (result.success() && null != result.getData()) { EpdcCompleteUserInfoDTO dto = ConvertUtils.sourceToTarget(result.getData(), EpdcCompleteUserInfoDTO.class); + // 获取志愿者表中的新增字段 + Result volunteerInfoDTO = userFeignClient.selectUserVolunteerInfo(tokenDto.getUserId()); + if (volunteerInfoDTO != null){ + dto.setVolunteerFaceImg(volunteerInfoDTO.getData().getVolunteerFaceImg()); + dto.setVolunteerNickname(volunteerInfoDTO.getData().getVolunteerNickname()); + dto.setVolunteerSignature(volunteerInfoDTO.getData().getVolunteerSignature()); + dto.setIntroduce(volunteerInfoDTO.getData().getIntroduce()); + } if (("0").equals(result.getData().getState())) { dto.setGridId(tokenDto.getGridId()); //未完善信息获取用户当前所在的网格的后两级机构（社区-网格），返回给前端 @@ -1467,6 +1478,13 @@ public class AppUserServiceImpl implements AppUserService { if (!insertCountResult.success()) { return insertCountResult; } + } else { + // 重复认证 修改志愿者信息 + formDto.setUserId(tokenDto.getUserId()); + Result updateCountResult = userFeignClient.updateV2VolunteerInfo(formDto); + if (!updateCountResult.success()) { + return updateCountResult; + } } // 更新用户缓存信息 diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java index a8f85884..fe98e41f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java @@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.epdc.form; import lombok.Data; import javax.validation.constraints.Min; +import java.util.List; /** * 志愿者列表 @@ -24,4 +25,9 @@ public class EpdcAppVolunteerListFormDTO { */ @Min(value = 1, message = "页容量必须大于0") private Integer pageSize; + + /** + * 数据权限 + */ + private List deptIdList; } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java index 6cfc457e..bb1f0937 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcUserInfoResultDTO.java @@ -30,24 +30,4 @@ public class EpdcUserInfoResultDTO implements Serializable { * 用户积分等级 */ private Integer grade; - - /** - * 志愿者昵称 - */ - private String volunteerNickname; - - /** - * 志愿者头像 - */ - private String volunteerFaceImg; - - /** - * 志愿者签名 - */ - private String volunteerSignature; - - /** - * 自我介绍 - */ - private String introduce; } 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 70c80c92..de5cef05 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 @@ -83,11 +83,27 @@ public class EpdcAppVolunteerInfoController { * @Author zhangyong * @Date 09:49 2020-05-26 **/ - @GetMapping("v2/insertVolunteerInfo") + @PostMapping("v2/insertVolunteerInfo") public Result insertV2VolunteerInfo(@RequestBody EpdcCompleteVolunteerInfoV2FormDTO formDTO) { //效验数据 ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); Result result = volunteerInfoService.insertV2VolunteerInfo(formDTO); return result; } + + /** + * 志愿者修改 V2接口 + * + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 09:49 2020-05-26 + **/ + @PostMapping("v2/updateVolunteerInfo") + public Result updateV2VolunteerInfo(@RequestBody EpdcCompleteVolunteerInfoV2FormDTO formDTO) { + //效验数据 + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); + Result result = volunteerInfoService.updateV2VolunteerInfo(formDTO); + return result; + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java index 57189782..b537fc28 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/VolunteerInfoDao.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.dto.UserTagDTO; import com.elink.esua.epdc.dto.VolunteerInfoDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcAppVolunteerListFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcVolunteerKindnessTimeFormDTO; +import com.elink.esua.epdc.dto.epdc.form.v2.EpdcCompleteVolunteerInfoV2FormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppVolunteerListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcGetVolunteerRankDTO; @@ -139,4 +140,13 @@ public interface VolunteerInfoDao extends BaseDao { * @Date 15:08 2020-05-18 **/ List selectListVolunteer(EpdcAppVolunteerListFormDTO dto); + + /** + * 志愿者认证，修改 + * @param formDTO + * @return void + * @Author zhangyong + * @Date 19:52 2020-05-27 + **/ + void updateVolunteerAauthentication(EpdcCompleteVolunteerInfoV2FormDTO formDTO); } 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 d0d1e289..cbc2325c 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 @@ -225,4 +225,14 @@ public interface VolunteerInfoService extends BaseService { * @Date 09:49 2020-05-26 */ Result insertV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO); + + /** + * 修改一条志愿者数据 + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author zhangyong + * @Date 09:49 2020-05-26 + */ + Result updateV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO); + } 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 89717654..ac9f88a2 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 @@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.enums.UserTagEnum; import com.elink.esua.epdc.commons.tools.page.PageData; +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.UserFieldConsant; @@ -391,6 +392,7 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl> listVolunteer(EpdcAppVolunteerListFormDTO dto) { +// dto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize(); dto.setPageIndex(pageIndex); List data = baseDao.selectListVolunteer(dto); @@ -427,4 +429,16 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl updateV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO) { + + VolunteerInfoEntity volunteerEntity = ConvertUtils.sourceToTarget(formDTO, VolunteerInfoEntity.class); + // 志愿者表修改 + baseDao.updateVolunteerAauthentication(formDTO); + this.sendNotice(volunteerEntity); + userTagRelationService.addUserTagRelation(volunteerEntity.getUserId(), UserTagEnum.VOLUNTEER.value()); + return new Result().ok(NumConstant.ONE); + } } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index d1959148..838fe42a 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -25,17 +25,12 @@ WHEN IFNULL(eu.POINTS_TOTLE,0) <= 0 THEN 0 ELSE IFNULL(FLOOR(IFNULL(eu.POINTS_TOTLE,0) / IFNULL(g.POINTS,0) * IFNULL(g.GRADE,0)),0) - END grade, - v.VOLUNTEER_NICKNAME volunteerNickname, - v.VOLUNTEER_FACE_IMG volunteerFaceImg, - v.VOLUNTEER_SIGNATURE volunteerSignature, - v.INTRODUCE introduce + END grade FROM epdc_user eu Left Join (select * from epdc_user_grid_relation where USER_ID = #{id} order by UPDATED_TIME desc limit 0,1) eugr on(eu.id=eugr.USER_ID) left join epdc_points_grade g ON 1=1 AND g.DEL_FLAG = 0 - LEFT JOIN epdc_volunteer_info v ON eu.id = v.USER_ID AND v.DEL_FLAG = 0 WHERE eu.ID = #{id} 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 38648772..e87d4623 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 @@ -221,7 +221,60 @@ WHERE v.DEL_FLAG = 0 AND v.AUDIT_STATUS != 2 + + and v.GRID_ID in + + #{deptId} + + ORDER BY v.VOLUNTEER_NICKNAME LIMIT #{pageIndex},#{pageSize} + + + UPDATE epdc_volunteer_info + SET + + REAL_NAME = #{realName}, + + + MOBILE = #{mobile}, + + + IDENTITY_NO = #{identityNo}, + + + ROAD = #{road}, + + + VILLAGE_NAME = #{villageName}, + + + DWELLING_PLACE = #{dwellingPlace}, + + + GRID_ID = #{gridId}, + + + INTRODUCE = #{introduce}, + + + BIRTHDAY = #{birthday}, + + + SEX = #{sex}, + + + VOLUNTEER_NICKNAME = #{volunteerNickname}, + + + VOLUNTEER_FACE_IMG = #{volunteerFaceImg}, + + + VOLUNTEER_SIGNATURE = #{volunteerSignature} + + WHERE + USER_ID = #{userId} + AND DEL_FLAG = '0' + From 761c0378ddced2a3ddc5394b64427919c5db4ef6 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 27 May 2020 21:51:22 +0800 Subject: [PATCH 11/20] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiImgConfigController.java | 2 +- .../esua/epdc/feign/UserFeignClient.java | 10 --- .../fallback/UserFeignClientFallback.java | 5 -- .../epdc/service/impl/AppUserServiceImpl.java | 71 +++++++------------ .../form/EpdcAppVolunteerListFormDTO.java | 2 +- .../EpdcAppVolunteerInfoController.java | 15 ---- .../epdc/service/VolunteerInfoService.java | 8 --- .../impl/VolunteerInfoServiceImpl.java | 27 +++---- .../resources/mapper/VolunteerInfoDao.xml | 7 +- 9 files changed, 40 insertions(+), 107 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiImgConfigController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiImgConfigController.java index 5abb67e0..866b0714 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiImgConfigController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiImgConfigController.java @@ -18,7 +18,7 @@ import java.util.List; * @date 2020/05/27 18:30 */ @RestController -@RequestMapping("heart/imgConfig") +@RequestMapping("imgConfig") public class ApiImgConfigController { @Autowired 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 8f897336..b7425375 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 @@ -387,16 +387,6 @@ public interface UserFeignClient { @PostMapping(value = "app-user/epdc-app/volunteerinfo/v2/insertVolunteerInfo", consumes = MediaType.APPLICATION_JSON_VALUE) Result insertV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO); - /** - * 志愿者修改 V2接口 - * - * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author zhangyong - * @Date 09:49 2020-05-26 - **/ - @PostMapping(value = "app-user/epdc-app/volunteerinfo/v2/updateVolunteerInfo", consumes = MediaType.APPLICATION_JSON_VALUE) - Result updateV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO); /** * 根据用户id，获取志愿者详情 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 3dc3ec73..2d63a9fc 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 @@ -189,11 +189,6 @@ public class UserFeignClientFallback implements UserFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "insertV2VolunteerInfo", dto); } - @Override - public Result updateV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateV2VolunteerInfo", formDTO); - } - @Override public Result selectUserVolunteerInfo(String userId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "selectUserVolunteerInfo", "userId"); 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 a36c424a..f2439f7f 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 @@ -882,7 +882,7 @@ public class AppUserServiceImpl implements AppUserService { EpdcCompleteUserInfoDTO dto = ConvertUtils.sourceToTarget(result.getData(), EpdcCompleteUserInfoDTO.class); // 获取志愿者表中的新增字段 Result volunteerInfoDTO = userFeignClient.selectUserVolunteerInfo(tokenDto.getUserId()); - if (volunteerInfoDTO != null){ + if (volunteerInfoDTO.success() && null != volunteerInfoDTO){ dto.setVolunteerFaceImg(volunteerInfoDTO.getData().getVolunteerFaceImg()); dto.setVolunteerNickname(volunteerInfoDTO.getData().getVolunteerNickname()); dto.setVolunteerSignature(volunteerInfoDTO.getData().getVolunteerSignature()); @@ -1437,62 +1437,43 @@ public class AppUserServiceImpl implements AppUserService { if (StringUtils.isNotBlank(formDto.getSmsCode())) { this.checkSmsCode(formDto.getMobile(), formDto.getSmsCode()); } - // 是否为志愿者 - boolean volunteerFlag = UserTagUtils.containIdentity(tokenDto.getUserTagInfos(), UserTagEnum.VOLUNTEER); - // 当前是否为党员 - boolean partyFlag = UserTagUtils.containIdentity(tokenDto.getUserTagInfos(), UserTagEnum.PARTY_MEMBER); // 此次完善信息后是否变为党员 boolean newPartyFlag = Boolean.FALSE; UserDTO user = getUserInfoById(tokenDto.getUserId()); - if (!volunteerFlag) { - // 处理和验证身份证号码 - String identityNo = fixAndCheckIdentityNo(formDto.getIdentityNo()); - String realName = ModuleUtils.replaceIllegalCharacter(formDto.getRealName()); - if (partyFlag) { - // 如果是党员，不再进行完善个人信息处理 - if (!user.getIdentityNo().equals(identityNo) || !user.getRealName().equals(realName)) { - return new Result().error("姓名或身份证号码有误，请核实信息"); - } - } else { - // 非党员，调用用户完善个人信息接口 - EpdcCompleteUserInfoFormV2DTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormV2DTO.class); - // set 党员标识，将志愿者完善信息视为党员完善信息，方便身份证号码唯一校验等操作 - epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.YES.value()); - epdcCompleteUserInfoFormDTO.setUserAuthType(UserAuthTypeEnum.VOLUNTEER_AUTH.value()); - Result result = completeUserInfoCore(tokenDto, epdcCompleteUserInfoFormDTO); - UserDTO completeUser = result.getData(); - user.setGrid(completeUser.getGrid()); - user.setState(completeUser.getState()); - if (YesOrNoEnum.YES.value().equals(completeUser.getPartyFlag())) { - newPartyFlag = Boolean.TRUE; - } - } - formDto.setSex(IdentityNoUtils.getSex(identityNo)); - formDto.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(identityNo), DateUtils.DATE_PATTERN)); - formDto.setUserId(tokenDto.getUserId()); - formDto.setGridId(tokenDto.getGridId()); - // 新增志愿者 - Result insertCountResult = userFeignClient.insertV2VolunteerInfo(formDto); - if (!insertCountResult.success()) { - return insertCountResult; - } - } else { - // 重复认证 修改志愿者信息 - formDto.setUserId(tokenDto.getUserId()); - Result updateCountResult = userFeignClient.updateV2VolunteerInfo(formDto); - if (!updateCountResult.success()) { - return updateCountResult; - } + // 处理和验证身份证号码 + String identityNo = fixAndCheckIdentityNo(formDto.getIdentityNo()); + + // 调用用户完善个人信息接口 + EpdcCompleteUserInfoFormV2DTO epdcCompleteUserInfoFormDTO = ConvertUtils.sourceToTarget(formDto, EpdcCompleteUserInfoFormV2DTO.class); + // set 党员标识，将志愿者完善信息视为党员完善信息，方便身份证号码唯一校验等操作 + epdcCompleteUserInfoFormDTO.setPartyFlag(YesOrNoEnum.YES.value()); + epdcCompleteUserInfoFormDTO.setUserAuthType(UserAuthTypeEnum.VOLUNTEER_AUTH.value()); + Result result = completeUserInfoCore(tokenDto, epdcCompleteUserInfoFormDTO); + + UserDTO completeUser = result.getData(); + user.setGrid(completeUser.getGrid()); + user.setState(completeUser.getState()); + if (YesOrNoEnum.YES.value().equals(completeUser.getPartyFlag())) { + newPartyFlag = Boolean.TRUE; } + formDto.setSex(IdentityNoUtils.getSex(identityNo)); + formDto.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(identityNo), DateUtils.DATE_PATTERN)); + formDto.setUserId(tokenDto.getUserId()); + formDto.setGridId(tokenDto.getGridId()); + // 新增 or 修改 志愿者信息 + Result insertCountResult = userFeignClient.insertV2VolunteerInfo(formDto); + if (!insertCountResult.success()) { + return insertCountResult; + } // 更新用户缓存信息 Result cachingUserResult = userFeignClient.needCachingUserInfoByUserId(tokenDto.getUserId()); CachingUserInfoDTO cachingUserInfoDTO = cachingUserResult.getData(); EpdcAppAuthorizationDTO authorizationDto = cachingUserInfoForAuthorization(cachingUserInfoDTO, user.getGrid(), user.getState()); - if (!partyFlag && newPartyFlag) { + if ( newPartyFlag) { initPartyGroupInfo(cachingUserInfoDTO); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java index fe98e41f..4e90ffcb 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java @@ -29,5 +29,5 @@ public class EpdcAppVolunteerListFormDTO { /** * 数据权限 */ - private List deptIdList; + private String gridId; } 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 de5cef05..f35f6536 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 @@ -91,19 +91,4 @@ public class EpdcAppVolunteerInfoController { return result; } - /** - * 志愿者修改 V2接口 - * - * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author zhangyong - * @Date 09:49 2020-05-26 - **/ - @PostMapping("v2/updateVolunteerInfo") - public Result updateV2VolunteerInfo(@RequestBody EpdcCompleteVolunteerInfoV2FormDTO formDTO) { - //效验数据 - ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); - Result result = volunteerInfoService.updateV2VolunteerInfo(formDTO); - return result; - } } 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 cbc2325c..cb39bb71 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 @@ -226,13 +226,5 @@ public interface VolunteerInfoService extends BaseService { */ Result insertV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO); - /** - * 修改一条志愿者数据 - * @param formDTO - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @Author zhangyong - * @Date 09:49 2020-05-26 - */ - Result updateV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO); } 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 ac9f88a2..90e65549 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,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl> listVolunteer(EpdcAppVolunteerListFormDTO dto) { -// dto.setDeptIdList(SecurityUser.getUser().getDeptIdList()); int pageIndex = (dto.getPageIndex() - NumConstant.ONE) * dto.getPageSize(); dto.setPageIndex(pageIndex); List data = baseDao.selectListVolunteer(dto); @@ -423,22 +422,16 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl updateV2VolunteerInfo(EpdcCompleteVolunteerInfoV2FormDTO formDTO) { - - VolunteerInfoEntity volunteerEntity = ConvertUtils.sourceToTarget(formDTO, VolunteerInfoEntity.class); - // 志愿者表修改 - baseDao.updateVolunteerAauthentication(formDTO); - this.sendNotice(volunteerEntity); - userTagRelationService.addUserTagRelation(volunteerEntity.getUserId(), UserTagEnum.VOLUNTEER.value()); + // deleteVolunteerByUserId(volunteerEntity.getUserId()); + VolunteerInfoDTO dto = baseDao.selectOneVolunteerInfoDTO(formDTO.getUserId()); + if(null != dto) { + volunteerEntity.setId(dto.getId()); + updateById(volunteerEntity); + } else { + insert(volunteerEntity); + this.sendNotice(volunteerEntity); + userTagRelationService.addUserTagRelation(volunteerEntity.getUserId(), UserTagEnum.VOLUNTEER.value()); + } return new Result().ok(NumConstant.ONE); } } 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 e87d4623..abc6e6ae 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 @@ -221,11 +221,8 @@ WHERE v.DEL_FLAG = 0 AND v.AUDIT_STATUS != 2 - - and v.GRID_ID in - - #{deptId} - + + and v.GRID_ID = #{gridId} ORDER BY v.VOLUNTEER_NICKNAME LIMIT #{pageIndex},#{pageSize} From 3f0f91eaecd2ea11bf651f2d4930163abead7d03 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 27 May 2020 22:08:47 +0800 Subject: [PATCH 12/20] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f2439f7f..2f5529d7 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 @@ -882,7 +882,7 @@ public class AppUserServiceImpl implements AppUserService { EpdcCompleteUserInfoDTO dto = ConvertUtils.sourceToTarget(result.getData(), EpdcCompleteUserInfoDTO.class); // 获取志愿者表中的新增字段 Result volunteerInfoDTO = userFeignClient.selectUserVolunteerInfo(tokenDto.getUserId()); - if (volunteerInfoDTO.success() && null != volunteerInfoDTO){ + if (volunteerInfoDTO.success() && null != volunteerInfoDTO.getData()){ dto.setVolunteerFaceImg(volunteerInfoDTO.getData().getVolunteerFaceImg()); dto.setVolunteerNickname(volunteerInfoDTO.getData().getVolunteerNickname()); dto.setVolunteerSignature(volunteerInfoDTO.getData().getVolunteerSignature()); From 7c32a48f56066f4c3baaa500e427c60792ad99a7 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 27 May 2020 22:15:39 +0800 Subject: [PATCH 13/20] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=20=E6=9D=83=E9=99=90=E6=8E=A7?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/ApiAppUserController.java | 3 ++- .../main/java/com/elink/esua/epdc/service/AppUserService.java | 3 ++- .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java | 3 ++- .../esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) 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 73682fcb..e9f7b109 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 @@ -332,13 +332,14 @@ public class ApiAppUserController { /* * 志愿者列表 + * @param tokenDto * @param dto * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author zhangyong * @Date 15:33 2020-05-18 **/ @GetMapping("volunteer/list") - public Result> volunteerList(EpdcAppVolunteerListFormDTO dto) { + public Result> volunteerList(@LoginUser TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { ValidatorUtils.validateEntity(dto); return appUserService.listVolunteer(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 1c973010..675ebb90 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 @@ -263,12 +263,13 @@ public interface AppUserService { /* * 志愿者列表 + * @param tokenDto * @param dto * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Author zhangyong * @Date 15:33 2020-05-18 **/ - Result> listVolunteer(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 2f5529d7..1ae967e4 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 @@ -1426,7 +1426,8 @@ public class AppUserServiceImpl implements AppUserService { } @Override - public Result> listVolunteer(EpdcAppVolunteerListFormDTO dto) { + 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-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java index 4e90ffcb..5b76ff64 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/EpdcAppVolunteerListFormDTO.java @@ -29,5 +29,5 @@ public class EpdcAppVolunteerListFormDTO { /** * 数据权限 */ - private String gridId; + private Long gridId; } From 8116cd05c29b9e77a268e1c808058bdba5945407 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Wed, 27 May 2020 22:17:52 +0800 Subject: [PATCH 14/20] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8A=E6=AC=A1?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/ApiAppUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e9f7b109..4ea45e3d 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 @@ -341,6 +341,6 @@ public class ApiAppUserController { @GetMapping("volunteer/list") public Result> volunteerList(@LoginUser TokenDto tokenDto, EpdcAppVolunteerListFormDTO dto) { ValidatorUtils.validateEntity(dto); - return appUserService.listVolunteer(dto); + return appUserService.listVolunteer(tokenDto, dto); } } From e1e46b5d478229c63765147e0e609e4bebec12a9 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 28 May 2020 10:15:09 +0800 Subject: [PATCH 15/20] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E6=98=B5=E7=A7=B0=E6=8B=BC=E9=9F=B3=E6=8E=92?= =?UTF-8?q?=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/VolunteerInfoDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 abc6e6ae..94f4c39b 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 @@ -224,7 +224,7 @@ and v.GRID_ID = #{gridId} - ORDER BY v.VOLUNTEER_NICKNAME + ORDER BY CONVERT(v.VOLUNTEER_NICKNAME USING gbk) LIMIT #{pageIndex},#{pageSize} From 12a16328ed818c99bec14a484ab0d8893aad34da Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 28 May 2020 13:55:45 +0800 Subject: [PATCH 16/20] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=AE=A4?= =?UTF-8?q?=E8=AF=81=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=92=8C=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=98=AF=E4=B8=80=E4=B8=AA=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E6=89=80=E4=BB=A5=E5=8E=BB=E6=8E=89=E5=BF=97=E6=84=BF?= =?UTF-8?q?=E8=80=85=E6=98=B5=E7=A7=B0=E3=80=81=E5=A4=B4=E5=83=8F=E3=80=81?= =?UTF-8?q?=E7=AD=BE=E5=90=8D=E5=88=A4=E6=96=AD=EF=BC=8C=E6=94=B9=E6=9C=89?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E8=BF=9B=E8=A1=8C=E7=9B=B8=E5=BA=94=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java index 9eb612f0..6289952f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java @@ -105,19 +105,16 @@ public class EpdcCompleteVolunteerInfoV2FormDTO implements Serializable { /** * 志愿者昵称 */ - @Size(min = 1, max = 10, message = "志愿者昵称不能为空,不能超过10字") private String volunteerNickname; /** * 志愿者头像 */ - @NotBlank(message = "志愿者头像不能为空") private String volunteerFaceImg; /** * 志愿者签名 */ - @Size(min = 1, max = 30, message = "评论内容不能为空,不能超过30字") private String volunteerSignature; } From 0e73d15cd79175e9cf843da88324498f07ea37ca Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 28 May 2020 14:06:39 +0800 Subject: [PATCH 17/20] =?UTF-8?q?(=E6=81=A2=E5=A4=8D=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E6=8F=90=E4=BA=A4)=E5=BF=97=E6=84=BF=E8=80=85?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=20=E6=B7=BB=E5=8A=A0=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E5=AE=8C=E5=96=84=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=85=A5=E5=8F=82=EF=BC=8C=E5=BF=97=E6=84=BF?= =?UTF-8?q?=E8=80=85=E7=9A=84=E5=9B=BE=E7=89=87=E3=80=81=E6=98=B5=E7=A7=B0?= =?UTF-8?q?=E7=AD=89=E4=B8=8D=E5=8A=A0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/form/v2/EpdcCompleteUserInfoFormV2DTO.java | 3 --- .../dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/v2/EpdcCompleteUserInfoFormV2DTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/v2/EpdcCompleteUserInfoFormV2DTO.java index 393f2339..149c47af 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/v2/EpdcCompleteUserInfoFormV2DTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/v2/EpdcCompleteUserInfoFormV2DTO.java @@ -83,19 +83,16 @@ public class EpdcCompleteUserInfoFormV2DTO implements Serializable { /** * 志愿者昵称 */ - @Size(min = 1, max = 10, message = "志愿者昵称不能为空,不能超过10字") private String volunteerNickname; /** * 志愿者头像 */ - @NotBlank(message = "志愿者头像不能为空") private String volunteerFaceImg; /** * 志愿者签名 */ - @Size(min = 1, max = 30, message = "评论内容不能为空,不能超过30字") private String volunteerSignature; /** diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java index 6289952f..804bbbf4 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcCompleteVolunteerInfoV2FormDTO.java @@ -105,16 +105,19 @@ public class EpdcCompleteVolunteerInfoV2FormDTO implements Serializable { /** * 志愿者昵称 */ + @Size(min = 1, max = 10, message = "志愿者昵称不能为空,不能超过10字") private String volunteerNickname; /** * 志愿者头像 */ + @NotBlank(message = "志愿者头像不能为空") private String volunteerFaceImg; /** * 志愿者签名 */ + @Size(min = 1, max = 30, message = "志愿者签名,不能超过30字") private String volunteerSignature; } From 746a3caf0993593cd04e26514f57f388807dc0f7 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 28 May 2020 15:15:41 +0800 Subject: [PATCH 18/20] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E5=88=99=E5=B0=9D=E8=AF=95=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=A1=A8=E4=B8=AD=E7=9A=84=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) 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 1ae967e4..86f0f918 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 @@ -887,6 +887,10 @@ public class AppUserServiceImpl implements AppUserService { dto.setVolunteerNickname(volunteerInfoDTO.getData().getVolunteerNickname()); dto.setVolunteerSignature(volunteerInfoDTO.getData().getVolunteerSignature()); dto.setIntroduce(volunteerInfoDTO.getData().getIntroduce()); + // 如果用户表的身份证号为空，则尝试使用志愿者表中的身份证 + if (null == dto.getIdentityNo()) { + dto.setIdentityNo(volunteerInfoDTO.getData().getIdentityNo()); + } } if (("0").equals(result.getData().getState())) { dto.setGridId(tokenDto.getGridId()); From da4e0bd22287a356156b33b5f7cf636a06552e2c Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 28 May 2020 16:14:10 +0800 Subject: [PATCH 19/20] =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8A=E6=AC=A1?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/service/impl/AppUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 86f0f918..1c2fd6b7 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 @@ -888,7 +888,7 @@ public class AppUserServiceImpl implements AppUserService { dto.setVolunteerSignature(volunteerInfoDTO.getData().getVolunteerSignature()); dto.setIntroduce(volunteerInfoDTO.getData().getIntroduce()); // 如果用户表的身份证号为空，则尝试使用志愿者表中的身份证 - if (null == dto.getIdentityNo()) { + if (null == dto.getIdentityNo() || "".equals(dto.getIdentityNo())) { dto.setIdentityNo(volunteerInfoDTO.getData().getIdentityNo()); } } From 627b04f967189936ea07fe6752509d3353df7420 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Thu, 28 May 2020 16:27:27 +0800 Subject: [PATCH 20/20] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=8A=A5=E5=90=8D=EF=BC=8Cuser=E8=A1=A8=E7=9A=84=E8=BA=AB?= =?UTF-8?q?=E4=BB=BD=E8=AF=81=E4=B8=BA=E7=A9=BA=EF=BC=8C=E5=AF=BC=E8=87=B4?= =?UTF-8?q?java=E8=A7=A3=E6=9E=90=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-user-server/src/main/resources/mapper/UserDao.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 838fe42a..599c3c90 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -13,7 +13,10 @@ eu.NICKNAME AS nickname, eu.FACE_IMG AS faceImg, eu.MOBILE AS mobile, - eu.IDENTITY_NO AS identityNo, + CASE SUM(IFNULL(eu.IDENTITY_NO,0)) + WHEN 0 THEN v.IDENTITY_NO + ELSE eu.IDENTITY_NO + END AS identityNo, eugr.ALL_DEPT_NAMES AS deptName, eu.REAL_NAME AS realName, eu.ROAD AS road, @@ -31,6 +34,7 @@ Left Join (select * from epdc_user_grid_relation where USER_ID = #{id} order by UPDATED_TIME desc limit 0,1) eugr on(eu.id=eugr.USER_ID) left join epdc_points_grade g ON 1=1 AND g.DEL_FLAG = 0 + LEFT JOIN epdc_volunteer_info v ON eu.ID = v.USER_ID WHERE eu.ID = #{id}