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

1.定值管理

Browse Source 
2.终端性能查看
3.监测点实时数据
4.终端升级
This commit is contained in:
wr
2023-08-18 15:45:54 +08:00
parent febba71ac1
commit df5c9f8b76
45 changed files with 2796 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/advanced/ContUpdateDevValueRVO.java Normal file
View File

@@ -0,0 +1,10 @@
package com.njcn.device.pq.pojo.advanced;
import lombok.Data;
@Data
public class ContUpdateDevValueRVO {
private String len;
private ContUpdateDevValueVO data;
}

12
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/advanced/ContUpdateDevValueVO.java Normal file
View File

@@ -0,0 +1,12 @@
package com.njcn.device.pq.pojo.advanced;
import lombok.Data;
@Data
public class ContUpdateDevValueVO {
private String type;
private String index;
private String hander;
private int[] interValue;
}

10
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/advanced/ContUpdateValueRVO.java Normal file
View File

@@ -0,0 +1,10 @@
package com.njcn.device.pq.pojo.advanced;
import lombok.Data;
@Data
public class ContUpdateValueRVO {
private String len;
private ContUpdateValueVO data;
}

12
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/advanced/ContUpdateValueVO.java Normal file
View File

@@ -0,0 +1,12 @@
package com.njcn.device.pq.pojo.advanced;
import lombok.Data;
@Data
public class ContUpdateValueVO {
private String type;
private String index;
private String lineid;
private String hander;
private float[] value;
}

11
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/advanced/ContValueRVO.java Normal file
View File

@@ -0,0 +1,11 @@
package com.njcn.device.pq.pojo.advanced;
import lombok.Data;
@Data
public class ContValueRVO {
private String len;
private ContValueVO data;
}

11
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/advanced/ContValueVO.java Normal file
View File

@@ -0,0 +1,11 @@
package com.njcn.device.pq.pojo.advanced;
import lombok.Data;
@Data
public class ContValueVO {
private String type;
private String index;
private String lineid;
private String hander;
}

18
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/advanced/UpDataVO.java Normal file
View File

@@ -0,0 +1,18 @@
package com.njcn.device.pq.pojo.advanced;
import lombok.Data;
import java.util.List;
/***
* @Description:
* @Author: wr
* @Date: 2023/8/16 16:10
*/
@Data
public class UpDataVO {
private String type;
private String edIndex;
private String userIndex;
private List<UpDevVO> terminal;
}

19
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/advanced/UpDevVO.java Normal file
View File

@@ -0,0 +1,19 @@
package com.njcn.device.pq.pojo.advanced;
import lombok.Data;
/**
* @Description
* @Author wr
* @Date 2022/8/14
**/
@Data
public class UpDevVO {
private String devIndex;
private String devName;
public String getDevIndex() {
return devIndex;
}
}

16
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/advanced/UpParamVO.java Normal file
View File

@@ -0,0 +1,16 @@
package com.njcn.device.pq.pojo.advanced;
import lombok.Data;
/**
* @Author: wr
* @Date: 2023/8/16 16:10
*/
@Data
public class UpParamVO {
private String len;
private UpDataVO data;
}

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

@@ -0,0 +1,80 @@
package com.njcn.device.pq.pojo.param;
import com.njcn.device.pq.pojo.po.PqsProtectvalue;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.List;
/**
* @author wr
* @description
* @date 2023/8/11 9:20
*/
@Data
public class ConstantValueParam implements Serializable {
@ApiModelProperty(name = "hander", value = "用于匹配 0 定值 1 定值描述")
@NotNull(message = "用于匹配 0 定值 1 定值描述不能为空")
private Integer hander;
@ApiModelProperty(name = "type", value = "区分内外定值")
@NotNull(message = "区分内外定值不能为空")
private Integer type;
@ApiModelProperty(name = "json", value = "json数据")
@NotNull(message = "json数据不能为空")
private ConstantValue json;
@Data
public static class ConstantValue {
private List<PqsProtectvalue> data;
private String devindex;
private Integer hander;
private String lineindex;
private String methodname;
}
@Data
public static class Constant {
@ApiModelProperty(name = "ip", value = "网络ip")
private String ip;
@ApiModelProperty(name = "type", value = "区分内外定值")
private String type;
@ApiModelProperty(name = "id", value = "监测编号或者终端编号")
@NotBlank(message = "装置系列字典不能为空")
private String id;
@ApiModelProperty(name = "hander", value = "用于匹配 0 定值 1 定值描述")
@NotBlank(message = "装置系列字典不能为空")
private String hander;
}
@Data
public static class ValueData extends Constant {
@ApiModelProperty(name = "interValue", value = "数值")
private String interValue;
}
@Data
public static class Upgrades {
@ApiModelProperty(name = "list", value = "终端id集合")
@NotEmpty(message = "终端id集合不能为空")
private List<String> list;
@ApiModelProperty(name = "edIndex", value = "选中版本号id")
@NotBlank(message = "选中版本号id不能为空")
private String edIndex;
}
}

14
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/ProgramParam.java
View File

@@ -3,6 +3,9 @@ package com.njcn.device.pq.pojo.param;
import com.njcn.web.pojo.param.BaseParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotEmpty;
import java.io.Serializable;
@@ -17,4 +20,15 @@ public class ProgramParam extends BaseParam implements Serializable {
@ApiModelProperty(name = "devType", value = "装置系列,字典表", required = false)
private String devType;
@Data
public static class Version{
@ApiModelProperty(name = "devType", value = "装置系列,字典表")
@NotBlank(message = "装置系列字典不能为空")
private String devType;
@ApiModelProperty(name = "devType", value = "版本编号集合")
@NotEmpty(message = "版本编号集合不能为空")
private String versionIds;
}
}

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

@@ -35,37 +35,18 @@ public class DevVersion extends BaseEntity {
/**
* 版本状态（0-前期版本;1-当前版本）
*/
private Boolean flag;
private Integer flag;
/**
* 操作结果（0-升级失败;1-升级成功）
*/
private Boolean result;
private Integer result;
/**
* 状态 0-删除；1-正常；默认正常
*/
private Boolean state;
private Integer state;
/**
* 创建用户
*/
private String createBy;
/**
* 创建时间
*/
private LocalDateTime createTime;
/**
* 更新用户
*/
private String updateBy;
/**
* 更新时间
*/
private LocalDateTime updateTime;
private String devType;
private String devTypeName;

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

@@ -0,0 +1,57 @@
package com.njcn.device.pq.pojo.po;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import java.io.Serializable;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
*
* </p>
*
* @author wr
* @since 2023-08-10
*/
@Getter
@Setter
@TableName("pqs_protectcontrolword")
public class PqsProtectcontrolword {
private static final long serialVersionUID = 1L;
/**
* PV_INDEX的外键（定值表的主键）
*/
@TableId(value = "pv_index")
private String pvIndex;
/**
* 控制位序号0,1,2,3,……,15
*/
private Integer typeNum;
/**
* 控制位为0时表达意义
*/
private String bit0;
/**
* 控制位为1时表达意义
*/
private String bit1;
/**
* 描述
*/
private String describe;
/**
* 是否选中：0：否，1：是
*/
private Integer flag;
}

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

@@ -0,0 +1,96 @@
package com.njcn.device.pq.pojo.po;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.util.List;
import lombok.Getter;
import lombok.Setter;
/**
* <p>
*
* </p>
*
* @author wr
* @since 2023-08-10
*/
@Getter
@Setter
@TableName("pqs_protectvalue")
public class PqsProtectvalue {
private static final long serialVersionUID = 1L;
/**
* 索引
*/
@TableId(value = "pv_index")
private String pvIndex;
/**
* 监测点序号，内部定值默认为1
*/
@TableField( "cpu_no")
private Integer cpu_no;
/**
* 终端类型GUID（PQS_Dicdata）
*/
@TableField("dev_type")
private String dev_type;
/**
* 类型 80-外部定值 十进制类型 81-外部定值的十六进制类型 90-内部定值 十进制类型 91-内部定制 十六进制类型
*/
private Integer type;
@TableField( "dz_type")
private Integer dz_type;
/**
* 单位
*/
private String unit;
/**
* 最大值
*/
@TableField( "max_value")
private Float maxvalue;
/**
* 最小值
*/
@TableField( "min_value")
private Float minvalue;
/**
* 默认值
*/
@TableField( "default_value")
private Float defaultvalue;
/**
* 设定值
*/
@TableField( "value")
private Float value;
/**
* 描述
*/
@TableField( "description")
private String describe;
/**
* 排序
*/
private Integer sort;
@TableField(exist = false)
List<PqsProtectcontrolword> word;
}

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

@@ -0,0 +1,40 @@
package com.njcn.device.pq.pojo.vo;
import com.njcn.device.pq.pojo.advanced.UpDevVO;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Description: 终端升级实体
* @Author: wr
* @Date: 2023/8/16 15:28
*/
@Data
public class DeviceIpRVO {
@ApiModelProperty("终端id")
private String devIndex;
@ApiModelProperty("终端名称")
private String devName;
@ApiModelProperty("前置ip")
private String ip;
@ApiModelProperty("端口")
private Integer port;
@ApiModelProperty("装置类型")
private String devType;
@ApiModelProperty("装置系列")
private String devSeries;
@ApiModelProperty("终端状态")
private Integer comFlag;
//扩展
private List<UpDevVO> devlist;
private List<String> indexlist;
}

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

@@ -46,6 +46,45 @@ public class TerminalVersionVO implements Serializable {
private String updateTime;
@ApiModelProperty(name = "升级人员")
private String updateBy;
@ApiModelProperty(name = "版本序号")
private String versionId;
@ApiModelProperty(name = "子级")
List<TerminalVersionVO> children;
@Data
public static class Version{
@ApiModelProperty(name = "终端编号")
private String id;
@ApiModelProperty(name = "终端名称")
private String name;
@ApiModelProperty(name = "版本序号")
private String versionName;
@ApiModelProperty(name = "版本协议")
private String protocol;
@ApiModelProperty(name = "版本日期")
private String versionDate;
@ApiModelProperty(name = "终端系列")
private String devSeries;
@ApiModelProperty(name = "终端型号")
private String devType;
@ApiModelProperty(name = "供电公司")
private String gbName;
@ApiModelProperty(name = "变电站")
private String subName;
@ApiModelProperty(name = "更新时间")
private String updateTime;
@ApiModelProperty(name = "修改人")
private String updateBy;
}
}

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

@@ -80,4 +80,6 @@ public class VersionVO implements Serializable {
@ApiModelProperty("文件名称")
private String fileName;
@ApiModelProperty("是否存在文件：0=未有文件 1=已有文件")
private Integer isFile;
}