From 3f7938a8c60f350a1cc40c9f5e094b0756deeb63 Mon Sep 17 00:00:00 2001 From: huangfeng Date: Tue, 21 Jan 2025 16:23:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=AD=A3orginalId=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BAint?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shxy/xymanager_common/entity/TerminalPhoto.java | 2 +- .../model/TerminalPhotoListForOpenModel.java | 2 +- .../model/TerminalPhotoSelectListModel.java | 2 +- .../shxy/xymanager_common/model/TerminalPhotosModel.java | 2 +- .../shxy/xymanager_common/util/xinyin/TerminalUtils.java | 6 +++--- .../xymanager_service/impl/TerminalPhotoServiceImpl.java | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) 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 2d9b356..910372c 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 @@ -16,7 +16,7 @@ public class TerminalPhoto implements Serializable { private Integer presetId; - private BigInteger orginalId; + private Integer orginalId; private Integer mediaType; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListForOpenModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListForOpenModel.java index 70f192c..35a0c4c 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListForOpenModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListForOpenModel.java @@ -41,7 +41,7 @@ public class TerminalPhotoListForOpenModel implements Serializable { private Integer presetId; @ApiModelProperty(value = "图片编号", example = "123456") - private BigInteger orginalId; + private Integer orginalId; //0--图片 1--视频 @ApiModelProperty(value = "图片类型") 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 1cd3f50..caa110c 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 @@ -62,7 +62,7 @@ public class TerminalPhotoSelectListModel implements Serializable { private Integer presetId; @ApiModelProperty(value = "图片编号", example = "123456") - private BigInteger orginalid; + private Integer orginalid; @ApiModelProperty(value = "图片类型", example = "123456") private Integer mediaType; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotosModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotosModel.java index d4b8acb..b013c0f 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotosModel.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotosModel.java @@ -63,7 +63,7 @@ public class TerminalPhotosModel implements Serializable { private Integer presetId; @ApiModelProperty(value = "图片编号", example = "123456") - private BigInteger orginalid; + private Integer orginalid; @ApiModelProperty(value = "图片类型", example = "123456") private Integer mediatype; 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 fd1f1f5..cbaeb83 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 @@ -202,7 +202,7 @@ public class TerminalUtils { ArrayList photoalarmlist = new ArrayList<>(); if (imgarlarmsList != null && imgarlarmsList.size() > 0) { Integer termId1 = terminalPhoto.getTermId(); - BigInteger orginalid = terminalPhoto.getOrginalId(); + Integer orginalid = terminalPhoto.getOrginalId(); for (TerminalImgAlarmsDto dto : imgarlarmsList) { BigInteger photoOrgId = dto.getPhotoOrgId(); Integer termId = dto.getTermId(); @@ -334,7 +334,7 @@ public class TerminalUtils { ArrayList photoalarmlist = new ArrayList<>(); if (imgarlarmsList != null && imgarlarmsList.size() > 0) { Integer termId1 = terminalPhoto.getTermId(); - BigInteger orginalid = terminalPhoto.getOrginalId(); + Integer orginalid = terminalPhoto.getOrginalId(); for (TerminalImgAlarmsDto dto : imgarlarmsList) { BigInteger photoOrgId = dto.getPhotoOrgId(); Integer termId = dto.getTermId(); @@ -437,7 +437,7 @@ public class TerminalUtils { ArrayList photoalarmlist = new ArrayList<>(); if (imgarlarmsList != null && imgarlarmsList.size() > 0) { Integer termId1 = item.getTermId(); - BigInteger orginalid = item.getOrginalId(); + Integer orginalid = item.getOrginalId(); for (TerminalImgAlarmsDto dto : imgarlarmsList) { BigInteger photoOrgId = dto.getPhotoOrgId(); Integer termId = dto.getTermId(); diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java index 23243bd..eedb2d4 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java @@ -160,13 +160,13 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { Map termchannelMapMap = cacheService.getTermChannelMapMap(); for (TerminalPhoto item : list) { Integer mediaType = item.getMediaType(); - BigInteger photoid = item.getOrginalId(); + Integer photoid = item.getOrginalId(); if (mediaType != null && (mediaType.intValue() == 0 || mediaType.intValue() == 1)) { Integer termId = item.getTermId(); if (termId != null) { TerminalPhotoListModel.PhotoBean photoBean = new TerminalPhotoListModel.PhotoBean(); Integer channelId = item.getChannelId(); - BigInteger orginalId = item.getOrginalId(); + Integer orginalId = item.getOrginalId(); Integer width = item.getWidth(); Integer height = item.getHeight(); @@ -302,7 +302,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { TerminalPhotoListModel.PhotoBean photoBean = new TerminalPhotoListModel.PhotoBean(); Integer termId = item.getTermId(); Integer channelId = item.getChannelId(); - BigInteger orginalId = item.getOrginalId(); + Integer orginalId = item.getOrginalId(); Integer width = item.getWidth(); Integer height = item.getHeight(); @@ -983,7 +983,7 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService { record.setTermId(termid); record.setPhotoTime((BigInteger.valueOf(MyDateUtils.TimeMillSecond2Second(date)))); record.setChannelId(channel); - record.setOrginalId(BigInteger.valueOf(RandomUtil.randomLong())); + record.setOrginalId(RandomUtil.randomInt()); record.setPath(year + "/" + mon + "/" + daystr + "/" + sub + "/" + file.getOriginalFilename()); record.setRecvTime(BigInteger.valueOf(MyDateUtils.TimeMillSecond2Second(date))); record.setCreateTime(new Date());