阀门信息推送BUG和设备列表测量点号

smart-city-platform/src/main/java/com/bz/smart_city/excel/download/column/DeviceColumnTranslator.java

@@ -154,6 +154,9 @@ public class DeviceColumnTranslator {
         if (StringUtils.equals("channelNumberName",columnName)) {
             return device.getChannelNumberName();
         }
+        if (StringUtils.equals("portName",columnName)) {
+            return device.getPort();
+        }
         return null;
     }
 }

smart-city-platform/src/main/java/com/bz/smart_city/kafka/consumer/ValveStatusReceiver.java

@@ -50,20 +50,22 @@ public class ValveStatusReceiver {
 
                 operatingValveRecordMapper.updateStatus(operatingValveRecordMessage);
             }
-            if(operatingValveRecordMessage==null){
-                operatingValveRecordMessage=new OperatingValveRecord();
-                operatingValveRecordMessage.setWaterNo(valveControlDataDto.getMeterNo());
-                operatingValveRecordMessage.setCustomerId(valveControlDataDto.getCustomerId());
-            }
-            Device device=operatingValveRecordMapper.getDevice(operatingValveRecordMessage);
-            if(device!=null){
-                log.info("同步水表阀门状态 电子号={}",device.getMetercode());
-                Map<String,Object>valveMessage=new HashMap<>();
-                valveMessage.put("meterNo",device.getMetercode());
-                valveMessage.put("meterStatus",Integer.parseInt(valveControlDataDto.getValve()));
-                kafkaTemplate.send(billingValveStatusReceiving, JSONUtils.obj2json(valveMessage));
-            }
 
         }
+
+        if(operatingValveRecordMessage==null){
+            operatingValveRecordMessage=new OperatingValveRecord();
+            operatingValveRecordMessage.setWaterNo(valveControlDataDto.getMeterNo());
+            operatingValveRecordMessage.setCustomerId(valveControlDataDto.getCustomerId());
+        }
+        Device device=operatingValveRecordMapper.getDevice(operatingValveRecordMessage);
+        if(device!=null){
+            log.info("同步水表阀门状态 电子号={}",device.getMetercode());
+            Map<String,Object>valveMessage=new HashMap<>();
+            valveMessage.put("meterNo",device.getMetercode());
+            valveMessage.put("meterStatus",Integer.parseInt(valveControlDataDto.getValve()));
+            kafkaTemplate.send(billingValveStatusReceiving, JSONUtils.obj2json(valveMessage));
+        }
+
     }
 }

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

@@ -320,7 +320,7 @@ public class DeviceDataPushServiceImpl implements DeviceDataPushService , Initia
 		jsonMap.put("dataList",dataMapList);
 		
 		String jsonString = JSON.toJSONString(jsonMap);
-		log.info("Push Content = {}",jsonString);
+		//log.info("Push Content = {}",jsonString);
 		return jsonString;
 	}
 	

smart-city-platform/src/main/resources/json/deviceAllColumn.json

@@ -24,5 +24,6 @@
   {"lastReceiveTime":"最后上报时间"},
   {"oldMeterEnd":"旧表止度"},
   {"userName":"用户名称"},
-  {"channelNumberName":"通道号"}
+  {"channelNumberName":"通道号"},
+  {"portName":"测量点号"}
 ]