Merge remote-tracking branch 'origin/20210716' into 20210716

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/install/InstallDetailDto.java

@@ -65,6 +65,9 @@ public class InstallDetailDto {
     @ApiModelProperty(value="是否启用单元 0：否 1：是", position = 2)
     private Integer enableUnit;
 
+    @ApiModelProperty(value="维度")
+    private String createBy;
+
     @ApiModelProperty(value="安装数据", position = 101)
     List<InstallPlanDataDto> installPlanDataList;
 

zoniot-rmcp/zoniot-rmcp-api/src/main/java/com/zcxk/rmcp/api/dto/install/MeterSyncDto.java

@@ -43,6 +43,10 @@ public class MeterSyncDto {
     @ApiModelProperty(value = "更新时间")
     private LocalDateTime dateUpdate;
 
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "安装时间")
+    private LocalDateTime installDate;
+
     @ApiModelProperty("水表起度")
     private String initialData;
 

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/DeviceMapper.xml

@@ -821,6 +821,7 @@
     rd.status,
     rd.create_date date_create,
     rd.update_date date_update,
+    rd.install_date,
     ril.new_begin_degree as initial_data,
     CONCAT_WS('/',sdm.name,sdt.product_name,sdt.product_model) as device_type
     from rmcp_device rd

zoniot-rmcp/zoniot-rmcp-core/src/main/java/com/zcxk/rmcp/core/mapper/InstallPlanMapper.xml

@@ -379,7 +379,8 @@
       rip.enable_unit,
       rc.address,
       rc.lat,
-      rc.lng
+      rc.lng,
+      rip.create_by
     from rmcp_install_plan rip
       left join rmcp_product rp on (rp.id = rip.product_id)
       left join rmcp_manufacturer rm on (rm.id = rp.manufacturer_id)