'会议正在进行中的要在列表中显示出来修改，匿名更新个人的密码调整'

o2server/x_meeting_assemble_control/src/main/java/com/x/meeting/assemble/control/factory/MeetingFactory.java

@@ -189,7 +189,8 @@ public class MeetingFactory extends AbstractFactory {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<String> cq = cb.createQuery(String.class);
 		Root<Meeting> root = cq.from(Meeting.class);
-		Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), new Date());
+		//Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), new Date());
+		Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.completedTime), new Date());
 		p = cb.and(p, cb.equal(root.get(Meeting_.room), roomId));
 		p = cb.and(p, cb.equal(root.get(Meeting_.manualCompleted), false));
 		if (allowOnly) {

o2server/x_meeting_assemble_control/src/main/webapp/describe/sources/com/x/meeting/assemble/control/factory/MeetingFactory.java

@@ -189,7 +189,8 @@ public class MeetingFactory extends AbstractFactory {
 		CriteriaBuilder cb = em.getCriteriaBuilder();
 		CriteriaQuery<String> cq = cb.createQuery(String.class);
 		Root<Meeting> root = cq.from(Meeting.class);
-		Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), new Date());
+		//Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.startTime), new Date());
+		Predicate p = cb.greaterThanOrEqualTo(root.get(Meeting_.completedTime), new Date());
 		p = cb.and(p, cb.equal(root.get(Meeting_.room), roomId));
 		p = cb.and(p, cb.equal(root.get(Meeting_.manualCompleted), false));
 		if (allowOnly) {

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/PersonAction.java

@@ -138,22 +138,4 @@ public class PersonAction extends StandardJaxrsAction {
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
 	
-	@JaxrsMethodDescribe(value = "匿名更新个人的密码.", action = ActionSetPasswordAnonymous.class)
-	@POST
-	@Path("password/anonymous")
-	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
-	@Consumes(MediaType.APPLICATION_JSON)
-	public void setPasswordAnonymous(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
-			JsonElement jsonElement) {
-		ActionResult<ActionSetPasswordAnonymous.Wo> result = new ActionResult<>();
-		EffectivePerson effectivePerson = this.effectivePerson(request);
-		try {
-			result = new ActionSetPasswordAnonymous().execute(effectivePerson, jsonElement);
-		} catch (Exception e) {
-			logger.error(e, effectivePerson, request, jsonElement);
-			result.error(e);
-		}
-		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
-	}
-	
 }

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/ActionSetPasswordAnonymous.java → o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ActionSetPasswordAnonymous.java

@@ -1,4 +1,4 @@
-package com.x.organization.assemble.personal.jaxrs.person;
+package com.x.organization.assemble.personal.jaxrs.reset;
 
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang3.BooleanUtils;
@@ -23,7 +23,7 @@ import com.x.organization.assemble.personal.jaxrs.reset.ExceptionPersonNotExiste
 import com.x.organization.core.entity.Person;
 
 public class ActionSetPasswordAnonymous extends BaseAction {
-	private static Logger logger = LoggerFactory.getLogger(ActionSetPassword.class);
+	private static Logger logger = LoggerFactory.getLogger(ActionSetPasswordAnonymous.class);
 
 	ActionResult<Wo> execute(EffectivePerson effectivePerson, JsonElement jsonElement) throws Exception {
 		try (EntityManagerContainer emc = EntityManagerContainerFactory.instance().create()) {
@@ -53,7 +53,7 @@ public class ActionSetPasswordAnonymous extends BaseAction {
 					throw new ExceptionOldPasswordEmpty();
 				}
 				if (StringUtils.isEmpty(wi.getNewPassword())) {
-					throw new ExceptionNewPasswordEmpty();
+					throw new ExceptionPasswordEmpty();
 				}
 				
 				if (StringUtils.isEmpty(wi.getConfirmPassword())) {

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ExceptionConfirmPasswordEmpty.java

@@ -0,0 +1,13 @@
+package com.x.organization.assemble.personal.jaxrs.reset;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionConfirmPasswordEmpty extends PromptException {
+
+	private static final long serialVersionUID = -3885997486474873786L;
+
+	ExceptionConfirmPasswordEmpty() {
+		super("确认密码不能为空.");
+	}
+
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ExceptionEditInitialManagerDeny.java

@@ -0,0 +1,12 @@
+package com.x.organization.assemble.personal.jaxrs.reset;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionEditInitialManagerDeny extends PromptException {
+
+	private static final long serialVersionUID = -3439770681867963457L;
+
+	ExceptionEditInitialManagerDeny() {
+		super("不能更新初始管理员.");
+	}
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ExceptionNewPasswordSameAsOldPassword.java

@@ -0,0 +1,12 @@
+package com.x.organization.assemble.personal.jaxrs.reset;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionNewPasswordSameAsOldPassword extends PromptException {
+
+	private static final long serialVersionUID = 1859164370743532895L;
+
+	ExceptionNewPasswordSameAsOldPassword() {
+		super("新密码不能和旧密码相同.");
+	}
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ExceptionOldPasswordEmpty.java

@@ -0,0 +1,13 @@
+package com.x.organization.assemble.personal.jaxrs.reset;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionOldPasswordEmpty extends PromptException {
+
+	private static final long serialVersionUID = -3885997486474873786L;
+
+	ExceptionOldPasswordEmpty() {
+		super("无效的操作请求.");
+	}
+
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ExceptionOldPasswordNotMatch.java

@@ -0,0 +1,13 @@
+package com.x.organization.assemble.personal.jaxrs.reset;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionOldPasswordNotMatch extends PromptException {
+
+	private static final long serialVersionUID = -3885997486474873786L;
+
+	ExceptionOldPasswordNotMatch() {
+		super("原密码错误.");
+	}
+
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ExceptionPersonNotExist.java

@@ -0,0 +1,12 @@
+package com.x.organization.assemble.personal.jaxrs.reset;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionPersonNotExist extends PromptException {
+
+	private static final long serialVersionUID = -3439770681867963457L;
+
+	ExceptionPersonNotExist(String name) {
+		super("用户: {} 不存在.", name);
+	}
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ExceptionTwicePasswordNotMatch.java

@@ -0,0 +1,13 @@
+package com.x.organization.assemble.personal.jaxrs.reset;
+
+import com.x.base.core.project.exception.PromptException;
+
+class ExceptionTwicePasswordNotMatch extends PromptException {
+
+	private static final long serialVersionUID = -3885997486474873786L;
+
+	ExceptionTwicePasswordNotMatch() {
+		super("两次输入的新密码不匹配.");
+	}
+
+}

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/person/ExceptionUserNameEmpty.java → o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ExceptionUserNameEmpty.java

@@ -1,4 +1,4 @@
-package com.x.organization.assemble.personal.jaxrs.person;
+package com.x.organization.assemble.personal.jaxrs.reset;
 
 import com.x.base.core.project.exception.PromptException;
 

o2server/x_organization_assemble_personal/src/main/java/com/x/organization/assemble/personal/jaxrs/reset/ResetAction.java

@@ -3,6 +3,7 @@ package com.x.organization.assemble.personal.jaxrs.reset;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
+import javax.ws.rs.POST;
 import javax.ws.rs.PUT;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -22,6 +23,7 @@ import com.x.base.core.project.jaxrs.ResponseFactory;
 import com.x.base.core.project.jaxrs.StandardJaxrsAction;
 import com.x.base.core.project.logger.Logger;
 import com.x.base.core.project.logger.LoggerFactory;
+import com.x.organization.assemble.personal.jaxrs.reset.ActionSetPasswordAnonymous;
 
 @Path("reset")
 public class ResetAction extends StandardJaxrsAction {
@@ -98,5 +100,23 @@ public class ResetAction extends StandardJaxrsAction {
 		}
 		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
 	}
+	
+	@JaxrsMethodDescribe(value = "匿名更新个人的密码.", action = ActionSetPasswordAnonymous.class)
+	@POST
+	@Path("password/anonymous")
+	@Produces(HttpMediaType.APPLICATION_JSON_UTF_8)
+	@Consumes(MediaType.APPLICATION_JSON)
+	public void setPasswordAnonymous(@Suspended final AsyncResponse asyncResponse, @Context HttpServletRequest request,
+			JsonElement jsonElement) {
+		ActionResult<ActionSetPasswordAnonymous.Wo> result = new ActionResult<>();
+		EffectivePerson effectivePerson = this.effectivePerson(request);
+		try {
+			result = new ActionSetPasswordAnonymous().execute(effectivePerson, jsonElement);
+		} catch (Exception e) {
+			logger.error(e, effectivePerson, request, jsonElement);
+			result.error(e);
+		}
+		asyncResponse.resume(ResponseFactory.getEntityTagActionResultResponse(request, result));
+	}
 
 }