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

file\on\off增加国际化

Browse Source 
国际化修改CA为CN
增加音频/视频标志开关功能
This commit is contained in:
duandongmei
2018-07-18 11:23:46 +08:00
parent 744df6a2de
commit f149800212
10 changed files with 204 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/nis/domain/configuration/AvSignSampleCfg.java
View File

@@ -16,6 +16,15 @@ public class AvSignSampleCfg extends BaseCfg<AvSignSampleCfg> {
@Expose
@SerializedName("cfgId")
private Integer compileId;
private Integer isValidOld;
public Integer getIsValidOld() {
return isValidOld;
}
public void setIsValidOld(Integer isValidOld) {
this.isValidOld = isValidOld;
}
public String getDescription() {
return description;
}

23
src/main/java/com/nis/domain/configuration/AvSignSampleCfgModel.java Normal file
View File

@@ -0,0 +1,23 @@
package com.nis.domain.configuration;
import java.util.List;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
public class AvSignSampleCfgModel extends BaseCfg<AvSignSampleCfgModel> {
/**
*
*/
private static final long serialVersionUID = 7579758192797537509L;
private List<AvSignSampleCfg> cfgs;
public List<AvSignSampleCfg> getCfgs() {
return cfgs;
}
public void setCfgs(List<AvSignSampleCfg> cfgs) {
this.cfgs = cfgs;
}
}

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

@@ -24,6 +24,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.FileCopyUtils;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.multipart.MultipartFile;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
@@ -38,6 +39,7 @@ import com.nis.domain.FunctionRegionDict;
import com.nis.domain.Page;
import com.nis.domain.configuration.AvFileSampleCfg;
import com.nis.domain.configuration.AvSignSampleCfg;
import com.nis.domain.configuration.AvSignSampleCfgModel;
import com.nis.domain.maat.ToMaatResult;
import com.nis.domain.maat.ToMaatResult.ResponseData;
import com.nis.exceptions.MaatConvertException;
@@ -75,15 +77,17 @@ public class AvController extends BaseController {
//音视频标志样例配置列表
@RequestMapping(value = {"/sample/signSampleList"})
public String signSampleList(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")AvSignSampleCfg entity){
Page<AvSignSampleCfg> page = avCfgService.getAvSignSampleList(new Page<AvSignSampleCfg>(request, response,"a"), entity);
model.addAttribute("page", page);
List<AvSignSampleCfg> list = avCfgService.getSignSampleList(entity);
model.addAttribute("cfgs", list);
model.addAttribute("functionId", entity.getFunctionId());
initPageCondition(model);
List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
/*List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
for(FunctionRegionDict region:regionList){
model.addAttribute("regionValue",region.getConfigRegionValue());
break;
}
return "/cfg/av/signSampleList";
}*/
//return "/cfg/av/signSampleList";
return "/cfg/av/switchSignSample";
}
//文件样例配置界面
@RequestMapping(value = {"/sample/fileSampleForm"})
@@ -272,22 +276,22 @@ public class AvController extends BaseController {
* @return
*/
@RequestMapping(value = {"/sample/auditAvSignSample"})
public String auditAvSignSample(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.auditAvSignSample(entity,isAudit);
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("音视频标识样例配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
public String auditAvSignSample(AvSignSampleCfgModel cfg,Integer functionId,RedirectAttributes redirectAttributes){
if(cfg != null && cfg.getCfgs() != null ){
for (AvSignSampleCfg avSignSampleCfg : cfg.getCfgs()) {
if(StringUtil.isEmpty(avSignSampleCfg.getIsValid())){
avSignSampleCfg.setIsValid(0);
}
//isValid值变更才下发
if(!avSignSampleCfg.getIsValid().equals(avSignSampleCfg.getIsValidOld())){
try {
avCfgService.auditAvSignSample(avSignSampleCfg);
} catch (MaatConvertException e) {
logger.error("下发失败",e);
addMessage(redirectAttributes, e.getMessage());
}
}
}
}
return "redirect:" + adminPath +"/ntc/av/sample/signSampleList?functionId="+functionId;

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

@@ -72,6 +72,10 @@ public class AvCfgService extends BaseService{
page.setList(list);
return page;
}
public List<AvSignSampleCfg> getSignSampleList(AvSignSampleCfg entity){
List<AvSignSampleCfg> list = avCfgDao.getAvSignSampleList(entity);
return list;
}
public void saveOrUpdateAvFileSample(AvFileSampleCfg entity){
//设置区域运营商信息
setAreaEffectiveIds(entity);
@@ -280,7 +284,23 @@ public class AvCfgService extends BaseService{
avCfgDao.updateAvSignSampleValid(entity);
}
}
public void auditAvSignSample(AvSignSampleCfg entity,Integer isAudit) throws MaatConvertException{
public void auditAvSignSample(AvSignSampleCfg entity) throws MaatConvertException{
avCfgDao.updateAvSignSampleValid(entity);
avCfgDao.auditAvSignSample(entity);
List<AvSignSampleCfg> list = new ArrayList<AvSignSampleCfg>();
list.add(entity);
//调用服务接口取消配置
String json=gsonToJson(list);
logger.info("标志状态变更："+json);
//调用服务接口取消配置
//ToMaatResult result = ConfigServiceUtil.put(json, 2);
//logger.info("音视频标志样状态变更响应信息："+result.getMsg());
}
/*public void auditAvSignSample(AvSignSampleCfg entity,Integer isAudit) throws MaatConvertException{
avCfgDao.auditAvSignSample(entity);
List<AvSignSampleCfg> list = new ArrayList<AvSignSampleCfg>();
if(isAudit==1){
@@ -306,7 +326,7 @@ public class AvCfgService extends BaseService{
logger.info("音视频标志样例配置取消配置响应信息："+result.getMsg());
}
}
}*/
/**
* 调用shell脚本 返回运行结果
*