11

src/main/java/com/ekexiu/project/platform/system/dao/UserDao.java

@@ -46,7 +46,7 @@ public interface UserDao {
    @Nullable
    @SelectOne
    User queryByLoginPhone(Connection con, String loginPhone, Boolean active) throws SQLException;
    User queryByLoginPhone(Connection con, String loginPhone, Boolean actived) throws SQLException;
    @Nullable
    @SelectOne
@@ -63,7 +63,7 @@ public interface UserDao {
    int updateLoginLog(Connection con, String id, @Set String lastLoginTime) throws SQLException;
    @Update
    @Exclude({"passwd", "active", "loginPhone"})
    @Exclude({"passwd", "actived", "loginPhone"})
    int update(Connection con, User user) throws SQLException;
    @UpdateWith
@@ -76,14 +76,14 @@ public interface UserDao {
    @UpdateWith
    @From(User.class)
    @Where("ACTIVE = '1'")
    @SetSentence("ACTIVE = '0'")
    @Where("ACTIVED = '1'")
    @SetSentence("ACTIVED = '0'")
    int invalid(Connection con, String id) throws SQLException;
    @UpdateWith
    @From(User.class)
    @Where("ACTIVE = '0'")
    @SetSentence("ACTIVE = '1'")
    @Where("ACTIVED = '0'")
    @SetSentence("ACTIVED = '1'")
    int valid(Connection con, String id) throws SQLException;
    @Insert
@@ -94,13 +94,13 @@ public interface UserDao {
    int validUser(Connection con, String id) throws SQLException;
    @PageSelect
    @Where("ACTIVE ='1'")
    @Where("ACTIVED ='1'")
    @OrderBy("ORDER BY CREATE_TIME DESC")
    PageQueryResult<User> pageQuery(Connection con, @GroupSqlColumn(handlerClass = StringHandler.class, value = {"ACCOUNT LIKE ?", "LOGIN_PHONE LIKE ?"}, isAnd = false) @Nullable String key, int pageSize, int pageNo) throws SQLException;
    @PageSelect
    @OrderBy("ORDER BY INVALID_TIME DESC")
    PageQueryResult<InvalidUser> pageQueryInvalidUser(Connection con,@GroupSqlColumn(handlerClass = StringHandler.class, value = {"ACCOUNT LIKE ?", "LOGIN_PHONE LIKE ?"}, isAnd = false) @Nullable String key, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<InvalidUser> pageQueryInvalidUser(Connection con, @GroupSqlColumn(handlerClass = StringHandler.class, value = {"ACCOUNT LIKE ?", "LOGIN_PHONE LIKE ?"}, isAnd = false) @Nullable String key, int pageSize, int pageNo) throws SQLException;
    @Nullable
    @SelectOne
@@ -122,21 +122,21 @@ public interface UserDao {
    @Update
    @Where("ACTIVE ='1'")
    @Where("ACTIVED ='1'")
    @IncludeFixSet
    @Exclude(value = {"invalidTime", "invalidOperator", "passwd", "active"})
    @Exclude(value = {"invalidTime", "invalidOperator", "passwd", "actived"})
    int update(Connection con, Manager user) throws SQLException;
    @UpdateWith
    @From(Manager.class)
    @Where("ACTIVE ='1'")
    @SetSentence("ACTIVE='0',INVALID_TIME=TO_CHAR(NOW(),'YYYYMMDDHH24MISS')")
    @Where("ACTIVED ='1'")
    @SetSentence("ACTIVED ='0',INVALID_TIME=TO_CHAR(NOW(),'YYYYMMDDHH24MISS')")
    int disable(Connection con, String id, @Set String invalidOperator) throws SQLException;
    @UpdateWith
    @From(Manager.class)
    @Where("ACTIVE ='0'")
    @SetSentence("ACTIVE='1'")
    @Where("ACTIVED ='0'")
    @SetSentence("ACTIVED ='1'")
    int enable(Connection con, String id) throws SQLException;
    @Nullable
@@ -152,11 +152,11 @@ public interface UserDao {
    @Nullable
    @SelectOne
    Manager queryManagerByLoginPhone(Connection con, String account,@Nullable Boolean actived) throws SQLException;
    Manager queryManagerByLoginPhone(Connection con, String account) throws SQLException;
    @UpdateWith
    @From(Manager.class)
    int changeManagerPasswd(Connection con, String id,@Set String passwd) throws SQLException;
    int changeManagerPasswd(Connection con, String id, @Set String passwd) throws SQLException;
    @UpdateWith
    @From(Manager.class)
@@ -165,7 +165,7 @@ public interface UserDao {
    @PageQuery
    @From(Manager.class)
    @OrderBy("ORDER BY CREATE_TIME DESC")
    PageQueryResult<ManagerInfo> managerPageQuery(Connection con,@UnEquals String id, boolean actived, int pageSize, int pageNo) throws SQLException;
    PageQueryResult<ManagerInfo> managerPageQuery(Connection con, @UnEquals String id, boolean actived, int pageSize, int pageNo) throws SQLException;
    @Nullable
    @QueryOne

src/main/java/com/ekexiu/project/platform/system/po/Manager.java

@@ -3,11 +3,14 @@ package com.ekexiu.project.platform.system.po;
import org.jfw.apt.orm.annotation.entry.Column;
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
import org.jfw.apt.orm.annotation.entry.Table;
import org.jfw.apt.orm.annotation.entry.Unique;
import org.jfw.apt.orm.annotation.entry.Uniques;
import org.jfw.apt.orm.core.enums.DE;
import com.ekexiu.project.platform.base.po.ManagedBaseTable;
@PrimaryKey("id")
@Uniques(@Unique(clolumns = "account",name = "account_unique"))
@Table(descp = "后台管理用户表")
public class Manager implements ManagedBaseTable {
    private String id;

src/main/java/com/ekexiu/project/platform/system/po/User.java

@@ -28,18 +28,18 @@ public class User implements BaseTable {
    private String linkPhone;
    private String email;
    private String passwd;
    private boolean active;
    private boolean actived;
    private String addr;
    private String head;
    @Column(descp = "是否可用", value = DE.boolean_de)
    public boolean isActive() {
        return active;
    public boolean isActived() {
        return actived;
    }
    public void setActive(boolean active) {
        this.active = active;
    public void setActived(boolean actived) {
        this.actived = actived;
    }
    @Column(descp = "密码（MD5）", queryable = false, handlerClass = StringHandler.class, dbType = "TEXT")

src/main/java/com/ekexiu/project/platform/system/service/SysService.java

@@ -71,8 +71,8 @@ public class SysService {
    @LoginUser
    @Get
    @Path("/exists")
    public boolean existsManager(@JdbcConn Connection con, String account, @Nullable Boolean active) throws SQLException {
        return null != userDao.queryManagerByLoginPhone(con, account, active);
    public boolean existsManager(@JdbcConn Connection con, String account) throws SQLException {
        return null != userDao.queryManagerByLoginPhone(con, account);
    }
    @Get
@@ -124,8 +124,8 @@ public class SysService {
    @Get
    @Path("/pq")
    public PageQueryResult<SessionManager> managerPageQuery(@JdbcConn Connection con,@LoginUser SessionManager user, boolean active, int pageSize, int pageNo) throws SQLException {
        PageQueryResult<ManagerInfo> pageQueryResult = userDao.managerPageQuery(con,user.getId(), active, pageSize, pageNo);
    public PageQueryResult<SessionManager> managerPageQuery(@JdbcConn Connection con,@LoginUser SessionManager user, boolean actived, int pageSize, int pageNo) throws SQLException {
        PageQueryResult<ManagerInfo> pageQueryResult = userDao.managerPageQuery(con,user.getId(), actived, pageSize, pageNo);
        List<ManagerInfo> managers = pageQueryResult.getData();
        List<SessionManager> sessionManagers = new ArrayList<>();
        if (!managers.isEmpty()) {
@@ -154,7 +154,7 @@ public class SysService {
    @Path("/new")
    @Post
    public String addUser(@JdbcConn(true) Connection con, @LoginUser SessionManager au, @RequestParam(excludeFields = {"id", "acitve", "createor"}) Manager user, String[] rightCode) throws SQLException {
    public String addUser(@JdbcConn(true) Connection con, @LoginUser SessionManager au, @RequestParam(excludeFields = {"id", "acitved", "createor"}) Manager user, String[] rightCode) throws SQLException {
        String id = StringUtil.buildUUID();
        user.setActived(true);
        user.setCreator(au.getId());
@@ -330,7 +330,7 @@ public class SysService {
        sessionUser.setId(user.getId());
        sessionUser.setJob(user.getJob());
        sessionUser.setName(user.getName());
        sessionUser.setActive(user.isActive());
        sessionUser.setActived(user.isActived());
        sessionUser.setAddr(user.getAccount());
        sessionUser.setCreateTime(user.getCreateTime());
        sessionUser.setHead(user.getHead());

src/main/java/com/ekexiu/project/platform/system/vo/SessionUser.java

@@ -20,7 +20,7 @@ public class SessionUser implements AuthUser {
	private String linkPhone;
	private String addr;
	private String head;
    private boolean active;
    private boolean actived;
	public String getId() {
		return id;
	}
@@ -99,11 +99,11 @@ public class SessionUser implements AuthUser {
	public void setHead(String head) {
		this.head = head;
	}
	public boolean isActive() {
		return active;
	public boolean isActived() {
		return actived;
	}
	public void setActive(boolean active) {
		this.active = active;
	public void setActived(boolean actived) {
		this.actived = actived;
	}
	@Override
	public boolean hasAuthority(int auth) {

src/main/resources/database.sql

@@ -351,3 +351,5 @@ COMMENT ON COLUMN ARTICLE_ORG.CREATE_TIME IS '创建时间（YYYYMMDDHH24MISS）
INSERT INTO "public"."manager" ("id", "account", "passwd", "name", "phone", "email", "job", "dep", "comp", "actived", "invalid_time", "invalid_operator","create_time","creator","modify_time","modifier") VALUES ('4733F3525B4E40719242AB154932CAA5', '18888888888', 'E10ADC3949BA59ABBE56E057F20F883E', 'admin', '18888888888', 'admin@ekexiu.com', '11', '11', '11', '1','','', '20180718091626', '4733F3525B4E40719242AB154932CAA5','20180718091626', '4733F3525B4E40719242AB154932CAA5');
ALTER TABLE MANAGER ADD UNIQUE (ACCOUNT);