From 5a74ccae46d816d17f0c3dbead6c138b5fa1ddc1 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Fri, 24 Sep 2021 15:31:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=A5=E5=8F=A3=EF=BC=8C?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=20=E5=B7=B2=E6=8A=A5=E5=90=8D=E7=9A=84?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=97=B6=E9=97=B4=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- esua-epdc/epdc-gateway/pom.xml | 4 ++-- .../controller/ApiActUserRelationController.java | 14 ++++++++++++++ .../feign/AppActUserRelationFeignClient.java | 12 ++++++++++++ .../AppActUserRelationFeignClientFallback.java | 4 ++++ .../epdc/service/ActUserRelationService.java | 11 +++++++++++ .../service/impl/ActUserRelationServiceImpl.java | 4 ++++ .../controller/AppActUserRelationController.java | 14 ++++++++++++++ .../modules/activity/dao/ActUserRelationDao.java | 12 ++++++++++++ .../activity/service/ActUserRelationService.java | 11 +++++++++++ .../service/impl/ActUserRelationServiceImpl.java | 4 ++++ .../mapper/activity/ActUserRelationDao.xml | 16 ++++++++++++++++ 11 files changed, 104 insertions(+), 2 deletions(-) diff --git a/esua-epdc/epdc-gateway/pom.xml b/esua-epdc/epdc-gateway/pom.xml index 894a9db0..4e771b7f 100644 --- a/esua-epdc/epdc-gateway/pom.xml +++ b/esua-epdc/epdc-gateway/pom.xml @@ -105,8 +105,8 @@ lb://epdc-activiti-server - lb://epdc-api-server - + + http://127.0.0.1:9040 lb://epdc-app-server diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java index ccfbd3dc..af2e94c0 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActUserRelationController.java @@ -208,4 +208,18 @@ public class ApiActUserRelationController { public Result> getActPeriods(String actId) { return actUserRelationService.listOfActPeriods(actId); } + + /** + * 获取 已报名的活动时间段 + * + * @param tokenDto + * @param actId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/3 15:54 + */ + @GetMapping("getSignInActPeriods") + public Result> getSignInActPeriods(@LoginUser TokenDto tokenDto, String actId) { + return actUserRelationService.listOfSignInActPeriods(tokenDto.getUserId(), actId); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java index 1a89edc3..d90961ce 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActUserRelationFeignClient.java @@ -82,4 +82,16 @@ public interface AppActUserRelationFeignClient { */ @GetMapping(value = "heart/appactuserrelation/getActPeriods/{actId}",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result> getActPeriods(@PathVariable("actId") String actId); + + /** + * 获取 已报名的活动时间段 + * + * @param userId + * @param actId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/3 15:54 + */ + @GetMapping(value = "heart/appactuserrelation/getSignInActPeriods/{userId}/{actId}",consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result> getSignInActPeriods(@PathVariable("userId") String userId, @PathVariable("actId") String actId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java index 6635604c..f632fa22 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActUserRelationFeignClientFallback.java @@ -52,4 +52,8 @@ public class AppActUserRelationFeignClientFallback implements AppActUserRelation return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getActPeriods", actId); } + @Override + public Result> getSignInActPeriods(String userId, String actId) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getSignInActPeriods", userId, actId); + } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java index ce1e30b3..ce4a9272 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActUserRelationService.java @@ -70,4 +70,15 @@ public interface ActUserRelationService { * @since 2021/9/3 15:55 */ Result> listOfActPeriods(String actId); + + /** + * 获取 已报名的活动时间段 + * + * @param userId + * @param actId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/3 15:54 + */ + Result> listOfSignInActPeriods(String userId, String actId); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java index c2f0a659..7298572a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActUserRelationServiceImpl.java @@ -65,4 +65,8 @@ public class ActUserRelationServiceImpl implements ActUserRelationService { return actInfoFeignClient.getActPeriods(actId); } + @Override + public Result> listOfSignInActPeriods(String userId, String actId) { + return actInfoFeignClient.getSignInActPeriods(userId, actId); + } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java index c4640f2b..e46cb3a7 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActUserRelationController.java @@ -108,4 +108,18 @@ public class AppActUserRelationController { return new Result>().ok(data); } + /** + * 获取 已报名的活动时间段 + * + * @param userId + * @param actId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/3 15:54 + */ + @GetMapping("getSignInActPeriods/{userId}/{actId}") + public Result> getSignInActPeriods(@PathVariable("userId") String userId,@PathVariable("actId") String actId) { + List data = actUserRelationService.listOfSignInActPeriods(userId, actId); + return new Result>().ok(data); + } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserRelationDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserRelationDao.java index 6def72e0..f482968d 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserRelationDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/dao/ActUserRelationDao.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.modules.activity.dao; import com.elink.esua.epdc.activity.ActClockListDTO; import com.elink.esua.epdc.activity.ActClockPicDTO; +import com.elink.esua.epdc.activity.ActPeriodDTO; import com.elink.esua.epdc.activity.ActUserRelationDTO; import com.elink.esua.epdc.activity.result.ActInfoClockResultDTO; import com.elink.esua.epdc.activity.result.ActUserClockResultDTO; @@ -125,4 +126,15 @@ public interface ActUserRelationDao extends BaseDao { * @return java.util.List **/ List selectListV2ActUserRelation(EpdcClockListV2FormDTO formDTO); + + /** + * 获取 已报名的活动时间段 + * + * @param userId + * @param actId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/3 15:54 + */ + List selectListOfSignInActPeriods(@Param("userId") String userId, @Param("actId") String actId); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java index d700eb73..ee55382d 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserRelationService.java @@ -194,4 +194,15 @@ public interface ActUserRelationService extends BaseService listOfActPeriods(String actId); + + /** + * 获取 已报名的活动时间段 + * + * @param userId + * @param actId + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/3 15:54 + */ + List listOfSignInActPeriods(String userId, String actId); } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java index 109cfd47..f06ef07b 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/impl/ActUserRelationServiceImpl.java @@ -674,4 +674,8 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl listOfSignInActPeriods(String userId, String actId) { + return baseDao.selectListOfSignInActPeriods(userId, actId); + } } diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml index 874e2def..9f4166b4 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/activity/ActUserRelationDao.xml @@ -302,4 +302,20 @@ order by auc.CLOCK_TIME desc LIMIT #{pageIndex}, #{pageSize} + +