From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoReceipt.java | 91 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 69 insertions(+), 22 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoReceipt.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoReceipt.java
index fad9f78..ea6ee21 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoReceipt.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voSe/VoReceipt.java
@@ -1,7 +1,8 @@
package com.dy.pipIrrGlobal.voSe;
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -15,62 +16,108 @@
*/
@Data
-@Schema(title = "鏀舵嵁瑙嗗浘瀵硅薄")
public class VoReceipt {
private static final long serialVersionUID = 202402011037001L;
- @Schema(title = "鏀堕摱鍛業D")
+ /**
+ * 鏀堕摱鍛業D
+ */
private String cashierId;
- @Schema(title = "璁㈠崟鍙�")
- private String orderNumber;
+ /**
+ * 璁㈠崟鍙�
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long orderNumber;
- @Schema(title = "闀囧悕绉�")
+ /**
+ * 闀囧悕绉�
+ */
private String townName;
- @Schema(title = "鏉戝悕绉�")
+ /**
+ * 鏉戝悕绉�
+ */
private String villageName;
- @Schema(title = "鍐滄埛濮撳悕")
+ /**
+ * 鍐滄埛濮撳悕
+ */
private String name;
- @Schema(title = "鐢佃瘽")
+ /**
+ * 鐢佃瘽
+ */
private String phone;
- @Schema(title = "鍐滄埛缂栧彿")
- private String clientNum;
+ /**
+ * 鍐滄埛缂栧彿
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long clientNum;
- @Schema(title = "姘村崱缂栧彿")
- private String cardNum;
+ /**
+ * 姘村崱缂栧彿
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ private Long cardNum;
- @Schema(title = "涓氬姟绫诲瀷")
+ /**
+ * 涓氬姟绫诲瀷
+ */
private String operateType;
- @Schema(title = "璐按閲戦")
+ /**
+ * 璐按閲戦
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double waterCost;
- @Schema(title = "璐崱閲戦")
+ /**
+ * 璧犻�侀噾棰�
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double gift;
+
+ /**
+ * 璐崱閲戦
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double cardCost;
- @Schema(title = "鏀惰垂閲戦")
+ /**
+ * 鏀惰垂閲戦
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double amount;
- @Schema(title = "姘村崱浣欓")
+ /**
+ * 姘村崱浣欓
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double money;
- @Schema(title = "鏀粯鏂瑰紡")
+ /**
+ * 鏀粯鏂瑰紡
+ */
private String paymentName;
- @Schema(title = "鎿嶄綔浜�")
+ /**
+ * 鎿嶄綔浜�
+ */
private String operatorName;
+ /**
+ * 鎿嶄綔鏃堕棿
+ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Schema(title = "鎿嶄綔鏃堕棿")
private Date operateTime;
+ /**
+ * 褰撳墠鏃堕棿
+ */
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- @Schema(title = "褰撳墠鏃堕棿")
private Date currentTime;
}
--
Gitblit v1.8.0