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://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
duandongmei
2018-08-09 19:46:12 +08:00
parent c939d46ba8 3e97682153
commit 7d6c1bd058
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,13 +1,6 @@
package com.nis.web.controller.configuration.ntc;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.lang.reflect.Type;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -17,24 +10,14 @@ import java.util.UUID;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONObject;
import org.apache.commons.httpclient.util.DateUtil;
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;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;
import com.google.gson.JsonSerializationContext;
import com.google.gson.JsonSerializer;
import com.nis.domain.FunctionRegionDict;
import com.nis.domain.Page;
import com.nis.domain.configuration.AvFileSampleCfg;
@@ -174,7 +157,7 @@ public class AvController extends BaseController {
}catch(Exception e){
logger.error("文件上传失败",e);
e.printStackTrace();
addMessage(redirectAttributes,e.getMessage());
addMessage(redirectAttributes,this.getMsgProp().getProperty("request_service_failed")+e.getMessage());
}
return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+entity.getFunctionId();
@@ -268,7 +251,7 @@ public class AvController extends BaseController {
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("音视频文件样例配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes,this.getMsgProp().getProperty("request_service_failed")+ e.getMessage());
}
}
return "redirect:" + adminPath +"/ntc/av/sample/fileSampleList?functionId="+functionId;
@@ -305,7 +288,7 @@ public class AvController extends BaseController {
} catch (MaatConvertException e) {
e.printStackTrace();
logger.info("音视频标识样例配置下发失败："+e.getMessage());
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes,this.getMsgProp().getProperty("request_service_failed")+ e.getMessage());
}
}
return "redirect:" + adminPath +"/ntc/av/sample/audioSignSampleList?functionId="+functionId;
@@ -332,7 +315,7 @@ public class AvController extends BaseController {
avCfgService.auditAvSignSample(avSignSampleCfg);
} catch (MaatConvertException e) {
logger.error("下发失败",e);
addMessage(redirectAttributes, e.getMessage());
addMessage(redirectAttributes,this.getMsgProp().getProperty("request_service_failed")+ e.getMessage());
}
}

1
src/main/webapp/static/global/scripts/common.js
View File

@@ -412,6 +412,7 @@ $(function(){
var ns = s.replace(/\t|\r|\n/mg, "");
$(this).val(ns);
});*/
$("input[name*='userRegion']").addClass("invisibleChar");
});
window.onload=function(){
//日志查询IP类型增加格式提示