Merge remote-tracking branch 'origin/zx_1026_1111' into zx_1026_1111

mec-application/src/main/java/com/ym/mec/student/controller/ActivityController.java

@@ -24,6 +24,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
@@ -138,6 +139,7 @@ public class ActivityController extends BaseController {
         return succeed(jsonObject.getJSONObject("musical"));
     }
 
+
     @ApiOperation(value = "学员已购买的双十一活动信息")
     @GetMapping("/queryStudentDoubleEleven2022Order")
     public Object queryStudentDoubleEleven2022Order() {

mec-application/src/main/java/com/ym/mec/student/controller/StudentController.java

@@ -2,9 +2,11 @@ package com.ym.mec.student.controller;
 
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dto.RegisterUserDto;
 import com.ym.mec.biz.dal.entity.Student;
 import com.ym.mec.biz.dal.entity.StudentPreRegistration;
 import com.ym.mec.biz.service.StudentService;
+import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -25,6 +27,8 @@ public class StudentController extends BaseController {
 
     @Resource
     private SysUserFeignService sysUserFeignService;
+	@Resource
+	private SysUserService sysUserService;
     @Autowired
     private StudentService studentService;
 
@@ -57,4 +61,18 @@ public class StudentController extends BaseController {
 		}
 		return succeed();
 	}
+
+	@ApiOperation("补充基本信息")
+	@PostMapping(value = "/updateBasicInfo")
+	public Object updateBasicInfo(RegisterUserDto registerUserDto) {
+		SysUser user = sysUserService.getUser();
+		user.setUsername(registerUserDto.getUsername());
+		sysUserService.updateSysUser(user);
+		Student student = studentService.get(user.getId());
+		student.setSubjectIdList(registerUserDto.getSubjectId().toString());
+		student.setCurrentGradeNum(registerUserDto.getCurrentGradeNum());
+		student.setUpdateTime(new Date());
+		studentService.update(student);
+		return succeed();
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/BasicUserDto.java

@@ -1,6 +1,5 @@
 package com.ym.mec.biz.dal.dto;
 
-import com.ym.mec.biz.dal.enums.JoinCourseType;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Objects;

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/RegisterUserDto.java

@@ -0,0 +1,20 @@
+package com.ym.mec.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class RegisterUserDto {
+
+    @ApiModelProperty(value = "学生姓名", required = false)
+    private String username;
+
+    @ApiModelProperty(value = "声部", required = false)
+    private Integer subjectId;
+
+    @ApiModelProperty(value = "年级(数字表示)", required = false)
+    private Integer currentGradeNum;
+
+//    @ApiModelProperty(value = "当前所在班级", required = false)
+//    private String currentClass;
+}

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

@@ -13,12 +13,7 @@ import com.microsvc.toolkit.middleware.im.message.MessageWrapper;
 import com.microsvc.toolkit.middleware.im.message.TencentRequest;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.auth.api.enums.SysUserType;
-import com.ym.mec.biz.dal.dao.ClassGroupTeacherMapperDao;
-import com.ym.mec.biz.dal.dao.ImGroupDao;
-import com.ym.mec.biz.dal.dao.ImGroupMemberDao;
-import com.ym.mec.biz.dal.dao.ImUserFriendDao;
-import com.ym.mec.biz.dal.dao.MusicGroupDao;
-import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.dto.ImGroupDto;
 import com.ym.mec.biz.dal.dto.ImGroupMemberDto;
 import com.ym.mec.biz.dal.dto.NameDto;
@@ -92,6 +87,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
     private ImGroupMemberDao imGroupMemberDao;
 
     @Resource
+    private ImGroupNoticeDao imGroupNoticeDao;
+
+    @Resource
     private ImGroupMemberService imGroupMemberService;
 
     @Resource
@@ -282,14 +280,11 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
     @Transactional(rollbackFor = Exception.class)
     public boolean cancel(String imGroupId) {
         // 删除群成员
-//        imGroupMemberDao.deleteByImGroupId(imGroupId);
-//        // 删除群公告
-//        imGroupNoticeDao.deleteByImGroupId(imGroupId);
-//        // 删除群信息
-//        imGroupDao.delete(imGroupId);
-//
-//        imFeignService.groupDismiss(new GroupModel(imGroupId, null));
-
+        imGroupMemberDao.deleteByImGroupId(imGroupId);
+        // 删除群公告
+        imGroupNoticeDao.deleteByImGroupId(imGroupId);
+        // 删除群信息
+        imGroupDao.delete(imGroupId);
         try {
             imGroupCoreService.groupDismiss(imGroupId);
         } catch (Exception e) {