From 01bf8b376feaea8cfcd33fede3f806c700a0c27e Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 16 Oct 2023 09:22:15 +0800 Subject: [PATCH] =?UTF-8?q?add:=20=E5=86=85=E5=A4=96=E9=83=A8=E4=BC=9A?= =?UTF-8?q?=E8=AE=AE=E6=A8=A1=E5=9D=97=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InsideOutSideMeetingController.java | 11 +++++ .../entity/InsideOutSideMeeting.java | 7 ++- .../entity/MeetingTopic.java | 5 ++- .../service/InsideOutsideMeetingService.java | 4 +- .../service/MeetingTopicService.java | 12 +++++ .../impl/InsideOutsideMeetingServiceImpl.java | 45 +++++++++++++++---- .../service/impl/MeetingTopicServiceImpl.java | 16 +++++++ .../InsideOntSideMeeting.xml | 2 - 8 files changed, 88 insertions(+), 14 deletions(-) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/MeetingTopicService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/MeetingTopicServiceImpl.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/controller/InsideOutSideMeetingController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/controller/InsideOutSideMeetingController.java index c97cb5bd..1306d27d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/controller/InsideOutSideMeetingController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/controller/InsideOutSideMeetingController.java @@ -7,6 +7,7 @@ import com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutSideMeeting; import com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutsideMeetingVO; import com.adc.da.slrs.InsideOntSideMeeting.service.InsideOutsideMeetingService; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.web.bind.annotation.*; @@ -58,4 +59,14 @@ public class InsideOutSideMeetingController extends BaseController updateMeetingInfo(@RequestBody InsideOutSideMeeting insideOutSideMeeting) { + if (ObjectUtils.isEmpty(insideOutSideMeeting)) { + return Result.error("更新失败，会议信息不存在"); + } + Boolean updateResult = meetingService.updateMeetingInfo(insideOutSideMeeting); + return updateResult ? Result.success() : Result.error("更新失败"); + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutSideMeeting.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutSideMeeting.java index d093567a..21632907 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutSideMeeting.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutSideMeeting.java @@ -1,8 +1,10 @@ package com.adc.da.slrs.InsideOntSideMeeting.entity; import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -12,6 +14,7 @@ import lombok.experimental.Accessors; import java.util.Date; import java.util.List; +import java.util.Objects; /** * @author tjzdw @@ -22,12 +25,13 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(value="inside_outside_meeting表对象", description="内外部会议") +@TableName("inside_outside_meeting") public class InsideOutSideMeeting extends BaseEntity { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "主键") - @TableId("ID") + @TableId(value = "ID", type = IdType.ID_WORKER_STR) private String id; @ApiModelProperty(value = "会议名称") @@ -72,6 +76,7 @@ public class InsideOutSideMeeting extends BaseEntity { private String secondMeetingType; @ApiModelProperty(value = "会议议题") + @TableField(exist = false) private List meetingTopicList; @ApiModelProperty(value = "逻辑删除，0可用，1不可用") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java index ff382dab..f030a1bc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/MeetingTopic.java @@ -1,8 +1,10 @@ package com.adc.da.slrs.InsideOntSideMeeting.entity; import com.adc.da.base.entity.BaseEntity; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -21,10 +23,11 @@ import java.util.Date; @EqualsAndHashCode(callSuper = true) @Accessors(chain = true) @ApiModel(value="meeting_topic表对象", description="会议议题表") +@TableName("meeting_topic") public class MeetingTopic extends BaseEntity { @ApiModelProperty(value = "主键") - @TableId("ID") + @TableId(value = "ID", type = IdType.ID_WORKER_STR) private String id; @ApiModelProperty(value = "内外部会议ID") diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/InsideOutsideMeetingService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/InsideOutsideMeetingService.java index a71a2544..b9f1c3e6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/InsideOutsideMeetingService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/InsideOutsideMeetingService.java @@ -19,5 +19,7 @@ public interface InsideOutsideMeetingService extends IService { +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java index b927919d..6d7158ce 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/service/impl/InsideOutsideMeetingServiceImpl.java @@ -1,12 +1,14 @@ package com.adc.da.slrs.InsideOntSideMeeting.service.impl; +import com.adc.da.base.page.Pager; import com.adc.da.slrs.InsideOntSideMeeting.dao.InsideOutsideMeetingDao; -import com.adc.da.slrs.InsideOntSideMeeting.dao.MeetingTopicDao; import com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutSideMeeting; import com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutsideMeetingVO; import com.adc.da.slrs.InsideOntSideMeeting.entity.MeetingTopic; import com.adc.da.slrs.InsideOntSideMeeting.service.InsideOutsideMeetingService; +import com.adc.da.slrs.InsideOntSideMeeting.service.MeetingTopicService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -26,7 +28,7 @@ import java.util.List; public class InsideOutsideMeetingServiceImpl extends ServiceImpl implements InsideOutsideMeetingService { @Resource - private MeetingTopicDao meetingTopicDao; + private MeetingTopicService meetingTopicService; @Override public InsideOutSideMeeting getMeetingInfo(String meetingId){ @@ -34,7 +36,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(MeetingTopic::getMeetingId, meetingId); - List meetingTopicList = meetingTopicDao.selectList(wrapper); + List meetingTopicList = meetingTopicService.list(wrapper); insideOutSideMeeting.setMeetingTopicList(meetingTopicList); } return insideOutSideMeeting; @@ -42,12 +44,35 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl 0) { - meetingTopicDao.deleteById(meetingId); + public Boolean deleteMeetingById(String meetingId) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(InsideOutSideMeeting::getId, meetingId); + wrapper.set(InsideOutSideMeeting::getValidFlag,1); + boolean update = update(wrapper); + if (update) { + LambdaUpdateWrapper topicWrapper = new LambdaUpdateWrapper<>(); + topicWrapper.eq(MeetingTopic::getMeetingId, meetingId); + topicWrapper.set(MeetingTopic::getValidFlag,1); + meetingTopicService.update(topicWrapper); } - return deleteById; + return update; + } + + @Transactional + @Override + public Boolean updateMeetingInfo(InsideOutSideMeeting insideOutSideMeeting) { + if (StringUtils.isBlank(insideOutSideMeeting.getId())) { + return false; + } + insideOutSideMeeting.setModifyTime(new Date()); + int update = this.baseMapper.updateById(insideOutSideMeeting); + if (update > 0) { + for (MeetingTopic meetingTopic : insideOutSideMeeting.getMeetingTopicList()) { + meetingTopic.setModifyTime(new Date()); + meetingTopicService.updateById(meetingTopic); + } + } + return true; } @Transactional @@ -59,10 +84,11 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl implements MeetingTopicService { +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml index f8d8cf57..9a513913 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/InsideOntSideMeeting/InsideOntSideMeeting.xml @@ -104,6 +104,4 @@ order by iom.ID limit #{page},#{pageSize} - - \ No newline at end of file