|
@@ -2,9 +2,12 @@ package com.uas.platform.b2b.manage.controller;
|
|
|
|
|
|
|
|
import com.uas.platform.b2b.manage.controller.support.PageResultBean;
|
|
import com.uas.platform.b2b.manage.controller.support.PageResultBean;
|
|
|
import com.uas.platform.b2b.manage.model.Listen;
|
|
import com.uas.platform.b2b.manage.model.Listen;
|
|
|
|
|
+import com.uas.platform.b2b.manage.model.UseType;
|
|
|
import com.uas.platform.b2b.manage.page.PageInfo;
|
|
import com.uas.platform.b2b.manage.page.PageInfo;
|
|
|
import com.uas.platform.b2b.manage.page.PageParams;
|
|
import com.uas.platform.b2b.manage.page.PageParams;
|
|
|
import com.uas.platform.b2b.manage.service.ListenService;
|
|
import com.uas.platform.b2b.manage.service.ListenService;
|
|
|
|
|
+import com.uas.platform.b2b.manage.web.BaseController;
|
|
|
|
|
+import com.uas.platform.core.util.AgentUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.data.domain.Sort;
|
|
import org.springframework.data.domain.Sort;
|
|
|
import org.springframework.util.StringUtils;
|
|
import org.springframework.util.StringUtils;
|
|
@@ -20,7 +23,7 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping("/listen")
|
|
@RequestMapping("/listen")
|
|
|
@RestController
|
|
@RestController
|
|
|
-public class ListenController {
|
|
|
|
|
|
|
+public class ListenController extends BaseController {
|
|
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
ListenService listenService;
|
|
ListenService listenService;
|
|
@@ -30,13 +33,14 @@ public class ListenController {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping("/list")
|
|
@RequestMapping("/list")
|
|
|
- public PageResultBean<Listen> findAll(PageParams params, String keyword, HttpServletRequest request) {
|
|
|
|
|
|
|
+ public PageResultBean<Listen> findAll(PageParams params, String keyword) {
|
|
|
PageInfo info = new PageInfo(params);
|
|
PageInfo info = new PageInfo(params);
|
|
|
Sort sort = new Sort(Sort.Direction.ASC, "date");
|
|
Sort sort = new Sort(Sort.Direction.ASC, "date");
|
|
|
info.setSort(sort);
|
|
info.setSort(sort);
|
|
|
if (!StringUtils.isEmpty(keyword)) {
|
|
if (!StringUtils.isEmpty(keyword)) {
|
|
|
keyword = keyword.trim();
|
|
keyword = keyword.trim();
|
|
|
}
|
|
}
|
|
|
|
|
+ useLogService.appendLog(UseType.MONITORING_SEARCH.code(), keyword, AgentUtils.getIp(request));
|
|
|
PageResultBean resultBean = new PageResultBean(listenService.findAll(info, keyword));
|
|
PageResultBean resultBean = new PageResultBean(listenService.findAll(info, keyword));
|
|
|
return resultBean;
|
|
return resultBean;
|
|
|
}
|
|
}
|