Merge branch 'test'

.gitignore

@@ -5,3 +5,8 @@
/.tern-project
/config-dev.properties
/src/main/resources/project-dev.properties
.gitignore
portal-web.iml
.idea/
a/
index.html

src/main/java/com/ekexiu/portal/resResult/ResearchResultDao.java

@@ -65,7 +65,7 @@ public interface ResearchResultDao {
    @PageQuery
    @OrderBy("ORDER BY CREATE_TIME DESC")
    PageQueryResult<ResearchResult> pageQueryByResearcher(Connection con, @Nullable @In String[] status, @SqlColumn(handlerClass = StringHandler.class, value = "ID IN (SELECT ID FROM RESEARCHER WHERE PROFESSOR_ID = ?)") String id, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<ResearchResult> pageQueryByResearcher(Connection con, @Nullable @In String[] status,@Nullable @GroupSqlColumn(handlerClass = StringHandler.class, value = {"name like ?", "ID IN (SELECT ID FROM RESEARCHER WHERE NAME LIKE ?)", "SUBJECT LIKE ?", "INDUSTRY LIKE ?"}, isAnd = false) String key ,@SqlColumn(handlerClass = StringHandler.class, value = "ID IN (SELECT ID FROM RESEARCHER WHERE PROFESSOR_ID = ?)") String id, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy("ORDER BY STATUS DESC, CREATE_TIME DESC")

src/main/java/com/ekexiu/portal/resResult/ResearchResultService.java

@@ -3,6 +3,7 @@ package com.ekexiu.portal.resResult;
import com.ekexiu.portal.dao.ProfessorDao;
import com.ekexiu.portal.dao.WatchDao;
import com.ekexiu.portal.service.KeyWordService;
import com.ekexiu.portal.team.TeamDao;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
@@ -52,6 +53,8 @@ public class ResearchResultService {
    private KeyWordService keyWordService;
    @Autowrie
    private WatchDao watchDao;
    @Autowrie
    private TeamDao teamDao;
    public ResearcherDao getResearcherDao() {
        return researcherDao;
@@ -121,6 +124,14 @@ public class ResearchResultService {
        this.imgMaxWidth = imgMaxWidth;
    }
    public TeamDao getTeamDao() {
        return teamDao;
    }
    public void setTeamDao(TeamDao teamDao) {
        this.teamDao = teamDao;
    }
    public String insert(Connection con, ResearchResult researchResult, String[] researchers) throws SQLException {
        String id = StringUtil.buildUUID();
        researchResult.setId(id);
@@ -137,6 +148,12 @@ public class ResearchResultService {
            kws = ListUtil.splitTrimExcludeEmpty(subject + "," + industry, ',').toArray(new String[0]);
            this.keyWordService.refreshResearchResult(con, id, kws);
        }
        Researcher res  = new Researcher();
        res.setId(id);
        res.setProfessorId(researchResult.getCreator());
        res.setName("######");
        res.setStatus("1");
        this.researcherDao.insert(con,res);
        this.researchResultDao.insert(con, researchResult);
        return id;
    }
@@ -160,6 +177,12 @@ public class ResearchResultService {
            }else {
                this.keyWordService.refreshResearchResult(con, id, null);
            }
            Researcher res  = new Researcher();
            res.setId(id);
            res.setProfessorId(researchResult.getCreator());
            res.setName("######");
            res.setStatus("1");
            this.researcherDao.insert(con,res);
            return true;
        }
        return false;
@@ -197,7 +220,7 @@ public class ResearchResultService {
    @Get
    @Path("/researcher")
    public List<Researcher> queryResearchers(@JdbcConn Connection con, String id) throws SQLException {
        return this.researcherDao.query(con, id);
        return this.researcherDao.query(con, id );
    }
    @Get
@@ -211,6 +234,8 @@ public class ResearchResultService {
    public void delete(@JdbcConn(true) Connection con, String id) throws SQLException {
        watchDao.deleteWatch(con,(short)12, id);
        this.researchResultDao.updateStatus(con, id);
        this.teamDao.deleteResResultbyresearchResult(con,id);
        this.researcherDao.delete(con,id);
        this.keyWordService.refreshResearchResult(con, id, null);
    }
@@ -228,14 +253,14 @@ public class ResearchResultService {
    @Get
    @Path("/pq/researcher")
    public PageQueryResult<ResearchResult> pqByResearcher(@JdbcConn Connection con,@Nullable String[] status, String id,int pageSize,int pageNo)throws SQLException {
        return researchResultDao.pageQueryByResearcher(con, status, id, pageSize, pageNo);
    public PageQueryResult<ResearchResult> pqByResearcher(@JdbcConn Connection con,@Nullable String[] status,@Nullable String key, String id,int pageSize,int pageNo)throws SQLException {
        return researchResultDao.pageQueryByResearcher(con, status,key == null ? null : "%" + key + "%",id, pageSize, pageNo);
    }
    @Get
    @Path("/pq/creator")
    public PageQueryResult<ResearchResult> pqByCreator(@JdbcConn Connection con,@Nullable String[] status, String id,int pageSize,int pageNo)throws SQLException {
        return researchResultDao.pageQueryByCreator(con, status, id, pageSize, pageNo);
        return researchResultDao.pageQueryByCreator(con, status, id,pageSize, pageNo);
    }
    @Get
@@ -422,11 +447,69 @@ public class ResearchResultService {
                re.setId(id);
                re.setProfessorId(researchers[i].substring(0, 32));
                re.setName(researchers[i].substring(33));
                re.setStatus("0");
                res[i] = re;
            }
            this.researcherDao.insert(con, res);
        }
    }
    /**
     *
     * @param con
     * @param id 非专利成果ID
     * @return
     * @throws SQLException
     */
    @Post
    @Path("/ass")
    public int ass(@JdbcConn(true) Connection con,String id,String researcher)throws SQLException{
        Researcher res = new Researcher();
        res.setId(id);
        res.setProfessorId(researcher.substring(0,32));
        res.setName("");
        res.setStatus("1");
        return this.researcherDao.insert(con,res);
    }
    /**
     *
     * @param con
     * @param id  专利id、
     * @param pid  用户id
     * @return
     * @throws SQLException
     */
    @Get
    @Path("/selectbyidandPid")
    public List<Researcher> selectbyidandPid(@JdbcConn Connection con,String id,String pid) throws SQLException {
        return this.researcherDao.selectbyidandPid(con,id,pid);
    }
    /**
     *
     * @param con
     * @param id  非专利（成果） ID
     * @param uid 创建人（研究者id）
     * @throws SQLException
     */
    @Post
    @Path("/deleteContact")
    public void deleteContact(@JdbcConn(true) Connection con, String id,String uid) throws SQLException {
        this.researcherDao.deletecontact(con,id,uid);
    }
    /**
     *
     * @param con
     * @param pid 研究者id
     * @return
     * @throws SQLException
     */
    @Get
    @Path("/researcherbyprofessorId")
    public List<Researcher> queryResearchersbyprofessorId(@JdbcConn Connection con, String pid) throws SQLException {
        return this.researcherDao.querybyprofessorId(con,pid);
    }
}

src/main/java/com/ekexiu/portal/resResult/Researcher.java

@@ -14,6 +14,8 @@ public class Researcher {
    private String id;
    private String professorId;
    private String name;
    private String status;
    @Column(DE.id_32)
    public String getId() {
@@ -41,4 +43,14 @@ public class Researcher {
    public void setName(String name) {
        this.name = name;
    }
    @Column(descp = "状态 0：默认 显示，1：不显示 ", value = DE.singleChar)
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
}

src/main/java/com/ekexiu/portal/resResult/ResearcherDao.java

@@ -4,6 +4,7 @@ import org.jfw.apt.annotation.Nullable;
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.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.SelectList;
@@ -31,6 +32,19 @@ public interface ResearcherDao {
    @SelectList
    @Nullable
    @Where("STATUS = '0'")
    List<Researcher> query(Connection con, String id) throws SQLException;
    @SelectList
    @Nullable
    List<Researcher> querybyprofessorId(Connection con, String professorId) throws SQLException;
    @DeleteWith
    @From(Researcher.class)
    int deletecontact(Connection con, String id , String professorId)throws SQLException;
    @SelectList
    @Nullable
    List<Researcher> selectbyidandPid(Connection con,String id ,String professorId) throws SQLException;
}

src/main/java/com/ekexiu/portal/team/TeamDao.java

@@ -136,6 +136,10 @@ public interface TeamDao {
    @From(TeamResResult.class)
    int deleteResResult(Connection con, String id, String researchResult) throws SQLException;
    @DeleteWith
    @From(TeamResResult.class)
    int deleteResResultbyresearchResult(Connection con, String researchResult) throws SQLException;
    @Insert
    int insert(Connection con, TeamPaper teamPaper) throws SQLException;