草稿功能各个页面开发引起的查询bug,预告警单新增整改意见字段
This commit is contained in:
@@ -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,6 +100,9 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
|
||||
private final DeptLineService deptLineService;
|
||||
@Override
|
||||
public LineDetailDataVO getLineDetailData(String id) {
|
||||
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);
|
||||
@@ -163,6 +166,8 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
|
||||
return lineDetailDataVO;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public LineOverLimitVO getLineOverLimitData(String id) {
|
||||
//根据监测点id查询所在监测点的限值表数据
|
||||
|
||||
Reference in New Issue
Block a user