Merge branch 'master' of http://121.42.53.174:3000/bulomakaka/ekexiu.com.portal.git

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

@@ -4,12 +4,14 @@ import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
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.OrderBy;
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;
import com.ekexiu.portal.po.Watch;
@@ -30,9 +32,9 @@ public abstract class WatchDao {
	@From(Watch.class)
	public abstract int deleteWatch(Connection con, String watchObject) throws SQLException;
	
//	@Nullable
//	@SelectOne
//	public abstract Watch queryOne(Connection con, String professorId, String watchObject) throws SQLException;
	@Nullable
	@SelectOne
	public abstract Watch queryOne(Connection con, String professorId, String watchObject) throws SQLException;
	
	@SelectList
	@OrderBy(" ORDER BY CREATE_TIME DESC ")

src/main/java/com/ekexiu/portal/pojo/ProfessorInfo.java

@@ -15,6 +15,7 @@ import com.ekexiu.portal.po.ResearchAreaLog;
public class ProfessorInfo extends Professor{
	
	private String orgName;
	private Integer hasHeadImage;
	/**
	 * 研究方向
	 */
@@ -45,13 +46,18 @@ public class ProfessorInfo extends Professor{
	 */
	private List<Project> projects;
	
	
	public String getOrgName() {
		return orgName;
	}
	public void setOrgName(String orgName) {
		this.orgName = orgName;
	}
	public Integer getHasHeadImage() {
		return hasHeadImage;
	}
	public void setHasHeadImage(Integer hasHeadImage) {
		this.hasHeadImage = hasHeadImage;
	}
	public List<ResearchAreaLog> getResearchAreaLogs() {
		return researchAreaLogs;
	}

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

@@ -404,6 +404,7 @@ public class ProfessorService {
		ProfessorInfo info = this.professorDao.queryInfo(con, id);
		if(info!=null){
			info.setOrgName(this.orgDao.query(con, info.getOrgId()).getName());
			info.setHasHeadImage(this.imageService.hasProfessorImage(id));
			info.setEdus(this.professorEduBgDao.query(con, id));
			info.setHonors(this.honorDao.query(con, id));
			info.setJobs(this.partTimeJobDao.query(con, id));
@@ -412,6 +413,7 @@ public class ProfessorService {
			info.setProjects(this.projectDao.query(con, id));
			info.setResearchAreaLogs(this.researchAreaLogDao.query(con, id));
			info.setResearchAreas(this.researchAreaDao.query(con, id));
			info.setResources(this.resourceDao.queryPro(con, id));
		}
		return info;
		

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

@@ -76,6 +76,12 @@ public class WatchService {
		this.watchDao.delete(con, professorId, watchObject);
	}
	
	@Get
	@Path("/hasWatch")
	public Watch queryOne(@JdbcConn Connection con, String professorId, String watchObject) throws SQLException {
		return this.watchDao.queryOne(con, professorId, watchObject);
	}
	
	@Get
	@Path("/qaPro")
	public List<Watch> queryPro(@JdbcConn Connection con, String professorId, Integer watchType) throws SQLException{