专家详细信息页返回值增加是否存在研究方向点赞的专家头像。

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

@@ -1,35 +1,61 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
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.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import com.ekexiu.portal.po.ResearchAreaLog;
import com.ekexiu.portal.pojo.EditResearchAreaLog;
@DAO
public interface ResearchAreaLogDao {
public abstract class ResearchAreaLogDao {
	
	@Insert
	int insert(Connection con,ResearchAreaLog log) throws SQLException;
	public abstract int insert(Connection con,ResearchAreaLog log) throws SQLException;
	
	@DeleteWith
	@From(ResearchAreaLog.class)
	int delete(Connection con,String professorId,String opreteProfessorId,String caption)throws SQLException;
	public abstract int delete(Connection con,String professorId,String opreteProfessorId,String caption)throws SQLException;
	
	@DeleteWith
	@From(ResearchAreaLog.class)
	int delete(Connection con,String professorId,String caption)throws SQLException;
	public abstract int delete(Connection con,String professorId,String caption)throws SQLException;
	@DeleteWith
	@From(ResearchAreaLog.class)
	int delete(Connection con,String professorId)throws SQLException;
	public abstract int delete(Connection con,String professorId)throws SQLException;
	
	@SelectList
	List<ResearchAreaLog> query(Connection con,String professorId)throws SQLException;
	public List<EditResearchAreaLog> query(Connection con,String professorId) throws SQLException{
        int _m_1 = 1;
        String sql = "SELECT OPRETE_PROFESSOR_ID,CREATE_TIME,PROFESSOR_ID,CAPTION FROM RESEARCH_AREA_LOG WHERE PROFESSOR_ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(_m_1++,professorId);
            ResultSet rs = ps.executeQuery();
            try{
                List<EditResearchAreaLog> _result = new ArrayList<EditResearchAreaLog>();
                while(rs.next()){
                	EditResearchAreaLog log =  new EditResearchAreaLog();
                	log.setOpreteProfessorId(rs.getString(1));
                	log.setCreateTime(rs.getString(2));
                	log.setProfessorId(rs.getString(3));
                	log.setCaption(rs.getString(4));
                    _result.add(log);
                }
                return _result;
            }finally{
                try{rs.close();}catch(Exception _m_2){}
            }
        }finally{
            try{ps.close();}catch(Exception _m_3){}
        }
    }
}

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

@@ -0,0 +1,16 @@
package com.ekexiu.portal.pojo;
import com.ekexiu.portal.po.ResearchAreaLog;
public class EditResearchAreaLog extends ResearchAreaLog {
	private Integer hasHeadImage;
	public Integer getHasHeadImage() {
		return hasHeadImage;
	}
	public void setHasHeadImage(Integer hasHeadImage) {
		this.hasHeadImage = hasHeadImage;
	}
	
}

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

@@ -10,7 +10,6 @@ import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.ProfessorEduBg;
import com.ekexiu.portal.po.Project;
import com.ekexiu.portal.po.ResearchArea;
import com.ekexiu.portal.po.ResearchAreaLog;
public class ProfessorInfo extends Professor{
	
@@ -20,7 +19,7 @@ public class ProfessorInfo extends Professor{
	 * 研究方向
	 */
	private List<ResearchArea> researchAreas;
	private List<ResearchAreaLog> researchAreaLogs;
	private List<EditResearchAreaLog> editResearchAreaLogs;
	/**
	 * 教育背景
	 */
@@ -58,11 +57,12 @@ public class ProfessorInfo extends Professor{
	public void setHasHeadImage(Integer hasHeadImage) {
		this.hasHeadImage = hasHeadImage;
	}
	public List<ResearchAreaLog> getResearchAreaLogs() {
		return researchAreaLogs;
	public List<EditResearchAreaLog> getEditResearchAreaLogs() {
		return editResearchAreaLogs;
	}
	public void setogs(List<ResearchAreaLog> researchAreaLogs) {
		this.researchAreaLogs = researchAreaLogs;
	public void setEditogs(
			List<EditResearchAreaLog> editResearchAreaLogs) {
		this.editResearchAreaLogs = editResearchAreaLogs;
	}
	public List<ResearchArea> getResearchAreas() {
		return researchAreas;

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

@@ -35,6 +35,7 @@ import com.ekexiu.portal.dao.ResourceDao;
import com.ekexiu.portal.dao.WatchDao;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.pojo.EditProfessor;
import com.ekexiu.portal.pojo.EditResearchAreaLog;
import com.ekexiu.portal.pojo.ProfessorInfo;
import com.ekexiu.portal.util.Calculate;
@@ -411,7 +412,13 @@ public class ProfessorService {
			info.setPapers(this.paperDao.query(con, id));
			info.setPatents(this.patentDao.query(con, id));
			info.setProjects(this.projectDao.query(con, id));
			info.setResearchAreaLogs(this.researchAreaLogDao.query(con, id));
			List<EditResearchAreaLog> logs = this.researchAreaLogDao.query(con, id);
			if(logs != null){
				for (EditResearchAreaLog log : logs) {
					log.setHasHeadImage(this.imageService.hasProfessorImage(log.getOpreteProfessorId()));
				}
			}
			info.setEditResearchAreaLogs(logs);
			info.setResearchAreas(this.researchAreaDao.query(con, id));
			info.setResources(this.resourceDao.queryPro(con, id));
		}