fix

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");
@@ -161,9 +161,10 @@ public class DeviceErrorServiceImpl implements DeviceErrorService {
                 objs[3] = deviceErrorDto.getWaterMeterNo();
                 objs[4] = deviceErrorDto.getManufacturerName();
                 objs[5] = deviceErrorDto.getCustomerName();
-                objs[6] = deviceErrorDto.getBuildingName();
-                objs[7] = deviceErrorDto.getLocation();
-                objs[8] = deviceErrorDto.getAlarmTime()!= null?deviceErrorDto.getAlarmTime().format(df):"";
+                objs[6] = deviceErrorDto.getCommunityName();
+                objs[7] = deviceErrorDto.getBuildingName();
+                objs[8] = deviceErrorDto.getLocation();
+                objs[9] = deviceErrorDto.getAlarmTime()!= null?deviceErrorDto.getAlarmTime().format(df):"";
                 dataList.add(objs);
             }
             ExcelUtil excelUtil = new ExcelUtil(title, rowsName, dataList);

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

@@ -178,7 +178,7 @@ public  class DeviceServiceImpl implements DeviceService {
         WMeterType wMeterType = wMeterTypeMapper.getChannelIdAndLevel(sysId, 2);
         if (wMeterType != null || sysId == -99) {
             DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            String[] rowsName = new String[]{"序号", "设备状态", "设备编号", "水表档案编号", "水表电子号", "集中器编码", "采集器编码", "水表厂商", "所属客户", "所属小区", "所属建筑", "安装地址", "故障类型", "连续故障天数", "水表当前读数", "最后一次更新时间","阀门状态","出厂时间","安装时间","验收时间"};
+            String[] rowsName = new String[]{"序号", "设备状态", "设备编号", "水表档案编号", "水表电子号", "集中器编码", "采集器编码", "水表厂商", "所属客户", "所属小区", "所属建筑", "安装地址", "故障类型", "连续故障天数", "水表当前读数", "最后一次更新时间","阀门控制","出厂时间","安装时间","验收时间"};
             List<Object[]> dataList = newArrayList();
             Object[] objs = null;
             for (int i = 0; i < list.size(); i++) {
@@ -200,7 +200,7 @@ public  class DeviceServiceImpl implements DeviceService {
                 objs[13] = deviceDto.getDays();
                 objs[14] = deviceDto.getMeterReading();
                 objs[15] = deviceDto.getLastReceiveTime()!=null?deviceDto.getLastReceiveTime().format(df):null;
-                objs[16] = this.getValveStatusName(deviceDto.getValveStatus());
+                objs[16] = this.getValveStatusName(deviceDto.getIsValve(),deviceDto.getValveStatus());
                 objs[17] = deviceDto.getPlanTime()!=null?deviceDto.getPlanTime().format(df):null;
                 objs[18] = deviceDto.getInstallTime()!=null?deviceDto.getInstallTime().format(df):null;
                 objs[19] = deviceDto.getAcceptTime()!=null?deviceDto.getAcceptTime().format(df):null;
@@ -239,15 +239,22 @@ public  class DeviceServiceImpl implements DeviceService {
         }
     }
 
-    protected String getValveStatusName(Integer valveStatus){
+    protected String getValveStatusName(Integer isValve, Integer valveStatus){
         String valveStatusName = "关阀";
-        if(valveStatus !=null){
-            if(valveStatus == 1){
-                valveStatusName = "开阀";
+        if (isValve != null) {
+            if(isValve == 1){
+                if(valveStatus !=null){
+                    if(valveStatus == 1){
+                        valveStatusName = "开阀";
+                    }
+                }else {
+                    valveStatusName = "开阀";
+                }
+            }else {
+                valveStatusName = "无阀";
             }
-        }else {
-            valveStatusName = "开阀";
         }
+
         return valveStatusName;
     }
 

smart-city-platform/src/main/resources/mapper/InstallAbnormalDeviceMapper.xml

@@ -144,7 +144,7 @@
       left join sc_customer sc on (sc.id = sd.customer_id)
       left join sc_community scom on (scom.id = sb.community)
       left join sc_install_list sii on (sii.device_id = sd.id)
-      where siad.status = 1
+      where siad.status = 1 and sd.status = 1
       and siad.abnormal_record_id = #{abnormalRecordId}
     </select>
   <select id="findById" resultMap="BaseResultMap">