Merge remote-tracking branch 'origin/master'

edu-im/edu-im-server/src/main/java/com/keao/edu/im/controller/RoomController.java

@@ -89,22 +89,7 @@ public class RoomController{
     public Object statusSync(@RequestBody String body) throws Exception {
         ChannelStateNotify notify = JSONObject.parseObject(body, ChannelStateNotify.class);
         log.info("statusSyncParam: {}",JSONObject.toJSON(notify));
-
-        if(notify.getEvent() == 1){
-            //同步房间信息
-        }else if(notify.getEvent() == 2){
-            //房间创建
-        }else if(notify.getEvent() == 3){
-            //房间销毁
-        }else if(notify.getEvent() == 11){
-            //成员加入
-            roomService.configRecord(notify.getChannelId(),notify.getUserId());
-        }else if(notify.getEvent() == 12){
-            //成员退出
-            roomService.leaveRoom(null,notify.getChannelId(),notify.getUserId());
-        }else if(notify.getEvent() == 20){
-            //资源发生变动
-        }
+        boolean b = roomService.statusSync(notify);
         return new BaseResponse<>();
     }
 

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/Impl/RoomServiceImpl.java

@@ -86,7 +86,7 @@ public class RoomServiceImpl implements RoomService {
     @Override
     public void configRecord(String roomId,String userId) throws Exception {
         ExamRoom examRoom = eduUserFeignService.getExamRoom(Integer.parseInt(roomId));
-        RoomMember roomMembers = roomMemberDao.findByRidAndUid(roomId, userId);
+        RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
 //        imHelper.configRecord(roomId,userId);
     }
 
@@ -1491,82 +1491,32 @@ public class RoomServiceImpl implements RoomService {
 
     @Override
     @Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
-    public boolean statusSync(String roomId,String userId) throws Exception {
-        log.info("statusSync: roomId={}, userId={}", roomId, userId);
-        RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
-        if(roomMember != null){
-//            SysUser sysUser = sysUserFeignService.queryUserById(Integer.parseInt(userId));
-
-        	List<Room> roomList = roomDao.findByRid(roomId);
-            if (roomList.size() == 0) {
-                log.error("room : {} not exist ", roomId);
-                throw new ApiException(ErrorEnum.ERR_ROOM_NOT_EXIST);
-            }
-
-//            List<RoomMember> roomMemberList = roomMemberDao.findByRidAndUid(roomId, userId);
-            /*if (roomMemberList.size() == 0) {
-                log.error("{} not exist in room: {}", userId, roomId);
-                throw new ApiException(ErrorEnum.ERR_USER_NOT_EXIST_IN_ROOM);
+    public boolean statusSync(ChannelStateNotify notify) throws Exception {
+//        String roomId = notify.getChannelId();
+//        String userId = notify.getUserId();
+//        ExamRoom examRoom = eduUserFeignService.getExamRoom(Integer.parseInt(roomId));
+//        RoomMember roomMember = roomMemberDao.findByRidAndUid(roomId, userId);
+        if(notify.getEvent() == 1){
+            //同步房间信息
+        }else if(notify.getEvent() == 2){
+            //房间创建
+        }else if(notify.getEvent() == 3){
+            //房间销毁
+        }else if(notify.getEvent() == 11){
+            //成员加入
+            /*if(roomMember.getRole() != 3){
+                this.configRecord(roomId,userId);
             }*/
-
-            int userRole = roomMember.getRole();
-            log.info("statusSync: roomId={}, role={}", roomId, RoleEnum.getEnumByValue(userRole));
-
-            if (userRole == RoleEnum.MainTeacher.getValue() || userRole == RoleEnum.AssistantTeacher.getValue()) {
-                if (isUserDisplay(roomList.get(0), userId)) {
-                    try {
-                        updateDisplay(roomId, userId, "", 0);
-                    }catch (Exception e){
-                        log.error(e.getMessage());
-                    }
-                    log.info("clear display cause speaker leave: roomId={}", roomId);
-                } else {
-                    log.info("don't update current display: room={}, role={}", roomList.get(0), RoleEnum.getEnumByValue(userRole));
-                }
-            } else {
-                log.info("don't update current display: room={}, userRole={}", roomList.get(0), RoleEnum.getEnumByValue(userRole));
-            }
-
-            if (roomMemberDao.countByRid(roomId) == 1) {
-                IMApiResultInfo apiResultInfo = null;
-                try {
-                    apiResultInfo = imHelper.dismiss(userId, roomId);
-                    if (apiResultInfo.getCode() == 200) {
-//                        roomMemberDao.deleteUserByRidAndUid(roomId, userId);
-                        roomDao.deleteByRid(roomId);
-                        deleteWhiteboardByUser(roomId, userId);
-                        log.info("dismiss the room: {},userId: {}", roomId,userId);
-                    } else {
-                        log.error("{} exit {} room error: {}", userId, roomId, apiResultInfo.getErrorMessage());
-                        throw new ApiException(ErrorEnum.ERR_EXIT_ROOM_ERROR, apiResultInfo.getErrorMessage());
-                    }
-                } catch (Exception e) {
-                    log.error("{} exit {} room error: {}", userId, roomId, e.getMessage());
-                    throw new ApiException(ErrorEnum.ERR_EXIT_ROOM_ERROR, e.getMessage());
-                }
-            } else {
-                MemberChangedMessage msg = new MemberChangedMessage(MemberChangedMessage.Action_Leave, userId, userRole);
-                imHelper.publishMessage(userId, roomId, msg);
-
-                /*IMApiResultInfo apiResultInfo = null;
-                try {
-                    apiResultInfo = imHelper.quit(new String[]{userId}, roomId);
-                    if (apiResultInfo.isSuccess()) {
-                        roomMemberDao.deleteUserByRidAndUid(roomId, userId);
-                        MemberChangedMessage msg = new MemberChangedMessage(MemberChangedMessage.Action_Leave, userId, userRole);
-                        imHelper.publishMessage(userId, roomId, msg);
-                        imHelper.quit(new String[]{userId}, roomId);
-                        log.info("quit group: roomId={},userId: {}", roomId,userId);
-                    } else {
-                        throw new ApiException(ErrorEnum.ERR_EXIT_ROOM_ERROR, apiResultInfo.getErrorMessage());
-                    }
-                } catch (Exception e) {
-                    log.error("leave room error: roomId={}, {}", roomId, e.getMessage());
-                    throw new ApiException(ErrorEnum.ERR_EXIT_ROOM_ERROR);
-                }*/
-            }
-            userDao.deleteByUid(userId);
-            return true;
+        }else if(notify.getEvent() == 12){
+            //成员退出
+            /*if(roomMember.getRole() != 3){
+                this.configRecord(roomId,userId);
+            }else {
+                this.stopRecord(roomId,userId);
+            }*/
+            this.leaveRoom(null,notify.getChannelId(),notify.getUserId());
+        }else if(notify.getEvent() == 20){
+            //资源发生变动
         }
         return true;
     }

edu-im/edu-im-server/src/main/java/com/keao/edu/im/service/RoomService.java

@@ -82,7 +82,7 @@ public interface RoomService {
     public Boolean memberOnlineStatus(List<ReqMemberOnlineStatus> statusList, String nonce, String timestamp, String signature) throws ApiException, Exception;
     public void userIMOfflineKick(String userId);
 
-    boolean statusSync(String roomId,String userId) throws Exception;
+    boolean statusSync(ChannelStateNotify notify) throws Exception;
 
     /**
      * 发送消息

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/dao/SubjectDao.java

@@ -16,7 +16,7 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      * @param parentId
      * @return
      */
-    List<Subject> findByParentId(@Param("parentId") Integer parentId, @Param("delFlag") YesOrNoEnum delFlag, @Param("tenantId") String tenantId);
+    List<Subject> findByParentId(@Param("parentId") Integer parentId, @Param("delFlag") YesOrNoEnum delFlag);
 
     /**
      * 根据声部id字符串查询
@@ -39,7 +39,7 @@ public interface SubjectDao extends BaseDAO<Integer, Subject> {
      *
      * @return
      */
-    List<Subject> findSubSubjects(@Param("tenantId") Integer tenantId);
+    List<Subject> findSubSubjects();
 
     List<Subject> findBySubjectByIdList(@Param("subjectIdList") String subjectIdList);
 

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/entity/Subject.java

@@ -39,7 +39,7 @@ public class Subject {
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<Subject> subjects;
 
-	private String tenantId;
+//	private String tenantId;
 
 	public String getParentName() {
 		return parentName;
@@ -57,13 +57,13 @@ public class Subject {
 		this.name = name;
 	}
 
-	public String getTenantId() {
+	/*public String getTenantId() {
 		return tenantId;
 	}
 
 	public void setTenantId(String tenantId) {
 		this.tenantId = tenantId;
-	}
+	}*/
 
 	public List<Subject> getSubjects() {
 		return subjects;

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/SubjectService.java

@@ -29,7 +29,7 @@ public interface SubjectService extends BaseService<Integer, Subject> {
      * 获取子级科目列表
      * @return
      */
-    List<Subject> findSubSubjects(Integer tenantId);
+    List<Subject> findSubSubjects();
 
     List<Subject> findBySubjectByIdList(List<Integer> subjectIdList);
 

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/SubjectServiceImpl.java

@@ -10,12 +10,12 @@ import com.keao.edu.user.entity.Subject;
 import com.keao.edu.user.enums.YesOrNoEnum;
 import com.keao.edu.user.page.SubjectQueryInfo;
 import com.keao.edu.user.service.SubjectService;
-import com.keao.edu.util.collection.MapUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.*;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implements SubjectService {
@@ -32,7 +32,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
     public PageInfo<Subject> queryPageTree(SubjectQueryInfo queryInfo) {
         PageInfo<Subject> pageInfo = queryPage(queryInfo);
         for (Subject subject:pageInfo.getRows()) {
-            subject = getTree(subject,queryInfo.getDelFlag(),queryInfo.getTenantId());
+            subject = getTree(subject,queryInfo.getDelFlag());
         }
         return pageInfo;
     }
@@ -43,7 +43,7 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
             Subject subject1 = subjectDao.get(subject.getId());
             if(subject1.getParentSubjectId() == 0){
                 //是否有子类
-                List<Subject> byParentId = subjectDao.findByParentId(subject.getId(), YesOrNoEnum.NO, subject.getTenantId());
+                List<Subject> byParentId = subjectDao.findByParentId(subject.getId(), YesOrNoEnum.NO);
                 if(byParentId != null && byParentId.size() > 0){
                     throw new BizException("操作失败：有未删除的专业");
                 }
@@ -80,25 +80,25 @@ public class SubjectServiceImpl extends BaseServiceImpl<Integer, Subject> implem
     }
 
 
-    private Subject getTree(Subject sub,YesOrNoEnum yesOrNoEnum,String tenantId){
+    private Subject getTree(Subject sub,YesOrNoEnum yesOrNoEnum){
         //得到根节点对象
         //获取子节点list
-        List<Subject> subjects = subjectDao.findByParentId(sub.getId(),yesOrNoEnum,tenantId);
+        List<Subject> subjects = subjectDao.findByParentId(sub.getId(),yesOrNoEnum);
         //如果存在子节点
         if(subjects != null && subjects.size() > 0) {
             //将子节点list放入父节点对象
             sub.setSubjects(subjects);
             //遍历子节点....
             for (Subject subject : subjects) {
-                getTree(subject,yesOrNoEnum,tenantId);
+                getTree(subject,yesOrNoEnum);
             }
         }
         return sub;
     }
 
     @Override
-    public List<Subject> findSubSubjects(Integer tenantId) {
-        return subjectDao.findSubSubjects(tenantId);
+    public List<Subject> findSubSubjects() {
+        return subjectDao.findSubSubjects();
     }
 
     @Override

edu-user/edu-user-biz/src/main/java/com/keao/edu/user/service/impl/TeacherServiceImpl.java

@@ -86,9 +86,7 @@ public class TeacherServiceImpl extends BaseServiceImpl<Integer, Teacher> implem
 			return id;
 		}
 		sysUser.setUserType("TEACHER");
-		if(StringUtils.isEmpty(user.getPassword())){
-			sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
-		}
+		sysUser.setPassword(new BCryptPasswordEncoder().encode("123456"));
 		sysUserDao.insert(sysUser);
 		Integer userId = sysUser.getId();
 		teacher.setUserId(userId);

edu-user/edu-user-biz/src/main/resources/config/mybatis/SubjectMapper.xml

@@ -16,7 +16,6 @@
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
         <result column="del_flag_" property="delFlag"/>
-        <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -26,14 +25,14 @@
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="Subject">
-		SELECT * FROM subject WHERE tenant_id_ = #{tenantId} ORDER BY id_
+		SELECT * FROM subject ORDER BY id_
 	</select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.keao.edu.user.entity.Subject" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
-        INSERT INTO subject (id_,name_,code_,parent_subject_id_,img_,create_time_,update_time_,tenant_id_)
-        VALUES(#{id},#{name},#{code},#{parentSubjectId},#{img},now(),now(),#{tenantId})
+        INSERT INTO subject (id_,name_,code_,parent_subject_id_,img_,create_time_,update_time_)
+        VALUES(#{id},#{name},#{code},#{parentSubjectId},#{img},now(),now())
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -52,15 +51,10 @@
             <if test="img != null">
                 img_ = #{img},
             </if>
-            <if test="updateTime != null">
-                update_time_ = NOW(),
-            </if>
             <if test="name != null">
                 name_ = #{name},
             </if>
-            <if test="tenantId!=null">
-                tenant_id_ = #{tenantId},
-            </if>
+            update_time_ = NOW()
         </set>
         WHERE id_ = #{id}
     </update>
@@ -95,23 +89,16 @@
     <select id="queryNameByIds" resultType="java.util.Map">
         select id_ `key`,name_ `value` FROM `subject` s
         WHERE FIND_IN_SET(s.id_,#{subjectIds}) AND s.del_flag_ = 0
-        AND tenant_id_ = #{tenantId}
     </select>
 
     <select id="findSubSubjects" resultMap="Subject">
         SELECT * FROM `subject`
         WHERE parent_subject_id_ != 0 AND del_flag_ = 0
-        <if test="tenantId != null and tenantId != 0">
-            AND tenant_id_ = #{tenantId}
-        </if>
     </select>
 
     <sql id="querySubPageSql">
         <where>
                 s.del_flag_ = 0
-            <if test="tenantId != null">
-                AND s.tenant_id_ = #{tenantId}
-            </if>
             <if test="parentId != null">
                 AND s.parent_subject_id_ = #{parentId}
             </if>

edu-user/edu-user-server/src/main/java/com/keao/edu/user/controller/SubjectController.java

@@ -29,7 +29,6 @@ public class SubjectController extends BaseController {
     @PostMapping("/upset")
     @PreAuthorize("@pcs.hasPermissions('subject/upset')")
     public HttpResponseResult update(@RequestBody Subject subject){
-        subject.setTenantId(TenantContextHolder.getTenantId());
         subjectService.upSetSubject(subject);
         return succeed();
     }
@@ -38,7 +37,6 @@ public class SubjectController extends BaseController {
     @PostMapping("/del")
     @PreAuthorize("@pcs.hasPermissions('subject/del')")
     public HttpResponseResult del(@RequestBody Subject subject){
-        subject.setTenantId(TenantContextHolder.getTenantId());
         subject.setDelFlag(true);
         subjectService.upSetSubject(subject);
         return succeed();
@@ -75,6 +73,6 @@ public class SubjectController extends BaseController {
     @GetMapping("/findSubSubjects")
     @PreAuthorize("@pcs.hasPermissions('subject/findSubSubjects')")
     public HttpResponseResult<List<Subject>> findSubSubjects(){
-        return succeed(subjectService.findSubSubjects(Integer.parseInt(TenantContextHolder.getTenantId())));
+        return succeed(subjectService.findSubSubjects());
     }
 }

edu-util/pom.xml

@@ -94,11 +94,17 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>net.coobird</groupId>
 			<artifactId>thumbnailator</artifactId>
 			<version>0.4.11</version>
 		</dependency>
+
+		<dependency>
+			<groupId>org.ini4j</groupId>
+			<artifactId>ini4j</artifactId>
+			<version>0.5.4</version>
+		</dependency>
 	</dependencies>
 </project>

edu-util/src/main/java/com/keao/edu/util/iniFile/IniFileEntity.java

@@ -0,0 +1,41 @@
+package com.keao.edu.util.iniFile;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+public class IniFileEntity {
+
+	private String section;
+
+	private String key;
+
+	private String value;
+
+	public String getSection() {
+		return section;
+	}
+
+	public void setSection(String section) {
+		this.section = section;
+	}
+
+	public String getKey() {
+		return key;
+	}
+
+	public void setKey(String key) {
+		this.key = key;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+	
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+}

edu-util/src/main/java/com/keao/edu/util/iniFile/IniFileUtil.java

@@ -0,0 +1,61 @@
+package com.keao.edu.util.iniFile;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.ini4j.Ini;
+import org.ini4j.InvalidFileFormatException;
+import org.ini4j.Profile.Section;
+
+import com.keao.edu.util.exception.UtilException;
+
+public class IniFileUtil {
+
+	/**
+	 * 读取Ini文件
+	 * @param iniFile 文件绝对路径(文件编码须UTF-8)
+	 * @return 返回所有section以及下面的key/value
+	 * @throws InvalidFileFormatException
+	 * @throws IOException
+	 */
+	public static Map<String, List<IniFileEntity>> readIniFile(File iniFile) throws InvalidFileFormatException, IOException {
+		if (!iniFile.exists()) {
+			throw new UtilException("文件[" + iniFile.getAbsolutePath() + "]不存在");
+		}
+		Ini ini = new Ini();
+		ini.load(iniFile);
+
+		Map<String, List<IniFileEntity>> result = new HashMap<String, List<IniFileEntity>>();
+		IniFileEntity entity = null;
+
+		Collection<Section> sections = ini.values();
+		for (Section section : sections) {
+			List<IniFileEntity> entryList = result.get(section.getName());
+			if (entryList == null) {
+				entryList = new ArrayList<IniFileEntity>();
+			}
+			for (Entry<String, String> entry : section.entrySet()) {
+				entity = new IniFileEntity();
+				entity.setSection(section.getName());
+				entity.setKey(entry.getKey());
+				entity.setValue(entry.getValue());
+
+				entryList.add(entity);
+			}
+			result.put(section.getName(), entryList);
+		}
+
+		return result;
+	}
+	
+	public static void main(String[] args) throws InvalidFileFormatException, IOException {
+		File file = new File("e:/test.ini");
+		System.out.println(IniFileUtil.readIniFile(file));
+	}
+}