소스 검색

会议小程序

孙永军 1 년 전
부모
커밋
ced1ff2c3a
19개의 변경된 파일278개의 추가작업 그리고 7개의 파일을 삭제
  1. 6 0
      src/main/java/com/smcic/api/conference/controller/ConferenceAgendaController.java
  2. 7 0
      src/main/java/com/smcic/api/conference/controller/ConferenceAgendaDetailController.java
  3. 7 0
      src/main/java/com/smcic/api/conference/controller/ConferenceConfController.java
  4. 14 2
      src/main/java/com/smcic/api/conference/controller/ConferenceGuestController.java
  5. 10 0
      src/main/java/com/smcic/api/conference/controller/ConferenceLivePhotoController.java
  6. 15 0
      src/main/java/com/smcic/api/conference/controller/ConferenceLiveVideoController.java
  7. 6 0
      src/main/java/com/smcic/api/conference/controller/ConferenceNewsController.java
  8. 17 2
      src/main/java/com/smcic/api/conference/controller/ConferencePartnerController.java
  9. 8 0
      src/main/java/com/smcic/api/conference/controller/ConferenceSubscriptionController.java
  10. 11 0
      src/main/java/com/smcic/api/conference/dto/DelBatchDTO.java
  11. 11 0
      src/main/java/com/smcic/api/conference/service/impl/ConferenceAgendaDetailServiceImpl.java
  12. 8 0
      src/main/java/com/smcic/api/conference/service/impl/ConferenceAgendaServiceImpl.java
  13. 16 1
      src/main/java/com/smcic/api/conference/service/impl/ConferenceConfServiceImpl.java
  14. 40 0
      src/main/java/com/smcic/api/conference/service/impl/ConferenceGuestServiceImpl.java
  15. 16 0
      src/main/java/com/smcic/api/conference/service/impl/ConferenceLivePhotoServiceImpl.java
  16. 31 2
      src/main/java/com/smcic/api/conference/service/impl/ConferenceLiveVideoServiceImpl.java
  17. 9 0
      src/main/java/com/smcic/api/conference/service/impl/ConferenceNewsServiceImpl.java
  18. 38 0
      src/main/java/com/smcic/api/conference/service/impl/ConferencePartnerServiceImpl.java
  19. 8 0
      src/main/java/com/smcic/api/conference/service/impl/ConferenceSubscriptionServiceImpl.java

+ 6 - 0
src/main/java/com/smcic/api/conference/controller/ConferenceAgendaController.java

@@ -37,6 +37,12 @@ public class ConferenceAgendaController {
         conferenceAgendaService.update(conferenceAgenda);
     }
 
+    @GetMapping("del/{id}")
+    @CmsLoginRequired
+    public void del(@PathVariable("id") Long id){
+        conferenceAgendaService.del(id);
+    }
+
     @GetMapping("list/{id}")
     public List<ConferenceAgenda> list(@PathVariable( "id" ) Long id){
         return conferenceAgendaService.listByCid(id);

+ 7 - 0
src/main/java/com/smcic/api/conference/controller/ConferenceAgendaDetailController.java

@@ -36,6 +36,13 @@ public class ConferenceAgendaDetailController {
         conferenceAgendaDetailService.update(conferenceAgendaDetail);
     }
 
+
+    @GetMapping("del/{id}")
+    @CmsLoginRequired
+    public void del(@PathVariable("id") Long id){
+        conferenceAgendaDetailService.del(id);
+    }
+
     @GetMapping("list/{id}")
     public List<ConferenceAgendaDetail> list(@PathVariable("id") Long id){
         return conferenceAgendaDetailService.lambdaQuery().eq(ConferenceAgendaDetail::getAgendaId, id).orderByAsc(ConferenceAgendaDetail::getStartTime).list();

+ 7 - 0
src/main/java/com/smcic/api/conference/controller/ConferenceConfController.java

@@ -52,4 +52,11 @@ public class ConferenceConfController {
     public  void update(@RequestBody ConferenceConf conferenceConf){
         conferenceConfService.update(conferenceConf);
     }
+
+    @GetMapping("del/{id}")
+    @CmsLoginRequired
+    public  void del(@PathVariable("id") Long id){
+        conferenceConfService.del(id);
+    }
+
 }

+ 14 - 2
src/main/java/com/smcic/api/conference/controller/ConferenceGuestController.java

@@ -3,6 +3,7 @@ package com.smcic.api.conference.controller;
 
 import com.smcic.api.conference.entity.ConferenceGuest;
 import com.smcic.api.conference.service.impl.ConferenceGuestServiceImpl;
+import com.smcic.core.auth.CmsLoginRequired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -24,9 +25,20 @@ public class ConferenceGuestController {
     private ConferenceGuestServiceImpl conferenceGuestService;
 
     @PostMapping("create")
+    @CmsLoginRequired
     public ConferenceGuest create(@RequestBody ConferenceGuest conferenceGuest){
-        conferenceGuestService.save(conferenceGuest);
-        return conferenceGuest;
+        return conferenceGuestService.create(conferenceGuest);
+    }
+    @PostMapping("update")
+    @CmsLoginRequired
+    public void update(@RequestBody ConferenceGuest conferenceGuest){
+        conferenceGuestService.update(conferenceGuest);
+    }
+
+    @GetMapping("del/{id}")
+    @CmsLoginRequired
+    public void del(@PathVariable("id") Long id){
+        conferenceGuestService.del(id);
     }
 
     @GetMapping( "list/{id}" )

+ 10 - 0
src/main/java/com/smcic/api/conference/controller/ConferenceLivePhotoController.java

@@ -3,8 +3,10 @@ package com.smcic.api.conference.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.smcic.api.conference.dto.BatchPhoto;
+import com.smcic.api.conference.dto.DelBatchDTO;
 import com.smcic.api.conference.entity.ConferenceLivePhoto;
 import com.smcic.api.conference.service.impl.ConferenceLivePhotoServiceImpl;
+import com.smcic.core.auth.CmsLoginRequired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -32,10 +34,18 @@ public class ConferenceLivePhotoController {
     }
 
     @PostMapping("create-batch")
+    @CmsLoginRequired
     public void createBatch(@RequestBody BatchPhoto batchPhoto) {
         conferenceLivePhotoService.batchCreate(batchPhoto);
     }
 
+    //批量删除
+    @PostMapping("del-batch")
+    @CmsLoginRequired
+    public void delBatch(@RequestBody DelBatchDTO dto) {
+        conferenceLivePhotoService.delBatch(dto);
+    }
+
     @GetMapping("list/{id}")
     public Page<ConferenceLivePhoto> listConferenceLivePhoto(@PathVariable("id") Long id,
                                                              @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,

+ 15 - 0
src/main/java/com/smcic/api/conference/controller/ConferenceLiveVideoController.java

@@ -2,8 +2,10 @@ package com.smcic.api.conference.controller;
 
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.smcic.api.conference.dto.DelBatchDTO;
 import com.smcic.api.conference.entity.ConferenceLiveVideo;
 import com.smcic.api.conference.service.impl.ConferenceLiveVideoServiceImpl;
+import com.smcic.core.auth.CmsLoginRequired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -25,10 +27,23 @@ public class ConferenceLiveVideoController {
     private ConferenceLiveVideoServiceImpl conferenceLiveVideoService;
 
     @PostMapping("create")
+    @CmsLoginRequired
     public ConferenceLiveVideo createConferenceLiveVideo(@RequestBody ConferenceLiveVideo conferenceLiveVideo) {
         return conferenceLiveVideoService.create(conferenceLiveVideo);
     }
 
+    @GetMapping("del/{id}")
+    @CmsLoginRequired
+    public void delConferenceLiveVideo(@PathVariable("id") Long id) {
+        conferenceLiveVideoService.del(id);
+    }
+
+    @PostMapping("del-batch")
+    @CmsLoginRequired
+    public void delBatch(@RequestBody DelBatchDTO dto) {
+        conferenceLiveVideoService.delBatch(dto);
+    }
+
     @GetMapping("list/{id}")
     public Page<ConferenceLiveVideo> listConferenceLiveVideo(@PathVariable("id") Long id,
             @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,

+ 6 - 0
src/main/java/com/smcic/api/conference/controller/ConferenceNewsController.java

@@ -38,6 +38,12 @@ public class ConferenceNewsController {
         conferenceNewsService.update(conferenceNews);
     }
 
+    @GetMapping("del/{id}")
+    @CmsLoginRequired
+    public void del(@PathVariable("id") Long id) {
+        conferenceNewsService.del(id);
+    }
+
     @GetMapping("list/{id}")
     public Page<ConferenceNews> list(@PathVariable( "id" ) Long id,
                                      @RequestParam(value = "category", required = false, defaultValue = "") String category,

+ 17 - 2
src/main/java/com/smcic/api/conference/controller/ConferencePartnerController.java

@@ -3,6 +3,7 @@ package com.smcic.api.conference.controller;
 
 import com.smcic.api.conference.entity.ConferencePartner;
 import com.smcic.api.conference.service.impl.ConferencePartnerServiceImpl;
+import com.smcic.core.auth.CmsLoginRequired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -24,13 +25,27 @@ public class ConferencePartnerController {
     private ConferencePartnerServiceImpl conferencePartnerService;
 
     @PostMapping("create")
+    @CmsLoginRequired
     public  ConferencePartner create(@RequestBody ConferencePartner conferencePartner){
-        conferencePartnerService.save(conferencePartner);
-        return conferencePartner;
+        return conferencePartnerService.create(conferencePartner);
+    }
+
+    @PostMapping("update")
+    @CmsLoginRequired
+    public void update(@RequestBody ConferencePartner conferencePartner){
+        conferencePartnerService.update(conferencePartner);
+    }
+
+    @GetMapping("del/{id}")
+    @CmsLoginRequired
+    public void del(@PathVariable("id") Long id){
+        conferencePartnerService.del(id);
     }
 
     @GetMapping("list/{id}")
     public List<ConferencePartner> list(@PathVariable( "id" ) Long id){
         return conferencePartnerService.listByCid(id);
     }
+
+
 }

+ 8 - 0
src/main/java/com/smcic/api/conference/controller/ConferenceSubscriptionController.java

@@ -1,6 +1,7 @@
 package com.smcic.api.conference.controller;
 
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.smcic.api.conference.entity.ConferenceSubscription;
 import com.smcic.api.conference.service.impl.ConferenceSubscriptionServiceImpl;
 import org.springframework.web.bind.annotation.*;
@@ -33,4 +34,11 @@ public class ConferenceSubscriptionController {
         return subscriptionService.getByCode( id, code);
     }
 
+    @GetMapping("list/{id}")
+    public Page<ConferenceSubscription> listSubscription(@PathVariable("id") Long id,
+                                                         @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
+                                                         @RequestParam(value = "pageSize", required = false, defaultValue = "20") Integer size) {
+        return subscriptionService.getByCid( id, page, size);
+    }
+
 }

+ 11 - 0
src/main/java/com/smcic/api/conference/dto/DelBatchDTO.java

@@ -0,0 +1,11 @@
+package com.smcic.api.conference.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DelBatchDTO {
+    private Long cid;
+    private List<Long> ids;
+}

+ 11 - 0
src/main/java/com/smcic/api/conference/service/impl/ConferenceAgendaDetailServiceImpl.java

@@ -55,5 +55,16 @@ public class ConferenceAgendaDetailServiceImpl extends ServiceImpl<ConferenceAge
         updateById(detail);
     }
 
+    public void del(Long id){
+        ConferenceAgendaDetail detail = getById(id);
+        ConferenceAgenda agenda = agendaService.getById(detail.getAgendaId());
+
+        if(!aclDataService.hasDataAcl(agenda.getConferenceId())){
+            throw new BizException("没有该会议的权限");
+        }
+
+        removeById(id);
+    }
+
 
 }

+ 8 - 0
src/main/java/com/smcic/api/conference/service/impl/ConferenceAgendaServiceImpl.java

@@ -64,4 +64,12 @@ public class ConferenceAgendaServiceImpl extends ServiceImpl<ConferenceAgendaMap
 
         updateById(data);
     }
+
+    public void del(Long id){
+        ConferenceAgenda data = getById(id);
+        if(!aclDataService.hasDataAcl(data.getConferenceId())){
+            throw new BizException("没有该会议的权限");
+        }
+        removeById(id);
+    }
 }

+ 16 - 1
src/main/java/com/smcic/api/conference/service/impl/ConferenceConfServiceImpl.java

@@ -45,9 +45,24 @@ public class ConferenceConfServiceImpl extends ServiceImpl<ConferenceConfMapper,
     }
 
     public void update(ConferenceConf conferenceConf){
-        if(!aclDataService.hasDataAcl(conferenceConf.getConferenceId())){
+        ConferenceConf conf = getById(conferenceConf.getId());
+        if(!aclDataService.hasDataAcl(conf.getConferenceId())){
             throw new BizException("没有该会议的权限");
         }
+
+        conf.setConfKey(conf.getConfKey());
+        conf.setConfName(conf.getConfName());
+        conf.setConfContent(conferenceConf.getConfContent());
+        conf.setConfType(conf.getConfType());
+
         updateById(conferenceConf);
     }
+
+    public void del(Long id){
+        ConferenceConf conf = getById(id);
+        if(!aclDataService.hasDataAcl(conf.getConferenceId())){
+            throw new BizException("没有该会议的权限");
+        }
+        removeById(id);
+    }
 }

+ 40 - 0
src/main/java/com/smcic/api/conference/service/impl/ConferenceGuestServiceImpl.java

@@ -4,8 +4,11 @@ import com.smcic.api.conference.entity.ConferenceGuest;
 import com.smcic.api.conference.mapper.ConferenceGuestMapper;
 import com.smcic.api.conference.service.IConferenceGuestService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.smcic.core.advice.BizException;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -18,9 +21,46 @@ import java.util.List;
  */
 @Service
 public class ConferenceGuestServiceImpl extends ServiceImpl<ConferenceGuestMapper, ConferenceGuest> implements IConferenceGuestService {
+    @Resource
+    private ConferenceAclDataServiceImpl aclDataService;
 
     public List<ConferenceGuest> listByType(Long cid,  Integer type) {
         return lambdaQuery().eq(ConferenceGuest::getConferenceId, cid).eq(type > 0, ConferenceGuest::getUserType, type)
                 .orderByAsc(ConferenceGuest::getSortNumber).list();
     }
+
+    public ConferenceGuest create( ConferenceGuest conferenceGuest){
+
+        if(!aclDataService.hasDataAcl(conferenceGuest.getConferenceId())){
+            throw new BizException("没有该会议的权限");
+        }
+
+        save(conferenceGuest);
+        return conferenceGuest;
+    }
+
+    public void update( ConferenceGuest conferenceGuest){
+        ConferenceGuest guest = getById(conferenceGuest.getId());
+        if(!aclDataService.hasDataAcl(guest.getConferenceId())){
+            throw new BizException("没有该会议的权限");
+        }
+
+        guest.setUserName(conferenceGuest.getUserName());
+        guest.setTags(conferenceGuest.getTags());
+        guest.setPhoto(conferenceGuest.getPhoto());
+        guest.setSortNumber(conferenceGuest.getSortNumber());
+        guest.setUserDesc(conferenceGuest.getUserDesc());
+        guest.setUserType(conferenceGuest.getUserType());
+        guest.setSpeechVideo(conferenceGuest.getSpeechVideo());
+        guest.setSpeechCover(conferenceGuest.getSpeechCover());
+        updateById(guest);
+    }
+
+    public void del(Long id){
+        ConferenceGuest guest = getById(id);
+        if(!aclDataService.hasDataAcl(guest.getConferenceId())){
+            throw new BizException("没有该会议的权限");
+        }
+        removeById(id);
+    }
 }

+ 16 - 0
src/main/java/com/smcic/api/conference/service/impl/ConferenceLivePhotoServiceImpl.java

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.smcic.api.conference.dto.BatchPhoto;
+import com.smcic.api.conference.dto.DelBatchDTO;
 import com.smcic.api.conference.entity.ConferenceLivePhoto;
 import com.smcic.api.conference.mapper.ConferenceLivePhotoMapper;
 import com.smcic.api.conference.service.IConferenceLivePhotoService;
+import com.smcic.core.advice.BizException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -33,6 +35,9 @@ public class ConferenceLivePhotoServiceImpl extends ServiceImpl<ConferenceLivePh
     @Resource
     private SSEService sseService;
 
+    @Resource
+    private ConferenceAclDataServiceImpl aclDataService;
+
     public Page<ConferenceLivePhoto> photoPage(Long id, Integer page, Integer pageSize) {
         Page<ConferenceLivePhoto> page1 = new Page<>(page, pageSize);
 
@@ -44,6 +49,9 @@ public class ConferenceLivePhotoServiceImpl extends ServiceImpl<ConferenceLivePh
 
     @Transactional
     public void batchCreate(BatchPhoto batchPhoto){
+        if(!aclDataService.hasDataAcl(batchPhoto.getConferenceId())){
+            throw new BizException("没有权限");
+        }
         List<ConferenceLivePhoto> photos = new ArrayList<>();
         LocalDateTime now = LocalDateTime.now();
         for(String url : batchPhoto.getPhoto()){
@@ -60,4 +68,12 @@ public class ConferenceLivePhotoServiceImpl extends ServiceImpl<ConferenceLivePh
 
 //        threadPoolExecutor.execute(()-> sseService.sendData(batchPhoto.getConferenceId(), photos));
     }
+
+    //批量删除
+    public void delBatch(DelBatchDTO dto) {
+        if(!aclDataService.hasDataAcl(dto.getCid())){
+            throw new BizException("没有权限");
+        }
+        remove(new LambdaQueryWrapper<ConferenceLivePhoto>().in(ConferenceLivePhoto::getId, dto.getIds()).eq(ConferenceLivePhoto::getConferenceId, dto.getCid()));
+    }
 }

+ 31 - 2
src/main/java/com/smcic/api/conference/service/impl/ConferenceLiveVideoServiceImpl.java

@@ -2,12 +2,16 @@ package com.smcic.api.conference.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.smcic.api.conference.dto.DelBatchDTO;
 import com.smcic.api.conference.entity.ConferenceLiveVideo;
 import com.smcic.api.conference.mapper.ConferenceLiveVideoMapper;
 import com.smcic.api.conference.service.IConferenceLiveVideoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.smcic.core.advice.BizException;
+import org.apache.http.util.TextUtils;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.time.LocalDateTime;
 
 /**
@@ -21,16 +25,41 @@ import java.time.LocalDateTime;
 @Service
 public class ConferenceLiveVideoServiceImpl extends ServiceImpl<ConferenceLiveVideoMapper, ConferenceLiveVideo> implements IConferenceLiveVideoService {
 
+    @Resource
+    private ConferenceAclDataServiceImpl aclDataService;
 
     public ConferenceLiveVideo create(ConferenceLiveVideo conferenceLiveVideo) {
+
+        if(!aclDataService.hasDataAcl(conferenceLiveVideo.getConferenceId())){
+            throw new BizException("没有权限");
+        }
         conferenceLiveVideo.setCreateTime(LocalDateTime.now());
-        if(conferenceLiveVideo.getType() == 1){
+        if(conferenceLiveVideo.getType() == 1 && TextUtils.isEmpty(conferenceLiveVideo.getCover())){
             conferenceLiveVideo.setCover(conferenceLiveVideo.getVideo() + "?x-oss-process=video/snapshot,t_3000,m_fast");
         }
         save( conferenceLiveVideo);
         return conferenceLiveVideo;
     }
 
+    public void del(Long id) {
+        ConferenceLiveVideo video = getById(id);
+        if(!aclDataService.hasDataAcl(video.getConferenceId())){
+            throw new BizException("没有权限");
+        }
+        removeById(id);
+    }
+
+    //批量删除
+    public void delBatch(DelBatchDTO dto) {
+
+        if (!aclDataService.hasDataAcl(dto.getCid())){
+            throw new BizException("没有权限");
+        }
+
+        remove(new LambdaQueryWrapper<ConferenceLiveVideo>().in(ConferenceLiveVideo::getId, dto.getIds()).eq(ConferenceLiveVideo::getConferenceId, dto.getCid()));
+
+    }
+
     public Page<ConferenceLiveVideo> videoPage(Long cid, Integer page, Integer pageSize) {
         Page<ConferenceLiveVideo> page1 = new Page<>(page, pageSize);
 

+ 9 - 0
src/main/java/com/smcic/api/conference/service/impl/ConferenceNewsServiceImpl.java

@@ -78,4 +78,13 @@ public class ConferenceNewsServiceImpl extends ServiceImpl<ConferenceNewsMapper,
         updateById(news);
 
     }
+
+
+    public void del(Long id){
+        ConferenceNews news = getById(id);
+        if(!aclDataService.hasDataAcl(news.getConferenceId())){
+            throw new BizException("没有该会议的权限");
+        }
+        removeById(id);
+    }
 }

+ 38 - 0
src/main/java/com/smcic/api/conference/service/impl/ConferencePartnerServiceImpl.java

@@ -4,8 +4,12 @@ import com.smcic.api.conference.entity.ConferencePartner;
 import com.smcic.api.conference.mapper.ConferencePartnerMapper;
 import com.smcic.api.conference.service.IConferencePartnerService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.smcic.core.advice.BizException;
 import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
+import javax.annotation.Resource;
 import java.util.List;
 
 /**
@@ -19,6 +23,9 @@ import java.util.List;
 @Service
 public class ConferencePartnerServiceImpl extends ServiceImpl<ConferencePartnerMapper, ConferencePartner> implements IConferencePartnerService {
 
+    @Resource
+    private ConferenceAclDataServiceImpl aclDataService;
+
     public List<ConferencePartner> listByCid(Long cid){
         return lambdaQuery().eq(ConferencePartner::getConferenceId, cid)
                 .eq(ConferencePartner::getStatus, 1)
@@ -26,4 +33,35 @@ public class ConferencePartnerServiceImpl extends ServiceImpl<ConferencePartnerM
                 .orderByAsc(ConferencePartner::getId)
                 .list();
     }
+
+    public  ConferencePartner create(ConferencePartner conferencePartner){
+        if(!aclDataService.hasDataAcl(conferencePartner.getConferenceId())){
+            throw new BizException("没有该会议的权限");
+        }
+        save(conferencePartner);
+        return conferencePartner;
+    }
+
+    public void update(ConferencePartner conferencePartner){
+        ConferencePartner partner = getById(conferencePartner.getId());
+        if(!aclDataService.hasDataAcl(partner.getConferenceId())){
+            throw new BizException("没有该会议的权限");
+        }
+        partner.setPartnerName(conferencePartner.getPartnerName());
+        partner.setLogo(conferencePartner.getLogo());
+        partner.setPartnerType(conferencePartner.getPartnerType());
+        partner.setWebsite(conferencePartner.getWebsite());
+        partner.setSortNo(conferencePartner.getSortNo());
+
+        updateById(partner);
+    }
+
+    public void del(Long id){
+        ConferencePartner partner = getById(id);
+        if(!aclDataService.hasDataAcl(partner.getConferenceId())){
+            throw new BizException("没有该会议的权限");
+        }
+        removeById(id);
+    }
+
 }

+ 8 - 0
src/main/java/com/smcic/api/conference/service/impl/ConferenceSubscriptionServiceImpl.java

@@ -1,5 +1,6 @@
 package com.smcic.api.conference.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.smcic.api.conference.entity.ConferenceSubscription;
 import com.smcic.api.conference.mapper.ConferenceSubscriptionMapper;
@@ -43,4 +44,11 @@ public class ConferenceSubscriptionServiceImpl extends ServiceImpl<ConferenceSub
         return lambdaQuery().eq(ConferenceSubscription::getConferenceId, id).eq(ConferenceSubscription::getPhone, phone)
                 .eq(ConferenceSubscription::getStatus, 1).list();
     }
+
+    public Page<ConferenceSubscription> getByCid(Long id, Integer page, Integer pageSize){
+
+        return lambdaQuery().eq(ConferenceSubscription::getConferenceId, id).eq(ConferenceSubscription::getStatus, 1)
+                .page(new Page<>(page, pageSize));
+
+    }
 }