修改我的工作台最新咨询和最新回复两个接口，返回值增加是否存在专家头像的字段。

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

@@ -16,7 +16,6 @@ import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.Consult;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.pojo.EditProfessor;
@DAO
@@ -205,12 +204,9 @@ public abstract class ConsultDao {
	 */
	public Consult queryNewConsult(Connection con, String professorId) throws SQLException {
		int m1 = 1;
		String sql = " SELECT CONSULT_ID,CONSULT_TYPE,CONSULT_TITLE,CONSULT_CONTANT,CONSULT.CREATE_TIME,"
				+ " CONSULT.PROFESSOR_ID,CONSULTANT_ID,READ_STATUS,PROFESSOR.NAME,PROFESSOR.OFFICE,"
				+ " PROFESSOR.DEPARTMENT,PROFESSOR.TITLE,PROFESSOR.ADDRESS,ORGANIZATION.NAME "
				+ " FROM CONSULT LEFT JOIN PROFESSOR ON CONSULTANT_ID = PROFESSOR.ID "
				+ " LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID "
				+ " WHERE CONSULT.CREATE_TIME "
		String sql = " SELECT CONSULT_ID,CONSULT_TYPE,CONSULT_TITLE,CONSULT_CONTANT,"
				+ "CONSULT.CREATE_TIME,CONSULT.PROFESSOR_ID,CONSULTANT_ID,READ_STATUS"
				+ " FROM CONSULT WHERE CONSULT.CREATE_TIME "
				+ " IN (SELECT MAX(CREATE_TIME) FROM CONSULT WHERE READ_STATUS = 0 AND PROFESSOR_ID = ?) ";
		PreparedStatement ps = con.prepareStatement(sql);
		try{
@@ -225,16 +221,8 @@ public abstract class ConsultDao {
					consult.setConsultContant(rs.getString(4));
					consult.setCreateTime(rs.getString(5));
					consult.setProfessorId(rs.getString(6));
					EditProfessor professor = new EditProfessor();
					professor.setId(rs.getString(7));
					consult.setConsultantId(rs.getString(7));
					consult.setReadStatus(rs.getInt(8));
					professor.setName(rs.getString(9));
					professor.setOffice(rs.getString(10));
					professor.setDepartment(rs.getString(11));
					professor.setTitle(rs.getString(12));
					professor.setAddress(rs.getString(13));
					professor.setOrgName(rs.getString(14));
					consult.setProfessor(professor);
					return consult;
				}else{
					return null;
@@ -265,7 +253,7 @@ public abstract class ConsultDao {
                    _result.setConsultTitle(rs.getString(3));
                    _result.setConsultContant(rs.getString(4));
                    _result.setProfessorId(rs.getString(5));
                    Professor professor = new Professor();
                    EditProfessor professor = new EditProfessor();
                    professor.setId(rs.getString(6));
                    _result.setConsultStatus(rs.getInt(7));
                    String _m_2 = rs.getString(8);
@@ -330,7 +318,7 @@ public abstract class ConsultDao {
                    _result.setConsultType(rs.getString(2));
                    _result.setConsultTitle(rs.getString(3));
                    _result.setConsultContant(rs.getString(4));
                    Professor professor = new Professor();
                    EditProfessor professor = new EditProfessor();
                    professor.setId(rs.getString(5));
                    _result.setConsultantId(rs.getString(6));
                    _result.setConsultStatus(rs.getInt(7));

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

@@ -6,6 +6,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.jfw.apt.annotation.Nullable;
@@ -288,6 +289,179 @@ public abstract class ProfessorDao {
					"" + "ORG_ID IN(SELECT ID FROM ORGANIZATION WHERE NAME LIKE ?)", "NAME LIKE ?" }, handlerClass = StringHandler.class) String key,
			int pageSize, int pageNo) throws SQLException;
	/**
	 * 分页查询专家基础信息，多条件查询专家列表。
	 * @param con
	 * @param key 搜索信息
	 * @param subject 学术领域
	 * @param industry 应用行业
	 * @param address 所在城市
	 * @param pageSize 
	 * @param pageNo
	 * @return 返回专家信息列表
	 * @throws SQLException
	 */
	public PageQueryResult<EditProfessor> queryEditBaseInfo(Connection con, @Nullable String key, String subject, 
			String industry, String address, int pageSize, int pageNo) throws SQLException {
		PageQueryResult<EditProfessor> _result = new PageQueryResult<EditProfessor>();
		StringBuilder sql = new StringBuilder();
		boolean hasKey = null != key;
		if (hasKey) {
			sql.append(" WHERE (( professor.ID IN (SELECT PROFESSOR_ID FROM RESEARCH_AREA WHERE CAPTION LIKE ?)) "
					+ " OR (ORG_ID IN(SELECT organization.ID FROM ORGANIZATION WHERE organization.NAME LIKE ?)) "
					+ " OR ( professor.NAME LIKE ?) OR (professor.SUBJECT LIKE ?) "
					+ " OR (professor.INDUSTRY LIKE ?) OR (professor.ADDRESS LIKE ?))");
		}
		boolean hasSubject = null != subject;
		boolean hasIndustry = null != industry;
		boolean hasAddress = null != address;
		if (hasSubject) {
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(SUBJECT LIKE ?)");
		}
		if (hasIndustry) {
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(INDUSTRY LIKE ?)");
		}
		if (hasAddress) {
			sql.append(sql.length() > 0 ? " AND " : " WHERE ").append("(ADDRESS LIKE ?)");
		}
		StringBuilder whereSql = sql;
		sql = new StringBuilder();
		sql.append("SELECT COUNT(1) FROM PROFESSOR");
		if (whereSql.length() > 0) {
			sql.append(whereSql);
		}
		PreparedStatement ps = con.prepareStatement(sql.toString());
		int paramIndex = 1;
		int totalSize = 0;
		try {
			if (hasKey) {
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
			}
			if (hasSubject) {
				ps.setString(paramIndex++, subject);
			}
			if (hasIndustry) {
				ps.setString(paramIndex++, industry);
			}
			if (hasAddress) {
				ps.setString(paramIndex++, address);
			}
			_result.setPageSize(pageSize);
			ResultSet _pageRs = ps.executeQuery();
			try {
				_pageRs.next();
				totalSize = _pageRs.getInt(1);
			} finally {
				try {
					_pageRs.close();
				} catch (Exception _m_6) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception _m_7) {
			}
		}
		_result.setTotal(totalSize);
		if (0 == totalSize) {
			_result.setPageNo(1);
			_result.setData(Collections.<EditProfessor> emptyList());
			return _result;
		}
		paramIndex = 1;
		if (1 == pageNo) {
			_result.setPageNo(1);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,SUBJECT,INDUSTRY,ADDRESS,DEPARTMENT,organization.NAME AS ONAME,TITLE,"
					+ " AUTHENTICATION,professor.ID,professor.NAME AS PNAME,STAR_LEVEL,CONSULT_COUNT "
					+ " FROM PROFESSOR LEFT JOIN ORGANIZATION ON ORG_ID=organization.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
			}
			sql.append(" ORDER BY ONAME ");
			sql.append(" LIMIT ").append(pageSize);
		} else {
			int _pageSize = totalSize / pageSize;
			if (totalSize % pageSize != 0) {
				++_pageSize;
			}
			if (pageNo > _pageSize) {
				pageNo = _pageSize;
			}
			_result.setPageNo(pageNo);
			--pageNo;
			int _m_10 = (pageNo * pageSize);
			sql = new StringBuilder();
			sql.append("SELECT OFFICE,SUBJECT,INDUSTRY,ADDRESS,DEPARTMENT,organization.NAME AS ONAME,TITLE,"
					+ " AUTHENTICATION,professor.ID,professor.NAME AS PNAME,STAR_LEVEL,CONSULT_COUNT "
					+ " FROM PROFESSOR LEFT JOIN ORGANIZATION ON ORG_ID=organization.ID ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
			}
			sql.append(" ORDER BY ONAME ");
			sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(_m_10);
		}
		ps = con.prepareStatement(sql.toString());
		try {
			if (hasKey) {
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
				ps.setString(paramIndex++, key);
			}
			if (hasSubject) {
				ps.setString(paramIndex++, subject);
			}
			if (hasIndustry) {
				ps.setString(paramIndex++, industry);
			}
			if (hasAddress) {
				ps.setString(paramIndex++, address);
			}
			java.sql.ResultSet rs = ps.executeQuery();
			try {
				List<EditProfessor> _m_11 = new ArrayList<EditProfessor>();
				_result.setData(_m_11);
				while (rs.next()) {
					EditProfessor professor = new EditProfessor();
					professor.setOffice(rs.getString(1));
					professor.setSubject(rs.getString(2));
					professor.setIndustry(rs.getString(3));
					professor.setAddress(rs.getString(4));
					professor.setDepartment(rs.getString(5));
					professor.setOrgName(rs.getString(6));
					professor.setTitle(rs.getString(7));
					professor.setAuthentication("1".equals(rs.getString(8)));
					professor.setId(rs.getString(9));
					professor.setName(rs.getString(10));
					professor.setStarLevel(rs.getBigDecimal(11));
					professor.setConsultCount(rs.getInt(12));
					_m_11.add(professor);
				}
				return _result;
			} finally {
				try {
					rs.close();
				} catch (Exception _m_17) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception _m_18) {
			}
		}
	}
	
	public PageQueryResult<Professor> query(Connection con, @Nullable String key, String subject, String industry, String address, int pageSize, int pageNo)
			throws SQLException {

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

@@ -11,7 +11,6 @@ import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import com.ekexiu.portal.po.Consult;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.Tidings;
import com.ekexiu.portal.pojo.EditProfessor;
@DAO
public abstract class TidingsDao {
@@ -59,12 +58,9 @@ public abstract class TidingsDao {
	 */
	public Tidings queryNewReply(Connection con, String consultantId) throws SQLException{
		int _m_1 = 1;
        String sql = "SELECT TIDINGS_ID,TIDINGS_CONTANT,SENDER_ID,TIDINGS.CONSULT_ID,TIDINGS.CREATE_TIME,"
        		+ " TIDINGS.READ_STATUS,CONSULT.CONSULT_TITLE,PROFESSOR.NAME,PROFESSOR.OFFICE,"
        		+ " PROFESSOR.DEPARTMENT,PROFESSOR.TITLE,PROFESSOR.ADDRESS,ORGANIZATION.NAME "
        String sql = "SELECT TIDINGS_ID,TIDINGS_CONTANT,SENDER_ID,TIDINGS.CONSULT_ID,"
        		+ " TIDINGS.CREATE_TIME,TIDINGS.READ_STATUS,CONSULT.CONSULT_TITLE"
        		+ " FROM TIDINGS LEFT JOIN CONSULT ON TIDINGS.CONSULT_ID = CONSULT.CONSULT_ID "
        		+ " LEFT JOIN PROFESSOR ON CONSULT.PROFESSOR_ID = PROFESSOR.ID "
        		+ " LEFT JOIN ORGANIZATION ON PROFESSOR.ORG_ID = ORGANIZATION.ID "
        		+ " WHERE TIDINGS.CREATE_TIME IN "
        		+ " (SELECT MAX(TIDINGS.CREATE_TIME) FROM TIDINGS "
        		+ " INNER JOIN CONSULT ON TIDINGS.CONSULT_ID = CONSULT.CONSULT_ID AND (TIDINGS.READ_STATUS = 0) "
@@ -80,20 +76,12 @@ public abstract class TidingsDao {
                	Tidings tidings = new Tidings();
                	tidings.setTidingsId(rs.getString(1));
                	tidings.setTidingsContant(rs.getString(2));
                	EditProfessor professor = new EditProfessor();
                	professor.setId(rs.getString(3));
                	tidings.setSenderId(rs.getString(3));
                	Consult consult = new Consult();
                	consult.setConsultId(rs.getString(4));
                	tidings.setCreateTime(rs.getString(5));
                	tidings.setReadStatus(rs.getShort(6));
                	tidings.setReadStatus(rs.getInt(6));
                	consult.setConsultTitle(rs.getString(7));
                	professor.setName(rs.getString(8));
                	professor.setOffice(rs.getString(9));
                	professor.setDepartment(rs.getString(10));
                	professor.setTitle(rs.getString(11));
                	professor.setAddress(rs.getString(12));
                	professor.setOrgName(rs.getString(13));
                	tidings.setProfessor(professor);
                	tidings.setConsult(consult);
                	return tidings;
                }else{

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

@@ -11,6 +11,7 @@ import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
import com.ekexiu.portal.pojo.EditProfessor;
@PrimaryKey("consultId")
@Table
@@ -33,12 +34,12 @@ public class Consult implements CreateTimeSupported {
	private String thanksTime;
	private String revoveryTime;
	private int readStatus;
	private Professor professor;
	private EditProfessor professor;
	
	public Professor getProfessor() {
	public EditProfessor getProfessor() {
		return professor;
	}
	public void setProfessor(Professor professor) {
	public void setProfessor(EditProfessor professor) {
		this.professor = professor;
	}
	

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

@@ -16,6 +16,7 @@ import org.jfw.util.StringUtil;
import com.ekexiu.portal.dao.ConsultDao;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.po.Consult;
import com.ekexiu.portal.pojo.EditProfessor;
@Path("/consult")
public class ConsultService {
@@ -23,6 +24,8 @@ public class ConsultService {
	private ConsultDao consultDao;
	@Autowrie
	private ProfessorDao professorDao;
	@Autowrie
	private ImageService imageService;
	
	public ConsultDao getConsultDao() {
		return consultDao;
@@ -36,6 +39,12 @@ public class ConsultService {
	public void setProfessorDao(ProfessorDao professorDao) {
		this.professorDao = professorDao;
	}
	public ImageService getImageService() {
		return imageService;
	}
	public void setImageService(ImageService imageService) {
		this.imageService = imageService;
	}
	
	@Post
	@Path
@@ -106,7 +115,13 @@ public class ConsultService {
	@Get
	@Path("/qaNewConsult")
	public Consult queryNewConsult(@JdbcConn Connection con, String professorId) throws SQLException {
		return this.consultDao.queryNewConsult(con, professorId);
		Consult consult = this.consultDao.queryNewConsult(con, professorId);
		if(consult != null){
			EditProfessor professor = this.professorDao.queryBaseInfo(con, consult.getConsultantId());
			professor.setHasHeadImage(this.imageService.hasProfessorImage(consult.getConsultantId()));
			consult.setProfessor(professor);
		}
		return consult;
	}
	
	@Get

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

@@ -200,7 +200,9 @@ public class ProfessorService {
	@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));
		if(null != professor){
			professor.setHasHeadImage(this.imageService.hasProfessorImage(id));
		}
		return professor;
	}
	
@@ -208,7 +210,9 @@ public class ProfessorService {
	@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));
		if(null != professor){
			professor.setHasHeadImage(this.imageService.hasProfessorImage(id));
		}
		return professor;
	}
	
@@ -265,9 +269,32 @@ public class ProfessorService {
		this.honorDao.delete(con, id);
		this.projectDao.delete(con, id);
	}
	
	@Get
	@Path("/pqBaseInfo")
	PageQueryResult<EditProfessor> queryEditBaseInfo(@JdbcConn(false) Connection con,@Nullable String key,
			@Nullable String subject,@Nullable String industry,@Nullable String address, 
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		if(key!=null) key="%"+key+"%";
		if(subject!=null) subject ="%"+subject+"%";
		if(null!=industry) industry="%"+industry+"%";
		if(null!=address) address="%"+address+"%";
		PageQueryResult<EditProfessor> queryResult = this.professorDao.queryEditBaseInfo(con, key, subject, industry, address, pageSize, pageNo);
		List<EditProfessor> editProfessors = queryResult.getData();
		if(editProfessors != null){
			for (EditProfessor editProfessor : editProfessors) {
				editProfessor.setHasHeadImage(this.imageService.hasProfessorImage(editProfessor.getId()));
				editProfessor.setResearchAreas(this.researchAreaDao.query(con, editProfessor.getId()));
			}
		}
		return queryResult;
	}
	
	@Get
	@Path("/pq")
	PageQueryResult<Professor> query(@JdbcConn(false) Connection con,@Nullable String key,@Nullable String subject,@Nullable String industry,@Nullable String address, @DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
	PageQueryResult<Professor> query(@JdbcConn(false) Connection con,@Nullable String key,
			@Nullable String subject,@Nullable String industry,@Nullable String address, 
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
	//	System.out.println("key==["+(key==null?"":key)+"]");
	//	System.out.println("subject==["+(subject==null?"":subject)+"]");
	//	System.out.println("industry==["+(industry==null?"":industry)+"]");

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

@@ -13,8 +13,10 @@ import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.util.StringUtil;
import com.ekexiu.portal.dao.ConsultDao;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.TidingsDao;
import com.ekexiu.portal.po.Tidings;
import com.ekexiu.portal.pojo.EditProfessor;
@Path("/tidings")
public class TidingsService {
@@ -22,6 +24,10 @@ public class TidingsService {
	private TidingsDao tidingsDao;
	@Autowrie
	private ConsultDao consultDao;
	@Autowrie
	private ProfessorDao professorDao;
	@Autowrie
	private ImageService imageService;
	
	public TidingsDao getTidingsDao() {
		return tidingsDao;
@@ -35,6 +41,18 @@ public class TidingsService {
	public void setConsultDao(ConsultDao consultDao) {
		this.consultDao = consultDao;
	}
	public ProfessorDao getProfessorDao() {
		return professorDao;
	}
	public void setProfessorDao(ProfessorDao professorDao) {
		this.professorDao = professorDao;
	}
	public ImageService getImageService() {
		return imageService;
	}
	public void setImageService(ImageService imageService) {
		this.imageService = imageService;
	}
	
	@Post
	@Path
@@ -58,7 +76,13 @@ public class TidingsService {
	@Get
	@Path("/qaNewReply")
	public Tidings queryNewReply(@JdbcConn Connection con, String consultantId) throws SQLException {
		return this.tidingsDao.queryNewReply(con, consultantId);
		Tidings tidings = this.tidingsDao.queryNewReply(con, consultantId);
		if(tidings != null){
			EditProfessor professor = this.professorDao.queryBaseInfo(con, tidings.getSenderId());
			professor.setHasHeadImage(this.imageService.hasProfessorImage(tidings.getSenderId()));
			tidings.setProfessor(professor);
		}
		return tidings;
	}
	
	@Get