update

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.entity.*;
+import com.ym.mec.biz.dal.enums.MusicGroupStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
@@ -28,6 +29,17 @@ public class SubFeeSettingDto {
     @ApiModelProperty(value = "乐团编号（修改时用）",required = false)
     private String musicGroupId;
 
+    @ApiModelProperty(value = "乐团状态（修改时用）",required = false)
+    private MusicGroupStatusEnum musicGroupStatus;
+
+    public MusicGroupStatusEnum getMusicGroupStatus() {
+        return musicGroupStatus;
+    }
+
+    public void setMusicGroupStatus(MusicGroupStatusEnum musicGroupStatus) {
+        this.musicGroupStatus = musicGroupStatus;
+    }
+
     public String getMusicGroupId() {
         return musicGroupId;
     }

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

@@ -202,6 +202,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             if(musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT && musicGroup.getStatus() != MusicGroupStatusEnum.AUDIT_FAILED){
                 throw new Exception("当前乐团状态不支持此操作");
             }
+            if(subFeeSettingDto.getMusicGroupStatus() == null){
+                throw new Exception("参数校验异常");
+            }
+            musicGroup.setStatus(subFeeSettingDto.getMusicGroupStatus());
+            musicGroup.setUpdateTime(new Date());
+            musicGroupDao.update(musicGroup);
             //记录日志信息
             musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId,"修改乐团计划声部、乐器",sysUser.getId(), JSONObject.toJSONString(subFeeSettingDto)));
             //删除原有的乐团声部规划

mec-im/pom.xml

@@ -84,6 +84,10 @@
       <version>2.8.1</version>
     </dependency>
     <dependency>
+      <groupId>com.ym</groupId>
+      <artifactId>mec-biz</artifactId>
+    </dependency>
+    <dependency>
       <groupId>cn.rongcloud.im</groupId>
       <artifactId>server-sdk-java</artifactId>
       <version>3.0.6</version>

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -9,11 +9,15 @@ import com.ym.dao.RoomDao;
 import com.ym.dao.RoomMemberDao;
 import com.ym.dao.UserDao;
 import com.ym.dao.WhiteboardDao;
-import com.ym.mec.im.IMHelper;
 import com.ym.job.ScheduleManager;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.dao.TeacherDao;
+import com.ym.mec.biz.dal.entity.Teacher;
+import com.ym.mec.biz.dal.enums.SignStatusEnum;
+import com.ym.mec.biz.service.TeacherAttendanceService;
 import com.ym.mec.common.security.SecurityUtils;
+import com.ym.mec.im.IMHelper;
 import com.ym.mec.im.message.*;
 import com.ym.pojo.*;
 import com.ym.service.RoomService;
@@ -62,6 +66,12 @@ public class RoomServiceImpl implements RoomService {
     private UserDao userDao;
 
     @Autowired
+    private TeacherDao teacherDao;
+
+    @Autowired
+    private TeacherAttendanceService teacherAttendanceService;
+
+    @Autowired
     private IMProperties imProperties;
 
     @Autowired
@@ -77,15 +87,18 @@ public class RoomServiceImpl implements RoomService {
     @Transactional
     @Override
     public RoomResult joinRoom(String userName, String roomId, boolean isAudience, boolean isDisableCamera) throws ApiException, Exception {
-        String token = SecurityUtils.getAuthenticationValue();
-
         CheckUtils.checkArgument(userName != null, "userName must't be null");
         CheckUtils.checkArgument(roomId != null, "roomId must't be null");
 
         log.info("joinRoom: roomId={}, userName={}, isAudience={}, isDisableCamera={}", roomId, userName, isAudience, isDisableCamera);
         roomId = "DAYA" + roomId;
-//        String userId = getUser().getUserId().toString();
         String userId = sysUserFeignService.queryUserInfo().getId().toString();
+        Teacher teacher = teacherDao.get(Integer.parseInt(userId));
+        if(teacher == null){
+            teacherAttendanceService.addTeacherAttendanceRecord(Integer.parseInt(roomId),Integer.parseInt(userId), SignStatusEnum.SIGN_IN,true);
+        }else {
+
+        }
 
         String display = "";
         Date curTime = DateTimeUtils.currentUTC();