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 bda0081..bdecf17 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/FdpListTableDataServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpListTableDataServiceImpl.java index 9ba5b68..99e77cc 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpListTableDataServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/service/impl/FdpListTableDataServiceImpl.java @@ -72,8 +72,9 @@ public class FdpListTableDataServiceImpl implements IFdpListTableDataService { @Override public R getListByProperty(FDPFaultListInfoDTO req) { IPage page = new Page<>(); + req.setPageIndex(req.getPageIndex()-1); page.setSize(req.getPageSize()); - page.setCurrent(req.getPageIndex()-1); + page.setCurrent(req.getPageIndex()+1); req.setDisplay(1); req.setIsRoot(0); req.setOrderBy("NAME"); 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 4ff85b7..2216534 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,7 +83,7 @@ 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());