gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

音视频内容IP审核功能完成

Browse Source 
音视频图片IP功能完成
音视频VOIP界面protocolId修改
This commit is contained in:
duandongmei
2018-05-31 17:21:34 +08:00
parent 95cf618e72
commit 56151dfad9
11 changed files with 1238 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.java
View File

@@ -19,7 +19,8 @@ import com.nis.web.dao.MyBatisDao;
@MyBatisDao
public interface AvContentCfgDao {
public List<CfgIndexInfo> findVoipList(CfgIndexInfo entity) ;
public List<AvContIpCfg> findContIpList(AvContIpCfg entity) ;
public List<BaseIpCfg> findIpList(BaseIpCfg entity) ;
public List<BaseIpCfg> getIpList(BaseIpCfg entity) ;
public List<AvVoipIpCfg> findVoipIpCfgList(CfgIndexInfo entity);
public List<AvVoipAccountCfg> findVoipAccountCfgList(CfgIndexInfo entity);
public CfgIndexInfo getCfgIndexInfo(CfgIndexInfo entity);
@@ -31,7 +32,7 @@ public interface AvContentCfgDao {
public void updateAvVoipAccount(CfgIndexInfo entity);
public void deleteAvVoipIp(CfgIndexInfo entity);
public void deleteAvVoipAccount(CfgIndexInfo entity);
public AvContIpCfg findContIpCfgById(AvContIpCfg entity) ;
public void insertAvContIp(AvContIpCfg entity);
public void updateAvContIp(AvContIpCfg entity);
public BaseIpCfg findIpCfgById(BaseIpCfg entity) ;
public void insertIp(BaseIpCfg entity);
public void updateIp(BaseIpCfg entity);
}

37
src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
View File

@@ -804,14 +804,14 @@
</where>
</delete>
<!-- avContIp条件查询列表信息 -->
<select id="findContIpList" resultMap="AvContIpCfgMap" parameterType="com.nis.domain.configuration.AvContIpCfg" >
<select id="findIpList" resultMap="AvContIpCfgMap" parameterType="com.nis.domain.configuration.BaseIpCfg" >
SELECT
<include refid="AvContIp_Column" />
<trim prefix="," prefixOverrides=",">
, s.name as creator_name,e.name as editor_name,u.name as auditor_name
,ri.request_title as requestName
</trim>
FROM av_cont_ip_cfg r
FROM ${tableName} r
left join sys_user s on r.creator_id=s.id
left join sys_user e on r.editor_id=e.id
left join sys_user u on r.auditor_id=u.id
@@ -912,10 +912,10 @@
</choose>
</select>
<!-- 根据cfg_id获取avContIpCfg信息 -->
<select id="findContIpCfgById" resultMap="AvContIpCfgMap" parameterType="com.nis.domain.configuration.AvContIpCfg">
<select id="findIpCfgById" resultMap="AvContIpCfgMap" parameterType="com.nis.domain.configuration.BaseIpCfg">
select
<include refid="AvContIp_Column" />
from av_cont_ip_cfg r
from ${tableName} r
<where>
<if test="cfgId != null">
and r.cfg_id=#{cfgId,jdbcType=INTEGER}
@@ -932,11 +932,8 @@
</select>
<!-- insert AV_cont_IP_CFG表信息 -->
<insert id="insertAvContIp" parameterType="com.nis.domain.configuration.AvContIpCfg" >
<selectKey resultType="java.lang.Long" order="AFTER" keyProperty="cfgId">
SELECT LAST_INSERT_ID()
</selectKey>
insert into av_cont_ip_cfg (
<insert id="insertIp" parameterType="com.nis.domain.configuration.BaseIpCfg" >
insert into ${tableName} (
CFG_DESC,
ACTION,
IS_VALID,
@@ -1003,8 +1000,8 @@
)
</insert>
<!-- update av_cont_ip_cfg表信息 -->
<update id="updateAvContIp" parameterType="com.nis.domain.configuration.AvContIpCfg" >
update av_cont_ip_cfg
<update id="updateIp" parameterType="com.nis.domain.configuration.BaseIpCfg" >
update ${tableName}
<set >
<trim suffixOverrides=",">
<if test="cfgDesc != null and cfgDesc != ''" >
@@ -1105,4 +1102,22 @@
</if>
</where>
</update>
<select id="getIpList" resultMap="AvVoipIpCfgMap" parameterType="com.nis.domain.configuration.BaseIpCfg">
select
<include refid="AvVoipIp_Column" />
from ${tableName} r
<where>
<if test="cfgId != null">
and r.cfg_id=#{cfgId,jdbcType=INTEGER}
</if>
<choose>
<when test="isValid != null">
and r.is_valid=#{isValid,jdbcType=INTEGER}
</when>
<otherwise>
and r.is_valid != -1
</otherwise>
</choose>
</where>
</select>
</mapper>