url分组配置查询、添加和编辑页面的修改

src/main/java/com/nis/domain/basics/UrlCommGroupCfg.java

@@ -15,10 +15,11 @@ public class UrlCommGroupCfg extends BaseStringCfg<UrlCommGroupCfg>{
 //    protected Integer  matchMethod;//匹配类型
     protected Integer  isHexbin;//是否大小写敏感
     protected String  ratelimit;//限速比例,0到1之间
+    @ExcelField(title="group_name",sort=108)
+    protected String  groupName;//公共组名称
     
     
-    
-    
+	
 	public String getCfgKeywords() {
 		return cfgKeywords;
 	}
@@ -53,6 +54,11 @@ public class UrlCommGroupCfg extends BaseStringCfg<UrlCommGroupCfg>{
 		return tableName;
 	}
     
-    
+	public String getGroupName() {
+		return groupName;
+	}
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
     
 }

src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java

@@ -139,8 +139,35 @@ public class UrlCommGroupController extends BaseController{
 		//选中配置审核
 		if(!StringUtil.isEmpty(ids)) {
 			List<UrlCommGroupCfg> urlGroupCfgs=urlCommGroupService.getByIds(ids);
-
+//			Map<Long,List<UrlCommGroupCfg>> urlcfgMap=Maps.newHashMap();
+//			for(UrlCommGroupCfg urlCommCfg:urlGroupCfgs) {
+//				urlCommCfg.setIsAudit(isAudit);
+//				urlCommCfg.setIsValid(isValid);
+//				urlCommCfg.setAuditorId(UserUtils.getUser().getId());
+//				urlCommCfg.setAuditTime(new Date());
+//				urlCommCfg.setFunctionId(functionId);
+//				if(urlcfgMap.containsKey(Long.parseLong(urlCommCfg.getUserRegion3()))) {
+//					urlcfgMap.get(Long.parseLong(urlCommCfg.getUserRegion3())).add(urlCommCfg);
+//				}else {
+//					List<UrlCommGroupCfg> _urlCfgs=Lists.newArrayList();
+//					_urlCfgs.add(urlCommCfg);
+//					urlcfgMap.put(Long.parseLong(urlCommCfg.getUserRegion3()), _urlCfgs);
+//				}
+//			}
 			/********************每次下发一个组的region，保证事物********************/
+//			for (Long groupId : urlcfgMap.keySet()) {
+//				try {
+//					urlCommGroupService.audit(urlcfgMap.get(groupId),groupId,isValid);
+//				} catch (Exception e) {
+//					logger.error("配置下发失败：",e);
+//					if(e instanceof MaatConvertException) {
+//						addMessage(redirectAttributes,"error", "request_service_failed");
+//					}else {
+//						addMessage(redirectAttributes,"error", "audit_failed");
+//					}
+//					
+//				}
+//			}
 			for (UrlCommGroupCfg urlCommGroup : urlGroupCfgs) {
 				try {
 					urlCommGroupService.audit(urlCommGroup,isAudit,isValid);
@@ -198,7 +225,7 @@ public class UrlCommGroupController extends BaseController{
 				classMap.put(entity.getMenuNameCode(), UrlCommGroupCfg.class);
 				String cfgIndexInfoNoExport=",block_type,do_log,action"
 						+ ",letter,whether_area_block,classification,attribute,label,expression_type,match_method"
-						+",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,asn_no,is_hex,is_case_insenstive,";
+						+",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,asn_no,is_hex,is_case_insenstive,";
 				// 时间过滤
 				if (entity.getSearch_create_time_start() == null ) {
 					cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport;

src/main/java/com/nis/web/dao/basics/UrlCommGroupDao.xml

@@ -35,6 +35,7 @@
 	    <result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
 	    <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
 	    
+	    <result column="group_name" property="groupName" jdbcType="VARCHAR" />
     </resultMap>
   	
   	<select id="findAllPageList" parameterType="com.nis.domain.basics.UrlCommGroupCfg" resultMap="urlCommGroupCfgMap">
@@ -45,12 +46,13 @@
 			r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,
 			r.cfg_region_code,r.cfg_type,r.ratelimit,r.user_region1,r.user_region2,
 			r.user_region3,r.user_region4,r.user_region5,
-			s.name AS creator_name,e.name AS editor_name,u.name AS auditor_name
+			s.name AS creator_name,e.name AS editor_name,u.name AS auditor_name,c.group_name
 		FROM
 			http_url_cfg r
 		LEFT JOIN sys_user s ON r.creator_id = s.id
 		LEFT JOIN sys_user e ON r.editor_id = e.id
 		LEFT JOIN sys_user u ON r.auditor_id = u.id
+		LEFT JOIN policy_group_info c ON c.service_group_id=r.user_region3
   		<trim prefix="WHERE" prefixOverrides="AND |OR ">
     		<if test="page !=null and page.where != null and page.where != ''">
 				AND ${page.where}
@@ -133,7 +135,7 @@
 				ORDER BY ${page.orderBy}
 			</when>
 			<otherwise>
-				ORDER BY r.create_time desc
+				ORDER BY r.is_audit,r.create_time desc
 			</otherwise>
 		</choose>