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

into develop Conflicts: src/main/java/com/nis/domain/configuration/CfgIndexInfo.java src/main/resources/nis.properties src/main/webapp/WEB-INF/tags/sys/delRow.tag asn相关功能更改： IP ADDR：增加asn域 1、新增IP ADDR可选asn，如果asn未下发过（is_used=0），下发时asn的group需要标记为commonGroup（groupId为asn组织的groupId，regionId为asn的regionId）。 2、如果所选的asn组(asn组织的groupId)已经下发过（is_used=1），则下发maat时，asn域不需要下发。 3、策略取消时，如果有需要保留的公共组（commongRroupIds），需要将公共组的组号下发。 ASN GROUP: 1、新增asn，如果此asn的组织groupId已下发过（is_used=1），且此组织的groupId已被策略标记过全选（is_audit_all=1），则需要调用公共组域新增的接口，将新增的asn关键字下发。 2、修改asn，如果此asn的组织groupId已下发过（is_used=1），则需要调用公共组域修改的接口，修改已经下发的asn关键字域。 3、删除asn，如果此asn的组织groupId已下发过（is_used=1），则需要调用公共组域删除的接口，删除已经下发的asn关键字域。 ASN IP CFG: 1、新增asn ip，所选asn no的组首次下发（is_valid=0），需要将asn no的groupId标记为公共组；如果asn no非首次下发（is_valid=1），直接调用公共组新增域的接口。 2、修改生效状态asn ip修改，调用公共组修改域接口直接修改 3、失效直接调用公共组删除域接口，失效asn ip域
2019-01-16 14:33:29 +06:00
parent db9dd66ab2 e62b5d24be
commit cb9aa36954
174 changed files with 7535 additions and 723 deletions
--- a/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java
+++ b/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.java
@@ -29,4 +29,7 @@ public interface AsnGroupInfoDao extends CrudDao<AsnGroupInfo> {
 	List<AsnGroupInfo> findAsnGroupInfos();
 	Long getCount();
 	void modifyIssuedIp(AsnGroupInfo info);
+	List<AsnGroupInfo> findAsnGroupInfoByAsnGroup(AsnGroupInfo asnGroupInfo);
+	void  updateIsUsedAndIsValid(@Param("asnNos")List asnNos,@Param("isUsed")Integer isUsed,@Param("isValid")Integer isValid);
+	List<AsnGroupInfo> findAsnGroupInfoByAsnNos(@Param("asnNos")List asnNos,@Param("isUsed")Integer isUsed);
 }
--- a/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/AsnGroupInfoDao.xml
@@ -15,10 +15,12 @@
    <result column="editor_id" property="editorId" jdbcType="INTEGER" />
    <result column="asn_id" property="asnId" jdbcType="BIGINT" />
    <result column="issued_ips" property="issuedIPs" jdbcType="INTEGER" />
+    <result column="is_used" property="isUsed" jdbcType="INTEGER" />
+    <result column="region_id" property="regionId" jdbcType="INTEGER" />
  </resultMap>
    <sql id="AsnGroupInfoColumns">
 		r.id,r.group_id,r.compile_id,r.organization,r.country,r.detail,r.is_valid,r.create_time,r.edit_time,
-		r.creator_id,r.editor_id,r.asn_id,r.issued_ips
+		r.creator_id,r.editor_id,r.asn_id,r.issued_ips,r.is_used,r.region_id
 	</sql>
  
   <!-- 查出所有 有效数据-->
@@ -79,7 +81,7 @@
      <select id="findAsnGroupInfos" resultMap="AsnGroupInfoMap">
 		SELECT
 			<include refid="AsnGroupInfoColumns"/>
-	    FROM asn_group_info r where is_valid !=-1
+	    FROM asn_group_info r where r.is_valid !=-1
 	</select>
      <select id="getCount" resultType="java.lang.Long">
 		SELECT count(1)
@@ -87,7 +89,20 @@
 	</select>
    
 	<insert id="insert" parameterType="com.nis.domain.basics.AsnGroupInfo" >
-    insert into asn_group_info(group_id,compile_id,organization,country,detail,is_valid,creator_id,create_time,editor_id,edit_time,asn_id
+    insert into asn_group_info(
+    group_id,
+    compile_id,
+    organization,
+    country,
+    detail,
+    is_valid,
+    creator_id,
+    create_time,
+    editor_id,
+    edit_time,
+    asn_id,
+    is_used,
+    region_id
    )values (
    	#{groupId,jdbcType=INTEGER}, 
    	#{compileId,jdbcType=INTEGER}, 
@@ -99,7 +114,9 @@
   		#{createTime,jdbcType=TIMESTAMP},
   		#{editorId,jdbcType=INTEGER}, 
   		#{editTime,jdbcType=TIMESTAMP},
-    	#{asnId,jdbcType=INTEGER}
+    	#{asnId,jdbcType=INTEGER},
+    	#{isUsed,jdbcType=INTEGER},
+    	#{regionId,jdbcType=INTEGER}
    )
  </insert>

@@ -137,6 +154,12 @@
       <if test="editTime != null  and editTime != ''" >
      	edit_time = #{editTime,jdbcType=TIMESTAMP},
      </if>
+      <if test="isUsed != null" >
+      	is_used = #{isUsed,jdbcType=INTEGER},
+      </if>
+      <if test="regionId != null" >
+      	region_id = #{regionId,jdbcType=INTEGER},
+      </if>
      </trim>
    </set>
    <where>
@@ -147,6 +170,28 @@
      	</trim>
    </where>
  </update>
+  <update id="updateIsUsedAndIsValid" >
+    update asn_group_info
+    <set >
+      <if test="isUsed != null" >
+      	is_used = #{isUsed,jdbcType=INTEGER},
+      </if>
+      <if test="isValid != null" >
+      	is_valid = #{isValid,jdbcType=INTEGER},
+      </if>
+    </set>
+    <where>
+    	 <if test="asnNos != null" >
+      		and asn_id in
+        	<foreach collection ="asnNos" item="asnId" separator ="," open="(" close=")">
+			         #{asnId}
+			    </foreach >
+      	</if>
+      	 <if test="isValid != null" >
+	      	and is_valid != #{isValid,jdbcType=INTEGER}
+	      </if>
+    </where>
+  </update>
  <update id="updateValid" parameterType="com.nis.domain.basics.AsnGroupInfo" >
    update asn_group_info
    <set >
@@ -205,7 +250,7 @@
  <select id="getByGroupId" resultType="com.nis.domain.basics.AsnGroupInfo">
  	select <include refid="AsnGroupInfoColumns"/> 
  	from asn_group_info r
-  	where r.group_id =#{groupId} and is_valid !=-1
+  	where r.group_id =#{groupId} and r.is_valid !=-1
  </select>
  <select id="getGroupInfoByName" resultType="com.nis.domain.basics.AsnGroupInfo">
  	select <include refid="AsnGroupInfoColumns"/> 
@@ -243,13 +288,13 @@
  	SELECT 
  		<include refid="AsnGroupInfoColumns"/> 
  	FROM 
-  		asn_group_info r WHERE group_id =  #{groupId,jdbcType=INTEGER} AND is_valid !=-1
+  		asn_group_info r WHERE r.group_id =  #{groupId,jdbcType=INTEGER} AND r.is_valid !=-1
  </select>
  <select id="getConfigGroupInfoByName" resultType="com.nis.domain.basics.AsnGroupInfo">
  	SELECT 
  		<include refid="AsnGroupInfoColumns"/> 
  	FROM 
-  		asn_group_info r WHERE organization =  #{organization,jdbcType=VARCHAR} AND is_valid !=-1
+  		asn_group_info r WHERE r.organization =  #{organization,jdbcType=VARCHAR} AND r.is_valid !=-1
  </select>
  <select id="getValidConfigGroupInfoByName" resultType="com.nis.domain.basics.AsnGroupInfo">
  	SELECT 
@@ -278,11 +323,49 @@
  		asn_group_info r
  	<trim prefix="WHERE" prefixOverrides="AND |OR ">
    	<if test="organization != null and organization != ''" >
-        	AND organization = #{organization,jdbcType=VARCHAR}
+        	AND r.organization = #{organization,jdbcType=VARCHAR}
      	</if>
    	<if test="asnId != null" >
-        	AND asn_id = #{asnId,jdbcType=INTEGER}
+        	AND r.asn_id = #{asnId,jdbcType=INTEGER}
      	</if>
    </trim>
  </select>
+  
+  <select id="findAsnGroupInfoByAsnGroup" resultMap="AsnGroupInfoMap">
+  	SELECT 
+  		<include refid="AsnGroupInfoColumns"/> 
+  	FROM 
+  		asn_group_info r
+  	<where>
+  		<if test="asnId != null" >
+        	AND r.asn_id = #{asnId,jdbcType=INTEGER}
+      	</if>
+      	<if test="isUsed != null" >
+        	AND r.is_used = #{isUsed,jdbcType=INTEGER}
+      	</if>
+      	<if test="organization != null and organization != ''" >
+        	AND r.organization = #{organization,jdbcType=VARCHAR}
+      	</if>
+      	<if test="isValid != null" >
+        	AND r.is_valid = #{isValid,jdbcType=VARCHAR}
+      	</if>
+  	</where>
+  </select>
+  <select id="findAsnGroupInfoByAsnNos" resultMap="AsnGroupInfoMap">
+  	SELECT 
+  		<include refid="AsnGroupInfoColumns"/> 
+  	FROM 
+  		asn_group_info r
+  	<where>
+      	<if test="isUsed != null" >
+        	AND r.is_used = #{isUsed,jdbcType=INTEGER}
+      	</if>
+      	<if test="asnNos != null" >
+      		and r.asn_id in
+        	<foreach collection ="asnNos" item="asnId" separator ="," open="(" close=")">
+			         #{asnId}
+			    </foreach >
+      	</if>
+  	</where>
+  </select>
 </mapper>
--- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java
+++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.java
@@ -4,6 +4,7 @@ import java.util.List;

 import org.apache.ibatis.annotations.Param;

+import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.basics.Varibles;
 import com.nis.web.dao.CrudDao;
@@ -20,6 +21,7 @@ public interface AsnIpCfgDao extends CrudDao<AsnIpCfg>{
 	public List<Integer> hasASNIds(@Param("ids")String ids);
 	public List<Integer> hasASNIpAddrs(@Param("ids")String ids);
 	public List<AsnIpCfg> findAllList(AsnIpCfg cfg);
+	public List<AsnIpCfg> findAllListByAsnGroup(@Param("entity")AsnIpCfg entity,@Param("asnGroups")List<AsnGroupInfo> asnGroups,@Param("asnIds")String asnIds);
 //	public List<ConfigGroupInfo> findPolicyGroupInfosByType(@Param("groupId")Integer groupId);
 	public List<Integer>  findOtherIps(@Param("groupId")Integer groupId,@Param("cfgId")Integer cfgId);
 	public List<Integer> countValidIPs(@Param("groups")String groups,@Param("ids")String ids);
@@ -32,4 +34,5 @@ public interface AsnIpCfgDao extends CrudDao<AsnIpCfg>{
 	public int hasValidAsnIp(@Param("asnId")Long asnNo);
 	public AsnIpCfg getOne(AsnIpCfg cfg);
 	public void updateAsn(@Param("asnId")String asnNo,@Param("organization")String organization,@Param("country")String country,@Param("detail")String detail);
+	public void updateAsnIpByAsnGroups(@Param("entity")AsnIpCfg entity,@Param("asnGroups")List<AsnGroupInfo> asnGroups,@Param("asnIds")String asnIds);
 }
--- a/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
@@ -308,6 +308,26 @@
 	    		AND r.asn_ip_group =#{asnIpGroup}
 	    </if>
    </select>
+    <select id="findAllListByAsnGroup" resultMap="asnIpCfgMap">
+    	select 
+    		<include refid="columns"></include>
+    	from asn_ip_cfg r
+    	<where>
+    		and is_valid=#{entity.isValid,jdbcType=INTEGER}
+    		and is_audit=#{entity.isAudit,jdbcType=INTEGER}
+     		<if test=" asnGroups != null">
+     			and r.user_region1 in 
+		    	<foreach collection ="asnGroups" item="asnGroup" separator ="," open="(" close=")">
+			         #{asnGroup.asnId,jdbcType=INTEGER}
+			    </foreach >
+     		</if>
+     		<if test=" asnIds != null and asnIds !=''">
+     			and r.user_region1 in (select asn_id from asn_group_info where asn_id in(${asnIds}) and is_used=0)
+			         
+     		</if>
+     	</where>
+    	
+    </select>
    <select id="getByIds" resultMap="asnIpCfgMap">
    	select 
    		<include refid="columns"></include>
@@ -627,6 +647,26 @@
 		<!-- left join policy_group_info d on r.asn_ip_group = d.service_group_id -->
    	where r.CFG_ID in (${ids})
    </select>
-    
+	<update id="updateAsnIpByAsnGroups" >
+     	update asn_ip_cfg set 
+     			<if test=" asnIds != null and asnIds !=''">
+     				is_valid=#{entity.isValid} ,
+     				is_audit=#{entity.isAudit},
+     			</if>
+     			AUDITOR_ID = #{entity.auditorId,jdbcType=INTEGER}
+			   	,AUDIT_TIME = #{entity.auditTime,jdbcType=TIMESTAMP}
+     	<where>
+		    <if test=" asnGroups != null">
+     			and user_region1 in 
+		    	<foreach collection ="asnGroups" item="asnGroup" separator ="," open="(" close=")">
+			         #{asnGroup.asnId,jdbcType=INTEGER}
+			    </foreach >
+     		</if>
+     		<if test=" asnIds != null and asnIds !=''">
+     			and user_region1 in (select asn_id from asn_group_info where asn_id in(${asnIds}) and is_used=0)
+			         
+     		</if>
+     	</where>
+    </update>
 	
 </mapper>