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/EventTransferRecordServiceImpl.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/EventTransferRecordServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventTransferRecordServiceImpl.java
index db98a51..d768c97 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventTransferRecordServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_grid/src/main/java/com/panzhihua/service_grid/service/impl/EventTransferRecordServiceImpl.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.EventTransferRecordDetailsVO;
import com.panzhihua.common.model.vos.grid.EventTransferRecordVO;
-import com.panzhihua.service_grid.dao.*;
-import com.panzhihua.service_grid.model.dos.*;
+import com.panzhihua.service_grid.dao.EventTransferRecordMapper;
+import com.panzhihua.service_grid.model.dos.EventTransferRecordDO;
import com.panzhihua.service_grid.service.EventTransferRecordService;
-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,20 +30,23 @@
*/
@Slf4j
@Service
-public class EventTransferRecordServiceImpl extends ServiceImpl<EventTransferRecordMapper, EventTransferRecordDO> implements EventTransferRecordService {
+public class EventTransferRecordServiceImpl extends ServiceImpl<EventTransferRecordMapper, EventTransferRecordDO>
+ implements EventTransferRecordService {
@Resource
private EventTransferRecordMapper eventTransferRecordMapper;
+
/**
* 新增事件处理流转记录
+ *
* @param eventTransferRecordAddDTO
* @return 新增结果
*/
- public R add(EventTransferRecordAddDTO eventTransferRecordAddDTO){
+ public R add(EventTransferRecordAddDTO eventTransferRecordAddDTO) {
EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
BeanUtils.copyProperties(eventTransferRecordAddDTO, eventTransferRecordDO);
eventTransferRecordDO.setCreateAt(new Date());
- if(eventTransferRecordMapper.insert(eventTransferRecordDO)>0){
+ if (eventTransferRecordMapper.insert(eventTransferRecordDO) > 0) {
return R.ok();
}
return R.fail();
@@ -48,14 +54,15 @@
/**
* 修改事件处理流转记录
+ *
* @param eventTransferRecordEditDTO
* @return 维护结果
*/
- public R edit(EventTransferRecordEditDTO eventTransferRecordEditDTO){
+ public R edit(EventTransferRecordEditDTO eventTransferRecordEditDTO) {
EventTransferRecordDO eventTransferRecordDO = new EventTransferRecordDO();
BeanUtils.copyProperties(eventTransferRecordEditDTO, eventTransferRecordDO);
- //eventTransferRecordDO.setUpdateAt(new Date());
- if(eventTransferRecordMapper.updateById(eventTransferRecordDO)>0){
+ // eventTransferRecordDO.setUpdateAt(new Date());
+ if (eventTransferRecordMapper.updateById(eventTransferRecordDO) > 0) {
return R.ok();
}
return R.fail();
@@ -63,15 +70,16 @@
/**
* 分页查找事件处理流转记录
+ *
* @param pageEventTransferRecordDTO
* @return 维护结果
*/
- public R<IPage<EventTransferRecordVO>> query(PageEventTransferRecordDTO pageEventTransferRecordDTO){
- Page page = new Page(1,10);
- if(pageEventTransferRecordDTO.getPageNum()!=null) {
+ public R<IPage<EventTransferRecordVO>> query(PageEventTransferRecordDTO pageEventTransferRecordDTO) {
+ Page page = new Page(1, 10);
+ if (pageEventTransferRecordDTO.getPageNum() != null) {
page.setCurrent(pageEventTransferRecordDTO.getPageNum());
}
- if(pageEventTransferRecordDTO.getPageSize()!=null) {
+ if (pageEventTransferRecordDTO.getPageSize() != null) {
page.setSize(pageEventTransferRecordDTO.getPageSize());
}
return R.ok(eventTransferRecordMapper.findByPage(page, pageEventTransferRecordDTO));
@@ -79,21 +87,24 @@
/**
* 删除事件处理流转记录
+ *
* @param EventTransferRecordDeleteDTO
* @return 平台用户信息
*/
- public R delete(EventTransferRecordDeleteDTO EventTransferRecordDeleteDTO){
+ public R delete(EventTransferRecordDeleteDTO EventTransferRecordDeleteDTO) {
return R.fail();
}
/**
* 查询事件处理流转记录详细信息
- * @param id 事件处理流转记录 id
+ *
+ * @param id
+ * 事件处理流转记录 id
* @return 查找结果
*/
- public R<EventTransferRecordDetailsVO> eventTransferRecordDetails(Long id){
+ public R<EventTransferRecordDetailsVO> eventTransferRecordDetails(Long id) {
EventTransferRecordDO eventTransferRecordDO = eventTransferRecordMapper.selectById(id);
- if(eventTransferRecordDO!=null) {
+ if (eventTransferRecordDO != null) {
EventTransferRecordDetailsVO eventTransferRecordDetailsVO = new EventTransferRecordDetailsVO();
BeanUtils.copyProperties(eventTransferRecordDO, eventTransferRecordDetailsVO);
return R.ok(eventTransferRecordDetailsVO);
--
Gitblit v1.7.1