换表推送

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

@@ -0,0 +1,51 @@
+package com.bz.smart_city.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+@Data
+public class WaterMeterReplaceData {
+
+    @ApiModelProperty(value = "active")
+    private String active;
+
+    @ApiModelProperty(value="参考sc_device表id")
+    private Long deviceId;
+
+    @ApiModelProperty(value = "客户id")
+    private Integer customerId;
+
+    @ApiModelProperty(value = "客户Code")
+    private String customerCode;
+
+    @ApiModelProperty(value="新表表号(电子号)")
+    private String newWaterNo;
+
+    @ApiModelProperty(value="旧表表号（电子号）")
+    private String oldWaterNo;
+
+    @ApiModelProperty(value="新表起度")
+    private String newBeginWsv;
+
+    @ApiModelProperty(value="旧表止度")
+    private String oldEndWsv;
+
+    @ApiModelProperty(value="新节点编号")
+    private String newDeviceNo;
+
+    @ApiModelProperty(value="旧节点编号")
+    private String oldDeviceNo;
+
+    @ApiModelProperty(value="备注")
+    private String remark;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private Date dateCreate;
+}

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

@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.List;
 
 import com.bz.smart_city.service.WaterMeterMaintenanceLogService;
@@ -66,6 +67,8 @@ public class WaterMeterMaintenanceLogServiceImpl implements WaterMeterMaintenanc
 
     @Value("${com.zcxk.kafka.accept_meter_replace.topic}")
     private String acceptMeterReplaceTopic;
+    @Value("${spring.profiles.active}")
+    private String active;
 
     @Override
     public int insert(WaterMeterMaintenanceLog waterMeterMaintenanceLog) {
@@ -232,8 +235,20 @@ public class WaterMeterMaintenanceLogServiceImpl implements WaterMeterMaintenanc
 
 
             // 3、推送换表信息
-            String json = JacksonUtil.obj2String(waterMeterReplaceLog);
-            log.info("acceptData:" + json);
+            WaterMeterReplaceData waterMeterReplaceData = new WaterMeterReplaceData();
+            waterMeterReplaceData.setActive(active);
+            waterMeterReplaceData.setDeviceId(waterMeterReplaceLog.getDeviceId());
+            waterMeterReplaceData.setCustomerId(device.getCustomerId());
+            waterMeterReplaceData.setCustomerCode("");
+            waterMeterReplaceData.setNewWaterNo(waterMeterReplaceLog.getNewWaterNo());
+            waterMeterReplaceData.setOldWaterNo(waterMeterReplaceLog.getOldWaterNo());
+            waterMeterReplaceData.setNewBeginWsv(waterMeterReplaceLog.getNewBeginWsv());
+            waterMeterReplaceData.setOldEndWsv(waterMeterReplaceLog.getOldEndWsv());
+            waterMeterReplaceData.setNewDeviceNo(waterMeterReplaceLog.getNewDeviceNo());
+            waterMeterReplaceData.setOldDeviceNo(waterMeterReplaceLog.getOldDeviceNo());
+            waterMeterReplaceData.setDateCreate(new Date());
+
+            String json = JacksonUtil.obj2String(waterMeterReplaceData);
             kafkaTemplate.send(acceptMeterReplaceTopic,json);
         } else {
             throw new ServiceException(-900, "该工单已经处理");

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

@@ -30,6 +30,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Date;
 import java.util.List;
 import com.bz.smart_city.entity.WaterMeterReplaceLog;
 import com.bz.smart_city.dao.WaterMeterReplaceLogMapper;
@@ -63,6 +64,8 @@ public class WaterMeterReplaceLogServiceImpl implements WaterMeterReplaceLogServ
 
     @Value("${com.zcxk.kafka.accept_meter_replace.topic}")
     private String acceptMeterReplaceTopic;
+    @Value("${spring.profiles.active}")
+    private String active;
 
 
     @Override
@@ -251,8 +254,21 @@ public class WaterMeterReplaceLogServiceImpl implements WaterMeterReplaceLogServ
         deviceMapper.updateByPrimaryKeySelective(newDevice);
 
         // 3、推送换表信息
-        String json = JacksonUtil.obj2String(waterMeterReplaceLog);
-        log.info("acceptData:" + json);
+        WaterMeterReplaceData waterMeterReplaceData = new WaterMeterReplaceData();
+        waterMeterReplaceData.setActive(active);
+        waterMeterReplaceData.setDeviceId(waterMeterReplaceLog.getDeviceId());
+        waterMeterReplaceData.setCustomerId(device.getCustomerId());
+        waterMeterReplaceData.setCustomerCode("");
+        waterMeterReplaceData.setNewWaterNo(waterMeterReplaceLog.getNewWaterNo());
+        waterMeterReplaceData.setOldWaterNo(waterMeterReplaceLog.getOldWaterNo());
+        waterMeterReplaceData.setNewBeginWsv(waterMeterReplaceLog.getNewBeginWsv());
+        waterMeterReplaceData.setOldEndWsv(waterMeterReplaceLog.getOldEndWsv());
+        waterMeterReplaceData.setNewDeviceNo(waterMeterReplaceLog.getNewDeviceNo());
+        waterMeterReplaceData.setOldDeviceNo(waterMeterReplaceLog.getOldDeviceNo());
+        waterMeterReplaceData.setDateCreate(new Date());
+
+        String json = JacksonUtil.obj2String(waterMeterReplaceData);
+        log.info("waterMeterReplaceData:" + json);
         kafkaTemplate.send(acceptMeterReplaceTopic,json);
 
         log.info("end submitWaterMeterReplace");