From 7242faec9cf2574a845e7ce28923f03121c15ff0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 十一月 2024 08:59:17 +0800
Subject: [PATCH] 1、Rtu模拟器编码实现不启动web服务; 2、修改ym:ugTaskSendUrl配置为测试下发远程升级任务; 3、优化代码。

---
 pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
index 88d93e0..c869671 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
@@ -1,6 +1,8 @@
 package com.dy.pipIrrGlobal.voPr;
 
 import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 import lombok.Data;
 
 /**
@@ -11,6 +13,7 @@
  */
 
 @Data
+@JsonPropertyOrder({ "intakeId", "rtuAddr", "intakeNum", "isOnLine"})
 public class VoOnLineIntake implements BaseEntity {
     private static final long serialVersionUID = 202405271703001L;
 
@@ -40,6 +43,12 @@
     private Double lat;
 
     /**
+     * 绱娴侀噺
+     */
+    @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+    private Double totalAmount;
+
+    /**
      * 鏄惁鍦ㄧ嚎
      */
     private Boolean isOnLine;

--
Gitblit v1.8.0