diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/epdc-api-server.iml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/epdc-api-server.iml index 074c8d8c..640d691c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/epdc-api-server.iml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/epdc-api-server.iml @@ -27,6 +27,7 @@ + diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java new file mode 100644 index 00000000..cb152614 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppActInfoController.java @@ -0,0 +1,115 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.activity.ActBannerDTO; +import com.elink.esua.epdc.activity.form.ActInfoAppFormDTO; +import com.elink.esua.epdc.activity.result.ActInfoAppResultDTO; +import com.elink.esua.epdc.activity.result.ActInfoDetailAppResultDTO; +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.service.ActInfoService; +import org.apache.commons.lang3.StringUtils; +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; + +/** + * 移动端接口-项目模块 + * + * @Author LPF + * @Date 2019/11/18 13:32 + */ +@RestController +@RequestMapping("heart/act") +public class ApiAppActInfoController { + + @Autowired + private ActInfoService actInfoService; + + + /** + * 活动列表 + * + * @Params: [ formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + @GetMapping("list") + public Result> listItems(ActInfoAppFormDTO formDto, @LoginUser TokenDto tokenDto) { + formDto.setUserId(tokenDto.getUserId()); + return actInfoService.listItems(formDto); + } + + /** + * 活动列表 + * + * @Params: [ formDto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + @GetMapping("signupList") + public Result> signupListItems(ActInfoAppFormDTO formDto, @LoginUser TokenDto tokenDto) { + formDto.setUserId(tokenDto.getUserId()); + return actInfoService.signupListItems(formDto); + } + + /** + * 项目详情 + * + * @Params: [id] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + @GetMapping("detail/{id}") + public Result detail(@PathVariable String id, @LoginUser TokenDto tokenDto) { + if (StringUtils.isBlank(id)) { + return new Result().error("id不能为空"); + } + ActInfoAppFormDTO formDto = new ActInfoAppFormDTO(); + formDto.setId(id); + formDto.setUserId(tokenDto.getUserId()); + return actInfoService.getDetail(formDto); + } + + /** + * 获取活动报名审核失败记录 + * + * @param id + * @param tokenDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author work@yujt.net.cn + * @date 2020/4/7 10:08 + */ + @GetMapping("rejectDetail/{id}") + public Result rejectDetail(@PathVariable String id, @LoginUser TokenDto tokenDto) { + ActInfoAppFormDTO formDto = new ActInfoAppFormDTO(); + formDto.setId(id); + formDto.setUserId(tokenDto.getUserId()); + return actInfoService.getRejectDetail(formDto); + } + + /** + * 项目详情 + * + * @Params: [id] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: lipengfei + * @Date: 2019/11/19 16:34 + */ + @GetMapping("cancelDetail/{id}") + public Result cancelDetail(@PathVariable String id) { + return actInfoService.getCancelDetail(id); + } + + @GetMapping("banner/list") + public Result> bannerList() { + return actInfoService.getBannerList(); + } +} diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/epdc-events-server.iml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/epdc-events-server.iml index 16ba2102..fbeb752f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/epdc-events-server.iml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/epdc-events-server.iml @@ -22,6 +22,7 @@ + diff --git a/esua-epdc/epdc-module/epdc-group/epdc-group-server/epdc-group-server.iml b/esua-epdc/epdc-module/epdc-group/epdc-group-server/epdc-group-server.iml index 685e56d1..36b10be5 100644 --- a/esua-epdc/epdc-module/epdc-group/epdc-group-server/epdc-group-server.iml +++ b/esua-epdc/epdc-module/epdc-group/epdc-group-server/epdc-group-server.iml @@ -21,6 +21,7 @@ + diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/epdc-heart-server.iml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/epdc-heart-server.iml index 00755288..246ed172 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/epdc-heart-server.iml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/epdc-heart-server.iml @@ -20,6 +20,7 @@ +