Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

算法提交

Browse Source
This commit is contained in:
hzj
2023-12-07 13:40:54 +08:00
parent 2704188f75
commit 79e01bbc82
12 changed files with 399 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/OverviewServiceImpl.java
View File

@@ -21,7 +21,6 @@ import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.dto.DeptDTO;
import com.njcn.user.pojo.po.Dept;
import com.njcn.web.utils.WebUtil;
import io.swagger.annotations.ApiModelProperty;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
@@ -149,7 +148,7 @@ public class OverviewServiceImpl implements OverviewService {
//获取数据库数据
List<RMpMonitorAlarmCountM> list = rMpMonitorAlarmCountMService.list(new LambdaQueryWrapper<RMpMonitorAlarmCountM>()
.in(RMpMonitorAlarmCountM::getMeasurementPointId, ids)
.eq(RMpMonitorAlarmCountM::getDataType,data.getId())
// .eq(RMpMonitorAlarmCountM::getDataType,data.getId())
.ge(StringUtils.isNotBlank(param.getStartTime()), RMpMonitorAlarmCountM::getDataDate, param.getStartTime())
.le(StringUtils.isNotBlank(param.getEndTime()), RMpMonitorAlarmCountM::getDataDate, param.getEndTime())
);