Merge branch 'next'

# Conflicts:
#	src/main/java/com/ekexiu/console/system/dao/ArticleDao.java

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

@@ -3,7 +3,6 @@ package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.Article;
import com.ekexiu.console.system.pojo.ArticleInfo;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.Column;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
@@ -25,6 +24,10 @@ import java.sql.SQLException;
@DAO
public interface ArticleDao {
    @Nullable
    @SelectOne
    Article query(Connection con, String articleId) throws SQLException;
    @Nullable
    @QueryVal
    @Column(handlerClass = StringHandler.class, value = "article_title")
@@ -45,4 +48,8 @@ public interface ArticleDao {
    @UpdateWith
    @From(Article.class)
    int[] updateStatus(Connection con,@Batch String[] articleId,@Set String status) throws SQLException;
    @UpdateWith
    @From(Article.class)
    int updateSortNum(Connection con, String articleId, @Set long sortNum) throws SQLException;
}

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

@@ -2,11 +2,17 @@ package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.Luser;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Column;
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.Or;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.UpdateWith;
import org.jfw.apt.orm.annotation.dao.param.Alias;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import java.sql.Connection;
import java.sql.SQLException;
@@ -24,4 +30,24 @@ public interface LuserDao {
    @Insert
    int insert(Connection con,Luser user)throws SQLException;
    @Nullable
    @QueryVal
    @Column(handlerClass=StringHandler.class,value="id")
    @From(Luser.class)
    String queryByEmail(Connection con,String email)throws SQLException;
    @Nullable
    @QueryVal
    @Column(handlerClass=StringHandler.class,value="id")
    @From(Luser.class)
    String queryByPhone(Connection con,String mobilePhone)throws SQLException;
    @UpdateWith
    @From(Luser.class)
    int updateAccount(Connection con, String id, @Set String mobilePhone, @Set String email)throws SQLException;
    @SelectOne
    @Nullable
    Luser query(Connection con, String id) throws SQLException;
}

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

@@ -7,6 +7,7 @@ import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.enums.DE;
/**
@@ -31,6 +32,7 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
    private int pageViews;
    private String status;
    private long shareId;
    private long sortNum;
    @Column(DE.id_32)
    public String getArticleId() {
@@ -143,6 +145,13 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
        this.shareId = shareId;
    }
    @Column(handlerClass=LongHandler.class,dbType="BIGINT",fixSqlValueWithInsert="0",insertable=true,renewable=false,nullable=false,queryable=true)
    public long getSortNum() {
        return sortNum;
    }
    public void setSortNum(long sortNum) {
        this.sortNum = sortNum;
    }
}

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

@@ -1,6 +1,7 @@
package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.ArticleDao;
import com.ekexiu.console.system.po.Article;
import com.ekexiu.console.system.pojo.ArticleInfo;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
@@ -9,6 +10,7 @@ import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
@@ -48,4 +50,16 @@ public class ArticleService {
        //修改文章状态为删除
        this.articleDao.updateStatus(con, articleIds, "3");
    }
    @Post
    @Path("/sortNum")
    public void updateSortNum(@JdbcConn(true) Connection con,String articleId,long sortNum) throws SQLException{
        this.articleDao.updateSortNum(con, articleId, sortNum);
    }
    @Get
    @Path("/id/{id}")
    public Article query(@JdbcConn Connection con, @PathVar String id) throws SQLException {
        return this.articleDao.query(con, id);
    }
}

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

@@ -293,7 +293,7 @@ public class OrgService extends com.ekexiu.console.service.Upload {
    @Path("/entryCheck")
    @Get
    public int entryCheck(@JdbcConn Connection con, String name, String email) throws SQLException, JfwBaseException {
    public int entryCheck(@JdbcConn Connection con, String name, String email) throws SQLException {
        OrgUser orgUser = this.orgUserDao.entryCheck(con, email);
        if (orgUser != null) {
            return 1;//该邮箱已被注册
@@ -307,7 +307,7 @@ public class OrgService extends com.ekexiu.console.service.Upload {
    @Path("/editCheck")
    @Get
    public int editCheck(@JdbcConn Connection con, String name, String email,String id) throws SQLException, JfwBaseException {
    public int editCheck(@JdbcConn Connection con, String name, String email,String id) throws SQLException {
        String orgUserId = this.orgUserDao.queryByEmail(con, email);
        if ((orgUserId != null)&&(!Objects.equals(orgUserId, id))) {
            return 2;//该邮箱已被注册

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

@@ -1,7 +1,9 @@
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.po.Luser;
import com.ekexiu.console.system.po.Professor;
import com.ekexiu.console.system.pojo.ProfessorInfo;
import com.ekexiu.console.system.pojo.UserDetail;
@@ -17,12 +19,16 @@ 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.DateUtil;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.exception.JfwBaseException;
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Objects;
import java.util.Random;
/**
 * Created by TT on 2017/5/25.
@@ -30,12 +36,16 @@ import java.sql.SQLException;
@Path("/sys/professor")
public class ProfessorService {
    public static final String DEFAULT_PASS_WORD = "11111111111111111111111111111111";
    @Autowrie
    private ProfessorDao professorDao;
    @Autowrie
    private OrgDao orgDao;
    @Autowrie
    private OrgService orgService;
    @Autowrie
    private LuserDao luserDao;
    public OrgService getOrgService() {
        return orgService;
@@ -61,6 +71,14 @@ public class ProfessorService {
        this.professorDao = professorDao;
    }
    public LuserDao getLuserDao() {
        return luserDao;
    }
    public void setLuserDao(LuserDao luserDao) {
        this.luserDao = luserDao;
    }
    @Post
    @Path
    public String insert(@JdbcConn(true) Connection con, Professor professor, @Nullable String orgName)
@@ -160,4 +178,91 @@ public class ProfessorService {
    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);
    }
    @Path("/createCheck")
    @Get
    public boolean entryCheck(@JdbcConn Connection con, @Nullable String mobile, @Nullable String email) throws SQLException {
        Luser luser1 = this.luserDao.check(con, mobile);
        Luser luser2 = this.luserDao.check(con, email);
        return luser1 == null && luser2 == null;
    }
    @Path("/updateCheck")
    @Get
    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))) {
            return 2;//该邮箱已被注册
        }
        String luserId1 = this.luserDao.queryByPhone(con, mobile);
        if ((luserId1 != null) && (!Objects.equals(luserId1, id))) {
            return 3;//该手机已被注册
        }
        return 1;
    }
    @Post
    @Path("/createAccount")
    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) {
            throw new JfwBaseException(40001, "邮箱已被注册");
        }
        String luserId1 = this.luserDao.queryByPhone(con, mobile);
        if (luserId1 != null) {
            throw new JfwBaseException(40002, "该电话已被注册");
        }
        String id = StringUtil.buildUUID();
        Luser luser = new Luser();
        luser.setId(id);
        Random rd = new Random();
        int code = rd.nextInt(1000000);
        String inviteCode = String.format("%06d", code);
        luser.setInviteCode(inviteCode);
        luser.setEmail(email);
        luser.setMobilePhone(mobile);
        luser.setPasswd(DEFAULT_PASS_WORD);
        luser.setUserType("0");
        luser.setCreateTime(DateUtil.formatDateTime(System.currentTimeMillis()));
        this.luserDao.insert(con, luser);
        Professor professor = new Professor();
        professor.setId(id);
        professor.setName(name);
        professor.setEmail(email);
        professor.setPhone(mobile);
        professor.setAuthType(1);
        professor.setAuthStatus(0);
        professor.setAuthStatusExpert(0);
        professor.setSortFirst(0);
        professor.setProfessorState(0);
        professor.setAuthentication(0);
        professor.setOrgAuth("0");
        this.professorDao.insert(con, professor);
    }
    @Post
    @Path("/updateAccount")
    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))) {
            throw new JfwBaseException(40001, "该邮箱已被注册");
        }
        String luserId1 = this.luserDao.queryByPhone(con, mobile);
        if ((luserId1 != null) && (!Objects.equals(luserId1, id))) {
            throw new JfwBaseException(40002, "该电话已被注册");
        }
        this.luserDao.updateAccount(con, id, mobile, email);
    }
    @Get
    @Path("/luserId/{id}")
    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;
    }
}

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

@@ -187,12 +187,12 @@ public class UserInfoService {
    @Path("/editCheck")
    @Get
    public Boolean editCheck(@JdbcConn Connection con, @Nullable String mobile, @Nullable String email,String id) throws SQLException {
        String orgId = this.userInfoDao.queryByKey(con, mobile);
        if ((orgId != null) && (!Objects.equals(orgId, id))){
        String userInfoId = this.userInfoDao.queryByKey(con, mobile);
        if ((userInfoId != null) && (!Objects.equals(userInfoId, id))){
            return false;
        }
        String orgId1 = this.userInfoDao.queryByKey(con, email);
        if ((orgId1 != null) && (!Objects.equals(orgId, id))){
        String userInfoId1 = this.userInfoDao.queryByKey(con, email);
        if ((userInfoId1 != null) && (!Objects.equals(userInfoId1, id))){
            return false;
        }
        Luser luser1 = this.luserDao.check(con, mobile);