线上系统繁忙处理

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

@@ -3835,17 +3835,19 @@ public class PracticeGroupServiceImpl extends BaseServiceImpl<Long, PracticeGrou
         for (PracticeCourseDto userPracticeGroup : userPracticeGroups) {
             JSONArray coursesArry = new JSONArray();
             JSONObject courseJson = JSON.parseObject(userPracticeGroup.getDrillTimesJson());
-            for (String weekNumStr : courseJson.keySet()) {
-                JSONObject newCourseJson = new JSONObject();
-                newCourseJson.put("weekName", DateUtil.weekNumNormalWeekNameMap.get(Integer.parseInt(weekNumStr)));
-                LocalTime courseStartTime = LocalTime.parse(courseJson.getString(weekNumStr), DateUtil.timeFormatter);
-                LocalTime courseEndTime = courseStartTime.plusMinutes(practiceCourseMinutes);
-                if(PracticeGroupType.COME_ON_PACKAGE.equals(userPracticeGroup.getType())){
-                    courseEndTime = courseStartTime.plusMinutes(2*practiceCourseMinutes);
+            if(courseJson != null){
+                for (String weekNumStr : courseJson.keySet()) {
+                    JSONObject newCourseJson = new JSONObject();
+                    newCourseJson.put("weekName", DateUtil.weekNumNormalWeekNameMap.get(Integer.parseInt(weekNumStr)));
+                    LocalTime courseStartTime = LocalTime.parse(courseJson.getString(weekNumStr), DateUtil.timeFormatter);
+                    LocalTime courseEndTime = courseStartTime.plusMinutes(practiceCourseMinutes);
+                    if(PracticeGroupType.COME_ON_PACKAGE.equals(userPracticeGroup.getType())){
+                        courseEndTime = courseStartTime.plusMinutes(2*practiceCourseMinutes);
+                    }
+                    newCourseJson.put("startTime", courseStartTime.format(DateUtil.timeFormatter));
+                    newCourseJson.put("endTime", courseEndTime.format(DateUtil.timeFormatter));
+                    coursesArry.add(newCourseJson);
                 }
-                newCourseJson.put("startTime", courseStartTime.format(DateUtil.timeFormatter));
-                newCourseJson.put("endTime", courseEndTime.format(DateUtil.timeFormatter));
-                coursesArry.add(newCourseJson);
             }
             userPracticeGroup.setDrillTimesJson(coursesArry.toJSONString());
         }

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

@@ -719,7 +719,7 @@ public class StudentManageServiceImpl implements StudentManageService {
             studentExtracurricularExercisesSituationDao.deleteByStudent(student.getId(), monDayDate.toString());
         }
         webFeignService.updateNickName(userId,student.getUsername());
-        imFeignService.update(new ImUserModel(userId.toString(),student.getUsername(),sysUser1.getAvatar()));
+        imFeignService.update(new ImUserModel(userId.toString(),student.getUsername(),sysUser1 == null ? null:sysUser1.getAvatar()));
         return userId;
     }
 

mec-teacher/src/main/java/com/ym/mec/teacher/controller/ImGroupController.java

@@ -52,9 +52,11 @@ public class ImGroupController extends BaseController {
 
 	@ApiOperation("查询群详情")
 	@GetMapping(value = "/queryGroupDetail")
-	public Object queryGroupList(Long imGroupId) {
-
-		return succeed(imGroupService.get(imGroupId));
+	public Object queryGroupDetail(String imGroupId) {
+		if (imGroupId.contains("S") || imGroupId.contains("I")){
+			imGroupId = imGroupId.substring(1);
+		}
+		return succeed(imGroupService.get(Long.parseLong(imGroupId)));
 	}
 
 	@ApiOperation("查询群成员列表")