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/service/basics/PolicyGroupInfoService.java

@@ -0,0 +1,83 @@
+package com.nis.web.service.basics;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.nis.domain.Page;
+import com.nis.domain.basics.PolicyGroupInfo;
+import com.nis.domain.configuration.AreaIpCfg;
+import com.nis.domain.configuration.AvVoipAccountCfg;
+import com.nis.domain.configuration.AvVoipIpCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.exceptions.MaatConvertException;
+import com.nis.util.ConfigServiceUtil;
+import com.nis.util.StringUtil;
+import com.nis.web.dao.basics.PolicyGroupInfoDao;
+import com.nis.web.security.UserUtils;
+import com.nis.web.service.BaseService;
+
+@Service
+public class PolicyGroupInfoService extends BaseService{
+	
+	@Autowired
+     private PolicyGroupInfoDao policyGroupInfoDao;
+	
+	/**
+	 * @param page
+	 * @param entity
+	 * @return
+	 */
+	public Page<PolicyGroupInfo> findPolicyGroupInfoList(Page<PolicyGroupInfo> page, PolicyGroupInfo entity) {
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
+		entity.setPage(page);
+		List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfoList(entity);
+		page.setList(list);
+		return page;
+	}
+	
+	public PolicyGroupInfo getById(int id) {
+		PolicyGroupInfo policyGroupInfo=policyGroupInfoDao.getById(id);
+		return policyGroupInfo;
+	}
+	
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void saveOrUpdate(PolicyGroupInfo entity){
+		entity.setIsValid(1);
+		//新增
+		if(entity.getGroupId()==null){
+			Date createTime=new Date();
+			entity.setCreatorId(UserUtils.getUser().getId());
+			entity.setCreateTime(createTime);
+			policyGroupInfoDao.insert(entity);
+		//修改
+		}else{
+			Date editTime=new Date();
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(editTime);
+			policyGroupInfoDao.update(entity);
+		}
+	}
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void deldete(String ids, int isValid){
+		PolicyGroupInfo entity=new PolicyGroupInfo();
+		Date editTime=new Date();
+		entity.setEditorId(UserUtils.getUser().getId());
+		entity.setEditTime(editTime);
+		entity.setIsValid(isValid);
+		if(!StringUtil.isEmpty(ids)){
+			for (String id : ids.split(",")) {
+				if(!StringUtil.isEmpty(id)){
+					entity.setGroupId(Integer.parseInt(id));
+					policyGroupInfoDao.update(entity);
+				}
+			}
+		}
+	}
+	
+}