From 135b66c6f544166c1c17ebef3c95abf338808c56 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 26 Sep 2018 17:43:50 +0800
Subject: [PATCH] =?UTF-8?q?(1)config=5Fgroup=5Finfo=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=B8=80=E5=88=97compile=5Fid=EF=BC=8C=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E5=AD=98=E6=94=BEapp=5Fip=5Fcfg=E7=9A=84compile=5Fid,=E9=98=B2?=
 =?UTF-8?q?=E6=AD=A2app=5Fip=5Fcfg=E7=9A=84=E6=95=B0=E6=8D=AE=E8=A2=AB?=
 =?UTF-8?q?=E8=AF=AF=E6=B8=85=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96=E4=B8=8D=E5=88=B0=E6=AD=A3=E7=A1=AE=E7=9A=84=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91ID=20(2)IP=5FTYPE=E5=8E=BB=E6=8E=8946,64,10=E4=B8=89?=
 =?UTF-8?q?=E7=A7=8D=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/specific/ConfigGroupInfo.java |  8 ++++++++
 .../web/dao/specific/SpecificServiceCfgDao.xml   | 12 ++++++++----
 .../web/service/configuration/AppCfgService.java | 16 +++++++++++-----
 .../sql/20180926/update_config_group_info.sql    |  2 ++
 .../resources/sql/20180926/update_ip_type.sql    |  2 ++
 5 files changed, 31 insertions(+), 9 deletions(-)
 create mode 100644 src/main/resources/sql/20180926/update_config_group_info.sql
 create mode 100644 src/main/resources/sql/20180926/update_ip_type.sql

diff --git a/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java b/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java
index e51dc5bd9..72f75145b 100644
--- a/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java
+++ b/src/main/java/com/nis/domain/specific/ConfigGroupInfo.java
@@ -10,6 +10,14 @@ public class ConfigGroupInfo {
 	private Date insertTime;
 	private Date updateTime;
 	private Integer groupType;
+	private Integer compileId;
+	
+	public Integer getCompileId() {
+		return compileId;
+	}
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
 	public Integer getId() {
 		return id;
 	}
diff --git a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml
index 63918e545..9d00b2bd1 100644
--- a/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml
@@ -212,7 +212,7 @@
 	
 	<!-- 根据groupId查出配置分组信息 -->
 	<select id="getConfigGroupInfoByGroupId" resultType="com.nis.domain.specific.ConfigGroupInfo" parameterType="java.lang.Integer">
-	  select id,group_id,group_name,is_issued,insert_time,update_time,group_type
+	  select id,group_id,group_name,is_issued,insert_time,update_time,group_type,compile_id
 	  from config_group_info c where c.group_id= #{groupId}
 	</select>
 	<select id="getIssuedConfigGroupInfoByGroupIds" resultType="java.lang.Integer" parameterType="java.lang.String">
@@ -221,12 +221,16 @@
 	
 	<!-- 修改配置分组状态信息 -->
 	<update id="updateConfigGroupInfobyGroupId" parameterType="com.nis.domain.specific.ConfigGroupInfo">
-	UPDATE config_group_info set is_issued = #{isIssued},update_time=now() where group_id = #{groupId}
+	UPDATE config_group_info set is_issued = #{isIssued},update_time=now()
+	<if test="compileId != null and compileId !='' ">
+	  ,compile_id= #{compileId}
+	</if>
+	 where group_id = #{groupId}
 	</update>
 	
 	<!-- 新增配置分组信息 -->
  	<insert id="insertConfigGroupInfo" parameterType="com.nis.domain.specific.ConfigGroupInfo" useGeneratedKeys="true">
- 	insert into config_group_info (id,group_id,group_name,is_issued,insert_time,group_type)
-      values(#{id},#{groupId},#{groupName},#{isIssued},now(),#{groupType}) 
+ 	insert into config_group_info (id,group_id,group_name,is_issued,insert_time,group_type,compile_id)
+      values(#{id},#{groupId},#{groupName},#{isIssued},now(),#{groupType},#{compileId}) 
  	</insert>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
index 5618b989e..757563c73 100644
--- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
@@ -335,11 +335,11 @@ public class AppCfgService extends BaseService {
 					compileId=beforeCfg.get(0).getCompileId();
 				}
 			}else if(configGroupInfo.getIsIssued().intValue()==1){//下发过了
-				List<AppIpCfg> beforeCfg=appCfgDao.getAppIpCfgBySpecServiceId(entity.getSpecServiceId());
-				if(beforeCfg==null||beforeCfg.size()==0) {
-					throw new RuntimeException("Can't get compileId, there is not app ip in an issued group");
-				}
-				compileId=beforeCfg.get(0).getCompileId();
+//				List<AppIpCfg> beforeCfg=appCfgDao.getAppIpCfgBySpecServiceId(entity.getSpecServiceId());
+//				if(beforeCfg==null||beforeCfg.size()==0) {
+//					throw new RuntimeException("Can't get compileId, there is not app ip in an issued group");
+//				}
+				compileId=configGroupInfo.getCompileId();
 			}else {
 				throw new RuntimeException("Unknown configGroupInfo isIssued value");
 			}
@@ -350,6 +350,11 @@ public class AppCfgService extends BaseService {
 			entity.setIsValid(0);
 			entity.setIsAudit(0);
 			appCfgDao.insertAppIpCfg(entity);
+			//app ip的编译ID存于configGroupInfo中
+			if((configGroupInfo.getCompileId()==null)||(compileId.intValue()!=configGroupInfo.getCompileId().intValue())) {
+				configGroupInfo.setCompileId(entity.getCompileId());
+				specificServiceCfgDao.updateConfigGroupInfobyGroupId(configGroupInfo);
+			}
 			// 保存区域IP信息
 			if (entity.getAreaCfg() != null) {
 				for (AreaIpCfg cfg : entity.getAreaCfg()) {
@@ -1102,6 +1107,7 @@ public class AppCfgService extends BaseService {
 			configGroupInfo.setGroupId(specificServiceCfg.getGroupId());
 			configGroupInfo.setGroupName(specificServiceCfg.getSpecServiceName());
 			configGroupInfo.setIsIssued(0);
+			configGroupInfo.setCompileId(entitys.get(0).getCompileId());
 			configGroupInfo.setGroupType(1);
 			specificServiceCfgDao.insertConfigGroupInfo(configGroupInfo);
 			//更新group_id
diff --git a/src/main/resources/sql/20180926/update_config_group_info.sql b/src/main/resources/sql/20180926/update_config_group_info.sql
new file mode 100644
index 000000000..6fe3c193d
--- /dev/null
+++ b/src/main/resources/sql/20180926/update_config_group_info.sql
@@ -0,0 +1,2 @@
+ALTER TABLE config_group_info MODIFY COLUMN group_type INT(11) NULL COMMENT '1:app ip，2：内容，3：区域 ,4 asn';
+ALTER TABLE config_group_info ADD COLUMN compile_id INT(11) NULL COMMENT 'app ip 对应的编译ID';
\ No newline at end of file
diff --git a/src/main/resources/sql/20180926/update_ip_type.sql b/src/main/resources/sql/20180926/update_ip_type.sql
new file mode 100644
index 000000000..2662ba9a9
--- /dev/null
+++ b/src/main/resources/sql/20180926/update_ip_type.sql
@@ -0,0 +1,2 @@
+UPDATE function_region_dict SET config_ip_type='4,6' WHERE config_ip_type='4,6,46,64,10';
+DELETE FROM sys_data_dictionary_item WHERE dictionary_id=(SELECT ID FROM sys_data_dictionary_name WHERE mark='IP_TYPE') AND item_code IN (46,64,10);
\ No newline at end of file