--add EditOrganization.java;update orgService.query();

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

@@ -1,6 +1,8 @@
package com.ekexiu.portal.dao;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
@@ -24,54 +26,139 @@ import org.jfw.util.PageQueryResult;
import com.ekexiu.portal.basepo.BaseOrganization;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.pojo.EditOrganization;
@DAO
public interface OrgDao {
public abstract class OrgDao {
	
	@Insert
	int insert(Connection con, Organization org)throws SQLException;
	public abstract int insert(Connection con, Organization org)throws SQLException;
	
	@UpdateWith
	@From(Organization.class)
	int updateIsJoin(Connection con,String id,@Set String isJoin)throws SQLException;
	public abstract int updateIsJoin(Connection con,String id,@Set String isJoin)throws SQLException;
	
	@UpdateWith
	@From(Organization.class)
	int updateAuthStatus(Connection con,String id,@Set String authStatus)throws SQLException;
	public abstract int updateAuthStatus(Connection con,String id,@Set String authStatus)throws SQLException;
	
	@Update
	int update(Connection con,Organization org)throws SQLException;
	public abstract int update(Connection con,Organization org)throws SQLException;
	
	@Nullable
	@SelectOne
	Organization query(Connection con,String id) throws SQLException;
	public abstract Organization query(Connection con,String id) throws SQLException;
	
	public EditOrganization queryEditOrg(Connection con,String id) throws SQLException{
        int index = 1;
        String sql = "SELECT FOR_SHORT,ORG_URL,FOUND_TIME,PROVINCE,CITY,SUBJECT,INDUSTRY,ORG_SIZE,QUALIFICATION,IS_JOIN,AUTH_STATUS,ORG_ATTR,ID,NAME,ORG_TYPE,CREATE_TIME,MODIFY_TIME,DESCP FROM ORGANIZATION WHERE ID = ?";
        PreparedStatement ps = con.prepareStatement(sql);
        try{
            ps.setString(index++,id);
            ResultSet rs = ps.executeQuery();
            try{
                if(rs.next()){
                    EditOrganization editOrg = new EditOrganization();
                    String forShort = rs.getString(1);
                    if(rs.wasNull()){
                    	forShort = null;
                    }
                    editOrg.setForShort(forShort);
                    String orgUrl = rs.getString(2);
                    if(rs.wasNull()){
                    	orgUrl = null;
                    }
                    editOrg.setOrgUrl(orgUrl);
                    String foundTime = rs.getString(3);
                    if(rs.wasNull()){
                    	foundTime = null;
                    }
                    editOrg.setFoundTime(foundTime);
                    String province = rs.getString(4);
                    if(rs.wasNull()){
                    	province = null;
                    }
                    editOrg.setProvince(province);
                    String city = rs.getString(5);
                    if(rs.wasNull()){
                    	city = null;
                    }
                    editOrg.setCity(city);
                    String subject = rs.getString(6);
                    if(rs.wasNull()){
                    	subject = null;
                    }
                    editOrg.setSubject(subject);
                    String industry = rs.getString(7);
                    if(rs.wasNull()){
                    	industry = null;
                    }
                    editOrg.setIndustry(industry);
                    String orgSize = rs.getString(8);
                    if(rs.wasNull()){
                    	orgSize = null;
                    }
                    editOrg.setOrgSize(orgSize);
                    String qualification = rs.getString(9);
                    if(rs.wasNull()){
                    	qualification = null;
                    }
                    editOrg.setQualification(qualification);
                    editOrg.setIsJoin(rs.getString(10));
                    editOrg.setAuthStatus(rs.getString(11));
                    String orgAttr = rs.getString(12);
                    if(rs.wasNull()){
                    	orgAttr = null;
                    }
                    editOrg.setOrgAttr(orgAttr);
                    editOrg.setId(rs.getString(13));
                    editOrg.setName(rs.getString(14));
                    editOrg.setOrgType(rs.getString(15));
                    editOrg.setCreateTime(rs.getString(16));
                    editOrg.setModifyTime(rs.getString(17));
                    String descp = rs.getString(18);
                    if(rs.wasNull()){
                    	descp = null;
                    }
                    editOrg.setDescp(descp);
                    return editOrg;
                }else{
                    return null;
                }
            }finally{
                try{rs.close();}catch(Exception e1){}
            }
        }finally{
            try{ps.close();}catch(Exception e2){}
        }
    }
	
	@SelectList
	List<Organization> query(Connection con)throws SQLException;
	public abstract List<Organization> query(Connection con)throws SQLException;
	@LimitQuery
	List<Organization> limitQuery(Connection con, @Like String name,int rows)throws SQLException;
	public abstract List<Organization> limitQuery(Connection con, @Like String name,int rows)throws SQLException;
	
	@Nullable
	@QueryVal
	@Column(handlerClass=StringHandler.class,value="id")
	@From(Organization.class)
	String queryByName(Connection con,String name)throws SQLException;
	public abstract String queryByName(Connection con,String name)throws SQLException;
	
	@Nullable
	@QueryVal
	@Column(handlerClass=StringHandler.class,value="auth_status")
	@From(Organization.class)
	String queryAuthStatus(Connection con,String id)throws SQLException;
	public abstract String queryAuthStatus(Connection con,String id)throws SQLException;
	
	@PageSelect
	PageQueryResult<Organization> query(Connection con,@Nullable  @Like String name,@Nullable String orgType,int pageSize,int pageNo) throws SQLException;
	public abstract PageQueryResult<Organization> query(Connection con,@Nullable  @Like String name,@Nullable String orgType,int pageSize,int pageNo) throws SQLException;
	@From(Organization.class)
	@LimitQuery
	List<BaseOrganization> query(Connection con,@Nullable @Like String name,int rows) throws SQLException;
	public abstract List<BaseOrganization> query(Connection con,@Nullable @Like String name,int rows) throws SQLException;
	
	@From(Organization.class)
	@DeleteWith
	int delete(Connection con,String id)throws SQLException;
	public abstract int delete(Connection con,String id)throws SQLException;
}

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

@@ -124,7 +124,7 @@ public class Organization extends BaseOrganization implements CreateTimeSupporte
	public void setIsJoin(String isJoin) {
		this.isJoin = isJoin;
	}
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(1)",renewable=false)
	@Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(2)",renewable=false)
	public String getAuthStatus() {
		return authStatus;
	}

src/main/java/com/ekexiu/portal/pojo/EditOrganization.java

@@ -0,0 +1,16 @@
package com.ekexiu.portal.pojo;
import com.ekexiu.portal.po.Organization;
public class EditOrganization extends Organization {
	private boolean hasOrgLogo;
	public boolean isHasOrgLogo() {
		return hasOrgLogo;
	}
	public void setHasOrgLogo(boolean hasOrgLogo) {
		this.hasOrgLogo = hasOrgLogo;
	}
	
}

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

@@ -162,6 +162,21 @@ public class ImageService {
			return 0;
		}
	}
	
	/**
	 * 判断是否有企业logo
	 * @param id 企业ID
	 * @return 有企业logo返回true，否则返回false
	 */
	public boolean hasOrgLogo(String id) {
		String orgPath = this.orgPath+"/"+id+".jpg";
		File file = new File(orgPath);
		if(file.exists()){
			return true;
		}else{
			return false;
		}
	}
	private File getTemplateFielName(File path, String suffix) {
		File result = null;

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

@@ -17,6 +17,7 @@ import org.jfw.util.StringUtil;
import com.ekexiu.portal.dao.OrgDao;
import com.ekexiu.portal.po.Organization;
import com.ekexiu.portal.pojo.EditOrganization;
@Path("/org")
public class OrgService {
@@ -85,8 +86,10 @@ public class OrgService {
	
	@Get
	@Path("/{id}")
	public Organization query(@JdbcConn(false) Connection con ,@PathVar String id)throws SQLException{
		return this.orgDao.query(con, id);
	public EditOrganization query(@JdbcConn(false) Connection con ,@PathVar String id)throws SQLException{
		EditOrganization editOrg = this.orgDao.queryEditOrg(con, id);
		editOrg.setHasOrgLogo(this.imageService.hasOrgLogo(id));
		return editOrg;
	}
	
	@Get