--企业资源和资源导入;

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

@@ -87,10 +87,25 @@ public abstract class ArticleDao {
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	public abstract List<Article> queryPro(Connection con, String professorId) throws SQLException;
	
	@SelectList
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	@Where("STATUS = '1'")
	public abstract List<Article> queryProPublish(Connection con, String professorId) throws SQLException;
	
	@SelectList
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	@Where("STATUS IN ('0','1','2')")
	public abstract List<Article> queryForDesk(Connection con, String professorId) throws SQLException;
	
	@SelectList
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	public abstract List<Article> queryOrg(Connection con, String orgId) throws SQLException;
	
	@SelectList
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	@Where("STATUS = '1'")
	public abstract List<Article> queryOrgPublish(Connection con, String orgId) throws SQLException;
	
	@LimitSelect
	@OrderBy(" ORDER BY MODIFY_TIME DESC ")
	public abstract List<Article> queryLimit(Connection con,String orgId,@LessThan String modifyTime,int rows)throws SQLException;

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

@@ -25,6 +25,10 @@ public abstract class ImageDao {
	@From(Image.class)
	public abstract int updateSort(Connection con, String imageId, @Set int sort) throws SQLException;
	
	@UpdateWith
	@From(Image.class)
	public abstract int updateAllSort(Connection con, String resourceId, @Set int sort) throws SQLException;
	
	@SelectOne
	@Nullable
	public abstract Image query(Connection con, String imageId) throws SQLException;
@@ -50,4 +54,8 @@ public abstract class ImageDao {
	@DeleteWith
	@From(Image.class)
	public abstract int deleteRes(Connection con, String resourceId) throws SQLException;
	
	@DeleteWith
	@From(Image.class)
	public abstract int deleteBySort(Connection con, String resourceId, int sort) throws SQLException;
}

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

@@ -0,0 +1,30 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
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.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.OrgResStaff;
@DAO
public abstract class OrgResStaffDao {
	@Insert
	public abstract int insert(Connection con, OrgResStaff orgResStaff) throws SQLException;
	
	@SelectList
	public abstract List<OrgResStaff> query(Connection con, String resourceId) throws SQLException;
	
	@DeleteWith
	@From(OrgResStaff.class)
	public abstract int delete(Connection con, String resourceId) throws SQLException;
	
	@DeleteWith
	@From(OrgResStaff.class)
	public abstract int deletePro(Connection con, String professorId) throws SQLException;
}

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

@@ -344,11 +344,10 @@ public abstract class ProfessorDao {
	public List<EditProfessor> queryByName(Connection con,String name,int total) throws SQLException{
        int index = 1;
        String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.ADDRESS,P.ORG_AUTH,ORGANIZATION.NAME,P.ORG_ID,P.SCORE_PERCENT "
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.NAME LIKE ? ORDER BY P.SCORE_PERCENT DESC LIMIT ? ";
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.NAME LIKE ? ORDER BY P.SCORE_PERCENT DESC LIMIT " + total;
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(index++,name);
            ps.setInt(index++, total);
            ResultSet rs = ps.executeQuery();
            try{
                List<EditProfessor> editProfessors = new ArrayList<EditProfessor>();

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

@@ -19,6 +19,7 @@ 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.LimitSelect;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectList;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
@@ -159,14 +160,14 @@ public abstract class ResourceDao {
        if(firstPage){
        	queryResult.setPageNo(1);
        	sql = new StringBuilder();
        	sql.append("(SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME FROM RESOURCE WHERE STATUS = '0'");
        	sql.append("(SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '0'");
        	if(hasProfessorId){
            	sql.append(" AND PROFESSOR_ID = ?");
            }
        	if(hasKey){
        		sql.append(" AND (RESOURCE_NAME LIKE ? OR SUPPORTED_SERVICES LIKE ? OR SUBJECT LIKE ?)");
        	}
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME FROM RESOURCE WHERE STATUS = '1'");
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '1'");
        	if(hasProfessorId){
            	sql.append(" AND PROFESSOR_ID = ?");
            }
@@ -187,14 +188,14 @@ public abstract class ResourceDao {
            --pageNo;
            int offset = (pageNo * pageSize);
            sql = new StringBuilder();
            sql.append("(SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME FROM RESOURCE WHERE STATUS = '0'");
            sql.append("(SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '0'");
        	if(hasProfessorId){
            	sql.append(" AND PROFESSOR_ID = ?");
            }
        	if(hasKey){
        		sql.append(" AND (RESOURCE_NAME LIKE ? OR SUPPORTED_SERVICES LIKE ? OR SUBJECT LIKE ?)");
        	}
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME FROM RESOURCE WHERE STATUS = '1'");
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '1'");
        	if(hasProfessorId){
            	sql.append(" AND PROFESSOR_ID = ?");
            }
@@ -272,6 +273,185 @@ public abstract class ResourceDao {
                    resource.setPublishTime(publishTime);
                    resource.setCreateTime(rs.getString(12));
                    resource.setModifyTime(rs.getString(13));
                    int pageViews = rs.getInt(14);
                    if(rs.wasNull()){
                    	pageViews = 0;
                    }
                    resource.setPageViews(pageViews);
                    resources.add(resource);
                }
                return queryResult;
            }finally{
                try{rs.close();}catch(Exception e3){}
            }
        }finally{
            try{ps.close();}catch(Exception e4){}
        }
    }
	
	public PageQueryResult<Resource> querySelfForOrg(Connection con,String orgId,@Nullable String key,int pageSize,int pageNo) throws SQLException{
        int total = 0;
        PageQueryResult<Resource> queryResult = new PageQueryResult<Resource>();
        int index = 1;
        boolean hasOrgId = null != orgId;
        boolean hasKey = null != key;
        StringBuilder sql = new StringBuilder();
        sql.append("SELECT COUNT(1) FROM RESOURCE WHERE STATUS IN('0','1')");
        if(hasOrgId){
        	sql.append(" AND ORG_ID = ?");
        }
        if(hasKey){
        	sql.append(" AND (RESOURCE_NAME LIKE ? OR SUPPORTED_SERVICES LIKE ? OR SUBJECT LIKE ?)");
        }
        PreparedStatement ps = con.prepareStatement(sql.toString());
        try{
        	if(hasOrgId){
        		ps.setString(index++, orgId);
        	}
        	if(hasKey){
        		ps.setString(index++, key);
        		ps.setString(index++, key);
        		ps.setString(index++, key);
        	}
        	queryResult.setPageSize(pageSize);
            ResultSet rs = ps.executeQuery();
            try{
                rs.next();
                total = rs.getInt(1);
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
        queryResult.setTotal(total);
        if(0== total){
        	queryResult.setPageNo(1);
        	queryResult.setData(Collections.<Resource>emptyList());
            return queryResult;
        }
        boolean firstPage = (1 == pageNo);
        if(firstPage){
        	queryResult.setPageNo(1);
        	sql = new StringBuilder();
        	sql.append("(SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,ORG_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '0'");
        	if(hasOrgId){
            	sql.append(" AND ORG_ID = ?");
            }
        	if(hasKey){
        		sql.append(" AND (RESOURCE_NAME LIKE ? OR SUPPORTED_SERVICES LIKE ? OR SUBJECT LIKE ?)");
        	}
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,ORG_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '1'");
        	if(hasOrgId){
            	sql.append(" AND ORG_ID = ?");
            }
        	if(hasKey){
        		sql.append(" AND (RESOURCE_NAME LIKE ? OR SUPPORTED_SERVICES LIKE ? OR SUBJECT LIKE ?)");
        	}
        	sql.append(" ORDER BY PUBLISH_TIME DESC)");
        	sql.append(" LIMIT ").append(pageSize);
        }else{
            int pageNum = total / pageSize;
            if(total % pageSize != 0){
                ++pageNum;
            }
            if(pageNo > pageNum){
                pageNo = pageNum;
            }
            queryResult.setPageNo(pageNo);
            --pageNo;
            int offset = (pageNo * pageSize);
            sql = new StringBuilder();
            sql.append("(SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,ORG_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '0'");
        	if(hasOrgId){
            	sql.append(" AND ORG_ID = ?");
            }
        	if(hasKey){
        		sql.append(" AND (RESOURCE_NAME LIKE ? OR SUPPORTED_SERVICES LIKE ? OR SUBJECT LIKE ?)");
        	}
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,ORG_ID,PUBLISH_TIME,CREATE_TIME,MODIFY_TIME,PAGE_VIEWS FROM RESOURCE WHERE STATUS = '1'");
        	if(hasOrgId){
            	sql.append(" AND ORG_ID = ?");
            }
        	if(hasKey){
        		sql.append(" AND (RESOURCE_NAME LIKE ? OR SUPPORTED_SERVICES LIKE ? OR SUBJECT LIKE ?)");
        	}
        	sql.append(" ORDER BY PUBLISH_TIME DESC)");
            sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(offset);
        }
        ps = con.prepareStatement(sql.toString());
        index = 1;
        try{
        	if(hasOrgId){
        		ps.setString(index++, orgId);
        	}
        	if(hasKey){
        		ps.setString(index++, key);
        		ps.setString(index++, key);
        		ps.setString(index++, key);
        	}
        	if(hasOrgId){
        		ps.setString(index++, orgId);
        	}
        	if(hasKey){
        		ps.setString(index++, key);
        		ps.setString(index++, key);
        		ps.setString(index++, key);
        	}
            ResultSet rs = ps.executeQuery();
            try{
                List<Resource> resources = new ArrayList<Resource>();
                queryResult.setData(resources);
                int size = 0;
                while((size<pageSize) && rs.next()){
                    ++size;
                    Resource resource =  new Resource();
                    resource.setResourceId(rs.getString(1));
                    resource.setResourceName(rs.getString(2));
                    String subject = rs.getString(3);
                    if(rs.wasNull()){
                    	subject = null;
                    }
                    resource.setSubject(subject);
                    resource.setSupportedServices(rs.getString(4));
                    String orgName = rs.getString(5);
                    if(rs.wasNull()){
                    	orgName = null;
                    }
                    resource.setOrgName(orgName);
                    String spec = rs.getString(6);
                    if(rs.wasNull()){
                    	spec = null;
                    }
                    resource.setSpec(spec);
                    String parameter = rs.getString(7);
                    if(rs.wasNull()){
                    	parameter = null;
                    }
                    resource.setParameter(parameter);
                    String status = rs.getString(8);
                    if(rs.wasNull()){
                    	status = null;
                    }
                    resource.setStatus(status);
                    String descp = rs.getString(9);
                    if(rs.wasNull()){
                    	descp = null;
                    }
                    resource.setDescp(descp);
                    resource.setOrgId(rs.getString(10));
                    String publishTime = rs.getString(11);
                    if(rs.wasNull()){
                    	publishTime = null;
                    }
                    resource.setPublishTime(publishTime);
                    resource.setCreateTime(rs.getString(12));
                    resource.setModifyTime(rs.getString(13));
                    int pageViews = rs.getInt(14);
                    if(rs.wasNull()){
                    	pageViews = 0;
                    }
                    resource.setPageViews(pageViews);
                    resources.add(resource);
                }
                return queryResult;
@@ -288,7 +468,7 @@ public abstract class ResourceDao {
        boolean hasProId = null != professorId;
        boolean hasResId = null != resourceId;
        StringBuilder sql = new StringBuilder();
        sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS FROM RESOURCE");
        sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS,ORG_ID,RESOURCE_TYPE FROM RESOURCE");
        sql.append(" WHERE STATUS = '1'");
        if(hasResId){
        	sql.append(" AND RESOURCE_ID != ?");
@@ -346,7 +526,11 @@ public abstract class ResourceDao {
                    	descp = null;
                    }
                    resource.setDescp(descp);
                    resource.setProfessorId(rs.getString(10));
                    String proId = rs.getString(10);
                    if(rs.wasNull()){
                    	proId = null;
                    }
                    resource.setProfessorId(proId);
                    String publishTime = rs.getString(11);
                    if(rs.wasNull()){
                    	publishTime = null;
@@ -357,6 +541,107 @@ public abstract class ResourceDao {
                    	pageViews = 0;
                    }
                    resource.setPageViews(pageViews);
                    String orgid = rs.getString(13);
                    if(rs.wasNull()){
                    	orgid = null;
                    }
                    resource.setOrgId(orgid);
                    resource.setResourceType(rs.getString(14));
                    resources.add(resource);
                }
                return resources;
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
	}
	
	public List<Resource> queryByOrgId(Connection con,String orgId,String resourceId,int rows) throws SQLException{
		int index = 1;
        boolean hasOrgId = null != orgId;
        boolean hasResId = null != resourceId;
        StringBuilder sql = new StringBuilder();
        sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS,ORG_ID,RESOURCE_TYPE FROM RESOURCE");
        sql.append(" WHERE STATUS = '1'");
        if(hasResId){
        	sql.append(" AND RESOURCE_ID != ?");
        }
        if(hasOrgId){
        	sql.append(" AND ORG_ID = ?");
        	sql.append(" ORDER BY PUBLISH_TIME DESC");
        }else{
        	sql.append(" ORDER BY PAGE_VIEWS DESC");
        }
        sql.append(" LIMIT ").append(rows);
        PreparedStatement ps = con.prepareStatement(sql.toString());
        try{
        	if(hasResId){
        		ps.setString(index++, resourceId);
        	}
        	if(hasOrgId){
        		ps.setString(index++, orgId);
        	}
            ResultSet rs = ps.executeQuery();
            try{
                List<Resource> resources = new ArrayList<Resource>();
                while(rs.next()){
                    Resource resource =  new Resource();
                    resource.setResourceId(rs.getString(1));
                    resource.setResourceName(rs.getString(2));
                    String subject = rs.getString(3);
                    if(rs.wasNull()){
                    	subject = null;
                    }
                    resource.setSubject(subject);
                    resource.setSupportedServices(rs.getString(4));
                    String orgName = rs.getString(5);
                    if(rs.wasNull()){
                    	orgName = null;
                    }
                    resource.setOrgName(orgName);
                    String spec = rs.getString(6);
                    if(rs.wasNull()){
                    	spec = null;
                    }
                    resource.setSpec(spec);
                    String parameter = rs.getString(7);
                    if(rs.wasNull()){
                    	parameter = null;
                    }
                    resource.setParameter(parameter);
                    String status = rs.getString(8);
                    if(rs.wasNull()){
                    	status = null;
                    }
                    resource.setStatus(status);
                    String descp = rs.getString(9);
                    if(rs.wasNull()){
                    	descp = null;
                    }
                    resource.setDescp(descp);
                    String proId = rs.getString(10);
                    if(rs.wasNull()){
                    	proId = null;
                    }
                    resource.setProfessorId(proId);
                    String publishTime = rs.getString(11);
                    if(rs.wasNull()){
                    	publishTime = null;
                    }
                    resource.setPublishTime(publishTime);
                    int pageViews = rs.getInt(12);
                    if(rs.wasNull()){
                    	pageViews = 0;
                    }
                    resource.setPageViews(pageViews);
                    String orgid = rs.getString(13);
                    if(rs.wasNull()){
                    	orgid = null;
                    }
                    resource.setOrgId(orgid);
                    resource.setResourceType(rs.getString(14));
                    resources.add(resource);
                }
                return resources;
@@ -382,7 +667,7 @@ public abstract class ResourceDao {
        boolean hasKeys = null != keys;
        boolean hasResId = null != resourceId;
        StringBuilder sql = new StringBuilder();
        sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS FROM RESOURCE");
        sql.append("SELECT RESOURCE_ID,RESOURCE_NAME,SUBJECT,SUPPORTED_SERVICES,ORG_NAME,SPEC,PARAMETER,STATUS,DESCP,PROFESSOR_ID,PUBLISH_TIME,PAGE_VIEWS,ORG_ID,RESOURCE_TYPE FROM RESOURCE");
        sql.append(" WHERE STATUS = '1'");
        if(hasResId){
        	sql.append(" AND RESOURCE_ID != ?");
@@ -458,6 +743,12 @@ public abstract class ResourceDao {
                    	pageViews = 0;
                    }
                    resource.setPageViews(pageViews);
                    String orgid = rs.getString(13);
                    if(rs.wasNull()){
                    	orgid = null;
                    }
                    resource.setOrgId(orgid);
                    resource.setResourceType(rs.getString(14));
                    resources.add(resource);
                }
                return resources;
@@ -783,6 +1074,21 @@ public abstract class ResourceDao {
	@OrderBy("ORDER BY PUBLISH_TIME DESC")
	public abstract List<Resource> queryByName(Connection con, @Like String resourceName, int rows) throws SQLException;
	
	@SelectList
	@OrderBy("ORDER BY PUBLISH_TIME DESC")
	@Where("STATUS = '1'")
	public abstract List<Resource> queryProPublish(Connection con,String professorId) throws SQLException;
	
	@SelectList
	@OrderBy("ORDER BY PUBLISH_TIME DESC")
	@Where("STATUS IN ('0','1')")
	public abstract List<Resource> queryForDesk(Connection con,String professorId) throws SQLException;
	
	@SelectList
	@OrderBy("ORDER BY PUBLISH_TIME DESC")
	@Where("STATUS = '1'")
	public abstract List<Resource> queryOrgPublish(Connection con,String orgId) throws SQLException;
	
	/**
	 * 按专家ID查询发布的所有资源
	 * @param con

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

@@ -0,0 +1,197 @@
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.Collections;
import java.util.List;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.po.ResourceTmp;
@DAO
public abstract class ResourceTmpDao {
	@Insert
	public abstract int insert(Connection con,ResourceTmp rt) throws SQLException;
	
	public PageQueryResult<ResourceTmp> query(Connection con,String orgName,String key,int pageSize,int pageNo) throws SQLException{
        int total = 0;
        int index = 1;
        PageQueryResult<ResourceTmp> queryResult = new PageQueryResult<ResourceTmp>();
        boolean hasKey = null != key;
        StringBuilder sql = new StringBuilder();
        sql.append(" WHERE ORG_NAME = ?");
        if(hasKey){
        	sql.append(" AND (NAME LIKE ? OR DOMAIN LIKE ? OR MAJOR_FUNC LIKE ?)");
        }
        StringBuilder whereSql = sql;
        sql = new StringBuilder();
        sql.append("SELECT COUNT(1) FROM RESOURCE_TMP");
        sql.append(whereSql);
        PreparedStatement ps = con.prepareStatement(sql.toString());
        try{
        	ps.setString(index++, orgName);
        	if(hasKey){
        		ps.setString(index++, key);
        		ps.setString(index++, key);
        		ps.setString(index++, key);
        	}
        	queryResult.setPageSize(pageSize);
            ResultSet rs = ps.executeQuery();
            try{
                rs.next();
                total = rs.getInt(1);
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
        queryResult.setTotal(total);
        if(0 == total){
        	queryResult.setPageNo(1);
        	queryResult.setData(Collections.<ResourceTmp>emptyList());
            return queryResult;
        }
        index = 1;
        boolean firstPage = (1 == pageNo);
        sql = new StringBuilder();
        if(firstPage){
        	queryResult.setPageNo(1);
            sql.append("SELECT ID,NAME,DOMAIN,COMP,SPEC,IMG,PARAMETER,MAJOR_FUNC,COST,ENABLED_TIME,COMMUNICATION,ORG_NAME,CORPORATION,LINKMAN,TEL,EMAIL,ADDR,ZIP_CODE,CREATE_TIME,MODIFY_TIME FROM RESOURCE_TMP");
            sql.append(whereSql);
            sql.append(" ORDER BY ID");
            sql.append(" LIMIT ").append(pageSize);
        }else{
            int pageNum = total / pageSize;
            if(total % pageSize != 0){
                ++pageNum;
            }
            if(pageNo > pageNum){
                pageNo = pageNum;
            }
            queryResult.setPageNo(pageNo);
            --pageNo;
            int offset = (pageNo * pageSize);
            sql.append("SELECT ID,NAME,DOMAIN,COMP,SPEC,IMG,PARAMETER,MAJOR_FUNC,COST,ENABLED_TIME,COMMUNICATION,ORG_NAME,CORPORATION,LINKMAN,TEL,EMAIL,ADDR,ZIP_CODE,CREATE_TIME,MODIFY_TIME FROM RESOURCE_TMP");
            sql.append(whereSql);
            sql.append(" ORDER BY ID");
            sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(offset);
        }
        ps = con.prepareStatement(sql.toString());
        try{
        	ps.setString(index++, orgName);
        	if(hasKey){
        		ps.setString(index++, key);
        		ps.setString(index++, key);
        		ps.setString(index++, key);
        	}
            ResultSet rs = ps.executeQuery();
            try{
                List<ResourceTmp> resourceTmps = new ArrayList<ResourceTmp>();
                queryResult.setData(resourceTmps);
                int size = 0;
                while((size<pageSize) && rs.next()){
                    ++size;
                    ResourceTmp resourceTmp =  new ResourceTmp();
                    resourceTmp.setId(rs.getString(1));
                    resourceTmp.setName(rs.getString(2));
                    String domain = rs.getString(3);
                    if(rs.wasNull()){
                    	domain = null;
                    }
                    resourceTmp.setDomain(domain);
                    String comp = rs.getString(4);
                    if(rs.wasNull()){
                    	comp = null;
                    }
                    resourceTmp.setComp(comp);
                    String spec = rs.getString(5);
                    if(rs.wasNull()){
                    	spec = null;
                    }
                    resourceTmp.setSpec(spec);
                    String img = rs.getString(6);
                    if(rs.wasNull()){
                        img = null;
                    }
                    resourceTmp.setImg(img);
                    String parameter = rs.getString(7);
                    if(rs.wasNull()){
                    	parameter = null;
                    }
                    resourceTmp.setParameter(parameter);
                    String majorFunc = rs.getString(8);
                    if(rs.wasNull()){
                    	majorFunc = null;
                    }
                    resourceTmp.setMajorFunc(majorFunc);
                    Double cost = rs.getDouble(9);
                    if(rs.wasNull()){
                    	cost = null;
                    }
                    resourceTmp.setCost(cost);
                    String enabledTime = rs.getString(10);
                    if(rs.wasNull()){
                    	enabledTime = null;
                    }
                    resourceTmp.setEnabledTime(enabledTime);
                    String communication = rs.getString(11);
                    if(rs.wasNull()){
                    	communication = null;
                    }
                    resourceTmp.setCommunication(communication);
                    String orgname = rs.getString(12);
                    if(rs.wasNull()){
                    	orgname = null;
                    }
                    resourceTmp.setOrgName(orgname);
                    String corporation = rs.getString(13);
                    if(rs.wasNull()){
                    	corporation = null;
                    }
                    resourceTmp.setCorporation(corporation);
                    String linkman = rs.getString(14);
                    if(rs.wasNull()){
                    	linkman = null;
                    }
                    resourceTmp.setLinkman(linkman);
                    String tel = rs.getString(15);
                    if(rs.wasNull()){
                    	tel = null;
                    }
                    resourceTmp.setTel(tel);
                    String email = rs.getString(16);
                    if(rs.wasNull()){
                    	email = null;
                    }
                    resourceTmp.setEmail(email);
                    String addr = rs.getString(17);
                    if(rs.wasNull()){
                        addr = null;
                    }
                    resourceTmp.setAddr(addr);
                    String zipCode = rs.getString(18);
                    if(rs.wasNull()){
                    	zipCode = null;
                    }
                    resourceTmp.setZipCode(zipCode);
                    resourceTmp.setCreateTime(rs.getString(19));
                    resourceTmp.setModifyTime(rs.getString(20));
                    resourceTmps.add(resourceTmp);
                }
                return queryResult;
            }finally{
                try{rs.close();}catch(Exception e3){}
            }
        }finally{
            try{ps.close();}catch(Exception e4){}
        }
    }
	
}

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

@@ -0,0 +1,45 @@
package com.ekexiu.portal.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.annotation.entry.Unique;
import org.jfw.apt.orm.annotation.entry.Uniques;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
import com.ekexiu.portal.pojo.EditProfessor;
@Table
@Uniques(@Unique(clolumns = { "resourceId", "professorId" }, name = "ORG_RES_STAFF_UQ"))
public class OrgResStaff implements CreateTimeSupported {
	private String resourceId;
	private String professorId;
	private String createTime;
	private EditProfessor professor;
	public EditProfessor getProfessor() {
		return professor;
	}
	public void setProfessor(EditProfessor professor) {
		this.professor = professor;
	}
	@Column(DE.id_32)
	public String getResourceId() {
		return resourceId;
	}
	public void setResourceId(String resourceId) {
		this.resourceId = resourceId;
	}
	@Column(DE.id_32)
	public String getProfessorId() {
		return professorId;
	}
	public void setProfessorId(String professorId) {
		this.professorId = professorId;
	}
	public String getCreateTime() {
		return createTime;
	}
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
}

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

@@ -12,6 +12,7 @@ import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
import com.ekexiu.portal.basepo.ModifyTimeSupported;
import com.ekexiu.portal.pojo.EditOrganization;
import com.ekexiu.portal.pojo.EditProfessor;
@PrimaryKey("resourceId")
@@ -45,6 +46,7 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
	private String professorId;
	private Professor professor;
	private EditProfessor editProfessor;
	private EditOrganization organization;
	private List<Image> images;
	/**
	 * 资源所属（个人/机构）
@@ -65,6 +67,15 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
	 * 浏览量
	 */
	private int pageViews;
	/**
	 * 所在单位
	 */
	private String comp;
	/**
	 * 资源类型(1-个人资源，2-企业资源)
	 */
	private String resourceType;
	private String orgId;
	
	public List<Image> getImages() {
		return images;
@@ -73,6 +84,12 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
		this.images = images;
	}
	
	public EditOrganization getOrganization() {
		return organization;
	}
	public void setOrganization(EditOrganization organization) {
		this.organization = organization;
	}
	public Professor getProfessor() {
		return professor;
	}
@@ -167,7 +184,7 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
		this.descp = descp;
	}
	
	@Column(DE.id_32)
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",nullable=true,renewable=false)
	public String getProfessorId() {
		return professorId;
	}
@@ -229,4 +246,28 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
		this.pageViews = pageViews;
	}
	
	@Column(handlerClass=StringHandler.class,nullable=true,renewable=false)
	public String getComp() {
		return comp;
	}
	public void setComp(String comp) {
		this.comp = comp;
	}
	
	@Column(handlerClass=FixLenStringHandler.class,nullable=true,renewable=false)
	public String getResourceType() {
		return resourceType;
	}
	public void setResourceType(String resourceType) {
		this.resourceType = resourceType;
	}
	
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",nullable=true,renewable=false)
	public String getOrgId() {
		return orgId;
	}
	public void setOrgId(String orgId) {
		this.orgId = orgId;
	}
	
}

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

@@ -0,0 +1,192 @@
package com.ekexiu.portal.po;
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.enums.DE;
import com.ekexiu.portal.basepo.CreateTimeSupported;
import com.ekexiu.portal.basepo.ModifyTimeSupported;
@Table
@PrimaryKey("id")
public class ResourceTmp implements CreateTimeSupported,ModifyTimeSupported {
	private String id;
	//设备名称 
	private String name;
	//所属领域
	private String domain;
	//所在单位 
	private String comp;
	//厂商及型号规格 
	private String spec;
	//图片 
	private String img;
	//性能参数 
	private String parameter;
	//主要功能及应用领域 
	private String majorFunc;
	//仪器原值（万元） 
	private Double cost;
	//启用时间 
	private String enabledTime;
	//联系方式
	private String communication;
	//机构名称
	private String orgName;
	//负责人
	private String corporation ;
	//联系人 
	private String linkman; 
	//电话
	private String tel;
	//邮箱
	private String email;
	//地址 
	private String addr;
	//邮编
	private String zipCode;
	private String createTime;
	private String modifyTime;
	
	@Column(DE.string_de)
	public String getId() {
		return id;
	}
	public void setId(String id) {
		this.id = id;
	}
	@Column(DE.text_de)
	public String getName() {
		return name;
	}
	public void setName(String name) {
		this.name = name;
	}
	@Column(DE.Text_de)
	public String getDomain() {
		return domain;
	}
	public void setDomain(String domain) {
		this.domain = domain;
	}
	@Column(DE.Text_de)
	public String getComp() {
		return comp;
	}
	public void setComp(String comp) {
		this.comp = comp;
	}
	@Column(DE.Text_de)
	public String getSpec() {
		return spec;
	}
	public void setSpec(String spec) {
		this.spec = spec;
	}
	@Column(DE.Text_de)
	public String getImg() {
		return img;
	}
	public void setImg(String img) {
		this.img = img;
	}
	@Column(DE.Text_de)
	public String getParameter() {
		return parameter;
	}
	public void setParameter(String parameter) {
		this.parameter = parameter;
	}
	@Column(DE.Text_de)
	public String getMajorFunc() {
		return majorFunc;
	}
	public void setMajorFunc(String majorFunc) {
		this.majorFunc = majorFunc;
	}
	@Column(DE.Double_de)
	public Double getCost() {
		return cost;
	}
	public void setCost(Double cost) {
		this.cost = cost;
	}
	@Column(DE.Text_de)
	public String getEnabledTime() {
		return enabledTime;
	}
	public void setEnabledTime(String enabledTime) {
		this.enabledTime = enabledTime;
	}
	@Column(DE.Text_de)
	public String getCommunication() {
		return communication;
	}
	
	public void setCommunication(String communication) {
		this.communication = communication;
	}
	@Column(DE.Text_de)
	public String getOrgName() {
		return orgName;
	}
	public void setOrgName(String orgName) {
		this.orgName = orgName;
	}
	@Column(DE.Text_de)
	public String getCorporation() {
		return corporation;
	}
	public void setCorporation(String corporation) {
		this.corporation = corporation;
	}
	@Column(DE.Text_de)
	public String getLinkman() {
		return linkman;
	}
	public void setLinkman(String linkman) {
		this.linkman = linkman;
	}
	@Column(DE.Text_de)
	public String getTel() {
		return tel;
	}
	public void setTel(String tel) {
		this.tel = tel;
	}
	@Column(DE.Text_de)
	public String getEmail() {
		return email;
	}
	public void setEmail(String email) {
		this.email = email;
	}
	@Column(DE.Text_de)
	public String getAddr() {
		return addr;
	}
	public void setAddr(String addr) {
		this.addr = addr;
	}
	@Column(DE.Text_de)
	public String getZipCode() {
		return zipCode;
	}
	public void setZipCode(String zipCode) {
		this.zipCode = zipCode;
	}
	public String getCreateTime() {
		return createTime;
	}
	public void setCreateTime(String createTime) {
		this.createTime = createTime;
	}
	public String getModifyTime() {
		return modifyTime;
	}
	public void setModifyTime(String modifyTime) {
		this.modifyTime = modifyTime;
	}
	
}

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

@@ -584,12 +584,30 @@ public class ArticleService {
		return this.articleDao.queryPro(con, professorId);
	}
	
	@Get
	@Path("/qaProPublish")
	public List<Article> queryProPublish(@JdbcConn Connection con, String professorId) throws SQLException{
		return this.articleDao.queryProPublish(con, professorId);
	}
	
	@Get
	@Path("/qaForDesk")
	public List<Article> queryForDesk(@JdbcConn Connection con, String professorId) throws SQLException{
		return this.articleDao.queryForDesk(con, professorId);
	}
	
	@Get
	@Path("/qaOrg")
	public List<Article> queryOrg(@JdbcConn Connection con,String orgId)throws SQLException{
		return this.articleDao.queryOrg(con, orgId);
	}
	
	@Get
	@Path("/qaOrgPublish")
	public List<Article> queryOrgPublish(@JdbcConn Connection con,String orgId)throws SQLException{
		return this.articleDao.queryOrgPublish(con, orgId);
	}
	
	@Get
	@Path("/qlOrg")
	public List<Article> queryLimitOrg(@JdbcConn Connection con,String orgId,@DefaultValue("com.ekexiu.portal.service.ArticleService.MAX_MODIFYTIME") String modifyTime,@DefaultValue("20") int rows)throws SQLException{

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

@@ -26,6 +26,7 @@ import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.HonorDao;
import com.ekexiu.portal.dao.ImageDao;
import com.ekexiu.portal.dao.OrgDao;
import com.ekexiu.portal.dao.OrgResStaffDao;
import com.ekexiu.portal.dao.PaperDao;
import com.ekexiu.portal.dao.PartTimeJobDao;
import com.ekexiu.portal.dao.PatentDao;
@@ -88,6 +89,8 @@ public class ProfessorService {
	private HonorDao honorDao;
	@Autowrie
	private ProjectDao projectDao;
	@Autowrie
	private OrgResStaffDao orgResStaffDao;
	public GrowthLogService getGrowthLogService() {
		return growthLogService;
@@ -250,6 +253,14 @@ public class ProfessorService {
		this.imageDao = imageDao;
	}
	public OrgResStaffDao getOrgResStaffDao() {
		return orgResStaffDao;
	}
	public void setOrgResStaffDao(OrgResStaffDao orgResStaffDao) {
		this.orgResStaffDao = orgResStaffDao;
	}
	@Post
	@Path
	public String insert(@JdbcConn(true) Connection con, Professor professor, @Nullable String orgName)

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

@@ -25,13 +25,17 @@ import com.ekexiu.portal.dao.ArticleDao;
import com.ekexiu.portal.dao.ArticleResDao;
import com.ekexiu.portal.dao.ImageDao;
import com.ekexiu.portal.dao.OperationDao;
import com.ekexiu.portal.dao.OrgDao;
import com.ekexiu.portal.dao.OrgResStaffDao;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.ResourceDao;
import com.ekexiu.portal.dao.WatchDao;
import com.ekexiu.portal.po.ArticleRes;
import com.ekexiu.portal.po.Image;
import com.ekexiu.portal.po.Operation;
import com.ekexiu.portal.po.OrgResStaff;
import com.ekexiu.portal.po.Resource;
import com.ekexiu.portal.pojo.EditOrganization;
import com.ekexiu.portal.pojo.EditProfessor;
@Path("/resource")
@@ -57,6 +61,10 @@ public class ResourceService {
	private ArticleResDao articleResDao;
	@Autowrie
	private ArticleDao articleDao;
	@Autowrie
	private OrgResStaffDao orgResStaffDao;
	@Autowrie
	private OrgDao orgDao;
	public String getTimeFormat() {
		return timeFormat;
@@ -146,6 +154,22 @@ public class ResourceService {
		this.articleDao = articleDao;
	}
	public OrgResStaffDao getOrgResStaffDao() {
		return orgResStaffDao;
	}
	public void setOrgResStaffDao(OrgResStaffDao orgResStaffDao) {
		this.orgResStaffDao = orgResStaffDao;
	}
	public OrgDao getOrgDao() {
		return orgDao;
	}
	public void setOrgDao(OrgDao orgDao) {
		this.orgDao = orgDao;
	}
	private String publishTime(){
		SimpleDateFormat df = new SimpleDateFormat(this.timeFormat);
		String publishTime = df.format(new Date());
@@ -179,6 +203,7 @@ public class ResourceService {
			resource.setStatus("1");
			resource.setPageViews(0);
			resource.setPublishTime(this.publishTime());
			resource.setResourceType("1");
			this.resourceDao.insert(con, resource);
			//this.growthLogService.addResource(con, resource.getProfessorId());
			return resourceId;
@@ -187,15 +212,15 @@ public class ResourceService {
			if(imageIds != null){
				imageLength = imageIds.length;
				List<Image> images = this.imageDao.queryRes(con, resource.getResourceId());
				this.imageDao.updateAllSort(con, resource.getResourceId(), 0);
				for (int i = 0; i < imageLength; i++) {
					for (Image image : images) {
						if(image.getImageId().equals(imageIds[i])){
							this.imageDao.updateSort(con, image.getImageId(), i+1);
						}else{
							this.imageDao.deleteId(con, image.getImageId());
						}
					}
				}
				this.imageDao.deleteBySort(con, resource.getResourceId(), 0);
			}
			if(fns != null){
				if(imageIds == null){
@@ -223,6 +248,7 @@ public class ResourceService {
			resource.setResourceId(resourceId);
			resource.setStatus("0");
			resource.setPageViews(0);
			resource.setResourceType("1");
			this.resourceDao.insert(con, resource);
			return resourceId;
		}else if(resource.getResourceId().trim().length() == 32){
@@ -230,15 +256,15 @@ public class ResourceService {
			if(imageIds != null){
				imageLength = imageIds.length;
				List<Image> images = this.imageDao.queryRes(con, resource.getResourceId());
				this.imageDao.updateAllSort(con, resource.getResourceId(), 0);
				for (int i = 0; i < imageLength; i++) {
					for (Image image : images) {
						if(image.getImageId().equals(imageIds[i])){
							this.imageDao.updateSort(con, image.getImageId(), i+1);
						}else{
							this.imageDao.deleteId(con, image.getImageId());
						}
					}
				}
				this.imageDao.deleteBySort(con, resource.getResourceId(), 0);
			}
			if(fns != null){
				if(imageIds == null){
@@ -266,6 +292,7 @@ public class ResourceService {
			resource.setResourceId(resourceId);
			resource.setStatus("2");
			resource.setPageViews(0);
			resource.setResourceType("1");
			this.resourceDao.insert(con, resource);
			return resourceId;
		}else if(resource.getResourceId().trim().length() == 32){
@@ -273,15 +300,15 @@ public class ResourceService {
			if(imageIds != null){
				imageLength = imageIds.length;
				List<Image> images = this.imageDao.queryRes(con, resource.getResourceId());
				this.imageDao.updateAllSort(con, resource.getResourceId(), 0);
				for (int i = 0; i < imageLength; i++) {
					for (Image image : images) {
						if(image.getImageId().equals(imageIds[i])){
							this.imageDao.updateSort(con, image.getImageId(), i+1);
						}else{
							this.imageDao.deleteId(con, image.getImageId());
						}
					}
				}
				this.imageDao.deleteBySort(con, resource.getResourceId(), 0);
			}
			if(fns != null){
				if(imageIds == null){
@@ -297,6 +324,129 @@ public class ResourceService {
		}
	}
	
	@Post
	@Path("/orgSave")
	public String orgSave(@JdbcConn(true) Connection con, Resource resource,@Nullable String[] fns,@Nullable String[] imageIds,
			@Nullable String[] professorIds) throws JfwBaseException, SQLException, IOException {
		if(resource.getResourceId() == null){
			String resourceId = StringUtil.buildUUID();
			if(fns != null){
				this.imagesService.saveImg(con, resourceId, fns);
			}
			resource.setResourceId(resourceId);
			resource.setStatus("1");
			resource.setPageViews(0);
			resource.setPublishTime(this.publishTime());
			resource.setResourceType("2");
			this.resourceDao.insert(con, resource);
			if(professorIds != null){
				for (String professorId : professorIds) {
					OrgResStaff orgResStaff = new OrgResStaff();
					orgResStaff.setResourceId(resourceId);
					orgResStaff.setProfessorId(professorId);
					this.orgResStaffDao.insert(con, orgResStaff);
				}
			}
			return resourceId;
		}else if(resource.getResourceId().trim().length() == 32){
			int imageLength = 0;
			if(imageIds != null){
				imageLength = imageIds.length;
				List<Image> images = this.imageDao.queryRes(con, resource.getResourceId());
				this.imageDao.updateAllSort(con, resource.getResourceId(), 0);
				for (int i = 0; i < imageLength; i++) {
					for (Image image : images) {
						if(image.getImageId().equals(imageIds[i])){
							this.imageDao.updateSort(con, image.getImageId(), i+1);
						}
					}
				}
				this.imageDao.deleteBySort(con, resource.getResourceId(), 0);
			}
			if(fns != null){
				if(imageIds == null){
					this.imageDao.deleteRes(con, resource.getResourceId());
				}
				this.imagesService.saveFns(con, resource.getResourceId(), fns, imageLength);
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updatePublishTime(con, resource.getResourceId(), "1", this.publishTime());
			this.orgResStaffDao.delete(con, resource.getResourceId());
			if(professorIds != null){
				for (String professorId : professorIds) {
					OrgResStaff orgResStaff = new OrgResStaff();
					orgResStaff.setResourceId(resource.getResourceId());
					orgResStaff.setProfessorId(professorId);
					this.orgResStaffDao.insert(con, orgResStaff);
				}
			}
			return resource.getResourceId();
		}else{
			throw new JfwBaseException(-1, "bad parameter:resourceId");
		}
	}
	
	@Post
	@Path("/orgDraft")
	public String orgDraft(@JdbcConn(true) Connection con,Resource resource,@Nullable String[] fns,@Nullable String[] imageIds,
			@Nullable String[] professorIds) throws SQLException, IOException, JfwBaseException{
		if(resource.getResourceId() == null){
			String resourceId = StringUtil.buildUUID();
			if(fns != null){
				this.imagesService.saveImg(con, resourceId, fns);
			}
			resource.setResourceId(resourceId);
			resource.setStatus("0");
			resource.setPageViews(0);
			resource.setResourceType("2");
			this.resourceDao.insert(con, resource);
			if(professorIds != null){
				for (String professorId : professorIds) {
					OrgResStaff orgResStaff = new OrgResStaff();
					orgResStaff.setResourceId(resourceId);
					orgResStaff.setProfessorId(professorId);
					this.orgResStaffDao.insert(con, orgResStaff);
				}
			}
			return resourceId;
		}else if(resource.getResourceId().trim().length() == 32){
			int imageLength = 0;
			if(imageIds != null){
				imageLength = imageIds.length;
				List<Image> images = this.imageDao.queryRes(con, resource.getResourceId());
				this.imageDao.updateAllSort(con, resource.getResourceId(), 0);
				for (int i = 0; i < imageLength; i++) {
					for (Image image : images) {
						if(image.getImageId().equals(imageIds[i])){
							this.imageDao.updateSort(con, image.getImageId(), i+1);
						}
					}
				}
				this.imageDao.deleteBySort(con, resource.getResourceId(), 0);
			}
			if(fns != null){
				if(imageIds == null){
					this.imageDao.deleteRes(con, resource.getResourceId());
				}
				this.imagesService.saveFns(con, resource.getResourceId(), fns, imageLength);
			}
			this.resourceDao.update(con, resource);
			this.resourceDao.updateStatus(con, resource.getResourceId(), "0");
			this.orgResStaffDao.delete(con, resource.getResourceId());
			if(professorIds != null){
				for (String professorId : professorIds) {
					OrgResStaff orgResStaff = new OrgResStaff();
					orgResStaff.setResourceId(resource.getResourceId());
					orgResStaff.setProfessorId(professorId);
					this.orgResStaffDao.insert(con, orgResStaff);
				}
			}
			return resource.getResourceId();
		}else{
			throw new JfwBaseException(-1, "bad parameter:resourceId");
		}
	}
	
	@Post
	@Path("/delete")
	public void deleteRes(@JdbcConn(true) Connection con, String resourceId) throws SQLException{
@@ -350,11 +500,19 @@ public class ResourceService {
		Resource resource = this.resourceDao.queryOne(con, resourceId);
		if(resource != null){
			resource.setImages(this.imageDao.queryRes(con, resourceId));
			EditProfessor professor = this.professorDao.queryBaseInfo(con, resource.getProfessorId());
			if(professor != null){
				professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
			if(resource.getProfessorId() != null){
				EditProfessor professor = this.professorDao.queryBaseInfo(con, resource.getProfessorId());
				if(professor != null){
					professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
				}
				resource.setEditProfessor(professor);
			}else if(resource.getOrgId() != null){
				EditOrganization organization = this.orgDao.queryEditOrg(con, resource.getOrgId());
				if(organization != null){
					organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
				}
				resource.setOrganization(organization);
			}
			resource.setEditProfessor(professor);
		}
		return resource;
	}
@@ -377,6 +535,24 @@ public class ResourceService {
		return queryResult;
	}
	
	@Get
	@Path("/pqForOrg")
	public PageQueryResult<Resource> queryPageForOrg(@JdbcConn Connection con,String orgId,@Nullable String key,
			@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		if(key != null){
			key = "%" + key + "%";
		}
		PageQueryResult<Resource> queryResult = this.resourceDao.querySelfForOrg(con, orgId, key, pageSize, pageNo);
		List<Resource> resources = queryResult.getData();
		if(!resources.isEmpty()){
			for (Resource resource : resources) {
				resource.setImages(this.imagesService.queryRes(con, resource.getResourceId()));
			}
			queryResult.setData(resources);
		}
		return queryResult;
	}
	
	@Get
	@Path("/ralateRes")
	public List<Resource> queryLimit(@JdbcConn Connection con,@Nullable String[] keys,String resourceId,
@@ -404,6 +580,33 @@ public class ResourceService {
		return resources;
	}
	
	@Get
	@Path("/orgRalateRes")
	public List<Resource> queryOrgRalateRes(@JdbcConn Connection con,@Nullable String[] keys,String resourceId,
			String orgId,@DefaultValue("10") int rows)throws SQLException{
		List<Resource> resources = new ArrayList<Resource>();
		if(keys != null){
			resources = this.resourceDao.queryLimit(con, keys, resourceId, rows);
		}
		if(resources.isEmpty()){
			resources = this.resourceDao.queryByOrgId(con, orgId, resourceId, rows);
			if(resources.isEmpty()){
				resources = this.resourceDao.queryByOrgId(con, null, resourceId, rows);
			}
		}
		if(!resources.isEmpty()){
			for (Resource resource : resources) {
				resource.setImages(this.imagesService.queryRes(con, resource.getResourceId()));
				EditOrganization organization = this.orgDao.queryEditOrg(con, resource.getOrgId());
				if(organization != null){
					organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
				}
				resource.setOrganization(organization);
			}
		}
		return resources;
	}
	
	@Get
	@Path("/articles")
	public List<ArticleRes> queryArticles(@JdbcConn Connection con, String resourceId, @DefaultValue("5") int rows) throws SQLException{
@@ -416,6 +619,22 @@ public class ResourceService {
		return articleRes;
	}
	
	@Get
	@Path("/qaLinkman")
	public List<OrgResStaff> queryLinkman(@JdbcConn Connection con, String resourceId) throws SQLException{
		List<OrgResStaff> orgResStaffs = this.orgResStaffDao.query(con, resourceId);
		if(orgResStaffs != null){
			for (OrgResStaff orgResStaff : orgResStaffs) {
				EditProfessor professor = this.professorDao.queryBaseInfo(con, orgResStaff.getProfessorId());
				if(professor != null){
					professor.setHasHeadImage(this.imageService.hasProfessorImage(professor.getId()));
				}
				orgResStaff.setProfessor(professor);
			}
		}
		return orgResStaffs;
	}
	
	@Get
	@Path("/resourceInfo")
	public Resource queryInfo(@JdbcConn Connection con, String resourceId) throws SQLException {
@@ -471,6 +690,42 @@ public class ResourceService {
		return resources;
	}
	
	@Get
	@Path("/qaProPublish")
	public List<Resource> queryProPublish(@JdbcConn Connection con, String professorId) throws SQLException {
		List<Resource> resources = this.resourceDao.queryProPublish(con, professorId);
		if(!resources.isEmpty()) {
			for (Resource resource : resources) {
				resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
			}
		}
		return resources;
	}
	
	@Get
	@Path("/qaForDesk")
	public List<Resource> queryForDesk(@JdbcConn Connection con, String professorId) throws SQLException {
		List<Resource> resources = this.resourceDao.queryForDesk(con, professorId);
		if(!resources.isEmpty()) {
			for (Resource resource : resources) {
				resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
			}
		}
		return resources;
	}
	
	@Get
	@Path("/qaOrgPublish")
	public List<Resource> queryOrgPublish(@JdbcConn Connection con, String orgId) throws SQLException {
		List<Resource> resources = this.resourceDao.queryOrgPublish(con, orgId);
		if(!resources.isEmpty()) {
			for (Resource resource : resources) {
				resource.setImages(this.imageDao.queryRes(con, resource.getResourceId()));
			}
		}
		return resources;
	}
	
	@Post
	@Path("/nameAndSupport")
	public void updateNameAndSupport(@JdbcConn(true) Connection con, String resourceId, 

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

@@ -0,0 +1,58 @@
package com.ekexiu.portal.service;
import java.sql.Connection;
import java.sql.SQLException;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.ResourceTmpDao;
import com.ekexiu.portal.po.ResourceTmp;
import com.ekexiu.portal.pojo.EditProfessor;
@Path("/resTmp")
public class ResourceTmpService {
	@Autowrie
	private ResourceTmpDao resourceTmpDao;
	@Autowrie
	private ProfessorDao professorDao;
	public ResourceTmpDao getResourceTmpDao() {
		return resourceTmpDao;
	}
	public void setResourceTmpDao(ResourceTmpDao resourceTmpDao) {
		this.resourceTmpDao = resourceTmpDao;
	}
	
	public ProfessorDao getProfessorDao() {
		return professorDao;
	}
	public void setProfessorDao(ProfessorDao professorDao) {
		this.professorDao = professorDao;
	}
	@Get
	@Path("/pq")
	public PageQueryResult<ResourceTmp> query(@JdbcConn Connection con,String professorId,@Nullable String key,@DefaultValue("10") int pageSize,@DefaultValue("1") int pageNo)throws SQLException{
		EditProfessor professor = this.professorDao.queryBaseInfo(con, professorId);
		String orgName = null;
		if(professor != null){
			orgName = professor.getOrgName();
		}
		if(orgName == null || "".equals(orgName)){
			return null;
		}
		if(key != null){
			key = "%" + key + "%";
		}
		return this.resourceTmpDao.query(con, orgName, key, pageSize, pageNo);
	}
}