Merge branch 'Next'

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

@@ -1,11 +1,15 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.Honor;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.*;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
/**
 * Created by TT on 2017/7/14.
@@ -14,4 +18,19 @@ import java.sql.SQLException;
public interface HonorDao {
    @Insert
    int insert(Connection con, Honor honor) throws SQLException;
    @Update
    int update(Connection con, Honor honor) throws SQLException;
    @SelectList
    @OrderBy(" ORDER BY YEAR DESC ")
    List<Honor> query(Connection con, String professorId) throws SQLException;
    @Nullable
    @SelectOne
    Honor queryOne(Connection con, String id) throws SQLException;
    @DeleteWith
    @From(Honor.class)
    int delete(Connection con, String id) throws SQLException;
}

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/PartTimeJobDao.java

@@ -1,11 +1,15 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.PartTimeJob;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.*;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
/**
 * Created by TT on 2017/7/14.
@@ -14,4 +18,19 @@ import java.sql.SQLException;
public interface PartTimeJobDao {
    @Insert
    int insert(Connection con, PartTimeJob job) throws SQLException;
    @Update
    int update(Connection con, PartTimeJob job) throws SQLException;
    @SelectList
    @OrderBy(" ORDER BY STOP_MONTH DESC ")
    List<PartTimeJob> query(Connection con, String professorId) throws SQLException;
    @Nullable
    @SelectOne
    PartTimeJob queryOne(Connection con, String id) throws SQLException;
    @DeleteWith
    @From(PartTimeJob.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/dao/ProfessorDao.java

@@ -83,9 +83,13 @@ public interface ProfessorDao {
    @PageQuery
    @OrderBy("ORDER BY create_time DESC NULLS LAST")
    PageQueryResult<UserDetail> pageQueryUserDetail(Connection con, @Nullable @Like String name,@Nullable @Alias("createTime") @GtEq String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<UserDetail> pageQueryUserDetail(Connection con, @Nullable @Like String name,@Nullable String activeStatus,@Nullable Integer sendMailStatus,@Nullable @Alias("createTime") @GtEq String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @UpdateWith
    @From(Professor.class)
    int updateBusinessData(Connection con,String id,@Set int authentication,@Set int authStatus,@Set int authStatusExpert ,@Set int sortFirst)throws SQLException;
    @Nullable
    @QueryOne
    UserDetail queryDetail(Connection con, String id)throws SQLException;
}

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

@@ -1,11 +1,15 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.ProfessorEduBg;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.*;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
/**
 * Created by TT on 2017/7/14.
@@ -14,4 +18,19 @@ import java.sql.SQLException;
public interface ProfessorEduBgDao {
    @Insert
    int insert(Connection con, ProfessorEduBg edu) throws SQLException;
    @Update
    int update(Connection con, ProfessorEduBg edu) throws SQLException;
    @SelectList
    @OrderBy(" ORDER BY YEAR DESC ")
    List<ProfessorEduBg> query(Connection con, String professorId) throws SQLException;
    @Nullable
    @SelectOne
    ProfessorEduBg queryOne(Connection con, String id) throws SQLException;
    @DeleteWith
    @From(ProfessorEduBg.class)
    int delete(Connection con, String id) throws SQLException;
}

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

@@ -1,11 +1,15 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.Project;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.*;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
/**
 * Created by TT on 2017/7/13.
@@ -13,5 +17,20 @@ import java.sql.SQLException;
@DAO
public interface ProjectDao {
    @Insert
    int insert(Connection con, Project project)throws SQLException;
    int insert(Connection con, Project project) throws SQLException;
    @Update
    int update(Connection con, Project project) throws SQLException;
    @SelectList
    @OrderBy(" ORDER BY STOP_MONTH DESC ")
    List<Project> query(Connection con, String professorId) throws SQLException;
    @Nullable
    @SelectOne
    Project queryOne(Connection con, String id) throws SQLException;
    @DeleteWith
    @From(Project.class)
    int delete(Connection con, String id) throws SQLException;
}

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

@@ -2,10 +2,17 @@ package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.ResearchArea;
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.OrderBy;
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;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Set;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
/**
 * Created by TT on 2017/7/13.
@@ -14,4 +21,20 @@ import java.sql.SQLException;
public interface ResearchAreaDao {
    @Insert
    int insert(Connection con, ResearchArea area) throws SQLException;
    @OrderBy("ORDER BY COUNT DESC,SORT_NUM ASC")
    @SelectList
    List<ResearchArea> query(Connection con, String professorId) throws SQLException;
    @DeleteWith
    @From(ResearchArea.class)
    int delete(Connection con, String professorId) throws SQLException;
    @DeleteWith
    @From(ResearchArea.class)
    int delete(Connection con, String professorId, String caption) throws SQLException;
    @UpdateWith
    @From(ResearchArea.class)
    int updateDescp(Connection con, String professorId, String caption, @Set String descp, @Set int sortNum) throws SQLException;
}

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

@@ -0,0 +1,25 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.ResearchAreaLog;
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 java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/8/17.
 */
@DAO
public abstract class ResearchAreaLogDao {
    @DeleteWith
    @From(ResearchAreaLog.class)
    public abstract int delete(Connection con, String professorId) throws SQLException;
    @DeleteWith
    @From(ResearchAreaLog.class)
    public abstract int delete(Connection con, String professorId, String caption) 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/po/Professor.java

@@ -12,6 +12,7 @@ import org.jfw.apt.orm.core.defaultImpl.WIntHandler;
import org.jfw.apt.orm.core.enums.DE;
import java.math.BigDecimal;
import java.util.List;
/**
 * Created by TT on 2017/4/6.
@@ -55,6 +56,9 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
    private String cuserId;
    private Integer professorState;
    private Integer sortFirst;
    private long pageViews;
    private List<ResearchArea> researchAreas;
    
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(1)",renewable=false)
@@ -102,7 +106,7 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
        this.office = office;
    }
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=false,queryable=true)
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
    public String getSubject() {
        return subject;
    }
@@ -110,7 +114,7 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
    public void setSubject(String subject) {
        this.subject = subject;
    }
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=false,queryable=true)
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
    public String getIndustry() {
        return industry;
    }
@@ -201,7 +205,7 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
    public void setName(String name) {
        this.name = name;
    }
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=false,queryable=true)
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
    public String getDescp() {
        return descp;
    }
@@ -316,5 +320,21 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
        this.sortFirst = sortFirst;
    }
    @Column(DE.bigSerial)
    public long getPageViews() {
        return pageViews;
    }
    public void setPageViews(long pageViews) {
        this.pageViews = pageViews;
    }
    public List<ResearchArea> getResearchAreas() {
        return researchAreas;
    }
    public void setResearchAreas(List<ResearchArea> researchAreas) {
        this.researchAreas = researchAreas;
    }
}

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

@@ -0,0 +1,55 @@
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.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2017/8/17.
 */
@Table
public class ResearchAreaLog {
    private String professorId;
    private String caption;
    private String opreteProfessorId;
    private String createTime;
    @Column(DE.id_32)
    public String getOpreteProfessorId() {
        return opreteProfessorId;
    }
    public void setOpreteProfessorId(String opreteProfessorId) {
        this.opreteProfessorId = opreteProfessorId;
    }
    @Column(handlerClass = FixLenStringHandler.class, dbType = "CHAR(14)", fixSqlValueWithInsert = "TO_CHAR(NOW(),'YYYYMMDDHH24MISS')", insertable = true, nullable = false, queryable = true, renewable = false)
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(DE.id_32)
    public String getProfessorId() {
        return professorId;
    }
    public void setProfessorId(String orgId) {
        this.professorId = orgId;
    }
    @Column(DE.string_de)
    public String getCaption() {
        return caption;
    }
    public void setCaption(String catpion) {
        this.caption = catpion;
    }
}

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

@@ -0,0 +1,68 @@
package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.HonorDao;
import com.ekexiu.console.system.po.Honor;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Delete;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.operate.Put;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.apt.web.annotation.param.RequestBody;
import org.jfw.util.StringUtil;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
/**
 * Created by TT on 2017/8/14.
 */
@Path("/honor")
public class HonorService {
    @Autowrie
    private HonorDao honorDao;
    public HonorDao getHonorDao() {
        return honorDao;
    }
    public void setHonorDao(HonorDao honorDao) {
        this.honorDao = honorDao;
    }
    @Get
    @Path("/{id}")
    public Honor query(@JdbcConn Connection con, @PathVar String id) throws SQLException
    {
        return this.honorDao.queryOne(con, id);
    }
    @Post
    @Path
    public void insert(@JdbcConn(true) Connection con, Honor honor) throws SQLException {
        String id = StringUtil.buildUUID();
        honor.setId(id);
        this.honorDao.insert(con, honor);
    }
    @Put
    @Path
    public void update(@JdbcConn(true) Connection con, @RequestBody Honor honor) throws SQLException {
        this.honorDao.update(con, honor);
    }
    @Get
    @Path("/professor")
    public List<Honor> queryByProfessor(@JdbcConn Connection con, String professorId) throws SQLException {
        return this.honorDao.query(con, professorId);
    }
    @Delete
    @Path("/{id}")
    public void delete(@JdbcConn(true) Connection con, @PathVar String id) throws SQLException {
        this.honorDao.delete(con, id);
    }
}

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;
    }
@@ -408,6 +418,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/PartTimeJobService.java

@@ -0,0 +1,67 @@
package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.PartTimeJobDao;
import com.ekexiu.console.system.po.PartTimeJob;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Delete;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.operate.Put;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.apt.web.annotation.param.RequestBody;
import org.jfw.util.StringUtil;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
/**
 * Created by TT on 2017/8/14.
 */
@Path("/job")
public class PartTimeJobService {
    @Autowrie
    private PartTimeJobDao partTimeJobDao;
    public PartTimeJobDao getPartTimeJobDao() {
        return partTimeJobDao;
    }
    public void setPartTimeJobDao(PartTimeJobDao jobDao) {
        this.partTimeJobDao = jobDao;
    }
    @Get
    @Path("/{id}")
    public PartTimeJob query(@JdbcConn Connection con, @PathVar String id) throws SQLException
    {
        return this.partTimeJobDao.queryOne(con, id);
    }
    @Post
    @Path
    public void insert(@JdbcConn(true) Connection con, PartTimeJob honor) throws SQLException {
        String id = StringUtil.buildUUID();
        honor.setId(id);
        this.partTimeJobDao.insert(con, honor);
    }
    @Put
    @Path
    public void update(@JdbcConn(true) Connection con, @RequestBody PartTimeJob honor) throws SQLException {
        this.partTimeJobDao.update(con, honor);
    }
    @Get
    @Path("/professor")
    public List<PartTimeJob> queryByProfessor(@JdbcConn Connection con, String professorId) throws SQLException {
        return this.partTimeJobDao.query(con, professorId);
    }
    @Delete
    @Path("/{id}")
    public void delete(@JdbcConn(true) Connection con, @PathVar String id) throws SQLException {
        this.partTimeJobDao.delete(con, id);
    }
}

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

@@ -0,0 +1,67 @@
package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.ProfessorEduBgDao;
import com.ekexiu.console.system.po.ProfessorEduBg;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Delete;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.operate.Put;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.apt.web.annotation.param.RequestBody;
import org.jfw.util.StringUtil;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
/**
 * Created by TT on 2017/8/14.
 */
@Path("/edu")
public class ProfessorEduBgService {
    @Autowrie
    private ProfessorEduBgDao professorEduBgDao;
    public ProfessorEduBgDao getProfessorEduBgDao() {
        return professorEduBgDao;
    }
    public void setProfessorEduBgDao(ProfessorEduBgDao professorEduBgDao) {
        this.professorEduBgDao = professorEduBgDao;
    }
    @Get
    @Path("/{id}")
    public ProfessorEduBg query(@JdbcConn Connection con, @PathVar String id) throws SQLException
    {
        return this.professorEduBgDao.queryOne(con, id);
    }
    @Post
    @Path
    public void insert(@JdbcConn(true) Connection con, ProfessorEduBg honor) throws SQLException {
        String id = StringUtil.buildUUID();
        honor.setId(id);
        this.professorEduBgDao.insert(con, honor);
    }
    @Put
    @Path
    public void update(@JdbcConn(true) Connection con, @RequestBody ProfessorEduBg honor) throws SQLException {
        this.professorEduBgDao.update(con, honor);
    }
    @Get
    @Path("/professor")
    public List<ProfessorEduBg> queryByProfessor(@JdbcConn Connection con, String professorId) throws SQLException {
        return this.professorEduBgDao.query(con, professorId);
    }
    @Delete
    @Path("/{id}")
    public void delete(@JdbcConn(true) Connection con, @PathVar String id) throws SQLException {
        this.professorEduBgDao.delete(con, id);
    }
}

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

@@ -3,6 +3,7 @@ package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.LuserDao;
import com.ekexiu.console.system.dao.OrgDao;
import com.ekexiu.console.system.dao.ProfessorDao;
import com.ekexiu.console.system.dao.ResearchAreaDao;
import com.ekexiu.console.system.po.Luser;
import com.ekexiu.console.system.po.Professor;
import com.ekexiu.console.system.pojo.ProfessorInfo;
@@ -46,6 +47,12 @@ public class ProfessorService {
    private OrgService orgService;
    @Autowrie
    private LuserDao luserDao;
    @Autowrie
    private KeyWordService keyWordService;
    @Autowrie
    private ResearchAreaDao researchAreaDao;
    @Autowrie
    private ResearchAreaService researchAreaService;
    public OrgService getOrgService() {
        return orgService;
@@ -79,6 +86,30 @@ public class ProfessorService {
        this.luserDao = luserDao;
    }
    public KeyWordService getKeyWordService() {
        return keyWordService;
    }
    public void setKeyWordService(KeyWordService keyWordService) {
        this.keyWordService = keyWordService;
    }
    public ResearchAreaDao getResearchAreaDao() {
        return researchAreaDao;
    }
    public void setResearchAreaDao(ResearchAreaDao researchAreaDao) {
        this.researchAreaDao = researchAreaDao;
    }
    public ResearchAreaService getResearchAreaService() {
        return researchAreaService;
    }
    public void setResearchAreaService(ResearchAreaService researchAreaService) {
        this.researchAreaService = researchAreaService;
    }
    @Post
    @Path
    public String insert(@JdbcConn(true) Connection con, Professor professor, @Nullable String orgName)
@@ -102,13 +133,39 @@ public class ProfessorService {
    @Put
    @Path
    public void update(@JdbcConn(true) Connection con, @RequestBody Professor professor) throws SQLException, IOException {
        this.professorDao.update(con, professor);
    public void update(@JdbcConn(true) Connection con, @RequestBody ProfessorInfo professor) throws SQLException, JfwBaseException, IOException {
        UserDetail userDetail = this.professorDao.queryDetail(con, professor.getId());
        if (!Objects.equals(userDetail.getActiveStatus(), "1")) {
            if (professor.getOrgName() != null) {
                if (null != this.orgDao.queryByName(con, professor.getOrgName())) {
                    professor.setOrgId(this.orgDao.queryByName(con, professor.getOrgName()));
                } else {
                    professor.setOrgId(this.orgService.createOrganization(con, professor.getOrgName()));
                }
            }
            this.professorDao.update(con, professor);
            if (professor.getResearchAreas() != null && !professor.getResearchAreas().isEmpty()) {
                this.researchAreaService.saveResearchArea(con, professor.getResearchAreas());
            } else {
                this.researchAreaService.delete(con, professor.getId());
            }
            Professor p = this.professorDao.query(con, professor.getId());
            String subject = p.getSubject();
            if (subject == null) {
                subject = "";
            }
            String industry = p.getIndustry();
            if (industry == null)
                industry = "";
            this.keyWordService.refreshProfessor(con, professor.getId(), KeyWordService.splitKeyWord(subject + "," + industry));
        } else {
            throw new JfwBaseException(50000, "只能修改未激活用户信息");
        }
    }
    @Get
    @Path("/pq")
    public PageQueryResult<ProfessorInfo> pageQuery(@JdbcConn Connection con, @Nullable String enter,@Nullable String orgName, @Nullable String name, @Nullable Integer professorState, @Nullable String bt, @Nullable String et, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
    public PageQueryResult<ProfessorInfo> pageQuery(@JdbcConn Connection con, @Nullable String enter, @Nullable String orgName, @Nullable String name, @Nullable Integer professorState, @Nullable String bt, @Nullable String et, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
        String oName = null;
        if (orgName != null) {
            oName = "%" + orgName + "%";
@@ -117,27 +174,27 @@ public class ProfessorService {
        if (name != null) {
            pname = "%" + name + "%";
        }
        if (et!=null) {
        if (et != null) {
            et = et + "235959";
        }
        return this.professorDao.pageQuery(con,enter, oName, pname, professorState, bt, et, pageSize, pageNo);
        return this.professorDao.pageQuery(con, enter, oName, pname, professorState, bt, et, pageSize, pageNo);
    }
    @Get
    @Path("/id/{id}")
    public ProfessorInfo query(@JdbcConn Connection con,@PathVar String id) throws SQLException {
    public ProfessorInfo query(@JdbcConn Connection con, @PathVar String id) throws SQLException {
        return this.professorDao.query(con, id);
    }
    @Post
    @Path("/sortFirst")
    public void updateSortFirst(@JdbcConn(true) Connection con,String id,Integer sortFirst)throws SQLException {
    public void updateSortFirst(@JdbcConn(true) Connection con, String id, Integer sortFirst) throws SQLException {
        this.professorDao.updateSortFirst(con, id, sortFirst);
    }
    @Get
    @Path("/pqperson")
    public PageQueryResult<ProfessorInfo> pageQueryPerson(@JdbcConn Connection con, @LoginUser ConsoleAuthUser cau,@Nullable String orgName, @Nullable String name, @Nullable Integer professorState,@Nullable String bt, @Nullable String et, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
    public PageQueryResult<ProfessorInfo> pageQueryPerson(@JdbcConn Connection con, @LoginUser ConsoleAuthUser cau, @Nullable String orgName, @Nullable String name, @Nullable Integer professorState, @Nullable String bt, @Nullable String et, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
        String oName = null;
        if (orgName != null) {
            oName = "%" + orgName + "%";
@@ -150,12 +207,12 @@ public class ProfessorService {
            bt = bt + "000000";
        if (et != null)
            et = et + "235959";
        return this.professorDao.pageQueryPerson(con,cau.getId(),oName, pname, professorState, bt, et, pageSize, pageNo);
        return this.professorDao.pageQueryPerson(con, cau.getId(), oName, pname, professorState, bt, et, pageSize, pageNo);
    }
    @Post
    @Path("/check")
    public void check(@JdbcConn(true) Connection con, String[] ids, Integer professorState, Integer authType, Integer authStatusExpert)throws SQLException {
    public void check(@JdbcConn(true) Connection con, String[] ids, Integer professorState, Integer authType, Integer authStatusExpert) throws SQLException {
        this.professorDao.updateProfessorState(con, ids, professorState);
        this.professorDao.updateAuthType(con, ids, authType);
        this.professorDao.updateAuthStatusExpert(con, ids, authStatusExpert);
@@ -163,23 +220,23 @@ public class ProfessorService {
    @Get
    @Path("/getName/{id}")
    public String getName(@JdbcConn Connection con,@PathVar String id) throws SQLException {
    public String getName(@JdbcConn Connection con, @PathVar String id) throws SQLException {
        return this.professorDao.queryById(con, id);
    }
    @Get
    @Path("/pqUserDetail")
    public PageQueryResult<UserDetail> userDetailPageQueryResult(@JdbcConn Connection con, @Nullable String name, @Nullable String bt, @Nullable String et, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo)throws SQLException {
        return this.professorDao.pageQueryUserDetail(con, name == null ? null : "%" + name + "%", bt, et, pageSize, pageNo);
    public PageQueryResult<UserDetail> userDetailPageQueryResult(@JdbcConn Connection con, @Nullable String name, @Nullable String activeStatus, @Nullable Integer sendMailStatus, @Nullable String bt, @Nullable String et, @DefaultValue("10") int pageSize, @DefaultValue("1") int pageNo) throws SQLException {
        return this.professorDao.pageQueryUserDetail(con, name == null ? null : "%" + name + "%", activeStatus, sendMailStatus, bt, et, pageSize, pageNo);
    }
    @Post
    @Path("/updateBusinessData")
    public void updateBusinessData(@JdbcConn(true) Connection con,String id,@Nullable int authentication,@Nullable int authStatus,@Nullable int authStatusExpert,int sortFirst)throws SQLException{
    public void updateBusinessData(@JdbcConn(true) Connection con, String id, @Nullable int authentication, @Nullable int authStatus, @Nullable int authStatusExpert, int sortFirst) throws SQLException {
        this.professorDao.updateBusinessData(con, id, authentication, authStatus, authStatusExpert, sortFirst);
        if (authStatusExpert == 3){
        if (authStatusExpert == 3) {
            this.professorDao.updateAuthType(con, id, 1);
        }else {
        } else {
            this.professorDao.updateAuthType(con, id, 0);
        }
    }
@@ -194,9 +251,9 @@ public class ProfessorService {
    @Path("/updateCheck")
    @Get
    public int editCheck(@JdbcConn Connection con,@Nullable String mobile, @Nullable String email,String id) throws SQLException {
    public int editCheck(@JdbcConn Connection con, @Nullable String mobile, @Nullable String email, String id) throws SQLException {
        String luserId = this.luserDao.queryByEmail(con, email);
        if ((luserId != null)&&(!Objects.equals(luserId, id))) {
        if ((luserId != null) && (!Objects.equals(luserId, id))) {
            return 2;//该邮箱已被注册
        }
        String luserId1 = this.luserDao.queryByPhone(con, mobile);
@@ -208,7 +265,7 @@ public class ProfessorService {
    @Post
    @Path("/createAccount")
    public void insert(@JdbcConn(true) Connection con,String name, @Nullable String mobile,@Nullable String email)throws SQLException,JfwBaseException {
    public void insert(@JdbcConn(true) Connection con, String name, @Nullable String mobile, @Nullable String email) throws SQLException, JfwBaseException {
        String luserId = this.luserDao.queryByEmail(con, email);
        if (luserId != null) {
@@ -249,9 +306,9 @@ public class ProfessorService {
    @Post
    @Path("/updateAccount")
    public void updateAccount(@JdbcConn(true) Connection con,@Nullable String mobile, @Nullable String email,String id) throws SQLException, JfwBaseException {
    public void updateAccount(@JdbcConn(true) Connection con, @Nullable String mobile, @Nullable String email, String id) throws SQLException, JfwBaseException {
        String luserId = this.luserDao.queryByEmail(con, email);
        if ((luserId != null)&&(!Objects.equals(luserId, id))) {
        if ((luserId != null) && (!Objects.equals(luserId, id))) {
            throw new JfwBaseException(40001, "该邮箱已被注册");
        }
        String luserId1 = this.luserDao.queryByPhone(con, mobile);
@@ -263,11 +320,19 @@ public class ProfessorService {
    @Get
    @Path("/luserId/{id}")
    public Luser queryAccount(@JdbcConn Connection con, @PathVar String id)throws SQLException {
    public Luser queryAccount(@JdbcConn Connection con, @PathVar String id) throws SQLException {
        Luser luser = this.luserDao.query(con, id);
        if (luser != null) {
            luser.setPasswd(null);
        }
        return luser;
    }
    @Get
    @Path("/detail/{id}")
    public UserDetail queryDetail(@JdbcConn Connection con, @PathVar String id) throws SQLException {
        UserDetail professor = this.professorDao.queryDetail(con, id);
        professor.setResearchAreas(this.researchAreaDao.query(con, id));
        return professor;
    }
}

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

@@ -0,0 +1,69 @@
package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.ProjectDao;
import com.ekexiu.console.system.po.Project;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Delete;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.operate.Put;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.apt.web.annotation.param.RequestBody;
import org.jfw.util.StringUtil;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
/**
 * Created by TT on 2017/8/14.
 */
@Path("/project")
public class ProjectService {
    @Autowrie
    private ProjectDao projectDao;
    public ProjectDao getProjectDao() {
        return projectDao;
    }
    public void setProjectDao(ProjectDao projectDao) {
        this.projectDao = projectDao;
    }
    @Get
    @Path("/{id}")
    public Project query(@JdbcConn Connection con, @PathVar String id) throws SQLException {
        return this.projectDao.queryOne(con, id);
    }
    @Post
    @Path
    public void insert(@JdbcConn(true) Connection con, Project project) throws SQLException {
        String id = StringUtil.buildUUID();
        project.setId(id);
        this.projectDao.insert(con, project);
    }
    @Put
    @Path
    public void update(@JdbcConn(true) Connection con, @RequestBody Project project) throws SQLException {
        this.projectDao.update(con, project);
    }
    @Get
    @Path("/professor")
    public List<Project> queryByProfessor(@JdbcConn Connection con, String professorId) throws SQLException {
        return this.projectDao.query(con, professorId);
    }
    @Delete
    @Path("/{id}")
    public void delete(@JdbcConn(true) Connection con, @PathVar String id) throws SQLException {
        this.projectDao.delete(con, id);
    }
}

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

@@ -0,0 +1,88 @@
package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.ResearchAreaDao;
import com.ekexiu.console.system.dao.ResearchAreaLogDao;
import com.ekexiu.console.system.po.ResearchArea;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Delete;
import org.jfw.apt.web.annotation.operate.Put;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.apt.web.annotation.param.RequestBody;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
/**
 * Created by TT on 2017/8/17.
 */
@Path("/researchArea")
public class ResearchAreaService {
    @Autowrie
    private ResearchAreaDao researchAreaDao;
    @Autowrie
    private ResearchAreaLogDao researchAreaLogDao;
    public ResearchAreaDao getResearchAreaDao() {
        return researchAreaDao;
    }
    public void setResearchAreaDao(ResearchAreaDao researchAreaDao) {
        this.researchAreaDao = researchAreaDao;
    }
    public ResearchAreaLogDao getResearchAreaLogDao() {
        return researchAreaLogDao;
    }
    public void setResearchAreaLogDao(ResearchAreaLogDao researchAreaLogDao) {
        this.researchAreaLogDao = researchAreaLogDao;
    }
    @Delete
    @Path("/{professorId}")
    public void delete(@JdbcConn(true) Connection con, @PathVar String professorId) throws SQLException {
        this.researchAreaDao.delete(con, professorId);
        this.researchAreaLogDao.delete(con, professorId);
    }
    @Put
    @Path
    public void saveResearchArea(@JdbcConn(true) Connection con, @RequestBody List<ResearchArea> areas) throws SQLException {
        String professorId = areas.get(0).getProfessorId();
        List<ResearchArea> olds = this.researchAreaDao.query(con, professorId);
        int sortNum = 1;
        for (ResearchArea area : areas) {
            area.setSortNum(sortNum++);
            boolean found = false;
            for (ResearchArea old : olds) {
                if (area.getCaption().equals(old.getCaption())) {
                    found = true;
                    this.researchAreaDao.updateDescp(con, professorId, area.getCaption(), area.getDescp(), area.getSortNum());
                    break;
                }
            }
            if (!found) {
                area.setProfessorId(professorId);
                this.researchAreaDao.insert(con, area);
            }
        }
        for (ResearchArea old : olds) {
            boolean found = false;
            for (ResearchArea area : areas) {
                if (area.getCaption().equals(old.getCaption())) {
                    found = true;
                    break;
                }
            }
            if (!found) {
                this.researchAreaDao.delete(con, professorId, old.getCaption());
                this.researchAreaLogDao.delete(con, professorId, old.getCaption());
            }
        }
    }
}

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) {