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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wr
2024-05-14 15:42:39 +08:00
parent af5f055d0c d5f57a65bd
commit ac606716ad
32 changed files with 506 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/LineFeignClient.java
View File

@@ -9,6 +9,7 @@ import com.njcn.device.pq.pojo.param.OnlineRateParam;
import com.njcn.device.pq.pojo.po.Line;
import com.njcn.device.pq.pojo.po.LineDetail;
import com.njcn.device.biz.pojo.po.Overlimit;
import com.njcn.device.pq.pojo.po.line.LineInfoVO;
import com.njcn.device.pq.pojo.vo.*;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
@@ -71,6 +72,15 @@ public interface LineFeignClient {
@PostMapping("getLineDetailData")
HttpResult<LineDetailDataVO> getLineDetailData(@RequestParam("id") String id);
/**
* 根据监测点id获取装置详情
*
* @param id 装置id
* @return 装置详情
*/
@PostMapping("getDeviceDetailData")
HttpResult<DeviceVO> getDeviceDetailData(@RequestParam("id") String id);
/**
* 根据监测点id获取监测点越限
*
@@ -141,14 +151,13 @@ public interface LineFeignClient {
@PostMapping("getLineInfo")
HttpResult<List<PollutionLineDTO>> getLineInfo(@RequestBody PollutionParamDTO pollutionParamDTO);
/**
* 获取所有监测点
* @param id 监测点集合
* @return 结果
*/
@PostMapping("getLineSubGdDetail")
HttpResult<LineDetailVO> getLineSubGdDetail(@RequestParam("id") String id);
@PostMapping("getLineInfoVO")
HttpResult<LineInfoVO> getLineInfoVO(@RequestParam("id") String id);
/**
* 获取告警变电站信息
* @param list 变电站集合
@@ -325,5 +334,9 @@ public interface LineFeignClient {
HttpResult<List<LineDetailVO.Detail>> getLineDetailByIds(@RequestBody List<String> ids);
@PostMapping("/updateDeviceRunFlag")
void updateDeviceRunFlag(@RequestParam("deviceId")String deviceId, @RequestParam("status")Integer status);
@PostMapping("/updateLineRunFlag")
void updateLineRunFlag(@RequestParam("lineId")String lineId, @RequestParam("status")Integer status);
}

25
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/LineFeignClientFallbackFactory.java
View File

@@ -10,6 +10,7 @@ import com.njcn.device.pq.pojo.param.OnlineRateParam;
import com.njcn.device.pq.pojo.po.Line;
import com.njcn.device.pq.pojo.po.LineDetail;
import com.njcn.device.biz.pojo.po.Overlimit;
import com.njcn.device.pq.pojo.po.line.LineInfoVO;
import com.njcn.device.pq.pojo.vo.*;
import com.njcn.device.biz.utils.DeviceEnumUtil;
import feign.hystrix.FallbackFactory;
@@ -63,6 +64,12 @@ public class LineFeignClientFallbackFactory implements FallbackFactory<LineFeign
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<DeviceVO> getDeviceDetailData(String id) {
log.error("{}异常，降级处理，异常为：{}", "根据装置Id获取装置详情 ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<LineOverLimitVO> getLineOverLimitData(String id) {
log.error("{}异常，降级处理，异常为：{}", "根据监测点Id获取监测点越限 ", throwable.toString());
@@ -117,6 +124,12 @@ public class LineFeignClientFallbackFactory implements FallbackFactory<LineFeign
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<LineInfoVO> getLineInfoVO(String id) {
log.error("{}异常，降级处理，异常为：{}", "监测点详细信息 ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<WarningSubstationDTO>> getWarningSub(List<String> list) {
log.error("{}异常，降级处理，异常为：{}", "变电站集合为 ", throwable.toString());
@@ -237,6 +250,18 @@ public class LineFeignClientFallbackFactory implements FallbackFactory<LineFeign
log.error("{}异常，降级处理，异常为：{}", "根据监测点id获取监测点集合: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public void updateDeviceRunFlag(String deviceId, Integer status) {
log.error("{}异常，降级处理，异常为：{}", "更新监测点运行状态: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public void updateLineRunFlag(String lineId, Integer status) {
log.error("{}异常，降级处理，异常为：{}", "更新监测点运行状态: ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

5
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDetail.java
View File

@@ -175,4 +175,9 @@ public class LineDetail{
*/
private String actualArea;
/**
* 监测点运行状态（0：运行；1：检修；2：停运；3：调试；4：退运）
*/
private Integer runFlag;
}

33
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/line/LineInfoVO.java Normal file
View File

@@ -0,0 +1,33 @@
package com.njcn.device.pq.pojo.po.line;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
@Data
public class LineInfoVO implements Serializable {
@ApiModelProperty("供电公司名称")
private String gdName;
@ApiModelProperty("变电站名称")
private String subName;
@ApiModelProperty("终端名称")
private String devName;
@ApiModelProperty("网络参数")
private String ip;
@ApiModelProperty("监测点名称")
private String lineName;
@ApiModelProperty("母线名称")
private String volName;
/**
* （0：运行；1：检修；2：停运；3：调试；4：退运）
*/
@ApiModelProperty("监测点运行状态")
private Integer runFlag;
}

7
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceVO.java
View File

@@ -26,6 +26,13 @@ public class DeviceVO implements Serializable {
*/
private String nodeId;
@ApiModelProperty("供电公司名称")
private String gdName;
@ApiModelProperty("变电站名称")
private String subName;
private String name;
/**

10
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailVO.java
View File

@@ -14,6 +14,7 @@ import java.time.LocalDateTime;
*/
@Data
public class LineDetailVO implements Serializable {
@ApiModelProperty("供电公司名称")
private String gdName;
@@ -28,6 +29,15 @@ public class LineDetailVO implements Serializable {
@ApiModelProperty("监测点名称")
private String lineName;
@ApiModelProperty("母线名称")
private String volName;
/**
* （0：运行；1：检修；2：停运；3：调试；4：退运）
*/
@ApiModelProperty("监测点运行状态")
private Integer runFlag;
@Data
public static class Detail extends LineDetailVO implements Serializable{