Merge remote-tracking branch 'origin/master'

.gitignore

@@ -10,4 +10,3 @@ bin
 /p2p-utils/.gitignore
 .idea
 *.iml
-test

mec-auth/mec-auth-server/pom.xml

@@ -70,8 +70,12 @@
 			<artifactId>kaptcha</artifactId>
 			<version>2.3.2</version>
 		</dependency>
+        <dependency>
+            <groupId>com.ym</groupId>
+            <artifactId>mec-client-api</artifactId>
+        </dependency>
 
-	</dependencies>
+    </dependencies>
 	
 	<build>
 		<plugins>

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/AuthServerApplication.java

@@ -15,7 +15,7 @@ import com.spring4all.swagger.EnableSwagger2Doc;
 
 @SpringBootApplication
 @EnableDiscoveryClient
-@EnableFeignClients
+@EnableFeignClients("com.ym.mec.im")
 @MapperScan("com.ym.mec.auth.dal.dao")
 @ComponentScan(basePackages="com.ym.mec")
 @Configuration

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/SysUserService.java

@@ -47,4 +47,11 @@ public interface SysUserService extends BaseService<Integer, SysUser> {
 	 * @param password
 	 */
 	void updatePassword(String mobile, String password);
+
+	/**
+	 * 新增用户
+	 * @param sysUser
+	 * @return
+	 */
+    Integer add(SysUser sysUser);
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/service/impl/SysUserServiceImpl.java

@@ -3,7 +3,10 @@ package com.ym.mec.auth.service.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.ym.mec.im.ImFeignService;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
+import com.ym.mec.common.entity.ImResult;
+import com.ym.mec.common.entity.ImUserModel;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -29,6 +32,9 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 	@Autowired
 	private SysRoleMenuService sysRoleMenuService;
 
+	@Autowired
+	private ImFeignService imFeignService;
+
 	@Override
 	public BaseDAO<Integer, SysUser> getDAO() {
 		return sysUserDao;
@@ -95,4 +101,17 @@ public class SysUserServiceImpl extends BaseServiceImpl<Integer, SysUser> implem
 		sysUserDao.updatePassword(mobile,password);
 	}
 
+	@Override
+	public Integer add(SysUser sysUser) {
+		sysUserDao.insert(sysUser);
+		switch (sysUser.getUserType()){
+			case TEACHER:
+
+		}
+		ImResult imResult = (ImResult)imFeignService.register(new ImUserModel(sysUser.getId().toString(), sysUser.getUsername(), sysUser.getAvatar()));
+		sysUser.setImToken(imResult.getToken());
+		sysUserDao.update(sysUser);
+		return sysUser.getId();
+	}
+
 }

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/web/controller/UserController.java

@@ -64,8 +64,7 @@ public class UserController extends BaseController {
 	@PostMapping(value = "/add", consumes = MediaType.APPLICATION_JSON_VALUE)
 	public Object add(@RequestBody SysUser sysUser) {
 //		sysUser.setPassword(new BCryptPasswordEncoder().encode(sysUser.getPassword()));
-		sysUserService.insert(sysUser);
-		return succeed(sysUser.getId());
+		return succeed(sysUserService.add(sysUser));
 	}
 
 	@ApiOperation(value = "设置密码")

mec-biz/pom.xml

@@ -25,5 +25,9 @@
 			<groupId>com.ym</groupId>
 			<artifactId>mec-auth-api</artifactId>
 		</dependency>
-	</dependencies>
+        <dependency>
+            <groupId>com.ym</groupId>
+            <artifactId>mec-client-api</artifactId>
+        </dependency>
+    </dependencies>
 </project>

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/TeacherDao.java

@@ -20,4 +20,10 @@ public interface TeacherDao extends BaseDAO<Integer, Teacher> {
      * @param user
      */
     void updateUser(SysUser user);
+
+    /**
+     * 新增sysUser
+     * @param user
+     */
+    void addSysUser(SysUser user);
 }

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.auth.api.enums.SysUserType;
 import com.ym.mec.auth.api.enums.YesOrNoEnum;
 import com.ym.mec.biz.dal.dao.OrganizationDao;
 import com.ym.mec.biz.dal.dao.SubjectDao;
@@ -11,9 +12,11 @@ import com.ym.mec.biz.dal.entity.Teacher;
 import com.ym.mec.biz.dal.page.TeacherQueryInfo;
 import com.ym.mec.biz.service.TeacherService;
 import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.entity.ImResult;
+import com.ym.mec.common.entity.ImUserModel;
 import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
-
+import com.ym.mec.im.ImFeignService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,6 +36,9 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 	private OrganizationDao organizationDao;
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
+	@Autowired
+	private ImFeignService imFeignService;
+
 
 	@Override
 	public BaseDAO<Integer, Teacher> getDAO() {
@@ -51,12 +57,15 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher>  imple
 		if(user != null && user.getId() != null){
 			throw new Exception("系统已存在该手机号的老师，请核查");
 		}
-		//保存用户表信息
-		sysUserFeignService.addUser(teacher);
-		//注册到融云
-
-		//保存教师表数据
+		teacher.setUserType(SysUserType.TEACHER);
+		teacherDao.addSysUser(teacher);
 		teacherDao.insert(teacher);
+		Object register = imFeignService.register(new ImUserModel(teacher.getId().toString(), teacher.getUsername(), teacher.getAvatar()));
+		if(register instanceof ImResult){
+			ImResult imResult = (ImResult)register;
+			teacher.setImToken(imResult.getToken());
+			teacherDao.updateUser(teacher);
+		}
 	}
 
 	@Override

mec-biz/src/main/resources/config/mybatis/SysMessageMapper.xml

@@ -154,7 +154,7 @@
 	<select id="queryPage" parameterType="map" resultMap="message">
 		select * from sys_message
 		<include refid="queryCondition" />
-		<include refid="global.orderby" />
+		order by create_on_ desc
 		<include refid="global.limit" />
 	</select>
 

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -68,6 +68,14 @@
         VALUES(#{id},#{organId},#{jobType},#{jobNature},#{isProbationPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{educationBackground},#{graduateSchool},#{technicalTitles},#{workUnit},#{subjectId},#{entryDate},#{demissionDate},#{certificateType},#{certificateNum},#{flowOrganRange},#{introduction},now(),now())
     </insert>
 
+    <insert id="addSysUser" parameterType="com.ym.mec.auth.api.entity.SysUser" useGeneratedKeys="true" keyColumn="id"
+            keyProperty="id">
+        INSERT INTO sys_user
+        (im_token_,id_,username_,salt_,phone_,avatar_,organ_id_,create_time_,update_time_,wx_openid_,qq_openid_,user_type_,gender_,nation_,birthdate_,email_,id_card_no_,esign_id_,wechat_id_)
+        VALUES(#{imToken},#{id},#{username},#{salt},#{phone},#{avatar},#{organId},now(),now(),#{wxOpenid},#{qqOpenid},#{userType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+        #{gender},#{nation},#{birthdate},#{email},#{idCardNo},#{esignId},#{wechatId})
+    </insert>
+
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Teacher">
         UPDATE teacher

mec-client-api/src/main/java/com/ym/App.java

@@ -1,13 +0,0 @@
-package com.ym;
-
-/**
- * Hello world!
- *
- */
-public class App 
-{
-    public static void main( String[] args )
-    {
-        System.out.println( "Hello World!" );
-    }
-}

mec-client-api/src/main/java/com/ym/im/ImFeignService.java → mec-client-api/src/main/java/com/ym/mec/im/ImFeignService.java

@@ -1,10 +1,9 @@
-package com.ym.im;
+package com.ym.mec.im;
 
+import com.ym.mec.im.fallback.ImFeignServiceFallback;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
-
-import com.ym.im.fallback.ImFeignServiceFallback;
 import com.ym.mec.common.config.FeignConfiguration;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImUserModel;
@@ -18,7 +17,7 @@ public interface ImFeignService {
      * @return
      */
     @PostMapping(value = "user/register")
-    Object getUser(@RequestBody ImUserModel userModel);
+    Object register(@RequestBody ImUserModel userModel);
 
     /**
      * 创建群组

mec-client-api/src/main/java/com/ym/im/fallback/ImFeignServiceFallback.java → mec-client-api/src/main/java/com/ym/mec/im/fallback/ImFeignServiceFallback.java

@@ -1,6 +1,6 @@
-package com.ym.im.fallback;
+package com.ym.mec.im.fallback;
 
-import com.ym.im.ImFeignService;
+import com.ym.mec.im.ImFeignService;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImUserModel;
 import org.springframework.stereotype.Component;
@@ -8,7 +8,7 @@ import org.springframework.stereotype.Component;
 @Component
 public class ImFeignServiceFallback implements ImFeignService {
     @Override
-    public Object getUser(ImUserModel userModel) {
+    public Object register(ImUserModel userModel) {
         return null;
     }
 

mec-client-api/src/test/java/com/ym/AppTest.java → mec-client-api/src/test/java/com/ym/FeignApplicationTest.java

@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class FeignApplicationTest
     extends TestCase
 {
     /**
@@ -15,7 +15,7 @@ public class AppTest
      *
      * @param testName name of the test case
      */
-    public AppTest( String testName )
+    public FeignApplicationTest(String testName )
     {
         super( testName );
     }
@@ -25,7 +25,7 @@ public class AppTest
      */
     public static Test suite()
     {
-        return new TestSuite( AppTest.class );
+        return new TestSuite( FeignApplicationTest.class );
     }
 
     /**

mec-common/common-core/src/main/java/com/ym/mec/common/entity/ImResult.java

@@ -0,0 +1,34 @@
+package com.ym.mec.common.entity;
+
+public class ImResult {
+
+    private String code;
+
+    private String userId;
+
+    private String token;
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+}

mec-common/common-core/src/main/java/com/ym/mec/common/entity/ImUserModel.java

@@ -11,6 +11,15 @@ public class ImUserModel {
 
     private ImUserModel[] blacklist;
 
+    public ImUserModel(String id, String name, String portrait) {
+        this.id = id;
+        this.name = name;
+        this.portrait = portrait;
+    }
+
+    public ImUserModel() {
+    }
+
     public String getId() {
         return id;
     }

mec-education/src/main/java/com/ym/mec/education/controller/ClassGroupController.java

@@ -21,7 +21,7 @@ import java.util.Objects;
  * @create: 2019-09-26 14:03
  */
 @RestController
-@RequestMapping("api/ClassGroup")
+@RequestMapping("api/classGroup")
 @Api(tags = "班级")
 @Slf4j
 public class ClassGroupController {
@@ -32,7 +32,7 @@ public class ClassGroupController {
     @PostMapping("/info")
     @ApiOperation("班级详情")
     public BaseResponse getInfo(@RequestBody ClassGroupReq classGroupReq) {
-        if (Objects.nonNull(classGroupReq.getGroupId())) {
+        if (Objects.isNull(classGroupReq.getGroupId())) {
             BaseResponse baseResponse = new BaseResponse();
             baseResponse.setReturnCode(ReturnCodeEnum.CODE_206.getCode());
             baseResponse.setMessage(ReturnCodeEnum.CODE_206.getValue());

mec-education/src/main/java/com/ym/mec/education/controller/CourseScheduleController.java

@@ -11,7 +11,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import javax.validation.Valid;
 
 /**
  * @program: mec
@@ -30,7 +29,7 @@ public class CourseScheduleController {
 
     @PostMapping("/list")
     @ApiOperation("课表列表")
-    public PageResponse list(@RequestBody @Valid ClassGroupReq classGroupReq) {
+    public PageResponse list(@RequestBody ClassGroupReq classGroupReq) {
         return courseScheduleService.getPage(classGroupReq);
     }
 }

mec-education/src/main/java/com/ym/mec/education/mapper/SubjectMapper.java

@@ -1,7 +1,7 @@
 package com.ym.mec.education.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ym.mec.education.entity.Subject;
-import com.baomidou.mybatisplus.mapper.BaseMapper;
 
 /**
  * <p>

mec-education/src/main/java/com/ym/mec/education/req/ClassGroupReq.java

@@ -4,8 +4,6 @@ import com.ym.mec.education.base.BaseQuery;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -18,8 +16,7 @@ import java.io.Serializable;
 @ApiModel(description = "班级入参")
 public class ClassGroupReq extends BaseQuery implements Serializable {
 
-    @ApiModelProperty(value = "班级id",required = true)
-    @NotNull(message = "班级id不能为空")
+    @ApiModelProperty(value = "班级id", required = true)
     private Integer groupId;
 
     private Integer type = 0;

mec-education/src/main/java/com/ym/mec/education/resp/ClassTeacherResp.java

@@ -30,4 +30,9 @@ public class ClassTeacherResp implements Serializable {
 
     private List<String> className;
 
+    /**
+     * 老师技能
+     */
+    private List<String> techSubject;
+
 }

mec-education/src/main/java/com/ym/mec/education/service/ISubjectService.java

@@ -1,7 +1,7 @@
 package com.ym.mec.education.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.ym.mec.education.entity.Subject;
-import com.baomidou.mybatisplus.service.IService;
 
 /**
  * <p>

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

@@ -1,5 +1,4 @@
 package com.ym.mec.education.service.impl;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -58,6 +57,9 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
     @Autowired
     private IStudentAttendanceService studentAttendanceService;
 
+    @Autowired
+    private ISubjectService subjectService;
+
 
     @Override
     public PageResponse groupList(MusicGroupReq req) {
@@ -316,9 +318,9 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
                 List<ClassGroupTeacherMapper> list = classGroupTeacherMapperService.list(queryWrapper2);
                 if(!CollectionUtils.isEmpty(list)){
 
-                    list.forEach(stud ->{
+                    list.forEach(tech ->{
                         ClassTeacherResp classTeacherResp = new ClassTeacherResp();
-                        List<ClassTeacherResp> removeList = classTeacherResps.stream().filter(c ->c.getUserId().equals(stud.getUserId()) && c.getClassGroupId().equals(stud.getClassGroupId())).collect(Collectors.toList());
+                        List<ClassTeacherResp> removeList = classTeacherResps.stream().filter(c ->c.getUserId().equals(tech.getUserId()) && c.getClassGroupId().equals(tech.getClassGroupId())).collect(Collectors.toList());
                         HashSet set = new HashSet<>();
                         if(!CollectionUtils.isEmpty(removeList)){
 
@@ -327,16 +329,31 @@ public class MusicGroupServiceImpl extends ServiceImpl<MusicGroupMapper, MusicGr
                             set.add(e.getName());
                             classTeacherResp.setClassName(new ArrayList<>(set));
                         }else{
-                            SysUser sysUser = sysUserService.getById(stud.getUserId());
+                            SysUser sysUser = sysUserService.getById(tech.getUserId());
                             if(sysUser != null){
                                 classTeacherResp.setName(sysUser.getRealName());
                                 classTeacherResp.setAvatar(sysUser.getAvatar());
                             }
-                            classTeacherResp.setUserId(stud.getUserId());
-                            classTeacherResp.setClassGroupId(stud.getClassGroupId());
+                            classTeacherResp.setUserId(tech.getUserId());
+                            classTeacherResp.setClassGroupId(tech.getClassGroupId());
 
                             set.add(e.getName());
                             classTeacherResp.setClassName(new ArrayList<>(set));
+
+                            //查询老师技能
+                            Teacher  teacher =  teacherService.getById(tech.getUserId());
+                            if(teacher != null && !StringUtils.isEmpty(teacher.getSubjectId())){
+                                String ids[] = teacher.getSubjectId().split(",");
+                                List<String> stringB = Arrays.asList(ids);
+                                QueryWrapper<Subject> queryWrapper = new QueryWrapper<>();
+                                queryWrapper.in("id_",stringB);
+                                List<Subject> subjectList =  subjectService.list(queryWrapper);
+                                if(!CollectionUtils.isEmpty(subjectList)){
+                                    List<String> subName = subjectList.stream().map(Subject::getName).collect(Collectors.toList());
+                                    classTeacherResp.setTechSubject(subName);
+                                }
+                            }
+
                             classTeacherResps.add(classTeacherResp);
                         }
 

mec-education/src/main/java/com/ym/mec/education/service/impl/SubjectServiceImpl.java

@@ -1,9 +1,9 @@
 package com.ym.mec.education.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ym.mec.education.entity.Subject;
 import com.ym.mec.education.mapper.SubjectMapper;
 import com.ym.mec.education.service.ISubjectService;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

mec-im/src/main/java/com/ym/job/ScheduleManager.java

@@ -6,8 +6,8 @@ import com.ym.config.RoomProperties;
 import com.ym.config.WhiteBoardProperties;
 import com.ym.dao.RoomDao;
 import com.ym.dao.RoomMemberDao;
-import com.ym.im.IMHelper;
-import com.ym.im.message.TicketExpiredMessage;
+import com.ym.mec.im.IMHelper;
+import com.ym.mec.im.message.TicketExpiredMessage;
 import com.ym.pojo.ScheduledTaskInfo;
 import com.ym.service.RoomService;
 import lombok.extern.slf4j.Slf4j;

mec-im/src/main/java/com/ym/im/BaseMessage.java → mec-im/src/main/java/com/ym/mec/im/BaseMessage.java

@@ -1,4 +1,4 @@
-package com.ym.im;
+package com.ym.mec.im;
 
 import com.alibaba.fastjson.JSONObject;
 

mec-im/src/main/java/com/ym/im/IMHelper.java → mec-im/src/main/java/com/ym/mec/im/IMHelper.java

@@ -1,4 +1,4 @@
-package com.ym.im;
+package com.ym.mec.im;
 
 import com.alibaba.fastjson.JSON;
 import com.ym.http.HttpHelper;

mec-im/src/main/java/com/ym/im/message/ApplyForSpeechMessage.java → mec-im/src/main/java/com/ym/mec/im/message/ApplyForSpeechMessage.java

@@ -1,6 +1,6 @@
-package com.ym.im.message;
+package com.ym.mec.im.message;
 
-import com.ym.im.BaseMessage;
+import com.ym.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

mec-im/src/main/java/com/ym/im/message/AssistantTransferMessage.java → mec-im/src/main/java/com/ym/mec/im/message/AssistantTransferMessage.java

@@ -1,6 +1,6 @@
-package com.ym.im.message;
+package com.ym.mec.im.message;
 
-import com.ym.im.BaseMessage;
+import com.ym.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

mec-im/src/main/java/com/ym/im/message/ControlDeviceNotifyMessage.java → mec-im/src/main/java/com/ym/mec/im/message/ControlDeviceNotifyMessage.java

@@ -1,6 +1,6 @@
-package com.ym.im.message;
+package com.ym.mec.im.message;
 
-import com.ym.im.BaseMessage;
+import com.ym.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

mec-im/src/main/java/com/ym/im/message/DeviceStateChangedMessage.java → mec-im/src/main/java/com/ym/mec/im/message/DeviceStateChangedMessage.java

@@ -1,6 +1,6 @@
-package com.ym.im.message;
+package com.ym.mec.im.message;
 
-import com.ym.im.BaseMessage;
+import com.ym.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

mec-im/src/main/java/com/ym/im/message/DisplayMessage.java → mec-im/src/main/java/com/ym/mec/im/message/DisplayMessage.java

@@ -1,6 +1,6 @@
-package com.ym.im.message;
+package com.ym.mec.im.message;
 
-import com.ym.im.BaseMessage;
+import com.ym.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

mec-im/src/main/java/com/ym/im/message/MemberChangedMessage.java → mec-im/src/main/java/com/ym/mec/im/message/MemberChangedMessage.java

@@ -1,6 +1,6 @@
-package com.ym.im.message;
+package com.ym.mec.im.message;
 
-import com.ym.im.BaseMessage;
+import com.ym.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

mec-im/src/main/java/com/ym/im/message/RoleChangedMessage.java → mec-im/src/main/java/com/ym/mec/im/message/RoleChangedMessage.java

@@ -1,6 +1,6 @@
-package com.ym.im.message;
+package com.ym.mec.im.message;
 
-import com.ym.im.BaseMessage;
+import com.ym.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

mec-im/src/main/java/com/ym/im/message/SpeechResultMessage.java → mec-im/src/main/java/com/ym/mec/im/message/SpeechResultMessage.java

@@ -1,6 +1,6 @@
-package com.ym.im.message;
+package com.ym.mec.im.message;
 
-import com.ym.im.BaseMessage;
+import com.ym.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

mec-im/src/main/java/com/ym/im/message/TicketExpiredMessage.java → mec-im/src/main/java/com/ym/mec/im/message/TicketExpiredMessage.java

@@ -1,6 +1,6 @@
-package com.ym.im.message;
+package com.ym.mec.im.message;
 
-import com.ym.im.BaseMessage;
+import com.ym.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

mec-im/src/main/java/com/ym/im/message/TurnPageMessage.java → mec-im/src/main/java/com/ym/mec/im/message/TurnPageMessage.java

@@ -1,6 +1,6 @@
-package com.ym.im.message;
+package com.ym.mec.im.message;
 
-import com.ym.im.BaseMessage;
+import com.ym.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

mec-im/src/main/java/com/ym/im/message/UpgradeRoleMessage.java → mec-im/src/main/java/com/ym/mec/im/message/UpgradeRoleMessage.java

@@ -1,6 +1,6 @@
-package com.ym.im.message;
+package com.ym.mec.im.message;
 
-import com.ym.im.BaseMessage;
+import com.ym.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

mec-im/src/main/java/com/ym/im/message/WhiteboardMessage.java → mec-im/src/main/java/com/ym/mec/im/message/WhiteboardMessage.java

@@ -1,6 +1,6 @@
-package com.ym.im.message;
+package com.ym.mec.im.message;
 
-import com.ym.im.BaseMessage;
+import com.ym.mec.im.BaseMessage;
 import lombok.Getter;
 import lombok.Setter;
 

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

@@ -9,12 +9,12 @@ import com.ym.dao.RoomDao;
 import com.ym.dao.RoomMemberDao;
 import com.ym.dao.UserDao;
 import com.ym.dao.WhiteboardDao;
-import com.ym.im.IMHelper;
-import com.ym.im.message.*;
+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.common.security.SecurityUtils;
+import com.ym.mec.im.message.*;
 import com.ym.pojo.*;
 import com.ym.service.RoomService;
 import com.ym.utils.CheckUtils;

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

@@ -1,10 +1,7 @@
 package com.ym.service.Impl;
 
-import com.ym.common.ApiException;
-import com.ym.common.ErrorEnum;
 import com.ym.dao.UserDao;
-import com.ym.im.IMHelper;
-import com.ym.pojo.IMTokenInfo;
+import com.ym.mec.im.IMHelper;
 import com.ym.service.UserService;
 import io.rong.RongCloud;
 import io.rong.methods.user.User;

mec-student/src/main/java/com/ym/mec/student/controller/CourseController.java

@@ -40,4 +40,14 @@ public class CourseController extends BaseController {
         }
         return succeed(classGroupService.queryUserGroups(sysUser.getId()));
     }
+
+    /*@ApiOperation(value = "根据群编号，获取群组基本信息")
+    @GetMapping("/findGroupById")
+    public Object findGroupById(Integer classGroupId){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed("获取用户信息失败");
+        }
+        return succeed(musicGroupService.findTeachersByStuId(sysUser.getId()));
+    }*/
 }

mec-web/src/main/java/com/ym/mec/web/controller/SysConfigController.java

@@ -4,9 +4,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
 import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,13 +32,7 @@ public class SysConfigController extends BaseController {
 	@GetMapping(value = "list")
 	public Object configList() {
 		List<SysConfig> configs = sysConfigService.findAll(null);
-		Map<String, Object> map = new HashMap<String, Object>();
-		if (configs != null && configs.size() > 0) {
-			for (SysConfig config : configs) {
-				map.put(config.getParamName(), config.getParanValue());
-			}
-		}
-		return succeed(map);
+		return succeed(configs);
 	}
 
 	@ApiOperation(value = "修改参数")