xymp
/
backend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "fix: 修正orginalId类型为int"

Browse Source 
This reverts commit 3f7938a8c6.
dev
huangfeng 5 months ago
parent 3f7938a8c6
commit 42e5fcbec4
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File

2
xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java
Unescape Escape View File

@ -16,7 +16,7 @@ public class TerminalPhoto implements Serializable {
private Integer presetId;
private Integer orginalId;
private BigInteger orginalId;
private Integer mediaType;

2
xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListForOpenModel.java
Unescape Escape View File

@ -41,7 +41,7 @@ public class TerminalPhotoListForOpenModel implements Serializable {
private Integer presetId;
@ApiModelProperty(value = "图片编号", example = "123456")
private Integer orginalId;
private BigInteger orginalId;
//0--图片 1--视频
@ApiModelProperty(value = "图片类型")

2
xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoSelectListModel.java
Unescape Escape View File

@ -62,7 +62,7 @@ public class TerminalPhotoSelectListModel implements Serializable {
private Integer presetId;
@ApiModelProperty(value = "图片编号", example = "123456")
private Integer orginalid;
private BigInteger orginalid;
@ApiModelProperty(value = "图片类型", example = "123456")
private Integer mediaType;

2
xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotosModel.java
Unescape Escape View File

@ -63,7 +63,7 @@ public class TerminalPhotosModel implements Serializable {
private Integer presetId;
@ApiModelProperty(value = "图片编号", example = "123456")
private Integer orginalid;
private BigInteger orginalid;
@ApiModelProperty(value = "图片类型", example = "123456")
private Integer mediatype;

6
xymanager_common/src/main/java/com/shxy/xymanager_common/util/xinyin/TerminalUtils.java
Unescape Escape View File

@ -202,7 +202,7 @@ public class TerminalUtils {
ArrayList<TerminalPhotoListModel.AlarmItemBean> photoalarmlist = new ArrayList<>();
if (imgarlarmsList != null && imgarlarmsList.size() > 0) {
Integer termId1 = terminalPhoto.getTermId();
Integer orginalid = terminalPhoto.getOrginalId();
BigInteger orginalid = terminalPhoto.getOrginalId();
for (TerminalImgAlarmsDto dto : imgarlarmsList) {
BigInteger photoOrgId = dto.getPhotoOrgId();
Integer termId = dto.getTermId();
@ -334,7 +334,7 @@ public class TerminalUtils {
ArrayList<TerminalPhotoListModel.AlarmItemBean> photoalarmlist = new ArrayList<>();
if (imgarlarmsList != null && imgarlarmsList.size() > 0) {
Integer termId1 = terminalPhoto.getTermId();
Integer orginalid = terminalPhoto.getOrginalId();
BigInteger orginalid = terminalPhoto.getOrginalId();
for (TerminalImgAlarmsDto dto : imgarlarmsList) {
BigInteger photoOrgId = dto.getPhotoOrgId();
Integer termId = dto.getTermId();
@ -437,7 +437,7 @@ public class TerminalUtils {
ArrayList<TerminalPhotoListModel.AlarmItemBean> photoalarmlist = new ArrayList<>();
if (imgarlarmsList != null && imgarlarmsList.size() > 0) {
Integer termId1 = item.getTermId();
Integer orginalid = item.getOrginalId();
BigInteger orginalid = item.getOrginalId();
for (TerminalImgAlarmsDto dto : imgarlarmsList) {
BigInteger photoOrgId = dto.getPhotoOrgId();
Integer termId = dto.getTermId();

8
xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalPhotoServiceImpl.java
Unescape Escape View File

@ -160,13 +160,13 @@ public class TerminalPhotoServiceImpl implements TerminalPhotoService {
Map<String, TerminalChannelMapper> termchannelMapMap = cacheService.getTermChannelMapMap();
for (TerminalPhoto item : list) {
Integer mediaType = item.getMediaType();
Integer photoid = item.getOrginalId();
BigInteger 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();
Integer orginalId = item.getOrginalId();
BigInteger 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();
Integer orginalId = item.getOrginalId();
BigInteger 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(RandomUtil.randomInt());
record.setOrginalId(BigInteger.valueOf(RandomUtil.randomLong()));
record.setPath(year + "/" + mon + "/" + daystr + "/" + sub + "/" + file.getOriginalFilename());
record.setRecvTime(BigInteger.valueOf(MyDateUtils.TimeMillSecond2Second(date)));
record.setCreateTime(new Date());

Write Preview
Loading…
Cancel
Save