11

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

@@ -114,6 +114,18 @@ public abstract class DemandDao {
	
	
	@PageSelect
	@OrderBy(" ORDER BY CREATE_TIME DESC")
	public abstract PageQueryResult<Demand> pageQueryOrderByCreateTimeDesc(Connection con,@Nullable String state, @Nullable String source,@Nullable String  cost, @Nullable String duration, 
			@GroupSqlColumn(value={"TITLE LIKE ?","DESCP LIKE ?","ORG_NAME LIKE ?","CREATOR IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)"},handlerClass=StringHandler.class,isAnd=false ,force =false)  @Nullable String key,int pageSize,int pageNo) throws SQLException;
	
	@PageSelect
	@OrderBy(" ORDER BY INVALID_DAY ASC")
	public abstract PageQueryResult<Demand> pageQueryOrderByInvalidDayAsc(Connection con,@Nullable String state, @Nullable String source,@Nullable String  cost, @Nullable String duration, 
			@GroupSqlColumn(value={"TITLE LIKE ?","DESCP LIKE ?","ORG_NAME LIKE ?","CREATOR IN (SELECT ID FROM PROFESSOR WHERE NAME LIKE ?)"},handlerClass=StringHandler.class,isAnd=false ,force =false)  @Nullable String key,int pageSize,int pageNo) throws SQLException;
	
    
	
	
	
//	

src/main/java/com/ekexiu/portal/platform/PlatformDao.java

@@ -146,6 +146,14 @@ public interface PlatformDao {
			@SqlColumn(handlerClass = StringHandler.class, value = { "R.PID=?" }) String pid,
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, isAnd = false, value = { "O.NAME LIKE ?", "O.FOR_SHORT LIKE ?" }) String key,
			int rows) throws SQLException;
	
	
	@PageQuery
	@OrderBy(value = "ORDER BY R.CREATE_TIME DESC")
	@Exclude({ "descp" })
	PageQueryResult<ResidentOrgInfo> pqResientOrgInfo(Connection con,@SqlColumn(handlerClass = StringHandler.class, value = { "R.PID=?" }) String pid,
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, isAnd = false, value = { "O.NAME LIKE ?", "O.FOR_SHORT LIKE ?" }) String key,
			int pageSize,int pageNo) throws SQLException;
	@LimitQuery
	@OrderBy(cols = { @LimitColumn(value = "time", column = "B.CREATE_TIME", handlerClass = StringHandler.class, asc = false),

src/main/java/com/ekexiu/portal/platform/PlatformService.java

@@ -109,8 +109,6 @@ public class PlatformService {
	public void setMailService(MailService mailService) {
		this.mailService = mailService;
	}
	
	
	public String getUrlWithRestPasswordWithEmail() {
		return urlWithRestPasswordWithEmail;
@@ -177,7 +175,8 @@ public class PlatformService {
	}
	@SetCookie(checkResultNull = true, path = "/", value = { "plf_user=result.getId()", "plf_email=result.getEmail()",
			"plf_logo=result.getLogo()==null?\"\":result.getLogo()" , "plf_name=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")"})
			"plf_logo=result.getLogo()==null?\"\":result.getLogo()",
			"plf_name=result.getName()==null?\"\":java.net.URLEncoder.encode(result.getName(),\"utf-8\")" })
	@Post
	@Path("/login")
	public LoginUserInfo login(@JdbcConn Connection con, String email, String pw) throws JfwBaseException, SQLException {
@@ -209,7 +208,7 @@ public class PlatformService {
	@Path("/reqResetPw")
	@Post
	public void requestResetPasswordWithEmail(@JdbcConn Connection con, String mail,String url) throws SQLException, JfwBaseException {
	public void requestResetPasswordWithEmail(@JdbcConn Connection con, String mail, String url) throws SQLException, JfwBaseException {
		PlatformUser pu = this.platformDao.queryUser(con, mail);
		if (pu == null)
			throw new JfwBaseException(-600001, "not found user");
@@ -289,16 +288,16 @@ public class PlatformService {
	@Post
	@Path("/bindMail")
	public void bindMail(@JdbcConn(true) Connection con, String code,String pw) throws SQLException, JfwBaseException {
	public void bindMail(@JdbcConn(true) Connection con, String code, String pw) throws SQLException, JfwBaseException {
		@SuppressWarnings("unchecked")
		StateCode<String, String> sc = (StateCode<String, String>) JfwAppContext.getCachedObject(code);
		if (sc == null) {
			throw new JfwBaseException(-600001, " code expire");
		}
		JfwAppContext.removeCachedObject(code);
		
		if(!StringUtil.md5(pw).equals(sc.getValue())){
			throw new JfwBaseException(-600003, "invalid passwd"); 
		if (!StringUtil.md5(pw).equals(sc.getValue())) {
			throw new JfwBaseException(-600003, "invalid passwd");
		}
		if (this.platformDao.updateMail(con, sc.getCode(), sc.getKey(), sc.getValue(), sc.getDescp()) == 0) {
@@ -324,7 +323,6 @@ public class PlatformService {
		return this.platformDao.queryInfo(con, id);
	}
	@Post
	@Path("/resident")
	public int resident(@JdbcConn(true) Connection con, @RequestParam(fields = { @FieldParam(value = "pid", valueClass = String.class),
@@ -393,6 +391,17 @@ public class PlatformService {
		return ret;
	}
	@Get
	@Path("/info/pqResidentOrgs")
	public PageQueryResult<ResidentOrgInfo> queryResidentOrginfos(@JdbcConn Connection con, String pid, @Nullable String key, int pageSize, int pageNo)
			throws SQLException {
		PageQueryResult<ResidentOrgInfo> ret = this.platformDao.pqResientOrgInfo(con, pid, key == null ? null : ("%" + key + "%"), pageSize, pageNo);
		for (ResidentOrgInfo roi : ret.getData()) {
			roi.setHasOrgLogo(this.imageService.hasOrgLogo(roi.getId()));
		}
		return ret;
	}
	@Get
	@Path("/info/buttedOrgs")
	public List<ButtedOrgInfo> queryButtedOrginfos(@JdbcConn Connection con, @DefaultValue("\"z\"") String time, @DefaultValue("\"z\"") String oid, String pid,
@@ -427,15 +436,18 @@ public class PlatformService {
		}
		return ret;
	}
	
	@Get
	@Path("/info/wares")
	public List<PlatformWare> queryWares(@JdbcConn Connection con,@Nullable String key,@DefaultValue("\"z\"") String time, @DefaultValue("Long.MAX_VALUE") long shareId,String pid,int rows)throws SQLException{
	public List<PlatformWare> queryWares(@JdbcConn Connection con, @Nullable String key, @DefaultValue("\"z\"") String time,
			@DefaultValue("Long.MAX_VALUE") long shareId, String pid, int rows) throws SQLException {
		return platformDao.queryWare(con, key, pid, time, shareId, rows);
	}
	@Get
	@Path("/info/resources")
	public List<PlatformResource> queryResources(@JdbcConn Connection con,@Nullable String key,@DefaultValue("\"z\"") String time, @DefaultValue("Long.MAX_VALUE") long shareId,String pid,int rows)throws SQLException{
	public List<PlatformResource> queryResources(@JdbcConn Connection con, @Nullable String key, @DefaultValue("\"z\"") String time,
			@DefaultValue("Long.MAX_VALUE") long shareId, String pid, int rows) throws SQLException {
		return platformDao.queryResource(con, key, pid, time, shareId, rows);
	}

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

@@ -388,4 +388,16 @@ public class DemandService {
			@DefaultValue("5") int pageSize) throws SQLException {
		return this.demandDao.pageQuery(con, state, key == null ? key : ("%" + key + "%"), pageSize, pageNo);
	}
	
	
	@Get
	@Path("/search/platform")
	public PageQueryResult<Demand> query(@JdbcConn Connection con, @Nullable String state, @Nullable String source,@Nullable String  cost, @Nullable String duration, boolean byCreateTime, @Nullable String key, @DefaultValue("1") int pageNo,
			@DefaultValue("5") int pageSize) throws SQLException {
		if(byCreateTime){
			return this.demandDao.pageQueryOrderByCreateTimeDesc(con, state, source, cost, duration, key, pageSize, pageNo);
		}else{
			return this.demandDao.pageQueryOrderByInvalidDayAsc(con, state, source, cost, duration, key, pageSize, pageNo);
		}
	}
}

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

@@ -1,7 +1,7 @@
package com.ekexiu.portal.service;
import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.DemandDao;
//import com.ekexiu.portal.dao.DemandDao;
import com.ekexiu.portal.dao.HonorDao;
import com.ekexiu.portal.dao.ImageDao;
import com.ekexiu.portal.dao.OrgDao;
@@ -111,16 +111,16 @@ public class ProfessorService {
	@Autowrie
	private KeyWordService keyWordService;
	@Autowrie
	private DemandDao demandDao;
	public DemandDao getDemandDao() {
		return demandDao;
	}
	public void setDemandDao(DemandDao demandDao) {
		this.demandDao = demandDao;
	}
//	@Autowrie
//	private DemandDao demandDao;
//
//	public DemandDao getDemandDao() {
//		return demandDao;
//	}
//
//	public void setDemandDao(DemandDao demandDao) {
//		this.demandDao = demandDao;
//	}
	public PatentAuthorDao getPatentAuthorDao() {
		return patentAuthorDao;
@@ -364,7 +364,7 @@ public class ProfessorService {
				this.professorDao.updateOrg(con, oid, id);
				if (old != null) {
					this.professorDao.updateOrgAuth(con, id, "0");
					this.demandDao.closeByCreator(con, id, id);
//					this.demandDao.closeByCreator(con, id, id);
					this.orgResStaffDao.deletePro(con, id);
					JdbcUtil.execute(con,"DELETE FROM WARE_PRO WHERE PROFESSOR=?",new PreparedStatementConfig() {
						@Override
@@ -400,7 +400,7 @@ public class ProfessorService {
			}
			if (old_oid != null && (!old_oid.equals(new_oid))) {
				this.professorDao.updateOrgAuth(con, op.getId(), "0");
				this.demandDao.closeByCreator(con, op.getId(), op.getId());
//				this.demandDao.closeByCreator(con, op.getId(), op.getId());
				this.orgResStaffDao.deletePro(con, op.getId());
				JdbcUtil.execute(con,"DELETE FROM WARE_PRO WHERE PROFESSOR=?",new PreparedStatementConfig() {
					@Override
@@ -433,7 +433,7 @@ public class ProfessorService {
			}
			if (old_oid != null && (!old_oid.equals(new_oid))) {
				this.professorDao.updateOrgAuth(con, op.getId(), "0");
				this.demandDao.closeByCreator(con, op.getId(), op.getId());
//				this.demandDao.closeByCreator(con, op.getId(), op.getId());
				this.orgResStaffDao.deletePro(con, op.getId());
			}
		}