From 38dee30efa61dfc03699bbf138db3cf1686f85e9 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 30 Apr 2020 16:50:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E5=BA=9C=E7=AB=AF-=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0-Bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/AddAgencyFormDTO.java | 10 ++++------ .../epmet/constant/CustomerAgencyConstant.java | 16 ++++++++++++++++ .../com/epmet/controller/AgencyController.java | 16 ++++++++++++++++ 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java index 0e64901007..a177306a68 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java @@ -69,22 +69,20 @@ public class AddAgencyFormDTO implements Serializable { /** * 省份 */ - @NotBlank(message = "省级名称不能为空") - @Length(max=30,message = "省份名称不能超过30个字") + @NotBlank(message = "省级机关名称不能为空") + @Length(max=30,message = "省级机关名称不能超过30个字") private String province; /** * 城市 */ - @NotBlank(message = "市级名称不能为空") - @Length(max=30,message = "市级名称不能超过30个字") + @Length(max=30,message = "市级机关名称不能超过30个字") private String city; /** * 区县 */ - @NotBlank(message = "区县名称不能为空") - @Length(max=30,message = "区县名称不能超过30个字") + @Length(max=30,message = "区县级机关名称不能超过30个字") private String district; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java index 3c28f465f9..7200bca2a3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/CustomerAgencyConstant.java @@ -18,4 +18,20 @@ public interface CustomerAgencyConstant { * 组织删除失败 */ String DEL_EXCEPTION = "组织删除失败"; + /** + * 机关级别-省级 + */ + String PROVINCE_LEVEL = "province"; + /** + * 机关级别-市级 + */ + String CITY_LEVEL = "city"; + /** + * 市级名称不能为空 + */ + String CITY_EXCEPTION = "市级机关名称不能为空"; + /** + * 区县名称不能为空 + */ + String DISTRICT_EXCEPTION = "区县级机关名称不能为空"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index 184dfc1a87..31a61eba22 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -18,9 +18,11 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constant.CustomerAgencyConstant; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.AddAgencyResultDTO; @@ -29,6 +31,7 @@ import com.epmet.dto.result.AgencysResultDTO; import com.epmet.dto.result.SubAgencyResultDTO; import com.epmet.entity.CustomerAgencyEntity; import com.epmet.service.AgencyService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -57,6 +60,19 @@ public class AgencyController { @PostMapping("addagency") public Result addAgency(@LoginUser TokenDto tokenDTO, @RequestBody AddAgencyFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO); + //机构级别是市级以上则市、区县名称可不传值，是区县级以上则区县名称可不传值 + if(!CustomerAgencyConstant.PROVINCE_LEVEL.equals(formDTO.getLevel())&&!CustomerAgencyConstant.CITY_LEVEL.equals(formDTO.getLevel())){ + if(StringUtils.isBlank(formDTO.getCity())){ + throw new RenException(CustomerAgencyConstant.CITY_EXCEPTION); + } + if(StringUtils.isBlank(formDTO.getDistrict())){ + throw new RenException(CustomerAgencyConstant.DISTRICT_EXCEPTION); + } + }else if(!CustomerAgencyConstant.PROVINCE_LEVEL.equals(formDTO.getLevel())){ + if(StringUtils.isBlank(formDTO.getCity())){ + throw new RenException(CustomerAgencyConstant.CITY_EXCEPTION); + } + } return agencyService.addAgency(formDTO); }