From f5f4ed7de0168cd94be8b671e5ff0049ecc1f54b Mon Sep 17 00:00:00 2001 From: ty <1577900710@qq.com> Date: Wed, 6 Mar 2024 18:42:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=99=BA=E8=83=BD=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= 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/FdpListTableDataServiceImpl.java | 3 ++- .../com/hnac/hzims/alarm/source/service/impl/FdpAlarmServiceImpl.java | 2 +- 3 files changed, 4 insertions(+), 3 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 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());