diff --git a/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppAutoDataMessage.java b/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppAutoDataMessage.java index 0e055143e..d466cee31 100644 --- a/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppAutoDataMessage.java +++ b/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppAutoDataMessage.java @@ -66,62 +66,6 @@ public class AppAutoDataMessage extends BaseMessage { private Integer dataTag; private String data; - - @ApiModelProperty("工程名称") - private String prjName; - - @ApiModelProperty("装置启动时间") - private Long prjTimeStart; - - @ApiModelProperty("装置结束时间") - private Long prjTimeEnd; - - @ApiModelProperty("装置数据路径") - private String prjDataPath; - - @ApiModelProperty("装置型号") - private String devType; - - @ApiModelProperty("装置mac地址") - private String devMac; - - @ApiModelProperty("装置程序版本") - private String appVersion; - - @ApiModelProperty("逻辑子设备id") - private Integer clDid; - - @ApiModelProperty("统计间隔") - private Integer statCycle; - - @ApiModelProperty("电压等级") - private Float volGrade; - - @ApiModelProperty("电压接线方式(0-星型, 1-角型, 2-V型)") - private Integer volConType; - - @ApiModelProperty("电流接线方式(0-正常, 1-合成IB, 2-合成IC)") - private Integer curConSel; - - @ApiModelProperty("PT变比") - private Integer ptRatio; - - @ApiModelProperty("ct变比") - private Integer ctRatio; - - @ApiModelProperty("基准短路容量") - private Float capacitySscb; - - @ApiModelProperty("最小短路容量") - private Float capacitySscmin; - - @ApiModelProperty("供电设备容量") - private Float capacitySt; - - @ApiModelProperty("用户协议容量") - private Float capacitySi; - - } } diff --git a/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppEventMessage.java b/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppEventMessage.java index 74db14224..a3b8b04be 100644 --- a/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppEventMessage.java +++ b/pqs-common/common-mq/src/main/java/com/njcn/mq/message/AppEventMessage.java @@ -65,6 +65,68 @@ public class AppEventMessage extends BaseMessage { private String code; private List param; + + @ApiModelProperty("工程名称") + private String prjName; + + @ApiModelProperty("装置启动时间") + private Long prjTimeStart; + + @ApiModelProperty("装置结束时间") + private Long prjTimeEnd; + + @ApiModelProperty("装置数据路径") + private String prjDataPath; + + @ApiModelProperty("装置型号") + private String devType; + + @ApiModelProperty("装置mac地址") + private String devMac; + + @ApiModelProperty("装置程序版本") + private String appVersion; + + @ApiModelProperty("逻辑子设备id") + private Integer clDid; + + @ApiModelProperty("统计间隔") + private Integer statCycle; + + @ApiModelProperty("电压等级") + private Float volGrade; + + @ApiModelProperty("电压接线方式(0-星型, 1-角型, 2-V型)") + private Integer volConType; + + @ApiModelProperty("电流接线方式(0-正常, 1-合成IB, 2-合成IC)") + private Integer curConSel; + + @ApiModelProperty("PT变比") + private Integer ptRatio; + + @ApiModelProperty("ct变比") + private Integer ctRatio; + + @ApiModelProperty("基准短路容量") + private Float capacitySscb; + + @ApiModelProperty("最小短路容量") + private Float capacitySscmin; + + @ApiModelProperty("供电设备容量") + private Float capacitySt; + + @ApiModelProperty("用户协议容量") + private Float capacitySi; + + + + + + + + } @Data