新版专家录入和专家录入审核

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

@@ -0,0 +1,17 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.Honor;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/14.
 */
@DAO
public interface HonorDao {
    @Insert
    int insert(Connection con, Honor honor) throws SQLException;
}

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

@@ -0,0 +1,27 @@
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.DAO;
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.SelectOne;
import org.jfw.apt.orm.annotation.dao.param.Alias;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/13.
 */
@DAO
public interface LuserDao {
    @Or
    @Nullable
    @SelectOne
    Luser check(Connection con, @Alias({ "mobilePhone", "email" }) String key) throws SQLException;
    @Insert
    int insert(Connection con,Luser user)throws SQLException;
}

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

@@ -0,0 +1,17 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.PartTimeJob;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/14.
 */
@DAO
public interface PartTimeJobDao {
    @Insert
    int insert(Connection con, PartTimeJob job) throws SQLException;
}

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

@@ -0,0 +1,17 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.ProfessorEduBg;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/14.
 */
@DAO
public interface ProfessorEduBgDao {
    @Insert
    int insert(Connection con, ProfessorEduBg edu) throws SQLException;
}

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

@@ -0,0 +1,17 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.Project;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/13.
 */
@DAO
public interface ProjectDao {
    @Insert
    int insert(Connection con, Project project)throws SQLException;
}

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

@@ -0,0 +1,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.operator.Insert;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/13.
 */
@DAO
public interface ResearchAreaDao {
    @Insert
    int insert(Connection con, ResearchArea area) throws SQLException;
}

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

@@ -78,4 +78,9 @@ public interface UserDao {
	@Batch
	@From(User.class)
	int[] delete(Connection con, @Batch String[] id) throws SQLException;
	@Batch
	@UpdateWith
	@From(User.class)
	int[] delete(Connection con, @Batch String[] id, @Set boolean actived) throws SQLException;
}

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

@@ -0,0 +1,54 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.UserInfo;
import org.jfw.apt.annotation.Nullable;
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.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.*;
import org.jfw.apt.orm.annotation.dao.param.Alias;
import org.jfw.apt.orm.annotation.dao.param.GtEq;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.LtEq;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/7.
 */
@DAO
public interface UserInfoDao {
    @Insert
    int insert(Connection con, UserInfo ui) throws SQLException;
    @Update
    int update(Connection con, UserInfo ui) throws SQLException;
    @DeleteWith
    @From(UserInfo.class)
    int delete(Connection con, String id) throws SQLException;
    @SelectOne
    @Nullable
    UserInfo query(Connection con, String id) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC")
    PageQueryResult<UserInfo> queryPerson(Connection con, String creator, @Nullable @Like String name, @Nullable @Like String orgName, @Nullable String state, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC")
    @Where("state<>'1'")
    PageQueryResult<UserInfo> queryAll(Connection con, @Nullable @Like String name, @Nullable @Like String orgName, @Nullable String state, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @Or
    @Nullable
    @SelectOne
    UserInfo entryCheck(Connection con, @Alias({ "mobile", "email" }) String key) throws SQLException;
}

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

@@ -1,18 +1,15 @@
package com.ekexiu.console.system.dao;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
import com.ekexiu.console.system.po.UserRole;
import org.jfw.apt.annotation.Nullable;
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.Delete;
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.*;
import com.ekexiu.console.system.po.UserRole;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@DAO
public interface UserRoleDao {
@@ -34,5 +31,9 @@ public interface UserRoleDao {
	
	@SelectList
	List<UserRole> queryByUserId(Connection con, String userid) throws SQLException;
	@Nullable
	@SelectOne
	UserRole queryByRoleId(Connection con, String roleid) throws SQLException;
	
}

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

@@ -0,0 +1,65 @@
package com.ekexiu.console.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.core.enums.DE;
/**
 * Created by TT on 2017/7/14.
 */
@PrimaryKey({"id"})
@Table
public class Honor {
    private String professorId;
    private String id;
    private String year;
    private String name;
    private String descp;
    @Column(DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(value = DE.time_de, dbType = "CHAR(4)")
    public String getYear() {
        return year;
    }
    public void setYear(String year) {
        this.year = year;
    }
    @Column(value = DE.string_de, dbType = "TEXT")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(DE.id_32)
    public String getProfessorId() {
        return professorId;
    }
    public void setProfessorId(String professorId) {
        this.professorId = professorId;
    }
    @Column(value = DE.String_de, dbType = "TEXT")
    public String getDescp() {
        return descp;
    }
    public void setDescp(String descp) {
        this.descp = descp;
    }
}

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

@@ -0,0 +1,118 @@
package com.ekexiu.console.system.po;
import com.ekexiu.console.basepo.CreateTimeSupported;
import org.jfw.apt.orm.annotation.entry.*;
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.apt.orm.core.defaultImpl.WIntHandler;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2017/7/13.
 */
@PrimaryKey("id")
@Uniques({ @Unique(clolumns = "email", name = "USER_EMAIL_UQ"),
        @Unique(clolumns = "mobilePhone", name = "USER_MOBILEPHONE_UQ") })
@Table(value="LUSER")
public class Luser implements CreateTimeSupported {
    private String id;
    private String email;
    private String mobilePhone;
    private String passwd;
    private String userType;
    private String createTime;
    private String inviteCode;
    private Integer sendMailStatus;
    private String inviterId;
    private String activeTime;
    @Column(DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(DE.Email_de)
    public String getEmail() {
        return email;
    }
    public void setEmail(String email) {
        this.email = email;
    }
    @Column(DE.MobilePhone_de)
    public String getMobilePhone() {
        return mobilePhone;
    }
    public void setMobilePhone(String mobilePhone) {
        this.mobilePhone = mobilePhone;
    }
    @Column(DE.md5_de)
    public String getPasswd() {
        return passwd;
    }
    public void setPasswd(String passwd) {
        this.passwd = passwd;
    }
    @Column(DE.singleChar)
    public String getUserType() {
        return userType;
    }
    public void setUserType(String userType) {
        this.userType = userType;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(value= DE.String_de,dbType="VARCHAR(32)")
    public String getInviteCode() {
        return inviteCode;
    }
    public void setInviteCode(String inviteCode) {
        this.inviteCode = inviteCode;
    }
    @Column(handlerClass=WIntHandler.class,dbType="INT",insertable=false,nullable=true,renewable=false,queryable=true)
    public Integer getSendMailStatus() {
        return sendMailStatus;
    }
    public void setSendMailStatus(Integer sendMailStatus) {
        this.sendMailStatus = sendMailStatus;
    }
    @Column(handlerClass=StringHandler.class,dbType="CHAR(32)",insertable = true,renewable=false,queryable=true,nullable=true)
    public String getInviterId() {
        return inviterId;
    }
    public void setInviterId(String inviterId) {
        this.inviterId = inviterId;
    }
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(14)",nullable=true,insertable=true,renewable=false,queryable=true)
    public String getActiveTime() {
        return activeTime;
    }
    public void setActiveTime(String activeTime) {
        this.activeTime = activeTime;
    }
}

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

@@ -0,0 +1,95 @@
package com.ekexiu.console.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.core.enums.DE;
/**
 * Created by TT on 2017/7/14.
 */
@PrimaryKey({"id"})
@Table
public class PartTimeJob {
    private String professorId;
    private String id;
    private String startMonth;
    private String stopMonth;
    private String company;
    private String title;
    private String descp;
    private String department;
    @Column(DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(DE.time_de)
    public String getStartMonth() {
        return startMonth;
    }
    public void setStartMonth(String startMonth) {
        this.startMonth = startMonth;
    }
    @Column(DE.Time_de)
    public String getStopMonth() {
        return stopMonth;
    }
    public void setStopMonth(String stopMonth) {
        this.stopMonth = stopMonth;
    }
    @Column(DE.id_32)
    public String getProfessorId() {
        return professorId;
    }
    public void setProfessorId(String professorId) {
        this.professorId = professorId;
    }
    @Column(DE.string_de)
    public String getCompany() {
        return company;
    }
    public void setCompany(String company) {
        this.company = company;
    }
    @Column(DE.string_de)
    public String getTitle() {
        return title;
    }
    public void setTitle(String title) {
        this.title = title;
    }
    @Column(value = DE.String_de, dbType = "TEXT")
    public String getDescp() {
        return descp;
    }
    public void setDescp(String descp) {
        this.descp = descp;
    }
    @Column(DE.String_de)
    public String getDepartment() {
        return department;
    }
    public void setDepartment(String department) {
        this.department = department;
    }
}

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

@@ -102,7 +102,7 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
        this.office = office;
    }
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=false,nullable=true,renewable=false,queryable=true)
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=false,queryable=true)
    public String getSubject() {
        return subject;
    }
@@ -110,7 +110,7 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
    public void setSubject(String subject) {
        this.subject = subject;
    }
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=false,nullable=true,renewable=false,queryable=true)
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=false,queryable=true)
    public String getIndustry() {
        return industry;
    }
@@ -201,7 +201,7 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
    public void setName(String name) {
        this.name = name;
    }
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=false,nullable=true,renewable=false,queryable=true)
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=false,queryable=true)
    public String getDescp() {
        return descp;
    }
@@ -262,7 +262,7 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
        this.authentication = authentication;
    }
    @Column(handlerClass=WIntHandler.class,dbType="INT",insertable=false,nullable=false,renewable=false,queryable=true)
    @Column(handlerClass=WIntHandler.class,dbType="INT",insertable=true,nullable=false,renewable=false,queryable=true)
    public Integer getAuthType() {
        return authType;
    }
@@ -271,7 +271,7 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
        this.authType = authType;
    }
    @Column(handlerClass=WIntHandler.class,dbType="INT",insertable=false,nullable=false,renewable=false,queryable=true)
    @Column(handlerClass=WIntHandler.class,dbType="INT",insertable=true,nullable=false,renewable=false,queryable=true)
    public Integer getAuthStatus() {
        return authStatus;
    }
@@ -280,7 +280,7 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
        this.authStatus = authStatus;
    }
    @Column(handlerClass=WIntHandler.class,dbType="INT",insertable=false,nullable=true,renewable=false,queryable=true)
    @Column(handlerClass=WIntHandler.class,dbType="INT",insertable=true,nullable=true,renewable=false,queryable=true)
    public Integer getAuthStatusExpert() {
        return authStatusExpert;
    }
@@ -307,7 +307,7 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
        this.email = email;
    }
    @Column(handlerClass=WIntHandler.class,dbType="INT",insertable=false,nullable=false,renewable=false,queryable=true)
    @Column(handlerClass=WIntHandler.class,dbType="INT",insertable=true,nullable=false,renewable=false,queryable=true)
    public Integer getSortFirst() {
        return sortFirst;
    }

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

@@ -0,0 +1,112 @@
package com.ekexiu.console.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.core.enums.DE;
/**
 * Created by TT on 2017/7/14.
 */
@PrimaryKey({"id"})
@Table
public class ProfessorEduBg {
    private String id;
    private String professorId;
    private String year;
    private String school;
    private String college;
    private String major;
    private boolean student;
    private String degree;
    private String descp;
    @Column(DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(value = DE.Time_de, dbType = "CHAR(4)")
    public String getYear() {
        return year;
    }
    public void setYear(String year) {
        this.year = year;
    }
    @Column(DE.boolean_de)
    public boolean isStudent() {
        return student;
    }
    public void setStudent(boolean student) {
        this.student = student;
    }
    @Column(DE.String_de)
    public String getDegree() {
        return degree;
    }
    public void setDegree(String degree) {
        this.degree = degree;
    }
    /**
     * @return
     */
    @Column(DE.id_32)
    public String getProfessorId() {
        return professorId;
    }
    public void setProfessorId(String professorId) {
        this.professorId = professorId;
    }
    /**
     * @return
     */
    @Column(DE.string_de)
    public String getSchool() {
        return school;
    }
    public void setSchool(String school) {
        this.school = school;
    }
    @Column(DE.String_de)
    public String getCollege() {
        return college;
    }
    public void setCollege(String college) {
        this.college = college;
    }
    @Column(DE.String_de)
    public String getMajor() {
        return major;
    }
    public void setMajor(String major) {
        this.major = major;
    }
    @Column(value = DE.String_de, dbType = "TEXT")
    public String getDescp() {
        return descp;
    }
    public void setDescp(String descp) {
        this.descp = descp;
    }
}

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

@@ -0,0 +1,66 @@
package com.ekexiu.console.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.core.enums.DE;
/**
 * Created by TT on 2017/7/13.
 */
@PrimaryKey({"id"})
@Table
public class Project {
    private String id;
    private String professorId;
    private String startMonth;
    private String stopMonth;
    private String name;
    private String descp;
    @Column(DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(DE.time_de)
    public String getStartMonth() {
        return startMonth;
    }
    public void setStartMonth(String startMonth) {
        this.startMonth = startMonth;
    }
    @Column(DE.Time_de)
    public String getStopMonth() {
        return stopMonth;
    }
    public void setStopMonth(String stopMonth) {
        this.stopMonth = stopMonth;
    }
    @Column(DE.id_32)
    public String getProfessorId() {
        return professorId;
    }
    public void setProfessorId(String professorId) {
        this.professorId = professorId;
    }
    @Column(value= DE.string_de,dbType="TEXT")
    public String getName() {
        return name;
    }
    public void setName(String title) {
        this.name = title;
    }
    @Column(value=DE.String_de,dbType="TEXT")
    public String getDescp() {
        return descp;
    }
    public void setDescp(String descp) {
        this.descp = descp;
    }
}

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

@@ -0,0 +1,58 @@
package com.ekexiu.console.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.core.defaultImpl.StringHandler;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2017/7/13.
 */
@PrimaryKey({"professorId","caption"})
@Table
public class ResearchArea {
    private String professorId;
    private String caption;
    private String descp;
    private int sortNum;
    private int count;
    @Column(DE.int_de)
    public int getSortNum() {
        return sortNum;
    }
    public void setSortNum(int sortNum) {
        this.sortNum = sortNum;
    }
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
    public String getDescp() {
        return descp;
    }
    public void setDescp(String descp) {
        this.descp = descp;
    }
    @Column(DE.int_de)
    public int getCount() {
        return count;
    }
    public void setCount(int count) {
        this.count = count;
    }
    @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 caption) {
        this.caption = caption;
    }
}

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

@@ -0,0 +1,193 @@
package com.ekexiu.console.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.core.enums.DE;
import org.jfw.util.json.JsonService;
import org.jfw.util.reflect.TypeReference;
import java.lang.reflect.Type;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
/**
 * Created by TT on 2017/7/7.
 */
@PrimaryKey("id")
@Table
public class UserInfo implements Map<String, Object> {
    public static Type MAP_TYPE = (new TypeReference<Map<String, Object>>() {
    }).getType();
    private transient Map<String, Object> target = new HashMap<String, Object>();
    @Column(DE.id_32)
    public String getId() {
        return (String) this.get("id");
    }
    public void setId(String id) {
        this.put("id", id);
    }
    @Column(DE.id_32)
    public String getCreator() {
        return (String) this.get("creator");
    }
    public void setCreator(String creator) {
        this.put("creator", creator);
    }
    @Column(DE.Text_de)
    public String getCreatorName() {
        return (String) this.get("creatorName");
    }
    public void setCreatorName(String creatorName) {
        this.put("creatorName", creatorName);
    }
    @Column(DE.Text_de)
    public String getMobile() {
        return (String) this.get("mobile");
    }
    public void setMobile(String mobile) {
        this.put("mobile", mobile);
    }
    @Column(DE.Text_de)
    public String getEmail() {
        return (String) this.get("email");
    }
    public void setEmail(String email) {
        this.put("email", email);
    }
    @Column(DE.Text_de)
    public String getOrgName() {
        return (String) this.get("orgName");
    }
    public void setOrgName(String orgName) {
        this.put("orgName", orgName);
    }
    @Column(DE.text_de)
    public String getState() {
        return (String) this.get("state");
    }
    public void setState(String state) {
        this.put("state", state);
    }
    @Column(DE.text_de)
    public String getName() {
        return (String) this.get("name");
    }
    public void setName(String name) {
        this.put("name", name);
    }
    @Column(DE.text_de)
    public String getCreateTime() {
        return (String) this.get("createTime");
    }
    public void setCreateTime(String createTime) {
        this.put("createTime", createTime);
    }
    @Column(DE.text_de)
    public String getCnt() {
        return JsonService.toJson(this);
    }
    public void setCnt(String cnt) {
        Map<String, Object> map = JsonService.fromJson(cnt, MAP_TYPE);
        this.putAll(map);
    }
    public static void main(String[] args) throws Exception {
        UserInfo ui = new UserInfo();
        ui.setId("dddd");
        ui.setState("2");
        String s = JsonService.toJson(ui);
        System.out.println(s);
        ui = JsonService.fromJson(s, UserInfo.class);
        System.out.println(ui.getId());
        System.out.println(ui.getState());
    }
    @Override
    public int size() {
        return target.size();
    }
    @Override
    public boolean isEmpty() {
        return target.isEmpty();
    }
    @Override
    public boolean containsKey(Object key) {
        return target.containsKey(key);
    }
    @Override
    public boolean containsValue(Object value) {
        return target.containsValue(value);
    }
    @Override
    public Object get(Object key) {
        return target.get(key);
    }
    @Override
    public Object put(String key, Object value) {
        return target.put(key, value);
    }
    @Override
    public Object remove(Object key) {
        return target.remove(key);
    }
    @Override
    public void putAll(Map<? extends String, ?> m) {
        target.putAll(m);
    }
    @Override
    public void clear() {
        target.clear();
    }
    @Override
    public Set<String> keySet() {
        return target.keySet();
    }
    @Override
    public Collection<Object> values() {
        return target.values();
    }
    @Override
    public Set<Entry<String, Object>> entrySet() {
        return target.entrySet();
    }
}

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

@@ -1,21 +1,12 @@
package com.ekexiu.console.system.service;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import javax.sql.DataSource;
import com.ekexiu.console.system.dao.RoleDao;
import com.ekexiu.console.system.dao.UserRoleDao;
import com.ekexiu.console.system.po.Role;
import com.ekexiu.console.system.po.UserRole;
import com.ekexiu.console.system.vo.ConsoleAuthRole;
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;
@@ -27,10 +18,12 @@ import org.jfw.util.auth.AuthUtil;
import org.jfw.util.jdbc.JdbcTask;
import org.jfw.util.jdbc.JdbcUtil;
import com.ekexiu.console.system.dao.RoleDao;
import com.ekexiu.console.system.dao.UserRoleDao;
import com.ekexiu.console.system.po.Role;
import com.ekexiu.console.system.vo.ConsoleAuthRole;
import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
@Path("/sys/role")
public class RoleService {
@@ -113,18 +106,23 @@ public class RoleService {
	}
	@Path("/{id}")
	@Delete
	public void delete(@JdbcConn final Connection con, @PathVar final String id) throws SQLException {
	@Post
	public int delete(@JdbcConn final Connection con, @PathVar final String id) throws SQLException {
		final AtomicBoolean ab = new AtomicBoolean(false);
		JdbcUtil.executeAutoCommit(con, new JdbcTask() {
			@Override
			public void exec() throws SQLException {
				userRoleDao.deleteByRoleId(con, id);
				ab.set(roleDao.delete(con, id) > 0);
			}
		});
		if (ab.get())
			this.remove(id);
		UserRole userRole = userRoleDao.queryByRoleId(con, id);
		if (userRole == null) {
			JdbcUtil.executeAutoCommit(con, new JdbcTask() {
				@Override
				public void exec() throws SQLException {
					//userRoleDao.deleteByRoleId(con, id);
					ab.set(roleDao.delete(con, id) > 0);
				}
			});
			if (ab.get())
				this.remove(id);
			return 1;
		}
		return 0;
	}
	@Path("/all")

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

@@ -0,0 +1,338 @@
package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.*;
import com.ekexiu.console.system.po.*;
import com.ekexiu.console.system.vo.ConsoleAuthUser;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.LoginUser;
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.DateUtil;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.*;
/**
 * Created by TT on 2017/7/7.
 */
@Path("/userinfo")
public class UserInfoService {
    public static final String DEFAULT_PASS_WORD = "11111111111111111111111111111111";
    @Autowrie
    private UserInfoDao userInfoDao;
    @Autowrie
    private LuserDao luserDao;
    @Autowrie
    private ResearchAreaDao researchAreaDao;
    @Autowrie
    private ProjectDao projectDao;
    @Autowrie
    private HonorDao honorDao;
    @Autowrie
    private PartTimeJobDao partTimeJobDao;
    @Autowrie
    private ProfessorEduBgDao professorEduBgDao;
    @Autowrie
    private ProfessorService professorService;
    public PartTimeJobDao getPartTimeJobDao() {
        return partTimeJobDao;
    }
    public void setPartTimeJobDao(PartTimeJobDao partTimeJobDao) {
        this.partTimeJobDao = partTimeJobDao;
    }
    public ProfessorEduBgDao getProfessorEduBgDao() {
        return professorEduBgDao;
    }
    public void setProfessorEduBgDao(ProfessorEduBgDao professorEduBgDao) {
        this.professorEduBgDao = professorEduBgDao;
    }
    public HonorDao getHonorDao() {
        return honorDao;
    }
    public void setHonorDao(HonorDao honorDao) {
        this.honorDao = honorDao;
    }
    public ProjectDao getProjectDao() {
        return projectDao;
    }
    public void setProjectDao(ProjectDao projectDao) {
        this.projectDao = projectDao;
    }
    public ResearchAreaDao getResearchAreaDao() {
        return researchAreaDao;
    }
    public void setResearchAreaDao(ResearchAreaDao researchAreaDao) {
        this.researchAreaDao = researchAreaDao;
    }
    public static String getDefaultPassWord() {
        return DEFAULT_PASS_WORD;
    }
    public ProfessorService getProfessorService() {
        return professorService;
    }
    public void setProfessorService(ProfessorService professorService) {
        this.professorService = professorService;
    }
    public LuserDao getLuserDao() {
        return luserDao;
    }
    public void setLuserDao(LuserDao luserDao) {
        this.luserDao = luserDao;
    }
    public UserInfoDao getUserInfoDao() {
        return userInfoDao;
    }
    public void setUserInfoDao(UserInfoDao userInfoDao) {
        this.userInfoDao = userInfoDao;
    }
    @Path("/insert")
    @Put
    public void insert(@JdbcConn(true) Connection con, @RequestBody UserInfo userInfo, @LoginUser ConsoleAuthUser user) throws SQLException {
        String id = StringUtil.buildUUID();
        userInfo.setId(id);
        userInfo.setState("1");
        userInfo.setCreator(user.getId());
        userInfo.setCreatorName(user.getName());
        userInfo.setCreateTime(DateUtil.formatDateTime(System.currentTimeMillis()));
        this.userInfoDao.insert(con, userInfo);
    }
    @Path("/update")
    @Put
    public void update(@JdbcConn(true) Connection con, @RequestBody UserInfo userInfo) throws SQLException {
        this.userInfoDao.update(con, userInfo);
    }
    @Path("/updateState")
    @Post
    public void updateState(@JdbcConn(true) Connection con, String id) throws SQLException {
        UserInfo userInfo = this.userInfoDao.query(con, id);
        userInfo.setState("2");
        this.userInfoDao.update(con, userInfo);
    }
    @Delete
    @Path("/del/{id}")
    public int delete(@JdbcConn(true) Connection con, @PathVar String id) throws SQLException {
        UserInfo userInfo = this.userInfoDao.query(con, id);
        if (userInfo!=null) {
            if(Objects.equals(userInfo.getState(), "1") || Objects.equals(userInfo.getState(), "4")) {
                this.userInfoDao.delete(con, id);
                return 1;//删除成功
            }else {
                return 2;//无法删除
            }
        }else
            return 3;//没有账户
    }
    @Path("/id/{id}")
    @Get
    public UserInfo queryOne(@JdbcConn Connection con, @PathVar String id) throws SQLException {
        return this.userInfoDao.query(con, id);
    }
    @Path("/pq")
    @Get
    public PageQueryResult<UserInfo> pageQueryPerson(@JdbcConn Connection con, @LoginUser ConsoleAuthUser user, @Nullable String name, @Nullable String orgName, @Nullable String state, @Nullable String bt, @Nullable String et, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize) throws SQLException {
        return this.userInfoDao.queryPerson(con, user.getId(), name == null ? null : "%" + name + "%", orgName == null ? null : "%" + orgName + "%", state, bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
    }
    @Path("/pqAll")
    @Get
    PageQueryResult<UserInfo> pageQueryAll(@JdbcConn Connection con, @Nullable String name, @Nullable String orgName, @Nullable String state, @Nullable String bt, @Nullable String et, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize) throws SQLException {
        return this.userInfoDao.queryAll(con, name == null ? null : "%" + name + "%", orgName == null ? null : "%" + orgName + "%", state, bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
    }
    @Path("/entryCheck")
    @Get
    public Boolean entryCheck(@JdbcConn Connection con, @Nullable String mobile, @Nullable String email) throws SQLException {
        UserInfo userInfo1 = this.userInfoDao.entryCheck(con, mobile);
        UserInfo userInfo2 = this.userInfoDao.entryCheck(con, email);
        Luser luser1 = this.luserDao.check(con, mobile);
        Luser luser2 = this.luserDao.check(con, email);
        return userInfo1 == null && userInfo2 == null && luser1 == null && luser2 == null;
    }
    @Path("/reviewCheck")
    @Get
    public Boolean reviewCheck(@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("/import")
    @Post
    public int importData(@JdbcConn(true) Connection con, String id, String reviewer, String reviewTime, String reviewerName,
                           Integer authentication, Integer authStatus, Integer authStatusExpert, @Nullable Integer sortFirst) throws SQLException, IOException {
        UserInfo userInfo = this.userInfoDao.query(con, id);
        if (userInfo!=null) {
            if (Objects.equals(userInfo.getState(), "2")) {
                userInfo.setState("3");
                userInfo.put("reviewer", reviewer);
                userInfo.put("reviewTime", reviewTime);
                userInfo.put("reviewerName", reviewerName);
                userInfo.put("authentication", authentication);
                userInfo.put("authStatus", authStatus);
                userInfo.put("authStatusExpert", authStatusExpert);
                userInfo.put("sortFirst", sortFirst);
                this.userInfoDao.update(con, userInfo);
                Luser luser = new Luser();
                luser.setId(userInfo.getId());
                luser.setEmail(userInfo.getEmail());
                Random rd = new Random();
                int code = rd.nextInt(1000000);
                String inviteCode = String.format("%06d", code);
                luser.setInviteCode(inviteCode);
                luser.setMobilePhone(userInfo.getMobile());
                luser.setPasswd(DEFAULT_PASS_WORD);
                luser.setUserType("0");
                luser.setCreateTime(userInfo.getCreateTime());
                this.luserDao.insert(con, luser);
                Professor professor = new Professor();
                professor.setId(userInfo.getId());
                professor.setName(userInfo.getName());
                professor.setEmail((String) userInfo.get("pEmail"));
                professor.setPhone((String) userInfo.get("pMobile"));
                professor.setTitle((String) userInfo.get("title"));
                professor.setOffice((String) userInfo.get("office"));
                professor.setSubject((String) userInfo.get("subject"));
                professor.setDepartment((String) userInfo.get("department"));
                professor.setIndustry((String) userInfo.get("industry"));
                professor.setDescp((String) userInfo.get("descp"));
                professor.setCreateTime(userInfo.getCreateTime());
                professor.setModifyTime(userInfo.getCreateTime());
                professor.setAddress((String) userInfo.get("address"));
                professor.setProvince((String) userInfo.get("province"));
                professor.setAuthentication((Integer) userInfo.get("authentication"));
                professor.setAuthType(1);
                if(userInfo.get("authStatus")!=null) {
                    professor.setAuthStatus((Integer) userInfo.get("authStatus"));
                }else {
                    professor.setAuthStatus(0);
                }
                if (userInfo.get("authStatusExpert")!=null) {
                    professor.setAuthStatusExpert((Integer) userInfo.get("authStatusExpert"));
                }else {
                    professor.setAuthStatusExpert(0);
                }
                if (userInfo.get("sortFirst")!=null) {
                    professor.setSortFirst((Integer) userInfo.get("sortFirst"));
                }else {
                    professor.setSortFirst(0);
                }
                professor.setProfessorState(0);
                this.professorService.insert(con, professor, userInfo.getOrgName());
                ArrayList<String> areas = (ArrayList<String>) userInfo.get("researchArea");
                if (areas != null) {
                    ResearchArea researchArea = new ResearchArea();
                    int sortNum = 1;
                    for (String area : areas) {
                        researchArea.setProfessorId(userInfo.getId());
                        researchArea.setCaption(area);
                        researchArea.setSortNum(sortNum++);
                        this.researchAreaDao.insert(con, researchArea);
                    }
                }
                ArrayList<Map<String, Object>> projects = (ArrayList<Map<String, Object>>) userInfo.get("projects");
                if (projects != null) {
                    for (Map<String, Object> project : projects) {
                        Project project1 = new Project();
                        String projectId = StringUtil.buildUUID();
                        project1.setId(projectId);
                        project1.setName((String) project.get("projectName"));
                        project1.setProfessorId(userInfo.getId());
                        project1.setDescp((String) project.get("projectDescp"));
                        project1.setStartMonth((String) project.get("projectStart"));
                        project1.setStopMonth((String) project.get("projectStop"));
                        this.projectDao.insert(con, project1);
                    }
                }
                ArrayList<Map<String, Object>> honors = (ArrayList<Map<String, Object>>) userInfo.get("honors");
                if (honors != null) {
                    for (Map<String, Object> honor : honors) {
                        Honor honor1 = new Honor();
                        String honorId = StringUtil.buildUUID();
                        honor1.setId(honorId);
                        honor1.setProfessorId(userInfo.getId());
                        honor1.setName((String) honor.get("honorName"));
                        honor1.setDescp((String) honor.get("honorDescp"));
                        honor1.setYear((String) honor.get("honorYear"));
                        this.honorDao.insert(con, honor1);
                    }
                }
                ArrayList<Map<String, Object>> jobs = (ArrayList<Map<String, Object>>) userInfo.get("jobs");
                if (jobs != null) {
                    for (Map<String, Object> job : jobs) {
                        PartTimeJob partTimeJob = new PartTimeJob();
                        String jobId = StringUtil.buildUUID();
                        partTimeJob.setId(jobId);
                        partTimeJob.setProfessorId(userInfo.getId());
                        partTimeJob.setCompany((String) job.get("jobCompany"));
                        partTimeJob.setDepartment((String) job.get("jobDepartment"));
                        partTimeJob.setTitle((String) job.get("jobTitle"));
                        partTimeJob.setStartMonth((String) job.get("jobStart"));
                        partTimeJob.setStopMonth((String) job.get("jobStop"));
                        this.partTimeJobDao.insert(con, partTimeJob);
                    }
                }
                List<Map<String, Object>> edus = (List<Map<String, Object>>) userInfo.get("edus");
                if (edus != null) {
                    for (Map<String, Object> edu : edus) {
                        ProfessorEduBg professorEduBg = new ProfessorEduBg();
                        String eduId = StringUtil.buildUUID();
                        professorEduBg.setId(eduId);
                        professorEduBg.setProfessorId(userInfo.getId());
                        professorEduBg.setSchool((String) edu.get("eduSchool"));
                        professorEduBg.setCollege((String) edu.get("eduCollege"));
                        professorEduBg.setMajor((String) edu.get("eduMajor"));
                        professorEduBg.setDegree((String) edu.get("eduDegree"));
                        professorEduBg.setYear((String) edu.get("eduYear"));
                        this.professorEduBgDao.insert(con, professorEduBg);
                    }
                }
                return 1;//导入成功
            }else
                return 2;//状态不符合要求
        }else
            return 3;//用户不存在
    }
}

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

@@ -211,7 +211,7 @@ public class UserService extends Upload {
	@Post
	@Path("/del")
	public void delete(@JdbcConn(true) Connection con, String[] ids) throws SQLException {
		this.userDao.delete(con, ids);
		this.userDao.delete(con, ids,false);
	}
	@Get

src/main/resources/database.sql

@@ -0,0 +1,29 @@
-- ----------------------------
-- Table structure for user_info
-- ----------------------------
CREATE TABLE public.user_info (
  id CHARACTER(32) PRIMARY KEY NOT NULL,
  org_name TEXT, -- 机构名称
  state TEXT NOT NULL, -- 审核状态(1-未提交，2-待审核，3-审核通过，4-审核失败)
  name TEXT NOT NULL, -- 姓名
  create_time TEXT NOT NULL, -- 创建时间
  cnt TEXT NOT NULL, -- 详细信息
  creator CHARACTER(32) NOT NULL, -- 创建人ID
  creator_name TEXT, -- 创建人姓名
  mobile TEXT, -- 注册手机
  email TEXT -- 注册邮箱
);
COMMENT ON COLUMN public.user_info.org_name IS '机构名称';
COMMENT ON COLUMN public.user_info.state IS '审核状态(1-未提交，2-待审核，3-审核通过，4-审核失败)';
COMMENT ON COLUMN public.user_info.name IS '姓名';
COMMENT ON COLUMN public.user_info.create_time IS '创建时间';
COMMENT ON COLUMN public.user_info.cnt IS '详细信息';
COMMENT ON COLUMN public.user_info.creator IS '创建人ID';
COMMENT ON COLUMN public.user_info.creator_name IS '创建人姓名';
COMMENT ON COLUMN public.user_info.mobile IS '注册手机';
COMMENT ON COLUMN public.user_info.email IS '注册邮箱';
-- ----------------------------
-- Uniques structure for table user_info
-- ----------------------------
ALTER TABLE USER_INFO ADD PRIMARY KEY (ID);

src/main/resources/project-dev.properties

@@ -49,7 +49,7 @@ dataSource.defaultAutoCommit::boolean=false
com_ekexiu_console_system_service_OrgService.tmpPath::java.io.File=/kexiu/www/html/images/tmp
com_ekexiu_console_system_service_OrgService.imagePath::java.io.File=/kexiu/www/html/images
cachedFileUploadServlet.cachePath::java.io.File=/kexiu/www/html/images/tmp
用户默认头像保存路径
#用户默认头像保存路径
com_ekexiu_console_system_service_OrgService.defaultHeadPhoto::java.io.File=/kexiu/www/html/images/default-photo.jpg
#机构默认图片保存路径
com_ekexiu_console_system_service_OrgService.defaultOrgLogo::java.io.File=/kexiu/www/html/images/default-icon.jpg