baseController增加策略分组service

国际化配置文件增加策略分组相关属性

src/main/java/com/nis/web/controller/BaseController.java

@@ -20,32 +20,22 @@ import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.beust.jcommander.internal.Lists;
 import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.FunctionServiceDict;
-import com.nis.domain.ServiceConfigInfo;
 import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.basics.SysDictInfo;
 import com.nis.domain.configuration.AreaBean;
 import com.nis.domain.configuration.AreaIpCfg;
-import com.nis.domain.configuration.AvVoipAccountCfg;
-import com.nis.domain.configuration.AvVoipIpCfg;
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.BaseIpCfg;
-import com.nis.domain.configuration.BaseStringCfg;
-import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.ComplexStringCfgTemplate;
-import com.nis.domain.configuration.ComplexkeywordCfg;
 import com.nis.domain.configuration.IpCfgTemplate;
-import com.nis.domain.configuration.NumBoundaryCfg;
 import com.nis.domain.configuration.RequestInfo;
 import com.nis.domain.configuration.StringCfgTemplate;
 import com.nis.domain.log.BaseLogEntity;
-import com.nis.domain.log.NtcOpenVpnLog;
 import com.nis.util.Configurations;
 //import com.nis.main.ConvertTool;
 import com.nis.util.Constants;
@@ -62,6 +52,7 @@ import com.nis.web.service.OfficeService;
 import com.nis.web.service.RoleService;
 import com.nis.web.service.SystemService;
 import com.nis.web.service.UserService;
+import com.nis.web.service.basics.PolicyGroupInfoService;
 import com.nis.web.service.basics.ServiceDictInfoService;
 import com.nis.web.service.basics.SysDictInfoService;
 import com.nis.web.service.configuration.AppCfgService;
@@ -160,6 +151,8 @@ public class BaseController {
 	protected BgpCfgService bgpCfgService;
 	@Autowired 
 	protected XmppCfgService xmppCfgService;
+	@Autowired 
+	protected PolicyGroupInfoService policyGroupInfoService;
 	/**
 	 * 管理基础路径
 	 */
@@ -486,10 +479,6 @@ public class BaseController {
 	//初始化查询值判断
 	public void initLogSearchValue(BaseLogEntity entry,Map<String, Object> params){
 		
-		params.put("operator", entry.getCurrentUser().getName());
-		params.put("opTime", DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss"));
-		params.put("opAction", 4);
-		
 		if (StringUtils.isNotBlank(entry.getSearchFoundStartTime())&&StringUtils.isNotBlank(entry.getSearchFoundEndTime())) {
 			params.put("searchFoundStartTime", entry.getSearchFoundStartTime());
 			params.put("searchFoundEndTime", entry.getSearchFoundEndTime());
@@ -525,5 +514,8 @@ public class BaseController {
 		if (entry.getEntranceId()!=null) {
 			params.put("searchEntranceId", entry.getEntranceId());
 		}
+		if (entry.getCfgId()!=null) {
+			params.put("searchCfgId", entry.getCfgId());
+		}
 	}
 }

src/main/resources/messages/message_en.properties

@@ -620,7 +620,7 @@ clientip=client ip
 serverport=server port
 clientport=client port
 entrance_id=entrance
-deviceid=device id
+deviceid=device
 direct=direction
 stream_type=stream type
 clj_ip=processor ip
@@ -636,4 +636,32 @@ host_cookie=host cookie
 mac=mac
 ex_protocol=exchange protocol
 isakmp_mode=ISAKMP mode
-#===========log end  =============
+req_hdr_file=request header file
+req_body_file=request body file
+res_hdr_file=response header file
+res_body_file=response body file
+qr=QR
+rd=RD
+ra=RA
+rr=RR
+qtype=QTYPE
+qclass=QCLASS
+opcode=Opcode
+qname=QNAME
+cname=CNAME
+dns_query=query
+dns_response=response
+entrance=entrance
+#dns_sub=DNS_SUB
+contrl_tunnel=contrl tunnel
+data_tunnel=data tunnel
+contrl_message=contrl message
+data_message=data message
+user_name=user name
+#===========log end  =============
+#===========policy_group_manage start  =============
+all_types=all types
+group_type=group type
+group_name=group name
+policy_group_manage=strateagy grouping management
+#===========policy_group_manage end  =============

src/main/resources/messages/message_ru.properties

@@ -446,7 +446,7 @@ clientip=client ip
 serverport=server port
 clientport=client port
 entrance_id=entrance
-deviceid=device id
+deviceid=device
 direct=direction
 stream_type=stream type
 clj_ip=processor ip
@@ -462,4 +462,32 @@ host_cookie=host cookie
 mac=mac
 ex_protocol=exchange protocol
 isakmp_mode=ISAKMP mode
-#===========log end  =============
+req_hdr_file=request header file
+req_body_file=request body file
+res_hdr_file=response header file
+res_body_file=response body file
+qr=QR
+rd=RD
+ra=RA
+rr=RR
+qtype=QTYPE
+qclass=QCLASS
+opcode=Opcode
+qname=QNAME
+cname=CNAME
+dns_query=query
+dns_response=response
+entrance=entrance
+#dns_sub=DNS_SUB
+contrl_tunnel=contrl tunnel
+data_tunnel=data tunnel
+contrl_message=contrl message
+data_message=data message
+user_name=user name
+#===========log end  =============
+#===========policy_group_manage start  =============
+all_types=all types
+group_type=group type
+group_name=group name
+policy_group_manage=strateagy grouping management
+#===========policy_group_manage end  =============