Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git into develop

2018-12-17 23:44:20 +08:00
parent 765cbb4fe3 d7f6c6de49
commit 8d69dc2df4
17 changed files with 397 additions and 40 deletions
--- a/src/main/java/com/nis/domain/configuration/AppFeatureIndex.java
+++ b/src/main/java/com/nis/domain/configuration/AppFeatureIndex.java
@@ -39,6 +39,7 @@ public class AppFeatureIndex extends BaseCfg<AppFeatureIndex> {
 	private List<AppIpCfg> ipPortList = new ArrayList();
 	private List<AppStringFeatureCfg> strList = new ArrayList();
 	private List<AppComplexFeatureCfg> complexList = new ArrayList();
+	private List<AppTcpCfg> numCfgList = new ArrayList();
 	protected Integer exprType ;
 	protected Integer matchMethod ;
 	protected Integer isHexbin;
@@ -126,5 +127,11 @@ public class AppFeatureIndex extends BaseCfg<AppFeatureIndex> {
 	public void setCfgRegionCode1(String cfgRegionCode1) {
 		this.cfgRegionCode1 = cfgRegionCode1;
 	}
+	public List<AppTcpCfg> getNumCfgList() {
+		return numCfgList;
+	}
+	public void setNumCfgList(List<AppTcpCfg> numCfgList) {
+		this.numCfgList = numCfgList;
+	}

 }
--- a/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java
+++ b/src/main/java/com/nis/web/controller/basics/PolicyGroupController.java
@@ -34,7 +34,6 @@ public class PolicyGroupController extends BaseController {
 		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";
@@ -49,11 +48,12 @@ public class PolicyGroupController extends BaseController {
 	 */
 	//@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,RedirectAttributes redirectAttributes) {
+	public String form(Integer groupType,String ids,Model model,String doAction,RedirectAttributes redirectAttributes) {
 		PolicyGroupInfo policyGroup=new PolicyGroupInfo();
 		if(!StringUtil.isEmpty(ids)){
 			policyGroup=policyGroupInfoService.getById(Integer.parseInt(ids));
 		}
+		policyGroup.setGroupType(groupType);
 		model.addAttribute("_cfg", policyGroup);
 		return "/basics/policyGroupForm";
 	}
@@ -64,7 +64,7 @@ public class PolicyGroupController extends BaseController {
 	//@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) {
+			RedirectAttributes redirectAttributes,String itType,Integer groupType) {
 		
 		try {
 			policyGroupInfoService.saveOrUpdate(cfg);
@@ -74,7 +74,7 @@ public class PolicyGroupController extends BaseController {
 			addMessage(redirectAttributes,"error","save_failed");
 		}
 		
-		return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
+		return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList?groupType="+groupType;
 		
 		
 	}
@@ -86,7 +86,7 @@ public class PolicyGroupController extends BaseController {
 	 */
 	//@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) {
+	public String delete(RedirectAttributes redirectAttributes, Integer groupType,String ids,int isValid) {
 		try {
 			policyGroupInfoService.deldete(ids,isValid);
 			addMessage(redirectAttributes,"success","delete_success");
@@ -94,7 +94,7 @@ public class PolicyGroupController extends BaseController {
 			logger.error("删除失败",e);
 			addMessage(redirectAttributes,"error","delete_failed");
 		}
-		return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList";
+		return "redirect:" + adminPath + "/basics/policyGroup/policyGroupList?groupType="+groupType;
 	}
 	@RequestMapping(value="ajaxServiceIdState",method=RequestMethod.POST)
 	@ResponseBody
@@ -121,7 +121,7 @@ public class PolicyGroupController extends BaseController {
 		
 		if(cfg.getGroupId() != null){
 			PolicyGroupInfo policyGroup = policyGroupInfoService.getInfoByAsnNo(cfg);
-			if(policyGroup != null && policyGroup.getAsnNo().equals(cfg.getAsnNo()) ){
+			if(policyGroup != null &&policyGroup.getIsValid()!=0&& policyGroup.getAsnNo().equals(cfg.getAsnNo()) ){
 				return true;
 			}
 		}
--- a/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java
@@ -104,6 +104,7 @@ public class AppFeatureCfgController extends BaseController {
 			entity.setIpPortList(appMultiFeatureCfgService.getAppIpRangeCfg(entity.getCompileId(), entity.getFunctionId()));
 			entity.setStrList(appMultiFeatureCfgService.getAppStringFeatureCfg(entity.getCompileId(), entity.getFunctionId(),null));
 			entity.setComplexList(appMultiFeatureCfgService.getAppComplexFeatureCfg(entity.getCompileId(), entity.getFunctionId(),null));
+			entity.setNumCfgList(appMultiFeatureCfgService.getAppTcpCfg(entity.getCompileId(), entity.getFunctionId(),null));
 			initUpdateFormCondition(model,entity);
 		}else{
 			initFormCondition(model,entity);
@@ -249,6 +250,10 @@ public class AppFeatureCfgController extends BaseController {
 					List<AppComplexFeatureCfg> complexList = appMultiFeatureCfgService.getAppComplexFeatureCfg(compileId,functionId,Integer.valueOf(cfgRegionCode[i]));
 					map.put("complexList", complexList);
 				}
+				if("4".equals(cfgRegionType[i])){
+					List<AppTcpCfg> numCfgList = appMultiFeatureCfgService.getAppTcpCfg(compileId,functionId,Integer.valueOf(cfgRegionCode[i]));
+					map.put("numCfgList", numCfgList);
+				}
 				tabList.add(map);
 			}
 		}else{
--- a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.java
@@ -56,6 +56,12 @@ public interface AppMultiFeatureCfgDao {
 	//增强字符串类特征配置
 	public List<AppComplexFeatureCfg> getAppComplexFeatureCfg(@Param("compileId")Integer compileId,
 			@Param("functionId")Integer functionId,@Param("cfgRegionCode")Integer cfgRegionCode);
+	//数值类特征配置
+	public List<AppTcpCfg> getAppTcpCfg(@Param("compileId")Integer compileId,
+			@Param("functionId")Integer functionId,@Param("cfgRegionCode")Integer cfgRegionCode);
+	public int insertAppTcpCfg(AppTcpCfg entity);
+	public void deleteAppTcpCfg(BaseCfg entity);
+	
 	public int insertAppComplexFeatureCfg(AppComplexFeatureCfg entity);
 	public void deleteAppComplexFeatureCfg(BaseCfg entity);
 	//IP RANGE配置
--- a/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml
@@ -137,6 +137,36 @@
    <result column="do_log" property="doLog" jdbcType="INTEGER" />
    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
  </resultMap>
+  <!-- 数值域 -->
+  <resultMap id="AppTcpCfgMap" type="com.nis.domain.configuration.AppTcpCfg" >
+    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+    <result column="spec_service_id" property="specServiceId" jdbcType="INTEGER" />
+    <result column="app_code" property="appCode" jdbcType="INTEGER" />
+    <result column="behav_code" property="behavCode" jdbcType="INTEGER" />
+    <result column="low_boundary" property="lowBoundary" jdbcType="BIGINT" />
+    <result column="up_boundary" property="upBoundary" jdbcType="BIGINT" />
+    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
+    <result column="action" property="action" jdbcType="INTEGER" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+    <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
+    <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="editor_id" property="editorId" jdbcType="INTEGER" />
+    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+    <result column="auditor_id" property="auditorId" jdbcType="INTEGER" />
+    <result column="audit_time" property="auditTime" jdbcType="TIMESTAMP" />
+    <result column="service_id" property="serviceId" jdbcType="INTEGER" />
+    <result column="request_id" property="requestId" jdbcType="INTEGER" />
+    <result column="compile_id" property="compileId" jdbcType="INTEGER" />
+    <result column="is_area_effective" property="isAreaEffective" jdbcType="INTEGER" />
+    <result column="classify" property="classify" jdbcType="VARCHAR" />
+    <result column="attribute" property="attribute" jdbcType="VARCHAR" />
+    <result column="lable" property="lable" jdbcType="VARCHAR" />
+    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
+    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
+    <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="do_log" property="doLog" jdbcType="INTEGER" />
+  </resultMap>
 
   <sql id="AppFeatureIndex_Column" >
 	    r.CFG_ID,r.CFG_DESC,r.ACTION,r.IS_VALID,r.IS_AUDIT,
@@ -181,6 +211,13 @@
    #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR},    
    #{areaEffectiveIds,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER}
  </sql>
+  <sql id="AppTcpCfg_Column" >
+    r.CFG_ID, r.APP_CODE,r.BEHAV_CODE,r.SPEC_SERVICE_ID,r.CFG_DESC,r.ACTION,r.IS_VALID,r.IS_AUDIT,
+    r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
+    r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
+    r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
+    r.low_boundary,r.up_boundary  as upBoundary,r.do_log
+  </sql>
  <select id="getAppFeatureIndex" resultMap="AppFeatureIndexMap" parameterType="java.lang.Long" >
    SELECT 
    <include refid="AppFeatureIndex_Column" />
@@ -448,6 +485,16 @@
 		AND r.cfg_region_code = #{cfgRegionCode,jdbcType=BIGINT}
 	</if>
  </select>
+  <!-- 查询数值类特征子配置列表 -->
+  <select id="getAppTcpCfg" resultMap="AppTcpCfgMap">
+    SELECT 
+    <include refid="AppTcpCfg_Column" />
+    FROM app_session_cfg r
+    WHERE r.compile_id=#{compileId}  and r.function_id=#{functionId}
+    <if test="cfgRegionCode !=null ">
+		AND r.cfg_region_code = #{cfgRegionCode,jdbcType=BIGINT}
+	</if>
+  </select>
 <!-- 新增app_ip_range子配置 -->
  <insert id="insertAppIpRangeCfg" parameterType="com.nis.domain.configuration.AppIpCfg" >
    <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="cfgId">
@@ -509,6 +556,24 @@
    #{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR}
    )
  </insert>
+  <!-- 新增APP数值域特征子配置 -->
+  <insert id="insertAppTcpCfg" parameterType="com.nis.domain.configuration.AppTcpCfg" >
+    <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="cfgId">
+    	SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into app_session_cfg (
+     APP_CODE,BEHAV_CODE,SPEC_SERVICE_ID,CFG_DESC,ACTION,IS_VALID,IS_AUDIT,
+    CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
+    SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
+    ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
+    low_boundary,up_boundary,DO_LOG
+    )values (
+     <include refid="AppCommonCfg_Value_List" />,
+     #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER},
+   	 #{lowBoundary,jdbcType=INTEGER},#{upBoundary,jdbcType=INTEGER},
+     #{doLog,jdbcType=INTEGER}
+    )
+  </insert>
  <!-- 删除app_ip_range子配置 -->
  <delete id="deleteAppIpRangeCfg" >
  	delete from app_ip_range_cfg where compile_id=#{compileId} and function_id=#{functionId}
@@ -521,6 +586,10 @@
  <delete id="deleteAppComplexFeatureCfg" >
  	delete from app_complex_feature_cfg where compile_id=#{compileId} and function_id=#{functionId}
  </delete>
+   <!-- 删除数值域特征子配置 -->
+  <delete id="deleteAppTcpCfg" >
+  	delete from app_session_cfg where compile_id=#{compileId} and function_id=#{functionId}
+  </delete>
  
 <select id="findAppByFeatureIndexList" resultMap="AppFeatureIndexMap">
 		select 
--- a/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java
@@ -18,6 +18,7 @@ import com.nis.domain.configuration.AppFeatureIndex;
 import com.nis.domain.configuration.AppHttpCfg;
 import com.nis.domain.configuration.AppIpCfg;
 import com.nis.domain.configuration.AppStringFeatureCfg;
+import com.nis.domain.configuration.AppTcpCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.HttpUrlCfg;
 import com.nis.domain.configuration.IpPortCfg;
@@ -111,6 +112,15 @@ public class AppMultiFeatureCfgService extends BaseService {
 						
 					}
 				}
+				if(entity.getNumCfgList()!=null){
+					for(AppTcpCfg cfg:entity.getNumCfgList()){
+						if(cfg.getLowBoundary()!=null && cfg.getUpBoundary()!=null){
+							BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+							appMultiFeatureCfgDao.insertAppTcpCfg(cfg);//复用AppTcpCfg对象作为数值类对象
+						}
+						
+					}
+				}

 			} catch (Exception e) {
 				e.printStackTrace();
@@ -126,6 +136,7 @@ public class AppMultiFeatureCfgService extends BaseService {
 			appMultiFeatureCfgDao.deleteAppIpRangeCfg(entity);
 			appMultiFeatureCfgDao.deleteAppStringFeatureCfg(entity);
 			appMultiFeatureCfgDao.deleteAppComplexFeatureCfg(entity);
+			appMultiFeatureCfgDao.deleteAppTcpCfg(entity);//复用AppTcpCfg对象作为数值类对象
 			entity.setCreateTime(new Date());
 			entity.setCreatorId(entity.getCurrentUser().getId());
 			if(entity.getIpPortList()!=null){
@@ -150,6 +161,14 @@ public class AppMultiFeatureCfgService extends BaseService {
 					}
 				}
 			}
+			if(entity.getNumCfgList()!=null){
+				for(AppTcpCfg cfg:entity.getNumCfgList()){
+					if(cfg.getLowBoundary()!=null && cfg.getUpBoundary()!=null){
+					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+					appMultiFeatureCfgDao.insertAppTcpCfg(cfg);
+					}
+				}
+			}
 		}
 	}
 	public void auditAppFeatureCfg(AppFeatureIndex entity, Integer isAudit) {
@@ -212,6 +231,18 @@ public class AppMultiFeatureCfgService extends BaseService {
 				strRegionList=map.get("dstList");
 			}
 		}
+		List<AppTcpCfg> numCfgList = appMultiFeatureCfgDao.getAppTcpCfg(entity.getCompileId(),entity.getFunctionId(),null);
+		if(numCfgList!=null && numCfgList.size()>0){
+			AppTcpCfg cfg = new AppTcpCfg();
+			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+			cfg.setTableName(AppTcpCfg.getTablename());
+			appMultiFeatureCfgDao.auditCfg(cfg);
+			if(isAudit==1){
+				Map<String,List> map = cfgConvert(numRegionList,numCfgList,4,entity,groupRelationList);
+				groupRelationList=map.get("groupList");
+				numRegionList=map.get("dstList");
+			}
+		}
 		// 构造提交综合服务参数格式，一条配置提交一次综合服务
 		if (isAudit == 1) {
 			maatCfg.initDefaultValue();
@@ -299,6 +330,13 @@ public class AppMultiFeatureCfgService extends BaseService {
 				cfg.setTableName(AppComplexFeatureCfg.getTablename());
 				appMultiFeatureCfgDao.updateCfgValid(cfg);
 			}
+			//修改数值域配置表状态
+			if (!StringUtil.isEmpty(entity.getNumCfgList())) {
+				AppTcpCfg cfg = new AppTcpCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[] { "cfgId" });
+				cfg.setTableName(AppTcpCfg.getTablename());
+				appMultiFeatureCfgDao.updateCfgValid(cfg);
+			}
 		}

 	}
@@ -315,6 +353,10 @@ public class AppMultiFeatureCfgService extends BaseService {
 	public List<AppIpCfg> getAppIpRangeCfg(Integer compileId,Integer functionId){
 		return appMultiFeatureCfgDao.getAppIpRangeCfg(compileId,functionId);
 	}
+	//I数值域配置
+	public List<AppTcpCfg> getAppTcpCfg(Integer compileId,Integer functionId,Integer cfgRegionCode){
+		return appMultiFeatureCfgDao.getAppTcpCfg(compileId,functionId,cfgRegionCode);
+	}
 	
 	public Map<String, List>  exportFeature(AppFeatureIndex entity){
 		Map<String, List> dataMap=new HashMap<String, List>();