2.5

src/main/java/com/ekexiu/portal/article/file/ArticleFileDao.java

@@ -1,9 +1,5 @@
package com.ekexiu.portal.article.file;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
@@ -13,6 +9,10 @@ import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@DAO
public interface ArticleFileDao {
	@Insert

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

@@ -782,6 +782,7 @@ public abstract class ArticleDao {
	@LimitSelect
	@OrderBy(" ORDER BY PAGE_VIEWS DESC")
	@Where("STATUS = '1' ")
	public abstract List<Article> queryByWareId(Connection con,
			@SqlColumn(handlerClass = StringHandler.class, value = { "ARTICLE_ID IN (SELECT ID FROM ARTICLE_WARE WHERE WARE =?)" }) String ware, int rows)
			throws SQLException;

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

@@ -1,12 +1,6 @@
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 com.ekexiu.portal.po.ArticleRes;
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.Where;
@@ -14,7 +8,12 @@ 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.ArticleRes;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@DAO
public abstract class ArticleResDao {
@@ -62,5 +61,6 @@ public abstract class ArticleResDao {
	
	@SelectList
    @Where("ARTICLE_ID IN (SELECT ARTICLE_ID FROM ARTICLE WHERE STATUS = '1') ")
	public abstract List<ArticleRes> queryByResourceId(Connection con,String resourceId) throws SQLException;
}

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

@@ -105,8 +105,12 @@ public abstract class DemandDao {
	@PageSelect
	@OrderBy(" ORDER BY STATE ASC,CREATE_TIME DESC")
	public abstract PageQueryResult<Demand> pageQuery(Connection con,@Nullable @In String[] state,@Nullable String creator,@Nullable String orgName,int pageSize,int pageNo) throws SQLException;
	
	
	@PageSelect
	@OrderBy(" ORDER BY STATE ASC,CREATE_TIME DESC")
	public abstract PageQueryResult<Demand> pageQueryOrg(Connection con,@Nullable @In String[] state,@GroupSqlColumn(value={"ORG_NAME = ?","CREATOR IN (SELECT ID FROM PROFESSOR WHERE ORG_ID IN(SELECT ID FROM ORGANIZATION WHERE NAME = ?) AND ORG_AUTH = '1')"},handlerClass = StringHandler.class,isAnd = false,force = false) String orgName,int pageSize,int pageNo) throws SQLException;
	@PageSelect
	@OrderBy(" ORDER BY CREATE_TIME DESC")
	public abstract PageQueryResult<Demand> pageQuery(Connection con,@Nullable @In String[] state,@GroupSqlColumn(value={"TITLE LIKE ?","DESCP LIKE ?"},handlerClass=StringHandler.class,isAnd=false ,force =false)  @Nullable String key,int pageSize,int pageNo) throws SQLException;

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

@@ -1,24 +1,27 @@
package com.ekexiu.portal.dao;
import com.ekexiu.portal.po.Demand;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.pojo.EditProfessor;
import com.ekexiu.portal.pojo.ProfessorInfo;
import com.ekexiu.portal.pojo.SortedPro;
import com.ekexiu.portal.pojo.UserInfo;
import com.ekexiu.portal.ware.Ware;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
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.LimitColumn;
import org.jfw.apt.orm.annotation.dao.method.Or;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.Select;
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
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.LimitQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryList;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryOne;
@@ -931,6 +934,17 @@ public abstract class ProfessorDao {
		}
	}
	@LimitQuery
	@OrderBy(cols = {@LimitColumn(value = "lid", column="id", handlerClass = StringHandler.class,asc=false)},value = "")
	@Select(Professor.class)
	@From(Professor.class)
	public abstract List<EditProfessor> orgAuth(Connection con,String orgId, @In(include= false) String[] id, String lid, int rows)throws SQLException;
	@PageQuery
	@Select(Professor.class)
	@From(Professor.class)
	public abstract PageQueryResult<EditProfessor> pqOrgAuth(Connection con, String orgId,@Nullable String orgAuth, int pageSize, int pageNo) throws SQLException;
	/**
	 * 查询所有专家的咨询星级和咨询完成次数
	 * 
@@ -2109,4 +2123,10 @@ public abstract class ProfessorDao {
	@Select(Professor.class)
	@From(Professor.class)
	public abstract List<EditProfessor> queryPro(Connection con, @In String[] id) throws SQLException;
	@UpdateWith
	@Where("orgAuth ='1'")
	@SetSentence("orgAuth='0'")
	@From(Professor.class)
	public abstract int cancelOrgAuth(Connection con,String id)throws SQLException;
}

src/main/java/com/ekexiu/portal/org/OrgLinkManDao.java

@@ -1,9 +1,5 @@
package com.ekexiu.portal.org;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
@@ -13,6 +9,10 @@ import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@DAO
public interface OrgLinkManDao {

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

@@ -1,5 +1,6 @@
package com.ekexiu.portal.service;
import com.ekexiu.portal.article.file.ArticleFileService;
import com.ekexiu.portal.cms.ContentType;
import com.ekexiu.portal.cms.TemplateService;
import com.ekexiu.portal.dao.ArticleAgreeDao;
@@ -104,6 +105,9 @@ public class ArticleService {
	@Autowrie
	private GrowthLogService growthLogService;
	@Autowrie
	private ArticleFileService articleFileService;
	public GrowthLogService getGrowthLogService() {
		return growthLogService;
	}
@@ -280,6 +284,14 @@ public class ArticleService {
		this.articleResDao = articleResDao;
	}
	public ArticleFileService getArticleFileService() {
		return articleFileService;
	}
	public void setArticleFileService(ArticleFileService articleFileService) {
		this.articleFileService = articleFileService;
	}
	private byte[] resImage(byte[] src, int maxLen) throws IOException {
		ByteArrayInputStream in = new ByteArrayInputStream(src);
		ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -364,7 +376,7 @@ public class ArticleService {
	@Post
	@Path("/save")
	public String saveArticle(@JdbcConn(false) Connection con, Article article, @Nullable String[] professors, @Nullable String[] resources,
	public String saveArticle(@JdbcConn(false) Connection con, Article article,@Nullable String[] files,@Nullable String[] professors, @Nullable String[] resources,
			@Nullable String[] orgs, @Nullable String[] wares) throws SQLException, IOException, JfwBaseException {
		String articleId = null;
		try {
@@ -387,6 +399,7 @@ public class ArticleService {
					throw new JfwBaseException(-2, "错误参数：文章类型");
				}
				this.articleDao.insert(con, article);
				this.articleFileService.update(con,articleId,files);
				this.keyWordService.refreshArticle(con, articleId, KeyWordService.splitKeyWord(article.getSubject()));
				if (professors != null) {
					for (String professor : professors) {
@@ -428,6 +441,7 @@ public class ArticleService {
					article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
				}
				this.articleDao.update(con, article);
				this.articleFileService.update(con,articleId,files);
				this.articleDao.updatePublishTime(con, article.getArticleId(), "1", this.publishTime());
				this.keyWordService.refreshArticle(con, article.getArticleId(), KeyWordService.splitKeyWord(article.getSubject()));
				this.articleProDao.delete(con, article.getArticleId());
@@ -483,7 +497,7 @@ public class ArticleService {
	@Post
	@Path("/draft")
	public String draft(@JdbcConn(false) Connection con, Article article, @Nullable String[] professors, @Nullable String[] resources, @Nullable String[] orgs,
	public String draft(@JdbcConn(false) Connection con, Article article,@Nullable String[] files, @Nullable String[] professors, @Nullable String[] resources, @Nullable String[] orgs,
			@Nullable String[] wares) throws SQLException, IOException, JfwBaseException {
		String articleId = null;
@@ -505,6 +519,7 @@ public class ArticleService {
					throw new JfwBaseException(-2, "错误参数：文章类型");
				}
				this.articleDao.insert(con, article);
				this.articleFileService.update(con,articleId,files);
				this.keyWordService.refreshArticle(con, articleId, null);
				if (professors != null) {
					for (String professor : professors) {
@@ -546,6 +561,7 @@ public class ArticleService {
					article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
				}
				this.articleDao.update(con, article);
				this.articleFileService.update(con,articleId,files);
				this.articleDao.updateStatus(con, article.getArticleId(), "0");
				this.keyWordService.refreshArticle(con, article.getArticleId(), null);
				this.articleProDao.delete(con, article.getArticleId());
@@ -601,7 +617,7 @@ public class ArticleService {
	@Post
	@Path("/timing")
	public String timingPublish(@JdbcConn(false) Connection con, Article article, @Nullable String[] professors, @Nullable String[] resources,
	public String timingPublish(@JdbcConn(false) Connection con, Article article,@Nullable String[] files, @Nullable String[] professors, @Nullable String[] resources,
			@Nullable String[] orgs, @Nullable String[] wares) throws SQLException, IOException, JfwBaseException {
		String articleId = null;
		try {
@@ -625,6 +641,7 @@ public class ArticleService {
					throw new JfwBaseException(-2, "错误参数：文章类型");
				}
				this.articleDao.insert(con, article);
				this.articleFileService.update(con,articleId,files);
				if (professors != null) {
					for (String professor : professors) {
						ArticlePro articlePro = new ArticlePro();
@@ -665,6 +682,7 @@ public class ArticleService {
					article.setArticleImg(this.createDate() + "/" + article.getArticleId() + "." + JPG);
				}
				this.articleDao.update(con, article);
				this.articleFileService.update(con,articleId,files);
				this.articleDao.updatePublishTime(con, article.getArticleId(), "2", article.getPublishTime());
				this.keyWordService.refreshArticle(con, article.getArticleId(), null);
				this.articleResDao.delete(con, article.getArticleId());

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

@@ -1,10 +1,11 @@
package com.ekexiu.portal.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Date;
import java.util.List;
import com.ekexiu.portal.dao.DemandDao;
import com.ekexiu.portal.dao.UserDao;
import com.ekexiu.portal.po.Demand;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.User;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
@@ -20,12 +21,10 @@ import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.jdbc.JdbcUtil;
import org.jfw.util.state.StateCode;
import com.ekexiu.portal.dao.DemandDao;
import com.ekexiu.portal.dao.UserDao;
import com.ekexiu.portal.po.Demand;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.po.Professor;
import com.ekexiu.portal.po.User;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Date;
import java.util.List;
@Path("/demand")
public class DemandService {
@@ -224,6 +223,28 @@ public class DemandService {
		return this.demandDao.update(con, demand) > 0;
	}
	/**
	 * 企业修改需求
	 *
	 * @param con
	 * @param demand
	 * @throws SQLException
	 */
	@Post
	@Path("/modify/org")
	public boolean orgUpdate(@JdbcConn(true) Connection con,
						  @RequestParam(excludeFields = { "state", "createTime", "modifyTime", "title","source", "descp",  "pageViews", "shareId" }) Demand demand)
			throws SQLException {
		if (demand.getCost() == null) {
			demand.setCost("0");
		}
		if (demand.getDuration() == null) {
			demand.setDuration("0");
		}
		demand.setState("1");
		return this.demandDao.update(con, demand) > 0;
	}
	/**
	 * 完成需求
	 * 
@@ -403,4 +424,19 @@ public class DemandService {
			return this.demandDao.pageQueryOrderByInvalidDayAsc(con, state, source, cost, duration, key == null ? null : ("%" + key + "%"), pageSize, pageNo);
		}
	}
	/**
	 * 分页查询企业需求(按状态及发布时间排序)
	 *
	 * @param con
	 * @param state
	 * @return
	 * @throws SQLException
	 */
	@Get
	@Path("/pq/org")
	public PageQueryResult<Demand> orgDemand(@JdbcConn Connection con, @Nullable String[] state, @Nullable String oname,
										 @DefaultValue("1") int pageNo, @DefaultValue("5") int pageSize) throws SQLException {
		return this.demandDao.pageQueryOrg(con, state, oname, pageSize, pageNo);
	}
}

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

@@ -29,6 +29,7 @@ import com.ekexiu.portal.pojo.ProfessorInfo;
import com.ekexiu.portal.pojo.SortedPro;
import com.ekexiu.portal.pojo.UserInfo;
import com.ekexiu.portal.util.Calculate;
import com.ekexiu.portal.ware.WareDao;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
@@ -111,6 +112,9 @@ public class ProfessorService {
	@Autowrie
	private KeyWordService keyWordService;
	@Autowrie
	private WareDao wareDao;
//	@Autowrie
//	private DemandDao demandDao;
//
@@ -314,6 +318,14 @@ public class ProfessorService {
		this.orgResStaffDao = orgResStaffDao;
	}
	public WareDao getWareDao() {
		return wareDao;
	}
	public void setWareDao(WareDao wareDao) {
		this.wareDao = wareDao;
	}
	@Post
	@Path
	public String insert(@JdbcConn(true) Connection con, Professor professor, @Nullable String orgName) throws SQLException, IOException {
@@ -538,6 +550,40 @@ public class ProfessorService {
		return hiddenPrivacyInfo(professors);
	}
	/**
	 * 企业联系人
	 *
	 * @param con
	 * @param orgId  企业ID
	 * @param ids  企业默认联系人
	 * @param lid limit查询最后一条的id 首次不传
	 * @param rows limit查询最后一条的最大返回条数
	 * @return
	 * @throws SQLException
	 */
	@Get
	@Path("/orgAuth/nonDef")
	public List<EditProfessor> orgAuth(@JdbcConn Connection con,String[] ids,String orgId,String lid,int rows)throws SQLException {
		List<EditProfessor> professors = this.professorDao.orgAuth(con,orgId,ids,lid,rows);
		for (EditProfessor professor : professors) {
			professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
			professor.setResearchAreas(this.researchAreaDao.query(con, professor.getId()));
		}
		return hiddenPrivacyInfo(professors);
	}
	@Get
	@Path("/pqOrgAuth")
	public PageQueryResult<EditProfessor> pqOrgAuth(@JdbcConn Connection con,String orgId,@Nullable String orgAuth,int pageSize,int pageNo)throws SQLException {
		PageQueryResult<EditProfessor> professors = this.professorDao.pqOrgAuth(con, orgId,orgAuth, pageSize, pageNo);
		for (EditProfessor professor : professors.getData()) {
			professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
			professor.setResearchAreas(this.researchAreaDao.query(con, professor.getId()));
			hiddenPrivacyInfo(professor);
		}
		return professors;
	}
	public void updateStarAvg(Connection con) throws SQLException {
		try {
			List<Professor> professors = this.professorDao.queryStar(con);
@@ -671,6 +717,8 @@ public class ProfessorService {
	@Path("/removeOrgAuth")
	public void removeOrgAuth(@JdbcConn(true) Connection con, String id) throws SQLException {
		this.professorDao.updateOrgAuth(con, id, "0");
		this.wareDao.deletePro(con, id);
		this.orgResStaffDao.deletePro(con, id);
	}
	@Post

src/main/java/com/ekexiu/portal/ware/WareDao.java

@@ -1,9 +1,5 @@
package com.ekexiu.portal.ware;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
@@ -34,6 +30,10 @@ import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@DAO
public abstract class WareDao {
@@ -62,6 +62,10 @@ public abstract class WareDao {
	@From(WarePro.class)
	public abstract int deleteWithPro(Connection con, String id, String professor) throws SQLException;
	@DeleteWith
	@From(WarePro.class)
	public abstract int deletePro(Connection con, String professor) throws SQLException;
	@Update
	public abstract int update(Connection con, Ware ware) throws SQLException;
@@ -81,6 +85,7 @@ public abstract class WareDao {
	public abstract List<WarePro> queryPro(Connection con, String id) throws SQLException;
	@SelectList
	@Where(" RESOURCE IN (SELECT ID FORM RESOURCE WHERE STATUS = '1') ")
	public abstract List<WareRes> queryRes(Connection con, String id) throws SQLException;
	@DefaultValue("0")
@@ -127,6 +132,7 @@ public abstract class WareDao {
	@QueryList
	@Select(Ware.class)
	@Where("(STATE='1' OR STATE ='2') AND CATEGORY='2'")
	@OrderBy("ORDER By STATE DESC,MODIFY_TIME DESC")
	@From(Ware.class)
	public abstract List<CountWare> queryByOwner(Connection con,
			@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = { "NAME LIKE ?", "CNT LIKE ?", "KEYWORDS LIKE ?" }, isAnd = false) String key,