From e6704a0ef8fd7c44fb9d6e6bdf0031522e724143 Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Wed, 24 May 2023 09:31:35 +0800 Subject: [PATCH] =?UTF-8?q?#20230510=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/TerminalListModel.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java index d25a576..583bd9a 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalListModel.java @@ -82,6 +82,10 @@ public class TerminalListModel implements Serializable { @ApiModelProperty(value = "经度", example = "213") private Double longitude; + + @ApiModelProperty(value = "绘制ID", example = "213") + private Integer markId; + @ApiModelProperty(value = "参考图片宽", example = "213") private Integer width; @@ -89,7 +93,7 @@ public class TerminalListModel implements Serializable { private Integer height; @ApiModelProperty(value = "线条颜色", example = "213") - private Integer color; + private String color; @ApiModelProperty(value = "线条宽度", example = "213") private Short boderWidth; @@ -106,6 +110,8 @@ public class TerminalListModel implements Serializable { public static class ChannelBeans { @ApiModelProperty(value = "通道编号", example = "213") private Integer id; + @ApiModelProperty(value = "照片编号", example = "213") + private Integer photoId; @ApiModelProperty(value = "通道名称", example = "213") private String name; @ApiModelProperty(value = "图片地址", example = "213") @@ -115,12 +121,12 @@ public class TerminalListModel implements Serializable { @Data public static class CoordinateBeans { @ApiModelProperty(value = "线段起始坐标x", example = "213") - private Integer x1; + private float x1; @ApiModelProperty(value = "线段结束坐标x", example = "213") - private Integer x2; + private float x2; @ApiModelProperty(value = "线段起始坐标y", example = "213") - private Integer y1; + private float y1; @ApiModelProperty(value = "线段结束坐标y", example = "213") - private Integer y2; + private float y2; } }