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

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;