|
|
@@ -5,6 +5,8 @@ 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.PageParams;
|
|
|
+import com.uas.platform.b2b.manage.page.criteria.CriterionExpression;
|
|
|
+import com.uas.platform.b2b.manage.page.criteria.SimpleExpression;
|
|
|
import com.uas.platform.b2b.manage.service.ListenService;
|
|
|
import com.uas.platform.b2b.manage.web.BaseController;
|
|
|
import com.uas.platform.core.util.AgentUtils;
|
|
|
@@ -14,6 +16,7 @@ import org.springframework.util.StringUtils;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+
|
|
|
/**
|
|
|
* 监控数据查询接口
|
|
|
* @Author: huj
|
|
|
@@ -33,7 +36,9 @@ public class ListenController extends BaseController {
|
|
|
@RequestMapping("/list")
|
|
|
public PageResultBean<Listen> findAll(PageParams params, String keyword) {
|
|
|
PageInfo info = new PageInfo(params);
|
|
|
- Sort sort = new Sort(Sort.Direction.ASC, "status");
|
|
|
+ Sort sort = new Sort(Sort.Direction.ASC, "status", "date");
|
|
|
+ SimpleExpression expression = new SimpleExpression("name", "", CriterionExpression.Operator.NE);
|
|
|
+ info.expression(expression);
|
|
|
info.setSort(sort);
|
|
|
if (!StringUtils.isEmpty(keyword)) {
|
|
|
keyword = keyword.trim();
|