diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java index ca5eb95..3c669e0 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java @@ -1,16 +1,14 @@ package com.shxy.xymanager_common.entity; -import com.shxy.xymanager_common.dto.TermChannelCoordinateDto; import lombok.Data; import java.io.Serializable; import java.math.BigInteger; import java.util.Date; -import java.util.List; @Data public class TerminalPhoto implements Serializable { - private Long id; + private BigInteger id; private Integer termId; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java index b4ead4c..efcf305 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; +import java.math.BigInteger; import java.util.Date; import java.util.List; @@ -29,7 +30,7 @@ public class TerminalPhotoListModel implements Serializable { public static class PhotoBean { @ApiModelProperty(value = "图片id", example = "12321") - private Long id; + private BigInteger id; @ApiModelProperty(value = "装置编号", example = "123456") private Integer termId; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoSelectListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoSelectListModel.java index a996207..538630a 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoSelectListModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoSelectListModel.java @@ -31,6 +31,9 @@ public class TerminalPhotoSelectListModel implements Serializable { @Data public static class PhotoBean { + @ApiModelProperty(value = "照片id", example = "123456") + private BigInteger picid; + @ApiModelProperty(value = "装置编号", example = "123456") private Integer termid; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java index f6689cd..70d9d4b 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java @@ -397,6 +397,8 @@ public class TerminalUtils { } } Integer channelId = item.getChannelId(); + BigInteger picid = item.getId(); + photoBean.setPicid(picid); photoBean.setChannelid(channelId); photoBean.setCmdid(terminals.getCmdid()); if (termchannelMap != null) {