Merge branch 'dev' of http://www.ekexiu.com:3000/jiapeng/portal-web.git

into dev

Conflicts:
	src/main/java/com/ekexiu/portal/ware/WareService.java

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

	@LimitSelect
	@OrderBy( " ORDER BY PAGE_VIEWS DESC")
	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;
	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/ware/WareService.java

	 */
	@Post
	@Path("/draft")
	public String draft(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", 
			"shareId", "pageViews", "sortFirst" }) Ware ware, @Nullable String[] resource) throws SQLException, IOException {
	public String draft(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource) throws SQLException, IOException {
		ware.setState("2");
		ware.setCategory("1");
		return insert(con, ware, null, resource);
	 */
	@Post
	@Path("/draft/org")
	public String draft(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", 
			"shareId", "pageViews", "sortFirst" }) Ware ware,@Nullable String[] resource,@Nullable String[] professor) throws SQLException, IOException {
	public String draft(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource, @Nullable String[] professor) throws SQLException, IOException {
		ware.setState("2");
		ware.setCategory("2");
		return insert(con, ware, professor, resource);
	 */
	@Post
	@Path("/publish")
	public String publish(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", 
			"shareId", "pageViews", "sortFirst" }) Ware ware,@Nullable String[] resource) throws SQLException, IOException {
	public String publish(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource) throws SQLException, IOException {
		ware.setState("1");
		ware.setCategory("1");
		return insert(con, ware, null, resource);
	 */
	@Post
	@Path("/publish/org")
	public String publish(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", 
			"shareId", "pageViews", "sortFirst" }) Ware ware,@Nullable String[] resource,@Nullable String[] professor) throws SQLException, IOException {
	public String publish(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "id", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource, @Nullable String[] professor) throws SQLException, IOException {
		ware.setState("1");
		ware.setCategory("2");
		return insert(con, ware, professor, resource);
	 */
	@Post
	@Path("/draft/update")
	public boolean updateDraft(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime",
			"shareId", "pageViews", "sortFirst" }) Ware ware, @Nullable String[] resource) throws SQLException, IOException {
	public boolean updateDraft(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource) throws SQLException, IOException {
		ware.setState("2");
		ware.setCategory("1");
		return update(con, ware, null, resource);
	 */
	@Post
	@Path("/draft/org/update")
	public boolean updateDraft(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime",
			"shareId", "pageViews", "sortFirst" }) Ware ware,@Nullable String[] resource,@Nullable String[] professor) throws SQLException, IOException {
	public boolean updateDraft(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource, @Nullable String[] professor) throws SQLException, IOException {
		ware.setState("2");
		ware.setCategory("2");
		return update(con, ware, professor, resource);
	 */
	@Post
	@Path("/publish/update")
	public boolean updatePublish(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime",
		 "shareId", "pageViews", "sortFirst" }) Ware ware,@Nullable String[] resource) throws SQLException, IOException {
	public boolean updatePublish(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource) throws SQLException, IOException {
		ware.setState("1");
		ware.setCategory("1");
		return update(con, ware, null, resource);
	 */
	@Post
	@Path("/publish/org/update")
	public boolean updatePublish(@JdbcConn(true) Connection con, @RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime",
		"shareId", "pageViews", "sortFirst" }) Ware ware,@Nullable String[] resource,@Nullable String[] professor) throws SQLException, IOException {
	public boolean updatePublish(@JdbcConn(true) Connection con,
			@RequestParam(excludeFields = { "category", "state", "createTime", "modifyTime", "shareId", "pageViews", "sortFirst" }) Ware ware,
			@Nullable String[] resource, @Nullable String[] professor) throws SQLException, IOException {
		ware.setState("1");
		ware.setCategory("2");
		return update(con, ware, professor, resource);
	@Path("/ralateWare")
	public List<Map<String, Object>> queryRalateWare(@JdbcConn Connection con, final String id, final int rows) throws SQLException {
		return JdbcUtil.queryList(con,
				"SELECT ID,NUM FROM (SELECT ID,COUNT(1) NUM FROM WRE_KEY_WORD WHERE ID <> ? AND KW IN (SELECT KW FROM WRE_KEY_WORD WHERE ID=?) GROUP BY ID ) T ORDER BY NUM DESC LIMIT ?",
				"SELECT ID,NUM FROM (SELECT ID,COUNT(1) NUM FROM WRE_KEY_WORD WHERE ID <> ? AND KW IN (SELECT KW FROM WRE_KEY_WORD WHERE ID = ?) GROUP BY ID ) T ORDER BY NUM DESC LIMIT ?",
				new ResultSetExtractor<Map<String, Object>>() {
					@Override
					public Map<String, Object> extractData(ResultSet rs) throws SQLException {
						Map<String, Object> map = new HashMap<String, Object>();
						map.put("id",rs.getString(1));
						map.put("id", rs.getString(1));
						map.put("num", rs.getLong(2));
						return map;
					}
					}
				});
	}
	@Get
	@Path("/byOwnerWithPageViews")
	public List<Ware> queryBySameKwWithPageViews(@JdbcConn Connection con,String category,String owner,@Nullable String id,int rows) throws SQLException{
	public List<Ware> queryBySameKwWithPageViews(@JdbcConn Connection con, String category, String owner, @Nullable String id, int rows) throws SQLException {
		return wareDao.queryByOwnerWithPageViews(con, category, owner, id, rows);
	}
	@Get
	@Path("/byResourceWithModifyTime")
	public List<Ware> queryByResourceWithModifyTime(@JdbcConn Connection con,String id,int rows) throws SQLException{
	public List<Ware> queryByResourceWithModifyTime(@JdbcConn Connection con, String id, int rows) throws SQLException {
		return wareDao.queryByResource(con, id, rows);
	}
	@Get
	@Path("/byArticle")
	public List<Ware> queryByArticle(@JdbcConn Connection con,String id,@DefaultValue("Integer.MAX_VALUE" ) int rows) throws SQLException{
	public List<Ware> queryByArticle(@JdbcConn Connection con, String id, @DefaultValue("Integer.MAX_VALUE") int rows) throws SQLException {
		return wareDao.queryByArticle(con, id, rows);
	}
	
	//
	// @Post
	// @Path("/update")