专家基本信息接口和专家基本信息（加上星级和被咨询次数）接口。ImageService添加判断是否存在专家头像的接口。

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

@@ -107,7 +107,7 @@ public abstract class ConsultDao {
	 * @return 返回用户被评价的平均星级
	 * @throws SQLException
	 */
	public int queryStarLevel(Connection con, String professorId) throws SQLException {
	public BigDecimal queryStarLevel(Connection con, String professorId) throws SQLException {
		int _m_2 = 1;
		String sql = " SELECT AVG(ASSESS_STAR) FROM CONSULT WHERE ASSESS_STATUS = 1 AND PROFESSOR_ID = ? ";
		PreparedStatement ps = con.prepareStatement(sql);
@@ -115,7 +115,7 @@ public abstract class ConsultDao {
			ps.setString(_m_2++, professorId);
			ResultSet rs = ps.executeQuery();
			rs.next();
			int avg = rs.getInt(1);
			BigDecimal avg = rs.getBigDecimal(1);
			return avg;
		} finally{
            try{ps.close();}catch(Exception _m_3){}
@@ -175,15 +175,15 @@ public abstract class ConsultDao {
	}
	
	/**
	 * 我的工作台中显示接受咨询的总次数
	 * 我的工作台中显示接受咨询的总次数(已完成状态)
	 * @param con
	 * @param professorId 登陆者ID
	 * @return 返回接受咨询的总次数
	 * @return 返回接受咨询已完成的总次数
	 * @throws SQLException
	 */
	public int queryReceiveConsult(Connection con, String professorId) throws SQLException {
		int _m_2 = 1;
		String sql = " SELECT COUNT(1) FROM CONSULT WHERE PROFESSOR_ID = ? ";
		String sql = " SELECT COUNT(1) FROM CONSULT WHERE (CONSULT_STATUS = 1) AND (PROFESSOR_ID = ?) ";
		PreparedStatement ps = con.prepareStatement(sql);
		try {
			ps.setString(_m_2++, professorId);

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

@@ -1,5 +1,6 @@
package com.ekexiu.portal.dao;
import java.math.BigDecimal;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -26,6 +27,7 @@ import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.pojo.EditProfessor;
import com.ekexiu.portal.pojo.ProfessorInfo;
@DAO
@@ -38,7 +40,11 @@ public abstract class ProfessorDao {
	
	@UpdateWith
	@From(Professor.class)
	public abstract int updateStarLevel(Connection con, String id, @Set int starLevel) throws SQLException;
	public abstract int updateStarLevel(Connection con, String id, @Set BigDecimal starLevel) throws SQLException;
	
	@UpdateWith
	@From(Professor.class)
	public abstract int updateConsultCount(Connection con, String id, @Set int consultCount) throws SQLException;
	@UpdateWith
	@From(Professor.class)
@@ -56,6 +62,93 @@ public abstract class ProfessorDao {
	@From(Professor.class)
	public abstract int updateAddress(Connection con, String id, @Set String address) throws SQLException;
	
	/**
	 * 查询专家基本信息接口
	 * @param con
	 * @param id 专家ID
	 * @return 返回专家基本信息
	 * @throws SQLException
	 */
	public EditProfessor queryBaseInfo(Connection con, String id) throws SQLException {
		int _m_1 = 1;
        String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,P.ID,P.NAME,P.ADDRESS,ORGANIZATION.NAME "
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(_m_1++,id);
            ResultSet rs = ps.executeQuery();
            try{
                if(rs.next()){
                	EditProfessor professor = new EditProfessor();
                    professor.setOffice(rs.getString(1));
                    professor.setDepartment(rs.getString(2));
                    professor.setTitle(rs.getString(3));
                    professor.setAuthentication("1".equals(rs.getString(4)));
                    professor.setId(rs.getString(5));
                    professor.setName(rs.getString(6));
                    professor.setAddress(rs.getString(7));
                    professor.setOrgName(rs.getString(8));
                    return professor;
                }else{
                    return null;
                }
            }finally{
                try{rs.close();}catch(Exception _m_9){}
            }
        }finally{
            try{ps.close();}catch(Exception _m_10){}
        }
	}
	
	/**
	 * 查询专家基本信息+星级+咨询次数的接口
	 * @param con
	 * @param id 专家ID
	 * @return 返回专家基本信息+星级+咨询次数
	 * @throws SQLException
	 */
	public EditProfessor queryEditBaseInfo(Connection con, String id) throws SQLException {
		int _m_1 = 1;
        String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,P.ID,P.NAME,"
        		+ " P.ADDRESS,P.STAR_LEVEL,P.CONSULT_COUNT,ORGANIZATION.NAME "
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(_m_1++,id);
            ResultSet rs = ps.executeQuery();
            try{
                if(rs.next()){
                	EditProfessor professor = new EditProfessor();
                    professor.setOffice(rs.getString(1));
                    professor.setDepartment(rs.getString(2));
                    professor.setTitle(rs.getString(3));
                    professor.setAuthentication("1".equals(rs.getString(4)));
                    professor.setId(rs.getString(5));
                    professor.setName(rs.getString(6));
                    professor.setAddress(rs.getString(7));
                    BigDecimal starLevel = rs.getBigDecimal(8);
                    if(rs.wasNull()){
                    	starLevel = null;
                    }
                    professor.setStarLevel(starLevel);
                    Integer consultCount = rs.getInt(9);
                    if(rs.wasNull()){
                    	consultCount = 0;
                    }
                    professor.setConsultCount(consultCount);
                    professor.setOrgName(rs.getString(10));
                    return professor;
                }else{
                    return null;
                }
            }finally{
                try{rs.close();}catch(Exception _m_9){}
            }
        }finally{
            try{ps.close();}catch(Exception _m_10){}
        }
	}
	
	public Professor query(Connection con, String id) throws SQLException{
        int _m_1 = 1;
        String sql = "SELECT P.OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,P.DEPARTMENT,ORG_ID,P.TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,ORGANIZATION.NAME FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";

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

@@ -1,8 +1,11 @@
package com.ekexiu.portal.po;
import java.math.BigDecimal;
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.defaultImpl.BigDecimalHandler;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
@@ -37,7 +40,8 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
	private String descp;
	private String createTime;
	private String modifyTime;
	private int starLevel;
	private BigDecimal starLevel;
	private int consultCount;
	private Organization organization;
	
	public Organization getOrganization() {
@@ -176,13 +180,22 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
		this.modifyTime = modifyTime;
	}
	@Column(handlerClass=IntHandler.class,dbType="INT",insertable=false,nullable=true,renewable=true,queryable=true)
	public int getStarLevel() {
	@Column(handlerClass=BigDecimalHandler.class,dbType="DECIMAL",insertable=false,nullable=true,renewable=true,queryable=true)
	public BigDecimal getStarLevel() {
		return starLevel;
	}
	public void setStarLevel(int starLevel) {
	
	public void setStarLevel(BigDecimal starLevel) {
		this.starLevel = starLevel;
	}
	@Column(handlerClass=IntHandler.class,dbType="INT",insertable=false,nullable=true,renewable=true,queryable=true)
	public int getConsultCount() {
		return consultCount;
	}
	public void setConsultCount(int consultCount) {
		this.consultCount = consultCount;
	}
}

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

@@ -1,9 +1,17 @@
package com.ekexiu.portal.pojo;
import java.util.List;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.ResearchArea;
public class EditProfessor extends Professor {
	private String orgName;
	private int hasHeadImage;
	/**
	 * 研究方向
	 */
	private List<ResearchArea> researchAreas;
	public String getOrgName() {
		return orgName;
@@ -12,6 +20,21 @@ public class EditProfessor extends Professor {
	public void setOrgName(String orgName) {
		this.orgName = orgName;
	}
	
	public int getHasHeadImage() {
		return hasHeadImage;
	}
	public void setHasHeadImage(int hasHeadImage) {
		this.hasHeadImage = hasHeadImage;
	}
	public List<ResearchArea> getResearchAreas() {
		return researchAreas;
	}
	public void setResearchAreas(List<ResearchArea> researchAreas) {
		this.researchAreas = researchAreas;
	}
}

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

@@ -14,18 +14,28 @@ import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import com.ekexiu.portal.dao.ConsultDao;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.po.Consult;
@Path("/consult")
public class ConsultService {
	@Autowrie
	private ConsultDao consultDao;
	@Autowrie
	private ProfessorDao professorDao;
	
	public ConsultDao getConsultDao() {
		return consultDao;
	}
	public void setConsultDao(ConsultDao consultDao) {
		this.consultDao = consultDao;
	}
	public ProfessorDao getProfessorDao() {
		return professorDao;
	}
	public void setProfessorDao(ProfessorDao professorDao) {
		this.professorDao = professorDao;
	}
	
	@Post
	@Path
@@ -48,6 +58,8 @@ public class ConsultService {
		Consult consult = this.consultDao.query(con, consultId);
		if(null == consult.getFinishTime()){
			this.consultDao.updateFinishTime(con, consultId,consultStatus);
			int finishConsult = this.consultDao.queryReceiveConsult(con, consult.getProfessorId());
			this.professorDao.updateConsultCount(con, consult.getProfessorId(), finishConsult);
			return true;
		}
		return false;
@@ -59,6 +71,8 @@ public class ConsultService {
		Consult consult = this.consultDao.query(con, consultId);
		if(0 == consult.getAssessStatus()){
			this.consultDao.updateAssess(con, consultId, assessStatus, assessStar, assessContant);
			BigDecimal avgStar = this.consultDao.queryStarLevel(con, consult.getProfessorId());
			this.professorDao.updateStarLevel(con, consult.getProfessorId(), avgStar);
			return true;
		}
		return false;

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

@@ -141,6 +141,21 @@ public class ImageService {
	public void setDefaultResourcePhoto(File defaultResourcePhoto) {
		this.defaultResourcePhoto = defaultResourcePhoto;
	}
	
	/**
	 * 判断是否有专家头像
	 * @param id 专家ID
	 * @return 有头像返回1，没有返回0.
	 */
	public int hasProfessorImage(String id) {
		String headPath = this.headPath+"/"+id+"_l.jpg";
		File file = new File(headPath);
		if(file.exists()){
			return 1;
		}else{
			return 0;
		}
	}
	private File getTemplateFielName(File path, String suffix) {
		File result = null;

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

@@ -1,6 +1,7 @@
package com.ekexiu.portal.service;
import java.io.IOException;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.sql.Connection;
import java.sql.SQLException;
@@ -194,7 +195,23 @@ public class ProfessorService {
			}
		this.professorDao.update(con, professor);
	}
	
	@Get
	@Path("/baseInfo/{id}")
	public EditProfessor queryBaseInfo(@JdbcConn Connection con, @PathVar String id) throws SQLException {
		EditProfessor professor = this.professorDao.queryBaseInfo(con, id);
		professor.setHasHeadImage(this.imageService.hasProfessorImage(id));
		return professor;
	}
	
	@Get
	@Path("/editBaseInfo/{id}")
	public EditProfessor queryEditBaseInfo(@JdbcConn Connection con, @PathVar String id) throws SQLException {
		EditProfessor professor = this.professorDao.queryEditBaseInfo(con, id);
		professor.setHasHeadImage(this.imageService.hasProfessorImage(id));
		return professor;
	}
	
	@Get
	@Path("/{id}")
	public Professor query(@JdbcConn Connection con, @PathVar String id) throws SQLException {
@@ -208,7 +225,7 @@ public class ProfessorService {
	
	@Post
	@Path("/starLevel")
	public void updateStarLevel(@JdbcConn(true) Connection con, String id, int starLevel) throws SQLException{
	public void updateStarLevel(@JdbcConn(true) Connection con, String id, BigDecimal starLevel) throws SQLException{
		this.professorDao.updateStarLevel(con, id, starLevel);
	}