diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomizedDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomizedDTO.java index aa54ed57bf..e9c924f24c 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomizedDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/CustomizedDTO.java @@ -64,4 +64,9 @@ public class CustomizedDTO implements Serializable { * 来源app(政府端:gov、居民端:resi) */ private String fromApp; + + /** + * 业务域名是否必填标识:0 [业务域名]字段 非必填; 1 [业务域名]字段 必填. + */ + private String isDomainName; } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveFunctionCustomizedFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveFunctionCustomizedFormDTO.java index 20d3fd5298..e9fbe3c0ed 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveFunctionCustomizedFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/SaveFunctionCustomizedFormDTO.java @@ -61,7 +61,6 @@ public class SaveFunctionCustomizedFormDTO implements Serializable { /** * 业务域名(https;//... 无端口号) */ - @NotBlank(message = "业务域名(https;//... 无端口号)不能为空") private String domainName; /** @@ -69,4 +68,10 @@ public class SaveFunctionCustomizedFormDTO implements Serializable { */ @NotBlank(message = "来源app(工作端:gov、居民端:resi)不能为空") private String fromApp; + + /** + * 业务域名是否必填标识:0 [业务域名]字段 非必填; 1 [业务域名]字段 必填. + */ + @NotBlank(message = "业务域名是否必填标识不能为空") + private String isDomainName; } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/UpdateCustomizedFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/UpdateCustomizedFormDTO.java index ec690c3a49..1af9144c50 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/UpdateCustomizedFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/UpdateCustomizedFormDTO.java @@ -61,7 +61,6 @@ public class UpdateCustomizedFormDTO implements Serializable { /** * 业务域名 */ - @NotBlank(message = "业务域名不能为空") private String domainName; /** @@ -69,4 +68,10 @@ public class UpdateCustomizedFormDTO implements Serializable { */ @NotBlank(message = "来源app(工作端:gov、居民端:resi)不能为空") private String fromApp; + + /** + * 业务域名是否必填标识:0 [业务域名]字段 非必填; 1 [业务域名]字段 必填. + */ + @NotBlank(message = "业务域名是否必填标识不能为空") + private String isDomainName; } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerResultDTO.java index 3c993374b3..162ce43cd0 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/CustomerResultDTO.java @@ -71,4 +71,8 @@ public class CustomerResultDTO implements Serializable { */ private String functionExplain; + /** + * 业务域名是否必填标识:0 [业务域名]字段 非必填; 1 [业务域名]字段 必填. + */ + private String isDomainName; } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionCustomizedDetailResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionCustomizedDetailResultDTO.java index e232ce5f2f..8595c2e20c 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionCustomizedDetailResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/FunctionCustomizedDetailResultDTO.java @@ -63,4 +63,9 @@ public class FunctionCustomizedDetailResultDTO implements Serializable { * 是否有客户在使用(0:否 1:是) */ private Integer isApply; + + /** + * 业务域名是否必填标识:0 [业务域名]字段 非必填; 1 [业务域名]字段 必填. + */ + private String isDomainName; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java index 8326a0a528..f217afd16c 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/FunctionCustomizedController.java @@ -17,6 +17,8 @@ package com.epmet.controller; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; @@ -31,6 +33,7 @@ import com.epmet.dto.result.FunctionCustomizedDetailResultDTO; import com.epmet.dto.result.FunctionCustomizedListResultDTO; import com.epmet.excel.FunctionCustomizedExcel; import com.epmet.service.FunctionCustomizedService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -105,6 +108,9 @@ public class FunctionCustomizedController { @PostMapping("savefunctioncustomized") public Result saveFunctionCustomized(@RequestBody SaveFunctionCustomizedFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); + if (NumConstant.ONE_STR.equals(formDTO.getIsDomainName()) && StringUtils.isBlank(formDTO.getDomainName())) { + throw new RenException("业务域名为空!"); + } functionCustomizedService.saveFunctionCustomized(formDTO); return new Result(); } @@ -142,7 +148,7 @@ public class FunctionCustomizedController { /** * 定制功能修改 - * 有客户在使用该功能时则不允许修改上下架状态、业务域名和外链地址、所属端app, + * 有客户在使用该功能时则不允许修改上下架状态、业务域名、业务域名是否必填标识(2021-04-12日追加)和外链地址、所属端app, * 只能修改功能名称和大小图标、功能说明 * 修改的要判断是否有客户在使用,有用的要批量更新已使用客户数据 * @@ -154,6 +160,9 @@ public class FunctionCustomizedController { @PostMapping("updatecustomized") public Result updateCustomized(@RequestBody UpdateCustomizedFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO); + if (NumConstant.ONE_STR.equals(formDTO.getIsDomainName()) && StringUtils.isBlank(formDTO.getDomainName())) { + throw new RenException("业务域名为空!"); + } return functionCustomizedService.updateCustomized(formDTO); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionCustomizedEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionCustomizedEntity.java index 45983b12b0..23aace2a98 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionCustomizedEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/FunctionCustomizedEntity.java @@ -73,4 +73,9 @@ public class FunctionCustomizedEntity extends BaseEpmetEntity { */ private String fromApp; + /** + * 业务域名是否必填标识:0 [业务域名]字段 非必填; 1 [业务域名]字段 必填. + */ + private String isDomainName; + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java index 9a7a1dc122..4134eed6ac 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/FunctionCustomizedServiceImpl.java @@ -139,6 +139,7 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl FROM_APP = #{fromApp}, + + IS_DOMAIN_NAME = #{isDomainName}, + UPDATED_TIME = now() WHERE DEL_FLAG = '0'