1.解决mysql语句关键字问题

2.mysql台账同步oracle

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/NodeClient.java

@@ -4,10 +4,12 @@ import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.pq.api.fallback.PqsTerminalLogsClientFallbackFactory;
 import com.njcn.device.pq.pojo.po.Node;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
+import javax.validation.constraints.NotNull;
 import java.util.List;
 
 /**
@@ -19,8 +21,18 @@ import java.util.List;
 public interface NodeClient {
 
 
-    @ApiOperation("获取全部前置机")
+    /**
+     * 获取全部前置机
+     * @return
+     */
     @GetMapping("/nodeAllList")
     HttpResult<List<Node>> nodeAllList();
 
+    /**
+     * 根据id获取前置机
+     * @param id
+     * @return
+     */
+    @GetMapping("/getNodeById")
+    HttpResult<Node> getNodeById(@Validated @NotNull(message = "id不可为空") @RequestParam("id")String id);
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/NodeClientFallbackFactory.java

@@ -39,6 +39,12 @@ public class NodeClientFallbackFactory implements FallbackFactory<NodeClient> {
                 log.error("{}异常，降级处理，异常为：{}", "获取全部前置机", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<Node> getNodeById(String id) {
+                log.error("{}异常，降级处理，异常为：{}", "根据id获取前置机", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
 
 

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/dto/PollutionSubstationDTO.java

@@ -3,6 +3,8 @@ package com.njcn.device.pq.pojo.dto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 类的介绍：
  *
@@ -24,6 +26,12 @@ public class PollutionSubstationDTO {
     @ApiModelProperty("电压等级")
     private String voltageLevel;
 
+    @ApiModelProperty(name ="lng",value = "变电站经度")
+    private BigDecimal lng;
+
+    @ApiModelProperty(name ="lat",value = "变电站纬度")
+    private BigDecimal lat;
+
     @ApiModelProperty("数据")
     private Double data = 3.14159;
 

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/SyncTerminalParam.java

@@ -56,4 +56,9 @@ public class SyncTerminalParam {
     @ApiModelProperty(name = "lineParam",value = "监测点信息")
     private LineParam lineParam;
 
+    @ApiModelProperty(name = "oracleLineId",value = "oracle监测点id")
+    private Integer  oracleLineId;
+
+    @ApiModelProperty(name = "oracleDevId",value = "oracle终端id")
+    private Integer oracleDevId;
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/LineDataIntegrity.java

@@ -41,4 +41,11 @@ public class LineDataIntegrity implements Serializable {
      */
     private Double integrityData;
 
+
+    private Double mysqlReal;
+
+    public void setMysqlReal(Double mysqlReal) {
+        this.real = mysqlReal;
+        this.mysqlReal = mysqlReal;
+    }
 }