From 6fb866218f53e1cf2c8c108c5aefc2a6a9e19c80 Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期四, 17 六月 2021 17:55:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_screen' into test_screen
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
index de5baad..d7fff02 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventServiceImpl.java
@@ -280,6 +280,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
eventResourceDO.setResourceTime(commonEventAddDTO.getAudioTime());
+ eventResourceDO.setResourceName(commonEventAddDTO.getAudio().substring(commonEventAddDTO.getAudio().lastIndexOf("/")+1));
int audioAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (audioAdd != 1) {
throw new ServiceException("添加音频失败");
@@ -294,6 +295,7 @@
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
eventResourceDO.setResourceTime(commonEventAddDTO.getVideoTime());
+ eventResourceDO.setResourceName(commonEventAddDTO.getVideo().substring(commonEventAddDTO.getVideo().lastIndexOf("/")+1));
int videoAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (videoAdd != 1) {
throw new ServiceException("添加视频失败");
@@ -309,6 +311,7 @@
eventResourceDO.setUrl(pica[i]);
eventResourceDO.setRefId(eventDO.getId());
eventResourceDO.setCreateBy(commonEventAddDTO.getUserId());
+ eventResourceDO.setResourceName(pica[i].substring(pica[i].lastIndexOf("/")+1));
int picAdd = eventResourceService.getBaseMapper().insert(eventResourceDO);
if (picAdd != 1) {
throw new ServiceException("添加图片失败");
@@ -516,7 +519,7 @@
eventDO.setProcessType(1);//网格员处理
eventDO.setCommunityProcess(0);//非 社区处理
eventDO.setRevokeType(eventRevokeDTO.getRevokeType());
- eventDO.setRevokeID(eventRevokeDTO.getRevokeId());
+ eventDO.setRevokeId(eventRevokeDTO.getRevokeId());
int updated = this.getBaseMapper().updateById(eventDO);
if (updated == 1) {
addTransferRecord(eventDO.getId(), eventRevokeDTO.getUserId(), eventRevokeDTO.getUserName(),
@@ -1283,7 +1286,7 @@
eventDO.setEventStatus(4);//4、撤销
eventDO.setProcessType(1);//网格员处理
eventDO.setCommunityProcess(0);//非 社区处理
- eventDO.setRevokeID(eventRevokeDTO.getRevokeId());
+ eventDO.setRevokeId(eventRevokeDTO.getRevokeId());
eventDO.setRevokeType(eventRevokeDTO.getRevokeType());
int updated = this.getBaseMapper().updateById(eventDO);
if (updated == 1) {
--
Gitblit v1.7.1