11

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/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.
@@ -56,6 +57,8 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
    private Integer professorState;
    private Integer sortFirst;
    private long pageViews;
    private List<ResearchArea> researchAreas;
    
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(1)",renewable=false)
@@ -103,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;
    }
@@ -111,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;
    }
@@ -202,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;
    }
@@ -325,5 +328,13 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
    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/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,18 +133,39 @@ public class ProfessorService {
    @Put
    @Path
    public void update(@JdbcConn(true) Connection con, @RequestBody Professor professor) throws SQLException,JfwBaseException {
    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);
        }else {
            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 + "%";
@@ -122,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 + "%";
@@ -155,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);
@@ -168,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 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);
    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);
        }
    }
@@ -199,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);
@@ -213,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) {
@@ -254,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);
@@ -268,7 +320,7 @@ 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);
@@ -279,6 +331,8 @@ public class ProfessorService {
    @Get
    @Path("/detail/{id}")
    public UserDetail queryDetail(@JdbcConn Connection con, @PathVar String id) throws SQLException {
        return this.professorDao.queryDetail(con, id);
        UserDetail professor = this.professorDao.queryDetail(con, id);
        professor.setResearchAreas(this.researchAreaDao.query(con, id));
        return professor;
    }
}

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());
            }
        }
    }
}