(1)策略分组修改,增加分租asn,id 为4

(2)策略分组删除时判断ASN分组是否已经下发过,如果已经下发过,则不能删除
(3)配置分组修改不能更新分组类型
This commit is contained in:
wangxin
2018-08-27 21:10:13 +08:00
parent 4259117e94
commit 18bfc299e4
12 changed files with 166 additions and 20 deletions

View File

@@ -11,10 +11,11 @@
<result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
<result column="creator_id" property="creatorId" jdbcType="INTEGER" />
<result column="editor_id" property="editorId" jdbcType="INTEGER" />
<result column="service_group_id" property="serviceGroupId" jdbcType="INTEGER" />
</resultMap>
<sql id="PolicyGroupInfoColumns">
r.group_id,r.group_name,r.group_type,r.is_valid,
r.create_time,r.edit_time,r.creator_id,r.editor_id
r.create_time,r.edit_time,r.creator_id,r.editor_id,r.service_group_id
</sql>
<!-- 查出所有 有效数据-->
@@ -78,13 +79,15 @@
CREATOR_ID,
CREATE_TIME,
GROUP_NAME,
GROUP_TYPE
GROUP_TYPE,
SERVICE_GROUP_ID
)values (
1,
#{creatorId,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP},
#{groupName,jdbcType=VARCHAR},
#{groupType,jdbcType=INTEGER}
#{groupType,jdbcType=INTEGER},
#{serviceGroupId,jdbcType=INTEGER}
)
</insert>
<update id="update" parameterType="com.nis.domain.basics.PolicyGroupInfo" >
@@ -112,6 +115,9 @@
<if test="groupId != null" >
and group_id = #{groupId,jdbcType=INTEGER}
</if>
<if test="serviceGroupId != null" >
and service_group_id = #{serviceGroupId,jdbcType=INTEGER}
</if>
</where>
</update>

View File

@@ -43,6 +43,7 @@ public interface SpecificServiceCfgDao extends CrudDao<SpecificServiceCfg> {
List<SpecificServiceCfg> getChildrenById(Integer specServiceId);
ConfigGroupInfo getConfigGroupInfoByGroupId(Integer groupId);
Integer getIssuedConfigGroupInfoByGroupIds(String groupIds);
Integer insertConfigGroupInfo(ConfigGroupInfo entity);

View File

@@ -215,6 +215,9 @@
select id,group_id,group_name,is_issued,insert_time,update_time,group_type
from config_group_info c where c.group_id= #{groupId}
</select>
<select id="getIssuedConfigGroupInfoByGroupIds" resultType="java.lang.Integer" parameterType="java.lang.String">
select count(1) from config_group_info c where c.group_id in(#{groupIds}) and is_issued=1
</select>
<!-- 修改配置分组状态信息 -->
<update id="updateConfigGroupInfobyGroupId" parameterType="com.nis.domain.specific.ConfigGroupInfo">