ホーム エスクプローラ ヘルプ
登録 サインイン
jiapeng
/
portal-web
Watch 3
Star 0
Fork 0
コード 課題 0 プルリクエスト 0 コミット 226 リリース 0 Wiki
ソースを参照

1

jiapeng 7 年 前
親
32e2546baa
コミット
92d79bfe5e
共有19 個のファイルを変更した、330 個の追加 と 151 個の削除を含む
分割表示 差分情報を表示
  1. 18 9
      src/main/java/com/ekexiu/portal/dao/ArticleDao.java
  2. 152 121
      src/main/java/com/ekexiu/portal/dao/OrgDao.java
  3. 4 0
      src/main/java/com/ekexiu/portal/dao/PpaperDao.java
  4. 3 0
      src/main/java/com/ekexiu/portal/dao/PpatentDao.java
  5. 35 18
      src/main/java/com/ekexiu/portal/dao/ProfessorDao.java
  6. 3 0
      src/main/java/com/ekexiu/portal/dao/ResourceDao.java
  7. 9 0
      src/main/java/com/ekexiu/portal/po/Article.java
  8. 8 0
      src/main/java/com/ekexiu/portal/po/Organization.java
  9. 8 0
      src/main/java/com/ekexiu/portal/po/Ppaper.java
  10. 10 0
      src/main/java/com/ekexiu/portal/po/Ppatent.java
  11. 10 0
      src/main/java/com/ekexiu/portal/po/Professor.java
  12. 10 0
      src/main/java/com/ekexiu/portal/po/Resource.java
  13. 6 0
      src/main/java/com/ekexiu/portal/service/ArticleService.java
  14. 16 0
      src/main/java/com/ekexiu/portal/service/OrgService.java
  15. 5 0
      src/main/java/com/ekexiu/portal/service/PpaperService.java
  16. 5 0
      src/main/java/com/ekexiu/portal/service/PpatentServcie.java
  17. 5 0
      src/main/java/com/ekexiu/portal/service/ProfessorService.java
  18. 5 1
      src/main/java/com/ekexiu/portal/service/ResourceService.java
  19. 18 2
      src/main/resources/database.sql

+ 18 - 9
src/main/java/com/ekexiu/portal/dao/ArticleDao.java
ファイルの表示 

@ -128,7 +128,7 @@ public abstract class ArticleDao {
128 128 
		int index = 1;
129 129 
		boolean hasArticleId = null != articleId;
130 130 
		StringBuilder sql = new StringBuilder();
131 
		sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE");
131 
		sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
132 132 
		sql.append(" WHERE STATUS = '1'");
133 133 
		if(hasArticleId){
134 134 
			sql.append(" AND ARTICLE_ID != ?");

@ -191,6 +191,7 @@ public abstract class ArticleDao {
191 191 
                    article.setStatus(status);
192 192 
                    article.setCreateTime(rs.getString(13));
193 193 
                    article.setModifyTime(rs.getString(14));
194 
                    article.setShareId(rs.getLong(15));
194 195 
					articles.add(article);
195 196 
				}
196 197 
				return articles;

@ -208,7 +209,7 @@ public abstract class ArticleDao {
208 209 
		boolean hasOrgId = null != orgId;
209 210 
		boolean hasArticleId = null != articleId;
210 211 
		StringBuilder sql = new StringBuilder();
211 
		sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE");
212 
		sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
212 213 
		sql.append(" WHERE STATUS = '1'");
213 214 
		if(hasProId){
214 215 
			sql.append(" AND PROFESSOR_ID = ?");

@ -283,6 +284,7 @@ public abstract class ArticleDao {
283 284 
                    article.setStatus(status);
284 285 
                    article.setCreateTime(rs.getString(13));
285 286 
                    article.setModifyTime(rs.getString(14));
287 
                    article.setShareId(rs.getLong(15));
286 288 
					articles.add(article);
287 289 
				}
288 290 
				return articles;

@ -299,7 +301,7 @@ public abstract class ArticleDao {
299 301 
		boolean hasKeys = null != keys;
300 302 
		boolean hasArticleId = null != articleId;
301 303 
		StringBuilder sql = new StringBuilder();
302 
		sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE");
304 
		sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
303 305 
		sql.append(" WHERE STATUS = '1'");
304 306 
		if(hasArticleId){
305 307 
			sql.append(" AND ARTICLE_ID != ?");

@ -377,6 +379,7 @@ public abstract class ArticleDao {
377 379 
                    article.setStatus(status);
378 380 
                    article.setCreateTime(rs.getString(13));
379 381 
                    article.setModifyTime(rs.getString(14));
382 
                    article.setShareId(rs.getLong(15));
380 383 
					articles.add(article);
381 384 
				}
382 385 
				return articles;

@ -440,7 +443,7 @@ public abstract class ArticleDao {
440 443 
        if(firstPage){
441 444 
            queryResult.setPageNo(1);
442 445 
            sql = new StringBuilder();
443 
            sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE");
446 
            sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
444 447 
            sql.append(whereSql);
445 448 
            sql.append(" ORDER BY PUBLISH_TIME DESC");
446 449 
            sql.append(" LIMIT ").append(pageSize);

@ -456,7 +459,7 @@ public abstract class ArticleDao {
456 459 
            --pageNo;
457 460 
            int offset = (pageNo * pageSize);
458 461 
            sql = new StringBuilder();
459 
            sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE");
462 
            sql.append("SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE");
460 463 
            sql.append(whereSql);
461 464 
            sql.append(" ORDER BY PUBLISH_TIME DESC");
462 465 
            sql.append(" LIMIT ").append(pageSize).append(" OFFSET ").append(offset);

@ -529,6 +532,7 @@ public abstract class ArticleDao {
529 532 
                    article.setStatus(status);
530 533 
                    article.setCreateTime(rs.getString(14));
531 534 
                    article.setModifyTime(rs.getString(15));
535 
                    article.setShareId(rs.getLong(16));
532 536 
                    articles.add(article);
533 537 
                }
534 538 
                return queryResult;

@ -591,7 +595,7 @@ public abstract class ArticleDao {
591 595 
        if(firstPage){
592 596 
        	queryResult.setPageNo(1);
593 597 
        	sql = new StringBuilder();
594 
        	sql.append("(SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE WHERE STATUS IN('0','2')");
598 
        	sql.append("(SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE WHERE STATUS IN('0','2')");
595 599 
        	if(hasProfessorId){
596 600 
            	sql.append(" AND PROFESSOR_ID = ?");
597 601 
            }

@ -601,7 +605,7 @@ public abstract class ArticleDao {
601 605 
        	if(hasArticleTitle){
602 606 
        		sql.append(" AND ARTICLE_TITLE LIKE ?");
603 607 
        	}
604 
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE WHERE STATUS = '1'");
608 
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE WHERE STATUS = '1'");
605 609 
        	if(hasProfessorId){
606 610 
            	sql.append(" AND PROFESSOR_ID = ?");
607 611 
            }

@ -625,7 +629,7 @@ public abstract class ArticleDao {
625 629 
            --pageNo;
626 630 
            int offset = (pageNo * pageSize);
627 631 
            sql = new StringBuilder();
628 
            sql.append("(SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE WHERE STATUS IN('0','2')");
632 
            sql.append("(SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE WHERE STATUS IN('0','2')");
629 633 
        	if(hasProfessorId){
630 634 
            	sql.append(" AND PROFESSOR_ID = ?");
631 635 
            }

@ -635,7 +639,7 @@ public abstract class ArticleDao {
635 639 
        	if(hasArticleTitle){
636 640 
        		sql.append(" AND ARTICLE_TITLE LIKE ?");
637 641 
        	}
638 
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME FROM ARTICLE WHERE STATUS = '1'");
642 
        	sql.append(" ORDER BY MODIFY_TIME DESC) UNION ALL (SELECT ARTICLE_ID,PROFESSOR_ID,ARTICLE_TITLE,ARTICLE_CONTENT,SUBJECT,INDUSTRY,PUBLISH_TIME,ARTICLE_IMG,ORG_ID,ARTICLE_TYPE,ARTICLE_AGREE,PAGE_VIEWS,STATUS,CREATE_TIME,MODIFY_TIME,SHARE_ID FROM ARTICLE WHERE STATUS = '1'");
639 643 
        	if(hasProfessorId){
640 644 
            	sql.append(" AND PROFESSOR_ID = ?");
641 645 
            }

@ -728,6 +732,7 @@ public abstract class ArticleDao {
728 732 
                    article.setStatus(status);
729 733 
                    article.setCreateTime(rs.getString(14));
730 734 
                    article.setModifyTime(rs.getString(15));
735 
                    article.setShareId(rs.getLong(16));
731 736 
                    articles.add(article);
732 737 
                }
733 738 
                return queryResult;

@ -910,5 +915,9 @@ public abstract class ArticleDao {
910 915 
            try{ps.close();}catch(Exception e4){}
911 916 
        }
912 917 
    }
918
919 
	@SelectOne
920 
	@Nullable
921 
	public abstract Article query(Connection con ,long shareId)throws SQLException;
913 922
914 923 
}

+ 152 - 121
src/main/java/com/ekexiu/portal/dao/OrgDao.java
ファイルの表示 

@ -8,12 +8,15 @@ import org.jfw.apt.annotation.Nullable;
8 8 
import org.jfw.apt.orm.annotation.dao.Column;
9 9 
import org.jfw.apt.orm.annotation.dao.DAO;
10 10 
import org.jfw.apt.orm.annotation.dao.method.From;
11 
import org.jfw.apt.orm.annotation.dao.method.Or;
11 12 
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
12 13 
import org.jfw.apt.orm.annotation.dao.method.Select;
13 14 
import org.jfw.apt.orm.annotation.dao.method.SetSentence;
15 
import org.jfw.apt.orm.annotation.dao.method.Where;
14 16 
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
15 17 
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
16 18 
import org.jfw.apt.orm.annotation.dao.method.operator.LimitQuery;
19 
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
17 20 
import org.jfw.apt.orm.annotation.dao.method.operator.PageSelect;
18 21 
import org.jfw.apt.orm.annotation.dao.method.operator.QueryOne;
19 22 
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
 
@ -23,6 +26,7 @@ import org.jfw.apt.orm.annotation.dao.method.operator.Update;
23 26 
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
24 27 
import org.jfw.apt.orm.annotation.dao.param.Like;
25 28 
import org.jfw.apt.orm.annotation.dao.param.Set;
29 
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
26 30 
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
27 31 
import org.jfw.util.PageQueryResult;
28 32 
@ -32,161 +36,188 @@ import com.ekexiu.portal.pojo.EditOrganization;
32 36
33 37 
@DAO
34 38 
public abstract class OrgDao {
35
39
36 40 
	@Insert
37 
	public abstract int insert(Connection con, Organization org)throws SQLException;
38
41 
	public abstract int insert(Connection con, Organization org) throws SQLException;
42
39 43 
	@UpdateWith
40 44 
	@From(Organization.class)
41 
	public abstract int updateIsJoin(Connection con,String id,@Set String isJoin)throws SQLException;
42
45 
	public abstract int updateIsJoin(Connection con, String id, @Set String isJoin) throws SQLException;
46
43 47 
	@UpdateWith
44 48 
	@From(Organization.class)
45 
	public abstract int updateAuthStatus(Connection con,String id,@Set String authStatus)throws SQLException;
46
49 
	public abstract int updateAuthStatus(Connection con, String id, @Set String authStatus) throws SQLException;
50
47 51 
	@Update
48 
	public abstract int update(Connection con,Organization org)throws SQLException;
49
52 
	public abstract int update(Connection con, Organization org) throws SQLException;
50 53
51 54 
	@Nullable
52 55 
	@SelectOne
53 
	public abstract Organization query(Connection con,String id) throws SQLException;
54
56 
	public abstract Organization query(Connection con, String id) throws SQLException;
57
55 58 
	@Nullable
56 59 
	@QueryOne
57 60 
	@From(Organization.class)
58 61 
	@Select(Organization.class)
59 
	public abstract EditOrganization queryEditOrg(Connection con,String id) throws SQLException;
60
61 
//	public EditOrganization queryEditOrg(Connection con,String id) throws SQLException{
62 
//        int index = 1;
63 
//        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 = ?";
64 
//        PreparedStatement ps = con.prepareStatement(sql);
65 
//        try{
66 
//            ps.setString(index++,id);
67 
//            ResultSet rs = ps.executeQuery();
68 
//            try{
69 
//                if(rs.next()){
70 
//                    EditOrganization editOrg = new EditOrganization();
71 
//                    String forShort = rs.getString(1);
72 
//                    if(rs.wasNull()){
73 
//                    	forShort = null;
74 
//                    }
75 
//                    editOrg.setForShort(forShort);
76 
//                    String orgUrl = rs.getString(2);
77 
//                    if(rs.wasNull()){
78 
//                    	orgUrl = null;
79 
//                    }
80 
//                    editOrg.setOrgUrl(orgUrl);
81 
//                    String foundTime = rs.getString(3);
82 
//                    if(rs.wasNull()){
83 
//                    	foundTime = null;
84 
//                    }
85 
//                    editOrg.setFoundTime(foundTime);
86 
//                    String province = rs.getString(4);
87 
//                    if(rs.wasNull()){
88 
//                    	province = null;
89 
//                    }
90 
//                    editOrg.setProvince(province);
91 
//                    String city = rs.getString(5);
92 
//                    if(rs.wasNull()){
93 
//                    	city = null;
94 
//                    }
95 
//                    editOrg.setCity(city);
96 
//                    String subject = rs.getString(6);
97 
//                    if(rs.wasNull()){
98 
//                    	subject = null;
99 
//                    }
100 
//                    editOrg.setSubject(subject);
101 
//                    String industry = rs.getString(7);
102 
//                    if(rs.wasNull()){
103 
//                    	industry = null;
104 
//                    }
105 
//                    editOrg.setIndustry(industry);
106 
//                    String orgSize = rs.getString(8);
107 
//                    if(rs.wasNull()){
108 
//                    	orgSize = null;
109 
//                    }
110 
//                    editOrg.setOrgSize(orgSize);
111 
//                    String qualification = rs.getString(9);
112 
//                    if(rs.wasNull()){
113 
//                    	qualification = null;
114 
//                    }
115 
//                    editOrg.setQualification(qualification);
116 
//                    editOrg.setIsJoin(rs.getString(10));
117 
//                    editOrg.setAuthStatus(rs.getString(11));
118 
//                    String orgAttr = rs.getString(12);
119 
//                    if(rs.wasNull()){
120 
//                    	orgAttr = null;
121 
//                    }
122 
//                    editOrg.setOrgAttr(orgAttr);
123 
//                    editOrg.setId(rs.getString(13));
124 
//                    editOrg.setName(rs.getString(14));
125 
//                    String orgType = rs.getString(15);
126 
//                    if(rs.wasNull()){
127 
//                    	orgType = null;
128 
//                    }
129 
//                    editOrg.setOrgType(orgType);
130 
//                    editOrg.setCreateTime(rs.getString(16));
131 
//                    editOrg.setModifyTime(rs.getString(17));
132 
//                    String descp = rs.getString(18);
133 
//                    if(rs.wasNull()){
134 
//                    	descp = null;
135 
//                    }
136 
//                    editOrg.setDescp(descp);
137 
//                    return editOrg;
138 
//                }else{
139 
//                    return null;
140 
//                }
141 
//            }finally{
142 
//                try{rs.close();}catch(Exception e1){}
143 
//            }
144 
//        }finally{
145 
//            try{ps.close();}catch(Exception e2){}
146 
//        }
147 
//    }
148 
//
62 
	public abstract EditOrganization queryEditOrg(Connection con, String id) throws SQLException;
63
64 
	// public EditOrganization queryEditOrg(Connection con,String id) throws
65 
	// SQLException{
66 
	// int index = 1;
67 
	// String sql = "SELECT
68 
	// 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
69 
	// FROM ORGANIZATION WHERE ID = ?";
70 
	// PreparedStatement ps = con.prepareStatement(sql);
71 
	// try{
72 
	// ps.setString(index++,id);
73 
	// ResultSet rs = ps.executeQuery();
74 
	// try{
75 
	// if(rs.next()){
76 
	// EditOrganization editOrg = new EditOrganization();
77 
	// String forShort = rs.getString(1);
78 
	// if(rs.wasNull()){
79 
	// forShort = null;
80 
	// }
81 
	// editOrg.setForShort(forShort);
82 
	// String orgUrl = rs.getString(2);
83 
	// if(rs.wasNull()){
84 
	// orgUrl = null;
85 
	// }
86 
	// editOrg.setOrgUrl(orgUrl);
87 
	// String foundTime = rs.getString(3);
88 
	// if(rs.wasNull()){
89 
	// foundTime = null;
90 
	// }
91 
	// editOrg.setFoundTime(foundTime);
92 
	// String province = rs.getString(4);
93 
	// if(rs.wasNull()){
94 
	// province = null;
95 
	// }
96 
	// editOrg.setProvince(province);
97 
	// String city = rs.getString(5);
98 
	// if(rs.wasNull()){
99 
	// city = null;
100 
	// }
101 
	// editOrg.setCity(city);
102 
	// String subject = rs.getString(6);
103 
	// if(rs.wasNull()){
104 
	// subject = null;
105 
	// }
106 
	// editOrg.setSubject(subject);
107 
	// String industry = rs.getString(7);
108 
	// if(rs.wasNull()){
109 
	// industry = null;
110 
	// }
111 
	// editOrg.setIndustry(industry);
112 
	// String orgSize = rs.getString(8);
113 
	// if(rs.wasNull()){
114 
	// orgSize = null;
115 
	// }
116 
	// editOrg.setOrgSize(orgSize);
117 
	// String qualification = rs.getString(9);
118 
	// if(rs.wasNull()){
119 
	// qualification = null;
120 
	// }
121 
	// editOrg.setQualification(qualification);
122 
	// editOrg.setIsJoin(rs.getString(10));
123 
	// editOrg.setAuthStatus(rs.getString(11));
124 
	// String orgAttr = rs.getString(12);
125 
	// if(rs.wasNull()){
126 
	// orgAttr = null;
127 
	// }
128 
	// editOrg.setOrgAttr(orgAttr);
129 
	// editOrg.setId(rs.getString(13));
130 
	// editOrg.setName(rs.getString(14));
131 
	// String orgType = rs.getString(15);
132 
	// if(rs.wasNull()){
133 
	// orgType = null;
134 
	// }
135 
	// editOrg.setOrgType(orgType);
136 
	// editOrg.setCreateTime(rs.getString(16));
137 
	// editOrg.setModifyTime(rs.getString(17));
138 
	// String descp = rs.getString(18);
139 
	// if(rs.wasNull()){
140 
	// descp = null;
141 
	// }
142 
	// editOrg.setDescp(descp);
143 
	// return editOrg;
144 
	// }else{
145 
	// return null;
146 
	// }
147 
	// }finally{
148 
	// try{rs.close();}catch(Exception e1){}
149 
	// }
150 
	// }finally{
151 
	// try{ps.close();}catch(Exception e2){}
152 
	// }
153 
	// }
154 
	//
149 155 
	@SelectList
150 
	public abstract List<Organization> query(Connection con)throws SQLException;
156 
	public abstract List<Organization> query(Connection con) throws SQLException;
157
151 158 
	@LimitQuery
152 
	public abstract List<Organization> limitQuery(Connection con, @Like String name,int rows)throws SQLException;
153
159 
	public abstract List<Organization> limitQuery(Connection con, @Like String name, int rows) throws SQLException;
160
154 161 
	@LimitQuery
155 162 
	@From(Organization.class)
156 163 
	@OrderBy("ORDER BY NAME")
157 164 
	@Select(Organization.class)
158 
	public abstract List<EditOrganization> queryLimit(Connection con,@Like String name,int rows)throws SQLException;
159
165 
	public abstract List<EditOrganization> queryLimit(Connection con, @Like String name, int rows) throws SQLException;
166
160 167 
	@Nullable
161 168 
	@QueryVal
162 
	@Column(handlerClass=StringHandler.class,value="id")
169 
	@Column(handlerClass = StringHandler.class, value = "id")
163 170 
	@From(Organization.class)
164 
	public abstract String queryByName(Connection con,String name)throws SQLException;
165
171 
	public abstract String queryByName(Connection con, String name) throws SQLException;
172
166 173 
	@Nullable
167 174 
	@QueryVal
168 
	@Column(handlerClass=StringHandler.class,value="auth_status")
175 
	@Column(handlerClass = StringHandler.class, value = "auth_status")
169 176 
	@From(Organization.class)
170 
	public abstract String queryAuthStatus(Connection con,String id)throws SQLException;
171
177 
	public abstract String queryAuthStatus(Connection con, String id) throws SQLException;
178
172 179 
	@PageSelect
173 
	public abstract PageQueryResult<Organization> query(Connection con,@Nullable  @Like String name,@Nullable String orgType,int pageSize,int pageNo) throws SQLException;
180 
	public abstract PageQueryResult<Organization> query(Connection con, @Nullable @Like String name, @Nullable String orgType, int pageSize, int pageNo)
181 
			throws SQLException;
174 182
175 183 
	@From(Organization.class)
176 184 
	@LimitQuery
177 
	public abstract List<BaseOrganization> query(Connection con,@Nullable @Like String name,int rows) throws SQLException;
178
185 
	public abstract List<BaseOrganization> query(Connection con, @Nullable @Like String name, int rows) throws SQLException;
186
179 187 
	@From(Organization.class)
180 188 
	@DeleteWith
181 
	public abstract int delete(Connection con,String id)throws SQLException;
182
183
189 
	public abstract int delete(Connection con, String id) throws SQLException;
190
184 191 
	@From(Organization.class)
185 192 
	@UpdateWith
186 
	public abstract int updateSortNum(Connection con,String id ,@Set long sortNum)throws SQLException;
193 
	public abstract int updateSortNum(Connection con, String id, @Set long sortNum) throws SQLException;
194
187 195 
	@From(Organization.class)
188 196 
	@UpdateWith
189 197 
	@SetSentence("PAGE_VIEWS = PAGE_VIEWS + 1")
190 
	public abstract int incPageViews(Connection con,String id)throws SQLException;
191
198 
	public abstract int incPageViews(Connection con, String id) throws SQLException;
199
200 
	@SelectOne
201 
	@Nullable
202 
	public abstract Organization query(Connection con, long shareId) throws SQLException;
203
204 
	@PageQuery
205 
	@From(Organization.class)
206 
	@OrderBy("ORDER BY SORT_NUM DESC,MODIFY_TIME DESC")
207 
	@Select(Organization.class)
208 
	@Or
209 
	public abstract PageQueryResult<EditOrganization> query(Connection con,
210 
			@SqlColumn(handlerClass = StringHandler.class, value = { "(NAME LIKE ? AND IS_JOIN ='1')", "(FOR_SHORT LIKE ? AND IS_JOIN ='1')",
211 
					"(DESCP LIKE ?  AND IS_JOIN ='1')", "(SUBJECT LIKE ? AND IS_JOIN ='1') ", "(industry LIKE ?  AND IS_JOIN ='1')",
212 
					"(ID IN (SELECT ORG_ID FROM RESOURCE WHERE RESOURCE_TYPE='2' AND RESOURCE_NAME LIKE ?) AND IS_JOIN ='1')",
213 
					"(ID IN (SELECT ORG_ID FROM ARTICLE WHERE ARTICLE_TYPE='2' AND ARTICLE_TITLE LIKE ?) AND IS_JOIN ='1')" }) String kw,
214 
			int pageSize, int pageNo) throws SQLException;
215
216 
	@PageQuery
217 
	@From(Organization.class)
218 
	@OrderBy("ORDER BY SORT_NUM DESC,MODIFY_TIME DESC")
219 
	@Select(Organization.class)
220 
	@Where("IS_JOIN ='1'")
221 
	public abstract PageQueryResult<EditOrganization> query(Connection con, int pageSize, int pageNo) throws SQLException;
222
192 223 
}

+ 4 - 0
src/main/java/com/ekexiu/portal/dao/PpaperDao.java
ファイルの表示 

@ -67,5 +67,9 @@ public interface PpaperDao {
67 67 
	@Or
68 68 
	PageQueryResult<Ppaper> query(Connection con,@Alias({"name","authors","keywords"}) @Like String cnt,int pageSize,int pageNo) throws SQLException;
69 69
70
71 
	@SelectOne
72 
	@Nullable
73 
	Ppaper query(Connection con,long shareId)throws SQLException;
70 74
71 75 
}

+ 3 - 0
src/main/java/com/ekexiu/portal/dao/PpatentDao.java
ファイルの表示 

@ -65,4 +65,7 @@ public interface PpatentDao {
65 65 
	@OrderBy(" ORDER BY SORT_NUM DESC,CREATE_TIME DESC,ID DESC")
66 66 
	PageQueryResult<Ppatent> query(Connection con,@Alias({"code","authors","name","keywords"}) @Like String cnt,int pageSize,int pageNo) throws SQLException;
67 67
68 
	@SelectOne
69 
	@Nullable
70 
	Ppatent query(Connection con,long shareId)throws SQLException;
68 71 
}

+ 35 - 18
src/main/java/com/ekexiu/portal/dao/ProfessorDao.java
ファイルの表示 

@ -69,6 +69,10 @@ public abstract class ProfessorDao {
69 69 
		}
70 70 
	}
71 71
72 
	@SelectOne
73 
	@Nullable
74 
	public abstract Professor query(Connection con,long shareId)throws SQLException;
75
72 76 
	@UpdateWith
73 77 
	@From(Professor.class)
74 78 
	public abstract int updatePhone(Connection con, String id, @Set String phone) throws SQLException;

@ -172,7 +176,7 @@ public abstract class ProfessorDao {
172 176
173 177 
	public List<EditProfessor> queryInvite(Connection con, String id) throws SQLException{
174 178 
		int index = 1;
175 
        String sql = "SELECT OFFICE,ADDRESS,ORG_ID,O.NAME,TITLE,AUTHENTICATION,P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_AUTH "
179 
        String sql = "SELECT OFFICE,ADDRESS,ORG_ID,O.NAME,TITLE,AUTHENTICATION,P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_AUTH,P.SHARE_ID "
176 180 
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION O ON P.ORG_ID=O.ID "
177 181 
        		+ " INNER JOIN LUSER L ON P.ID=L.ID WHERE L.INVITER_ID = ? ORDER BY P.CREATE_TIME DESC,P.ID";
178 182 
        PreparedStatement ps = con.prepareStatement(sql);

@ -216,6 +220,7 @@ public abstract class ProfessorDao {
216 220 
                    professor.setId(rs.getString(9));
217 221 
                    professor.setName(rs.getString(10));
218 222 
                    professor.setOrgAuth(rs.getString(11));
223 
                    professor.setShareId(rs.getLong(12));
219 224 
                    professors.add(professor);
220 225 
                }
221 226 
                return professors;

@ -275,7 +280,7 @@ public abstract class ProfessorDao {
275 280 
	public EditProfessor queryBaseInfo(Connection con, String id) throws SQLException {
276 281 
		int index = 1;
277 282 
        String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,"
278 
        		+ " P.ID,P.NAME,P.ADDRESS,P.ORG_AUTH,ORGANIZATION.NAME,P.ORG_ID,P.SCORE_PERCENT "
283 
        		+ " P.ID,P.NAME,P.ADDRESS,P.ORG_AUTH,ORGANIZATION.NAME,P.ORG_ID,P.SCORE_PERCENT,P.SHARE_ID "
279 284 
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
280 285 
        PreparedStatement ps = con.prepareStatement(sql);
281 286 
        try{

@ -329,6 +334,7 @@ public abstract class ProfessorDao {
329 334 
                    	scorePercent = null;
330 335 
                    }
331 336 
                    professor.setScorePercent(scorePercent);
337 
                    professor.setShareId(rs.getLong(14));
332 338 
                    return professor;
333 339 
                }else{
334 340 
                    return null;

@ -343,7 +349,7 @@ public abstract class ProfessorDao {
343 349
344 350 
	public List<EditProfessor> queryByName(Connection con,String name,int total) throws SQLException{
345 351 
        int index = 1;
346 
        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 "
352 
        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,P.SHARE_ID "
347 353 
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.NAME LIKE ? ORDER BY P.SCORE_PERCENT DESC LIMIT " + total;
348 354 
        PreparedStatement ps = con.prepareStatement(sql);
349 355 
        try{

@ -398,6 +404,7 @@ public abstract class ProfessorDao {
398 404 
                    	scorePercent = null;
399 405 
                    }
400 406 
                    professor.setScorePercent(scorePercent);
407 
                    professor.setShareId(rs.getLong(14));
401 408 
                    editProfessors.add(professor);
402 409 
                }
403 410 
                return editProfessors;

@ -419,7 +426,7 @@ public abstract class ProfessorDao {
419 426 
	public EditProfessor queryEditBaseInfo(Connection con, String id) throws SQLException {
420 427 
		int index = 1;
421 428 
        String sql = "SELECT P.OFFICE,P.DEPARTMENT,P.TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,"
422 
        		+ " P.ID,P.NAME,P.ADDRESS,P.STAR_LEVEL,P.CONSULT_COUNT,P.ORG_AUTH,ORGANIZATION.NAME "
429 
        		+ " P.ID,P.NAME,P.ADDRESS,P.STAR_LEVEL,P.CONSULT_COUNT,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID "
423 430 
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
424 431 
        PreparedStatement ps = con.prepareStatement(sql);
425 432 
        try{

@ -465,6 +472,7 @@ public abstract class ProfessorDao {
465 472 
                    	orgName = null;
466 473 
                    }
467 474 
                    professor.setOrgName(orgName);
475 
                    professor.setShareId(rs.getLong(14));
468 476 
                    return professor;
469 477 
                }else{
470 478 
                    return null;

@ -484,7 +492,7 @@ public abstract class ProfessorDao {
484 492 
	public Professor query(Connection con, String id) throws SQLException{
485 493 
        int index = 1;
486 494 
        String sql = "SELECT P.OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,P.DEPARTMENT,ORG_ID,P.TITLE,AUTHENTICATION,AUTH_TYPE,"
487 
        		+ "P.AUTH_STATUS,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.PHONE,P.EMAIL,P.ORG_AUTH,ORGANIZATION.NAME "
495 
        		+ "P.AUTH_STATUS,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.PHONE,P.EMAIL,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID "
488 496 
        		+ "FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID = ORGANIZATION.ID WHERE P.ID = ?";
489 497 
        PreparedStatement ps = con.prepareStatement(sql);
490 498 
        try{

@ -562,6 +570,7 @@ public abstract class ProfessorDao {
562 570 
                    }
563 571 
                    organization.setName(orgName);
564 572 
                    professor.setOrganization(organization);
573 
                    professor.setShareId(rs.getLong(20));
565 574 
                    return professor;
566 575 
                }else{
567 576 
                    return null;

@ -576,7 +585,7 @@ public abstract class ProfessorDao {
576 585
577 586 
	public List<Professor> query(Connection con) throws SQLException{
578 587 
        String sql = "SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.PROVINCE,P.ADDRESS,DEPARTMENT,ORG_ID,organization.NAME AS ONAME,"
579 
        		+ " TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME AS PNAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH "
588 
        		+ " TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME AS PNAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH,P.SHARE_ID "
580 589 
        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=organization.ID ORDER BY ONAME,P.ID";
581 590 
        PreparedStatement ps = con.prepareStatement(sql);
582 591 
        try{

@ -641,6 +650,7 @@ public abstract class ProfessorDao {
641 650 
                    professor.setCreateTime(rs.getString(16));
642 651 
                    professor.setModifyTime(rs.getString(17));
643 652 
                    professor.setOrgAuth(rs.getString(18));
653 
                    professor.setShareId(rs.getLong(19));
644 654 
                    professors.add(professor);
645 655 
                }
646 656 
                return professors;

@ -692,7 +702,7 @@ public abstract class ProfessorDao {
692 702 
        boolean firstPage = (1 == pageNo);
693 703 
        if(firstPage){
694 704 
            queryResult.setPageNo(1);
695 
            sql = "SELECT OFFICE,DEPARTMENT,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,ID,NAME,ADDRESS,ORG_AUTH FROM PROFESSOR";
705 
            sql = "SELECT OFFICE,DEPARTMENT,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,ID,NAME,ADDRESS,ORG_AUTH,SHARE_ID FROM PROFESSOR";
696 706 
            sql = sql + whereSql;
697 707 
            sql = sql + " ORDER BY AUTH_TYPE DESC,ID";
698 708 
            sql = sql + " LIMIT " + pageSize;

@ -756,6 +766,7 @@ public abstract class ProfessorDao {
756 766 
                	}
757 767 
                    professor.setAddress(address);
758 768 
                    professor.setOrgAuth(rs.getString(10));
769 
                    professor.setShareId(rs.getLong(11));
759 770 
                    professors.add(professor);
760 771 
                }
761 772 
                return queryResult;

@ -771,7 +782,7 @@ public abstract class ProfessorDao {
771 782 
        int index = 1;
772 783 
        boolean hasOrgAuth = null != orgAuth;
773 784 
        StringBuilder sql = new StringBuilder();
774 
        sql.append("SELECT OFFICE,DEPARTMENT,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,ID,NAME,ADDRESS,ORG_AUTH FROM PROFESSOR");
785 
        sql.append("SELECT OFFICE,DEPARTMENT,TITLE,AUTHENTICATION,AUTH_TYPE,AUTH_STATUS,ID,NAME,ADDRESS,ORG_AUTH,SHARE_ID FROM PROFESSOR");
775 786 
        sql.append(" WHERE ORG_ID = ?");
776 787 
        if(hasOrgAuth){
777 788 
            sql.append(" AND ORG_AUTH = ?");

@ -818,6 +829,7 @@ public abstract class ProfessorDao {
818 829 
                	}
819 830 
                    professor.setAddress(address);
820 831 
                    professor.setOrgAuth(rs.getString(10));
832 
                    professor.setShareId(rs.getLong(11));
821 833 
                    professors.add(professor);
822 834 
                }
823 835 
                return professors;

@ -965,7 +977,7 @@ public abstract class ProfessorDao {
965 977 
		if (1 == pageNo) {
966 978 
			queryResult.setPageNo(1);
967 979 
			sql = new StringBuilder();
968 
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME"
980 
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID"
969 981 
	        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
970 982 
			if (whereSql.length() > 0) {
971 983 
				sql.append(whereSql);

@ -984,7 +996,7 @@ public abstract class ProfessorDao {
984 996 
			--pageNo;
985 997 
			int offset = (pageNo * pageSize);
986 998 
			sql = new StringBuilder();
987 
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME"
999 
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID"
988 1000 
	        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
989 1001 
			if (whereSql.length() > 0) {
990 1002 
				sql.append(whereSql);

@ -1031,6 +1043,7 @@ public abstract class ProfessorDao {
1031 1043 
                    	orgName = null;
1032 1044 
                    }
1033 1045 
                    professor.setOrgName(orgName);
1046 
                    professor.setShareId(rs.getLong(12));
1034 1047 
                    professors.add(professor);
1035 1048 
				}
1036 1049 
				return queryResult;

@ -1160,7 +1173,7 @@ public abstract class ProfessorDao {
1160 1173 
		if (1 == pageNo) {
1161 1174 
			queryResult.setPageNo(1);
1162 1175 
			sql = new StringBuilder();
1163 
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME"
1176 
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID"
1164 1177 
	        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
1165 1178 
			if (whereSql.length() > 0) {
1166 1179 
				sql.append(whereSql);

@ -1179,7 +1192,7 @@ public abstract class ProfessorDao {
1179 1192 
			--pageNo;
1180 1193 
			int offset = (pageNo * pageSize);
1181 1194 
			sql = new StringBuilder();
1182 
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME"
1195 
			sql.append("SELECT OFFICE,P.ADDRESS,TITLE,AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,ORG_ID,P.ORG_AUTH,ORGANIZATION.NAME,P.SHARE_ID"
1183 1196 
	        		+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=ORGANIZATION.ID ");
1184 1197 
			if (whereSql.length() > 0) {
1185 1198 
				sql.append(whereSql);

@ -1254,6 +1267,7 @@ public abstract class ProfessorDao {
1254 1267 
                    	orgName = null;
1255 1268 
                    }
1256 1269 
                    professor.setOrgName(orgName);
1270 
                    professor.setShareId(rs.getLong(12));
1257 1271 
                    professors.add(professor);
1258 1272 
				}
1259 1273 
				return queryResult;

@ -1375,7 +1389,7 @@ public abstract class ProfessorDao {
1375 1389 
			queryResult.setPageNo(1);
1376 1390 
			sql = new StringBuilder();
1377 1391 
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORGANIZATION.NAME,TITLE,"
1378 
					+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT,P.ORG_AUTH "
1392 
					+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT,P.ORG_AUTH,P.SHARE_ID "
1379 1393 
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON ORG_ID=ORGANIZATION.ID ");
1380 1394 
			if (whereSql.length() > 0) {
1381 1395 
				sql.append(whereSql);

@ -1395,7 +1409,7 @@ public abstract class ProfessorDao {
1395 1409 
			int offset = (pageNo * pageSize);
1396 1410 
			sql = new StringBuilder();
1397 1411 
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORGANIZATION.NAME,TITLE,"
1398 
					+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT,P.ORG_AUTH "
1412 
					+ " AUTHENTICATION,AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,STAR_LEVEL,CONSULT_COUNT,P.ORG_AUTH,P.SHARE_ID "
1399 1413 
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON ORG_ID=ORGANIZATION.ID ");
1400 1414 
			if (whereSql.length() > 0) {
1401 1415 
				sql.append(whereSql);

@ -1482,6 +1496,7 @@ public abstract class ProfessorDao {
1482 1496 
					professor.setStarLevel(rs.getBigDecimal(13));
1483 1497 
					professor.setConsultCount(rs.getInt(14));
1484 1498 
					professor.setOrgAuth(rs.getString(15));
1499 
					professor.setShareId(rs.getLong(16));
1485 1500 
					professors.add(professor);
1486 1501 
				}
1487 1502 
				return queryResult;

@ -1579,7 +1594,7 @@ public abstract class ProfessorDao {
1579 1594 
			queryResult.setPageNo(1);
1580 1595 
			sql = new StringBuilder();
1581 1596 
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORG_ID,organization.NAME,"
1582 
					+ " TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH "
1597 
					+ " TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH,P.SHARE_ID "
1583 1598 
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=organization.ID ");
1584 1599 
			if (whereSql.length() > 0) {
1585 1600 
				sql.append(whereSql);

@ -1599,7 +1614,7 @@ public abstract class ProfessorDao {
1599 1614 
			int offset = (pageNo * pageSize);
1600 1615 
			sql = new StringBuilder();
1601 1616 
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,ORG_ID,organization.NAME,"
1602 
					+ " TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH "
1617 
					+ " TITLE,AUTHENTICATION,P.ID,P.NAME,P.DESCP,P.CREATE_TIME,P.MODIFY_TIME,P.ORG_AUTH,P.SHARE_ID "
1603 1618 
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION ON P.ORG_ID=organization.ID ");
1604 1619 
			if (whereSql.length() > 0) {
1605 1620 
				sql.append(whereSql);

@ -1689,6 +1704,7 @@ public abstract class ProfessorDao {
1689 1704 
					professor.setCreateTime(rs.getString(13));
1690 1705 
					professor.setModifyTime(rs.getString(14));
1691 1706 
					professor.setOrgAuth(rs.getString(15));
1707 
					professor.setShareId(rs.getLong(16));
1692 1708 
					professors.add(professor);
1693 1709 
				}
1694 1710 
				return queryResult;

@ -1793,7 +1809,7 @@ public abstract class ProfessorDao {
1793 1809 
			queryResult.setPageNo(1);
1794 1810 
			sql = new StringBuilder();
1795 1811 
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,O.NAME,TITLE,AUTHENTICATION,"
1796 
					+ " P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME,P.ORG_AUTH "
1812 
					+ " P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME,P.ORG_AUTH,P.SHARE_ID "
1797 1813 
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION O ON P.ORG_ID=O.ID LEFT JOIN LUSER L ON P.ID=L.ID");
1798 1814 
			if (whereSql.length() > 0) {
1799 1815 
				sql.append(whereSql);

@ -1813,7 +1829,7 @@ public abstract class ProfessorDao {
1813 1829 
			int offset = (pageNo * pageSize);
1814 1830 
			sql = new StringBuilder();
1815 1831 
			sql.append("SELECT OFFICE,P.SUBJECT,P.INDUSTRY,P.ADDRESS,DEPARTMENT,O.NAME,TITLE,AUTHENTICATION,"
1816 
					+ " P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME,P.ORG_AUTH "
1832 
					+ " P.AUTH_TYPE,P.AUTH_STATUS,P.ID,P.NAME,P.EMAIL,P.PHONE,L.ACTIVE_TIME,P.ORG_AUTH,P.SHARE_ID "
1817 1833 
					+ " FROM PROFESSOR P LEFT JOIN ORGANIZATION O ON P.ORG_ID=O.ID LEFT JOIN LUSER L ON P.ID=L.ID");
1818 1834 
			if (whereSql.length() > 0) {
1819 1835 
				sql.append(whereSql);

@ -1897,6 +1913,7 @@ public abstract class ProfessorDao {
1897 1913 
					userInfo.setActiveTime(rs.getString(15));
1898 1914 
					userInfo.setActiveState(!(rs.getString(15)==null));
1899 1915 
					userInfo.setOrgAuth(rs.getString(16));
1916 
					userInfo.setShareId(rs.getLong(17));
1900 1917 
					userInfos.add(userInfo);
1901 1918 
				}
1902 1919 
				return queryResult;

+ 3 - 0
src/main/java/com/ekexiu/portal/dao/ResourceDao.java
ファイルの表示 

@ -1775,4 +1775,7 @@ public abstract class ResourceDao {
1775 1775 
        }
1776 1776 
    }
1777 1777
1778 
	@SelectOne
1779 
	@Nullable
1780 
	public abstract Resource query(Connection con,long shareId)throws SQLException;
1778 1781 
}

+ 9 - 0
src/main/java/com/ekexiu/portal/po/Article.java
ファイルの表示 

@ -30,6 +30,7 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
30 30 
	private int articleAgree;
31 31 
	private int pageViews;
32 32 
	private String status;
33 
	private long shareId;
33 34 
	private EditProfessor professor;
34 35 
	private Organization organization;
35 36 
	private EditOrganization editOrganization;

@ -155,5 +156,13 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
155 156 
	public void setStatus(String status) {
156 157 
		this.status = status;
157 158 
	}
159 
	@Column(DE.bigSerial)
160 
	public long getShareId() {
161 
		return shareId;
162 
	}
163 
	public void setShareId(long shareId) {
164 
		this.shareId = shareId;
165 
	}
166
158 167
159 168 
}

+ 8 - 0
src/main/java/com/ekexiu/portal/po/Organization.java
ファイルの表示 

@ -84,6 +84,7 @@ public class Organization extends BaseOrganization implements CreateTimeSupporte
84 84 
	 * 浏览量
85 85 
	 */
86 86 
	private long pageViews;
87 
	private long shareId;
87 88
88 89
89 90 
	@Column(value=DE.String_de,dbType="VARCHAR(20)")
 
@ -230,6 +231,13 @@ public class Organization extends BaseOrganization implements CreateTimeSupporte
230 231 
	public void setPageViews(long pageViews) {
231 232 
		this.pageViews = pageViews;
232 233 
	}
234 
	@Column(DE.bigSerial)
235 
	public long getShareId() {
236 
		return shareId;
237 
	}
238 
	public void setShareId(long shareId) {
239 
		this.shareId = shareId;
240 
	}
233 241
234 242
235 243

+ 8 - 0
src/main/java/com/ekexiu/portal/po/Ppaper.java
ファイルの表示 

@ -23,6 +23,7 @@ public class Ppaper implements CreateTimeSupported {
23 23 
	private String createTime;
24 24 
	private String authors;
25 25 
	private long sortNum;
26 
	private long shareId;
26 27
27 28
28 29 
	public String getCreateTime() {

@ -116,6 +117,13 @@ public class Ppaper implements CreateTimeSupported {
116 117 
	public void setRef_param(String ref_param) {
117 118 
		this.ref_param = ref_param;
118 119 
	}
120 
	@Column(DE.bigSerial)
121 
	public long getShareId() {
122 
		return shareId;
123 
	}
124 
	public void setShareId(long shareId) {
125 
		this.shareId = shareId;
126 
	}
119 127
120 128
121 129

+ 10 - 0
src/main/java/com/ekexiu/portal/po/Ppatent.java
ファイルの表示 

@ -24,6 +24,7 @@ public class Ppatent implements CreateTimeSupported {
24 24 
	private String createTime;
25 25 
	private String authors;
26 26 
	private long sortNum;
27 
	private long shareId;
27 28
28 29 
	public String getCreateTime() {
29 30 
		return createTime;

@ -149,5 +150,14 @@ public class Ppatent implements CreateTimeSupported {
149 150 
	public void setKeywords(String keywords) {
150 151 
		this.keywords = keywords;
151 152 
	}
153 
	@Column(DE.bigSerial)
154 
	public long getShareId() {
155 
		return shareId;
156 
	}
157
158 
	public void setShareId(long shareId) {
159 
		this.shareId = shareId;
160 
	}
152 161
162
153 163 
}

+ 10 - 0
src/main/java/com/ekexiu/portal/po/Professor.java
ファイルの表示 

@ -54,6 +54,7 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
54 54 
	private Integer scoreValue;
55 55 
	private Integer growthValue;
56 56 
	private String scorePercent;
57 
	private long shareId;
57 58
58 59 
	private Organization organization;
59 60 
	private List<Resource> resources;
 
@ -332,5 +333,14 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
332 333 
	public void setScorePercent(String scorePercent) {
333 334 
		this.scorePercent = scorePercent;
334 335 
	}
336 
	@Column(DE.bigSerial)
337 
	public long getShareId() {
338 
		return shareId;
339 
	}
340
341 
	public void setShareId(long shareId) {
342 
		this.shareId = shareId;
343 
	}
335 344
345
336 346 
}

+ 10 - 0
src/main/java/com/ekexiu/portal/po/Resource.java
ファイルの表示 

@ -77,6 +77,8 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
77 77 
	private String resourceType;
78 78 
	private String orgId;
79 79
80 
	private long shareId;
81
80 82 
	public List<Image> getImages() {
81 83 
		return images;
82 84 
	}

@ -269,5 +271,13 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
269 271 
	public void setOrgId(String orgId) {
270 272 
		this.orgId = orgId;
271 273 
	}
274 
	@Column(DE.bigSerial)
275 
	public long getShareId() {
276 
		return shareId;
277 
	}
278 
	public void setShareId(long shareId) {
279 
		this.shareId = shareId;
280 
	}
281
272 282
273 283 
}

+ 6 - 0
src/main/java/com/ekexiu/portal/service/ArticleService.java
ファイルの表示 

@ -756,5 +756,11 @@ public class ArticleService {
756 756 
		this.articleAgreeDao.delete(con, articleId);
757 757 
		this.watchDao.deleteWatch(con, articleId);
758 758 
	}
759
760 
	@Path("/byShareId")
761 
	@Get
762 
	public Article query(@JdbcConn Connection con,long id) throws SQLException{
763 
		return this.articleDao.query(con, id);
764 
	}
759 765
760 766 
}

+ 16 - 0
src/main/java/com/ekexiu/portal/service/OrgService.java
ファイルの表示 

@ -13,6 +13,7 @@ import org.jfw.apt.web.annotation.operate.Get;
13 13 
import org.jfw.apt.web.annotation.operate.Post;
14 14 
import org.jfw.apt.web.annotation.param.JdbcConn;
15 15 
import org.jfw.apt.web.annotation.param.PathVar;
16 
import org.jfw.util.PageQueryResult;
16 17 
import org.jfw.util.StringUtil;
17 18
18 19 
import com.ekexiu.portal.dao.OrgDao;
 
@ -177,5 +178,20 @@ public class OrgService {
177 178 
	public OrgRegInfo queryRegInfo(@JdbcConn Connection con,String name) throws SQLException{
178 179 
		return this.orgRegInfoDao.query(con, name);
179 180 
	}
181 
	@Get
182 
	@Path("/byShareId")
183 
	public Organization query(@JdbcConn Connection con,long id)throws SQLException{
184 
		return this.orgDao.query(con, id);
185 
	}
180 186
187 
	@Get
188 
	@Path("/find/pq")
189 
	public PageQueryResult<EditOrganization> pageQuery(@JdbcConn Connection con,@Nullable String kw,@DefaultValue("20") int pageSize,@DefaultValue("1") int pageNo)throws SQLException
190 
	{
191 
		PageQueryResult<EditOrganization> pqr = kw==null?this.orgDao.query(con, pageSize, pageNo):this.orgDao.query(con,"%"+kw+"%", pageSize, pageNo);
192 
		for (EditOrganization organization : pqr.getData()) {
193 
			organization.setHasOrgLogo(this.imageService.hasOrgLogo(organization.getId()));
194 
		}
195 
		return pqr;
196 
	}
181 197 
}

+ 5 - 0
src/main/java/com/ekexiu/portal/service/PpaperService.java
ファイルの表示 

@ -138,4 +138,9 @@ public class PpaperService {
138 138 
		this.ppaperDao.update(con, id, keywords);
139 139 
	}
140 140
141 
	@Get
142 
	@Path("/byShareId")
143 
	public Ppaper query(@JdbcConn Connection con,long id) throws SQLException{
144 
		return this.ppaperDao.query(con,id);
145 
	}
141 146 
}

+ 5 - 0
src/main/java/com/ekexiu/portal/service/PpatentServcie.java
ファイルの表示 

@ -135,4 +135,9 @@ public class PpatentServcie {
135 135 
	public void update(@JdbcConn(true) Connection con,String id,@Nullable String keywords)throws SQLException{
136 136 
		this.ppatentDao.update(con, id, keywords);
137 137 
	}
138 
	@Get
139 
	@Path("/byShareId")
140 
	public Ppatent query(@JdbcConn Connection con,long id)throws SQLException{
141 
		return this.ppatentDao.query(con,id);
142 
	}
138 143 
}

+ 5 - 0
src/main/java/com/ekexiu/portal/service/ProfessorService.java
ファイルの表示 

@ -666,6 +666,11 @@ public class ProfessorService {
666 666 
		return info;
667 667
668 668 
	}
669 
	@Get
670 
	@Path("/byShareId")
671 
	public Professor query(@JdbcConn Connection con,long id)throws SQLException{
672 
		return this.professorDao.query(con,id);
673 
	}
669 674
670 675 
	public static void main(String[] args)throws Exception{
671 676 
//		Connection con = DriverManager.getConnection("jdbc:postgresql://121.42.53.174:5432/ekexiu", "postgres",  "postgres");

+ 5 - 1
src/main/java/com/ekexiu/portal/service/ResourceService.java
ファイルの表示 

@ -947,5 +947,9 @@ public class ResourceService {
947 947 
		}
948 948 
		return queryResult;
949 949 
	}
950
950 
	@Get
951 
	@Path("/byShareId")
952 
	public Resource query(@JdbcConn Connection con,long id)throws SQLException{
953 
		return this.resourceDao.query(con,id);
954 
	}
951 955 
}

+ 18 - 2
src/main/resources/database.sql
ファイルの表示 

@ -1490,8 +1490,24 @@ COMMENT ON COLUMN feedback.param IS '参数：如 论文ID....';
1490 1490 
COMMENT ON COLUMN feedback.state IS '状态，0：初始状态   ，其他由不同大类业务确定';
1491 1491
1492 1492
1493
1494
1493 
create sequence professor_share_id_seq increment by 1 minvalue 100000 no maxvalue start with 100000;
1494 
ALTER TABLE professor ADD COLUMN share_id int8 DEFAULT nextval('professor_share_id_seq'::regclass) NOT NULL;
1495 
COMMENT ON COLUMN professor.share_id IS '共享ID';
1496 
create sequence organization_share_id_seq increment by 1 minvalue 100000 no maxvalue start with 100000;
1497 
ALTER TABLE organization ADD COLUMN share_id int8 DEFAULT nextval('organization_share_id_seq'::regclass) NOT NULL;
1498 
COMMENT ON COLUMN organization.share_id IS '共享ID';
1499 
create sequence article_share_id_seq increment by 1 minvalue 100000 no maxvalue start with 100000;
1500 
ALTER TABLE article ADD COLUMN share_id int8 DEFAULT nextval('article_share_id_seq'::regclass) NOT NULL;
1501 
COMMENT ON COLUMN article.share_id IS '共享ID';
1502 
create sequence resource_share_id_seq increment by 1 minvalue 100000 no maxvalue start with 100000;
1503 
ALTER TABLE resource ADD COLUMN share_id int8 DEFAULT nextval('resource_share_id_seq'::regclass) NOT NULL;
1504 
COMMENT ON COLUMN resource.share_id IS '共享ID';
1505 
create sequence ppaper_share_id_seq increment by 1 minvalue 100000 no maxvalue start with 100000;
1506 
ALTER TABLE ppaper ADD COLUMN share_id int8 DEFAULT nextval('ppaper_share_id_seq'::regclass) NOT NULL;
1507 
COMMENT ON COLUMN ppaper.share_id IS '共享ID';
1508 
create sequence ppatent_share_id_seq increment by 1 minvalue 100000 no maxvalue start with 100000;
1509 
ALTER TABLE ppatent ADD COLUMN share_id int8 DEFAULT nextval('ppatent_share_id_seq'::regclass) NOT NULL;
1510 
COMMENT ON COLUMN ppatent.share_id IS '共享ID';
1495 1511
1496 1512
1497 1513