换表推送

smart-city-platform/src/main/java/com/bz/smart_city/dto/AcceptListData.java

@@ -18,14 +18,20 @@ public class AcceptListData {
     @ApiModelProperty(value = "电子号",position = 2)
     private String waterMeterNo;
 
-    @ApiModelProperty(value = "安装地址",position = 3)
+    @ApiModelProperty(value = "小区名称",position = 3)
+    private String communityName;
+
+    @ApiModelProperty(value = "建筑名称",position = 4)
+    private String buildingName;
+
+    @ApiModelProperty(value = "安装地址",position = 5)
     private String location;
 
-    @ApiModelProperty(value = "本期读数",position = 4)
+    @ApiModelProperty(value = "本期读数",position = 6)
     private BigDecimal readData;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
-    @ApiModelProperty(value = "安装时间",position = 5)
+    @ApiModelProperty(value = "安装时间",position = 7)
     private Date installTime;
 }

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

@@ -173,7 +173,9 @@ public class AcceptManagerServiceImpl implements AcceptManagerService,Initializi
 			AcceptListData acceptListData = new AcceptListData();
 			acceptListData.setDeviceNo(install.getDeviceNo());
 			acceptListData.setWaterMeterNo(install.getElectronicNo());
-			acceptListData.setLocation(install.getBuildingName()+install.getDoorNo());
+			acceptListData.setCommunityName(install.getCommunityName());
+			acceptListData.setBuildingName(install.getBuildingName());
+			acceptListData.setLocation(install.getDoorNo());
 			if (install.getMeterReading() != null) {
 				acceptListData.setReadData(new BigDecimal(install.getMeterReading()));
 			}else {

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

@@ -451,7 +451,7 @@
 			n.remark as remark,
 			n.floor as floor,
 			com.id as community_id,
-			com.name as community_namae,
+			com.name as community_name,
             swmed.meter_reading,
             n.metercode as metercode,
             n.account_id as account_id,