diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractIndexFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractIndexFormDTO.java index c188b64a57..8d948a633e 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractIndexFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/ExtractIndexFormDTO.java @@ -1,7 +1,9 @@ package com.epmet.dto.extract.form; import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -13,8 +15,13 @@ public class ExtractIndexFormDTO implements Serializable { private static final long serialVersionUID = 1248641210655148366L; + public interface AddUserInternalGroup { + } + + @NotBlank(message = "customerId不能为空", groups = AddUserInternalGroup.class) private String customerId; + @Length(min = 6, max = 6, message = "monthId不能为空", groups = {AddUserInternalGroup.class}) private String monthId; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java index 80e087bc3f..b21eee911b 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java @@ -2,6 +2,7 @@ package com.epmet.service.evaluationindex.extract.dataToIndex.impl; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.extract.form.ExtractIndexFormDTO; import com.epmet.service.evaluationindex.extract.dataToIndex.*; import com.epmet.service.stats.DimCustomerService; @@ -72,6 +73,7 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService ExtractIndexFormDTO param = new ExtractIndexFormDTO(); param.setCustomerId(cId); param.setMonthId(finalMonthId); + ValidatorUtils.validateEntity(param, ExtractIndexFormDTO.AddUserInternalGroup.class); submitJob(param); }); }