管乐迷优化需求

mec-application/src/main/java/com/ym/mec/web/controller/education/ImGroupNoticeController.java

@@ -34,6 +34,10 @@ public class ImGroupNoticeController extends BaseController {
     @RequestMapping("/add")
     public HttpResponseResult<Long> add(ImGroupNotice imGroupNotice ) {
         imGroupNotice.setOperatorId(sysUserService.getUserId().longValue());
+        if(imGroupNotice.isIsTop()){
+            //置顶取消
+            imGroupNoticeService.getDao().updateTop(imGroupNotice.getImGroupId(),false);
+        }
         return succeed(imGroupNoticeService.insert(imGroupNotice));
     }
 

mec-biz/src/main/java/com/ym/mec/biz/service/ImGroupNoticeService.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.service;
 
+import com.ym.mec.biz.dal.dao.ImGroupNoticeDao;
 import com.ym.mec.biz.dal.dto.ImGroupNoticeDto;
 import com.ym.mec.biz.dal.entity.ImGroupNotice;
 import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
@@ -18,4 +19,6 @@ public interface ImGroupNoticeService extends BaseService<Long, ImGroupNotice> {
 	ImGroupNoticeDto queryLatestNotice(String imGroupId);
 
 	void modify(ImGroupNotice imGroupNotice);
+
+	ImGroupNoticeDao getDao();
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/GroupClassServiceImpl.java

@@ -65,8 +65,6 @@ public class GroupClassServiceImpl implements GroupClassService {
     @Autowired
     private SysTenantAccountService sysTenantAccountService;
     @Autowired
-    private ActivityUserMapperService activityUserMapperService;
-    @Autowired
     private StudentDao studentDao;
     @Autowired
     private PracticeGroupService practiceGroupService;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupNoticeServiceImpl.java

@@ -1,25 +1,24 @@
 package com.ym.mec.biz.service.impl;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import com.ym.mec.common.exception.BizException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
 import com.ym.mec.biz.dal.dao.ImGroupNoticeDao;
 import com.ym.mec.biz.dal.dto.ImGroupNoticeDto;
 import com.ym.mec.biz.dal.entity.ImGroupNotice;
 import com.ym.mec.biz.dal.page.ImGroupNoticeQueryInfo;
 import com.ym.mec.biz.service.ImGroupNoticeService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
 import com.ym.mec.util.collection.MapUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Service
 public class ImGroupNoticeServiceImpl extends BaseServiceImpl<Long, ImGroupNotice>  implements ImGroupNoticeService {
 	
@@ -62,9 +61,16 @@ public class ImGroupNoticeServiceImpl extends BaseServiceImpl<Long, ImGroupNotic
         if (imGroupNotice.getId() == null) {
 			throw new BizException("id不能为空");
 		}
-		//置顶取消
-		imGroupNoticeDao.updateTop(imGroupNotice.getImGroupId(),false);
+		if(imGroupNotice.isIsTop()){
+			//置顶取消
+			imGroupNoticeDao.updateTop(imGroupNotice.getImGroupId(),false);
+		}
 		imGroupNoticeDao.update(imGroupNotice);
 	}
 
+	@Override
+	public ImGroupNoticeDao getDao() {
+		return imGroupNoticeDao;
+	}
+
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -1773,6 +1773,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
         }
         vipGroup.setStatus(VipGroupStatusEnum.DELETE);
         vipGroupDao.update(vipGroup);
+        ClassGroup classGroup = classGroupDao.findByVipGroup(vipGroupId, VIP.getCode());
+        //解散群聊
+        imGroupService.cancel(classGroup.getId().toString());
         groupClassService.hideGroupInfo(vipGroupId.toString(), "VIP".equals(vipGroup.getGroupType())?GroupType.VIP:GroupType.LIVE);
     }