Url分组配置修改、删除和审核服务端

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

@@ -1,6 +1,7 @@
 package com.nis.web.controller.basics;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import com.google.common.collect.Maps;
 import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
@@ -28,8 +30,11 @@ import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
+import com.nis.web.security.UserUtils;
 import com.nis.web.service.basics.UrlCommGroupService;
 
+import jersey.repackaged.com.google.common.collect.Lists;
+
 @Controller
 @RequestMapping(value = "${adminPath}/basics/url")
 public class UrlCommGroupController extends BaseController{
@@ -77,7 +82,7 @@ public class UrlCommGroupController extends BaseController{
 	@RequiresPermissions(value={"http:url:config"})
 	public String save(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes){
 		
-		System.out.println("URL分组");
+//		System.out.println("URL分组");
 		try{
 			urlCommGroupService.saveUrlCommGroupCfg(cfg);
 		}catch(Exception e){
@@ -93,7 +98,81 @@ public class UrlCommGroupController extends BaseController{
 		return "redirect:" + adminPath +"/basics/url/list?functionId="+cfg.getFunctionId();
 	}
 	
+	@RequestMapping(value = {"/updateForm"})
+	public String updateForm(Model model,HttpServletRequest request
+			,HttpServletResponse response,String ids,@ModelAttribute("cfg")UrlCommGroupCfg cfg
+			,RedirectAttributes redirectAttributes){
+		cfg = urlCommGroupService.get(Long.parseLong(ids));
+//		initUpdateFormCondition(model, cfg);
+		cfg.setGroupType(11);
+		initUpdateFormCondition(model,cfg);
+		//List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
+		//model.addAttribute("policyGroups", groupInfos);
+		model.addAttribute("_cfg", cfg);
+		return "/basics/urlCommGroupFormUpdate";
+	}
+	@RequestMapping(value = {"/update"})
+	@RequiresPermissions(value={"http:url:config"})
+	public String update(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")UrlCommGroupCfg cfg,RedirectAttributes redirectAttributes){
+		try{
+			urlCommGroupService.update(cfg);
+			addMessage(redirectAttributes,"success","save_success");
+		}catch(Exception e){
+			logger.error("信息保存失败",e);
+			e.printStackTrace();
+			addMessage(redirectAttributes,"error","save_failed");
+		}
+		
+		return "redirect:" + adminPath +"/basics/url/list?functionId="+cfg.getFunctionId();
+	}
 	
+	@RequestMapping(value = {"/audit"})
+	@RequiresPermissions(value={"http:url:config"})
+	public String audit(Model model,@ModelAttribute("cfg")UrlCommGroupCfg cfg
+			,Integer isAudit
+			,Integer isValid
+			,String ids
+			,Integer functionId
+			, HttpServletRequest request
+			,HttpServletResponse response
+			,RedirectAttributes redirectAttributes) {
+		//选中配置审核
+		if(!StringUtil.isEmpty(ids)) {
+			List<UrlCommGroupCfg> urlGroupCfgs=urlCommGroupService.getByIds(ids);
+
+			/********************每次下发一个组的region，保证事物********************/
+			for (UrlCommGroupCfg urlCommGroup : urlGroupCfgs) {
+				try {
+					urlCommGroupService.audit(urlCommGroup,isAudit,isValid);
+				} catch (Exception e) {
+					logger.error("审核失败",e);
+					e.printStackTrace();
+					addMessage(redirectAttributes,"error","audit_failed");
+				}
+			}
+		}
+		return "redirect:" + adminPath +"/basics/url/list?functionId="+cfg.getFunctionId();
+	}
+	
+	@RequestMapping(value = {"/delete"})
+	@RequiresPermissions(value={"http:url:config"})
+	public String delete(Integer isValid
+			,String ids,Integer functionId
+			,RedirectAttributes redirectAttributes){
+			try{
+				urlCommGroupService.delete(ids);
+				addMessage(redirectAttributes,"success","delete_success");
+			}catch(Exception e){
+				logger.error("Delete failed",e);
+				if(e instanceof MaatConvertException) {
+					addMessage(redirectAttributes,"error",e.getMessage());
+				}else {
+					addMessage(redirectAttributes,"error","delete_failed");
+				}
+			}
+			
+		return "redirect:" + adminPath +"/basics/url/list?functionId="+functionId;
+	}
 	//urlComm配置导出
 	@RequestMapping(value = "/exportUrlComm")
 	public void exportAsnIp(Model model,HttpServletRequest  request,HttpServletResponse response,
@@ -118,7 +197,7 @@ public class UrlCommGroupController extends BaseController{
 				titleList.add(entity.getMenuNameCode());
 				classMap.put(entity.getMenuNameCode(), UrlCommGroupCfg.class);
 				String cfgIndexInfoNoExport=",block_type,do_log,action"
-						+ ",letter,whether_area_block,classification,attribute,label"
+						+ ",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,";
 				// 时间过滤
 				if (entity.getSearch_create_time_start() == null ) {