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

数据中心台账修改

Browse Source
This commit is contained in:
雨木c
2023-04-03 19:10:16 +08:00
parent 38427cfc0d
commit 3248bbe83c
12 changed files with 45 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/area/AreaInfoController.java
View File

@@ -49,20 +49,7 @@ public class AreaInfoController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
}
/**
* 获取区域中断设备
* @author cdf
* @date 2022/6/29
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getAreaOffDev")
@ApiOperation("获取区域中断设备")
@ApiImplicitParam(name = "deviceInfoParam", value = "参数体", required = true)
public HttpResult<List<TerminalBaseVO>> getAreaOffDev(@RequestBody @Validated DeviceInfoParam.BusinessParam deviceInfoParam) {
String methodDescribe = getMethodDescribe("getAreaOffDev");
List<TerminalBaseVO> res = areaInfoService.getAreaOffDev(deviceInfoParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
}
/**
* 未处理暂降事件列表

7
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/AreaInfoService.java
View File

@@ -23,12 +23,7 @@ public interface AreaInfoService {
List<AreaSubLineVO> getAreaLineInfo(DeviceInfoParam.BusinessParam deviceInfoParam);
/**
* 获取区域监测点地理信息
* @author cdf
* @date 2022/6/29
*/
List<TerminalBaseVO> getAreaOffDev(DeviceInfoParam.BusinessParam deviceInfoParam);
/**
* 获取区域监测点地理信息

20
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java
View File

@@ -4,28 +4,21 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM;
import com.njcn.device.pq.api.GeneralDeviceInfoClient;
import com.njcn.device.pq.api.LineFeignClient;
import com.njcn.device.pq.api.TerminalBaseClient;
import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
import com.njcn.device.pq.pojo.param.DeviceInfoParam;
import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
import com.njcn.device.pq.pojo.vo.TerminalBaseVO;
import com.njcn.event.pojo.constant.Param;
import com.njcn.event.pojo.po.EventDetailNew;
import com.njcn.event.pojo.po.RmpEventDetailPO;
import com.njcn.event.pojo.vo.AreaSubLineVO;
import com.njcn.event.service.majornetwork.AreaInfoService;
import com.njcn.event.service.majornetwork.EventDetailService;
import com.njcn.influxdb.mapper.InfluxDBResultMapperCn;
import com.njcn.influxdb.param.InfluxDBPublicParam;
import com.njcn.influxdb.utils.InfluxDBCommUtils;
import com.njcn.influxdb.utils.InfluxDbUtils;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.influxdb.dto.QueryResult;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
@@ -109,16 +102,7 @@ public class AreaInfoServiceImpl implements AreaInfoService {
return resultVOList;
}
@Override
public List<TerminalBaseVO> getAreaOffDev(DeviceInfoParam.BusinessParam deviceInfoParam) {
List<TerminalBaseVO> res = new ArrayList<>();
List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData();
List<String> devIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getDeviceIndexes().stream()).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(devIds)) {
res = terminalBaseClient.getDeviceByIdOnOrOff(devIds).getData();
}
return res;
}
@Override
public List<EventDetailNew> getNoDealEvents(DeviceInfoParam deviceInfoParam) {
@@ -150,8 +134,6 @@ public class AreaInfoServiceImpl implements AreaInfoService {
resList.add(eventDetailNew);
}
}
}
return resList;
}