From 177249c76aeea0b4bf8d8816d4994e3b445b45ce Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期四, 02 九月 2021 10:39:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zzj' into zzj
---
springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventResourceServiceImpl.java | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventResourceServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventResourceServiceImpl.java
index fdcc8e2..5fbe3ff 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventResourceServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventResourceServiceImpl.java
@@ -1,5 +1,12 @@
package com.panzhihua.service_grid.service.impl;
+import java.util.Date;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,15 +17,11 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.grid.EventResourceDetailsVO;
import com.panzhihua.common.model.vos.grid.EventResourceVO;
-import com.panzhihua.service_grid.dao.*;
-import com.panzhihua.service_grid.model.dos.*;
+import com.panzhihua.service_grid.dao.EventResourceMapper;
+import com.panzhihua.service_grid.model.dos.EventResourceDO;
import com.panzhihua.service_grid.service.EventResourceService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.beans.BeanUtils;
-import javax.annotation.Resource;
-import java.util.Date;
+import lombok.extern.slf4j.Slf4j;
/**
* @auther lyq
@@ -27,21 +30,24 @@
*/
@Slf4j
@Service
-public class EventResourceServiceImpl extends ServiceImpl<EventResourceMapper, EventResourceDO> implements EventResourceService {
+public class EventResourceServiceImpl extends ServiceImpl<EventResourceMapper, EventResourceDO>
+ implements EventResourceService {
@Resource
private EventResourceMapper eventResourceMapper;
+
/**
* 新增事件或者走访中关联的图片音频和视频文件
+ *
* @param eventResourceAddDTO
* @return 新增结果
*/
@Override
- public R add(EventResourceAddDTO eventResourceAddDTO){
+ public R add(EventResourceAddDTO eventResourceAddDTO) {
EventResourceDO eventResourceDO = new EventResourceDO();
BeanUtils.copyProperties(eventResourceAddDTO, eventResourceDO);
eventResourceDO.setCreateAt(new Date());
- if(eventResourceMapper.insert(eventResourceDO)>0){
+ if (eventResourceMapper.insert(eventResourceDO) > 0) {
return R.ok();
}
return R.fail();
@@ -49,15 +55,16 @@
/**
* 修改事件或者走访中关联的图片音频和视频文件
+ *
* @param eventResourceEditDTO
* @return 维护结果
*/
@Override
- public R edit(EventResourceEditDTO eventResourceEditDTO){
+ public R edit(EventResourceEditDTO eventResourceEditDTO) {
EventResourceDO eventResourceDO = new EventResourceDO();
BeanUtils.copyProperties(eventResourceEditDTO, eventResourceDO);
- //eventResourceDO.setUpdateAt(new Date());
- if(eventResourceMapper.updateById(eventResourceDO)>0){
+ // eventResourceDO.setUpdateAt(new Date());
+ if (eventResourceMapper.updateById(eventResourceDO) > 0) {
return R.ok();
}
return R.fail();
@@ -65,16 +72,17 @@
/**
* 分页查找事件或者走访中关联的图片音频和视频文件
+ *
* @param pageEventResourceDTO
* @return 维护结果
*/
@Override
- public R<IPage<EventResourceVO>> query(PageEventResourceDTO pageEventResourceDTO){
- Page page = new Page(1,10);
- if(pageEventResourceDTO.getPageNum()!=null) {
+ public R<IPage<EventResourceVO>> query(PageEventResourceDTO pageEventResourceDTO) {
+ Page page = new Page(1, 10);
+ if (pageEventResourceDTO.getPageNum() != null) {
page.setCurrent(pageEventResourceDTO.getPageNum());
}
- if(pageEventResourceDTO.getPageSize()!=null) {
+ if (pageEventResourceDTO.getPageSize() != null) {
page.setSize(pageEventResourceDTO.getPageSize());
}
return R.ok(eventResourceMapper.findByPage(page, pageEventResourceDTO));
@@ -82,23 +90,26 @@
/**
* 删除事件或者走访中关联的图片音频和视频文件
+ *
* @param EventResourceDeleteDTO
* @return 平台用户信息
*/
@Override
- public R delete(EventResourceDeleteDTO EventResourceDeleteDTO){
+ public R delete(EventResourceDeleteDTO EventResourceDeleteDTO) {
return R.fail();
}
/**
* 查询事件或者走访中关联的图片音频和视频文件详细信息
- * @param id 事件或者走访中关联的图片音频和视频文件 id
+ *
+ * @param id
+ * 事件或者走访中关联的图片音频和视频文件 id
* @return 查找结果
*/
@Override
- public R<EventResourceDetailsVO> eventResourceDetails(Long id){
+ public R<EventResourceDetailsVO> eventResourceDetails(Long id) {
EventResourceDO eventResourceDO = eventResourceMapper.selectById(id);
- if(eventResourceDO!=null) {
+ if (eventResourceDO != null) {
EventResourceDetailsVO eventResourceDetailsVO = new EventResourceDetailsVO();
BeanUtils.copyProperties(eventResourceDO, eventResourceDetailsVO);
return R.ok(eventResourceDetailsVO);
--
Gitblit v1.7.1