Merge branch 'master' of https://gitee.com/zouxuan/mec

mec-im/src/main/java/com/ym/config/RoomProperties.java

@@ -15,4 +15,29 @@ public class RoomProperties {
     private long taskTtl;
     private long roomTtl;
     private long userIMOfflineKickTtl;
+	public int getMaxCount() {
+		return maxCount;
+	}
+	public void setMaxCount(int maxCount) {
+		this.maxCount = maxCount;
+	}
+	public long getTaskTtl() {
+		return taskTtl;
+	}
+	public void setTaskTtl(long taskTtl) {
+		this.taskTtl = taskTtl;
+	}
+	public long getRoomTtl() {
+		return roomTtl;
+	}
+	public void setRoomTtl(long roomTtl) {
+		this.roomTtl = roomTtl;
+	}
+	public long getUserIMOfflineKickTtl() {
+		return userIMOfflineKickTtl;
+	}
+	public void setUserIMOfflineKickTtl(long userIMOfflineKickTtl) {
+		this.userIMOfflineKickTtl = userIMOfflineKickTtl;
+	}
+    
 }

mec-im/src/main/java/com/ym/pojo/ReqChangeRole.java

@@ -10,4 +10,23 @@ public class ReqChangeRole {
     String userId;
     int role;
     String roomId;
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	public int getRole() {
+		return role;
+	}
+	public void setRole(int role) {
+		this.role = role;
+	}
+	public String getRoomId() {
+		return roomId;
+	}
+	public void setRoomId(String roomId) {
+		this.roomId = roomId;
+	}
+    
 }

mec-im/src/main/java/com/ym/pojo/ReqChangeUserRoleData.java

@@ -17,4 +17,21 @@ public class ReqChangeUserRoleData {
         String userId;
         int role;
     }
+
+	public String getRoomId() {
+		return roomId;
+	}
+
+	public void setRoomId(String roomId) {
+		this.roomId = roomId;
+	}
+
+	public List<ChangedUser> getUsers() {
+		return users;
+	}
+
+	public void setUsers(List<ChangedUser> users) {
+		this.users = users;
+	}
+    
 }

mec-im/src/main/java/com/ym/pojo/ReqDeviceControlData.java

@@ -12,4 +12,35 @@ public class ReqDeviceControlData {
     private String roomId;
     private String userId;
     private String ticket;
+	public Boolean getCameraOn() {
+		return cameraOn;
+	}
+	public void setCameraOn(Boolean cameraOn) {
+		this.cameraOn = cameraOn;
+	}
+	public Boolean getMicrophoneOn() {
+		return microphoneOn;
+	}
+	public void setMicrophoneOn(Boolean microphoneOn) {
+		this.microphoneOn = microphoneOn;
+	}
+	public String getRoomId() {
+		return roomId;
+	}
+	public void setRoomId(String roomId) {
+		this.roomId = roomId;
+	}
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	public String getTicket() {
+		return ticket;
+	}
+	public void setTicket(String ticket) {
+		this.ticket = ticket;
+	}
+    
 }

mec-im/src/main/java/com/ym/pojo/ReqDisplayData.java

@@ -11,4 +11,29 @@ public class ReqDisplayData {
     private int type;
     private String userId;//即将展示的对应人的 userId
     private String uri;
+	public String getRoomId() {
+		return roomId;
+	}
+	public void setRoomId(String roomId) {
+		this.roomId = roomId;
+	}
+	public int getType() {
+		return type;
+	}
+	public void setType(int type) {
+		this.type = type;
+	}
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	public String getUri() {
+		return uri;
+	}
+	public void setUri(String uri) {
+		this.uri = uri;
+	}
+    
 }

mec-im/src/main/java/com/ym/pojo/ReqSpeechData.java

@@ -9,4 +9,17 @@ import lombok.Data;
 public class ReqSpeechData {
     String roomId;
     String ticket;
+	public String getRoomId() {
+		return roomId;
+	}
+	public void setRoomId(String roomId) {
+		this.roomId = roomId;
+	}
+	public String getTicket() {
+		return ticket;
+	}
+	public void setTicket(String ticket) {
+		this.ticket = ticket;
+	}
+    
 }

mec-im/src/main/java/com/ym/pojo/ReqUpgradeRoleData.java

@@ -11,4 +11,29 @@ public class ReqUpgradeRoleData {
     private String userId;
     private String ticket;
     private int role;
+	public String getRoomId() {
+		return roomId;
+	}
+	public void setRoomId(String roomId) {
+		this.roomId = roomId;
+	}
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	public String getTicket() {
+		return ticket;
+	}
+	public void setTicket(String ticket) {
+		this.ticket = ticket;
+	}
+	public int getRole() {
+		return role;
+	}
+	public void setRole(int role) {
+		this.role = role;
+	}
+    
 }

mec-im/src/main/java/com/ym/pojo/ReqUserData.java

@@ -12,4 +12,35 @@ public class ReqUserData {
     private String userId;
     private boolean audience;
 	private boolean disableCamera;
+	public String getUserName() {
+		return userName;
+	}
+	public void setUserName(String userName) {
+		this.userName = userName;
+	}
+	public String getRoomId() {
+		return roomId;
+	}
+	public void setRoomId(String roomId) {
+		this.roomId = roomId;
+	}
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	public boolean isAudience() {
+		return audience;
+	}
+	public void setAudience(boolean audience) {
+		this.audience = audience;
+	}
+	public boolean isDisableCamera() {
+		return disableCamera;
+	}
+	public void setDisableCamera(boolean disableCamera) {
+		this.disableCamera = disableCamera;
+	}
+	
 }

mec-im/src/main/java/com/ym/pojo/ReqWhiteboardData.java

@@ -10,4 +10,23 @@ public class ReqWhiteboardData {
     private String roomId;
     private String whiteboardId;
     private int page;
+	public String getRoomId() {
+		return roomId;
+	}
+	public void setRoomId(String roomId) {
+		this.roomId = roomId;
+	}
+	public String getWhiteboardId() {
+		return whiteboardId;
+	}
+	public void setWhiteboardId(String whiteboardId) {
+		this.whiteboardId = whiteboardId;
+	}
+	public int getPage() {
+		return page;
+	}
+	public void setPage(int page) {
+		this.page = page;
+	}
+    
 }

mec-thirdpart/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-thirdpart/src/test/java/com/ym/AppTest.java

@@ -1,20 +0,0 @@
-package com.ym;
-
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-/**
- * Unit test for simple App.
- */
-public class AppTest 
-{
-    /**
-     * Rigorous Test :-)
-     */
-    @Test
-    public void shouldAnswerWithTrue()
-    {
-        assertTrue( true );
-    }
-}

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

@@ -22,7 +22,7 @@ public class OrganizationController extends BaseController {
 
     @ApiOperation(value = "分页查询组织机构树状列表")
     @PostMapping("/queryPage")
-    public Object queryPage(@RequestBody OrganizationQueryInfo queryInfo){
+    public Object queryPage(OrganizationQueryInfo queryInfo){
         return succeed(organizationService.queryTreePage(queryInfo));
     }