diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java index f64f33bae..e1141505f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserCancelsignupDTO.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.dto.form; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -39,9 +40,12 @@ public class EpdcAppActUserCancelsignupDTO implements Serializable { /** * 活动ID */ - private String actId; + @NotBlank(message = "活动ID不能为空") + private String actId; + /** * 取消报名原因 */ + @NotBlank(message = "取消报名原因不能为空") private String failureReason; -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserClockLogDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserClockLogDTO.java index e63f6ab67..2d30a4525 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserClockLogDTO.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppActUserClockLogDTO.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.dto.form; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.math.BigDecimal; import java.util.ArrayList; @@ -41,10 +42,12 @@ public class EpdcAppActUserClockLogDTO implements Serializable { /** * 活动ID */ - private String actId; + @NotBlank(message = "活动ID不能为空") + private String actId; /** * 打卡描述 */ + @NotBlank(message = "打卡描述不能为空") private String clockDesc; /** * 打卡位置经度 @@ -57,6 +60,7 @@ public class EpdcAppActUserClockLogDTO implements Serializable { /** * 打卡地址 */ + @NotBlank(message = "打卡地址不能为空") private String clockAddress; /** * 打卡图片 @@ -65,10 +69,12 @@ public class EpdcAppActUserClockLogDTO implements Serializable { /** * 打卡类型(0-打卡,1-更新打卡) */ - private String clockType; + @NotBlank(message = "打卡类型不能为空") + private String clockType; /** * 打卡是否有效(0-否,1-是) */ + @NotBlank(message = "打卡是否有效不能为空") private String effectiveFlag; -} \ No newline at end of file +} 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 a8acaa43b..d1815b563 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 @@ -12,6 +12,7 @@ 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.utils.ConvertUtils; 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.result.EpdcUserInfoResultDTO; import com.elink.esua.epdc.dto.form.EpdcAppActUserCancelsignupDTO; import com.elink.esua.epdc.dto.form.EpdcAppActUserClockLogDTO; @@ -19,6 +20,7 @@ import com.elink.esua.epdc.dto.result.EpdcAppClockListDTO; import com.elink.esua.epdc.service.ActUserRelationService; import com.elink.esua.epdc.service.AppUserService; import com.elink.esua.epdc.utils.UserTagUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -51,10 +53,13 @@ public class ApiActUserRelationController { */ @PostMapping("signup") public Result activitySignUp(@LoginUser TokenDto tokenDto,String actId) { + if (StringUtils.isBlank(actId)) { + return new Result().error("活动id不能为空"); + } //验证是否为志愿者 Result isVolunteer = appUserService.getVolunteerCountById(tokenDto); int code = isVolunteer.getCode(); - if(code != 0){ + if (code != 0) { //不是志愿者 return isVolunteer; } @@ -93,6 +98,7 @@ public class ApiActUserRelationController { */ @PostMapping("cancelsignup") public Result activityCancelSignUp(@LoginUser TokenDto tokenDto,@RequestBody EpdcAppActUserCancelsignupDTO epdcAppActUserCancelsignupDTO) { + ValidatorUtils.validateEntity(epdcAppActUserCancelsignupDTO); epdcAppActUserCancelsignupDTO.setUserId(tokenDto.getUserId()); AppActUserCancelsignupDTO actUserCancelsignupDTO = ConvertUtils.sourceToTarget(epdcAppActUserCancelsignupDTO, AppActUserCancelsignupDTO.class); return actUserRelationService.activityCancelSignUp(actUserCancelsignupDTO); @@ -110,6 +116,7 @@ public class ApiActUserRelationController { */ @PostMapping("clock") public Result activityClock(@LoginUser TokenDto tokenDto, @RequestBody EpdcAppActUserClockLogDTO epdcAppActUserClockLogDTO) { + ValidatorUtils.validateEntity(epdcAppActUserClockLogDTO); AppActUserClockLogDTO appActUserClockLogDTO = ConvertUtils.sourceToTarget(epdcAppActUserClockLogDTO, AppActUserClockLogDTO.class); appActUserClockLogDTO.setUserId(tokenDto.getUserId()); return actUserRelationService.activityClock(appActUserClockLogDTO); 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 index fc5268df8..20a4cca3f 100644 --- 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 @@ -7,10 +7,13 @@ 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.dto.item.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.*; +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; @@ -61,6 +64,9 @@ public class ApiAppActInfoController { */ @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()); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java index c1ca0968a..f7de7f8a5 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ActInfoFeignClient.java @@ -4,21 +4,14 @@ 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.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.config.FeignRequestInterceptor; -import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; -import com.elink.esua.epdc.dto.item.form.*; -import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.feign.fallback.ActInfoFeignClientFallback; -import com.elink.esua.epdc.feign.fallback.WorkItemFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; import java.util.List; @@ -27,7 +20,7 @@ import java.util.List; * @Author LPF * @Date 2019/11/18 16:39 */ -@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = ActInfoFeignClientFallback.class, configuration = FeignRequestInterceptor.class) +@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = ActInfoFeignClientFallback.class, configuration = FeignRequestInterceptor.class, url = "http://127.0.0.1:9072") public interface ActInfoFeignClient { 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 00f257f18..5d0e9b24d 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 @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.PathVariable; * @Author:wanggongfeng * @Date:2019/12/16 17:36 */ -@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppActUserRelationFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_HEART_SERVER, fallback = AppActUserRelationFeignClientFallback.class, url = "http://127.0.0.1:9072") public interface AppActUserRelationFeignClient { /** diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserCancelsignupDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserCancelsignupDTO.java index 15dc4938c..8ed743d9e 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserCancelsignupDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserCancelsignupDTO.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.activity; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -39,9 +40,11 @@ public class AppActUserCancelsignupDTO implements Serializable { /** * 活动ID */ - private String actId; + @NotBlank(message = "活动ID不能为空") + private String actId; /** * 取消报名原因 */ + @NotBlank(message = "取消报名原因不能为空") private String failureReason; -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java index 3b4471a36..54a16100b 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/activity/AppActUserClockLogDTO.java @@ -19,6 +19,7 @@ package com.elink.esua.epdc.activity; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.math.BigDecimal; import java.util.ArrayList; @@ -41,10 +42,12 @@ public class AppActUserClockLogDTO implements Serializable { /** * 活动ID */ - private String actId; + @NotBlank(message = "活动ID不能为空") + private String actId; /** * 打卡描述 */ + @NotBlank(message = "打卡描述不能为空") private String clockDesc; /** * 打卡位置经度 @@ -57,6 +60,7 @@ public class AppActUserClockLogDTO implements Serializable { /** * 打卡地址 */ + @NotBlank(message = "打卡地址不能为空") private String clockAddress; /** * 打卡图片 @@ -65,10 +69,12 @@ public class AppActUserClockLogDTO implements Serializable { /** * 打卡类型(0-打卡,1-更新打卡) */ - private String clockType; + @NotBlank(message = "打卡类型不能为空") + private String clockType; /** * 打卡是否有效(0-否,1-是) */ + @NotBlank(message = "打卡是否有效不能为空") private String effectiveFlag; -} \ 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/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 3514e776d..d36946a8c 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 @@ -21,6 +21,7 @@ import com.elink.esua.epdc.activity.ActUserRelationDTO; import com.elink.esua.epdc.activity.AppActUserCancelsignupDTO; import com.elink.esua.epdc.activity.AppClockListDTO; 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.ActUserRelationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,7 +35,7 @@ import org.springframework.web.bind.annotation.*; @RestController @RequestMapping("appactuserrelation") public class AppActUserRelationController { - + @Autowired private ActUserRelationService actUserRelationService; @@ -55,7 +56,7 @@ public class AppActUserRelationController { */ @GetMapping("activityCancelSignUp") public Result activityCancelSignUp(@RequestBody AppActUserCancelsignupDTO appActUserCancelsignupDTO){ - + ValidatorUtils.validateEntity(appActUserCancelsignupDTO); return actUserRelationService.activityCancelSignUp(appActUserCancelsignupDTO); } @@ -79,4 +80,4 @@ public class AppActUserRelationController { return actUserRelationService.updateAuditDefaultStatus(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/ActUserPointsLogService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserPointsLogService.java index fd65c8b10..573c2f883 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserPointsLogService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/activity/service/ActUserPointsLogService.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; /** - * + * * * @author qu qu@elink-cn.com * @since v1.0.0 2019-12-21 @@ -92,4 +92,13 @@ public interface ActUserPointsLogService extends BaseService