修改泰和告警

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -56,7 +56,8 @@ public class MonitorFanIdxController extends BaseController {
     @Autowired
     EquipAlarmEventServiceImpl equipAlarmEventService;
 
-
+    @Autowired
+    EquipAlarmEventServiceImpl equipAlarmEventServiceImpl;
     @Autowired
     CommonServiceImpl commonServiceImpl;
     @Autowired
@@ -522,7 +523,14 @@ public class MonitorFanIdxController extends BaseController {
         } else if (type.equals("1")) {
             StationBasic stationBasic = stationBasicMapper.selectById(stationId);
             String fanGatewayId = stationBasic.getFanGatewayId();
-            resultsData = monitorFanIndicatorImpl.getNationWideInfo(current, size, fanGatewayId, null);
+            if("FDZ".equals(stationBasic.getStationType())) 
+            {
+            	 resultsData = monitorFanIndicatorImpl.getNationWideInfo(current, size, fanGatewayId, null);
+            }else 
+            {
+            	 resultsData = equipAlarmEventServiceImpl.getEventByEquipIndex(fanGatewayId, current, size, null, null);
+            }
+      
         }
         return ResponseHelper.buildResponse(resultsData);
     }

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/EquipAlarmEventServiceImpl.java

@@ -45,11 +45,21 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto,
         IPage<EquipAlarmEvent>  page = equipAlarmEventMapper.selectPage(p, queryWrapper);
      //   equipAlarmEvents = equipAlarmEventMapper.selectList(queryWrapper);
         equipAlarmEvents=page.getRecords();
+        equipAlarmEvents.forEach(i->{
+        	if("true".equals(i)) 
+        	{
+        		i.setValue("合");
+        	}else 
+        	{
+        		i.setValue("分");
+        	}
+        });
         DataGridMock DataGridMock = new DataGridMock(current, equipAlarmEvents.size(), false, current, equipAlarmEvents.subList((current - 1) * size, current * size));
         ColModel colModelEventMovement = new ColModel("equipName", "equipName", "设备名", "设备名", "dataGrid", "equipName");
         ColModel colModelStationName = new ColModel("alarmDesc", "alarmDesc", "事件描述", "事件描述", "dataGrid", "alarmDesc");
         ColModel colModelEventDesc = new ColModel("createdTime", "createdTime", "告警时间", "告警时间", "dataGrid", "createdTime");
-        List<ColModel> listColModel = Arrays.asList(colModelEventMovement, colModelStationName, colModelEventDesc);
+        ColModel colModelValueDesc = new ColModel("value", "value", "动作", "动作", "dataGrid", "value");
+        List<ColModel> listColModel = Arrays.asList(colModelEventMovement, colModelStationName, colModelEventDesc,colModelValueDesc);
         ResultsData resultsData = new ResultsData(DataGridMock, listColModel);
         return resultsData;
     }