文章设置栏目;文章、资源、专利、论文设置关键词

src/main/java/com/ekexiu/console/system/dao/ArtKeyWordDao.java

@@ -0,0 +1,25 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.ArtKeyWord;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/8/23.
 */
@DAO
public interface ArtKeyWordDao {
    @Insert
    @Batch
    int[] insert(Connection con, ArtKeyWord[] okws) throws SQLException;
    @DeleteWith
    @From(ArtKeyWord.class)
    int delete(Connection con, String id) throws SQLException;
}

src/main/java/com/ekexiu/console/system/dao/ArticleDao.java

@@ -49,13 +49,21 @@ public interface ArticleDao {
    @Batch
    @UpdateWith
    @From(Article.class)
    int[] updateStatus(Connection con,@Batch String[] articleId,@Set String status) throws SQLException;
    int[] updateStatus(Connection con, @Batch String[] articleId, @Set String status) throws SQLException;
    @UpdateWith
    @From(Article.class)
    int updateStatus(Connection con,String articleId,@Set String status) throws SQLException;
    int updateStatus(Connection con, String articleId, @Set String status) throws SQLException;
    @UpdateWith
    @From(Article.class)
    int updateSortNum(Connection con, String articleId, @Set long sortNum) throws SQLException;
    @UpdateWith
    @From(Article.class)
    int updateColNum(Connection con, String articleId, @Set int colNum) throws SQLException;
    @UpdateWith
    @From(Article.class)
    int updateSubject(Connection con, String articleId, @Set String subject) throws SQLException;
}

src/main/java/com/ekexiu/console/system/dao/PapKeyWordDao.java

@@ -0,0 +1,25 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.PapKeyWord;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/8/23.
 */
@DAO
public interface PapKeyWordDao {
    @Insert
    @Batch
    int[] insert(Connection con, PapKeyWord[] okws) throws SQLException;
    @DeleteWith
    @From(PapKeyWord.class)
    int delete(Connection con, String id) throws SQLException;
}

src/main/java/com/ekexiu/console/system/dao/PatKeyWordDao.java

@@ -0,0 +1,25 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.PatKeyWord;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/8/23.
 */
@DAO
public interface PatKeyWordDao {
    @Insert
    @Batch
    int[] insert(Connection con, PatKeyWord[] okws) throws SQLException;
    @DeleteWith
    @From(PatKeyWord.class)
    int delete(Connection con, String id) throws SQLException;
}

src/main/java/com/ekexiu/console/system/dao/PpaperDao.java

@@ -44,4 +44,8 @@ public interface PpaperDao {
    @UpdateWith
    @From(Ppaper.class)
    int updateSortNum(Connection con, String id, @Set long sortNum) throws SQLException;
    @UpdateWith
    @From(Ppaper.class)
    int updateKeyWords(Connection con, String id, @Set String keywords) throws SQLException;
}

src/main/java/com/ekexiu/console/system/dao/PpatentDao.java

@@ -45,4 +45,8 @@ public interface PpatentDao {
    @From(Ppatent.class)
    int updateSortNum(Connection con, String id, @Set long sortNum) throws SQLException;
    @UpdateWith
    @From(Ppatent.class)
    int updateKeyWords(Connection con, String id, @Set String keywords) throws SQLException;
}

src/main/java/com/ekexiu/console/system/dao/ResKeyWordDao.java

@@ -0,0 +1,25 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.ResKeyWord;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/8/23.
 */
@DAO
public interface ResKeyWordDao {
    @Insert
    @Batch
    int[] insert(Connection con, ResKeyWord[] okws) throws SQLException;
    @DeleteWith
    @From(ResKeyWord.class)
    int delete(Connection con, String id) throws SQLException;
}

src/main/java/com/ekexiu/console/system/dao/ResourceDao.java

@@ -58,4 +58,8 @@ public interface ResourceDao {
    @UpdateWith
    @From(Resource.class)
    int updateSortNum(Connection con, String resourceId, @Set long sortNum) throws SQLException;
    @UpdateWith
    @From(Resource.class)
    int updateSubject(Connection con, String resourceId, @Set String subject) throws SQLException;
}

src/main/java/com/ekexiu/console/system/po/ArtKeyWord.java

@@ -0,0 +1,32 @@
package com.ekexiu.console.system.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2017/8/23.
 */
@Table
public class ArtKeyWord {
    private String id;
    private String kw;
    @Column(DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(DE.text_de)
    public String getKw() {
        return kw;
    }
    public void setKw(String kw) {
        this.kw = kw;
    }
}

src/main/java/com/ekexiu/console/system/po/Article.java

@@ -33,6 +33,7 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
    private String status;
    private long shareId;
    private long sortNum;
    private int colNum;
    @Column(DE.id_32)
    public String getArticleId() {
@@ -153,5 +154,13 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
    public void setSortNum(long sortNum) {
        this.sortNum = sortNum;
    }
    @Column(DE.int_de)
    public int getColNum() {
        return colNum;
    }
    public void setColNum(int colNum) {
        this.colNum = colNum;
    }
}

src/main/java/com/ekexiu/console/system/po/PapKeyWord.java

@@ -0,0 +1,32 @@
package com.ekexiu.console.system.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2017/8/23.
 */
@Table
public class PapKeyWord {
    private String id;
    private String kw;
    @Column(DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(DE.text_de)
    public String getKw() {
        return kw;
    }
    public void setKw(String kw) {
        this.kw = kw;
    }
}

src/main/java/com/ekexiu/console/system/po/PatKeyWord.java

@@ -0,0 +1,32 @@
package com.ekexiu.console.system.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2017/8/23.
 */
@Table
public class PatKeyWord {
    private String id;
    private String kw;
    @Column(DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(DE.text_de)
    public String getKw() {
        return kw;
    }
    public void setKw(String kw) {
        this.kw = kw;
    }
}

src/main/java/com/ekexiu/console/system/po/ResKeyWord.java

@@ -0,0 +1,33 @@
package com.ekexiu.console.system.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2017/8/23.
 */
@Table
public class ResKeyWord {
    private String id;
    private String kw;
    @Column(DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(DE.text_de)
    public String getKw() {
        return kw;
    }
    public void setKw(String kw) {
        this.kw = kw;
    }
}

src/main/java/com/ekexiu/console/system/service/ArticleService.java

@@ -23,6 +23,8 @@ import java.sql.SQLException;
public class ArticleService {
    @Autowrie
    private ArticleDao articleDao;
    @Autowrie
    private KeyWordService keyWordService;
    public ArticleDao getArticleDao() {
        return articleDao;
@@ -32,6 +34,14 @@ public class ArticleService {
        this.articleDao = articleDao;
    }
    public KeyWordService getKeyWordService() {
        return keyWordService;
    }
    public void setKeyWordService(KeyWordService keyWordService) {
        this.keyWordService = keyWordService;
    }
    @Path("/pq")
    @Get
    public PageQueryResult<ArticleInfo> pageQueryResult(@JdbcConn Connection con, @Nullable String title, @Nullable String name, int orderBy, @Nullable String bt, @Nullable String et, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize)throws SQLException {
@@ -62,4 +72,17 @@ public class ArticleService {
    public Article query(@JdbcConn Connection con, @PathVar String id) throws SQLException {
        return this.articleDao.query(con, id);
    }
    @Post
    @Path("/colNum")
    public void updateColNum(@JdbcConn(true) Connection con,String articleId,int colNum)throws SQLException {
        this.articleDao.updateColNum(con, articleId, colNum);
    }
    @Post
    @Path("/subject")
    public void updateSubject(@JdbcConn(true) Connection con,String articleId,@Nullable String subject) throws SQLException {
        this.articleDao.updateSubject(con, articleId, subject);
        this.keyWordService.refreshArticle(con, articleId, subject);
    }
}

src/main/java/com/ekexiu/console/system/service/KeyWordService.java

@@ -1,9 +1,7 @@
package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.OrgKeyWordDao;
import com.ekexiu.console.system.dao.ProKeyWordDao;
import com.ekexiu.console.system.po.OrgKeyWord;
import com.ekexiu.console.system.po.ProKeyWord;
import com.ekexiu.console.system.dao.*;
import com.ekexiu.console.system.po.*;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Bean;
@@ -22,6 +20,14 @@ public class KeyWordService {
    private ProKeyWordDao proKeyWordDao;
    @Autowrie
    private OrgKeyWordDao orgKeyWordDao;
    @Autowrie
    private ResKeyWordDao resKeyWordDao;
    @Autowrie
    private ArtKeyWordDao artKeyWordDao;
    @Autowrie
    private PatKeyWordDao patKeyWordDao;
    @Autowrie
    private PapKeyWordDao papKeyWordDao;
    public ProKeyWordDao getProKeyWordDao() {
        return proKeyWordDao;
@@ -39,7 +45,40 @@ public class KeyWordService {
        this.orgKeyWordDao = orgKeyWordDao;
    }
    public void refreshProfessor(Connection con, String id, String[] kws) throws SQLException {
    public ResKeyWordDao getResKeyWordDao() {
        return resKeyWordDao;
    }
    public void setResKeyWordDao(ResKeyWordDao resKeyWordDao) {
        this.resKeyWordDao = resKeyWordDao;
    }
    public ArtKeyWordDao getArtKeyWordDao() {
        return artKeyWordDao;
    }
    public void setArtKeyWordDao(ArtKeyWordDao artKeyWordDao) {
        this.artKeyWordDao = artKeyWordDao;
    }
    public PatKeyWordDao getPatKeyWordDao() {
        return patKeyWordDao;
    }
    public void setPatKeyWordDao(PatKeyWordDao patKeyWordDao) {
        this.patKeyWordDao = patKeyWordDao;
    }
    public PapKeyWordDao getPapKeyWordDao() {
        return papKeyWordDao;
    }
    public void setPapKeyWordDao(PapKeyWordDao papKeyWordDao) {
        this.papKeyWordDao = papKeyWordDao;
    }
    public void refreshProfessor(Connection con, String id, String kw) throws SQLException {
        String[] kws = splitKeyWord(kw);
        proKeyWordDao.delete(con, id);
        if (kws != null && kws.length > 0) {
            ProKeyWord[] okws = new ProKeyWord[kws.length];
@@ -53,7 +92,8 @@ public class KeyWordService {
        }
    }
    public void refreshOrg(Connection con, String id, String[] kws) throws SQLException {
    public void refreshOrg(Connection con, String id, String kw) throws SQLException {
        String[] kws = splitKeyWord(kw);
        orgKeyWordDao.delete(con, id);
        if (kws != null && kws.length > 0) {
            OrgKeyWord[] okws = new OrgKeyWord[kws.length];
@@ -67,6 +107,66 @@ public class KeyWordService {
        }
    }
    public void refreshArticle(Connection con, String id, String kw) throws SQLException {
        String[] kws = splitKeyWord(kw);
        artKeyWordDao.delete(con, id);
        if (kws != null && kws.length > 0) {
            ArtKeyWord[] okws = new ArtKeyWord[kws.length];
            for (int i = 0; i < kws.length; ++i) {
                ArtKeyWord okw = new ArtKeyWord();
                okw.setId(id);
                okw.setKw(kws[i]);
                okws[i] = okw;
            }
            artKeyWordDao.insert(con, okws);
        }
    }
    public void refreshResource(Connection con, String id, String kw) throws SQLException {
        String[] kws = splitKeyWord(kw);
        resKeyWordDao.delete(con, id);
        if (kws != null && kws.length > 0) {
            ResKeyWord[] okws = new ResKeyWord[kws.length];
            for (int i = 0; i < kws.length; ++i) {
                ResKeyWord okw = new ResKeyWord();
                okw.setId(id);
                okw.setKw(kws[i]);
                okws[i] = okw;
            }
            resKeyWordDao.insert(con, okws);
        }
    }
    public void refreshPaper(Connection con, String id, String kw) throws SQLException {
        String[] kws = splitKeyWord(kw);
        papKeyWordDao.delete(con, id);
        if (kws != null && kws.length > 0) {
            PapKeyWord[] okws = new PapKeyWord[kws.length];
            for (int i = 0; i < kws.length; ++i) {
                PapKeyWord okw = new PapKeyWord();
                okw.setId(id);
                okw.setKw(kws[i]);
                okws[i] = okw;
            }
            papKeyWordDao.insert(con, okws);
        }
    }
    public void refreshPatent(Connection con, String id, String kw) throws SQLException {
        String[] kws = splitKeyWord(kw);
        patKeyWordDao.delete(con, id);
        if (kws != null && kws.length > 0) {
            PatKeyWord[] okws = new PatKeyWord[kws.length];
            for (int i = 0; i < kws.length; ++i) {
                PatKeyWord okw = new PatKeyWord();
                okw.setId(id);
                okw.setKw(kws[i]);
                okws[i] = okw;
            }
            patKeyWordDao.insert(con, okws);
        }
    }
    public static String[] splitKeyWord(String kws) {
        if (kws == null || kws.trim().length() == 0) return null;
        kws = kws.trim();

src/main/java/com/ekexiu/console/system/service/OrgService.java

@@ -425,7 +425,7 @@ public class OrgService extends com.ekexiu.console.service.Upload {
            String in = no.getIndustry();
            String kw = s==null?"":s.trim();
            kw = kw + (in==null?"":(","+in.trim()));
            this.keyWordService.refreshOrg(con,orgn.getId(),KeyWordService.splitKeyWord(kw));
            this.keyWordService.refreshOrg(con,orgn.getId(),kw);
        }else{
            this.keyWordService.refreshOrg(con,orgn.getId(),null);
        }

src/main/java/com/ekexiu/console/system/service/PaperService.java

@@ -26,6 +26,8 @@ public class PaperService {
    private PpaperDao ppaperDao;
    @Autowrie
    private PaperAgreeDao paperAgreeDao;
    @Autowrie
    private KeyWordService keyWordService;
    public PpaperDao getPpaperDao() {
        return ppaperDao;
@@ -43,6 +45,14 @@ public class PaperService {
        this.paperAgreeDao = paperAgreeDao;
    }
    public KeyWordService getKeyWordService() {
        return keyWordService;
    }
    public void setKeyWordService(KeyWordService keyWordService) {
        this.keyWordService = keyWordService;
    }
    @Path("/pq")
    @Get
    public PageQueryResult<Ppaper> pageQueryResult(@JdbcConn Connection con, @Nullable String title, @Nullable String name, int orderBy, @Nullable String bt, @Nullable String et, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize)throws SQLException {
@@ -73,4 +83,10 @@ public class PaperService {
        return this.paperAgreeDao.query(con,id);
    }
    @Post
    @Path("/keywords")
    public void updateKeyWords(@JdbcConn(true) Connection con,String id, @Nullable String keywords) throws SQLException {
        this.ppaperDao.updateKeyWords(con, id, keywords);
        this.keyWordService.refreshPaper(con, id, keywords);
    }
}

src/main/java/com/ekexiu/console/system/service/PatentService.java

@@ -26,6 +26,8 @@ public class PatentService {
    private PpatentDao ppatentDao;
    @Autowrie
    private PatentAgreeDao patentAgreeDao;
    @Autowrie
    private KeyWordService keyWordService;
    public PpatentDao getPpatentDao() {
        return ppatentDao;
@@ -43,6 +45,14 @@ public class PatentService {
        this.patentAgreeDao = patentAgreeDao;
    }
    public KeyWordService getKeyWordService() {
        return keyWordService;
    }
    public void setKeyWordService(KeyWordService keyWordService) {
        this.keyWordService = keyWordService;
    }
    @Path("/pq")
    @Get
    public PageQueryResult<Ppatent> pageQueryResult(@JdbcConn Connection con, @Nullable String title, @Nullable String name, int orderBy, @Nullable String bt, @Nullable String et, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize)throws SQLException {
@@ -72,4 +82,11 @@ public class PatentService {
    public int agreeCount(@JdbcConn(false) Connection con,String id)throws SQLException{
        return this.patentAgreeDao.query(con,id);
    }
    @Post
    @Path("/keywords")
    public void updateKeyWords(@JdbcConn(true) Connection con,String id, @Nullable String keywords) throws SQLException {
        this.ppatentDao.updateKeyWords(con, id, keywords);
        this.keyWordService.refreshPatent(con, id, keywords);
    }
}

src/main/java/com/ekexiu/console/system/service/ProfessorService.java

@@ -157,7 +157,7 @@ public class ProfessorService {
            String industry = p.getIndustry();
            if (industry == null)
                industry = "";
            this.keyWordService.refreshProfessor(con, professor.getId(), KeyWordService.splitKeyWord(subject + "," + industry));
            this.keyWordService.refreshProfessor(con, professor.getId(), subject + "," + industry);
        } else {
            throw new JfwBaseException(50000, "只能修改未激活用户信息");
        }

src/main/java/com/ekexiu/console/system/service/ResourceService.java

@@ -23,6 +23,8 @@ import java.sql.SQLException;
public class ResourceService {
    @Autowrie
    private ResourceDao resourceDao;
    @Autowrie
    private KeyWordService keyWordService;
    public ResourceDao getResourceDao() {
        return resourceDao;
@@ -32,6 +34,14 @@ public class ResourceService {
        this.resourceDao = resourceDao;
    }
    public KeyWordService getKeyWordService() {
        return keyWordService;
    }
    public void setKeyWordService(KeyWordService keyWordService) {
        this.keyWordService = keyWordService;
    }
    @Path("/pq")
    @Get
    public PageQueryResult<ResourceInfo> pageQueryResult(@JdbcConn Connection con, @Nullable String resourceName, @Nullable String name, int orderBy, @Nullable String bt, @Nullable String et, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize)throws SQLException {
@@ -62,4 +72,11 @@ public class ResourceService {
    public Resource query(@JdbcConn Connection con, @PathVar String id) throws SQLException {
        return this.resourceDao.query(con, id);
    }
    @Post
    @Path("/subject")
    public void updateSubject(@JdbcConn(true) Connection con,String resourceId,@Nullable String subject) throws SQLException {
        this.resourceDao.updateSubject(con, resourceId, subject);
        this.keyWordService.refreshResource(con, resourceId, subject);
    }
}

src/main/java/com/ekexiu/console/system/service/UserInfoService.java

@@ -288,7 +288,7 @@ public class UserInfoService {
                }
                professor.setProfessorState(0);
                this.professorService.insert(con, professor, userInfo.getOrgName());
                this.keyWordService.refreshProfessor(con, id, KeyWordService.splitKeyWord(subject + "," + industry));
                this.keyWordService.refreshProfessor(con, id,subject + "," + industry);
                ArrayList<String> areas = (ArrayList<String>) userInfo.get("researchArea");
                if (areas != null) {