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

1.变压器策略代码提交

Browse Source 
2.数据中心bug修改
This commit is contained in:
wr
2023-08-03 19:22:49 +08:00
parent d11003f530
commit 13d5d73ce1
34 changed files with 1547 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/enums/PvDeviceResponseEnum.java
View File

@@ -27,6 +27,9 @@ public enum PvDeviceResponseEnum {
VOLTAGE_PARAM_EMPTY_MUST("A0359","所属母线必须为空"),
LV_USER_REPEAT("A0360","低压用户名称重复"),
SUBSTATION_CODE_REPEAT("A0351","变电站编号重复"),
TRANSFORMER_NAME_REPEAT("A0401","变压器名称重复"),
TFLGPLOY_NAME_REPEAT("A0402","变压器策略名称重复"),
TEN_VOLTAGE_NULL("A0360","未查询到指定10kV线路"),

88
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/PqsTransformerParam.java Normal file
View File

@@ -0,0 +1,88 @@
package com.njcn.device.pq.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* @author wr
* @description
* @date 2023/7/19 11:29
*/
@Data
public class PqsTransformerParam implements Serializable {
@ApiModelProperty(name ="tfIndex",value = "变压器台账编号",required = true)
@NotBlank(message = "变压器台账编号不能为空")
private String tfIndex;
@ApiModelProperty(name ="upNode",value = "上节点",required = true)
private String upNode;
@ApiModelProperty(name ="downNode",value = "下节点",required = true)
private String downNode;
@Data
public static class TransformerAddParam {
/**
* 变压器名称
*/
@ApiModelProperty(value = "变压器名称")
@NotBlank(message = "变压器名称不能为空")
private String tfName;
/**
* 所属变电站主键
*/
@ApiModelProperty(value = "所属变电站主键")
@NotBlank(message = "所属变电站信息为空")
private String subIndex;
/**
* 接线方式（跟数据字典绑定，星星，星三角）
*/
@ApiModelProperty(value = "接线方式（跟数据字典绑定，星星，星三角）")
@NotBlank(message = "接线方式不能为空")
private String wiring;
/**
* 描述
*/
@ApiModelProperty(value = "描述")
private String tfDescribe;
}
@Data
public static class TransformerUpdateParam {
/**
* 变压器主键
*/
@ApiModelProperty(value = "变压器主键")
@NotBlank(message = "变压器编号不能为空")
private String tfIndex;
/**
* 变压器名称
*/
@ApiModelProperty(value = "变压器名称")
@NotBlank(message = "变压器名称不能为空")
private String tfName;
/**
* 接线方式（跟数据字典绑定，星星，星三角）
*/
@ApiModelProperty(value = "接线方式（跟数据字典绑定，星星，星三角）")
@NotBlank(message = "接线方式不能为空")
private String wiring;
/**
* 描述
*/
@ApiModelProperty(value = "描述")
private String tfDescribe;
}
}

44
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/TflgployParam.java Normal file
View File

@@ -0,0 +1,44 @@
package com.njcn.device.pq.pojo.param;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
/**
* @author wr
* @description
* @date 2023/7/19 15:59
*/
@Data
public class TflgployParam implements Serializable {
/**
* 变压器策略名称
*/
@ApiModelProperty(value = "变压器策略名称")
@NotBlank(message = "变压器策略名称不能为空")
private String tpName;
/**
* 变压器策略描述
*/
@ApiModelProperty(value = "变压器策略描述")
private String tfDescribe;
@ApiModelProperty(value = "变压器台账id集合")
private List<String> tfIndexs;
@Data
public static class TflgployUpdateParam extends TflgployParam{
/**
* 变压器策略Guid
*/
@ApiModelProperty(value = "变压器策略Guid")
@NotBlank(message = "变压器策略编号不能为空")
private String tpIndex;
}
}

50
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/PqsTflgass.java Normal file
View File

@@ -0,0 +1,50 @@
package com.njcn.device.pq.pojo.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 变压器逻辑节点关系表
* </p>
*
* @author wr
* @since 2023-07-19
*/
@Getter
@Setter
@TableName("pqs_tflgass")
public class PqsTflgass extends BaseEntity {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "变压器跟逻辑节点关系Guid")
@TableId(value = "Ass_Index")
private String assIndex;
@ApiModelProperty(value = "变压器台账Guid")
private String tfIndex;
/**
* 上级逻辑节点
*/
@ApiModelProperty(value = "上级逻辑节点")
private String logicBefore;
/**
* 下级逻辑节点
*/
@ApiModelProperty(value = "下级逻辑节点")
private String logicNext;
}

60
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/PqsTflgploy.java Normal file
View File

@@ -0,0 +1,60 @@
package com.njcn.device.pq.pojo.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.omg.PortableInterceptor.INACTIVE;
/**
* <p>
* PQS_TfLgPloy变压器策略表
* </p>
*
* @author wr
* @since 2023-07-19
*/
@Getter
@Setter
@TableName("pqs_tflgploy")
public class PqsTflgploy extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 变压器策略Guid
*/
@ApiModelProperty(value = "变压器策略Guid")
@TableId(value = "tp_Index")
private String tpIndex;
/**
* 变压器策略名称
*/
@ApiModelProperty(value = "变压器策略名称")
private String tpName;
/**
* 变压器策略描述
*/
@ApiModelProperty(value = "变压器策略描述")
private String tfDescribe;
/**
* 0删除 1.正常
*/
@ApiModelProperty(value = "0删除 1.正常")
@TableLogic(value="1",delval="0")
private Integer status;
}

42
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/PqsTflgployass.java Normal file
View File

@@ -0,0 +1,42 @@
package com.njcn.device.pq.pojo.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* PQS_TfLgPloyAss策略、变压器关系表
* </p>
*
* @author wr
* @since 2023-07-19
*/
@Getter
@Setter
@TableName("pqs_tflgployass")
public class PqsTflgployass extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 策略Guid（外键PQS_TfLgPloy中TP_Index）
*/
@ApiModelProperty(value = "策略Guid（外键PQS_TfLgPloy中TP_Index）")
private String tpIndex;
/**
* 报告基础项Guid（外键PQS_Transformer中Tf_Index）
*/
@ApiModelProperty(value = "报告基础项Guid（外键PQS_Transformer中Tf_Index）")
private String tfIndex;
}

75
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/PqsTransformer.java Normal file
View File

@@ -0,0 +1,75 @@
package com.njcn.device.pq.pojo.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import java.time.LocalDateTime;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
* 变压器台账表
* </p>
*
* @author wr
* @since 2023-07-19
*/
@Getter
@Setter
@TableName("pqs_transformer")
public class PqsTransformer extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* 变压器主键
*/
@ApiModelProperty(value = "变压器主键")
@TableId(value = "Tf_Index")
private String tfIndex;
/**
* 变压器名称
*/
@ApiModelProperty(value = "变压器名称")
private String tfName;
/**
* 所属变电站主键
*/
@ApiModelProperty(value = "所属变电站主键")
private String subIndex;
/**
* 接线方式（跟数据字典绑定，星星，星三角）
*/
@ApiModelProperty(value = "接线方式（跟数据字典绑定，星星，星三角）")
private String wiring;
/**
* 描述
*/
@ApiModelProperty(value = "描述")
private String tfDescribe;
/**
* 排序
*/
@ApiModelProperty(value = "排序")
private Integer sort;
/**
* 0删除 1.正常
*/
@ApiModelProperty(value = "0删除 1.正常")
@TableLogic(value="1",delval="0")
private Integer status;
}

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

@@ -18,6 +18,9 @@ public class LineDeviceStateVO implements Serializable {
@ApiModelProperty(name = "name",value = "监测点名称")
private String name;
@ApiModelProperty(name = "subName",value = "变电站名称")
private String subName;
@ApiModelProperty(name = "pids",value = "节点")
private String pids;

36
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/PqsTflgassVO.java Normal file
View File

@@ -0,0 +1,36 @@
package com.njcn.device.pq.pojo.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author wr
* @description
* @date 2023/7/20 13:55
*/
@Data
public class PqsTflgassVO {
@ApiModelProperty(value = "变压器台账Guid")
private String tfIndex;
/**
* 上级逻辑节点
*/
@ApiModelProperty(value = "上级逻辑节点")
private String logicBefore;
@ApiModelProperty(value = "上级逻辑节点名称")
private String logicBeforeName;
/**
* 下级逻辑节点
*/
@ApiModelProperty(value = "下级逻辑节点")
private String logicNext;
@ApiModelProperty(value = "下级逻辑节店名称")
private String logicNextName;
}

63
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/PqsTransformerVO.java Normal file
View File

@@ -0,0 +1,63 @@
package com.njcn.device.pq.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @author wr
* @description
* @date 2023/8/2 10:06
*/
@Data
public class PqsTransformerVO {
/**
* 变压器主键
*/
@ApiModelProperty(value = "变压器主键")
private String tfIndex;
/**
* 变压器名称
*/
@ApiModelProperty(value = "变压器名称")
private String tfName;
/**
* 所属变电站主键
*/
@ApiModelProperty(value = "所属变电站主键")
private String subIndex;
/**
* 所属变电站主键
*/
@ApiModelProperty(value = "所属变电站主键")
private String subIndexName;
/**
* 接线方式（跟数据字典绑定，星星，星三角）
*/
@ApiModelProperty(value = "接线方式（跟数据字典绑定，星星，星三角）")
private String wiring;
/**
* 描述
*/
@ApiModelProperty(value = "描述")
private String tfDescribe;
/**
* 更新用户
*/
private String updateBy;
/**
* 更新时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
}

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

@@ -17,6 +17,11 @@ public class SubstationDetailVO implements Serializable {
private String srbName;
/**
* 变电站名称
*/
private String subName;
private Double coordY;
private Double coordX;

24
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TransformerVO.java Normal file
View File

@@ -0,0 +1,24 @@
package com.njcn.device.pq.pojo.vo;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author wr
* @description
* @date 2023/7/19 14:47
*/
@Data
@ApiModel
public class TransformerVO {
@ApiModelProperty(name = "id",value = "id")
private String id;
@ApiModelProperty(name = "name",value = "名称")
private String name;
@ApiModelProperty(name = "sort",value = "排序")
private String sort;
}