Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
策略分组功能提交

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

@@ -0,0 +1,115 @@
+package com.nis.web.controller.basics;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.nis.domain.Page;
+import com.nis.domain.basics.PolicyGroupInfo;
+import com.nis.domain.basics.ServiceDictInfo;
+import com.nis.util.ConfigDictUtils;
+import com.nis.util.Configurations;
+import com.nis.util.StringUtil;
+import com.nis.util.StringUtils;
+import com.nis.web.controller.BaseController;
+/**
+ * 协议分组
+ * @author dell
+ *
+ */
+@Controller
+@RequestMapping(value = "${adminPath}/basics/policyGroup")
+public class PolicyGroupController extends BaseController {
+	
+	//@RequiresPermissions(value={"basics:policyGroup:view"},logical=Logical.OR)
+	@RequestMapping(value = {"/policyGroupList", ""})
+	public String policyGroupList(PolicyGroupInfo cfg,HttpServletRequest request, HttpServletResponse response, Model model) {
+		if(cfg == null)cfg=new PolicyGroupInfo();
+		Page<PolicyGroupInfo> pageCondition = new Page<PolicyGroupInfo>(request, response,"r");
+		
+		Page page = policyGroupInfoService.findPolicyGroupInfoList(pageCondition,cfg);
+		
+		model.addAttribute("cfg", cfg);
+		model.addAttribute("page", page);
+		return "/basics/policyGroupList";
+	}
+	
+	
+	/**
+	 * 进入添加或修改页面
+	 * @param serviceDictInfo
+	 * @param model
+	 * @return
+	 */
+	//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit","basics:classification:view","basics:attribute:view","basics:label:view"},logical=Logical.OR)
+	@RequestMapping(value={"/policyGroupForm"})
+	public String form(String ids,Model model,String doAction) {
+		PolicyGroupInfo policyGroup=new PolicyGroupInfo();
+		if(!StringUtil.isEmpty(ids)){
+			policyGroup=policyGroupInfoService.getById(Integer.parseInt(ids));
+		}
+		model.addAttribute("_cfg", policyGroup);
+		return "/basics/policyGroupForm";
+	}
+	/**
+	 * 新增或修改
+	 * @return
+	 */
+	//@RequiresPermissions(value={"basics:classification:add","basics:attribute:add","basics:label:add","basics:classification:edit","basics:attribute:edit","basics:label:edit"},logical=Logical.OR)
+	@RequestMapping(value = "saveOrUpdate")
+	public String saveOrUpdate(PolicyGroupInfo cfg,Model model, RedirectAttributes redirectAttributes,String itType) {
+		
+		try {
+			policyGroupInfoService.saveOrUpdate(cfg);
+			if(!StringUtil.isEmpty(cfg.getGroupId())){
+				addMessage(redirectAttributes, "save_success");
+			}else{
+				addMessage(redirectAttributes, "update_success");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			if(!StringUtil.isEmpty(cfg.getGroupId())){
+				addMessage(redirectAttributes, "save_failed");
+			}else{
+				addMessage(redirectAttributes, "update_failed");
+			}
+		}
+		
+		return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
+		
+		
+	}
+	
+	
+	/**
+	 * 删除
+	 * @return
+	 */
+	//@RequiresPermissions(value={"basics:classification:del","basics:attribute:del","basics:label:del"},logical=Logical.OR)
+	@RequestMapping(value={"delete"})
+	public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) {
+		try {
+			policyGroupInfoService.deldete(ids,isValid);
+			addMessage(redirectAttributes, "delete_success");
+		} catch (Exception e) {
+			e.printStackTrace();
+			addMessage(redirectAttributes, "delete_failed");
+		}
+		return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
+	}
+	
+}