1

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

@@ -7,32 +7,50 @@ import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
@PrimaryKey({"pid","oid"})
/**
 * 对接的合作机构
 * 
 * @author Saga
 *
 */
@PrimaryKey({ "pid", "oid" })
@Table
public class ButtedOrg implements CreateTimeSupported {
	/**
	 * 平台ID
	 */
	private String pid;
	/**
	 * 对接的合作机构ID(企业ID)
	 */
	private String oid;
	private String createTime;
	
	@Column(DE.text_de)
	public String getPid() {
		return pid;
	}
	public void setPid(String pid) {
		this.pid = pid;
	}
	@Column(DE.text_de)
	public String getOid() {
		return oid;
	}
	public void setOid(String oid) {
		this.oid = oid;
	}
	public String getCreateTime() {
		return createTime;
	}
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	
}

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

@@ -6,11 +6,22 @@ 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({"pid","uid"})
@Table
public class ButtedProfessor implements CreateTimeSupported {
	/**
	 * 平台ID
	 */
	private String pid;
	/**
	 * 对接的专家ID
	 */
	private String uid;
	private String createTime;
	

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

@@ -8,6 +8,8 @@ import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.Delete;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
@@ -20,42 +22,110 @@ import org.jfw.apt.orm.annotation.dao.param.Set;
@DAO
public interface PlatformDao {
	
	@SelectOne
	@Nullable
	@Where("STATE='1'")
	PlatformUser login(Connection con,String email,String passwd)throws SQLException;
	PlatformUser login(Connection con, String email, String passwd) throws SQLException;
	@Nullable
	@SelectOne
	PlatformInfo  queryInfo(Connection con,String id)throws SQLException;
	
	PlatformInfo queryInfo(Connection con, String id) throws SQLException;
	@SelectOne
	@Nullable 
	PlatformUser queryUser(Connection con,String email)throws SQLException;
	
	@Nullable
	PlatformUser queryUser(Connection con, String email) throws SQLException;
	@SelectOne
	@Nullable 
	PlatformUser queryUserById(Connection con,String id)throws SQLException;
	
	@Nullable
	PlatformUser queryUserById(Connection con, String id) throws SQLException;
	@SelectList
	List<PlatformInfo> queryInfos(Connection con,@In String[] id)throws SQLException;
	
	List<PlatformInfo> queryInfos(Connection con, @In String[] id) throws SQLException;
	@UpdateWith
	@From(PlatformUser.class)
	int updatePasswd(Connection con,String id ,@Alias("passwd") String oldpw ,@Set String passwd)throws SQLException;
	
	int updatePasswd(Connection con, String id, @Alias("passwd") String oldpw, @Set String passwd) throws SQLException;
	@UpdateWith
	@From(PlatformUser.class)
	int updatePasswd(Connection con,String id,String email ,@Alias("passwd") String oldpw ,@Set String passwd)throws SQLException;
	
	int updatePasswd(Connection con, String id, String email, @Alias("passwd") String oldpw, @Set String passwd) throws SQLException;
	@UpdateWith
	@From(PlatformUser.class)
	int updateMail(Connection con,String id,@Alias("email") String oldemail ,String passwd ,@Set String email)throws SQLException;
	
	
	int updateMail(Connection con, String id, @Alias("email") String oldemail, String passwd, @Set String email) throws SQLException;
	@Update
	int update(Connection con,PlatformInfo pi)throws SQLException;
	
	int update(Connection con, PlatformInfo pi) throws SQLException;
	@Insert
	int insert(Connection con, PlatformOrg org) throws SQLException;
	@Insert
	int insert(Connection con,PlatformOrg org) throws SQLException;
	int insert(Connection con, ResidentOrg org) throws SQLException;
	@Insert
	int insert(Connection con, ButtedOrg org) throws SQLException;
	@Insert
	int insert(Connection con, ButtedProfessor professor) throws SQLException;
	@Insert
	int insert(Connection con, ReferencedArticle article) throws SQLException;
	@Delete
	int delete(Connection con, ResidentOrg org) throws SQLException;
	@Delete
	int delete(Connection con, ButtedOrg org) throws SQLException;
	@Delete
	int delete(Connection con, ButtedProfessor professor) throws SQLException;
	@Delete
	int delete(Connection con, ReferencedArticle article) throws SQLException;
	@SelectList
	List<ResidentOrg> queryResidentOrgs(Connection con, String pid) throws SQLException;
	@SelectList
	List<ButtedOrg> queryButtedOrgs(Connection con, String pid) throws SQLException;
	@SelectList
	List<ButtedProfessor> queryButtedProfessors(Connection con, String pid) throws SQLException;
	@SelectList
	List<ReferencedArticle> queryReferencedArticles(Connection con, String pid) throws SQLException;
	@SelectOne
	@Nullable
	ResidentOrg queryResidentOrg(Connection con, String pid, String oid) throws SQLException;
	@SelectOne
	@Nullable
	ButtedOrg queryButtedOrg(Connection con, String pid, String oid) throws SQLException;
	@SelectOne
	@Nullable
	ButtedProfessor queryButtedProfessor(Connection con, String pid, String uid) throws SQLException;
	@SelectOne
	@Nullable
	ReferencedArticle queryReferencedArticle(Connection con, String pid, String aid) throws SQLException;
	@DeleteWith
	@From(ResidentOrg.class)
	int deleteResidentOrg(Connection con, String pid, String oid) throws SQLException;
	@SelectOne
	@From(ButtedOrg.class)
	int deleteButtedOrg(Connection con, String pid, String oid) throws SQLException;
	@SelectOne
	@From(ButtedProfessor.class)
	int deleteButtedProfessor(Connection con, String pid, String uid) throws SQLException;
	@SelectOne
	@From(ReferencedArticle.class)
	int deleteReferencedArticle(Connection con, String pid, String aid) throws SQLException;
}

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

@@ -5,20 +5,59 @@ import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.enums.DE;
/**
 * 平台信息表
 * @author Saga
 *
 */
@PrimaryKey("id")
@Table
public class PlatformInfo {
	private String id;
	/**
	 * 平台名称
	 */
	private String name;
	/**
	 * 平台LOGO
	 */
	private String logo;
	/**
	 * 联系人
	 */
	private String linkman;
	/**
	 *联系电话
	 */
	private String linkphone;
	/**
	 * 联系邮箱
	 */
	private String linkeamil;
	/**
	 * 省
	 */
	private String province;
	/**
	 * 市
	 */
	private String city;
	/**
	 * 地址
	 */
	private String addr;
	/**
	 * 主页
	 */
	private String url;
	/**
	 * 面向行业
	 */
	private String industry;
	/**
	 * 平台介绍
	 */
	private String descp;
	private String createTime;
	private String modifyTime;

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

@@ -6,12 +6,23 @@ 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 name;
	private String email;
	private String addr;

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

@@ -21,6 +21,7 @@ import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.FieldParam;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.RequestParam;
import org.jfw.apt.web.annotation.param.Upload;
@@ -45,8 +46,7 @@ public class PlatformService {
	private String stateCodeWithRestPasswordWithEmail = "MAIL_REST_SC";
	private String templateWithRestPasswordWithEmail = "";
	private String subjectWithRestPasswordWithEmail = "「科袖」平台账户密码找回";
	
	
	private long bindEmailTimeout = 60 * 10;
	private String urlWithBindEmail = "MAIL_REST_URL";
@@ -153,9 +153,6 @@ public class PlatformService {
			throw new JfwBaseException(-600002, "mail service error");
		}
	}
	
	
	
	@Post
	@Path("/restpw")
@@ -171,17 +168,17 @@ public class PlatformService {
			throw new JfwBaseException(-600002, "user too fresh");
		}
	}
	
	@Path("reqBindMail")
	@Post
	public void requestBindMail(@JdbcConn Connection con, String mail, String id,@Nullable String url) throws SQLException, JfwBaseException {
	public void requestBindMail(@JdbcConn Connection con, String mail, String id, @Nullable String url) throws SQLException, JfwBaseException {
		PlatformUser pu = this.platformDao.queryUser(con, mail);
		if (pu != null)
			throw new JfwBaseException(-600001, "already bind");
		pu = this.platformDao.queryUserById(con, id);
		if (pu == null)
			throw new JfwBaseException(-600002, "not exists user["+id+"]");
		
			throw new JfwBaseException(-600002, "not exists user[" + id + "]");
		StateCode<String, String> sc = new StateCode<String, String>();
		sc.setCode(pu.getId());
		sc.setKey(pu.getEmail());
@@ -207,9 +204,6 @@ public class PlatformService {
			throw new JfwBaseException(-600003, "mail service error");
		}
	}
	
	
	
	@Post
	@Path("/bindMail")
@@ -226,31 +220,90 @@ public class PlatformService {
		}
	}
	
	@Post
	@Path("/modifypw")
	public int modifypw(@JdbcConn(true) Connection con,String id,String opw,String npw) throws SQLException{
		return this.platformDao.updatePasswd(con, id,StringUtil.md5(opw),StringUtil.md5(npw));
	public int modifypw(@JdbcConn(true) Connection con, String id, String opw, String npw) throws SQLException {
		return this.platformDao.updatePasswd(con, id, StringUtil.md5(opw), StringUtil.md5(npw));
	}
	
	@Post
	@Path("/info")
	public int updateInfo(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "createTime", "modifyTime" }) PlatformInfo pi) throws SQLException {
		return this.platformDao.update(con, pi);
	}
	
	@Get
	@Path("/info")
	public PlatformInfo info(@JdbcConn Connection con,String id) throws SQLException{
	public PlatformInfo info(@JdbcConn Connection con, String id) throws SQLException {
		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{
	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")
	public int resident(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "oid", valueClass = String.class) }) ResidentOrg po) throws SQLException {
		return this.platformDao.insert(con, po);
	}
	@Post
	@Path("/buttedOrg")
	public int buttedOrg(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "oid", valueClass = String.class) }) ButtedOrg po) throws SQLException {
		return this.platformDao.insert(con, po);
	}
	@Post
	@Path("/buttedProfessor")
	public int buttedProfessor(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "uid", valueClass = String.class) }) ButtedProfessor po) throws SQLException {
		return this.platformDao.insert(con, po);
	}
	
	@Post
	@Path("/referencedArticle")
	public int referencedArticle(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "aid", valueClass = String.class) }) ReferencedArticle po) throws SQLException {
		return this.platformDao.insert(con, po);
	}
	
	
	
	
	
	
	
	
	@Post
	@Path("/resident/delete")
	public int residentDelete(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "oid", valueClass = String.class) }) ResidentOrg po) throws SQLException {
		return this.platformDao.delete(con, po);
	}
	@Post
	@Path("/buttedOrg/delete")
	public int buttedOrgDelete(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "oid", valueClass = String.class) }) ButtedOrg po) throws SQLException {
		return this.platformDao.delete(con, po);
	}
	@Post
	@Path("/buttedProfessor/delete")
	public int buttedProfessorDelete(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "uid", valueClass = String.class) }) ButtedProfessor po) throws SQLException {
		return this.platformDao.delete(con, po);
	}
	
	@Post
	@Path("/referencedArticle/delete")
	public int referencedArticleDelete(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
			@FieldParam(value = "aid", valueClass = String.class) }) ReferencedArticle po) throws SQLException {
		return this.platformDao.delete(con, po);
	}
	@Post
	@Path("/upload")
	public List<UploadFile> upload(@Upload UploadItemIterator it) throws Exception {

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

@@ -24,7 +24,7 @@ public class ReferencedArticle {
		return aid;
	}
	public void setAid(String aid) {
		this.aid = oid;
		this.aid = aid;
	}
	public String getCreateTime() {
		return createTime;