--add isRegOrg();update orgLogin();

src/main/java/com/ekexiu/portal/service/SysService.java

@@ -28,10 +28,12 @@ import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.state.StateCode;
import com.ekexiu.portal.dao.OrgDao;
import com.ekexiu.portal.dao.OrgUserDao;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.UserDao;
import com.ekexiu.portal.mail.MailService;
import com.ekexiu.portal.mobile.MobilePhoneService;
import com.ekexiu.portal.po.OrgUser;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.User;
@@ -46,6 +48,8 @@ public class SysService {
	@Autowrie
	private UserDao userDao;
	@Autowrie
	private OrgUserDao orgUserDao;
	@Autowrie
	private OrgDao orgDao;
	@Autowrie
	private OrgService orgService;
@@ -329,6 +333,14 @@ public class SysService {
		this.userDao = userDao;
	}
	public OrgUserDao getOrgUserDao() {
		return orgUserDao;
	}
	public void setOrgUserDao(OrgUserDao orgUserDao) {
		this.orgUserDao = orgUserDao;
	}
	public OrgDao getOrgDao() {
		return orgDao;
	}
@@ -421,6 +433,17 @@ public class SysService {
		}
	}
	
	@Get
	@Path("/isRegOrg")
	public boolean isRegOrg(@JdbcConn Connection con,String email)throws SQLException{
		OrgUser orgUser = this.orgUserDao.queryByEmail(con, email);
		if(null != orgUser){
			return false;
		}else{
			return true;
		}
	}
	
	@Get
	@Path("/isOrgUser")
	public boolean isOrgUser(@JdbcConn Connection con,String orgName)throws SQLException, JfwBaseException{
@@ -428,7 +451,7 @@ public class SysService {
		if(orgId == null){
			return true;
		}else{
			if(this.userDao.query(con, orgId) == null){
			if(this.orgUserDao.queryOne(con, orgId) == null){
				return true;
			}else{
				if("3".equals(this.orgDao.query(con, orgId).getAuthStatus())){
@@ -603,23 +626,21 @@ public class SysService {
			throw new JfwBaseException(-1, "验证链接已失效");
		}
		String orgId = this.orgDao.queryByName(con, sc.getValue());
		if((orgId != null) && (this.userDao.query(con, orgId) != null)){
		if((orgId != null) && (this.orgUserDao.queryOne(con, orgId)!= null)){
			throw new JfwBaseException(2, "该企业已注册科袖账号");
		}
		try {
			User user = new User();
			user.setEmail(sc.getCode());
			OrgUser orgUser = new OrgUser();
			orgUser.setEmail(sc.getCode());
			if(orgId != null){
				user.setId(orgId);
				orgUser.setId(orgId);
			}else{
				user.setId(this.orgService.createOrganization(con, sc.getValue()));
				orgUser.setId(this.orgService.createOrganization(con, sc.getValue()));
			}
			user.setSendMailStatus(0);
			user.setPasswd(StringUtil.md5(sc.getKey()));
			user.setUserType("1");
			user.setActiveTime(DATE.format(new Date()));
			this.userDao.insert(con, user);
			this.orgDao.updateIsJoin(con, user.getId(), "1");
			orgUser.setPasswd(StringUtil.md5(sc.getKey()));
			orgUser.setUserType("1");
			this.orgUserDao.insert(con, orgUser);
			this.orgDao.updateIsJoin(con, orgUser.getId(), "1");
			con.commit();
		} catch (SQLException e) {
			try {
@@ -647,8 +668,8 @@ public class SysService {
	@Post
	@Path("/regOrgMail")
	public void regOrgMail(@JdbcConn(false) Connection con,String orgName,String mail,String password)throws JfwBaseException, SQLException {
		User user = this.userDao.queryByEmailOrMobilePhone(con, mail);
		if (null != user) {
		OrgUser orgUser = this.orgUserDao.queryByEmail(con, mail);
		if (null != orgUser) {
			throw new JfwBaseException(-1, "邮箱[" + mail + "]已被注册过了");
		} else {
@@ -776,27 +797,26 @@ public class SysService {
		return ret;
	}
	
	@SetCookie(checkResultNull = true, path = "/", value = { "userid=result.getId()", "userType=result.getType()",
			"userAuth=String.valueOf(result.isAuth())", "userEmail=result.getEmail()==null?\"\":result.getEmail()",
			"userName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")","userAuthStatus=result.getAuthStatus()"})
	@SetCookie(checkResultNull = true, path = "/", value = { "orgId=result.getId()", "orgType=result.getType()",
			"orgAuth=String.valueOf(result.isAuth())", "orgEmail=result.getEmail()==null?\"\":result.getEmail()",
			"orgName=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/orgLogin")
	public SessionUser orgLogin(@JdbcConn Connection con, String lk, String pw) throws SQLException, JfwBaseException {
		User user = userDao.queryByEmailOrMobilePhone(con, lk);
		if (null == user)
		OrgUser orgUser = this.orgUserDao.queryByEmail(con, lk);
		if (null == orgUser)
			throw new JfwBaseException(-1, "该用户还未注册");
		if (!StringUtil.md5(pw).equals(user.getPasswd()))
		if (!StringUtil.md5(pw).equals(orgUser.getPasswd()))
			return null;
		SessionUser ret = new SessionUser();
		ret.setId(user.getId());
		Organization org = this.orgDao.query(con, user.getId());
		ret.setId(orgUser.getId());
		Organization org = this.orgDao.query(con, orgUser.getId());
		if(org != null){
			ret.setName(org.getName());
		}
		ret.setAuthStatus(org.getAuthStatus());
		ret.setType(user.getUserType());
		ret.setEmail(user.getEmail());
		ret.setType(orgUser.getUserType());
		ret.setEmail(orgUser.getEmail());
		ret.setAuth(true);
		return ret;
	}