设备在线状态逻辑调整,支付下发指令参数调整等

This commit is contained in:
蒾酒
2024-12-28 18:17:30 +08:00
parent 6ed87aa6e6
commit 250530570a
11 changed files with 81 additions and 30 deletions

View File

@ -3,11 +3,14 @@ package com.fastbee.data.controller;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
import javax.servlet.http.HttpServletResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@ -51,10 +54,9 @@ public class DeviceReportInfoController extends BaseController
public TableDataInfo list(DeviceReportInfo deviceReportInfo)
{
startPage();
List<DeviceReportInfo> list = deviceReportInfoService.selectDeviceReportInfoList(deviceReportInfo);
System.err.println("查询条件:"+deviceReportInfo.getOnLine());
System.err.println("设备总长度:"+list.size());
//查询设备在线状态
list.forEach(d->{
if(d.getType()==1){
@ -68,9 +70,14 @@ public class DeviceReportInfoController extends BaseController
//展连流量计设备在线状态判断
d.setType(0);
}
});
// //处理在线/离线筛选
// if(deviceReportInfo.getOnLine()!=null){
// //根据online状态的值过滤集合
// list= list.stream().filter(d -> Objects.equals(d.getOnLine(), deviceReportInfo.getOnLine()))
// .collect(Collectors.toList());
// }
System.err.println("过滤后总长度:"+list.size());
return getDataTable(list);
}
//统计是设备相关信息

View File

@ -217,6 +217,8 @@ public class WeChatPayController extends BaseController {
}
if (isVerified) {
System.out.println("签名验证成功");
} else {
System.out.println("签名验证失败");
responseBody.put("code", "FAIL");