咨询页面我的咨询和收到回复两个接口返回值增加专家基础信息和是否存在专家头像。

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

@@ -9,6 +9,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
@@ -20,6 +21,17 @@ import com.ekexiu.portal.pojo.EditProfessor;
@DAO
public abstract class ConsultDao {
	@Autowrie
	private ProfessorDao professorDao;
	
	public ProfessorDao getProfessorDao() {
		return professorDao;
	}
	public void setProfessorDao(ProfessorDao professorDao) {
		this.professorDao = professorDao;
	}
	@Insert
	public abstract int insert(Connection con, Consult consult) throws SQLException;
	
@@ -367,6 +379,182 @@ public abstract class ConsultDao {
        }
    }	
	
	public PageQueryResult<Consult> queryPageProBase(Connection con, String professorId, int status, int timeType, int sortType, int pageSize, int pageNo) throws SQLException{
		PageQueryResult<Consult> queryResult = new PageQueryResult<Consult>();
		StringBuilder sql = new StringBuilder();
		sql.append(" WHERE PROFESSOR_ID = ? ");
		if(1 == status) {
			sql.append(" AND CONSULT_STATUS = 0 ");
		}else if(2 == status) {
			sql.append(" AND CONSULT_STATUS = 1 AND THANKS_STATUS = 0 ");
		}else if(3 == status) {
			sql.append(" AND CONSULT_STATUS = 1 AND ASSESS_STATUS = 0 ");
		}else if(4 == status) {
			sql.append(" AND CONSULT_STATUS = 1 ");
		}
		StringBuilder whereSql = sql;
		sql = new StringBuilder();
		sql.append("SELECT COUNT(1) FROM CONSULT");
		if (whereSql.length() > 0) {
			sql.append(whereSql);
		}
		PreparedStatement ps = con.prepareStatement(sql.toString());
		int paramIndex = 1;
		int totalSize = 0;
		try {
			ps.setString(paramIndex++, professorId);
			queryResult.setPageSize(pageSize);
			ResultSet resultSet = ps.executeQuery();
			try {
				resultSet.next();
				totalSize = resultSet.getInt(1);
			} finally {
				try {
					resultSet.close();
				} catch (Exception _m_6) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception _m_7) {
			}
		}
		queryResult.setTotal(totalSize);
		if (0 == totalSize) {
			queryResult.setPageNo(1);
			queryResult.setData(Collections.<Consult> emptyList());
			return queryResult;
		}
		paramIndex = 1;
		if (1 == pageNo) {
			queryResult.setPageNo(1);
			sql = new StringBuilder();
			sql.append(" SELECT CONSULT_ID,CONSULT_TYPE,CONSULT_TITLE,CONSULT_CONTANT,PROFESSOR_ID,CONSULTANT_ID,"
					+ " CONSULT_STATUS,FINISH_TIME,ASSESS_STATUS,ASSESS_STAR,ASSESS_CONTANT,ASSESS_TIME,THANKS_STATUS,"
					+ " THANKS_MONEY,THANKS_TIME,REVOVERY_TIME,READ_STATUS,CREATE_TIME FROM CONSULT ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
			}
			if(0 == timeType) {
				sql.append(" ORDER BY CREATE_TIME ");
			}else if(1 == timeType) {
				sql.append(" ORDER BY REVOVERY_TIME ");
			}else if(2 == timeType) {
				sql.append(" ORDER BY FINISH_TIME ");
			}
			if(0 == sortType) {
				sql.append(" DESC ");
			}
			sql.append(" LIMIT ").append(pageSize);
		} else {
			int _pageSize = totalSize / pageSize;
			if (totalSize % pageSize != 0) {
				++_pageSize;
			}
			if (pageNo > _pageSize) {
				pageNo = _pageSize;
			}
			queryResult.setPageNo(pageNo);
			--pageNo;
			int _m_10 = (pageNo * pageSize);
			sql = new StringBuilder();
			sql.append(" SELECT CONSULT_ID,CONSULT_TYPE,CONSULT_TITLE,CONSULT_CONTANT,PROFESSOR_ID,CONSULTANT_ID,"
					+ " CONSULT_STATUS,FINISH_TIME,ASSESS_STATUS,ASSESS_STAR,ASSESS_CONTANT,ASSESS_TIME,THANKS_STATUS,"
					+ " THANKS_MONEY,THANKS_TIME,REVOVERY_TIME,READ_STATUS,CREATE_TIME FROM CONSULT ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
			}
			if(0 == timeType) {
				sql.append(" ORDER BY CREATE_TIME ");
			}else if(1 == timeType) {
				sql.append(" ORDER BY REVOVERY_TIME ");
			}else if(2 == timeType) {
				sql.append(" ORDER BY FINISH_TIME ");
			}
			if(0 == sortType) {
				sql.append(" DESC ");
			}
			sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(_m_10);
		}
		ps = con.prepareStatement(sql.toString());
		try {
			ps.setString(paramIndex++, professorId);
			ResultSet rs = ps.executeQuery();
			try {
				List<Consult> _m_11 = new ArrayList<Consult>();
				queryResult.setData(_m_11);
				while (rs.next()) {
					Consult consult = new Consult();
					consult.setConsultId(rs.getString(1));
					consult.setConsultType(rs.getString(2));
					consult.setConsultTitle(rs.getString(3));
					consult.setConsultContant(rs.getString(4));
					consult.setProfessorId(rs.getString(5));
					consult.setConsultantId(rs.getString(6));
					Integer m1 = rs.getInt(7);
					if (rs.wasNull()) {
						m1 = null;
					}
					consult.setConsultStatus(m1);
					String m2 = rs.getString(8);
					if (rs.wasNull()) {
						m2 = null;
					}
					consult.setFinishTime(m2);
					Integer m3 = rs.getInt(9);
					if (rs.wasNull()) {
						m3 = null;
					}
					consult.setAssessStatus(m3);
					consult.setAssessStar(rs.getInt(10));
					String m5 = rs.getString(11);
					if (rs.wasNull()) {
						m5 = null;
					}
					consult.setAssessContant(m5);
					String m6 = rs.getString(12);
					if (rs.wasNull()) {
						m6 = null;
					}
					consult.setAssessTime(m6);
					Integer m7 = rs.getInt(13);
					if (rs.wasNull()) {
						m7 = null;
					}
					consult.setThanksStatus(m7);
					BigDecimal m8 = rs.getBigDecimal(14);
					if (rs.wasNull()) {
						m8 = null;
					}
					consult.setThanksMoney(m8);
					String m9 = rs.getString(15);
					if (rs.wasNull()) {
						m9 = null;
					}
					consult.setThanksTime(m9);
					consult.setRevoveryTime(rs.getString(16));
					consult.setReadStatus(rs.getInt(17));
					consult.setCreateTime(rs.getString(18));
					EditProfessor professor = this.professorDao.queryBaseInfo(con, consult.getConsultantId());
					consult.setProfessor(professor);
					_m_11.add(consult);
				}
				return queryResult;
			} finally {
				try {
					rs.close();
				} catch (Exception _m_17) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception _m_18) {
			}
		}
	}
	
	public PageQueryResult<Consult> queryPagePro(Connection con, String professorId, int status, int timeType, int sortType, int pageSize, int pageNo) throws SQLException{
		PageQueryResult<Consult> queryResult = new PageQueryResult<Consult>();
		StringBuilder sql = new StringBuilder();
@@ -502,12 +690,11 @@ public abstract class ConsultDao {
						m3 = null;
					}
					consult.setAssessStatus(m3);
//					Integer m4 = rs.getInt(10);
//					if (rs.wasNull()) {
//						m4 = null;
//					}
//					consult.setAssessStar(m4);
					consult.setAssessStar(rs.getInt(10));
					Integer m4 = rs.getInt(10);
					if (rs.wasNull()) {
						m4 = null;
					}
					consult.setAssessStar(m4);
					String m5 = rs.getString(11);
					if (rs.wasNull()) {
						m5 = null;
@@ -564,6 +751,181 @@ public abstract class ConsultDao {
		}
	}
	
	public PageQueryResult<Consult> queryPageConBase(Connection con, String consultantId, int status, int timeType, int sortType, int pageSize, int pageNo) throws SQLException{
		PageQueryResult<Consult> queryResult = new PageQueryResult<Consult>();
		StringBuilder sql = new StringBuilder();
		sql.append(" WHERE CONSULTANT_ID = ? ");
		if(1 == status) {
			sql.append(" AND CONSULT_STATUS = 0 ");
		}else if(2 == status) {
			sql.append(" AND CONSULT_STATUS = 1 AND THANKS_STATUS = 0 ");
		}else if(3 == status) {
			sql.append(" AND CONSULT_STATUS = 1 AND ASSESS_STATUS = 0 ");
		}else if(4 == status) {
			sql.append(" AND CONSULT_STATUS = 1 ");
		}
		StringBuilder whereSql = sql;
		sql = new StringBuilder();
		sql.append("SELECT COUNT(1) FROM CONSULT");
		if (whereSql.length() > 0) {
			sql.append(whereSql);
		}
		PreparedStatement ps = con.prepareStatement(sql.toString());
		int paramIndex = 1;
		int totalSize = 0;
		try {
			ps.setString(paramIndex++, consultantId);
			ResultSet resultSet = ps.executeQuery();
			try {
				resultSet.next();
				totalSize = resultSet.getInt(1);
			} finally {
				try {
					resultSet.close();
				} catch (Exception _m_6) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception _m_7) {
			}
		}
		queryResult.setTotal(totalSize);
		if (0 == totalSize) {
			queryResult.setPageNo(1);
			queryResult.setData(Collections.<Consult> emptyList());
			return queryResult;
		}
		paramIndex = 1;
		if (1 == pageNo) {
			queryResult.setPageNo(1);
			sql = new StringBuilder();
			sql.append(" SELECT CONSULT_ID,CONSULT_TYPE,CONSULT_TITLE,CONSULT_CONTANT,PROFESSOR_ID,CONSULTANT_ID,"
					+ " CONSULT_STATUS,FINISH_TIME,ASSESS_STATUS,ASSESS_STAR,ASSESS_CONTANT,ASSESS_TIME,THANKS_STATUS,"
					+ " THANKS_MONEY,THANKS_TIME,REVOVERY_TIME,READ_STATUS,CREATE_TIME FROM CONSULT ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
			}
			if(0 == timeType) {
				sql.append(" ORDER BY CREATE_TIME ");
			}else if(1 == timeType) {
				sql.append(" ORDER BY REVOVERY_TIME ");
			}else if(2 == timeType) {
				sql.append(" ORDER BY FINISH_TIME ");
			}
			if(0 == sortType) {
				sql.append(" DESC ");
			}
			sql.append(" LIMIT ").append(pageSize);
		} else {
			int _pageSize = totalSize / pageSize;
			if (totalSize % pageSize != 0) {
				++_pageSize;
			}
			if (pageNo > _pageSize) {
				pageNo = _pageSize;
			}
			queryResult.setPageNo(pageNo);
			--pageNo;
			int _m_10 = (pageNo * pageSize);
			sql = new StringBuilder();
			sql.append(" SELECT CONSULT_ID,CONSULT_TYPE,CONSULT_TITLE,CONSULT_CONTANT,PROFESSOR_ID,CONSULTANT_ID,"
					+ " CONSULT_STATUS,FINISH_TIME,ASSESS_STATUS,ASSESS_STAR,ASSESS_CONTANT,ASSESS_TIME,THANKS_STATUS,"
					+ " THANKS_MONEY,THANKS_TIME,REVOVERY_TIME,READ_STATUS,CREATE_TIME FROM CONSULT ");
			if (whereSql.length() > 0) {
				sql.append(whereSql);
			}
			if(0 == timeType) {
				sql.append(" ORDER BY CREATE_TIME ");
			}else if(1 == timeType) {
				sql.append(" ORDER BY REVOVERY_TIME ");
			}else if(2 == timeType) {
				sql.append(" ORDER BY FINISH_TIME ");
			}
			if(0 == sortType) {
				sql.append(" DESC ");
			}
			sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(_m_10);
		}
		ps = con.prepareStatement(sql.toString());
		try {
			ps.setString(paramIndex++, consultantId);
			ResultSet rs = ps.executeQuery();
			try {
				List<Consult> _m_11 = new ArrayList<Consult>();
				queryResult.setData(_m_11);
				while (rs.next()) {
					Consult consult = new Consult();
					consult.setConsultId(rs.getString(1));
					consult.setConsultType(rs.getString(2));
					consult.setConsultTitle(rs.getString(3));
					consult.setConsultContant(rs.getString(4));
					consult.setProfessorId(rs.getString(5));
					consult.setConsultantId(rs.getString(6));
					Integer m1 = rs.getInt(7);
					if (rs.wasNull()) {
						m1 = null;
					}
					consult.setConsultStatus(m1);
					String m2 = rs.getString(8);
					if (rs.wasNull()) {
						m2 = null;
					}
					consult.setFinishTime(m2);
					Integer m3 = rs.getInt(9);
					if (rs.wasNull()) {
						m3 = null;
					}
					consult.setAssessStatus(m3);
					consult.setAssessStar(rs.getInt(10));
					String m5 = rs.getString(11);
					if (rs.wasNull()) {
						m5 = null;
					}
					consult.setAssessContant(m5);
					String m6 = rs.getString(12);
					if (rs.wasNull()) {
						m6 = null;
					}
					consult.setAssessTime(m6);
					Integer m7 = rs.getInt(13);
					if (rs.wasNull()) {
						m7 = null;
					}
					consult.setThanksStatus(m7);
					BigDecimal m8 = rs.getBigDecimal(14);
					if (rs.wasNull()) {
						m8 = null;
					}
					consult.setThanksMoney(m8);
					String m9 = rs.getString(15);
					if (rs.wasNull()) {
						m9 = null;
					}
					consult.setThanksTime(m9);
					consult.setRevoveryTime(rs.getString(16));
					consult.setReadStatus(rs.getInt(17));
					consult.setCreateTime(rs.getString(18));
					EditProfessor professor = this.professorDao.queryBaseInfo(con, consult.getProfessorId());
					consult.setProfessor(professor);
					_m_11.add(consult);
				}
				return queryResult;
			} finally {
				try {
					rs.close();
				} catch (Exception _m_17) {
				}
			}
		} finally {
			try {
				ps.close();
			} catch (Exception _m_18) {
			}
		}
	}
	
	public PageQueryResult<Consult> queryPageCon(Connection con, String consultantId, int status, int timeType, int sortType, int pageSize, int pageNo) throws SQLException{
		PageQueryResult<Consult> queryResult = new PageQueryResult<Consult>();
		StringBuilder sql = new StringBuilder();

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

@@ -6,8 +6,8 @@ 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.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.apt.orm.core.defaultImpl.WIntHandler;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
@@ -23,17 +23,17 @@ public class Consult implements CreateTimeSupported {
	private String createTime;
	private String professorId;
	private String consultantId;
	private int consultStatus;
	private Integer consultStatus;
	private String finishTime;
	private int assessStatus;
	private int assessStar;
	private Integer assessStatus;
	private Integer assessStar;
	private String assessContant;
	private String assessTime;
	private int thanksStatus;
	private Integer thanksStatus;
	private BigDecimal thanksMoney;
	private String thanksTime;
	private String revoveryTime;
	private int readStatus;
	private Integer readStatus;
	private EditProfessor professor;
	
	public EditProfessor getProfessor() {
@@ -98,11 +98,11 @@ public class Consult implements CreateTimeSupported {
		this.consultantId = consultantId;
	}
	
	@Column(handlerClass=IntHandler.class,dbType="INT",nullable=true,insertable=true,renewable=true,queryable=true)
	public int getConsultStatus() {
	@Column(handlerClass=WIntHandler.class,dbType="INT",nullable=true,insertable=true,renewable=true,queryable=true)
	public Integer getConsultStatus() {
		return consultStatus;
	}
	public void setConsultStatus(int consultStatus) {
	public void setConsultStatus(Integer consultStatus) {
		this.consultStatus = consultStatus;
	}
	
@@ -114,19 +114,19 @@ public class Consult implements CreateTimeSupported {
		this.finishTime = finishTime;
	}
	
	@Column(handlerClass=IntHandler.class,dbType="INT",nullable=true,insertable=true,renewable=true,queryable=true)
	public int getAssessStatus() {
	@Column(handlerClass=WIntHandler.class,dbType="INT",nullable=true,insertable=true,renewable=true,queryable=true)
	public Integer getAssessStatus() {
		return assessStatus;
	}
	public void setAssessStatus(int assessStatus) {
	public void setAssessStatus(Integer assessStatus) {
		this.assessStatus = assessStatus;
	}
	
	@Column(handlerClass=IntHandler.class,dbType="INT",nullable=true,insertable=false,renewable=true,queryable=true)
	public int getAssessStar() {
	@Column(handlerClass=WIntHandler.class,dbType="INT",nullable=true,insertable=false,renewable=true,queryable=true)
	public Integer getAssessStar() {
		return assessStar;
	}
	public void setAssessStar(int assessStar) {
	public void setAssessStar(Integer assessStar) {
		this.assessStar = assessStar;
	}
	
@@ -146,11 +146,11 @@ public class Consult implements CreateTimeSupported {
		this.assessTime = assessTime;
	}
	
	@Column(handlerClass=IntHandler.class,dbType="INT",nullable=true,insertable=true,renewable=true,queryable=true)
	public int getThanksStatus() {
	@Column(handlerClass=WIntHandler.class,dbType="INT",nullable=true,insertable=true,renewable=true,queryable=true)
	public Integer getThanksStatus() {
		return thanksStatus;
	}
	public void setThanksStatus(int thanksStatus) {
	public void setThanksStatus(Integer thanksStatus) {
		this.thanksStatus = thanksStatus;
	}
	
@@ -178,11 +178,11 @@ public class Consult implements CreateTimeSupported {
		this.revoveryTime = revoveryTime;
	}
	
	@Column(handlerClass=IntHandler.class,dbType="INT",nullable=false,insertable=false,renewable=true,queryable=true)
	public int getReadStatus() {
	@Column(handlerClass=WIntHandler.class,dbType="INT",nullable=false,insertable=false,renewable=true,queryable=true)
	public Integer getReadStatus() {
		return readStatus;
	}
	public void setReadStatus(int readStatus) {
	public void setReadStatus(Integer readStatus) {
		this.readStatus = readStatus;
	}
	

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

@@ -3,6 +3,7 @@ package com.ekexiu.portal.service;
import java.math.BigDecimal;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
@@ -136,6 +137,22 @@ public class ConsultService {
		return this.consultDao.queryCon(con, consultId);
	}
	
	@Get
	@Path("/pqPro")
	public PageQueryResult<Consult> queryPageProBase(@JdbcConn Connection con, String professorId, 
			@DefaultValue("0") int status, @DefaultValue("0") int timeType, @DefaultValue("0") int sortType, 
			@DefaultValue("5") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<Consult> queryResult = this.consultDao.queryPageProBase(con, professorId, status, timeType, sortType, pageSize, pageNo);
		List<Consult> consults = queryResult.getData();
		if(consults != null){
			for (Consult consult : consults) {
				int hasHeadImage = this.imageService.hasProfessorImage(consult.getConsultantId());
				consult.getProfessor().setHasHeadImage(hasHeadImage);
			}
		}
		return queryResult;
	}	
	
	@Get
	@Path("/pqpro")
	public PageQueryResult<Consult> queryPagePro(@JdbcConn Connection con, String professorId, 
@@ -144,6 +161,22 @@ public class ConsultService {
		return this.consultDao.queryPagePro(con, professorId, status, timeType, sortType, pageSize, pageNo);
	}	
	
	@Get
	@Path("/pqCon")
	public PageQueryResult<Consult> queryPageConBase(@JdbcConn Connection con, String consultantId, 
			@DefaultValue("0") int status, @DefaultValue("0") int timeType, @DefaultValue("0") int sortType, 
			@DefaultValue("5") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
		PageQueryResult<Consult> queryResult = this.consultDao.queryPageConBase(con, consultantId, status, timeType, sortType, pageSize, pageNo);
		List<Consult> consults = queryResult.getData();
		if(consults != null){
			for (Consult consult : consults) {
				int hasHeadImage = this.imageService.hasProfessorImage(consult.getProfessorId());
				consult.getProfessor().setHasHeadImage(hasHeadImage);
			}
		}
		return queryResult;
	}
	
	@Get
	@Path("/pqcon")
	public PageQueryResult<Consult> queryPageCon(@JdbcConn Connection con, String consultantId,