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

sql字段修改前端联调

Browse Source
This commit is contained in:
zhuxinyu
2023-04-07 10:11:53 +08:00
parent a4363bf37b
commit b06916b5ea
10 changed files with 87 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/IntegrityServiceImpl.java
View File

@@ -11,7 +11,9 @@ import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.enums.LineBaseEnum;
import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
import com.njcn.device.pq.pojo.param.DeviceInfoParam;
import com.njcn.device.pq.pojo.param.LineBaseQueryParam;
import com.njcn.device.pq.pojo.param.OnlineRateParam;
import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
import com.njcn.device.pq.pojo.vo.RStatIntegrityVO;
import com.njcn.harmonic.mapper.IntegrityMapper;
import com.njcn.harmonic.pojo.dto.PublicDTO;
@@ -346,11 +348,6 @@ public class IntegrityServiceImpl implements IntegrityService {
}
/**
* influxDB相关操作
* 查询监测点的数据完整性
* 前端要求: 返回百分比数据
*/
private List<PublicDTO> getCondition(List<String> lineList, String startTime, String endTime) {
List<PublicDTO> integrityList = new ArrayList<>();
OnlineRateParam param = new OnlineRateParam();
@@ -358,7 +355,12 @@ public class IntegrityServiceImpl implements IntegrityService {
param.setStartTime(DateUtil.beginOfDay(DateUtil.parse(startTime)).toString());
param.setEndTime(DateUtil.endOfDay(DateUtil.parse(endTime)).toString());
List<RStatIntegrityVO> data = lineFeignClient.getOnIntegrityByIds(param).getData();
// LineBaseQueryParam param = new LineBaseQueryParam();
// param.setLineIds(lineList);
// param.setStartTime(DateUtil.beginOfDay(DateUtil.parse(startTime)).toString());
// param.setEndTime(DateUtil.endOfDay(DateUtil.parse(endTime)).toString());
// List<RStatIntegrityVO> data = lineFeignClient.getOnIntegrityByIdsAndTime(param).getData();
// List<String> data = lineFeignClient.getOnOrUnLine(param).getData()
if (!CollectionUtils.isEmpty(data)) {
data.forEach(po -> {
PublicDTO publicDTO = new PublicDTO();