opc完善

platform-dao/src/main/java/com/platform/dao/dto/remote/RemoteOpcDTO.java

@@ -65,27 +65,27 @@ public class RemoteOpcDTO extends BaseDTO implements Serializable {
     /**
      * x轴位置
      */
-    private Integer xPosition;
+    private BigDecimal xPosition;
     /**
      * y轴位置
      */
-    private Integer yPosition;
+    private BigDecimal yPosition;
     /**
      * x轴位置图片
      */
-    private Integer imgXPosition;
+    private BigDecimal imgXPosition;
     /**
      * x轴位置图片
      */
-    private Integer imgYPosition;
+    private BigDecimal imgYPosition;
     /**
      * 位置宽度
      */
-    private Integer width;
+    private BigDecimal width;
     /**
      * 位置高度
      */
-    private Integer height;
+    private BigDecimal height;
     /**
      * 是否模拟量：0否1是
      */

platform-dao/src/main/java/com/platform/dao/entity/remote/RemoteOpc.java

@@ -64,27 +64,27 @@ public class RemoteOpc implements Serializable {
     /**
      * x轴位置
      */
-    private Integer xPosition;
+    private BigDecimal xPosition;
     /**
      * y轴位置
      */
-    private Integer yPosition;
+    private BigDecimal yPosition;
     /**
      * x轴位置图片
      */
-    private Integer imgXPosition;
+    private BigDecimal imgXPosition;
     /**
      * x轴位置图片
      */
-    private Integer imgYPosition;
+    private BigDecimal imgYPosition;
     /**
      * 位置宽度
      */
-    private Integer width;
+    private BigDecimal width;
     /**
      * 位置高度
      */
-    private Integer height;
+    private BigDecimal height;
     /**
      * 量程：最低
      */

platform-dao/src/main/java/com/platform/dao/vo/export/remote/ExportRemoteOpcVO.java

@@ -53,7 +53,6 @@ public class ExportRemoteOpcVO implements Serializable {
      */
     @Excel(name = "类型", dicCode="REMOTE_OPC")
     private Integer type;
-
     /**
      * 描述
      */
@@ -107,22 +106,57 @@ public class ExportRemoteOpcVO implements Serializable {
      * x轴位置
      */
     @Excel(name = "x轴位置")
-    private Integer xPosition;
+    private BigDecimal xPosition;
     /**
      * y轴位置
      */
     @Excel(name = "y轴位置")
-    private Integer yPosition;
+    private BigDecimal yPosition;
     /**
      * 位置宽度
      */
     @Excel(name = "位置宽度")
-    private Integer width;
+    private BigDecimal width;
+    /**
+     * 低低阈值
+     */
+    @Excel(name = "低低阈值")
+    private BigDecimal warnFirst;
+    /**
+     * 低低阈值颜色
+     */
+    @Excel(name = "低低阈值颜色")
+    private BigDecimal warnFirstColor;
+    /**
+     * 低阈值
+     */
+    @Excel(name = "低阈值")
+    private BigDecimal warnSecond;
+    /**
+     * 低阈值颜色
+     */
+    @Excel(name = "低阈值颜色")
+    private BigDecimal warnSecondColor;
+    /**
+     * 高阈值
+     */
+    @Excel(name = "高阈值")
+    private BigDecimal warnThird;
+    /**
+     * 高阈值颜色
+     */
+    @Excel(name = "高阈值颜色")
+    private BigDecimal warnThirdColor;
+    /**
+     * 高高阈值
+     */
+    @Excel(name = "高高阈值")
+    private BigDecimal warnFour;
     /**
-     * 位置高度
+     * 高高阈值颜色
      */
-    @Excel(name = "位置高度")
-    private Integer height;
+    @Excel(name = "高高阈值颜色")
+    private BigDecimal warnFourColor;
     /**
      * 备注
      */

platform-dao/src/main/java/com/platform/dao/vo/query/remote/RemoteOpcVO.java

@@ -62,27 +62,27 @@ public class RemoteOpcVO extends BaseVO implements Serializable {
     /**
      * x轴位置
      */
-    private Integer xPosition;
+    private BigDecimal xPosition;
     /**
      * y轴位置
      */
-    private Integer yPosition;
+    private BigDecimal yPosition;
     /**
      * x轴位置图片
      */
-    private Integer imgXPosition;
+    private BigDecimal imgXPosition;
     /**
      * x轴位置图片
      */
-    private Integer imgYPosition;
+    private BigDecimal imgYPosition;
     /**
      * 位置宽度
      */
-    private Integer width;
+    private BigDecimal width;
     /**
      * 位置高度
      */
-    private Integer height;
+    private BigDecimal height;
     /**
      * 量程：最低
      */