From 84579c8f3f3e9fea98bc9c19a8fd03beb019d2af Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@zdjizhi.com>
Date: Fri, 21 Jun 2019 15:59:18 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E5=88=86=E7=BB=84=E5=9F=9F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=202.=E4=BF=AE=E6=AD=A3=E5=88=86=E7=BB=84=E5=9F=9F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=203.=E8=A1=A5=E6=BC=8F=E8=A1=A8=E5=8D=95GroupName?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/basics/CommonGroupManageDao.xml    |  2 +-
 .../service/basics/CommonGroupManageService.java   | 10 +++++++++-
 .../web/service/basics/DomainCommGroupService.java | 12 +++++++++---
 .../web/service/basics/IpCommGroupCfgService.java  | 14 ++++++++++----
 .../service/basics/ScriberIdCommGroupService.java  | 14 ++++++++++----
 .../web/service/basics/UrlCommGroupService.java    | 14 ++++++++++----
 .../views/basics/domainCommGroupFormAdd.jsp        |  2 +-
 .../views/basics/domainCommGroupFormUpdate.jsp     |  2 +-
 .../WEB-INF/views/basics/ipCommGroupFormAdd.jsp    |  2 +-
 .../WEB-INF/views/basics/ipCommGroupFormUpdate.jsp |  2 +-
 .../views/basics/scriberidCommGroupFormAdd.jsp     |  2 +-
 .../views/basics/scriberidCommGroupFormUpdate.jsp  |  2 +-
 .../WEB-INF/views/basics/urlCommGroupFormAdd.jsp   |  2 +-
 .../views/basics/urlCommGroupFormUpdate.jsp        |  2 +-
 14 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml
index 7ff971058..a25f41025 100644
--- a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml
@@ -214,7 +214,7 @@
 	    FROM
 	    	cfg_index_info 
 		WHERE 
-			common_group_ids LIKE concat(concat('%',#{groupId,jdbcType=VARCHAR}),'%') AND is_valid != -1 AND is_audit = 1
+			common_group_ids = #{groupId,jdbcType=VARCHAR} AND is_valid != -1 AND is_audit = 1
 	</select>
 	
 	<select id="ajaxCheckIsLastOneCfg" resultType="java.lang.Integer">
diff --git a/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java b/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java
index 027f9278e..944867cc0 100644
--- a/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java
+++ b/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java
@@ -239,19 +239,27 @@ public class CommonGroupManageService extends BaseService{
 			for (Integer cfgId : cfgIdList) {
 				cfgIds += "," + cfgId;
 			}
+			String keyString = "";
 			Integer size = 0;
 			if(groupType == Constants.IP_OBJ_GROUP_TYPE) { // IP
+				keyString = "ipGroup";
 				size = commonGroupManageDao.ajaxCheckIsLastOneCfg(groupId, cfgIds.substring(1), IpCommCfg.getIndexTable());
 			}else if(groupType == Constants.URL_OBJ_GROUP_TYPE) { // URL
+				keyString = "urlGroup";
 				size = commonGroupManageDao.ajaxCheckIsLastOneCfg(groupId, cfgIds.substring(1), UrlCommCfg.getTablename());
 			}else if(groupType == Constants.DOMAIN_OBJ_GROUP_TYPE) { // Domain
+				keyString = "domainGroup";
 				size = commonGroupManageDao.ajaxCheckIsLastOneCfg(groupId, cfgIds.substring(1), DomainCommCfg.getTablename());
 			}else if(groupType == Constants.SUBID_OBJ_GROUP_TYPE) { // ScriberId
+				keyString = "subscribeIdGroup";
 				size = commonGroupManageDao.ajaxCheckIsLastOneCfg(groupId, cfgIds.substring(1), ScriberIdCommCfg.getTablename());
 			}
 
 			if(size == 0) { // 0为分组下的最后一条配置，获取配置ID提示
-				Integer compileId = commonGroupManageDao.getCompileIdByGroupId(","+groupId+",");
+				Map<String,String> searchMap = new HashMap<String,String>();
+				searchMap.put(keyString, ","+groupId+",");
+				
+				Integer compileId = commonGroupManageDao.getCompileIdByGroupId(gsonToJson(searchMap));
 				if(compileId != null) {
 					resultList.add(compileId);
 				}
diff --git a/src/main/java/com/nis/web/service/basics/DomainCommGroupService.java b/src/main/java/com/nis/web/service/basics/DomainCommGroupService.java
index ed5a4a6db..ca3ce70e1 100644
--- a/src/main/java/com/nis/web/service/basics/DomainCommGroupService.java
+++ b/src/main/java/com/nis/web/service/basics/DomainCommGroupService.java
@@ -191,7 +191,7 @@ public class DomainCommGroupService extends CrudService<CrudDao<DomainCommCfg>,
             	Properties props = groupController.getMsgProp();
             	
             	// 配置未生效
-            	String updateStatusGroupIds = "";
+            	/*String updateStatusGroupIds = "";
             	for (String groupId : serviceGroupIds.split(",")) {
             		List<CfgIndexInfo> list = commonPolicyDao.getObjGroupListByGroupIds(groupId, 888, Constants.VALID_NO);
             		if(list.size() > 0) {
@@ -209,13 +209,19 @@ public class DomainCommGroupService extends CrudService<CrudDao<DomainCommCfg>,
                 	
                 	List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(updateStatusGroupIds);
                 	groupManageService.updateGroupStatus(policyGroupInfos, Constants.DOMAIN_OBJ_GROUP_TYPE);
-            	}
+            	}*/
             	
             	// 配置已生效
+            	// 组下无域配置common_group_ids -> "",ud_flag -> 0
             	CfgIndexInfo entity = new CfgIndexInfo(); 
             	entity.setUserRegion5(serviceGroupIds);
-            	entity.setServiceId(0);
             	entity.setFunctionId(888);
+            	entity.setCommonGroupIds("");
+            	commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
+            	List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
+            	groupManageService.updateGroupStatus(policyGroupInfos, Constants.DOMAIN_OBJ_GROUP_TYPE);
+            	
+            	entity.setServiceId(0);
             	entity.setIsValid(Constants.VALID_NO);
             	entity.setIsAudit(Constants.AUDIT_NOT_YES);
             	entity.setBatchAuditValue("1");
diff --git a/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java b/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java
index b93b87862..162fd76c0 100644
--- a/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java
+++ b/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java
@@ -184,7 +184,7 @@ public class IpCommGroupCfgService extends BaseService {
             	Properties props = groupController.getMsgProp();
             	
             	// 配置未生效
-            	String updateStatusGroupIds = "";
+            	/*String updateStatusGroupIds = "";
             	for (String groupId : serviceGroupIds.split(",")) {
             		List<CfgIndexInfo> list = commonPolicyDao.getObjGroupListByGroupIds(groupId, 888, Constants.VALID_NO);
             		if(list.size() > 0) {
@@ -202,13 +202,19 @@ public class IpCommGroupCfgService extends BaseService {
                 	
                 	List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(updateStatusGroupIds);
                 	groupManageService.updateGroupStatus(policyGroupInfos, Constants.IP_OBJ_GROUP_TYPE);
-            	}
+            	}*/
             	
-            	// 配置已生效
+            	// 配置已生效×
+            	// 组下无域配置common_group_ids -> "",ud_flag -> 0
             	CfgIndexInfo entity = new CfgIndexInfo(); 
             	entity.setUserRegion5(serviceGroupIds);
-            	entity.setServiceId(0);
             	entity.setFunctionId(888);
+            	entity.setCommonGroupIds("");
+            	commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
+            	List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
+            	groupManageService.updateGroupStatus(policyGroupInfos, Constants.IP_OBJ_GROUP_TYPE);
+            	
+            	entity.setServiceId(0);
             	entity.setIsValid(Constants.VALID_NO);
             	entity.setIsAudit(Constants.AUDIT_NOT_YES);
             	entity.setBatchAuditValue("1");
diff --git a/src/main/java/com/nis/web/service/basics/ScriberIdCommGroupService.java b/src/main/java/com/nis/web/service/basics/ScriberIdCommGroupService.java
index ebb0ca6c2..95289dcd0 100644
--- a/src/main/java/com/nis/web/service/basics/ScriberIdCommGroupService.java
+++ b/src/main/java/com/nis/web/service/basics/ScriberIdCommGroupService.java
@@ -191,7 +191,7 @@ public class ScriberIdCommGroupService extends CrudService<CrudDao<ScriberIdComm
             	Properties props = groupController.getMsgProp();
             	
             	// 配置未生效
-            	String updateStatusGroupIds = "";
+            	/*String updateStatusGroupIds = "";
             	for (String groupId : serviceGroupIds.split(",")) {
             		List<CfgIndexInfo> list = commonPolicyDao.getObjGroupListByGroupIds(groupId, 888, Constants.VALID_NO);
             		if(list.size() > 0) {
@@ -209,13 +209,19 @@ public class ScriberIdCommGroupService extends CrudService<CrudDao<ScriberIdComm
                 	
                 	List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(updateStatusGroupIds);
                 	groupManageService.updateGroupStatus(policyGroupInfos, Constants.SUBID_OBJ_GROUP_TYPE);
-            	}
+            	}*/
             	
-            	// 配置已生效
+            	// 配置已生效×
+            	// 组下无域配置common_group_ids -> "",ud_flag -> 0
             	CfgIndexInfo entity = new CfgIndexInfo(); 
             	entity.setUserRegion5(serviceGroupIds);
-            	entity.setServiceId(0);
             	entity.setFunctionId(888);
+            	entity.setCommonGroupIds("");
+            	commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
+            	List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
+            	groupManageService.updateGroupStatus(policyGroupInfos, Constants.SUBID_OBJ_GROUP_TYPE);
+            	
+            	entity.setServiceId(0);
             	entity.setIsValid(Constants.VALID_NO);
             	entity.setIsAudit(Constants.AUDIT_NOT_YES);
             	entity.setBatchAuditValue("1");
diff --git a/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java b/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java
index a8e0a98c8..642c629ed 100644
--- a/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java
+++ b/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java
@@ -191,7 +191,7 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
             	Properties props = groupController.getMsgProp();
             	
             	// 配置未生效
-            	String updateStatusGroupIds = "";
+            	/*String updateStatusGroupIds = "";
             	for (String groupId : serviceGroupIds.split(",")) {
             		List<CfgIndexInfo> list = commonPolicyDao.getObjGroupListByGroupIds(groupId, 888, Constants.VALID_NO);
             		if(list.size() > 0) {
@@ -209,13 +209,19 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
                 	
                 	List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(updateStatusGroupIds);
                 	groupManageService.updateGroupStatus(policyGroupInfos, Constants.URL_OBJ_GROUP_TYPE);
-            	}
+            	}*/
             	
-            	// 配置已生效
+            	// 配置已生效×
+            	// 组下无域配置common_group_ids -> "",ud_flag -> 0
             	CfgIndexInfo entity = new CfgIndexInfo(); 
             	entity.setUserRegion5(serviceGroupIds);
-            	entity.setServiceId(0);
             	entity.setFunctionId(888);
+            	entity.setCommonGroupIds("");
+            	commonPolicyDao.updateCfgIndexCommonGroupIdsBatch(entity);
+            	List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoDao.findPolicyByServiceGroupInfoList(serviceGroupIds);
+            	groupManageService.updateGroupStatus(policyGroupInfos, Constants.URL_OBJ_GROUP_TYPE);
+            	
+            	entity.setServiceId(0);
             	entity.setIsValid(Constants.VALID_NO);
             	entity.setIsAudit(Constants.AUDIT_NOT_YES);
             	entity.setBatchAuditValue("1");
diff --git a/src/main/webapp/WEB-INF/views/basics/domainCommGroupFormAdd.jsp b/src/main/webapp/WEB-INF/views/basics/domainCommGroupFormAdd.jsp
index 80976d3b9..0b8c3f9de 100644
--- a/src/main/webapp/WEB-INF/views/basics/domainCommGroupFormAdd.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/domainCommGroupFormAdd.jsp
@@ -196,7 +196,7 @@
                                         <label for="srearchInput" class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
                                         <div class="col-md-6 has-feedback">
 											<span class="form-control-feedback input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
-											<input id="srearchInput" class="form-control fc-clear" name="groupName" autocomplete="false">
+											<input id="srearchInput" class="form-control fc-clear required" name="groupName" autocomplete="false">
                                         </div>
                                         <div for="groupName"></div>
                                     </div>
diff --git a/src/main/webapp/WEB-INF/views/basics/domainCommGroupFormUpdate.jsp b/src/main/webapp/WEB-INF/views/basics/domainCommGroupFormUpdate.jsp
index c368c77fb..536749375 100644
--- a/src/main/webapp/WEB-INF/views/basics/domainCommGroupFormUpdate.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/domainCommGroupFormUpdate.jsp
@@ -136,7 +136,7 @@
                                              	</c:if>
                                             </c:forEach>
                                             <span class="input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
-                                            <input id="srearchInput" class="form-control" name="groupName" value="${cfgGroupName }" autocomplete="false" >
+                                            <input id="srearchInput" class="form-control required" name="groupName" value="${cfgGroupName }" autocomplete="false" >
                                         </div>
                                         <div for="groupName"></div>
                                     </div>
diff --git a/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormAdd.jsp b/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormAdd.jsp
index c8b0ae021..f03086557 100644
--- a/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormAdd.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormAdd.jsp
@@ -163,7 +163,7 @@
                                         <label for="srearchInput" class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
                                         <div class="col-md-6 has-feedback">
 											<span class="form-control-feedback input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
-											<input id="srearchInput" class="form-control fc-clear" name="groupName" autocomplete="false">
+											<input id="srearchInput" class="form-control fc-clear required" name="groupName" autocomplete="false">
                                         </div>
                                         <div for="groupName"></div>
                                     </div>
diff --git a/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormUpdate.jsp b/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormUpdate.jsp
index 6e120770a..3e1a5f299 100644
--- a/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormUpdate.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormUpdate.jsp
@@ -120,7 +120,7 @@
                                              	</c:if>
                                             </c:forEach>
                                             <span class="input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
-                                            <input id="srearchInput" class="form-control" name="groupName" value="${cfgGroupName }" autocomplete="false" >
+                                            <input id="srearchInput" class="form-control required" name="groupName" value="${cfgGroupName }" autocomplete="false" >
                                         </div>
                                         <div for="groupName"></div>
                                     </div>
diff --git a/src/main/webapp/WEB-INF/views/basics/scriberidCommGroupFormAdd.jsp b/src/main/webapp/WEB-INF/views/basics/scriberidCommGroupFormAdd.jsp
index 44ac50f3e..0f244b225 100644
--- a/src/main/webapp/WEB-INF/views/basics/scriberidCommGroupFormAdd.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/scriberidCommGroupFormAdd.jsp
@@ -185,7 +185,7 @@
                                         <label for="srearchInput" class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
                                         <div class="col-md-6 has-feedback">
 											<span class="form-control-feedback input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
-											<input id="srearchInput" class="form-control fc-clear" name="groupName" autocomplete="false">
+											<input id="srearchInput" class="form-control fc-clear required" name="groupName" autocomplete="false">
                                         </div>
                                         <div for="groupName"></div>
                                     </div>
diff --git a/src/main/webapp/WEB-INF/views/basics/scriberidCommGroupFormUpdate.jsp b/src/main/webapp/WEB-INF/views/basics/scriberidCommGroupFormUpdate.jsp
index 4c8d810a0..97958ff50 100644
--- a/src/main/webapp/WEB-INF/views/basics/scriberidCommGroupFormUpdate.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/scriberidCommGroupFormUpdate.jsp
@@ -136,7 +136,7 @@
                                              	</c:if>
                                             </c:forEach>
                                             <span class="input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
-                                            <input id="srearchInput" class="form-control" name="groupName" value="${cfgGroupName }" autocomplete="false" >
+                                            <input id="srearchInput" class="form-control required" name="groupName" value="${cfgGroupName }" autocomplete="false" >
                                         </div>
                                         <div for="groupName"></div>
                                     </div>
diff --git a/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormAdd.jsp b/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormAdd.jsp
index 5ac524421..a88f6da2b 100644
--- a/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormAdd.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormAdd.jsp
@@ -261,7 +261,7 @@
                                         <label for="srearchInput" class="control-label col-md-3"><font color="red">*</font><spring:message code="group_name"/></label>
                                         <div class="col-md-6 has-feedback">
 											<span class="form-control-feedback input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
-											<input id="srearchInput" class="form-control fc-clear" name="groupName" autocomplete="false">
+											<input id="srearchInput" class="form-control fc-clear required" name="groupName" autocomplete="false">
                                         </div>
                                         <div for="groupName"></div>
                                     </div>
diff --git a/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormUpdate.jsp b/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormUpdate.jsp
index 9cde09222..cb1b446dc 100644
--- a/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormUpdate.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormUpdate.jsp
@@ -150,7 +150,7 @@
                                              	</c:if>
                                             </c:forEach>
                                             <span class="input-icon input-icon-md" style="display: inline; left: 90%;"><i class="fa fa-search"></i></span>
-                                            <input id="srearchInput" class="form-control" name="groupName" value="${cfgGroupName }" autocomplete="false" >
+                                            <input id="srearchInput" class="form-control required" name="groupName" value="${cfgGroupName }" autocomplete="false" >
                                         </div>
                                         <div for="groupName"></div>
                                     </div>