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

（1）音视频url日志字段修改

Browse Source 
（2）所有日志传输层协议国际化修改
（3）部分国际化修改
This commit is contained in:
wangxin
2018-10-10 16:17:19 +08:00
parent 8cc18a96a7
commit 8d48d9a354
39 changed files with 386 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/nis/web/controller/log/ntc/MmAvUrlLogController.java
View File

@@ -20,7 +20,7 @@ import com.google.gson.reflect.TypeToken;
import com.nis.domain.FunctionServiceDict;
import com.nis.domain.Page;
import com.nis.domain.PageLog;
import com.nis.domain.log.MmAvUrlLog;
import com.nis.domain.log.NtcStreamMediaLog;
import com.nis.domain.maat.LogRecvData;
import com.nis.util.Constants;
import com.nis.util.DictUtils;
@@ -42,11 +42,11 @@ public class MmAvUrlLogController extends BaseController{
* @throws IOException
*/
@RequestMapping(value={"list",""})
public String list(Model model,@ModelAttribute("log")MmAvUrlLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
public String list(Model model,@ModelAttribute("log")NtcStreamMediaLog entry,HttpServletRequest request, HttpServletResponse response) throws ClientProtocolException, IOException {
try {
PageLog<MmAvUrlLog> page = new PageLog<MmAvUrlLog>(request, response);
PageLog<NtcStreamMediaLog> page = new PageLog<NtcStreamMediaLog>(request, response);
Map<String, Object> params=new HashMap<>();
params.put("pageSize", page.getPageSize());
params.put("pageNo", page.getPageNo());
@@ -62,13 +62,13 @@ public class MmAvUrlLogController extends BaseController{
Gson gson = new GsonBuilder().create();
//gson泛型支持
LogRecvData<MmAvUrlLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<MmAvUrlLog>>(){}.getType());
LogRecvData<NtcStreamMediaLog> fromJson = gson.fromJson(jsonString, new TypeToken<LogRecvData<NtcStreamMediaLog>>(){}.getType());
if (fromJson.getStatus().intValue() == 200) {
Page<MmAvUrlLog> data = fromJson.getData();
Page<NtcStreamMediaLog> data = fromJson.getData();
page.setList(data.getList());
List<MmAvUrlLog> list = page.getList();
for (MmAvUrlLog l : list) {
List<NtcStreamMediaLog> list = page.getList();
for (NtcStreamMediaLog l : list) {
l.setFunctionId(entry.getFunctionId());
setLogAction(l,serviceList);
}
@@ -79,7 +79,7 @@ public class MmAvUrlLogController extends BaseController{
logger.error("查询音视频url日志失败", e);
addMessageLog(model, e.getMessage());
}
return "/log/ntc/mmAvUrlList";
return "/log/ntc/ntcStreamMedia";
}
}