fix: 塘口、设备按创建时间进行正序排列。
This commit is contained in:
@@ -217,7 +217,7 @@ public class PondController extends BaseController {
|
||||
new LambdaQueryWrapper<Device>()
|
||||
.eq(Device::getPondId, pondId)
|
||||
.orderByAsc(Device::getDeviceType)
|
||||
.orderByDesc(Device::getCreateTime)
|
||||
.orderByAsc(Device::getCreateTime)
|
||||
);
|
||||
|
||||
// 3. 查询塘口下的所有开关(switch.pondId == pondId),包含开关未挂塘口的控制器也能被找到
|
||||
@@ -601,12 +601,12 @@ public class PondController extends BaseController {
|
||||
com.intc.fishery.domain.bo.MessageWarnBo query = new com.intc.fishery.domain.bo.MessageWarnBo();
|
||||
query.setDeviceId(deviceId);
|
||||
List<com.intc.fishery.domain.vo.MessageWarnVo> messageWarns = messageWarnService.queryList(query);
|
||||
|
||||
|
||||
if (!messageWarns.isEmpty()) {
|
||||
List<Long> messageWarnIds = messageWarns.stream()
|
||||
.map(com.intc.fishery.domain.vo.MessageWarnVo::getId)
|
||||
.collect(Collectors.toList());
|
||||
|
||||
|
||||
// 删除告警消息
|
||||
messageWarnService.deleteWithValidByIds(messageWarnIds, false);
|
||||
log.info("清除设备 {} 的 {} 条告警消息", deviceId, messageWarnIds.size());
|
||||
@@ -719,7 +719,7 @@ public class PondController extends BaseController {
|
||||
List<Pond> ponds = pondMapper.selectList(
|
||||
new LambdaQueryWrapper<Pond>()
|
||||
.eq(Pond::getUserId, rootUserId)
|
||||
.orderByDesc(Pond::getCreateTime)
|
||||
.orderByAsc(Pond::getCreateTime)
|
||||
);
|
||||
|
||||
List<PublicPondMode1Vo> listData = new ArrayList<>();
|
||||
@@ -946,7 +946,7 @@ public class PondController extends BaseController {
|
||||
new LambdaQueryWrapper<Pond>()
|
||||
.eq(Pond::getUserId, rootUserId)
|
||||
.select(Pond::getId, Pond::getPondName)
|
||||
.orderByDesc(Pond::getCreateTime)
|
||||
.orderByAsc(Pond::getCreateTime)
|
||||
);
|
||||
|
||||
// 转换为VO列表
|
||||
|
||||
Reference in New Issue
Block a user