同步数据

zoniot-pay/zoniot-pay-core/pom.xml

@@ -12,10 +12,6 @@
     <artifactId>zoniot-pay-core</artifactId>
 
 <dependencies>
-    <dependency>
-        <groupId>com.zcxk</groupId>
-        <artifactId>zoniot-pay-api</artifactId>
-    </dependency>
     <dependency>
         <groupId>com.zcxk</groupId>
         <artifactId>zoniot-core-mysql</artifactId>

zoniot-pay/zoniot-pay-web/pom.xml

@@ -36,10 +36,6 @@
         <artifactId>spring-boot-starter-aop</artifactId>
     </dependency>
     <!--zoniot公共包-->
-    <dependency>
-        <groupId>com.zcxk</groupId>
-        <artifactId>zoniot-pay-api</artifactId>
-    </dependency>
     <dependency>
         <groupId>com.zcxk</groupId>
         <artifactId>zoniot-pay-core</artifactId>

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

@@ -10,15 +10,22 @@ import java.time.LocalDateTime;
 @Data
 @ApiModel
 public class MeterSyncDto {
+
+    @ApiModelProperty("设备ID")
+    private String deviceId;
+
     @ApiModelProperty("设备编号")
     private String deviceNo;
 
+    @ApiModelProperty("租户")
+    private String tenantId;
+
+    @ApiModelProperty("产品")
+    private String productId;
+
     @ApiModelProperty("地址")
     private String locDesc;
 
-    @ApiModelProperty("客户id")
-    private Integer customerId;
-
     @ApiModelProperty("水表电子号")
     private String waterMeterNo;
 

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

@@ -810,15 +810,17 @@
 
   <select id="meterSync" resultType="com.zcxk.rmcp.api.dto.install.MeterSyncDto">
     select
+    rd.id as device_id,
     rd.device_no,
     rd.address as loc_desc,
     rd.tenant_id,
+    rd.product_id,
     rd.meter_no as water_meter_no,
     rd.file_no as file_no,
     ril.meter_code as meter_code,
     rd.status,
-    rd.create_date,
-    rd.update_date,
+    rd.create_date date_create,
+    rd.update_date date_update,
     ril.new_begin_degree as initial_data,
     CONCAT_WS('/',sdm.name,sdt.product_name,sdt.product_model) as device_type
     from rmcp_device rd