From 87dcd22d5b1b1eb951cc4abdd8b64e733928ca00 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 08 四月 2025 11:38:16 +0800
Subject: [PATCH] 修改查询报表bug
---
ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/EquipmentInfo.java | 48 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 37 insertions(+), 11 deletions(-)
diff --git a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/EquipmentInfo.java b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/EquipmentInfo.java
index 5c64c3b..775bf7f 100644
--- a/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/EquipmentInfo.java
+++ b/ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/drainage/model/EquipmentInfo.java
@@ -1,5 +1,7 @@
package com.ruoyi.integration.drainage.model;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.models.auth.In;
import lombok.Data;
import javax.validation.constraints.NotNull;
@@ -18,56 +20,80 @@
* 设备编号
*/
@NotNull
- private String EquipmentID;
+ @JsonProperty("EquipmentID")
+ private String equipmentID;
/**
* 设备生产商组织机构代码
*/
@Null
- private String ManufacturerID;
+ @JsonProperty("ManufacturerID")
+ private String manufacturerID;
+ /**
+ * 设备唯一
+ * 编码
+ */
+ @Null
+ @JsonProperty("EquipmentUniqueNumber")
+ private String equipmentUniqueNumber;
/**
* 设备生产商名称
*/
@Null
- private String ManufacturerName;
+ @JsonProperty("ManufacturerName")
+ private String manufacturerName;
/**
* 设备型号
*/
@Null
- private String EquipmentModel;
+ @JsonProperty("EquipmentModel")
+ private String equipmentModel;
/**
* 设备生产日期
* YYYY-MM-DD
*/
@Null
- private String ProductionDate;
+ @JsonProperty("ProductionDate")
+ private String productionDate;
/**
* 设备类型
*/
@NotNull
- private Integer EquipmentType;
+ @JsonProperty("EquipmentType")
+ private Integer equipmentType;
/**
* 充电设备接口信息列表
*/
@NotNull
- private List<ConnectorInfo> ConnectorInfos;
+ @JsonProperty("ConnectorInfos")
+ private List<ConnectorInfo> connectorInfos;
/**
* 充电设备经度
*/
@Null
- private BigDecimal EquipmentLng;
+ @JsonProperty("EquipmentLng")
+ private BigDecimal equipmentLng;
/**
* 充电设备纬度
*/
@Null
- private BigDecimal EquipmentLat;
+ @JsonProperty("EquipmentLat")
+ private BigDecimal equipmentLat;
/**
* 充电设备总功率
*/
@NotNull
- private BigDecimal Power;
+ @JsonProperty("Power")
+ private BigDecimal power;
/**
* 充电设备名称
*/
@Null
- private String EquipmentName;
+ @JsonProperty("EquipmentName")
+ private String equipmentName;
+ /**
+ * 设备分类
+ */
+ @NotNull
+ @JsonProperty("EquipmentClassification")
+ private Integer equipmentClassification;
}
--
Gitblit v1.7.1