Merge branch 'KeyWord' into Next

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

@@ -0,0 +1,25 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.OrgKeyWord;
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/10.
 */
@DAO
public interface OrgKeyWordDao {
    @Insert
    @Batch
    int[] insert(Connection con, OrgKeyWord[] okws)throws SQLException;
    @DeleteWith
    @From(OrgKeyWord.class)
    int delete(Connection con,String id)throws SQLException;
}

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

@@ -0,0 +1,27 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.ProKeyWord;
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/10.
 */
@DAO
public interface ProKeyWordDao {
    @Insert
    @Batch
    int[] insert(Connection con, ProKeyWord[] pkw) throws SQLException;
    @DeleteWith
    @From(ProKeyWord.class)
    int delete(Connection con, String id) throws SQLException;
}

src/main/java/com/ekexiu/console/system/po/OrgKeyWord.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/10.
 */
@Table
public class OrgKeyWord {
    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/ProKeyWord.java

@@ -0,0 +1,34 @@
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/10.
 */
@Table
public class ProKeyWord {
    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/KeyWordService.java

@@ -0,0 +1,90 @@
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 org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.Bean;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Collections;
import java.util.HashSet;
/**
 * Created by TT on 2017/8/10.
 */
@Bean
public class KeyWordService {
    @Autowrie
    private ProKeyWordDao proKeyWordDao;
    @Autowrie
    private OrgKeyWordDao orgKeyWordDao;
    public ProKeyWordDao getProKeyWordDao() {
        return proKeyWordDao;
    }
    public void setProKeyWordDao(ProKeyWordDao proKeyWordDao) {
        this.proKeyWordDao = proKeyWordDao;
    }
    public OrgKeyWordDao getOrgKeyWordDao() {
        return orgKeyWordDao;
    }
    public void setOrgKeyWordDao(OrgKeyWordDao orgKeyWordDao) {
        this.orgKeyWordDao = orgKeyWordDao;
    }
    public void refreshProfessor(Connection con, String id, String[] kws) throws SQLException {
        proKeyWordDao.delete(con, id);
        if (kws != null && kws.length > 0) {
            ProKeyWord[] okws = new ProKeyWord[kws.length];
            for (int i = 0; i < kws.length; ++i) {
                ProKeyWord okw = new ProKeyWord();
                okw.setId(id);
                okw.setKw(kws[i]);
                okws[i] = okw;
            }
            proKeyWordDao.insert(con, okws);
        }
    }
    public void refreshOrg(Connection con, String id, String[] kws) throws SQLException {
        orgKeyWordDao.delete(con, id);
        if (kws != null && kws.length > 0) {
            OrgKeyWord[] okws = new OrgKeyWord[kws.length];
            for (int i = 0; i < kws.length; ++i) {
                OrgKeyWord okw = new OrgKeyWord();
                okw.setId(id);
                okw.setKw(kws[i]);
                okws[i] = okw;
            }
            orgKeyWordDao.insert(con, okws);
        }
    }
    public static String[] splitKeyWord(String kws) {
        if (kws == null || kws.trim().length() == 0) return null;
        kws = kws.trim();
        String[] s = kws.split(",");
        HashSet<String> result = new HashSet<String>();
        Collections.addAll(result, s);
        result.remove("");
        return result.isEmpty() ? null : result.toArray(new String[result.size()]);
    }
    public static void main(String[] args) {
        String s = ",asd,asd,dsa,dsa,we,we,xmtt,ttmx ,ttmx,";
        String[] s1 = splitKeyWord(s);
        for (String aS1 : s1) {
            System.out.println(aS1);
        }
    }
}

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

@@ -67,6 +67,8 @@ public class OrgService extends com.ekexiu.console.service.Upload {
    private OrgUserDao orgUserDao;
    @Autowrie
    private OrgRecordDao orgRecordDao;
    @Autowrie
    private KeyWordService keyWordService;
    public OrgRecordDao getOrgRecordDao() {
        return orgRecordDao;
@@ -157,6 +159,14 @@ public class OrgService extends com.ekexiu.console.service.Upload {
        this.orgDao = orgDao;
    }
    public KeyWordService getKeyWordService() {
        return keyWordService;
    }
    public void setKeyWordService(KeyWordService keyWordService) {
        this.keyWordService = keyWordService;
    }
    public int getLargeHeadPhotoWidth() {
        return largeHeadPhotoWidth;
    }
@@ -427,6 +437,19 @@ public class OrgService extends com.ekexiu.console.service.Upload {
        }else {
            this.orgRecordDao.updateModifier(con, orgn.getId(), user.getId(),DateUtil.formatDateTime(System.currentTimeMillis()));
        }
        Organization no = this.orgDao.query(con, orgn.getId());
        if(no!=null && "1".equals(no.getIsJoin())){
            String s = no.getSubject();
            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));
        }else{
            this.keyWordService.refreshOrg(con,orgn.getId(),null);
        }
    }
    @Post

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

@@ -46,6 +46,8 @@ public class UserInfoService {
    private ProfessorEduBgDao professorEduBgDao;
    @Autowrie
    private ProfessorService professorService;
    @Autowrie
    private KeyWordService keyWordService;
    public PartTimeJobDao getPartTimeJobDao() {
        return partTimeJobDao;
@@ -115,6 +117,14 @@ public class UserInfoService {
        this.userInfoDao = userInfoDao;
    }
    public KeyWordService getKeyWordService() {
        return keyWordService;
    }
    public void setKeyWordService(KeyWordService keyWordService) {
        this.keyWordService = keyWordService;
    }
    @Path("/insert")
    @Put
    public void insert(@JdbcConn(true) Connection con, @RequestBody UserInfo userInfo, @LoginUser ConsoleAuthUser user) throws SQLException {
@@ -239,6 +249,8 @@ public class UserInfoService {
                this.luserDao.insert(con, luser);
                Professor professor = new Professor();
                String subject = (String) userInfo.get("subject");
                String industry = (String) userInfo.get("industry");
                professor.setId(userInfo.getId());
                professor.setName(userInfo.getName());
                professor.setEmail((String) userInfo.get("pEmail"));
@@ -276,6 +288,7 @@ public class UserInfoService {
                }
                professor.setProfessorState(0);
                this.professorService.insert(con, professor, userInfo.getOrgName());
                this.keyWordService.refreshProfessor(con, id, KeyWordService.splitKeyWord(subject + "," + industry));
                ArrayList<String> areas = (ArrayList<String>) userInfo.get("researchArea");
                if (areas != null) {