物联设备电表SN验证及推送

nursing-unit-common/src/main/java/com/nu/dto/IotElectricityMeterMQDto.java

@@ -22,6 +22,7 @@ public class IotElectricityMeterMQDto{
 	private String readTime;
 	/**描述*/
 	private String remark;
+	private String sim;
 	/**区域编码*/
 	private String nuId;
 	/**区域名称*/

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/entity/ElectricityMeter.java

@@ -67,6 +67,7 @@ public class ElectricityMeter implements Serializable {
 	@Excel(name = "描述", width = 15)
 	@ApiModelProperty(value = "描述")
 	private String remark;
+	private String sim;
 
 	@Dict(dicCode = "nu_id", dicText = "nu_name", dictTable = "nu_base_info")
 	private String nuId;//护理单元ID

nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml

@@ -19,7 +19,8 @@
 			a.depart_server_url as departServerUrl,
 			a.old_server_url ,
 			a.sync_type,
-			a.maintain_status
+			a.maintain_status,
+		    a.sim
 		from nu_iot_ds_electricity_meter a
 		left join nu_base_info c on a.nu_id = c.nu_id
 		<where>
@@ -58,7 +59,8 @@
 			a.depart_server_url as departServerUrl,
 			a.old_server_url ,
 			a.sync_type,
-			a.maintain_status
+			a.maintain_status,
+		    a.sim
 		from nu_iot_ds_electricity_meter a
 	</select>
 
@@ -72,6 +74,7 @@
 			read_time as readTime,
 			( case when timestampdiff(minute, str_to_date(read_time, '%y-%m-%d %h:%i:%s'), now()) > 120 then 'false' else 'true' end ) as online,
 			remark,
+		    sim,
 			nu_id as nuId,
 			nu_name as nuName,
 			depart_id as departId,