diff --git a/src/main/java/com/nis/domain/configuration/AvSignSampleCfg.java b/src/main/java/com/nis/domain/configuration/AvSignSampleCfg.java index aec629b47..70c51ef4e 100644 --- a/src/main/java/com/nis/domain/configuration/AvSignSampleCfg.java +++ b/src/main/java/com/nis/domain/configuration/AvSignSampleCfg.java @@ -16,6 +16,15 @@ public class AvSignSampleCfg extends BaseCfg { @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; } diff --git a/src/main/java/com/nis/domain/configuration/AvSignSampleCfgModel.java b/src/main/java/com/nis/domain/configuration/AvSignSampleCfgModel.java new file mode 100644 index 000000000..736a6b709 --- /dev/null +++ b/src/main/java/com/nis/domain/configuration/AvSignSampleCfgModel.java @@ -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 { + + /** + * + */ + private static final long serialVersionUID = 7579758192797537509L; + private List cfgs; + public List getCfgs() { + return cfgs; + } + public void setCfgs(List cfgs) { + this.cfgs = cfgs; + } + + +} diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java index 61c8f5a74..c3e7a0f5f 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java @@ -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 page = avCfgService.getAvSignSampleList(new Page(request, response,"a"), entity); - model.addAttribute("page", page); + List list = avCfgService.getSignSampleList(entity); + model.addAttribute("cfgs", list); + model.addAttribute("functionId", entity.getFunctionId()); initPageCondition(model); - List regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId()); + /*List 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; diff --git a/src/main/java/com/nis/web/service/configuration/AvCfgService.java b/src/main/java/com/nis/web/service/configuration/AvCfgService.java index 89267ad41..dd849bd22 100644 --- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java @@ -72,6 +72,10 @@ public class AvCfgService extends BaseService{ page.setList(list); return page; } + public List getSignSampleList(AvSignSampleCfg entity){ + List 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 list = new ArrayList(); + 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 list = new ArrayList(); if(isAudit==1){ @@ -306,7 +326,7 @@ public class AvCfgService extends BaseService{ logger.info("音视频标志样例配置取消配置响应信息："+result.getMsg()); } - } + }*/ /** * 调用shell脚本 返回运行结果 * diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 3c10c0ef3..fe289444a 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -570,6 +570,7 @@ av_sample_control=Sample configure_statistics_info=Configure statistics info harm_level=Degree of harm src_file=Source File +file=File select_file=Please Select Upload File sample_file=Sample File sample_sign=Sample Sign @@ -601,7 +602,7 @@ http_res_body_title=HTTP Response Body Configuration ssl_ip=SSL IP Configuration ssl_sni=SSL SNI Keyowrd Configuration ssl_san=SSL SAN Keyowrd Configuration -ssl_ca=SSL CA Keyowrd Configuration +ssl_ca=SSL CN Keyowrd Configuration http_control=http Configuration ingress=Ingress egress=Egress diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 01ed862b7..96975b8d0 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -570,9 +570,12 @@ av_sample_control=\u97F3\u89C6\u9891\u6837\u4F8B configure_statistics_info=\u914D\u7F6E\u7EDF\u8BA1\u4FE1\u606F harm_level=\u5371\u5BB3\u7A0B\u5EA6 src_file=\u6E90\u6587\u4EF6 +file=\u6587\u4EF6 select_file=\u8BF7\u9009\u62E9\u4E0A\u4F20\u6587\u4EF6 sample_file=\u6837\u4F8B\u6587\u4EF6 sample_sign=\u6837\u4F8B\u6807\u5FD7 +off=\u5173 +on=\u5F00 click_detail=\u8BF7\u70B9\u51FB\u201C\u67E5\u770B\u8BE6\u7EC6\u4FE1\u606F\u201D\u6309\u94AE\uFF0C\u5C06\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F\u53D1\u9001\u7ED9\u7CFB\u7EDF\u7BA1\u7406\u5458\uFF0C\u8C22\u8C22\uFF01 return_lastpage=\u8FD4\u56DE\u4E0A\u4E00\u9875 show_detail=\u67E5\u770B\u8BE6\u7EC6\u4FE1\u606F @@ -809,7 +812,7 @@ av_voip_account=VoIP\u8D26\u53F7\u914D\u7F6E av_cont_ip=\u5185\u5BB9IP\u914D\u7F6E NTC_SSL_SNI=SNI\u5173\u952E\u5B57\u914D\u7F6E NTC_SSL_SAN=SAN\u5173\u952E\u5B57\u914D\u7F6E -NTC_SSL_CA=CA\u5173\u952E\u5B57\u914D\u7F6E +NTC_SSL_CA=CN\u5173\u952E\u5B57\u914D\u7F6E av_pic_ip=\u56FE\u7247IP\u914D\u7F6E av_cont_url=\u5185\u5BB9URL\u914D\u7F6E av_pic_url=\u56FE\u7247URL\u914D\u7F6E diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp index b3bff8f38..6b132ff51 100644 --- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp @@ -3,6 +3,8 @@ <spring:message code="${cfgName}"></spring:message> + + + + + +
+

+ + + + + +

+
+
+
+
+
+ +
+
+ +
+ +
+ +
+
+ +
+
+ + + + + +
+
+ " + data-off-label="" + name="cfgs[${status.index }].isValid" + value="${_cfg.isValid }" + + checked + + /> +
+
+
+
+ +
+ +
+
+
+
+
+
+ + +
+
+
+
+
+
+
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp index 7c2dbd6a3..4d9a915d3 100644 --- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp @@ -5,7 +5,7 @@ <spring:message code="${cfgName}"></spring:message>