Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
This commit is contained in:
@@ -0,0 +1,65 @@
|
||||
package com.nis.web.controller.log.ntc;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
import com.nis.domain.Page;
|
||||
import com.nis.domain.PageLog;
|
||||
import com.nis.domain.log.MmSampleAudioLog;
|
||||
import com.nis.domain.maat.LogRecvData;
|
||||
import com.nis.util.Constants;
|
||||
import com.nis.util.httpclient.HttpClientUtil;
|
||||
import com.nis.web.controller.BaseController;
|
||||
|
||||
@Controller
|
||||
@RequestMapping(value = "${adminPath}/log/ntc/mmSampleAudioLogs")
|
||||
public class MmSampleAudioController extends BaseController{
|
||||
|
||||
@RequestMapping(value = {"/list",""})
|
||||
public String list(HttpServletRequest request, HttpServletResponse response, Model model, @ModelAttribute("log")MmSampleAudioLog sampleAudioLog) {
|
||||
|
||||
PageLog<MmSampleAudioLog> page = new PageLog<MmSampleAudioLog>(request,response);
|
||||
Map<String, Object> params = new HashMap<String,Object>();
|
||||
params.put("pageSize", page.getPageSize());
|
||||
params.put("pageNo", page.getPageNo());
|
||||
|
||||
// 请求参数判断
|
||||
initLogSearchValue(sampleAudioLog, params);
|
||||
|
||||
try {
|
||||
// 请求接口
|
||||
String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEAUDIO_LOG;
|
||||
String resJson = HttpClientUtil.getMsg(url, params, request);
|
||||
Gson gson = new GsonBuilder().create();
|
||||
LogRecvData<MmSampleAudioLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSampleAudioLog>>() {}.getType());
|
||||
if(fromJson.getStatus().intValue() == 200) {
|
||||
Page<MmSampleAudioLog> fromPage = fromJson.getData();
|
||||
page.setList(fromPage.getList());
|
||||
List<MmSampleAudioLog> list = fromPage.getList();
|
||||
for (MmSampleAudioLog log : list) {
|
||||
log.setFunctionId(sampleAudioLog.getFunctionId());
|
||||
setLogAction(log);
|
||||
}
|
||||
model.addAttribute("page", page);
|
||||
logger.info("音频样例日志查询成功!");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.info("音频样例日志查询失败!", e);
|
||||
addMessage(model, e.getMessage());
|
||||
}
|
||||
|
||||
return "/log/ntc/mmSampleAudioList";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package com.nis.web.controller.log.ntc;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
import com.nis.domain.Page;
|
||||
import com.nis.domain.PageLog;
|
||||
import com.nis.domain.log.MmSamplePicLog;
|
||||
import com.nis.domain.maat.LogRecvData;
|
||||
import com.nis.util.Constants;
|
||||
import com.nis.util.httpclient.HttpClientUtil;
|
||||
import com.nis.web.controller.BaseController;
|
||||
|
||||
@Controller
|
||||
@RequestMapping(value = "${adminPath}/log/ntc/mmSamplePicLogs")
|
||||
public class MmSamplePicController extends BaseController{
|
||||
|
||||
@RequestMapping(value = {"/list",""})
|
||||
public String list(HttpServletRequest request, HttpServletResponse response, Model model, @ModelAttribute("log")MmSamplePicLog samplePicLog) {
|
||||
|
||||
PageLog<MmSamplePicLog> page = new PageLog<MmSamplePicLog>(request,response);
|
||||
Map<String, Object> params = new HashMap<String,Object>();
|
||||
params.put("pageSize", page.getPageSize());
|
||||
params.put("pageNo", page.getPageNo());
|
||||
|
||||
// 请求参数判断
|
||||
initLogSearchValue(samplePicLog, params);
|
||||
|
||||
try {
|
||||
// 请求接口
|
||||
String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEPIC_LOG;
|
||||
String resJson = HttpClientUtil.getMsg(url, params, request);
|
||||
Gson gson = new GsonBuilder().create();
|
||||
LogRecvData<MmSamplePicLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSamplePicLog>>() {}.getType());
|
||||
if(fromJson.getStatus().intValue() == 200) {
|
||||
Page<MmSamplePicLog> fromPage = fromJson.getData();
|
||||
page.setList(fromPage.getList());
|
||||
List<MmSamplePicLog> list = fromPage.getList();
|
||||
for (MmSamplePicLog log : list) {
|
||||
log.setFunctionId(samplePicLog.getFunctionId());
|
||||
setLogAction(log);
|
||||
}
|
||||
model.addAttribute("page", page);
|
||||
logger.info("图片样例日志查询成功!");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.info("图片样例日志查询失败!", e);
|
||||
addMessage(model, e.getMessage());
|
||||
}
|
||||
|
||||
return "/log/ntc/mmSamplePicList";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package com.nis.web.controller.log.ntc;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.servlet.http.HttpServletResponse;
|
||||
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import com.google.gson.reflect.TypeToken;
|
||||
import com.nis.domain.Page;
|
||||
import com.nis.domain.PageLog;
|
||||
import com.nis.domain.log.MmSampleVideoLog;
|
||||
import com.nis.domain.maat.LogRecvData;
|
||||
import com.nis.util.Constants;
|
||||
import com.nis.util.httpclient.HttpClientUtil;
|
||||
import com.nis.web.controller.BaseController;
|
||||
|
||||
@Controller
|
||||
@RequestMapping(value = "${adminPath}/log/ntc/mmSampleVideoLogs")
|
||||
public class MmSampleVideoController extends BaseController{
|
||||
|
||||
@RequestMapping(value = {"/list",""})
|
||||
public String list(HttpServletRequest request, HttpServletResponse response, Model model, @ModelAttribute("log")MmSampleVideoLog sampleVideoLog) {
|
||||
|
||||
PageLog<MmSampleVideoLog> page = new PageLog<MmSampleVideoLog>(request,response);
|
||||
Map<String, Object> params = new HashMap<String,Object>();
|
||||
params.put("pageSize", page.getPageSize());
|
||||
params.put("pageNo", page.getPageNo());
|
||||
|
||||
// 请求参数判断
|
||||
initLogSearchValue(sampleVideoLog, params);
|
||||
|
||||
try {
|
||||
// 请求接口
|
||||
String url = Constants.LOG_BASE_URL + Constants.NTC_MMSAMPLEVIDEO_LOG;
|
||||
String resJson = HttpClientUtil.getMsg(url, params, request);
|
||||
Gson gson = new GsonBuilder().create();
|
||||
LogRecvData<MmSampleVideoLog> fromJson = gson.fromJson(resJson, new TypeToken<LogRecvData<MmSampleVideoLog>>() {}.getType());
|
||||
if(fromJson.getStatus().intValue() == 200) {
|
||||
Page<MmSampleVideoLog> fromPage = fromJson.getData();
|
||||
page.setList(fromPage.getList());
|
||||
List<MmSampleVideoLog> list = fromPage.getList();
|
||||
for (MmSampleVideoLog log : list) {
|
||||
log.setFunctionId(sampleVideoLog.getFunctionId());
|
||||
setLogAction(log);
|
||||
}
|
||||
model.addAttribute("page", page);
|
||||
logger.info("视频样例日志查询成功!");
|
||||
}
|
||||
} catch (Exception e) {
|
||||
logger.info("视频样例日志查询失败!", e);
|
||||
addMessage(model, e.getMessage());
|
||||
}
|
||||
|
||||
return "/log/ntc/mmSampleVideoList";
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user