设备自定义字段

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

@@ -24,6 +24,8 @@
   {"lastReceiveTime":"最后上报时间"},
   {"oldMeterEnd":"旧表止度"},
   {"userName":"用户名称"},
+  {"userPhone":"手机号码"},
+  {"idCard":"身份证号"},
   {"channelNumberName":"通道号"},
   {"portName":"测量点号"}
 ]

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

@@ -1,13 +1,13 @@
 {
   "general": ["deviceNo", "deviceModel", "customerName", "deviceStatus", "buildingName", "locDesc", "dateCreate", "lastReceiveTime"],
-  "loraMeter": ["deviceNo", "waterMeterFileNo", "waterMeterNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading","communityName", "buildingName", "locDesc", "syncStatus", "valveStatus","lastReceiveTime","userName"],
-  "photoelectricMeter": ["waterMeterNo","waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "concentratorName", "channelNumberName","collectorName", "issueStatus", "meterReading","communityName", "buildingName", "installTime","locDesc","valveStatus","lastReceiveTime","userName"],
-  "nbiotMeter": ["deviceNo", "waterMeterNo","waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading","communityName", "buildingName", "locDesc", "registerStatus", "valveStatus","lastReceiveTime","userName"],
+  "loraMeter": ["deviceNo", "waterMeterFileNo", "waterMeterNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading","communityName", "buildingName", "locDesc", "syncStatus", "valveStatus","lastReceiveTime","userName","userPhone"],
+  "photoelectricMeter": ["waterMeterNo","waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "concentratorName", "channelNumberName","collectorName", "issueStatus", "meterReading","communityName", "buildingName", "installTime","locDesc","valveStatus","lastReceiveTime","userName","userPhone"],
+  "nbiotMeter": ["deviceNo", "waterMeterNo","waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading","communityName", "buildingName", "locDesc", "registerStatus", "valveStatus","lastReceiveTime","userName","userPhone"],
   "waterQualityMeter": ["deviceNo", "deviceModel", "customerName", "deviceStatus", "buildingName", "locDesc", "lastReceiveTime"],
   "flowmeter": ["deviceNo", "deviceModel", "customerName", "deviceStatus", "buildingName", "locDesc", "lastReceiveTime"],
-  "installLoraMeter": ["deviceNo", "waterMeterNo", "waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading", "oldMeterEnd", "communityName", "buildingName", "locDesc", "installTime", "lastReceiveTime", "userName"],
-  "installNbiotMeter": ["deviceNo", "waterMeterNo", "waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading", "oldMeterEnd", "registerStatus", "communityName", "buildingName", "locDesc", "installTime", "lastReceiveTime", "userName"],
-  "installRemoteMeter": ["waterMeterNo", "waterMeterFileNo", "deviceModel", "customerName", "deviceStatus","concentratorName","channelNumberName","collectorName","issueStatus", "meterReading", "oldMeterEnd", "communityName", "buildingName","locDesc", "installTime","lastReceiveTime", "userName"],
+  "installLoraMeter": ["deviceNo", "waterMeterNo", "waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading", "oldMeterEnd", "communityName", "buildingName", "locDesc", "installTime", "lastReceiveTime", "userName","userPhone"],
+  "installNbiotMeter": ["deviceNo", "waterMeterNo", "waterMeterFileNo", "deviceModel", "customerName", "deviceStatus", "lastErrorType", "meterReading", "oldMeterEnd", "registerStatus", "communityName", "buildingName", "locDesc", "installTime", "lastReceiveTime", "userName","userPhone"],
+  "installRemoteMeter": ["waterMeterNo", "waterMeterFileNo", "deviceModel", "customerName", "deviceStatus","concentratorName","channelNumberName","collectorName","issueStatus", "meterReading", "oldMeterEnd", "communityName", "buildingName","locDesc", "installTime","lastReceiveTime", "userName","userPhone"],
   "rmcp_loraMeter": ["deviceNo", "waterMeterNo", "waterMeterFileNo", "deviceModel", "buildingName", "locDesc", "deviceStatus", "meterReading", "lastReceiveTime", "valveStatus"],
   "rmcp_photoelectricMeter": ["waterMeterNo", "waterMeterFileNo", "deviceModel", "buildingName", "locDesc", "deviceStatus", "meterReading", "lastReceiveTime", "valveStatus"],
   "rmcp_nbiotMeter": ["deviceNo", "waterMeterNo", "waterMeterFileNo", "deviceModel", "buildingName", "locDesc", "deviceStatus", "meterReading", "lastReceiveTime", "valveStatus"]