From 63c2bfc5ad7d0e1be32046650030ce1e8e0e56e9 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 23 Jun 2020 14:58:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=AE=B2=E5=9D=9B=C2=A0-?= =?UTF-8?q?=C2=A0=E5=B1=85=E6=B0=91=E7=AB=AF=C2=A0=C2=A0-=C2=A0=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E6=8A=A5=E5=90=8D=20=E6=8E=A5=E5=8F=A3=E4=B8=9A?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ActivityInfoController.java | 2 +- .../ActivityParticipantController.java | 2 +- .../controller/AppActivityInfoController.java | 12 ++++-- .../service/ActivityParticipantService.java | 11 +++++ .../impl/ActivityParticipantServiceImpl.java | 40 ++++++++++++++++--- 5 files changed, 55 insertions(+), 12 deletions(-) diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActivityInfoController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActivityInfoController.java index fbd850c..c28c531 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActivityInfoController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActivityInfoController.java @@ -23,8 +23,8 @@ 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.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.activity.ActivityInfoDTO; import com.elink.esua.epdc.modules.activity.excel.ActivityInfoExcel; import com.elink.esua.epdc.modules.activity.service.ActivityInfoService; diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActivityParticipantController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActivityParticipantController.java index d557788..daf0a82 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActivityParticipantController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/ActivityParticipantController.java @@ -23,8 +23,8 @@ 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.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.activity.ActivityParticipantDTO; import com.elink.esua.epdc.modules.activity.excel.ActivityParticipantExcel; import com.elink.esua.epdc.modules.activity.service.ActivityParticipantService; diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActivityInfoController.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActivityInfoController.java index c2ac017..24fd3d1 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActivityInfoController.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/controller/AppActivityInfoController.java @@ -22,12 +22,13 @@ 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.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.dto.activity.ActivityInfoDTO; import com.elink.esua.epdc.dto.activity.form.ActivityDetailFormDTO; import com.elink.esua.epdc.dto.activity.form.ActivityInfoFormDTO; +import com.elink.esua.epdc.dto.activity.form.ActivityParticipantFormDTO; import com.elink.esua.epdc.dto.activity.result.ActivityDetailResultDTO; import com.elink.esua.epdc.dto.activity.result.ActivityInfoResultDTO; import com.elink.esua.epdc.modules.activity.service.ActivityInfoService; +import com.elink.esua.epdc.modules.activity.service.ActivityParticipantService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -47,6 +48,9 @@ public class AppActivityInfoController { @Autowired private ActivityInfoService activityInfoService; + @Autowired + private ActivityParticipantService activityParticipantService; + @GetMapping("listActivity") public Result> listActivity(@RequestBody ActivityInfoFormDTO formDto) { List page = activityInfoService.listActivity(formDto); @@ -59,11 +63,11 @@ public class AppActivityInfoController { return new Result().ok(data); } - @PostMapping - public Result save(@RequestBody ActivityInfoDTO dto) { + @PostMapping("singUp") + public Result save(@RequestBody ActivityParticipantFormDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - activityInfoService.save(dto); + activityParticipantService.signUp(dto); return new Result(); } diff --git a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/ActivityParticipantService.java b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/ActivityParticipantService.java index 5c304af..0becbfd 100644 --- a/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/ActivityParticipantService.java +++ b/epdc-cloud-property/src/main/java/com/elink/esua/epdc/modules/activity/service/ActivityParticipantService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.activity.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.activity.ActivityParticipantDTO; +import com.elink.esua.epdc.dto.activity.form.ActivityParticipantFormDTO; import com.elink.esua.epdc.modules.activity.entity.ActivityParticipantEntity; import java.util.List; @@ -73,6 +74,16 @@ public interface ActivityParticipantService extends BaseService page(Map params) { IPage page = getPage(params); @@ -66,8 +72,8 @@ public class ActivityParticipantServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + 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); @@ -88,6 +94,17 @@ public class ActivityParticipantServiceImpl extends BaseServiceImpl