Skip to content

R
rs-cloud-platform
Commit 284f6d9a authored by cuijun's avatar cuijun
Browse files
Options

Merge remote-tracking branch 'origin/rs_gdweb_platform' into rs_gdweb_platform

parents 6637bfd2 aed97493
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpMonitorimageController.java
View file @ 284f6d9a
...@@ -31,6 +31,7 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB ...@@ -31,6 +31,7 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB
Example example = new Example(RscpMonitorimage.class); Example example = new Example(RscpMonitorimage.class);
Example.Criteria criteria = example.createCriteria(); Example.Criteria criteria = example.createCriteria();
criteria.andEqualTo("status",2); criteria.andEqualTo("status",2);
criteria.andEqualTo("is_del",0);
example.setOrderByClause("start_time DESC"); example.setOrderByClause("start_time DESC");
PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example)); PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example));
return ObjectRestResponse.succ(pageDataVO); return ObjectRestResponse.succ(pageDataVO);
...@@ -46,6 +47,7 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB ...@@ -46,6 +47,7 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB
Example example = new Example(RscpMonitorimage.class); Example example = new Example(RscpMonitorimage.class);
Example.Criteria criteria = example.createCriteria(); Example.Criteria criteria = example.createCriteria();
criteria.andEqualTo("status",2); criteria.andEqualTo("status",2);
criteria.andEqualTo("is_del",0);
example.setOrderByClause("hot DESC"); example.setOrderByClause("hot DESC");
PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example)); PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example));
return ObjectRestResponse.succ(pageDataVO); return ObjectRestResponse.succ(pageDataVO);
...@@ -56,6 +58,7 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB ...@@ -56,6 +58,7 @@ public class RscpMonitorimageController extends BaseController<RscpMonitorimageB
List<RscpMonitorimage> list = baseBiz.selectByWeekend(w -> { List<RscpMonitorimage> list = baseBiz.selectByWeekend(w -> {
w.andEqualTo(RscpMonitorimage::getStatus, 2); w.andEqualTo(RscpMonitorimage::getStatus, 2);
w.andEqualTo(RscpMonitorimage::getIsDel, 0);
return w; return w;
}, "start_time DESC"); }, "start_time DESC");
return ObjectRestResponse.succ(list); return ObjectRestResponse.succ(list);
......
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpMosaicimageController.java
View file @ 284f6d9a
...@@ -36,6 +36,7 @@ public class RscpMosaicimageController extends BaseController<RscpMosaicimageBiz ...@@ -36,6 +36,7 @@ public class RscpMosaicimageController extends BaseController<RscpMosaicimageBiz
List<RscpMosaicimage> list = baseBiz.selectByWeekend(w -> { List<RscpMosaicimage> list = baseBiz.selectByWeekend(w -> {
w.andEqualTo(RscpMosaicimage::getStatus, 2); w.andEqualTo(RscpMosaicimage::getStatus, 2);
w.andEqualTo(RscpMosaicimage::getIsDel, 0);
return w; return w;
}, "start_time asc"); }, "start_time asc");
return ObjectRestResponse.succ(list); return ObjectRestResponse.succ(list);
...@@ -48,6 +49,7 @@ public class RscpMosaicimageController extends BaseController<RscpMosaicimageBiz ...@@ -48,6 +49,7 @@ public class RscpMosaicimageController extends BaseController<RscpMosaicimageBiz
Example example = new Example(RscpMosaicimage.class); Example example = new Example(RscpMosaicimage.class);
Example.Criteria criteria = example.createCriteria(); Example.Criteria criteria = example.createCriteria();
criteria.andEqualTo("status",2); criteria.andEqualTo("status",2);
criteria.andEqualTo("is_del",0);
example.setOrderByClause("start_time DESC"); example.setOrderByClause("start_time DESC");
PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example)); PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example));
return ObjectRestResponse.succ(pageDataVO); return ObjectRestResponse.succ(pageDataVO);
...@@ -63,6 +65,7 @@ public class RscpMosaicimageController extends BaseController<RscpMosaicimageBiz ...@@ -63,6 +65,7 @@ public class RscpMosaicimageController extends BaseController<RscpMosaicimageBiz
Example example = new Example(RscpMosaicimage.class); Example example = new Example(RscpMosaicimage.class);
Example.Criteria criteria = example.createCriteria(); Example.Criteria criteria = example.createCriteria();
criteria.andEqualTo("status",2); criteria.andEqualTo("status",2);
criteria.andEqualTo("is_del",0);
example.setOrderByClause("hot DESC"); example.setOrderByClause("hot DESC");
PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example)); PageDataVO pageDataVO = PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), ()->baseBiz.selectByExample(example));
return ObjectRestResponse.succ(pageDataVO); return ObjectRestResponse.succ(pageDataVO);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment