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
2022-07-01 09:17:51 +08:00
parent 7affd72b1d
commit 76ea96e316
38 changed files with 575 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -172,4 +172,21 @@ public interface LineFeignClient {
*/
@PostMapping("getOverLimitByList")
HttpResult<List<Overlimit>> getOverLimitByList(@RequestBody PollutionParamDTO pollutionParamDTO);
/**
* 区域监测点以及上级一些信息
* @param list 监测点id集合
* @return
*/
@PostMapping("getBaseLineAreaInfo")
HttpResult<List<AreaLineInfoVO>> getBaseLineAreaInfo(@RequestBody List<String> list);
/**
* 获取监测点基本信息
* @param list 监测点id集合
* @return
*/
@PostMapping("getBaseLineList")
HttpResult<List<Line>> getBaseLineList(@RequestBody List<String> list);
}

13
pqs-device/device-api/src/main/java/com/njcn/device/api/TerminalBaseClient.java
View File

@@ -5,10 +5,14 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.device.api.fallback.GeneralDeviceInfoClientFallbackFactory;
import com.njcn.device.api.fallback.TerminalBaseClientFallbackFactory;
import com.njcn.device.pojo.dto.GeneralDeviceDTO;
import com.njcn.device.pojo.po.Device;
import com.njcn.device.pojo.po.Line;
import com.njcn.device.pojo.vo.AreaLineInfoVO;
import com.njcn.device.pojo.vo.TerminalBaseVO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@@ -33,4 +37,13 @@ public interface TerminalBaseClient {
@GetMapping("/getSubstationById")
HttpResult<List<Line>> getSubstationById(@RequestParam("list") List<String> list);
/**
* 获取监测点限值
* @param list 设备id集合
* @return 监测点限值信息
*/
@PostMapping("getDevInfoByIds")
HttpResult<List<TerminalBaseVO>> getDeviceByIdOnOrOff(@RequestBody List<String> list);
}

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

@@ -135,6 +135,21 @@ public class LineFeignClientFallbackFactory implements FallbackFactory<LineFeign
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<AreaLineInfoVO>> getBaseLineAreaInfo(List<String> list) {
log.error("{}异常，降级处理，异常为：{}", "获取监测点详情 ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<Line>> getBaseLineList(List<String> list) {
log.error("{}异常，降级处理，异常为：{}", "获取监测点详情 ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

8
pqs-device/device-api/src/main/java/com/njcn/device/api/fallback/TerminalBaseClientFallbackFactory.java
View File

@@ -6,7 +6,9 @@ import com.njcn.common.pojo.response.HttpResult;
import com.njcn.device.api.GeneralDeviceInfoClient;
import com.njcn.device.api.TerminalBaseClient;
import com.njcn.device.pojo.dto.GeneralDeviceDTO;
import com.njcn.device.pojo.po.Device;
import com.njcn.device.pojo.po.Line;
import com.njcn.device.pojo.vo.TerminalBaseVO;
import com.njcn.device.utils.DeviceEnumUtil;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
@@ -38,6 +40,12 @@ public class TerminalBaseClientFallbackFactory implements FallbackFactory<Termin
log.error("{}异常，降级处理，异常为：{}", "根据变电站id获取变电站详情", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<TerminalBaseVO>> getDeviceByIdOnOrOff(List<String> list) {
log.error("{}异常，降级处理，异常为：{}", "根据设备ids获取设备详情", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};

73
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/AreaLineInfoVO.java Normal file
View File

@@ -0,0 +1,73 @@
package com.njcn.device.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
* 监测点详细信息
* @author cdf
* @date 2022/6/29
*/
@Data
public class AreaLineInfoVO implements Serializable {
@ApiModelProperty(name = "lineId",value = "监测点id")
private String lineId;
@ApiModelProperty(name = "lineName",value = "监测点名称")
private String lineName;
@ApiModelProperty(name = "subId",value = "变电站id")
private String subId;
@ApiModelProperty(name = "subName",value = "变电站名称")
private String subName;
@ApiModelProperty(name = "gdId",value = "供电公司id")
private String gdId;
@ApiModelProperty(name = "gdName",value = "供电公司名称")
private String gdName;
@ApiModelProperty(name = "voltageId",value = "母线id")
private String voltageId;
@ApiModelProperty(name = "voltageName",value = "母线名称")
private String voltageName;
@ApiModelProperty(name = "noDealCount",value = "未处理暂降事件")
private Integer noDealCount;
@ApiModelProperty(name = "ct1",value = "ct1")
private Integer ct1;
@ApiModelProperty(name = "ct2",value = "ct2")
private Integer ct2;
@ApiModelProperty(name = "pt1",value = "pt1")
private Integer pt1;
@ApiModelProperty(name = "pt2",value = "pt2")
private Integer pt2;
@ApiModelProperty(name = "runFlag",value = "运行状态")
private Integer runFlag;
@ApiModelProperty(name = "comFlag",value = "通讯状态")
private Integer comFlag;
@ApiModelProperty(name = "ip",value = "装置ip")
private String ip;
@ApiModelProperty(name = "lat",value = "维度")
private BigDecimal lat;
@ApiModelProperty(name = "lng",value = "经度")
private BigDecimal lng;
@ApiModelProperty(name = "manufacturer",value = "供应商名称")
private String manufacturer;
}

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

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
@@ -18,7 +19,7 @@ import java.util.List;
* @date 2021/6/23
*/
@Data
public class DeviceVO {
public class DeviceVO implements Serializable {
private String devIndex;

4
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/LineMarkVO.java
View File

@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
/**
* pqs
*
@@ -13,7 +15,7 @@ import lombok.NoArgsConstructor;
*/
@Data
@ApiModel
public class LineMarkVO {
public class LineMarkVO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(name = "省份")
private String province;

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/LineVO.java
View File

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
/**
@@ -15,7 +16,7 @@ import java.util.Date;
*/
@Data
@ApiModel
public class LineVO {
public class LineVO implements Serializable {
@ApiModelProperty(name = "id",value = "监测点索引")
private String lineIndex;

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/ProjectVO.java
View File

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
@@ -16,7 +17,7 @@ import javax.validation.constraints.NotNull;
*/
@Data
@ApiModel
public class ProjectVO {
public class ProjectVO implements Serializable {
/**
* 表Id

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/ProvinceVO.java
View File

@@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import java.io.Serializable;
/**
* pqs
@@ -20,7 +21,7 @@ import javax.validation.constraints.Pattern;
*/
@Data
@ApiModel
public class ProvinceVO {
public class ProvinceVO implements Serializable {
/**
* 表Id

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/SubStationVO.java
View File

@@ -3,6 +3,7 @@ package com.njcn.device.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigDecimal;
/**
@@ -12,7 +13,7 @@ import java.math.BigDecimal;
* @date 2021/7/20
*/
@Data
public class SubStationVO {
public class SubStationVO implements Serializable {
@ApiModelProperty(name ="subIndex",value = "变电站索引")
private String subIndex;

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/SubVoltageVO.java
View File

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
@@ -14,7 +15,7 @@ import java.util.List;
*/
@Data
@ApiModel
public class SubVoltageVO {
public class SubVoltageVO implements Serializable {
@ApiModelProperty(name = "subIndex",value = "母线索引")
private String subvIndex;

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/TerminalAlarmVO.java
View File

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
@@ -16,7 +17,7 @@ import java.time.LocalDateTime;
*/
@Data
@ApiModel
public class TerminalAlarmVO {
public class TerminalAlarmVO implements Serializable {
private String subName;

54
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/TerminalBaseVO.java Normal file
View File

@@ -0,0 +1,54 @@
package com.njcn.device.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* pqs
*
* @author cdf
* @date 2022/6/30
*/
@Data
public class TerminalBaseVO {
@ApiModelProperty("监测点名称")
private String lineName;
@ApiModelProperty("监测点id")
private String lineId;
@ApiModelProperty("母线名称")
private String voltage;
@ApiModelProperty("母线id")
private String voltageId;
@ApiModelProperty("设备名称")
private String devName;
@ApiModelProperty("设备id")
private String devId;
@ApiModelProperty("变电站名称")
private String subName;
@ApiModelProperty("变电站id")
private String subId;
@ApiModelProperty("供电名称")
private String gdName;
@ApiModelProperty("供电id")
private String gdId;
@ApiModelProperty("装置ip")
private String ip;
@ApiModelProperty("数据更新时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String updateTime;
}

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/TerminalLedgerVO.java
View File

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
@@ -14,7 +15,7 @@ import java.util.List;
*/
@Data
@ApiModel
public class TerminalLedgerVO {
public class TerminalLedgerVO implements Serializable {
@ApiModelProperty(name = "areaIndex",value = "区域索引")
private String areaIndex;

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/TerminalMaintainVO.java
View File

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
@@ -14,7 +15,7 @@ import java.util.List;
*/
@Data
@ApiModel
public class TerminalMaintainVO {
public class TerminalMaintainVO implements Serializable {
@ApiModelProperty(name="序号")
private Integer index;
@ApiModelProperty(name = "拓扑名称")

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/TerminalTree.java
View File

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -15,7 +16,7 @@ import java.util.List;
*/
@ApiModel
@Data
public class TerminalTree {
public class TerminalTree implements Serializable {
private String id;
@ApiModelProperty(name = "parentId",value = "父id")
private String pid;

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/TerminalVO.java
View File

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
@@ -16,7 +17,7 @@ import java.util.List;
*/
@Data
@ApiModel
public class TerminalVO {
public class TerminalVO implements Serializable {
@ApiModelProperty(name = "projectVO",value = "项目实体")
private ProjectVO projectVO;

3
pqs-device/device-api/src/main/java/com/njcn/device/pojo/vo/TerminalVersionVO.java
View File

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
@@ -15,7 +16,7 @@ import java.util.List;
*/
@Data
@ApiModel
public class TerminalVersionVO {
public class TerminalVersionVO implements Serializable {
@ApiModelProperty(name="序号")
private Integer index;
@ApiModelProperty(name = "拓扑名称")