From 26202db6cc4c82b311d6afbb20348c6675bdfef0 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 16 Oct 2023 10:28:45 +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?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InsideOutSideMeetingController.java | 20 +++++++++-------- .../dao/InsideOutsideMeetingDao.java | 8 +++---- ...Meeting.java => InsideOutsideMeeting.java} | 2 +- .../entity/InsideOutsideMeetingVO.java | 2 ++ .../service/InsideOutsideMeetingService.java | 12 +++++----- .../impl/InsideOutsideMeetingServiceImpl.java | 22 +++++++++---------- .../InsideOntSideMeeting.xml | 11 +++++----- 7 files changed, 39 insertions(+), 38 deletions(-) rename adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/{InsideOutSideMeeting.java => InsideOutsideMeeting.java} (98%) 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 1306d27d..9123c3df 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 @@ -1,14 +1,16 @@ package com.adc.da.slrs.InsideOntSideMeeting.controller; import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; -import com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutSideMeeting; +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.beans.BeanUtils; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -21,31 +23,31 @@ import java.util.List; */ @RestController @RequestMapping("/${restPath}/lawss/insideOutsideMeeting") -public class InsideOutSideMeetingController extends BaseController { +public class InsideOutSideMeetingController extends BaseController { @Resource private InsideOutsideMeetingService meetingService; @ApiOperation(value = "根据会议ID查询会议信息") @GetMapping("/getMeetingInfo") - public ResponseMessage getMeetingInfo(String meetingId){ + public ResponseMessage getMeetingInfo(String meetingId){ if (StringUtils.isBlank(meetingId)) { return Result.error("会议ID为空！"); } - InsideOutSideMeeting meetingInfo = meetingService.getMeetingInfo(meetingId); + InsideOutsideMeeting meetingInfo = meetingService.getMeetingInfo(meetingId); return Result.success(meetingInfo); } @ApiOperation(value = "分页查询") @GetMapping("/page") - public ResponseMessage> page(InsideOutsideMeetingVO insideOutsideMeetingVO) { - List rows = meetingService.queryByPage(insideOutsideMeetingVO); - return Result.success(rows); + public ResponseMessage> page(InsideOutsideMeetingVO insideOutsideMeetingVO) { + List rows = meetingService.queryByPage(insideOutsideMeetingVO); + return Result.success(getPageInfo(insideOutsideMeetingVO.getPager(), rows)); } @ApiOperation(value = "新增内外部会议") @PostMapping(value = "/addMeetingInfo", consumes = "application/json;charset=UTF-8") - public ResponseMessage create(@RequestBody InsideOutSideMeeting insideOutSideMeeting) throws Exception { + public ResponseMessage create(@RequestBody InsideOutsideMeeting insideOutSideMeeting) throws Exception { meetingService.addMeetingInfo(insideOutSideMeeting); return Result.success(); } @@ -62,7 +64,7 @@ public class InsideOutSideMeetingController extends BaseController updateMeetingInfo(@RequestBody InsideOutSideMeeting insideOutSideMeeting) { + public ResponseMessage updateMeetingInfo(@RequestBody InsideOutsideMeeting insideOutSideMeeting) { if (ObjectUtils.isEmpty(insideOutSideMeeting)) { return Result.error("更新失败，会议信息不存在"); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java index 11a4693f..74487b9c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/dao/InsideOutsideMeetingDao.java @@ -1,13 +1,11 @@ package com.adc.da.slrs.InsideOntSideMeeting.dao; -import com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutSideMeeting; +import com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutsideMeeting; import com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutsideMeetingVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** * @author tjzdw @@ -15,10 +13,10 @@ import java.util.Map; * @date 2023/10/10 */ @Mapper -public interface InsideOutsideMeetingDao extends BaseMapper { +public interface InsideOutsideMeetingDao extends BaseMapper { Integer queryByPageCount(InsideOutsideMeetingVO page); - List queryByPage(InsideOutsideMeetingVO page); + List queryByPage(InsideOutsideMeetingVO page); } 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 similarity index 98% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutSideMeeting.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeeting.java index 21632907..8f783abc 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 @@ -26,7 +26,7 @@ import java.util.Objects; @Accessors(chain = true) @ApiModel(value="inside_outside_meeting表对象", description="内外部会议") @TableName("inside_outside_meeting") -public class InsideOutSideMeeting extends BaseEntity { +public class InsideOutsideMeeting extends BaseEntity { private static final long serialVersionUID = 1L; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java index c9c781c4..4195217c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/InsideOntSideMeeting/entity/InsideOutsideMeetingVO.java @@ -4,6 +4,7 @@ import com.adc.da.base.page.BasePage; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; import java.util.Date; import java.util.List; @@ -14,6 +15,7 @@ import java.util.List; * @date 2023/10/12 */ @EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) @Data public class InsideOutsideMeetingVO extends BasePage { 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 b9f1c3e6..0c88446b 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 @@ -1,6 +1,6 @@ package com.adc.da.slrs.InsideOntSideMeeting.service; -import com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutSideMeeting; +import com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutsideMeeting; import com.adc.da.slrs.InsideOntSideMeeting.entity.InsideOutsideMeetingVO; import com.baomidou.mybatisplus.extension.service.IService; @@ -11,15 +11,15 @@ import java.util.List; * @description * @date 2023/10/10 */ -public interface InsideOutsideMeetingService extends IService { +public interface InsideOutsideMeetingService extends IService { - Integer addMeetingInfo(InsideOutSideMeeting insideOutSideMeeting); + Integer addMeetingInfo(InsideOutsideMeeting insideOutSideMeeting); - List queryByPage(InsideOutsideMeetingVO page); + List queryByPage(InsideOutsideMeetingVO page); - InsideOutSideMeeting getMeetingInfo(String meetingId); + InsideOutsideMeeting getMeetingInfo(String meetingId); Boolean deleteMeetingById(String meetingId); - Boolean updateMeetingInfo(InsideOutSideMeeting insideOutSideMeeting); + Boolean updateMeetingInfo(InsideOutsideMeeting insideOutSideMeeting); } 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 6d7158ce..257b504e 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,8 +1,7 @@ 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.entity.InsideOutSideMeeting; +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; @@ -25,14 +24,14 @@ import java.util.List; * @date 2023/10/10 */ @Service -public class InsideOutsideMeetingServiceImpl extends ServiceImpl implements InsideOutsideMeetingService { +public class InsideOutsideMeetingServiceImpl extends ServiceImpl implements InsideOutsideMeetingService { @Resource private MeetingTopicService meetingTopicService; @Override - public InsideOutSideMeeting getMeetingInfo(String meetingId){ - InsideOutSideMeeting insideOutSideMeeting = this.baseMapper.selectById(meetingId); + public InsideOutsideMeeting getMeetingInfo(String meetingId){ + InsideOutsideMeeting insideOutSideMeeting = this.baseMapper.selectById(meetingId); if (insideOutSideMeeting != null) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(MeetingTopic::getMeetingId, meetingId); @@ -45,9 +44,9 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl wrapper = new LambdaUpdateWrapper<>(); - wrapper.eq(InsideOutSideMeeting::getId, meetingId); - wrapper.set(InsideOutSideMeeting::getValidFlag,1); + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(InsideOutsideMeeting::getId, meetingId); + wrapper.set(InsideOutsideMeeting::getValidFlag,1); boolean update = update(wrapper); if (update) { LambdaUpdateWrapper topicWrapper = new LambdaUpdateWrapper<>(); @@ -60,7 +59,7 @@ public class InsideOutsideMeetingServiceImpl extends ServiceImpl queryByPage(InsideOutsideMeetingVO page){ + public List queryByPage(InsideOutsideMeetingVO page){ if (StringUtils.isNotBlank(page.getParticipants())) { page.setParticipantsList(Arrays.asList(page.getParticipants().split(","))); } Integer rowCount = this.baseMapper.queryByPageCount(page); page.getPager().setRowCount(rowCount); - page.setPage(page.getPage()-1); return this.baseMapper.queryByPage(page); } } 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 9a513913..dc8b2981 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 @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -91,17 +91,18 @@ - select from inside_outside_meeting iom join meeting_topic mt on iom.ID = mt.MEETING_ID where iom.VALID_FLAG = 0 order by iom.ID - limit #{page},#{pageSize} + limit ${pager.startIndex-1},${pageSize} \ No newline at end of file