From e69aa0f838b72981a2ff3f40faa72196446d0019 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.coom> Date: Mon, 12 Apr 2021 16:58:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[=E5=AE=9A=E5=88=B6=E5=8A=9F=E8=83=BD=20]?= =?UTF-8?q?=20=E8=A1=A8=E5=A2=9E=E5=8A=A0IS=5FDOMAIN=5FNAME=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/CustomizedDTO.java | 5 +++++ .../dto/form/SaveFunctionCustomizedFormDTO.java | 7 ++++++- .../epmet/dto/form/UpdateCustomizedFormDTO.java | 7 ++++++- .../com/epmet/dto/result/CustomerResultDTO.java | 4 ++++ .../FunctionCustomizedDetailResultDTO.java | 5 +++++ .../FunctionCustomizedController.java | 11 ++++++++++- .../epmet/entity/FunctionCustomizedEntity.java | 5 +++++ .../impl/FunctionCustomizedServiceImpl.java | 17 ++++++++--------- .../mapper/CustomerFunctionDetailDao.xml | 3 ++- .../resources/mapper/FunctionCustomizedDao.xml | 9 +++++++-- 10 files changed, 58 insertions(+), 15 deletions(-) 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' From 415c57188826f5ba4b174eef1ea616c038b209b4 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 20 Apr 2021 14:02:36 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=BF=90=E8=90=A5=E7=AB=AF=E5=AE=9A?= =?UTF-8?q?=E5=88=B6=E5=8A=9F=E8=83=BD=E4=B8=9A=E5=8A=A1=E5=9F=9F=E5=90=8D?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=9D=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.8__alter_function_customized.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql new file mode 100644 index 0000000000..67e6bc0ea6 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql @@ -0,0 +1,3 @@ +ALTER TABLE function_customized MODIFY `DOMAIN_NAME` varchar(128) DEFAULT NULL COMMENT ''业务域名(可设置多个 用分号分隔)''; + +ALTER TABLE function_customized add column IS_DOMAIN_NAME varchar(1) NOT NULL DEFAULT ''1'' COMMENT ''业务域名是否必填标识：0 [业务域名]字段 非必填; 1 [业务域名]字段 必填.''; \ No newline at end of file From 67a7d3f3855ca5253c9e22921814e5a1abedef8f Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 20 Apr 2021 14:22:02 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=84=91=E5=A3=B3=E7=96=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.9__alter_function_customized_v2.sql | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.9__alter_function_customized_v2.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.9__alter_function_customized_v2.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.9__alter_function_customized_v2.sql new file mode 100644 index 0000000000..4aa497be86 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.9__alter_function_customized_v2.sql @@ -0,0 +1,7 @@ +ALTER TABLE `function_customized` +DROP COLUMN `IS_DOMAIN_NAME`; + + +ALTER TABLE function_customized MODIFY `DOMAIN_NAME` varchar(128) DEFAULT NULL COMMENT '业务域名(可设置多个 用分号分隔)'; + +ALTER TABLE function_customized add column IS_DOMAIN_NAME varchar(1) NOT NULL DEFAULT '1' COMMENT '业务域名是否必填标识：0 [业务域名]字段 非必填; 1 [业务域名]字段 必填.'; \ No newline at end of file From e406e839a4ad41a64efd864cf80cf4f6813b7248 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 20 Apr 2021 14:32:42 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9C=8D=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.8__alter_function_customized.sql | 6 ++++-- .../db/migration/V0.0.9__alter_function_customized_v2.sql | 7 ------- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.9__alter_function_customized_v2.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql index 67e6bc0ea6..6f52c92746 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql @@ -1,3 +1,5 @@ -ALTER TABLE function_customized MODIFY `DOMAIN_NAME` varchar(128) DEFAULT NULL COMMENT ''业务域名(可设置多个 用分号分隔)''; -ALTER TABLE function_customized add column IS_DOMAIN_NAME varchar(1) NOT NULL DEFAULT ''1'' COMMENT ''业务域名是否必填标识：0 [业务域名]字段 非必填; 1 [业务域名]字段 必填.''; \ No newline at end of file + +ALTER TABLE function_customized MODIFY `DOMAIN_NAME` varchar(128) DEFAULT NULL COMMENT '业务域名(可设置多个 用分号分隔)'; + +ALTER TABLE function_customized add column IS_DOMAIN_NAME varchar(1) NOT NULL DEFAULT '1' COMMENT '业务域名是否必填标识：0 [业务域名]字段 非必填; 1 [业务域名]字段 必填.'; \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.9__alter_function_customized_v2.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.9__alter_function_customized_v2.sql deleted file mode 100644 index 4aa497be86..0000000000 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.9__alter_function_customized_v2.sql +++ /dev/null @@ -1,7 +0,0 @@ -ALTER TABLE `function_customized` -DROP COLUMN `IS_DOMAIN_NAME`; - - -ALTER TABLE function_customized MODIFY `DOMAIN_NAME` varchar(128) DEFAULT NULL COMMENT '业务域名(可设置多个 用分号分隔)'; - -ALTER TABLE function_customized add column IS_DOMAIN_NAME varchar(1) NOT NULL DEFAULT '1' COMMENT '业务域名是否必填标识：0 [业务域名]字段 非必填; 1 [业务域名]字段 必填.'; \ No newline at end of file From 347b41c45b005fec1040809faaa6cc815c7255ff Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 20 Apr 2021 14:43:10 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...tion_customized.sql => V0.0.10__alter_function_customized.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/{V0.0.8__alter_function_customized.sql => V0.0.10__alter_function_customized.sql} (100%) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.10__alter_function_customized.sql similarity index 100% rename from epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.8__alter_function_customized.sql rename to epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.10__alter_function_customized.sql