From 66b2b283aebe8e40b26d0da7d914b161f0b2ec1b Mon Sep 17 00:00:00 2001
From: ty <1577900710@qq.com>
Date: Wed, 6 Mar 2024 15:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9B=86=E4=B8=AD=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7-fdp=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=85=A5=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/hnac/hzims/alarm/config/vo/FdpAlarmVo.java      | 2 +-
 .../com/hnac/hzims/fdp/service/impl/FdpHistoryDataServiceImpl.java    | 3 ++-
 .../com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/FdpAlarmVo.java b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/FdpAlarmVo.java
index bdecf17..bda0081 100644
--- a/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/FdpAlarmVo.java
+++ b/hzims-service-api/alarm-api/src/main/java/com/hnac/hzims/alarm/config/vo/FdpAlarmVo.java
@@ -21,7 +21,7 @@ public class FdpAlarmVo  {
 	/**
 	 * 故障ID
 	 */
-	private String UUID;
+	private String uuid;
 	/**
 	 * 故障站点
 	 */
diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpHistoryDataServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpHistoryDataServiceImpl.java
index 3f28c81..c9e5efd 100644
--- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpHistoryDataServiceImpl.java
+++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpHistoryDataServiceImpl.java
@@ -50,7 +50,8 @@ public class FdpHistoryDataServiceImpl implements IFdpHistoryDataService {
 	@Override
 	public R<IPage<FdpFaultHistoryDataEntity>> getHistoryData(FDPFaultTableDTO req) {
 		IPage<FdpFaultHistoryDataEntity> page = new Page<>();
-		page.setSize(req.getPageSize()-1);
+		req.setPageIndex(req.getPageIndex()-1);
+		page.setSize(req.getPageSize()+1);
 		page.setCurrent(req.getPageIndex());
 		req.setOrderBy("CREATE_TIME");
 		if (StringUtil.isBlank(req.getSource())){
diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java
index ca23e68..4ff85b7 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java
@@ -83,14 +83,14 @@ public class FdpAlarmServiceImpl implements FdpAlarmService {
 
     private AlarmEntity getAlarmEntity(FdpAlarmVo item) {
         AlarmEntity entity = new AlarmEntity();
-        entity.setAlarmId(item.getUUID());
+        entity.setAlarmId(item.getUuid());
         entity.setRealId(item.getFaultId());
         entity.setAlarmTime(item.getCreateTime());
         entity.setAlarmContext(item.getFinfo());
         entity.setAlarmType(EARLY);
         entity.setDeviceCode(item.getDeviceId());
         entity.setDeviceName(item.getDeviceName());
-        entity.setAlarmStatus(Integer.valueOf(item.getStatus()));
+        entity.setAlarmStatus(0);
         entity.setAlarmValue(item.getInfo());
         entity.setStationId(item.getStation());
         entity.setDiagReason(item.getDiagReason());