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

问题单整改

Browse Source
This commit is contained in:
zhuxinyu
2023-04-18 09:04:09 +08:00
parent 98b03af2ff
commit a00dbfbe37
3 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AnalyzeServiceImpl.java
View File

@@ -16,6 +16,7 @@ import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
import com.njcn.device.pq.pojo.dto.OverLimitLineDTO;
import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
import com.njcn.device.pq.pojo.dto.WarningSubstationDTO;
import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
import com.njcn.harmonic.constant.Param;
import com.njcn.harmonic.mapper.RStatLimitRateDMapper;
import com.njcn.harmonic.pojo.excel.area.AreaExcel;
@@ -301,7 +302,8 @@ public class AnalyzeServiceImpl implements IAnalyzeService {
list.addAll(monMap.keySet());
PollutionParamDTO pollutionParamDTO = new PollutionParamDTO();
pollutionParamDTO.setLineList(list);
// List<AreaLineInfoVO> data = lineFeignClient.getBaseLineAreaInfo(list).getData();
List<AreaLineInfoVO> data = lineFeignClient.getBaseLineAreaInfo(list).getData();
System.out.println(data);
List<OverLimitLineDTO> overLimitLineList = lineFeignClient.getOverLimitLineInfo(pollutionParamDTO).getData();
List<RStatLimitRateDPO> rStatLimitRateDPOS = rateDMapper.selectList(new QueryWrapper<RStatLimitRateDPO>()
.in("r_stat_limit_rate_d.my_index", list)

4
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java
View File

@@ -175,8 +175,8 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
@Override
public List<PollutionVO> getDeptSubstationRelations(HarmonicPublicParam harmonicPublicParam) {
List<PollutionVO> list = new ArrayList<>();
String pollutionType = harmonicPublicParam.getStatisticalType ( ).getId ();
String searchBeginTime = harmonicPublicParam.getSearchBeginTime ( ).substring (0,10);
String pollutionType = harmonicPublicParam.getStatisticalType ().getId ();
String searchBeginTime = harmonicPublicParam.getSearchBeginTime ().substring (0,10);
if (StringUtils.isBlank(RequestUtil.getDeptIndex())){
return list;
}