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());