Merge branch 'dev' of http://121.42.53.174:3000/jiapeng/portal-web into dev

src/main/java/com/ekexiu/portal/dao/DemandDao.java

@@ -84,7 +84,7 @@ public abstract class DemandDao {
	@Column(handlerClass=IntHandler.class,value="COUNT(1)")
	@From(Demand.class)
	@DefaultValue("0")
	public abstract int cnt(Connection con,@Nullable @In String[] state,@Nullable String creator,@Nullable String orgId)throws SQLException;
	public abstract int cnt(Connection con,@Nullable @In String[] state,@Nullable String creator,@Nullable String orgName)throws SQLException;
	
	@SelectOne
	@Nullable
@@ -105,7 +105,7 @@ public abstract class DemandDao {
	
	@PageSelect
	@OrderBy(" ORDER BY STATE ASC,CREATE_TIME DESC")
	public abstract PageQueryResult<Demand> pageQuery(Connection con,@Nullable @In String[] state,@Nullable String creator,@Nullable String orgId,int pageSize,int pageNo) throws SQLException;
	public abstract PageQueryResult<Demand> pageQuery(Connection con,@Nullable @In String[] state,@Nullable String creator,@Nullable String orgName,int pageSize,int pageNo) throws SQLException;
	
	
	@PageSelect

src/main/java/com/ekexiu/portal/dao/OrgDao.java

@@ -176,6 +176,13 @@ public abstract class OrgDao {
	@Column(handlerClass = StringHandler.class, value = "id")
	@From(Organization.class)
	public abstract String queryByName(Connection con, String name) throws SQLException;
	
	
	@Nullable 
	@QueryOne
	@From(Organization.class)
	@Select(Organization.class)
	public abstract EditOrganization queryOneByName(Connection con,String name) throws SQLException;
	@Nullable
	@QueryVal

src/main/java/com/ekexiu/portal/platform/PlatformDao.java

@@ -24,6 +24,7 @@ import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.LtEq;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
@@ -69,9 +70,6 @@ public interface PlatformDao {
	@Update
	int update(Connection con, PlatformInfo pi) throws SQLException;
	@Insert
	int insert(Connection con, PlatformOrg org) throws SQLException;
	@Insert
	int insert(Connection con, ResidentOrg org) throws SQLException;
@@ -175,8 +173,20 @@ public interface PlatformDao {
	PageQueryResult<ButtedProfessorInfo> queryButtedProfessorInfo(Connection con,
			@SqlColumn(handlerClass = StringHandler.class, value = { "B.PID=?" }) String pid, int pageSize, int pageNo) throws SQLException;
	@LimitQuery
	@OrderBy(cols = { @LimitColumn(value = "time", column = "PTIME", handlerClass = StringHandler.class, asc = false),
			@LimitColumn(value = "shareId", handlerClass = LongHandler.class) }, value = "")
	List<PlatformWare> queryWare(Connection con, @GroupSqlColumn(handlerClass = StringHandler.class, value = { "WNAME LIKE ?", "KEYWORDS LIKE ?",
			"FNAME LIKE ?", "SNAME LIKE ?", "CNT LIKE ?" }) @Nullable String key, String pid, String time, long shareId, int rows) throws SQLException;
	@LimitQuery
	@OrderBy(cols = { @LimitColumn(value = "time", column = "PTIME", handlerClass = StringHandler.class, asc = false),
			@LimitColumn(value = "shareId", handlerClass = LongHandler.class) }, value = "")
	List<PlatformResource> queryResource(Connection con, @GroupSqlColumn(handlerClass = StringHandler.class, value = { "RNAME LIKE ?", "KEYWORDS LIKE ?",
			"FNAME LIKE ?", "SNAME LIKE ?", "CNT LIKE ?" ,"COMP LIKE ?"},isAnd = false) @Nullable String key, String pid, String time, long shareId, int rows) throws SQLException;
	/*
	运营系统
	 * 运营系统
	 */
	@Insert
	int insert(Connection con, PlatformInfo platformInfo) throws SQLException;
@@ -190,7 +200,7 @@ public interface PlatformDao {
	@UpdateWith
	@From(PlatformInfo.class)
	int updateName(Connection con,String id,@Set String name)throws SQLException;
	int updateName(Connection con, String id, @Set String name) throws SQLException;
	@Nullable
	@SelectOne

src/main/java/com/ekexiu/portal/platform/PlatformOrg.java

@@ -1,112 +0,0 @@
package com.ekexiu.portal.platform;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
/**
 * 平台
 * @author Saga
 *
 */
@PrimaryKey("id")
@Table
public class PlatformOrg implements CreateTimeSupported {
	/**
	 * id
	 */
	private String id;
	/**
	 * 平台ID
	 */
	private String pid;
	private String logo;
	private String name;
	private String email;
	private String addr;
	private String linkman;
	private String linkphone;
	private String industry;
	private String descp;
	private String createTime;
	@Column(DE.text_de)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	public String getPid() {
		return pid;
	}
	@Column(DE.text_de)
	public void setPid(String pid) {
		this.pid = pid;
	}
	@Column(DE.text_de)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(DE.text_de)
	public String getEmail() {
		return email;
	}
	public void setEmail(String email) {
		this.email = email;
	}
	@Column(DE.Text_de)
	public String getAddr() {
		return addr;
	}
	public void setAddr(String addr) {
		this.addr = addr;
	}
	@Column(DE.Text_de)
	public String getLinkman() {
		return linkman;
	}
	public void setLinkman(String linkman) {
		this.linkman = linkman;
	}
	@Column(DE.Text_de)
	public String getLinkphone() {
		return linkphone;
	}
	public void setLinkphone(String linkphone) {
		this.linkphone = linkphone;
	}
	@Column(DE.Text_de)
	public String getIndustry() {
		return industry;
	}
	public void setIndustry(String industry) {
		this.industry = industry;
	}
	@Column(DE.Text_de)
	public String getDescp() {
		return descp;
	}
	public void setDescp(String descp) {
		this.descp = descp;
	}
	public String getCreateTime() {
		return createTime;
	}
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	@Column(DE.Text_de)
	public String getLogo() {
		return logo;
	}
	public void setLogo(String logo) {
		this.logo = logo;
	}
	
	
}

src/main/java/com/ekexiu/portal/platform/PlatformResource.java

@@ -0,0 +1,113 @@
package com.ekexiu.portal.platform;
import org.jfw.apt.orm.annotation.entry.CalcColumn;
import org.jfw.apt.orm.annotation.entry.View;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
@View("(SELECT P.ID OID,'1' OTYPE, R.RESOURCE_ID RID,R.RESOURCE_NAME RNAME, R.SUBJECT KEYWORDS,R.SUPPORTED_SERVICES CNT,I.IMAGE_SRC IMAGES,P.NAME FNAME,'' SNAME,B.PID PID,R.PUBLISH_TIME PTIME,R.SHARE_ID SHARE_ID,R.COMP COMP "+
	    "FROM RESOURCE R INNER JOIN PROFESSOR P ON R.PROFESSOR_ID=P.ID  INNER JOIN BUTTED_PROFESSOR B ON P.ID = B.UID  LEFT JOIN IMAGE I ON R.RESOURCE_ID=I.RESOURCE_ID "+
	    "WHERE R.STATUS='1' AND R.RESOURCE_TYPE='1' "+
	    "UNION ALL "+
	    "SELECT  O.ID OID,'2' OTYPE,R.RESOURCE_ID RID,R.RESOURCE_NAME RNAME, R.SUBJECT KEYWORDS,R.SUPPORTED_SERVICES CNT,I.IMAGE_SRC IMAGES,O.NAME FNAME,O.FOR_SHORT SNAME,B.PID PID,R.PUBLISH_TIME PTIME,R.SHARE_ID SHARE_ID,R.COMP COMP "+ 
	    "FROM RESOURCE R INNER JOIN ORGANIZATION O ON R.ORG_ID=O.ID  INNER JOIN BUTTED_ORG B ON O.ID = B.OID  LEFT JOIN IMAGE I ON R.RESOURCE_ID=I.RESOURCE_ID "+
	    "WHERE R.STATUS='1' AND R.RESOURCE_TYPE='2' ) T ")
public class PlatformResource {
	private String id;
	private String name;
//	private String keywords;
	private String cnt;
	private String images;
//	private String fname;
//	private String sname;
	private String pid;
	private String time;
	private long shareId;
	private String oid;
	private String otype;
	
	@CalcColumn(column="OID",handlerClass=StringHandler.class,nullable = false)
	public String getOid() {
		return oid;
	}
	public void setOid(String oid) {
		this.oid = oid;
	}
	@CalcColumn(column="OTYPE",handlerClass=StringHandler.class,nullable = false)
	public String getOtype() {
		return otype;
	}
	public void setOtype(String otype) {
		this.otype = otype;
	}
	@CalcColumn(column="RID",handlerClass=StringHandler.class,nullable = false)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@CalcColumn(column="RNAME",handlerClass=StringHandler.class,nullable = false)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
//	@CalcColumn(column="KEYWORDS",handlerClass=StringHandler.class,nullable = true)
//	public String getKeywords() {
//		return keywords;
//	}
//	public void setKeywords(String keywords) {
//		this.keywords = keywords;
//	}
	@CalcColumn(column="CNT",handlerClass=StringHandler.class,nullable = true)
	public String getCnt() {
		return cnt;
	}
	public void setCnt(String cnt) {
		this.cnt = cnt;
	}
	@CalcColumn(column="IMAGES",handlerClass=StringHandler.class,nullable = true)
	public String getImages() {
		return images;
	}
	public void setImages(String images) {
		this.images = images;
	}
//	@CalcColumn(column="FNAME",handlerClass=StringHandler.class,nullable = false)
//	public String getFname() {
//		return fname;
//	}
//	public void setFname(String fname) {
//		this.fname = fname;
//	}
//	@CalcColumn(column="SNAME",handlerClass=StringHandler.class,nullable = true)
//	public String getSname() {
//		return sname;
//	}
//	public void setSname(String sname) {
//		this.sname = sname;
//	}
	@CalcColumn(column="PID",handlerClass=StringHandler.class,nullable = false)
	public String getPid() {
		return pid;
	}
	public void setPid(String pid) {
		this.pid = pid;
	}
	@CalcColumn(column="PTIME",handlerClass=StringHandler.class,nullable = false)
	public String getTime() {
		return time;
	}
	public void setTime(String time) {
		this.time = time;
	}
	@CalcColumn(column="SHARE_ID",handlerClass=LongHandler.class,nullable = false)
	public long getShareId() {
		return shareId;
	}
	public void setShareId(long shareId) {
		this.shareId = shareId;
	}
}

src/main/java/com/ekexiu/portal/platform/PlatformService.java

@@ -289,13 +289,17 @@ public class PlatformService {
	@Post
	@Path("/bindMail")
	public void bindMail(@JdbcConn(true) Connection con, String code) throws SQLException, JfwBaseException {
	public void bindMail(@JdbcConn(true) Connection con, String code,String pw) throws SQLException, JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(code);
		if (sc == null) {
			throw new JfwBaseException(-600001, " code expire");
		}
		JfwAppContext.removeCachedObject(code);
		
		if(!StringUtil.md5(pw).equals(sc.getValue())){
			throw new JfwBaseException(-600003, "invalid passwd"); 
		}
		if (this.platformDao.updateMail(con, sc.getCode(), sc.getKey(), sc.getValue(), sc.getDescp()) == 0) {
			throw new JfwBaseException(-600002, "user too fresh");
@@ -320,12 +324,6 @@ public class PlatformService {
		return this.platformDao.queryInfo(con, id);
	}
	@Post
	@Path("/add/org")
	public int addOrg(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "createTime", "id" }) PlatformOrg po) throws SQLException {
		po.setId(StringUtil.buildUUID());
		return this.platformDao.insert(con, po);
	}
	@Post
	@Path("/resident")
@@ -429,6 +427,17 @@ public class PlatformService {
		}
		return ret;
	}
	
	@Get
	@Path("/info/wares")
	public List<PlatformWare> queryWares(@JdbcConn Connection con,@Nullable String key,@DefaultValue("\"z\"") String time, @DefaultValue("Long.MAX_VALUE") long shareId,String pid,int rows)throws SQLException{
		return platformDao.queryWare(con, key, pid, time, shareId, rows);
	}
	@Get
	@Path("/info/resources")
	public List<PlatformResource> queryResources(@JdbcConn Connection con,@Nullable String key,@DefaultValue("\"z\"") String time, @DefaultValue("Long.MAX_VALUE") long shareId,String pid,int rows)throws SQLException{
		return platformDao.queryResource(con, key, pid, time, shareId, rows);
	}
	@Get
	@Path("/info/pqButtedProfessors")

src/main/java/com/ekexiu/portal/platform/PlatformWare.java

@@ -0,0 +1,113 @@
package com.ekexiu.portal.platform;
import org.jfw.apt.orm.annotation.entry.CalcColumn;
import org.jfw.apt.orm.annotation.entry.View;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
@View("(SELECT P.ID OID,'1' OTYPE, W.ID WID,W.NAME WNAME, W.KEYWORDS KEYWORDS,W.CNT CNT,W.IMAGES IMAGES,P.NAME FNAME,'' SNAME,B.PID PID,W.MODIFY_TIME PTIME,W.SHARE_ID SHARE_ID "+
		    "FROM WARE W INNER JOIN PROFESSOR P ON W.OWNER=P.ID  INNER JOIN BUTTED_PROFESSOR B ON P.ID = B.UID "+
		    "WHERE W.STATE='1' AND W.CATEGORY='1' "+
		    "UNION ALL "+
		    "SELECT  O.ID OID,'2' OTYPE,W.ID WID,W.NAME WNAME, W.KEYWORDS KEYWORDS,W.CNT CNT,W.IMAGES IMAGES,O.NAME FNAME,O.FOR_SHORT SNAME,B.PID PID,W.MODIFY_TIME PTIME,W.SHARE_ID SHARE_ID "+ 
		    "FROM WARE W INNER JOIN ORGANIZATION O ON W.OWNER=O.ID  INNER JOIN BUTTED_ORG B ON O.ID = B.OID "+
		    "WHERE W.STATE='1' AND W.CATEGORY='2') T ")
public class PlatformWare {
	private String id;
	private String name;
//	private String keywords;
	private String cnt;
	private String images;
//	private String fname;
//	private String sname;
	private String pid;
	private String time;
	private long shareId;
	private String oid;
	private String otype;
	
	@CalcColumn(column="OID",handlerClass=StringHandler.class,nullable = false)
	public String getOid() {
		return oid;
	}
	public void setOid(String oid) {
		this.oid = oid;
	}
	@CalcColumn(column="OTYPE",handlerClass=StringHandler.class,nullable = false)
	public String getOtype() {
		return otype;
	}
	public void setOtype(String otype) {
		this.otype = otype;
	}
	@CalcColumn(column="WID",handlerClass=StringHandler.class,nullable = false)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@CalcColumn(column="WNAME",handlerClass=StringHandler.class,nullable = false)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
//	@CalcColumn(column="KEYWORDS",handlerClass=StringHandler.class,nullable = true)
//	public String getKeywords() {
//		return keywords;
//	}
//	public void setKeywords(String keywords) {
//		this.keywords = keywords;
//	}
	@CalcColumn(column="CNT",handlerClass=StringHandler.class,nullable = true)
	public String getCnt() {
		return cnt;
	}
	public void setCnt(String cnt) {
		this.cnt = cnt;
	}
	@CalcColumn(column="IMAGES",handlerClass=StringHandler.class,nullable = true)
	public String getImages() {
		return images;
	}
	public void setImages(String images) {
		this.images = images;
	}
//	@CalcColumn(column="FNAME",handlerClass=StringHandler.class,nullable = false)
//	public String getFname() {
//		return fname;
//	}
//	public void setFname(String fname) {
//		this.fname = fname;
//	}
//	@CalcColumn(column="SNAME",handlerClass=StringHandler.class,nullable = true)
//	public String getSname() {
//		return sname;
//	}
//	public void setSname(String sname) {
//		this.sname = sname;
//	}
	@CalcColumn(column="PID",handlerClass=StringHandler.class,nullable = false)
	public String getPid() {
		return pid;
	}
	public void setPid(String pid) {
		this.pid = pid;
	}
	@CalcColumn(column="PTIME",handlerClass=StringHandler.class,nullable = false)
	public String getTime() {
		return time;
	}
	public void setTime(String time) {
		this.time = time;
	}
	@CalcColumn(column="SHARE_ID",handlerClass=LongHandler.class,nullable = false)
	public long getShareId() {
		return shareId;
	}
	public void setShareId(long shareId) {
		this.shareId = shareId;
	}
}

src/main/java/com/ekexiu/portal/po/Demand.java

@@ -24,12 +24,13 @@ public class Demand implements CreateTimeSupported,ModifyTimeSupported {
	private String contactNum;
	
	private String state;
	private String orgId;
	private String orgName;
	private String modifier;
	private String creator;
	private String createTime;
	private String modifyTime;
	private String descp;
	private String source;
	
	
	private long pageViews;
@@ -136,15 +137,27 @@ public class Demand implements CreateTimeSupported,ModifyTimeSupported {
		this.state = state;
	}
	/**
	 * 发布人发布时所在机构ID
	 * 发布人发布时所在机构
	 * @return
	 */
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",insertable=true,nullable=false,queryable=true,renewable=false)
	public String getOrgId() {
		return orgId;
	@Column(DE.text_de)
	public String getOrgName() {
		return orgName;
	}
	public void setOrgName(String orgName) {
		this.orgName = orgName;
	}
	
	/**
	 * 发布来源
	 * @return
	 */
	@Column(DE.text_de)
	public String getSource() {
		return source;
	}
	public void setOrgId(String orgId) {
		this.orgId = orgId;
	public void setSource(String source) {
		this.source = source;
	}
	/**
	 * 最后修改人

src/main/java/com/ekexiu/portal/po/Resource.java

@@ -83,6 +83,16 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
	 */
	private long sortNum;
	
	private String category;
	
	
	@Column(DE.text_de)
	public String getCategory() {
		return category;
	}
	public void setCategory(String category) {
		this.category = category;
	}
	public List<Image> getImages() {
		return images;
	}

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

@@ -2,6 +2,7 @@ package com.ekexiu.portal.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Date;
import java.util.List;
import org.jfw.apt.annotation.Autowrie;
@@ -14,17 +15,50 @@ import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.RequestParam;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.context.JfwAppContext;
import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.jdbc.JdbcUtil;
import org.jfw.util.state.StateCode;
import com.ekexiu.portal.dao.DemandDao;
import com.ekexiu.portal.dao.UserDao;
import com.ekexiu.portal.po.Demand;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.User;
@Path("/demand")
public class DemandService {
	public static final String MAX_CREATETIME = "9";
	@Autowrie
	private UserDao userDao;
	@Autowrie
	private ProfessorService professorService;
	@Autowrie
	private OrgService orgService;
	@Autowrie
	private DemandDao demandDao;
	public OrgService getOrgService() {
		return orgService;
	}
	public void setOrgService(OrgService orgService) {
		this.orgService = orgService;
	}
	public ProfessorService getProfessorService() {
		return professorService;
	}
	public void setProfessorService(ProfessorService professorService) {
		this.professorService = professorService;
	}
	public DemandDao getDemandDao() {
		return demandDao;
	}
@@ -33,22 +67,33 @@ public class DemandService {
		this.demandDao = demandDao;
	}
	public UserDao getUserDao() {
		return userDao;
	}
	public void setUserDao(UserDao userDao) {
		this.userDao = userDao;
	}
	/**
	 * 发布需求
	 * 
	 * @param con
	 * @param demand  
	 * @param demand
	 * @throws SQLException
	 */
	@Post
	@Path
	public String  insert(@JdbcConn(true) Connection con,@RequestParam(excludeFields={"id","state","createTime","modifyTime","shareId","pageViews","modifier"})  Demand demand)throws SQLException{
	public String insert(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "id", "state", "createTime", "modifyTime", "shareId", "pageViews", "modifier" }) Demand demand)
			throws SQLException {
		String demandId = StringUtil.buildUUID();
		demand.setId(demandId);
		demand.setState("1");
		if(demand.getCost()==null){
		if (demand.getCost() == null) {
			demand.setCost("0");
		}
		if(demand.getDuration()==null){
		if (demand.getDuration() == null) {
			demand.setDuration("0");
		}
		demand.setModifier(demand.getCreator());
@@ -56,127 +101,263 @@ public class DemandService {
		return demandId;
	}
	/**
	 * 发布需求
	 * 
	 * @param con
	 * @param demand
	 * @throws SQLException
	 */
	@Post
	@Path("/publishInPlatform")
	public String insert(@JdbcConn Connection con,
			@RequestParam(excludeFields = { "creator", "id", "state", "createTime", "modifyTime", "shareId", "pageViews", "modifier" }) Demand demand,
			String state, String vc, String name) throws Exception {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(state);
		if (sc == null || sc.getExpiredTime() < System.currentTimeMillis())
			throw new JfwBaseException(-600001, "验证超时");
		if (!sc.getKey().equals(demand.getContactNum())) {
			throw new JfwBaseException(-2, "手机号与验证手机不匹配");
		}
		if (!sc.getValue().equals(vc)) {
			throw new JfwBaseException(-3, "验证码错误");
		}
		String orgId = null;
		try {
			orgId = this.orgService.createOrganization(con, demand.getOrgName());
			con.commit();
		} catch (Exception e) {
			JdbcUtil.rollback(con);
			throw e;
		}
		String demandId = null;
		try {
			User user = null;
			boolean exists = false;
			String uid = StringUtil.buildUUID();
			try {
				user = new User();
				user.setId(uid);
				String passwd = StringUtil.md5("123456");
				user.setMobilePhone(demand.getContactNum());
				user.setPasswd(passwd);
				user.setUserType("0");
				user.setActiveTime(SysService.DATE.format(new Date()));
				this.userDao.insert(con, user);
			} catch (SQLException e) {
				if ("23505".equals(e.getSQLState())) {
					con.rollback();
					user = userDao.queryByEmailOrMobilePhone(con, demand.getContactNum());
					if (user == null)
						throw new RuntimeException("not fonud  with query user by phone");
					exists = true;
					uid = user.getId();
				} else {
					throw e;
				}
			}
			if (exists) {
				Professor professor = this.professorService.query(con, uid);
				if (professor == null) {
					professor = new Professor();
					professor.setId(uid);
					professor.setName(name);
					professor.setPhone(demand.getContactNum());
					professor.setOrgId(orgId);
					this.professorService.insert(con, professor, null);
				}
			} else {
				Professor professor = new Professor();
				professor.setId(uid);
				professor.setName(name);
				professor.setPhone(demand.getContactNum());
				professor.setOrgId(orgId);
				this.professorService.insert(con, professor, null);
			}
			Organization org = this.orgService.query(con, orgId);
			if (!demand.getOrgName().equals(org.getName())) {
				demand.setOrgName(org.getName());
			}
			demandId = StringUtil.buildUUID();
			demand.setId(demandId);
			demand.setState("1");
			if (demand.getCost() == null) {
				demand.setCost("0");
			}
			if (demand.getDuration() == null) {
				demand.setDuration("0");
			}
			demand.setCreator(user.getId());
			demand.setModifier(user.getId());
			this.demandDao.insert(con, demand);
			con.commit();
		} catch (Exception e) {
			JdbcUtil.rollback(con);
			throw e;
		} finally {
			JfwAppContext.removeCachedObject(state);
		}
		return demandId;
	}
	/**
	 * 修改需求
	 * 
	 * @param con
	 * @param demand
	 * @throws SQLException
	 */
	@Post
	@Path("/modify")
	public boolean update(@JdbcConn(true) Connection con,@RequestParam(excludeFields={"state","createTime","modifyTime","title","descp","orgId","creator","pageViews","shareId"}) Demand demand)throws SQLException{
		if(demand.getCost()==null){
	public boolean update(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "state", "createTime", "modifyTime", "title","source", "descp", "creator", "pageViews", "shareId" }) Demand demand)
			throws SQLException {
		if (demand.getCost() == null) {
			demand.setCost("0");
		}
		if(demand.getDuration()==null){
		if (demand.getDuration() == null) {
			demand.setDuration("0");
		}
		demand.setState("1");
		return this.demandDao.update(con, demand)>0;	
		return this.demandDao.update(con, demand) > 0;
	}
	/**
	 * 完成需求
	 * 
	 * @param con
	 * @param id  需求ID
	 * @param uid 操作用户ID
	 * @param id
	 *            需求ID
	 * @param uid
	 *            操作用户ID
	 * @return
	 * @throws SQLException
	 */
	@Post
	@Path("/over")
	public boolean over(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
		return this.demandDao.over(con, id, uid)>0;
	public boolean over(@JdbcConn(true) Connection con, String id, String uid) throws SQLException {
		return this.demandDao.over(con, id, uid) > 0;
	}
	/**
	 * 关闭需求
	 * 
	 * @param con
	 * @param id 需求ID
	 * @param uid 需求ID
	 * @param id
	 *            需求ID
	 * @param uid
	 *            需求ID
	 * @return
	 * @throws SQLException
	 */
	@Post
	@Path("/close")
	public boolean close(@JdbcConn(true) Connection con,String id,String uid)throws SQLException{
		return this.demandDao.close(con, id, uid)>0;
	public boolean close(@JdbcConn(true) Connection con, String id, String uid) throws SQLException {
		return this.demandDao.close(con, id, uid) > 0;
	}
	/**
	 * 延期需求
	 * 
	 * @param con
	 * @param id 需求ID
	 * @param uid 操作用户ID
	 * @param day 延期日期 YYYYMMD
	 * @param id
	 *            需求ID
	 * @param uid
	 *            操作用户ID
	 * @param day
	 *            延期日期 YYYYMMD
	 * @return
	 * @throws SQLException
	 */
	@Post
	@Path("/defer")
	public boolean defer(@JdbcConn(true) Connection con,String id,String uid,String day)throws SQLException{
		return this.demandDao.defer(con, id,uid,day)>0;
	public boolean defer(@JdbcConn(true) Connection con, String id, String uid, String day) throws SQLException {
		return this.demandDao.defer(con, id, uid, day) > 0;
	}
	/**
	 * 增加浏览量
	 * 
	 * @param con
	 * @param id 需求ID
	 * @param id
	 *            需求ID
	 * @throws SQLException
	 */
	@Post
	@Path("/incPageViews")
	public void incPageViews(@JdbcConn(true) Connection con,String id)throws SQLException{
	public void incPageViews(@JdbcConn(true) Connection con, String id) throws SQLException {
		this.demandDao.incPageViews(con, id);
	}
	/**
	 * 查询需求数量
	 * 
	 * @param con
	 * @param state  需求状态
	 * @param uid    发布者ID
	 * @param oid   发布者发布时机构ID
	 * @param state
	 *            需求状态
	 * @param uid
	 *            发布者ID
	 * @param oid
	 *            发布者发布时机构ID
	 * @return
	 * @throws SQLException
	 */
	@Get
	@Path("/qc")
	public int queryCount(@JdbcConn Connection con,@Nullable String[] state,@Nullable String uid,@Nullable String oid)throws SQLException{
		return this.demandDao.cnt(con, state, uid,oid);
	public int queryCount(@JdbcConn Connection con, @Nullable String[] state, @Nullable String uid, @Nullable String oid) throws SQLException {
		return this.demandDao.cnt(con, state, uid, oid);
	}
	/**
	 * 查询需求
	 * 
	 * @param con
	 * @param id  需求ID
	 * @param id
	 *            需求ID
	 * @return
	 * @throws SQLException
	 */
	@Get
	@Path("/qo")
	public Demand queryOne(@JdbcConn Connection con, String id)throws SQLException{
	public Demand queryOne(@JdbcConn Connection con, String id) throws SQLException {
		return this.demandDao.query(con, id);
	}
	/**
	 * 根据分享ID 查询需求
	 * 
	 * @param con
	 * @param id 分享ID
	 * @param id
	 *            分享ID
	 * @return
	 * @throws SQLException
	 */
	@Get
	@Path("/byShareId")
	public Demand queryByShareId(@JdbcConn Connection con ,long id)throws SQLException{
	public Demand queryByShareId(@JdbcConn Connection con, long id) throws SQLException {
		return this.demandDao.query(con, id);
	}
	/**
	 * 查询需求列表
	 * 
	 * @param con
	 * @param id 需求ID 数组
	 * @param id
	 *            需求ID 数组
	 * @return
	 * @throws SQLException
	 */
	@Get
	@Path("/qm")
	public List<Demand> queryOne(@JdbcConn Connection con, String[] id)throws SQLException{
	public List<Demand> queryOne(@JdbcConn Connection con, String[] id) throws SQLException {
		return this.demandDao.query(con, id);
	}
	/**
	 * 分页查询需求(按状态及发布时间排序)
	 * 
	 * @param con
	 * @param state
	 * @param uid
@@ -186,12 +367,14 @@ public class DemandService {
	 */
	@Get
	@Path("/pq")
	public PageQueryResult<Demand> query(@JdbcConn Connection con,@Nullable String[] state,@Nullable String uid,@Nullable String oid,@DefaultValue("1") int pageNo,@DefaultValue("5") int pageSize)throws SQLException{
		return this.demandDao.pageQuery(con, state, uid, oid,pageSize,pageNo);
	public PageQueryResult<Demand> query(@JdbcConn Connection con, @Nullable String[] state, @Nullable String uid, @Nullable String oname,
			@DefaultValue("1") int pageNo, @DefaultValue("5") int pageSize) throws SQLException {
		return this.demandDao.pageQuery(con, state, uid, oname, pageSize, pageNo);
	}
	
	/**
	 * 分页查询需求(按发布时间排序)
	 * 
	 * @param con
	 * @param state
	 * @param uid
@@ -201,7 +384,8 @@ public class DemandService {
	 */
	@Get
	@Path("/search")
	public PageQueryResult<Demand> query(@JdbcConn Connection con,@Nullable String[] state,@Nullable String key,@DefaultValue("1") int pageNo,@DefaultValue("5") int pageSize)throws SQLException{
		return this.demandDao.pageQuery(con,state, key==null?key:("%"+key+"%"),pageSize,pageNo);
	public PageQueryResult<Demand> query(@JdbcConn Connection con, @Nullable String[] state, @Nullable String key, @DefaultValue("1") int pageNo,
			@DefaultValue("5") int pageSize) throws SQLException {
		return this.demandDao.pageQuery(con, state, key == null ? key : ("%" + key + "%"), pageSize, pageNo);
	}
}

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

@@ -178,6 +178,14 @@ public class OrgService {
		return organizations;
	}
	
	@Get
	@Path("/queryByName")
	public EditOrganization queryByName(@JdbcConn Connection con,String name)throws SQLException{
		EditOrganization o = this.orgDao.queryOneByName(con, name);
		o.setHasOrgLogo(this.imageService.hasOrgLogo(o.getId()));
		return o;
	}
	
	public String createOrganization(Connection con, String orgName) throws SQLException, IOException {
		String id = StringUtil.buildUUID();
		Organization org = new Organization();

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

@@ -1952,6 +1952,19 @@ public class SysService {
		}
		return key;
	}
	
	@Post
	@Path("/phoneValidCode/check")
	public boolean checkPhoneValidCode(String key,String phone,String code){
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(key);
		if(sc!=null){
			if(sc.getExpiredTime() > System.currentTimeMillis()){
				return phone.equals(sc.getKey()) && code.equals(sc.getValue());
			}
		}
		return false;
	}
	@Get
	@Path("/sendMobileForLogin")

src/main/java/com/ekexiu/portal/ware/Ware.java

@@ -62,6 +62,8 @@ public class Ware implements CreateTimeSupported, ModifyTimeSupported{
	
	
	
	
	
	@Column(handlerClass=LongHandler.class,dbType="INT8",nullable=true,renewable=false,fixSqlValueWithInsert="0")
	public long getPageViews() {
		return pageViews;

src/main/resources/database.sql

@@ -2353,31 +2353,14 @@ COMMENT ON COLUMN BUTTED_PROFESSOR.PID is '平台ID';
COMMENT ON COLUMN BUTTED_PROFESSOR.UID is '对接的专家ID';
COMMENT ON COLUMN BUTTED_PROFESSOR.CREATE_TIME is '对接时间';
CREATE TABLE PLATFORM_ORG (
	ID TEXT NOT NULL,
	PID TEXT NOT NULL,
	LOGO TEXT,
	NAME TEXT NOT NULL,
	EMAIL TEXT NOT NULL,
	ADDR TEXT,
	LINKMAN TEXT,
	LINKPHONE TEXT,
	INDUSTRY TEXT,
	DESCP TEXT,
	CREATE_TIME CHAR(14) NOT NULL);
ALTER TABLE PLATFORM_ORG ADD PRIMARY KEY (ID);
COMMENT ON TABLE PLATFORM_ORG is '平台待入驻企业表';
COMMENT ON COLUMN PLATFORM_ORG.PID is '平台ID';
COMMENT ON COLUMN PLATFORM_ORG.NAME is '企业全称';
COMMENT ON COLUMN PLATFORM_ORG.EMAIL is '企业邮箱';
COMMENT ON COLUMN PLATFORM_ORG.ADDR is '企业地址';
COMMENT ON COLUMN PLATFORM_ORG.LINKMAN is '联系人';
COMMENT ON COLUMN PLATFORM_ORG.LINKPHONE is '联系电话';
COMMENT ON COLUMN PLATFORM_ORG.INDUSTRY is '所属行业';
COMMENT ON COLUMN PLATFORM_ORG.DESCP is '企业介绍';
--ALTER TABLE RESOURCE ADD COLUMN CATEGORY TEXT DEFAULT '0';
--COMMENT ON COLUMN resource.CATEGORY IS '资源分类';
--ALTER TABLE RESOURCE ALTER COLUMN CATEGORY SET NOT NULL;
ALTER TABLE DEMAND ADD COLUMN ORG_NAME TEXT DEFAULT '1';
update DEMAND set ORG_NAME =(SELECT NAME FROM ORGANIZATION WHERE ID =  DEMAND.ORG_ID);
ALTER TABLE DEMAND DROP COLUMN ORG_ID;
ALTER TABLE DEMAND ALTER COLUMN ORG_NAME SET  NOT NULL;

src/main/resources/project.properties

@@ -104,7 +104,7 @@ com_ekexiu_portal_service_SysService.phoneRetrievePasswordReplaceKey=yzm
com_ekexiu_portal_service_SysService.phoneRetrievePasswordContentTemplate=\u3010\u79D1\u8896\u3011\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801yzm\uFF0C\u5B8C\u6210\u5BC6\u7801\u91CD\u7F6E\u3002\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\u9A8C\u8BC1\u7801\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1\u3002
#手机验证-注册用户
com_ekexiu_portal_service_SysService.regMobilePhoneReplaceKey=yzm
com_ekexiu_portal_service_SysService.regMobilePhoneContentTemplate=\u3010\u79D1\u8896\u3011\u60A8\u7684\u9A8C\u8BC1\u7801\u4E3Ayzm\uFF0C\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\uFF0C\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u6B64\u77ED\u4FE1\u3002
com_ekexiu_portal_service_SysService.regMobilePhoneContentTemplate=\u3010\u79D1\u8896\u3011\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801yzm\uFF0C\u5B8C\u6210\u624B\u673A\u9A8C\u8BC1\u3002\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\u9A8C\u8BC1\u7801\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1\u3002
#手机验证-用户登录
com_ekexiu_portal_service_SysService.loginMobilePhoneReplaceKey=yzm
com_ekexiu_portal_service_SysService.loginMobilePhoneContentTemplate=\u3010\u79D1\u8896\u3011\u8BF7\u8F93\u5165\u9A8C\u8BC1\u7801yzm\uFF0C\u5B8C\u6210\u77ED\u4FE1\u767B\u5F55\u3002\u8BF7\u4E8E3\u5206\u949F\u5185\u6B63\u786E\u8F93\u5165\u9A8C\u8BC1\u7801\u3002\u5982\u975E\u672C\u4EBA\u64CD\u4F5C\uFF0C\u8BF7\u5FFD\u7565\u672C\u77ED\u4FE1\u3002