|
@@ -50,12 +50,12 @@ public class CmcTemperatureController extends BaseController {
|
50
|
50
|
*/
|
51
|
51
|
@Get
|
52
|
52
|
@Mapping("listByInfo")
|
53
|
|
- public List<CmcTemperature> listByInfo(CmcTemperature cmcTemperature, String Info) {
|
54
|
|
- QueryWrapper qw = getQW(cmcTemperature, Info);
|
|
53
|
+ public List<CmcTemperature> listByInfo(CmcTemperature cmcTemperature, String Info, Integer pageSize, Integer pageNum) {
|
|
54
|
+ QueryWrapper qw = getQW(cmcTemperature, Info, pageSize, pageNum);
|
55
|
55
|
return cmcTemperatureService.list(qw);
|
56
|
56
|
}
|
57
|
57
|
|
58
|
|
- private QueryWrapper getQW(CmcTemperature cmcTemperature, String Info) {
|
|
58
|
+ private QueryWrapper getQW(CmcTemperature cmcTemperature, String Info, Integer pageSize, Integer pageNum) {
|
59
|
59
|
QueryWrapper qw = QueryWrapper.create();
|
60
|
60
|
qw.select(CmcTemperature::getId, CmcTemperature::getGroupNo, CmcTemperature::getSensorNo, CmcTemperature::getData, CmcTemperature::getVolt, CmcTemperature::getCSQ, CmcTemperature::getDatetime)
|
61
|
61
|
.from(CmcTemperature.class)
|
|
@@ -70,7 +70,7 @@ public class CmcTemperatureController extends BaseController {
|
70
|
70
|
.and(CmcTemperature::getCSQ).eq(cmcTemperature.getCSQ())
|
71
|
71
|
.and(CmcTemperature::getDatetime).ge(cmcTemperature.getStartTime())
|
72
|
72
|
.and(CmcTemperature::getDatetime).le(cmcTemperature.getEndTime())
|
73
|
|
- .orderBy(CmcTemperature::getDatetime).desc();
|
|
73
|
+ .orderBy(CmcTemperature::getDatetime).desc().limit((pageNum - 1) * pageSize, pageSize);
|
74
|
74
|
return qw;
|
75
|
75
|
}
|
76
|
76
|
|