fix

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceErrorHandleServiceImpl.java

@@ -118,7 +118,7 @@ public class DeviceErrorHandleServiceImpl implements DeviceErrorHandleService {
         WMeterType wMeterType = wMeterTypeMapper.getChannelIdAndLevel(sysId, 2);
         if (wMeterType != null) {
             String title = "已处理记录";
-            String[] rowsName = new String[]{"序号", "告警类型", "水表档案号", "水表电子号", "水表厂商", "所属客户", "所属小区", "所属建筑", "安装地址", "告警时间", "处理人", "处理时间", "处理结果"};
+            String[] rowsName = new String[]{"序号", "告警类型", "设备编号", "水表档案号", "水表电子号", "水表厂商", "客户", "小区", "建筑", "安装地址", "告警时间", "处理人", "处理时间", "处理结果"};
             List<Object[]> dataList = newArrayList();
             Object[] objs = null;
             DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -127,17 +127,18 @@ public class DeviceErrorHandleServiceImpl implements DeviceErrorHandleService {
                 objs = new Object[rowsName.length];
                 objs[0] = i;
                 objs[1] = deviceErrorHandleDto.getAlarmTypeName();
-                objs[2] = deviceErrorHandleDto.getWaterMeterFileNo();
-                objs[3] = deviceErrorHandleDto.getWaterMeterNo();
-                objs[4] = deviceErrorHandleDto.getManufacturerName();
-                objs[5] = deviceErrorHandleDto.getCustomerName();
-                objs[6] = deviceErrorHandleDto.getCommunityName();
-                objs[7] = deviceErrorHandleDto.getBuildingName();
-                objs[8] = deviceErrorHandleDto.getLocation();
-                objs[9] = deviceErrorHandleDto.getDateCreate()!=null?deviceErrorHandleDto.getDateCreate().format(df):"";
-                objs[10] = deviceErrorHandleDto.getHandleUsername();
-                objs[11] = deviceErrorHandleDto.getHandleTime()!=null?deviceErrorHandleDto.getHandleTime().format(df):"";
-                objs[12] = deviceErrorHandleDto.getHandleResultName();
+                objs[2] = deviceErrorHandleDto.getDeviceNo();
+                objs[3] = deviceErrorHandleDto.getWaterMeterFileNo();
+                objs[4] = deviceErrorHandleDto.getWaterMeterNo();
+                objs[5] = deviceErrorHandleDto.getManufacturerName();
+                objs[6] = deviceErrorHandleDto.getCustomerName();
+                objs[7] = deviceErrorHandleDto.getCommunityName();
+                objs[8] = deviceErrorHandleDto.getBuildingName();
+                objs[9] = deviceErrorHandleDto.getLocation();
+                objs[10] = deviceErrorHandleDto.getDateCreate()!=null?deviceErrorHandleDto.getDateCreate().format(df):"";
+                objs[11] = deviceErrorHandleDto.getHandleUsername();
+                objs[12] = deviceErrorHandleDto.getHandleTime()!=null?deviceErrorHandleDto.getHandleTime().format(df):"";
+                objs[13] = deviceErrorHandleDto.getHandleResultName();
                 dataList.add(objs);
             }
             ExcelUtil excelUtil = new ExcelUtil(title, rowsName, dataList);

smart-city-platform/src/main/java/com/bz/smart_city/service/impl/DeviceErrorServiceImpl.java

@@ -148,7 +148,7 @@ public class DeviceErrorServiceImpl implements DeviceErrorService {
         WMeterType wMeterType = wMeterTypeMapper.getChannelIdAndLevel(sysId, 2);
         if (wMeterType != null) {
             String title = "待处理记录";
-            String[] rowsName = new String[]{"序号", "告警类型", "水表档案号", "水表电子号", "水表厂商", "客户", "小区", "建筑", "安装地址", "告警时间"};
+            String[] rowsName = new String[]{"序号", "告警类型", "设备编号", "水表档案号", "水表电子号", "水表厂商", "客户", "小区", "建筑", "安装地址", "告警时间"};
             List<Object[]> dataList = newArrayList();
             Object[] objs = null;
             DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
@@ -157,14 +157,15 @@ public class DeviceErrorServiceImpl implements DeviceErrorService {
                 objs = new Object[rowsName.length];
                 objs[0] = i;
                 objs[1] = deviceErrorDto.getAlarmTypeName();
-                objs[2] = deviceErrorDto.getWaterMeterFileNo();
-                objs[3] = deviceErrorDto.getWaterMeterNo();
-                objs[4] = deviceErrorDto.getManufacturerName();
-                objs[5] = deviceErrorDto.getCustomerName();
-                objs[6] = deviceErrorDto.getCommunityName();
-                objs[7] = deviceErrorDto.getBuildingName();
-                objs[8] = deviceErrorDto.getLocation();
-                objs[9] = deviceErrorDto.getAlarmTime()!= null?deviceErrorDto.getAlarmTime().format(df):"";
+                objs[2] = deviceErrorDto.getDeviceNo();
+                objs[3] = deviceErrorDto.getWaterMeterFileNo();
+                objs[4] = deviceErrorDto.getWaterMeterNo();
+                objs[5] = deviceErrorDto.getManufacturerName();
+                objs[6] = deviceErrorDto.getCustomerName();
+                objs[7] = deviceErrorDto.getCommunityName();
+                objs[8] = deviceErrorDto.getBuildingName();
+                objs[9] = deviceErrorDto.getLocation();
+                objs[10] = deviceErrorDto.getAlarmTime()!= null?deviceErrorDto.getAlarmTime().format(df):"";
                 dataList.add(objs);
             }
             ExcelUtil excelUtil = new ExcelUtil(title, rowsName, dataList);