Commit 64cf2f3f authored by xiaoguang.xu's avatar xiaoguang.xu

错误数据报错处理

parent 77a9f7dd
......@@ -5,6 +5,7 @@ import cn.quantgroup.xyqb.controller.middleoffice.contact.dto.ContactSaveDto;
import cn.quantgroup.xyqb.controller.middleoffice.contact.dto.ContactUpdateDto;
import cn.quantgroup.xyqb.entity.Contact;
import cn.quantgroup.xyqb.model.JsonResult;
import cn.quantgroup.xyqb.model.Tuple;
import cn.quantgroup.xyqb.service.user.IContactService;
import cn.quantgroup.xyqb.util.ValidationUtil;
import org.springframework.web.bind.annotation.GetMapping;
......@@ -73,20 +74,16 @@ public class ContactController {
public JsonResult save(@RequestBody ContactSaveDto contactSaveDto) {
Long userId = contactSaveDto.getUserId();
List<Contact> contacts = contactSaveDto.getContacts();
Timestamp now = new Timestamp(System.currentTimeMillis());
List<Contact> collect = contacts.stream()
.filter(Contact::valid)
.collect(Collectors.toList());
collect.forEach(contact -> {
for (Contact contact : contacts) {
Tuple<String, Boolean> result = contact.validAndResult();
//数据校验
if (!result.getValue()) {
return JsonResult.buildErrorStateResult(result.getKey(), null);
}
contact.setUserId(userId);
contact.setBizType(contactSaveDto.getBizType());
contact.setCreatedAt(now);
contact.setUpdatedAt(now);
});
if (collect.isEmpty()) {
return JsonResult.buildErrorStateResult("数据格式错误", null);
}
contactService.save(collect);
contactService.save(contacts);
return JsonResult.buildSuccessResult();
}
......
......@@ -3,6 +3,7 @@ package cn.quantgroup.xyqb.controller.middleoffice.contact.dto;
import cn.quantgroup.user.enums.BizType;
import cn.quantgroup.xyqb.entity.Contact;
import lombok.Data;
import org.hibernate.validator.constraints.NotEmpty;
import org.springframework.validation.annotation.Validated;
import javax.validation.constraints.NotNull;
......@@ -15,6 +16,6 @@ public class ContactSaveDto {
private Long userId;
@NotNull(message = "业务类型不能为空")
private BizType bizType;
@NotNull(message = "联系人信息不能为空")
@NotEmpty(message = "联系人信息不能为空")
private List<Contact> contacts;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment