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

草稿功能各个页面开发引起的查询bug，预告警单新增整改意见字段

Browse Source
This commit is contained in:
hzj
2024-06-20 19:14:16 +08:00
parent 7abce7651d
commit 731f6f2d12
1 changed files with 67 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java
View File

@@ -16,10 +16,11 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.utils.EnumUtils;
import com.njcn.common.utils.PubUtils;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.biz.pojo.dto.LineDTO;
import com.njcn.device.biz.pojo.dto.LineALLInfoDTO;
import com.njcn.device.biz.pojo.dto.LineDTO;
import com.njcn.device.biz.pojo.po.Overlimit;
import com.njcn.device.pq.enums.LineBaseEnum;
import com.njcn.device.pq.mapper.*;
import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
import com.njcn.device.pq.pojo.dto.PollutionLineDTO;
import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
@@ -30,7 +31,6 @@ import com.njcn.device.pq.pojo.param.PqsParam;
import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
import com.njcn.device.pq.pojo.po.*;
import com.njcn.device.pq.pojo.vo.*;
import com.njcn.device.pq.mapper.*;
import com.njcn.device.pq.service.DeptLineService;
import com.njcn.device.pq.service.LineService;
import com.njcn.influx.constant.InfluxDbSqlConstant;
@@ -44,7 +44,6 @@ import com.njcn.system.pojo.po.Area;
import com.njcn.system.pojo.po.DictData;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.user.pojo.dto.DeptDTO;
import com.njcn.web.pojo.param.BaseParam;
import com.njcn.web.pojo.vo.LineDataVO;
import com.njcn.web.utils.GeneralUtil;
import com.njcn.web.utils.RequestUtil;
@@ -52,6 +51,7 @@ import com.njcn.web.utils.WebUtil;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -100,67 +100,72 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
private final DeptLineService deptLineService;
@Override
public LineDetailDataVO getLineDetailData(String id) {
//根据id查询当前信息的pids
List<String> pids = Arrays.asList(this.baseMapper.selectById(id).getPids().split(","));
List<String> list = new ArrayList(pids);
list.add(id);
List<LineDataVO> lineDataVOList = this.baseMapper.getLineDetail(list);
LineDetailDataVO lineDetailDataVO = new LineDetailDataVO();
String areaId = "", devId = "", voId = "";
for (LineDataVO lineDataVO : lineDataVOList) {
switch (lineDataVO.getLevel()) {
case 1:
areaId = lineDataVO.getName();
break;
case 2:
lineDetailDataVO.setGdName(lineDataVO.getName());
break;
case 3:
lineDetailDataVO.setBdName(lineDataVO.getName());
break;
case 4:
devId = lineDataVO.getId();
lineDetailDataVO.setDevName(lineDataVO.getName());
break;
case 5:
voId = lineDataVO.getId();
break;
case 6:
lineDetailDataVO.setLineName(lineDataVO.getName());
break;
default:
break;
if(StringUtils.isEmpty(id)){
return new LineDetailDataVO();
}else {
//根据id查询当前信息的pids
List<String> pids = Arrays.asList(this.baseMapper.selectById(id).getPids().split(","));
List<String> list = new ArrayList(pids);
list.add(id);
List<LineDataVO> lineDataVOList = this.baseMapper.getLineDetail(list);
LineDetailDataVO lineDetailDataVO = new LineDetailDataVO();
String areaId = "", devId = "", voId = "";
for (LineDataVO lineDataVO : lineDataVOList) {
switch (lineDataVO.getLevel()) {
case 1:
areaId = lineDataVO.getName();
break;
case 2:
lineDetailDataVO.setGdName(lineDataVO.getName());
break;
case 3:
lineDetailDataVO.setBdName(lineDataVO.getName());
break;
case 4:
devId = lineDataVO.getId();
lineDetailDataVO.setDevName(lineDataVO.getName());
break;
case 5:
voId = lineDataVO.getId();
break;
case 6:
lineDetailDataVO.setLineName(lineDataVO.getName());
break;
default:
break;
}
}
lineDetailDataVO.setAreaName(areaFeignClient.selectIdArea(areaId).getData().getName());
lineDetailDataVO.setScale(dicDataFeignClient.getDicDataById(voltageMapper.selectById(voId).getScale()).getData().getName());
LineDetail lineDetail = lineDetailMapper.selectById(id);
Device device = deviceMapper.selectById(devId);
lineDetailDataVO.setManufacturer(dicDataFeignClient.getDicDataById(device.getManufacturer()).getData().getName());
lineDetailDataVO.setComFlag(PubUtils.comFlag(device.getComFlag()));
lineDetailDataVO.setRunFlag(PubUtils.lineRunFlag(lineDetail.getRunFlag()));
lineDetailDataVO.setIp(device.getIp());
lineDetailDataVO.setLoginTime(device.getLoginTime());
lineDetailDataVO.setDevId(device.getId());
lineDetailDataVO.setBusinessType(dicDataFeignClient.getDicDataById(lineDetail.getBusinessType()).getData().getName());
lineDetailDataVO.setLoadType(dicDataFeignClient.getDicDataById(lineDetail.getLoadType()).getData().getName());
lineDetailDataVO.setObjName(lineDetail.getObjName());
lineDetailDataVO.setId(lineDetail.getNum());
lineDetailDataVO.setPtType(PubUtils.ptType(lineDetail.getPtType()));
lineDetailDataVO.setPt(lineDetail.getPt1() + "/" + lineDetail.getPt2());
lineDetailDataVO.setCt(lineDetail.getCt1() + "/" + lineDetail.getCt2());
lineDetailDataVO.setDealCapacity(lineDetail.getDealCapacity());
lineDetailDataVO.setDevCapacity(lineDetail.getDevCapacity());
lineDetailDataVO.setShortCapacity(lineDetail.getShortCapacity());
lineDetailDataVO.setStandardCapacity(lineDetail.getStandardCapacity());
lineDetailDataVO.setTimeInterval (lineDetail.getTimeInterval ());
lineDetailDataVO.setOwner(lineDetail.getOwner());
lineDetailDataVO.setOwnerDuty(lineDetail.getOwnerDuty());
lineDetailDataVO.setOwnerTel(lineDetail.getOwnerTel());
lineDetailDataVO.setWiringDiagram(lineDetail.getWiringDiagram());
lineDetailDataVO.setPtPhaseType(lineDetail.getPtPhaseType());
lineDetailDataVO.setUpdateTime(device.getUpdateTime());
return lineDetailDataVO;
}
lineDetailDataVO.setAreaName(areaFeignClient.selectIdArea(areaId).getData().getName());
lineDetailDataVO.setScale(dicDataFeignClient.getDicDataById(voltageMapper.selectById(voId).getScale()).getData().getName());
LineDetail lineDetail = lineDetailMapper.selectById(id);
Device device = deviceMapper.selectById(devId);
lineDetailDataVO.setManufacturer(dicDataFeignClient.getDicDataById(device.getManufacturer()).getData().getName());
lineDetailDataVO.setComFlag(PubUtils.comFlag(device.getComFlag()));
lineDetailDataVO.setRunFlag(PubUtils.lineRunFlag(lineDetail.getRunFlag()));
lineDetailDataVO.setIp(device.getIp());
lineDetailDataVO.setLoginTime(device.getLoginTime());
lineDetailDataVO.setDevId(device.getId());
lineDetailDataVO.setBusinessType(dicDataFeignClient.getDicDataById(lineDetail.getBusinessType()).getData().getName());
lineDetailDataVO.setLoadType(dicDataFeignClient.getDicDataById(lineDetail.getLoadType()).getData().getName());
lineDetailDataVO.setObjName(lineDetail.getObjName());
lineDetailDataVO.setId(lineDetail.getNum());
lineDetailDataVO.setPtType(PubUtils.ptType(lineDetail.getPtType()));
lineDetailDataVO.setPt(lineDetail.getPt1() + "/" + lineDetail.getPt2());
lineDetailDataVO.setCt(lineDetail.getCt1() + "/" + lineDetail.getCt2());
lineDetailDataVO.setDealCapacity(lineDetail.getDealCapacity());
lineDetailDataVO.setDevCapacity(lineDetail.getDevCapacity());
lineDetailDataVO.setShortCapacity(lineDetail.getShortCapacity());
lineDetailDataVO.setStandardCapacity(lineDetail.getStandardCapacity());
lineDetailDataVO.setTimeInterval (lineDetail.getTimeInterval ());
lineDetailDataVO.setOwner(lineDetail.getOwner());
lineDetailDataVO.setOwnerDuty(lineDetail.getOwnerDuty());
lineDetailDataVO.setOwnerTel(lineDetail.getOwnerTel());
lineDetailDataVO.setWiringDiagram(lineDetail.getWiringDiagram());
lineDetailDataVO.setPtPhaseType(lineDetail.getPtPhaseType());
lineDetailDataVO.setUpdateTime(device.getUpdateTime());
return lineDetailDataVO;
}
@Override