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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
leijun
2018-10-16 19:12:05 +08:00
parent c06a527297 b4668c734b
commit 2f5ec8ee12
19 changed files with 916 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/main/java/com/nis/domain/configuration/GroupAreaInfo.java Normal file
View File

@@ -0,0 +1,47 @@
package com.nis.domain.configuration;
import java.io.Serializable;
import java.util.Date;
/**
* 分组地理信息
*/
public class GroupAreaInfo extends BaseCfg<GroupAreaInfo> implements Serializable{
private static final long serialVersionUID = 3312689200711339511L;
private Long id;
private Integer groupId;
private Integer areaCode;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Integer getGroupId() {
return groupId;
}
public void setGroupId(Integer groupId) {
this.groupId = groupId;
}
public Integer getAreaCode() {
return areaCode;
}
public void setAreaCode(Integer areaCode) {
this.areaCode = areaCode;
}
public Date getCreateTime() {
return createTime;
}
public void setCreateTime(Date createTime) {
this.createTime = createTime;
}
public Date getEditTime() {
return editTime;
}
public void setEditTime(Date editTime) {
this.editTime = editTime;
}
}

89
src/main/java/com/nis/web/controller/configuration/GroupAreaController.java Normal file
View File

@@ -0,0 +1,89 @@
package com.nis.web.controller.configuration;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.nis.domain.Page;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.GroupAreaInfo;
import com.nis.util.StringUtil;
import com.nis.web.controller.BaseController;
import com.nis.web.service.configuration.GroupAreaService;
/**
* 分组地理信息管理
*
*/
@Controller
@RequestMapping(value = "${adminPath}/cfg/groupArea")
public class GroupAreaController extends BaseController {
@Autowired
private GroupAreaService groupAreaService;
@RequestMapping(value = { "/groupAreaList", "" })
public String policyGroupList(GroupAreaInfo cfg, HttpServletRequest request, HttpServletResponse response,
Model model) {
if (cfg == null)cfg = new GroupAreaInfo();
Page<GroupAreaInfo> pageCondition = new Page<GroupAreaInfo>(request, response, "r");
Page page = groupAreaService.findGroupAreaInfoList(pageCondition, cfg);
// 获取策略分组信息
List<PolicyGroupInfo> policyGroups = policyGroupInfoService.findNatPolicyGroups();
// 获取区域信息
initFormCondition(model);
model.addAttribute("cfg", cfg);
model.addAttribute("page", page);
model.addAttribute("policyGroups", policyGroups);
return "/cfg/manipulation/ipmulitiplex/groupAreaList";
}
@RequestMapping(value={"/groupAreaForm"})
public String form(String ids,Model model,String doAction,RedirectAttributes redirectAttributes) {
GroupAreaInfo groupArea=new GroupAreaInfo();
// 获取未使用的策略分组
List<PolicyGroupInfo> groups = policyGroupInfoService.findNatPolicyGroups();
groups = groupAreaService.getNotUsedPolicyGroups(groups);
if(!StringUtil.isEmpty(ids)){
groupArea=groupAreaService.getInfoById(Integer.parseInt(ids));
groups.add(policyGroupInfoService.getById(groupArea.getGroupId()));
}
// 获取区域信息
initFormCondition(model);
model.addAttribute("_cfg", groupArea);
model.addAttribute("policyGroups", groups);
return "/cfg/manipulation/ipmulitiplex/groupAreaForm";
}
@RequestMapping(value = "saveOrUpdate")
public String saveOrUpdate(GroupAreaInfo cfg,Model model,RedirectAttributes redirectAttributes) {
try {
groupAreaService.saveOrUpdate(cfg);
addMessage(redirectAttributes, "save_success");
} catch (Exception e) {
logger.error("新增失败",e);
addMessage(redirectAttributes, "save_failed");
}
return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList";
}
@RequestMapping(value={"delete"})
public String delete(RedirectAttributes redirectAttributes, String ids,int isValid) {
try {
groupAreaService.deldete(ids,isValid);
addMessage(redirectAttributes, "delete_success");
} catch (Exception e) {
logger.error("删除失败",e);
addMessage(redirectAttributes, "delete_failed");
}
return "redirect:" + adminPath + "/cfg/groupArea/groupAreaList";
}
}

78
src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
View File

@@ -293,40 +293,40 @@ public class AvController extends BaseController {
}
//修改标志样例配置审核状态
/**
* 审核配置下发，为了保证配置下发过程事务正确，一条配置提交一次
* @param isAudit
* @param isValid
* @param ids
* @param functionId
* @return
*/
@RequestMapping(value = {"/sample/auditAvAudioSignSample"})
public String auditAvAudioSignSample(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes){
/**
* 审核配置下发，为了保证配置下发过程事务正确，一条配置提交一次
* @param isAudit
* @param isValid
* @param ids
* @param functionId
* @return
*/
@RequestMapping(value = {"/sample/auditAvAudioSignSample"})
public String auditAvAudioSignSample(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes){
// avCfgService.auditAvSignSample(isAudit,isValid,ids);
AvSignSampleCfg entity = new AvSignSampleCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = avCfgService.getAvSignSampleById(Long.parseLong(id));
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());
entity.setAuditTime(new Date());
try {
avCfgService.audioAuditAvSignSample(entity,isAudit);
}catch(Exception e){
e.printStackTrace();
if(e instanceof MaatConvertException) {
logger.info("音视频标识样例配置下发失败："+e.getMessage());
addMessage(redirectAttributes,e.getMessage());
}else {
logger.error("auditAvAudioSignSample failed",e);
addMessage(redirectAttributes,"audit_failed");
}
AvSignSampleCfg entity = new AvSignSampleCfg();
String[] idArray = ids.split(",");
for(String id :idArray){
entity = avCfgService.getAvSignSampleById(Long.parseLong(id));
entity.setIsAudit(isAudit);
entity.setIsValid(isValid);
entity.setAuditorId(UserUtils.getUser().getId());
entity.setAuditTime(new Date());
try {
avCfgService.audioAuditAvSignSample(entity,isAudit,false);
}catch(Exception e){
e.printStackTrace();
if(e instanceof MaatConvertException) {
logger.info("音视频标识样例配置下发失败："+e.getMessage());
addMessage(redirectAttributes,e.getMessage());
}else {
logger.error("auditAvAudioSignSample failed",e);
addMessage(redirectAttributes,"audit_failed");
}
}
return "redirect:" + adminPath +"/ntc/av/sample/audioSignSampleList?functionId="+functionId;
}
return "redirect:" + adminPath +"/ntc/av/sample/signSampleList?functionId="+functionId;
}
//修改标志样例配置审核状态
/**
* 审核配置下发，为了保证配置下发过程事务正确，一条配置提交一次
@@ -340,9 +340,11 @@ public class AvController extends BaseController {
public String auditAvSignSample(Integer preset,AvSignSampleCfgModel cfg,Integer functionId,RedirectAttributes redirectAttributes){
//预置配置
try {
if(preset!=null&&1==preset){
avCfgService.auditAvSignSample();
addMessage(redirectAttributes,"audit_success");
if(preset!=null&&1==preset){//预置信息需要在数据库中插入一条记录
for (AvSignSampleCfg avSignSampleCfg : cfg.getCfgs()) {
avCfgService.saveOrUpdateAvSignSample(avSignSampleCfg);
}
addMessage(redirectAttributes,"save_success");
return "redirect:" + adminPath +"/ntc/av/sample/signSampleList?functionId="+functionId;
}
} catch (Exception e1) {
@@ -352,15 +354,15 @@ public class AvController extends BaseController {
addMessage(redirectAttributes,"request_service_failed");
}else {
logger.error("auditAvSignSample failed",e1);
addMessage(redirectAttributes,"audit_failed");
addMessage(redirectAttributes,"save_failed");
}
}
//修改下发配置
if(cfg != null && cfg.getCfgs() != null ){
for (AvSignSampleCfg avSignSampleCfg : cfg.getCfgs()) {
if(StringUtil.isEmpty(avSignSampleCfg.getIsValid())){
/*if(StringUtil.isEmpty(avSignSampleCfg.getIsValid())){
avSignSampleCfg.setIsValid(0);
}
}*/
if(cfg.getAction()!=null){
avSignSampleCfg.setAction(cfg.getAction());
}
@@ -368,7 +370,7 @@ public class AvController extends BaseController {
// if(!avSignSampleCfg.getAction().equals(avSignSampleCfg.getActionOld())||!avSignSampleCfg.getIsValid().equals(avSignSampleCfg.getIsValidOld())){
try {
avCfgService.auditAvSignSample(avSignSampleCfg);
addMessage(redirectAttributes,"audit_success");
addMessage(redirectAttributes,"save_success");
}catch(Exception e){
e.printStackTrace();
if(e instanceof MaatConvertException) {
@@ -376,7 +378,7 @@ public class AvController extends BaseController {
addMessage(redirectAttributes,"request_service_failed");
}else {
logger.error("auditAvSignSample failed",e);
addMessage(redirectAttributes,"audit_failed");
addMessage(redirectAttributes,"save_failed");
}
}
}

2
src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java
View File

@@ -15,5 +15,5 @@ public interface PolicyGroupInfoDao extends CrudDao<PolicyGroupInfo> {
List<PolicyGroupInfo> findHasIPPolicyGroupInfosByType(int groupType);
List<PolicyGroupInfo> findPolicyGroupInfosHasIpRegionByType(int groupType);
PolicyGroupInfo getById(int id);
List<PolicyGroupInfo> findNatPolicyGroups();
}

6
src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.xml
View File

@@ -67,6 +67,12 @@
FROM policy_group_info r
where r.is_valid=1
</select>
<select id="findNatPolicyGroups" resultMap="PolicyGroupInfoMap">
SELECT
<include refid="PolicyGroupInfoColumns"/>
FROM policy_group_info r
where r.is_valid=1 AND r.group_type = 2 OR r.group_type = 3
</select>
<select id="findPolicyGroupInfosByType" resultMap="PolicyGroupInfoMap">
SELECT
<include refid="PolicyGroupInfoColumns"/>

3
src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml
View File

@@ -516,6 +516,9 @@
update av_sign_sample_cfg
<set>
is_valid = #{isValid,jdbcType=INTEGER},
<if test="isAudit != null" >
is_audit = #{isAudit,jdbcType=INTEGER},
</if>
<if test="serviceId!=null">
service_id=#{serviceId,jdbcType=INTEGER},
</if>

17
src/main/java/com/nis/web/dao/configuration/GroupAreaDao.java Normal file
View File

@@ -0,0 +1,17 @@
package com.nis.web.dao.configuration;
import java.util.List;
import com.nis.domain.configuration.GroupAreaInfo;
import com.nis.web.dao.CrudDao;
import com.nis.web.dao.MyBatisDao;
@MyBatisDao
public interface GroupAreaDao extends CrudDao<GroupAreaInfo>{
List<GroupAreaInfo> findGroupAreaInfoList(GroupAreaInfo entity);
GroupAreaInfo getInfoById(int groupId);
}

127
src/main/java/com/nis/web/dao/configuration/GroupAreaDao.xml Normal file
View File

@@ -0,0 +1,127 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper namespace="com.nis.web.dao.configuration.GroupAreaDao">
<resultMap id="GroupAreaInfoMap" type="com.nis.domain.configuration.GroupAreaInfo" >
<id column="id" property="id" jdbcType="INTEGER" />
<result column="group_id" property="groupId" jdbcType="INTEGER" />
<result column="area_code" property="areaCode" jdbcType="INTEGER" />
<result column="is_valid" property="isValid" 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" />
</resultMap>
<sql id="GroupAreaInfoColumns">
r.id,
r.group_id,
r.area_code,
r.is_valid,
r.creator_id,
r.create_time,
r.editor_id,
r.edit_time
</sql>
<!-- 查出所有 有效数据-->
<select id="findGroupAreaInfoList" resultMap="GroupAreaInfoMap">
SELECT
<include refid="GroupAreaInfoColumns"/>
<trim prefix="," prefixOverrides=",">
, s.name as creator_name
,e.name as editor_name
</trim>
FROM group_area_info r
left join sys_user s on r.creator_id=s.id
left join sys_user e on r.editor_id=e.id
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="page !=null and page.where != null and page.where != ''">
AND ${page.where}
</if>
<if test="groupId != null">
AND r.group_id =#{groupId }
</if>
<if test="areaCode != null">
AND r.area_code =#{areaCode }
</if>
AND r.IS_VALID =1
<if test="creatorName != null and creatorName != ''">
AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
</if>
<if test="editorName != null and editorName != ''">
AND r.EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
</if>
<!-- 数据范围过滤 -->
<!-- ${sqlMap.dsf} -->
</trim>
<choose>
<when test="page !=null and page.orderBy != null and page.orderBy != ''">
ORDER BY ${page.orderBy}
</when>
<otherwise>
ORDER BY r.id desc
</otherwise>
</choose>
</select>
<select id="getInfoById" resultType="com.nis.domain.configuration.GroupAreaInfo">
SELECT
<include refid="GroupAreaInfoColumns"/>
FROM
group_area_info r
WHERE
r.id = #{Id}
</select>
<insert id="insert" parameterType="com.nis.domain.configuration.GroupAreaInfo" >
insert into group_area_info(
ID,
GROUP_ID,
AREA_CODE,
IS_VALID,
CREATOR_ID,
CREATE_TIME
)values (
#{id,jdbcType=INTEGER},
#{groupId,jdbcType=INTEGER},
#{areaCode,jdbcType=INTEGER},
#{isValid,jdbcType=INTEGER},
#{creatorId,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}
)
</insert>
<update id="update" parameterType="com.nis.domain.configuration.GroupAreaInfo" >
update group_area_info
<set >
<trim suffixOverrides=",">
<if test="id != null" >
id = #{id,jdbcType=INTEGER},
</if>
<if test="groupId != null" >
group_Id = #{groupId,jdbcType=INTEGER},
</if>
<if test="areaCode != null" >
area_code = #{areaCode,jdbcType=INTEGER},
</if>
<if test="isValid != null" >
is_valid = #{isValid,jdbcType=INTEGER},
</if>
<if test="editorId != null" >
editor_id = #{editorId,jdbcType=INTEGER},
</if>
<if test="editTime != null and editTime != ''" >
edit_time = #{editTime,jdbcType=TIMESTAMP},
</if>
</trim>
</set>
<where>
<if test="id != null" >
and id = #{id,jdbcType=INTEGER}
</if>
</where>
</update>
</mapper>

4
src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java
View File

@@ -45,6 +45,10 @@ public class PolicyGroupInfoService extends BaseService{
List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfos();
return list;
}
public List<PolicyGroupInfo> findNatPolicyGroups() {
List<PolicyGroupInfo> list=policyGroupInfoDao.findNatPolicyGroups();
return list;
}
public List<PolicyGroupInfo> findPolicyGroupInfosByType(int type) {
List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByType(type);
return list;

135
src/main/java/com/nis/web/service/configuration/AvCfgService.java
View File

@@ -291,7 +291,7 @@ public class AvCfgService extends BaseService{
entity.setCreateTime(new Date());
//调用服务接口获取compileId
Integer compileId = 0;
try {
/*try {
List<Integer> compileIds = ConfigServiceUtil.getId(1,1);
if(!StringUtil.isEmpty(compileIds)){
compileId = compileIds.get(0);
@@ -300,13 +300,13 @@ public class AvCfgService extends BaseService{
e.printStackTrace();
logger.info("获取编译ID出错");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
}
if(compileId!=0){
}*/
// if(compileId!=0){
entity.setCompileId(compileId);
avCfgDao.insertAvSignSample(entity);
}else{
/*}else{
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
}*/
}else{
entity.setEditorId(UserUtils.getUser().getId());
@@ -318,7 +318,7 @@ public class AvCfgService extends BaseService{
//添加即时生效
entity.setIsValid(1);
entity.setIsAudit(1);
audioAuditAvSignSample(entity,1);
audioAuditAvSignSample(entity,1,true);
}
public void updateAvFileSampleValid(Integer isAudit,Integer isValid,String ids){
String[] idArray = ids.split(",");
@@ -375,18 +375,28 @@ public class AvCfgService extends BaseService{
}
}
public void audioAuditAvSignSample(AvSignSampleCfg entity,Integer isAudit) throws MaatConvertException{
public void audioAuditAvSignSample(AvSignSampleCfg entity,Integer isAudit,boolean init) throws MaatConvertException{
entity.setAuditTime(new Date());
entity.setAuditorId(UserUtils.getUser().getId());
avCfgDao.auditAvSignSample(entity);
List<AvSignSampleCfg> list = new ArrayList<AvSignSampleCfg>();
if(isAudit==1){
list.add(entity);
//调用服务接口下发配置数据
String json=gsonToJson(list);
logger.info("文件样例下发配置参数："+json);
//调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
logger.info("音视频标志样例配置下发响应信息："+result.getMsg());
if(init){//预置配置时初始下发配置
list.add(entity);
//调用服务接口下发配置数据
String json=gsonToJson(list);
logger.info("文件样例下发配置参数："+json);
//调用服务接口下发配置
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
logger.info("音视频标志样例配置下发响应信息："+result.getMsg());
}else{
list.add(entity);
String json=gsonToJson(list);
logger.info("标志状态变更："+json);
//调用服务接口修改配置内容
String result = ConfigServiceUtil.patch(json, 2);
logger.info("视频标志样状态变更响应信息："+result);
}
}else if(isAudit==3){
AvSignSampleCfg cfg = new AvSignSampleCfg();
cfg.setIsValid(0);
@@ -399,78 +409,57 @@ public class AvCfgService extends BaseService{
//调用服务接口取消配置
ToMaatResult result = ConfigServiceUtil.put(json, 2);
logger.info("音视频标志样例配置取消配置响应信息："+result.getMsg());
}
}
}
//预置配置下发
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void auditAvSignSample() throws MaatConvertException{
try {
AvSignSampleCfg entity = new AvSignSampleCfg();
List<AvSignSampleCfg> avSignSampleList = avCfgDao.getAvSignSampleList(entity);
if(avSignSampleList!=null&&avSignSampleList.size()>0){
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void auditAvSignSample() throws MaatConvertException{
try {
AvSignSampleCfg entity = new AvSignSampleCfg();
List<AvSignSampleCfg> avSignSampleList = avCfgDao.getAvSignSampleList(entity);
if(avSignSampleList!=null&&avSignSampleList.size()>0){
// avCfgDao.updateAvSignSampleValid(entity);
// avCfgDao.auditAvSignSample(entity);
// List<AvSignSampleCfg> list = new ArrayList<AvSignSampleCfg>();
// avSignSampleList.add(entity);
for (AvSignSampleCfg av : avSignSampleList) {
av.setAuditTime(new Date());
av.setAuditorId(UserUtils.getUser().getId());
if(av.getIsValid()!=null&&av.getIsValid()!=1){
av.setIsValid(1);
}
avCfgDao.updateAvSignSampleValid(av);
for (AvSignSampleCfg av : avSignSampleList) {
av.setAuditTime(new Date());
av.setAuditorId(UserUtils.getUser().getId());
if(av.getIsValid()!=null&&av.getIsValid()!=1){
av.setIsValid(1);
}
//调用服务接口取消配置
String json=gsonToJson(avSignSampleList);
logger.info("标志状态变更："+json);
//调用服务接口取消配置
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
logger.info("音视频标志样状态变更响应信息："+result.getMsg());
}else{
logger.info("视频场景预置失败，数据为空");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
avCfgDao.updateAvSignSampleValid(av);
}
} catch (Exception e) {
e.printStackTrace();
//调用服务接口取消配置
String json=gsonToJson(avSignSampleList);
logger.info("标志状态变更："+json);
//调用服务接口取消配置
ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
logger.info("音视频标志样状态变更响应信息："+result.getMsg());
}else{
logger.info("视频场景预置失败，数据为空");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
} catch (Exception e) {
e.printStackTrace();
logger.info("视频场景预置失败，数据为空");
throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void auditAvSignSample(AvSignSampleCfg entity) throws Exception{
List<AvSignSampleCfg> list = new ArrayList<AvSignSampleCfg>();
entity.setAuditTime(new Date());
entity.setDescription("0");
list.add(entity);
try {
}
@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
public void auditAvSignSample(AvSignSampleCfg entity) throws Exception{
List<AvSignSampleCfg> list = new ArrayList<AvSignSampleCfg>();
entity.setEditTime(new Date());
entity.setDescription("0");
list.add(entity);
try {
avCfgDao.updateAvSignSampleValid(entity);
// avCfgDao.auditAvSignSample(entity);
//更新配置
if(entity.getIsValid()!=null&&entity.getIsValid()==Constants.VALID_YES){
//调用服务接口取消配置
String json=gsonToJson(list);
logger.info("标志状态变更："+json);
//调用服务接口取消配置
String result = ConfigServiceUtil.patch(json, 2);
logger.info("视频标志样状态变更响应信息："+result);
}
if(entity.getIsValid()!=null&&entity.getIsValid()==Constants.VALID_NO){
//调用服务接口取消配置
String json=gsonToJson(list);
logger.info("标志状态变更："+json);
//调用服务接口取消配置
ToMaatResult result = ConfigServiceUtil.put(json, 2);
logger.info("视频标志样状态变更响应信息："+result.getMsg());
}
} catch (Exception e) {
e.printStackTrace();
}
} catch (Exception e) {
e.printStackTrace();
}
}
/*public void auditAvSignSample(AvSignSampleCfg entity,Integer isAudit) throws MaatConvertException{
avCfgDao.auditAvSignSample(entity);
List<AvSignSampleCfg> list = new ArrayList<AvSignSampleCfg>();

83
src/main/java/com/nis/web/service/configuration/GroupAreaService.java Normal file
View File

@@ -0,0 +1,83 @@
package com.nis.web.service.configuration;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.nis.domain.Page;
import com.nis.domain.basics.PolicyGroupInfo;
import com.nis.domain.configuration.GroupAreaInfo;
import com.nis.util.StringUtil;
import com.nis.web.dao.configuration.GroupAreaDao;
import com.nis.web.security.UserUtils;
import com.nis.web.service.BaseService;
@Service
public class GroupAreaService extends BaseService{
@Autowired
private GroupAreaDao groupAreaDao;
public Page<GroupAreaInfo> findGroupAreaInfoList(Page<GroupAreaInfo> page, GroupAreaInfo entity) {
entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
entity.setPage(page);
List<GroupAreaInfo> list=groupAreaDao.findGroupAreaInfoList(entity);
page.setList(list);
return page;
}
public GroupAreaInfo getInfoById(int groupId) {
GroupAreaInfo GroupAreaInfo=groupAreaDao.getInfoById(groupId);
return GroupAreaInfo;
}
public void saveOrUpdate(GroupAreaInfo entity) {
entity.setIsValid(1);
if(entity.getId()==null){//新增
Date createTime=new Date();
entity.setCreatorId(UserUtils.getUser().getId());
entity.setCreateTime(createTime);
groupAreaDao.insert(entity);
}else{//修改
Date editTime=new Date();
entity.setEditorId(UserUtils.getUser().getId());
entity.setEditTime(editTime);
groupAreaDao.update(entity);
}
}
public void deldete(String ids, int isValid) {
if(!StringUtil.isEmpty(ids)){
GroupAreaInfo entity=new GroupAreaInfo();
Date editTime=new Date();
entity.setEditorId(UserUtils.getUser().getId());
entity.setEditTime(editTime);
entity.setIsValid(isValid);
for (String id : ids.split(",")) {
if(!StringUtil.isEmpty(id)){
entity.setId(Long.parseLong(id));
groupAreaDao.update(entity);
}
}
}
}
// 获取未使用的策略分组
public List<PolicyGroupInfo> getNotUsedPolicyGroups(List<PolicyGroupInfo> policyGroups) {
List<GroupAreaInfo> groupAreas=groupAreaDao.findGroupAreaInfoList(new GroupAreaInfo());
for (GroupAreaInfo groupArea : groupAreas) {
for (int i = 0; i < policyGroups.size(); i++) {
Integer groupId = policyGroups.get(i).getGroupId();
if(groupArea.getGroupId().equals(groupId)){
policyGroups.remove(i);
i--;
}
}
}
return policyGroups;
}
}