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] =?UTF-8?q?[=E5=AE=9A=E5=88=B6=E5=8A=9F=E8=83=BD=20]=20?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0IS=5FDOMAIN=5FNAME=E5=AD=97=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<FunctionCusto
         entity.setTargetLink(formDTO.getTargetLink());
         entity.setDomainName(formDTO.getDomainName());
         entity.setFromApp(formDTO.getFromApp());
+        entity.setIsDomainName(formDTO.getIsDomainName());
         insert(entity);
     }
 
@@ -195,29 +196,27 @@ public class FunctionCustomizedServiceImpl extends BaseServiceImpl<FunctionCusto
             for (int i = 0; i < customizedId.size(); i++){
                 if (null != customizedDTO){
                     // 3.1 功能信息和客户信息：判断这个功能，用户使用的是默认的，还是自定义的
+                    // StringUtils.isBlank(customizedDTO.getDomainName()  特殊处理，domainName为空的情况
                     if (customizedDTO.getCustomizedName().equals(customizedId.get(i).getFunctionName())
                             && customizedDTO.getIconLargeImg().equals(customizedId.get(i).getIconLargeImg())
                             && customizedDTO.getIconSmallImg().equals(customizedId.get(i).getIconSmallImg())
-                            && customizedDTO.getDomainName().equals(customizedId.get(i).getDomainName())
+                            && (StringUtils.isBlank(customizedDTO.getDomainName()) || customizedDTO.getDomainName().equals(customizedId.get(i).getDomainName()))
                             && customizedDTO.getTargetLink().equals(customizedId.get(i).getTargetLink()) ){
                             // 这个功能，客户使用的是默认的，则判断本次修改的字段，如果是功能名称和大小图标、功能说明，则批量更新客户数据，负责提示 不能修改
-                            if (!formDTO.getShoppingStatus().equals(customizedDTO.getShoppingStatus())
-                                    || !formDTO.getTargetLink().equals(customizedDTO.getTargetLink())
-                                    || !formDTO.getDomainName().equals(customizedDTO.getDomainName())
-                                    || !formDTO.getFromApp().equals(customizedDTO.getFromApp()) ){
-                                // 4.1 如果修改的内容是其他字段，则返回语句
-                                tipCustomizedInfoUserId.append(customizedId.get(i).getId() + ",");
-                            } else if (!formDTO.getFunctionName().equals(customizedDTO.getCustomizedName())
+                            if (!formDTO.getFunctionName().equals(customizedDTO.getCustomizedName())
                                         || !formDTO.getFunctionExplain().equals(customizedDTO.getFunctionExplain())
                                         || !formDTO.getIconLargeImg().equals(customizedDTO.getIconLargeImg())
                                         || !formDTO.getIconSmallImg().equals(customizedDTO.getIconSmallImg())){
-                                // 4.2 如果修改的内容只是：功能名称和大小图标、功能说明，, 需要批量更新客户数据
+                                // 4.1 如果修改的内容只是：功能名称和大小图标、功能说明，, 需要批量更新客户数据
                                 CustomerFunctionDetailEntity customer = new CustomerFunctionDetailEntity();
                                 customer.setFunctionName(formDTO.getFunctionName());
                                 customer.setIconLargeImg(formDTO.getIconLargeImg());
                                 customer.setIconSmallImg(formDTO.getIconSmallImg());
                                 customer.setId(customizedId.get(i).getId());
                                 upCustomizedInfo.add(customer);
+                            } else {
+                                // 4.2 如果修改的内容是其他字段，则返回提示信息
+                                tipCustomizedInfoUserId.append(customizedId.get(i).getId() + ",");
                             }
                     } else {
                         // 3.2 用户使用的是自定义的功能，则不予处理
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml
index 76ef19210d..2c4b264b50 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/CustomerFunctionDetailDao.xml
@@ -63,7 +63,8 @@
             fc.from_app AS "fromApp",
             fc.icon_large_img AS "defaultLargeImg",
             fc.icon_small_img AS "defaultSmallImg",
-            f.function_explain AS "functionExplain"
+            f.function_explain AS "functionExplain",
+            fc.IS_DOMAIN_NAME AS "isDomainName"
         FROM
             customer_function_detail cfd
         INNER JOIN function_customized fc ON cfd.function_id = fc.function_id
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml
index 1e304190cf..38af4ad98a 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/FunctionCustomizedDao.xml
@@ -14,7 +14,8 @@
             cu.ICON_SMALL_IMG iconSmallImg,
             cu.TARGET_LINK targetLink,
             cu.DOMAIN_NAME domainName,
-            cu.FROM_APP fromApp
+            cu.FROM_APP fromApp,
+            cu.IS_DOMAIN_NAME isDomainName
         FROM function_customized cu
         LEFT JOIN `function` f ON cu.FUNCTION_ID = f.ID
         WHERE cu.DEL_FLAG = '0'
@@ -38,7 +39,8 @@
             cu.ICON_SMALL_IMG iconSmallImg,
             cu.TARGET_LINK targetLink,
             cu.DOMAIN_NAME domainName,
-            cu.FROM_APP fromApp
+            cu.FROM_APP fromApp,
+            cu.IS_DOMAIN_NAME isDomainName
         FROM `function` f
         LEFT JOIN function_customized cu ON f.ID = cu.FUNCTION_ID
         WHERE f.DEL_FLAG = '0'
@@ -156,6 +158,9 @@
         <if test="fromApp != null and fromApp.trim() != ''">
             FROM_APP = #{fromApp},
         </if>
+        <if test="isDomainName != null and isDomainName.trim() != ''">
+            IS_DOMAIN_NAME = #{isDomainName},
+        </if>
         UPDATED_TIME = now()
         WHERE
             DEL_FLAG = '0'