Merge remote-tracking branch 'origin/master'

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;
 	/**
 	 * 故障站点
 	 */

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<FdpFaultTableListEntity> 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");

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