From fb9533935200c532d0b11ae8bee091823be28cea Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 17 Dec 2019 11:07:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=9A=E5=B8=B8?= =?UTF-8?q?=E7=94=A8=E8=AF=AD=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiActPhraseController.java | 59 +++++++++++++++++++ .../ApiActUserRelationController.java | 7 +-- .../epdc/feign/AppActPhraseFeignClient.java | 35 +++++++++++ .../feign/AppActUserRelationFeignClient.java | 4 +- .../AppActPhraseFeignClientFallback.java | 25 ++++++++ .../esua/epdc/service/ActPhraseService.java | 30 ++++++++++ .../epdc/service/ActUserRelationService.java | 2 +- .../service/impl/ActPhraseServiceImpl.java | 36 +++++++++++ .../AppActUserRelationController.java | 2 +- .../controller/AppActPhraseController.java | 56 ++++++++++++++++++ 10 files changed, 248 insertions(+), 8 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActPhraseController.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActPhraseFeignClient.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActPhraseFeignClientFallback.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActPhraseService.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActPhraseServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/AppActPhraseController.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActPhraseController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActPhraseController.java new file mode 100644 index 000000000..ab9ea53b4 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiActPhraseController.java @@ -0,0 +1,59 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.common.token.dto.TokenDto; +import com.elink.esua.epdc.commons.tools.annotation.LoginUser; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.service.ActPhraseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * APP常用语相关接口 + * + * @author wanggongfeng + * @date 2019/12/17 10:30 + */ +@RestController +@RequestMapping("heart") +public class ApiActPhraseController { + + @Autowired + private ActPhraseService actPhraseService; + + /** + * 使用次数加一 + * + * @param tokenDto + * @param id + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author wanggongfeng + * @date 2019/12/13 14:41 + */ + @PostMapping("phrase/sagenumAddOne") + public Result sagenumAddOneById(@LoginUser TokenDto tokenDto, @PathVariable("id") String id) { + ValidatorUtils.validateEntity(id); + return actPhraseService.sagenumAddOneById(id); + } + + /** + * 获取常用语列表 + * + * @param tokenDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author wanggongfeng + * @date 2019/12/13 14:41 + */ + @PostMapping("phrase/getPhraseList") + public Result getPhraseList(@LoginUser TokenDto tokenDto) { + ValidatorUtils.validateEntity(tokenDto); + return actPhraseService.getPhraseList(); + + } + + + +} 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 3d35df5db..1c123091b 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 @@ -18,11 +18,10 @@ import org.springframework.web.bind.annotation.RestController; import java.util.Date; /** - * 用户模块 + * APP活动相关接口 * - * @author yujintao - * @email yujintao@elink-cn.comuser/completeInfo - * @date 2019/9/6 19:30 + * @author wanggongfeng + * @date 2019/12/17 10:30 */ @RestController @RequestMapping("heart") diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActPhraseFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActPhraseFeignClient.java new file mode 100644 index 000000000..9540de9f2 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/AppActPhraseFeignClient.java @@ -0,0 +1,35 @@ +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.feign.fallback.AppActPhraseFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +/** + * + * 活动报名管理 + * + * @Author：wanggongfeng + * @Date：2019/12/16 17:36 + */ +@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppActPhraseFeignClientFallback.class) +public interface AppActPhraseFeignClient { + + /** + * 活动报名 + * + * @param id + * @return + */ + @GetMapping("heart/appactphrase/sagenumAddOneById/{id}") + Result sagenumAddOneById(@PathVariable("id") String id); + + /** + * 取消活动报名 + * @return + */ + @GetMapping("heart/appactphrase/getPhraseList") + Result getPhraseList(); +} 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 32136b734..5707c9b1e 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 @@ -24,7 +24,7 @@ public interface AppActUserRelationFeignClient { * @param actUserRelationDTO * @return */ - @GetMapping("heart/actuserrelation/activitySignUp") + @GetMapping("heart/appactuserrelation/activitySignUp") Result activitySignUp(ActUserRelationDTO actUserRelationDTO); /** @@ -33,6 +33,6 @@ public interface AppActUserRelationFeignClient { * @param actId * @return */ - @GetMapping("heart/actuserrelation/activityCancelSignUp/{userId}/{actId}") + @GetMapping("heart/appactuserrelation/activityCancelSignUp/{userId}/{actId}") Result activityCancelSignUp(@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/AppActPhraseFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActPhraseFeignClientFallback.java new file mode 100644 index 000000000..145640506 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/AppActPhraseFeignClientFallback.java @@ -0,0 +1,25 @@ +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.feign.AppActPhraseFeignClient; +import org.springframework.stereotype.Component; + +/** + * @Author：wanggongfeng + * @Date：2019/12/16 15:11 + */ +@Component +public class AppActPhraseFeignClientFallback implements AppActPhraseFeignClient { + + @Override + public Result sagenumAddOneById(String id) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "sagenumAddOneById", id); + } + @Override + public Result getPhraseList() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_HEART_SERVER, "getPhraseList"); + } + +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActPhraseService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActPhraseService.java new file mode 100644 index 000000000..9d249e4cb --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ActPhraseService.java @@ -0,0 +1,30 @@ +package com.elink.esua.epdc.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; + +/** + * @author wanggongfeng + * @date 2019/12/17 9:50 + */ +public interface ActPhraseService { + + /** + * 常用语使用次数加一 + * @param id + * @Author wanggongfeng + * @return + */ + Result sagenumAddOneById(String id); + + /** + * redis获取常用语 + * @Author wanggongfeng + * @return + */ + Result getPhraseList(); + + + + + +} 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 4523551b9..0ccef7988 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 @@ -5,7 +5,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result; /** * @author wanggongfeng - * @date 2019/9/7 9:50 + * @date 2019/12/17 9:50 */ public interface ActUserRelationService { diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActPhraseServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActPhraseServiceImpl.java new file mode 100644 index 000000000..c6e92b1d8 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ActPhraseServiceImpl.java @@ -0,0 +1,36 @@ +package com.elink.esua.epdc.service.impl; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.feign.AppActPhraseFeignClient; +import com.elink.esua.epdc.service.ActPhraseService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +/** + * @author wanggongfeng + * @date 2019/12/16 17:50 + */ +@Slf4j +@Service +public class ActPhraseServiceImpl implements ActPhraseService { + + @Autowired + private AppActPhraseFeignClient appActPhraseFeignClient; + + @Override + public Result sagenumAddOneById(String id) { + Result dataResult = appActPhraseFeignClient.sagenumAddOneById(id); + return dataResult; + } + + @Override + public Result getPhraseList() { + Result dataResult = appActPhraseFeignClient.getPhraseList(); + return dataResult; + } + + + +} 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 2617c5dd7..b79cc055e 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 @@ -32,7 +32,7 @@ import org.springframework.web.bind.annotation.RestController; * @since v1.0.0 2019-12-16 */ @RestController -@RequestMapping("actuserrelation") +@RequestMapping("appactuserrelation") public class AppActUserRelationController { @Autowired diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/AppActPhraseController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/AppActPhraseController.java new file mode 100644 index 000000000..370d9772f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/AppActPhraseController.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.modules.phrases.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.modules.phrases.entity.ActPhraseRedisEntity; +import com.elink.esua.epdc.modules.phrases.service.ActPhraseService; +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; + + +/** + * 常用语表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2019-12-11 + */ +@RestController +@RequestMapping("appactphrase") +public class AppActPhraseController { + + @Autowired + private ActPhraseService actPhraseService; + + @GetMapping(value="sagenumAddOneById",produces = "text/plain;charset=UTF-8") + public Result sagenumAddOne(String id) { + actPhraseService.updateUsagenumAddOne(id); + return new Result().ok("使用次数加一成功"); + } + + @GetMapping(value="getPhraseList",produces = "text/plain;charset=UTF-8") + public Result getPhraseList() { + List object = actPhraseService.getPhraseList(); + return new Result().ok(object); + } + +} \ No newline at end of file