Merge branch 'org'

# Conflicts:
#	src/main/java/com/ekexiu/console/system/dao/UserInfoDao.java
#	src/main/java/com/ekexiu/console/system/service/UserInfoService.java

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

@@ -0,0 +1,41 @@
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.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.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
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.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/26.
 */
@DAO
public interface ArticleDao {
    @Nullable
    @QueryVal
    @Column(handlerClass = StringHandler.class, value = "article_title")
    @From(Article.class)
    String queryById(Connection con, String articleId) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC NULLS LAST")
    PageQueryResult<ArticleInfo> queryByTime(Connection con, @Nullable @Like String articleTitle, @Nullable @Like String professorName, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY page_views DESC NULLS LAST")
    PageQueryResult<ArticleInfo> queryByPV(Connection con, @Nullable @Like String articleTitle,@Nullable @Like String professorName, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
}

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

@@ -0,0 +1,35 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.Feedback;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
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.LtEq;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/25.
 */
@DAO
public interface FeedbackDao {
    @Update
    int update(Connection con, Feedback feedback) throws SQLException;
    @SelectOne
    @Nullable
    Feedback query(Connection con, long id) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC")
    PageQueryResult<Feedback> query(Connection con,@Nullable String state, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
}

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

@@ -0,0 +1,26 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.LeaveWord;
import org.jfw.apt.annotation.DefaultValue;
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.operator.QueryVal;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/27.
 */
@DAO
public abstract class LeaveWordDao {
    @QueryVal
    @From(LeaveWord.class)
    @Column(handlerClass=IntHandler.class,value={"COUNT(1)"})
    @DefaultValue("0")
    public abstract int queryCount(Connection con, String articleId)throws SQLException;
}

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

@@ -9,8 +9,7 @@ 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.*;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.*;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
@@ -38,13 +37,21 @@ public interface OrgDao {
	@QueryOne
	OrganizationInfo query(Connection con, String id) throws SQLException;
	@UpdateWith
	@From(Organization.class)
	int updateOrgName(Connection con,String id,@Set String name)throws SQLException;
	@UpdateWith
	@From(Organization.class)
	int updateAuthStatus(Connection con,String id,@Set String authStatus)throws SQLException;
	@PageQuery
	@OrderBy(" ORDER BY create_time DESC")
	PageQueryResult<OrganizationInfo> query(Connection con,@Nullable @Like String inviterId, @Nullable @Like String name, @Nullable @Like String industry, @Nullable @Like String subject, @Nullable @Like String city, int pageSize, int pageNo) throws SQLException;
	@OrderBy(" ORDER BY create_time DESC NULLS LAST")
	PageQueryResult<OrganizationInfo> queryTime(Connection con, @Nullable @Like String name, @Nullable @Like String industry, @Nullable @Like String subject, @Nullable @Like String city, @Nullable String authStatus, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
	@PageQuery
	@OrderBy(" ORDER BY page_views DESC NULLS LAST")
	PageQueryResult<OrganizationInfo> queryViews(Connection con, @Nullable @Like String name, @Nullable @Like String industry, @Nullable @Like String subject, @Nullable @Like String city, @Nullable String authStatus, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
	@Nullable
	@QueryVal
@@ -52,4 +59,17 @@ public interface OrgDao {
	@From(Organization.class)
	String queryByName(Connection con,String name)throws SQLException;
	@Nullable
	@SelectOne
	Organization entryCheck(Connection con, @Nullable String name) throws SQLException;
	@UpdateWith
	@From(Organization.class)
	int updateBusinessData(Connection con,String id,@Set String authStatus,@Set Long sortNum)throws SQLException;
	@Nullable
	@QueryVal
	@Column(handlerClass = StringHandler.class, value = "name")
	@From(Organization.class)
	String queryById(Connection con, String id) throws SQLException;
}

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

@@ -0,0 +1,35 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.OrgRecord;
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.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.operator.SelectOne;
import org.jfw.apt.orm.annotation.dao.method.operator.Update;
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;
/**
 * Created by TT on 2017/7/21.
 */
@DAO
public interface OrgRecordDao {
    @Insert
    int insert(Connection con, OrgRecord orgRecord) throws SQLException;
    @Update
    int update(Connection con, OrgRecord orgRecord) throws SQLException;
    @Nullable
    @SelectOne
    OrgRecord queryById(Connection con, String id) throws SQLException;
    @UpdateWith
    @From(OrgRecord.class)
    int updateModifier(Connection con,String id,@Set String modifier,@Set String modifyTime)throws SQLException;
}

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

@@ -1,8 +1,13 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.OrgUser;
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.operator.Insert;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.*;
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;
@@ -16,4 +21,24 @@ public interface OrgUserDao {
    @Insert
    int insert(Connection con, OrgUser orgUser) throws SQLException;
    @Nullable
    @QueryOne
    OrgUser query(Connection con, String id) throws SQLException;
    @Nullable
    @QueryVal
    @Column(handlerClass=StringHandler.class,value="id")
    @From(OrgUser.class)
    String queryByEmail(Connection con,String email)throws SQLException;
    @Update
    int update(Connection con, OrgUser org) throws SQLException;
    @UpdateWith
    @From(OrgUser.class)
    int updateEmail(Connection con,String id,@Set String email)throws SQLException;
    @Nullable
    @SelectOne
    OrgUser entryCheck(Connection con, @Nullable String email) throws SQLException;
}

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

@@ -0,0 +1,40 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.Ppaper;
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.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
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.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/26.
 */
@DAO
public interface PpaperDao {
    @Nullable
    @QueryVal
    @Column(handlerClass = StringHandler.class, value = "name")
    @From(Ppaper.class)
    String queryById(Connection con, String id) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC NULLS LAST")
    PageQueryResult<Ppaper> queryByTime(Connection con, @Nullable @Like String name, @Nullable @Like String authors, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY page_views DESC NULLS LAST")
    PageQueryResult<Ppaper> queryByPV(Connection con, @Nullable @Like String name,@Nullable @Like String authors, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
}

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

@@ -0,0 +1,40 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.Ppatent;
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.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
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.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/26.
 */
@DAO
public interface PpatentDao {
    @Nullable
    @QueryVal
    @Column(handlerClass = StringHandler.class, value = "name")
    @From(Ppatent.class)
    String queryById(Connection con, String id) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC NULLS LAST")
    PageQueryResult<Ppatent> queryByTime(Connection con, @Nullable @Like String name, @Nullable @Like String reqPerson, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY page_views DESC NULLS LAST")
    PageQueryResult<Ppatent> queryByPV(Connection con, @Nullable @Like String name,@Nullable @Like String reqPerson, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
}

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

@@ -4,12 +4,14 @@ import com.ekexiu.console.system.po.Professor;
import com.ekexiu.console.system.pojo.ProfessorInfo;
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;
import org.jfw.apt.orm.annotation.dao.method.IncludeFixSet;
import org.jfw.apt.orm.annotation.dao.method.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.*;
import org.jfw.apt.orm.annotation.dao.param.*;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
@@ -71,4 +73,10 @@ public interface ProfessorDao {
    @UpdateWith
    @From(Professor.class)
    int[] updateAuthStatusExpert(Connection con, @Batch String[] id, @Set Integer authStatusExpert) throws SQLException;
    @Nullable
    @QueryVal
    @Column(handlerClass = StringHandler.class, value = "name")
    @From(Professor.class)
    String queryById(Connection con, String id) throws SQLException;
}

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

@@ -0,0 +1,40 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.Resource;
import com.ekexiu.console.system.pojo.ResourceInfo;
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.OrderBy;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryVal;
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.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/26.
 */
@DAO
public interface ResourceDao {
    @Nullable
    @QueryVal
    @Column(handlerClass = StringHandler.class, value = "resource_name")
    @From(Resource.class)
    String queryById(Connection con, String resourceId) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC NULLS LAST")
    PageQueryResult<ResourceInfo> queryByTime(Connection con, @Nullable @Like String resourceName, @Nullable @Like String professorName, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY page_views DESC NULLS LAST")
    PageQueryResult<ResourceInfo> queryByPV(Connection con, @Nullable @Like String resourceName,@Nullable @Like String professorName, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
}

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

@@ -44,11 +44,17 @@ public interface UserInfoDao {
    @PageQuery
    @OrderBy(" ORDER BY create_time DESC")
    @Where("state<>'1'")
    PageQueryResult<UserInfo> queryAll(Connection con, @Nullable @Like String creatorName,@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;
    PageQueryResult<UserInfo> queryAll(Connection con, @Nullable @Like String creatorName,@Nullable @Like Stringname, @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;
    @Nullable
    @QueryVal
    @Column(handlerClass=StringHandler.class,value="id")
    @From(UserInfo.class)
    String queryByKey(Connection con,@Alias({ "mobile", "email" }) String key)throws SQLException;
}

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

@@ -0,0 +1,24 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.Watch;
import org.jfw.apt.annotation.DefaultValue;
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.operator.QueryVal;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/27.
 */
@DAO
public interface WatchDao {
    @QueryVal
    @From(Watch.class)
    @Column(value = "COUNT(1)", handlerClass = IntHandler.class)
    @DefaultValue("0")
    public abstract int countProfessor(Connection con, String watchObject, short watchType) throws SQLException;
}

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

@@ -0,0 +1,148 @@
package com.ekexiu.console.system.po;
import com.ekexiu.console.basepo.CreateTimeSupported;
import com.ekexiu.console.basepo.ModifyTimeSupported;
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.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2017/7/26.
 */
@Table
@PrimaryKey("articleId")
public class Article implements CreateTimeSupported, ModifyTimeSupported {
    private String articleId;
    private String professorId;
    private String articleTitle;
    private String articleContent;
    private String subject;
    private String industry;
    private String createTime;
    private String modifyTime;
    private String publishTime;
    private String articleImg;
    private String orgId;
    private String articleType;
    private int articleAgree;
    private int pageViews;
    private String status;
    private long shareId;
    @Column(DE.id_32)
    public String getArticleId() {
        return articleId;
    }
    public void setArticleId(String articleId) {
        this.articleId = articleId;
    }
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",nullable=true,renewable=false)
    public String getProfessorId() {
        return professorId;
    }
    public void setProfessorId(String professorId) {
        this.professorId = professorId;
    }
    @Column(value= DE.string_de,dbType="TEXT")
    public String getArticleTitle() {
        return articleTitle;
    }
    public void setArticleTitle(String articleTitle) {
        this.articleTitle = articleTitle;
    }
    @Column(value=DE.String_de,dbType="TEXT")
    public String getArticleContent() {
        return articleContent;
    }
    public void setArticleContent(String articleContent) {
        this.articleContent = articleContent;
    }
    @Column(value=DE.String_de,dbType="TEXT")
    public String getSubject() {
        return subject;
    }
    public void setSubject(String subject) {
        this.subject = subject;
    }
    @Column(value=DE.String_de,dbType="TEXT")
    public String getIndustry() {
        return industry;
    }
    public void setIndustry(String industry) {
        this.industry = industry;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    public String getModifyTime() {
        return modifyTime;
    }
    public void setModifyTime(String modifyTime) {
        this.modifyTime = modifyTime;
    }
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(14)",nullable=true,renewable=false)
    public String getPublishTime() {
        return publishTime;
    }
    public void setPublishTime(String publishTime) {
        this.publishTime = publishTime;
    }
    @Column(DE.String_de)
    public String getArticleImg() {
        return articleImg;
    }
    public void setArticleImg(String articleImg) {
        this.articleImg = articleImg;
    }
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",nullable=true,renewable=false)
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(1)",nullable=true,renewable=false)
    public String getArticleType() {
        return articleType;
    }
    public void setArticleType(String articleType) {
        this.articleType = articleType;
    }
    @Column(handlerClass=IntHandler.class,dbType="INTEGER",renewable=false)
    public int getArticleAgree() {
        return articleAgree;
    }
    public void setArticleAgree(int articleAgree) {
        this.articleAgree = articleAgree;
    }
    @Column(handlerClass=IntHandler.class,dbType="INTEGER",nullable=true,renewable=false)
    public int getPageViews() {
        return pageViews;
    }
    public void setPageViews(int pageViews) {
        this.pageViews = pageViews;
    }
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(1)",nullable=true,renewable=false)
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @Column(DE.bigSerial)
    public long getShareId() {
        return shareId;
    }
    public void setShareId(long shareId) {
        this.shareId = shareId;
    }
}

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

@@ -0,0 +1,165 @@
package com.ekexiu.console.system.po;
import com.ekexiu.console.basepo.CreateTimeSupported;
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.FixLenStringHandler;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2017/7/25.
 */
@PrimaryKey("id")
@Table
public class Feedback implements CreateTimeSupported {
    private long id;
    private String title;
    private int category;// int4 NOT NULL,
    private int schema;// int4 NOT NULL,
    private String param;// text NOT NULL,
    private String content;// text NOT NULL,
    private String createTime;// char(14) NOT NULL,
    private String state;// char(1) NOT NULL,
    private String userId;
    private String operator;
    private String operateTime;
    private String operateDescp;
    private String operatorName;
    private String userName;
    private String dataName;
    @Override
    public String getCreateTime() {
        return this.createTime;
    }
    @Override
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(DE.bigSerial)
    public long getId() {
        return id;
    }
    public void setId(long id) {
        this.id = id;
    }
    @Column(DE.Text_de)
    public String getTitle() {
        return title;
    }
    public void setTitle(String title) {
        this.title = title;
    }
    @Column(DE.int_de)
    public int getCategory() {
        return category;
    }
    public void setCategory(int category) {
        this.category = category;
    }
    @Column(DE.int_de)
    public int getSchema() {
        return schema;
    }
    public void setSchema(int schema) {
        this.schema = schema;
    }
    @Column(DE.text_de)
    public String getParam() {
        return param;
    }
    public void setParam(String param) {
        this.param = param;
    }
    @Column(DE.text_de)
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    @Column(DE.singleChar)
    public String getState() {
        return state;
    }
    public void setState(String state) {
        this.state = state;
    }
    @Column(DE.Text_de)
    public String getUserId() {
        return userId;
    }
    public void setUserId(String userId) {
        this.userId = userId;
    }
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",insertable=true,nullable=true,renewable=true,queryable=true)
    public String getOperator() {
        return operator;
    }
    public void setOperator(String operator) {
        this.operator = operator;
    }
    @Column(DE.Text_de)
    public String getOperateTime() {
        return operateTime;
    }
    public void setOperateTime(String operateTime) {
        this.operateTime = operateTime;
    }
    @Column(DE.Text_de)
    public String getOperateDescp() {
        return operateDescp;
    }
    public void setOperateDescp(String operateDescp) {
        this.operateDescp = operateDescp;
    }
    public String getOperatorName() {
        return operatorName;
    }
    public void setOperatorName(String operatorName) {
        this.operatorName = operatorName;
    }
    public String getUserName() {
        return userName;
    }
    public void setUserName(String userName) {
        this.userName = userName;
    }
    public String getDataName() {
        return dataName;
    }
    public void setDataName(String dataName) {
        this.dataName = dataName;
    }
}

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

@@ -0,0 +1,64 @@
package com.ekexiu.console.system.po;
import com.ekexiu.console.basepo.CreateTimeSupported;
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/27.
 */
@PrimaryKey("id")
@Table
public class LeaveWord implements CreateTimeSupported {
    private String id;
    private String content;
    private String sender;
    private String articleId;
    private String createTime;
    private long orderKey;
    @Column(DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(DE.text_de)
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    @Column(DE.id_32)
    public String getSender() {
        return sender;
    }
    public void setSender(String sender) {
        this.sender = sender;
    }
    @Column(DE.id_32)
    public String getArticleId() {
        return articleId;
    }
    public void setArticleId(String articleId) {
        this.articleId = articleId;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(DE.long_de)
    public long getOrderKey() {
        return orderKey;
    }
    public void setOrderKey(long orderKey) {
        this.orderKey = orderKey;
    }
}

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

@@ -0,0 +1,68 @@
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.FixLenStringHandler;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2017/7/20.
 */
@Table
@PrimaryKey("id")
public class OrgRecord {
    private String id;
    private String createTime;
    private String creator;
    private String modifyTime;
    private String modifier;
    @Column(DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",insertable=true,nullable=true,renewable=true,queryable=true)
    public String getCreator() {
        return creator;
    }
    public void setCreator(String creator) {
        this.creator = creator;
    }
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",insertable=true,nullable=true,renewable=true,queryable=true)
    public String getModifier() {
        return modifier;
    }
    public void setModifier(String modifier) {
        this.modifier = modifier;
    }
    @Column(DE.Text_de)
    public String getModifyTime() {
        return modifyTime;
    }
    public void setModifyTime(String modifyTime) {
        this.modifyTime = modifyTime;
    }
    @Column(DE.Text_de)
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
}

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

@@ -7,6 +7,7 @@ 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.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.LongHandler;
import org.jfw.apt.orm.core.enums.DE;
@PrimaryKey("id")
@@ -32,6 +33,36 @@ public class Organization implements CreateTimeSupported, ModifyTimeSupported, D
    private String descp;
    private String authStatus;
    /**
     * 详细地址
     */
    private String addr;
    /**
     * 联系邮箱
     */
    private String email;
    /**
     * 联系电话
     */
    private String contactNum;
    /**
     * 客户领域
     */
    private String fieldOfCustomer;
    /**
     * 供应商领域
     */
    private String fieldOfSupplier;
    /**
     * 排序字段
     */
    private long sortNum;
    /**
     * 浏览量
     */
    private long pageViews;
    @Column(DE.string_de)
    public String getAuthStatus() {
        return authStatus;
@@ -192,5 +223,56 @@ public class Organization implements CreateTimeSupported, ModifyTimeSupported, D
        this.isJoin = isJoin;
    }
    @Column(DE.Text_de)
    public String getAddr() {
        return addr;
    }
    public void setAddr(String addr) {
        this.addr = addr;
    }
    @Column(DE.Text_de)
    public String getEmail() {
        return email;
    }
    public void setEmail(String email) {
        this.email = email;
    }
    @Column(DE.Text_de)
    public String getContactNum() {
        return contactNum;
    }
    public void setContactNum(String contactNum) {
        this.contactNum = contactNum;
    }
    @Column(DE.Text_de)
    public String getFieldOfCustomer() {
        return fieldOfCustomer;
    }
    public void setFieldOfCustomer(String fieldOfCustomer) {
        this.fieldOfCustomer = fieldOfCustomer;
    }
    @Column(DE.Text_de)
    public String getFieldOfSupplier() {
        return fieldOfSupplier;
    }
    public void setFieldOfSupplier(String fieldOfSupplier) {
        this.fieldOfSupplier = fieldOfSupplier;
    }
    @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;
    }
    @Column(handlerClass=LongHandler.class,dbType="BIGINT",fixSqlValueWithInsert="0",insertable=true,renewable=false,nullable=false,queryable=true)
    public long getPageViews() {
        return pageViews;
    }
    public void setPageViews(long pageViews) {
        this.pageViews = pageViews;
    }
}

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

@@ -0,0 +1,132 @@
package com.ekexiu.console.system.po;
import com.ekexiu.console.basepo.CreateTimeSupported;
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/26.
 */
@PrimaryKey("id")
@Table
public class Ppaper implements CreateTimeSupported {
    private String id; // char(32)  NOT NULL,
    private String name; // text COLLATE "zh_CN.utf8" NOT NULL,
    private long pageViews;// int8 DEFAULT 0 NOT NULL,
    private String cn4periodical;// text,
    private String en4periodical;// text,
    private String periodicaltype;// text,
    private String pubDay;// text,
    private String summary;// text COLLATE "zh_CN.utf8" NOT NULL,
    private String keywords;// text COLLATE "zh_CN.utf8",
    private String ref_param;// text);
    private String createTime;
    private String authors;
    private long sortNum;
    private long shareId;
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(DE.text_de)
    public String getAuthors() {
        return authors;
    }
    public void setAuthors(String authors) {
        this.authors = authors;
    }
    @Column(DE.long_de)
    public long getSortNum() {
        return sortNum;
    }
    public void setSortNum(long sortNum) {
        this.sortNum = sortNum;
    }
    @Column(DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(DE.text_de)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(value=DE.long_de)
    public long getPageViews() {
        return pageViews;
    }
    public void setPageViews(long pageViews) {
        this.pageViews = pageViews;
    }
    @Column(DE.Text_de)
    public String getCn4periodical() {
        return cn4periodical;
    }
    public void setCn4periodical(String cn4periodical) {
        this.cn4periodical = cn4periodical;
    }
    @Column(DE.Text_de)
    public String getEn4periodical() {
        return en4periodical;
    }
    public void setEn4periodical(String en4periodical) {
        this.en4periodical = en4periodical;
    }
    @Column(DE.Text_de)
    public String getPeriodicaltype() {
        return periodicaltype;
    }
    public void setPeriodicaltype(String periodicaltype) {
        this.periodicaltype = periodicaltype;
    }
    @Column(DE.text_de)
    public String getPubDay() {
        return pubDay;
    }
    public void setPubDay(String pubDay) {
        this.pubDay = pubDay;
    }
    @Column(DE.text_de)
    public String getSummary() {
        return summary;
    }
    public void setSummary(String summary) {
        this.summary = summary;
    }
    @Column(DE.Text_de)
    public String getKeywords() {
        return keywords;
    }
    public void setKeywords(String keywords) {
        this.keywords = keywords;
    }
    @Column(DE.Text_de)
    public String getRef_param() {
        return ref_param;
    }
    public void setRef_param(String ref_param) {
        this.ref_param = ref_param;
    }
    @Column(DE.bigSerial)
    public long getShareId() {
        return shareId;
    }
    public void setShareId(long shareId) {
        this.shareId = shareId;
    }
}

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

@@ -0,0 +1,166 @@
package com.ekexiu.console.system.po;
import com.ekexiu.console.basepo.CreateTimeSupported;
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/26.
 */
@PrimaryKey("id")
@Table
public class Ppatent implements CreateTimeSupported {
    private String id;// char(32) NOT NULL,
    private String name;// text COLLATE "zh_CN.utf8" NOT NULL,
    private long pageViews;// int8 DEFAULT 0 NOT NULL,
    private String code;// text NOT NULL,
    private String reqCode;// text NOT NULL,
    private String reqPerson;// text COLLATE "zh_CN.utf8",
    private String reqDay;// char(8) NOT NULL,
    private String pubDay;// char(8) NOT NULL,
    private String summary;// text COLLATE "zh_CN.utf8" NOT NULL,
    private String ref_param;// text ,
    private String keywords;// text COLLATE "zh_CN.utf8"
    private String createTime;
    private String authors;
    private long sortNum;
    private long shareId;
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(DE.text_de)
    public String getAuthors() {
        return authors;
    }
    public void setAuthors(String authors) {
        this.authors = authors;
    }
    @Column(DE.long_de)
    public long getSortNum() {
        return sortNum;
    }
    public void setSortNum(long sortNum) {
        this.sortNum = sortNum;
    }
    @Column(DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(DE.text_de)
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    @Column(DE.long_de)
    public long getPageViews() {
        return pageViews;
    }
    public void setPageViews(long pageViews) {
        this.pageViews = pageViews;
    }
    @Column(DE.Text_de)
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    @Column(DE.Text_de)
    public String getReqCode() {
        return reqCode;
    }
    public void setReqCode(String reqCode) {
        this.reqCode = reqCode;
    }
    @Column(DE.Text_de)
    public String getReqPerson() {
        return reqPerson;
    }
    public void setReqPerson(String reqPerson) {
        this.reqPerson = reqPerson;
    }
    @Column(DE.Text_de)
    public String getReqDay() {
        return reqDay;
    }
    public void setReqDay(String reqDay) {
        this.reqDay = reqDay;
    }
    @Column(DE.Text_de)
    public String getPubDay() {
        return pubDay;
    }
    public void setPubDay(String pubDay) {
        this.pubDay = pubDay;
    }
    @Column(DE.text_de)
    public String getSummary() {
        return summary;
    }
    public void setSummary(String summary) {
        this.summary = summary;
    }
    @Column(DE.Text_de)
    public String getRef_param() {
        return ref_param;
    }
    public void setRef_param(String ref_param) {
        this.ref_param = ref_param;
    }
    @Column(DE.Text_de)
    public String getKeywords() {
        return keywords;
    }
    public void setKeywords(String keywords) {
        this.keywords = keywords;
    }
    @Column(DE.bigSerial)
    public long getShareId() {
        return shareId;
    }
    public void setShareId(long shareId) {
        this.shareId = shareId;
    }
}

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

@@ -0,0 +1,250 @@
package com.ekexiu.console.system.po;
import com.ekexiu.console.basepo.CreateTimeSupported;
import com.ekexiu.console.basepo.ModifyTimeSupported;
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.FixLenStringHandler;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2017/7/26.
 */
@PrimaryKey("resourceId")
@Table
public class Resource implements CreateTimeSupported, ModifyTimeSupported {
    private String resourceId;
    private String resourceName;
    /**
     * 关键字
     */
    private String subject;
    private String industry;
    /**
     * 资源提供的服务、应用用途
     */
    private String supportedServices;
    private String orgName;
    /**
     * 厂商及型号规格
     */
    private String spec;
    /**
     * 性能参数
     */
    private String parameter;
    /**
     *
     */
    private String status;
    private String descp;
    private String professorId;
    /**
     * 资源所属（个人/机构）
     */
    private String ascription;
    private String createTime;
    private String modifyTime;
    private String hopePayMethod;
    /**
     * 合作备注
     */
    private String cooperationNotes;
    /**
     * 发布时间
     */
    private String publishTime;
    /**
     * 浏览量
     */
    private int pageViews;
    /**
     * 所在单位
     */
    private String comp;
    /**
     * 资源类型(1-个人资源，2-企业资源)
     */
    private String resourceType;
    private String orgId;
    private long shareId;
    @Column(DE.id_32)
    public String getResourceId() {
        return resourceId;
    }
    public void setResourceId(String resourceId) {
        this.resourceId = resourceId;
    }
    @Column(DE.dictCaption)
    public String getResourceName() {
        return resourceName;
    }
    public void setResourceName(String resourceName) {
        this.resourceName = resourceName;
    }
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
    public String getSubject() {
        return subject;
    }
    public void setSubject(String subject) {
        this.subject = subject;
    }
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
    public String getIndustry() {
        return industry;
    }
    public void setIndustry(String industry) {
        this.industry = industry;
    }
    @Column(DE.string_de)
    public String getSupportedServices() {
        return supportedServices;
    }
    public void setSupportedServices(String supportedServices) {
        this.supportedServices = supportedServices;
    }
    @Column(DE.String_de)
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    @Column(DE.String_de)
    public String getSpec() {
        return spec;
    }
    public void setSpec(String spec) {
        this.spec = spec;
    }
    @Column(handlerClass=FixLenStringHandler.class,dbType="TEXT",nullable=true)
    public String getParameter() {
        return parameter;
    }
    public void setParameter(String parameter) {
        this.parameter = parameter;
    }
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(1)",nullable=true,renewable=false)
    public String getStatus() {
        return status;
    }
    public void setStatus(String status) {
        this.status = status;
    }
    @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(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",nullable=true,renewable=false)
    public String getProfessorId() {
        return professorId;
    }
    public void setProfessorId(String professorId) {
        this.professorId = professorId;
    }
    @Column(DE.String_de)
    public String getAscription() {
        return ascription;
    }
    public void setAscription(String ascription) {
        this.ascription = ascription;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    public String getModifyTime() {
        return modifyTime;
    }
    public void setModifyTime(String modifyTime) {
        this.modifyTime = modifyTime;
    }
    @Column(DE.String_de)
    public String getHopePayMethod() {
        return hopePayMethod;
    }
    public void setHopePayMethod(String hopePayMethod) {
        this.hopePayMethod = hopePayMethod;
    }
    @Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=true,queryable=true)
    public String getCooperationNotes() {
        return cooperationNotes;
    }
    public void setCooperationNotes(String cooperationNotes) {
        this.cooperationNotes = cooperationNotes;
    }
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(14)",nullable=true,renewable=false)
    public String getPublishTime() {
        return publishTime;
    }
    public void setPublishTime(String publishTime) {
        this.publishTime = publishTime;
    }
    @Column(handlerClass=IntHandler.class,dbType="INTEGER",nullable=true,renewable=false)
    public int getPageViews() {
        return pageViews;
    }
    public void setPageViews(int pageViews) {
        this.pageViews = pageViews;
    }
    @Column(handlerClass=StringHandler.class,nullable=true,renewable=false)
    public String getComp() {
        return comp;
    }
    public void setComp(String comp) {
        this.comp = comp;
    }
    @Column(handlerClass=FixLenStringHandler.class,nullable=true,renewable=false)
    public String getResourceType() {
        return resourceType;
    }
    public void setResourceType(String resourceType) {
        this.resourceType = resourceType;
    }
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",nullable=true,renewable=false)
    public String getOrgId() {
        return orgId;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    }
    @Column(DE.bigSerial)
    public long getShareId() {
        return shareId;
    }
    public void setShareId(long shareId) {
        this.shareId = shareId;
    }
}

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

@@ -0,0 +1,65 @@
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.enums.DE;
/**
 * Created by TT on 2017/7/27.
 */
@Uniques(@Unique(clolumns = { "professorId","watchObject","watchType" }, name = "WATCH_RELATION_UQ"))
@PrimaryKey({"professorId","watchObject"})
@Table
public class Watch implements CreateTimeSupported {
    private String professorId;
    private String watchObject;
    private String createTime;
    private short watchType;
    private Resource resource;
    private Article article;
    public Resource getResource() {
        return resource;
    }
    public void setResource(Resource resource) {
        this.resource = resource;
    }
    public Article getArticle() {
        return article;
    }
    public void setArticle(Article article) {
        this.article = article;
    }
    @Column(DE.id_32)
    public String getProfessorId() {
        return professorId;
    }
    public void setProfessorId(String professorId) {
        this.professorId = professorId;
    }
    @Column(DE.string_de)
    public String getWatchObject() {
        return watchObject;
    }
    public void setWatchObject(String watchObject) {
        this.watchObject = watchObject;
    }
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }
    @Column(DE.short_de)
    public short getWatchType() {
        return watchType;
    }
    public void setWatchType(short watchType) {
        this.watchType = watchType;
    }
}

src/main/java/com/ekexiu/console/system/pojo/ArticleInfo.java

@@ -0,0 +1,23 @@
package com.ekexiu.console.system.pojo;
import com.ekexiu.console.system.po.Article;
import org.jfw.apt.orm.annotation.entry.CalcColumn;
import org.jfw.apt.orm.annotation.entry.ExtendView;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
/**
 * Created by TT on 2017/7/27.
 */
@ExtendView(fromSentence = "article a LEFT JOIN professor p on p.id = a.professor_id ", tableAlias = "a")
public class ArticleInfo extends Article{
    private String professorName;
    @CalcColumn(handlerClass = StringHandler.class, column = "p.name")
    public String getProfessorName() {
        return professorName;
    }
    public void setProfessorName(String professorName) {
        this.professorName = professorName;
    }
}

src/main/java/com/ekexiu/console/system/pojo/OrganizationInfo.java

@@ -3,17 +3,27 @@ package com.ekexiu.console.system.pojo;
import com.ekexiu.console.system.po.Organization;
import org.jfw.apt.orm.annotation.entry.CalcColumn;
import org.jfw.apt.orm.annotation.entry.ExtendView;
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
/**
 * Created by TT on 2017/5/18.
 */
@ExtendView(fromSentence = "organization o LEFT JOIN org_user ou on ou.id = o.id LEFT JOIN cuser c on ou.inviter_id = c.id", tableAlias = "o")
@ExtendView(fromSentence = "organization o RIGHT JOIN org_user ou on ou.id = o.id LEFT JOIN (select watch_object id,count(1) num from watch WHERE watch_type = 6 group by id)as fans  on fans.id = o.id", tableAlias = "o")
public class OrganizationInfo extends Organization {
    private String principal;
    private String inviterId;
    private String email;
    private String registerEmail;
    private boolean hasOrgLogo;
    private int fans;
    @CalcColumn(handlerClass = IntHandler.class, column = "fans.num")
    public int getFans() {
        return fans;
    }
    public void setFans(int fans) {
        this.fans = fans;
    }
    public boolean isHasOrgLogo() {
        return hasOrgLogo;
@@ -24,12 +34,12 @@ public class OrganizationInfo extends Organization {
    }
    @CalcColumn(handlerClass = StringHandler.class, column = "ou.email")
    public String getEmail() {
        return email;
    public String getRegisterEmail() {
        return registerEmail;
    }
    public void setEmail(String email) {
        this.email = email;
    public void setRegisterEmail(String registerEmail) {
        this.registerEmail = registerEmail;
    }
    @CalcColumn(handlerClass = StringHandler.class, column = "ou.inviter_id")
@@ -41,12 +51,4 @@ public class OrganizationInfo extends Organization {
        this.inviterId = inviterId;
    }
    @CalcColumn(handlerClass = StringHandler.class, column = "c.name")
    public String getPrincipal() {
        return principal;
    }
    public void setPrincipal(String principal) {
        this.principal = principal;
    }
}

src/main/java/com/ekexiu/console/system/pojo/ResourceInfo.java

@@ -0,0 +1,23 @@
package com.ekexiu.console.system.pojo;
import com.ekexiu.console.system.po.Resource;
import org.jfw.apt.orm.annotation.entry.CalcColumn;
import org.jfw.apt.orm.annotation.entry.ExtendView;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
/**
 * Created by TT on 2017/7/27.
 */
@ExtendView(fromSentence = "resource r LEFT JOIN professor p on p.id = r.professor_id ", tableAlias = "r")
public class ResourceInfo extends Resource{
    private String professorName;
    @CalcColumn(handlerClass = StringHandler.class, column = "p.name")
    public String getProfessorName() {
        return professorName;
    }
    public void setProfessorName(String professorName) {
        this.professorName = professorName;
    }
}

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

@@ -0,0 +1,129 @@
package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.*;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.param.JdbcConn;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2017/7/27.
 */
@Path("/content")
public class ContentService {
    @Autowrie
    private ArticleDao articleDao;
    @Autowrie
    private ResourceDao resourceDao;
    @Autowrie
    private PpatentDao ppatentDao;
    @Autowrie
    private PpaperDao ppaperDao;
    @Autowrie
    private LeaveWordDao leaveWordDao;
    @Autowrie
    private WatchDao watchDao;
    public ArticleDao getArticleDao() {
        return articleDao;
    }
    public void setArticleDao(ArticleDao articleDao) {
        this.articleDao = articleDao;
    }
    public ResourceDao getResourceDao() {
        return resourceDao;
    }
    public void setResourceDao(ResourceDao resourceDao) {
        this.resourceDao = resourceDao;
    }
    public PpatentDao getPpatentDao() {
        return ppatentDao;
    }
    public void setPpatentDao(PpatentDao ppatentDao) {
        this.ppatentDao = ppatentDao;
    }
    public PpaperDao getPpaperDao() {
        return ppaperDao;
    }
    public void setPpaperDao(PpaperDao ppaperDao) {
        this.ppaperDao = ppaperDao;
    }
    public LeaveWordDao getLeaveWordDao() {
        return leaveWordDao;
    }
    public void setLeaveWordDao(LeaveWordDao leaveWordDao) {
        this.leaveWordDao = leaveWordDao;
    }
    public WatchDao getWatchDao() {
        return watchDao;
    }
    public void setWatchDao(WatchDao watchDao) {
        this.watchDao = watchDao;
    }
    @Get
    @Path("/lwCount")
    public int queryCount(@JdbcConn Connection con,String articleId)throws SQLException{
        return this.leaveWordDao.queryCount(con, articleId);
    }
    @Get
    @Path("/countProfessor")
    public int countProfessor(@JdbcConn Connection con,String id,short type)throws SQLException{
        return this.watchDao.countProfessor(con, id, type);
    }
    @Path("/pq")
    @Get
    public Object pageQuery(@JdbcConn Connection con, int contentType, @Nullable String title, @Nullable String name, int orderBy, @Nullable String bt, @Nullable String et, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize)throws SQLException{
        if (contentType == 3){
            if (orderBy == 1) {
                return this.articleDao.queryByTime(con, title == null ? null : "%" + title + "%",  name == null ? null : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
            }
            if (orderBy == 2) {
                return this.articleDao.queryByPV(con, title == null ? null : "%" + title + "%",  name == null ? null : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
            }
        }
        if (contentType == 2){
            if (orderBy == 1){
                return this.resourceDao.queryByTime(con, title == null ? null : "%" + title + "%",  name == null ? null : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
            }
            if (orderBy == 2) {
                return this.resourceDao.queryByPV(con, title == null ? null : "%" + title + "%",  name == null ? null : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
            }
        }
        if (contentType == 5){
            if (orderBy == 1){
                return this.ppaperDao.queryByTime(con,title == null ? null : "%" + title + "%",  name == null ? null : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
            }
            if (orderBy == 2) {
                return this.ppaperDao.queryByPV(con, title == null ? null : "%" + title + "%",  name == null ? null : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
            }
        }
        if (contentType == 4){
            if (orderBy == 1){
                return this.ppatentDao.queryByTime(con, title == null ? null : "%" + title + "%",  name == null ? null : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
            }
            if (orderBy == 2) {
                return this.ppatentDao.queryByPV(con, title == null ? null : "%" + title + "%",  name == null ? null : "%" + name + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
            }
        }
        return null;
    }
}

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

@@ -0,0 +1,196 @@
package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.*;
import com.ekexiu.console.system.po.Feedback;
import com.ekexiu.console.system.po.Professor;
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.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.DateUtil;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
/**
 * Created by TT on 2017/7/25.
 */
@Path("/feedback")
public class FeedbackService {
    @Autowrie
    private FeedbackDao feedbackDao;
    @Autowrie
    private UserDao userDao;
    @Autowrie
    private ProfessorDao professorDao;
    @Autowrie
    private PpaperDao ppaperDao;
    @Autowrie
    private PpatentDao ppatentDao;
    @Autowrie
    private OrgDao orgDao;
    @Autowrie
    private ResourceDao resourceDao;
    @Autowrie
    private ArticleDao articleDao;
    public FeedbackDao getFeedbackDao() {
        return feedbackDao;
    }
    public void setFeedbackDao(FeedbackDao feedbackDao) {
        this.feedbackDao = feedbackDao;
    }
    public UserDao getUserDao() {
        return userDao;
    }
    public void setUserDao(UserDao userDao) {
        this.userDao = userDao;
    }
    public ProfessorDao getProfessorDao() {
        return professorDao;
    }
    public void setProfessorDao(ProfessorDao professorDao) {
        this.professorDao = professorDao;
    }
    public PpaperDao getPpaperDao() {
        return ppaperDao;
    }
    public void setPpaperDao(PpaperDao ppaperDao) {
        this.ppaperDao = ppaperDao;
    }
    public PpatentDao getPpatentDao() {
        return ppatentDao;
    }
    public void setPpatentDao(PpatentDao ppatentDao) {
        this.ppatentDao = ppatentDao;
    }
    public OrgDao getOrgDao() {
        return orgDao;
    }
    public void setOrgDao(OrgDao orgDao) {
        this.orgDao = orgDao;
    }
    public ResourceDao getResourceDao() {
        return resourceDao;
    }
    public void setResourceDao(ResourceDao resourceDao) {
        this.resourceDao = resourceDao;
    }
    public ArticleDao getArticleDao() {
        return articleDao;
    }
    public void setArticleDao(ArticleDao articleDao) {
        this.articleDao = articleDao;
    }
    @Path("/update")
    @Post
    public void update(@JdbcConn(true) Connection con,long id,String state,@Nullable String operateDescp,@LoginUser ConsoleAuthUser user) throws SQLException {
        Feedback feedback = this.feedbackDao.query(con, id);
        feedback.setState(state);
        feedback.setOperateDescp(operateDescp);
        feedback.setOperator(user.getId());
        feedback.setOperateTime(DateUtil.formatDateTime(System.currentTimeMillis()));
        this.feedbackDao.update(con, feedback);
    }
    @Path("/id/{id}")
    @Get
    public Feedback query(@JdbcConn Connection con, @PathVar long id)throws SQLException {
        Feedback feedback = this.feedbackDao.query(con, id);
        if (feedback.getOperator()!=null) {
            feedback.setOperatorName(this.userDao.queryById(con, feedback.getOperator()).getName());
        }
        if (feedback.getUserId() != null) {
            Professor professor = this.professorDao.query(con, feedback.getUserId());
            if (professor!=null) {
                feedback.setUserName(professor.getName());
            }
        }
        if (feedback.getParam()!=null){
            if (feedback.getSchema() == 1) {
                String name = this.ppaperDao.queryById(con, feedback.getParam());
                if (name != null) {
                    feedback.setDataName(name);
                }
            }
            if (feedback.getSchema() == 2) {
                String name = this.ppatentDao.queryById(con, feedback.getParam());
                if (name != null) {
                    feedback.setDataName(name);
                }
            }
            if (feedback.getSchema() == 3) {
                String name = this.professorDao.queryById(con, feedback.getParam());
                if (name != null) {
                    feedback.setDataName(name);
                }
            }
            if (feedback.getSchema() == 4) {
                String name = this.orgDao.queryById(con, feedback.getParam());
                if (name != null) {
                    feedback.setDataName(name);
                }
            }if (feedback.getSchema() == 5) {
                String name = this.resourceDao.queryById(con, feedback.getParam());
                if (name != null) {
                    feedback.setDataName(name);
                }
            }
            if (feedback.getSchema() == 6) {
                String name = this.articleDao.queryById(con, feedback.getParam());
                if (name != null) {
                    feedback.setDataName(name);
                }
            }
        }
        return feedback;
    }
    @Path("/pq")
    @Get
    public PageQueryResult<Feedback> pageQuery(@JdbcConn Connection con,@Nullable String state, @Nullable String bt, @Nullable String et, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize) throws SQLException {
        PageQueryResult<Feedback> queryResult = this.feedbackDao.query(con,state, bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
        List<Feedback> feedbacks = queryResult.getData();
        if (!feedbacks.isEmpty()) {
            for (Feedback feedback : feedbacks) {
                if (feedback.getOperator()!=null) {
                    feedback.setOperatorName(this.userDao.queryById(con, feedback.getOperator()).getName());
                }
                if (feedback.getUserId() != null) {
                    Professor professor = this.professorDao.query(con, feedback.getUserId());
                    if (professor!=null) {
                            feedback.setUserName(professor.getName());
                    }
                }
            }
            queryResult.setData(feedbacks);
        }
        return queryResult;
    }
}

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

@@ -1,7 +1,9 @@
package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.OrgDao;
import com.ekexiu.console.system.dao.OrgRecordDao;
import com.ekexiu.console.system.dao.OrgUserDao;
import com.ekexiu.console.system.po.OrgRecord;
import com.ekexiu.console.system.po.OrgUser;
import com.ekexiu.console.system.po.Organization;
import com.ekexiu.console.system.pojo.OrganizationInfo;
@@ -9,24 +11,25 @@ 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.orm.annotation.dao.param.Like;
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.param.FieldParam;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.apt.web.annotation.param.RequestParam;
import org.jfw.util.DateUtil;
import org.jfw.util.JpgUtil;
import org.jfw.util.PageQueryResult;
import org.jfw.util.StringUtil;
import org.jfw.util.exception.JfwBaseException;
import org.jfw.util.io.IoUtil;
import java.io.*;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.Objects;
@Path("/sys/org")
public class OrgService extends com.ekexiu.console.service.Upload {
@@ -62,6 +65,16 @@ public class OrgService extends com.ekexiu.console.service.Upload {
    private OrgDao orgDao;
    @Autowrie
    private OrgUserDao orgUserDao;
    @Autowrie
    private OrgRecordDao orgRecordDao;
    public OrgRecordDao getOrgRecordDao() {
        return orgRecordDao;
    }
    public void setOrgRecordDao(OrgRecordDao orgRecordDao) {
        this.orgRecordDao = orgRecordDao;
    }
    public File getDefaultHeadPhoto() {
        return defaultHeadPhoto;
@@ -260,21 +273,7 @@ public class OrgService extends com.ekexiu.console.service.Upload {
    @Post
    @Path("/create")
    public String insertOrg(@JdbcConn(true) Connection con,
                            @RequestParam(fields = {@FieldParam(value = "email", valueClass = String.class, required = true),
                                    @FieldParam(value = "inviterId", valueClass = String.class, required = true),
                                    @FieldParam(value = "name", valueClass = String.class, required = true),
                                    @FieldParam(value = "forShort", valueClass = String.class, required = true),
                                    @FieldParam(value = "province", valueClass = String.class, required = true),
                                    @FieldParam(value = "city", valueClass = String.class, required = true),
                                    @FieldParam(value = "foundTime", valueClass = String.class, required = false),
                                    @FieldParam(value = "descp", valueClass = String.class, required = false),
                                    @FieldParam(value = "orgType", valueClass = String.class, required = false),
                                    @FieldParam(value = "industry", valueClass = String.class, required = false),
                                    @FieldParam(value = "subject", valueClass = String.class, required = false),
                                    @FieldParam(value = "orgSize", valueClass = String.class, required = false),
                                    @FieldParam(value = "qualification", valueClass = String.class, required = false),
                                    @FieldParam(value = "orgUrl", valueClass = String.class, required = false)}) OrganizationInfo info,@Nullable String fn)
    public String insertOrg(@JdbcConn(true) Connection con, OrganizationInfo info,@Nullable String fn)
            throws SQLException,IOException {
        String id = StringUtil.buildUUID();
        OrgUser orgUser = new OrgUser();
@@ -292,35 +291,156 @@ public class OrgService extends com.ekexiu.console.service.Upload {
        return orgUser.getId();
    }
    @Path("/entryCheck")
    @Get
    public int entryCheck(@JdbcConn Connection con, String name, String email) throws SQLException, JfwBaseException {
        OrgUser orgUser = this.orgUserDao.entryCheck(con, email);
        if (orgUser != null) {
            return 1;//该邮箱已被注册
        }
        String orgId = this.orgDao.queryByName(con, name);
        if ((orgId != null) && (this.orgUserDao.query(con, orgId) != null)) {
            return 2;//该企业已注册科袖账号
        }
        return 3;//可以创建
    }
    @Path("/editCheck")
    @Get
    public int editCheck(@JdbcConn Connection con, String name, String email,String id) throws SQLException, JfwBaseException {
        String orgUserId = this.orgUserDao.queryByEmail(con, email);
        if ((orgUserId != null)&&(!Objects.equals(orgUserId, id))) {
            return 2;//该邮箱已被注册
        }
        String orgId = this.orgDao.queryByName(con, name);
        if ((orgId != null) && (!Objects.equals(orgId, id))) {
            return 3;//该企业名称已经注册
        }
        return 1;
    }
    @Post
    @Path("/createAccount")
    public void createOrg(@JdbcConn(true) Connection con, String email,String name,@LoginUser ConsoleAuthUser user) throws SQLException, IOException, JfwBaseException {
        String orgId = this.orgDao.queryByName(con, name);
        if ((orgId != null) && (this.orgUserDao.query(con, orgId) != null)) {
            throw new JfwBaseException(3002, "该企业已注册科袖账号");
        }
        String orgUserId = this.orgUserDao.queryByEmail(con,email);
        if (orgUserId!=null){
            throw new JfwBaseException(3003, "该邮箱已被注册");
        }
        if ((orgId !=null)&&(this.orgUserDao.query(con,orgId)==null)){
            OrgUser orgUser = new OrgUser();
            orgUser.setId(orgId);
            orgUser.setEmail(email);
            orgUser.setInviterId(user.getId());
            orgUser.setPasswd(DEFAULT_PW_STR);
            orgUser.setUserType("1");
            this.orgUserDao.insert(con, orgUser);
            OrgRecord orgRecord = new OrgRecord();
            orgRecord.setId(orgId);
            orgRecord.setCreator(user.getId());
            orgRecord.setCreateTime(DateUtil.formatDateTime(System.currentTimeMillis()));
            orgRecord.setModifyTime(DateUtil.formatDateTime(System.currentTimeMillis()));
            this.orgRecordDao.insert(con, orgRecord);
        }
        if ((orgId == null)&&(this.orgUserDao.queryByEmail(con,email)==null)) {
            String id = this.createOrganization(con, name);
            OrgUser orgUser = new OrgUser();
            orgUser.setId(id);
            orgUser.setEmail(email);
            orgUser.setInviterId(user.getId());
            orgUser.setPasswd(DEFAULT_PW_STR);
            orgUser.setUserType("1");
            this.orgUserDao.insert(con, orgUser);
            OrgRecord orgRecord = new OrgRecord();
            orgRecord.setId(id);
            orgRecord.setCreator(user.getId());
            orgRecord.setCreateTime(DateUtil.formatDateTime(System.currentTimeMillis()));
            orgRecord.setModifyTime(DateUtil.formatDateTime(System.currentTimeMillis()));
            this.orgRecordDao.insert(con, orgRecord);
        }
    }
    @Get
    @Path("/queryAccount/{id}")
    public Account queryAccount(@JdbcConn Connection con,@PathVar String id)throws SQLException {
        Organization organization = this.orgDao.query(con, id);
        OrgUser orgUser = this.orgUserDao.query(con, id);
        Account account = new Account();
        if (orgUser!=null) {
            account.setEmail(orgUser.getEmail());
        }
        account.setName(organization.getName());
        account.setId(id);
        return account;
    }
    @Post
    @Path("/updateAccount")
    public void updateAccount(@JdbcConn(true) Connection con, String email, String name, String id,@LoginUser ConsoleAuthUser user) throws SQLException, JfwBaseException {
        String orgUserId = this.orgUserDao.queryByEmail(con, email);
        if ((orgUserId != null)&&(!Objects.equals(orgUserId, id))) {
            throw new JfwBaseException(2001, "该邮箱已被注册");
        }
        String orgId = this.orgDao.queryByName(con, name);
        if ((orgId != null) && (!Objects.equals(orgId, id))) {
            throw new JfwBaseException(2002, "该企业已注册科袖账号");
        }
        this.orgUserDao.updateEmail(con, id, email);
        this.orgDao.updateOrgName(con, id, name);
        OrgRecord orgRecord = this.orgRecordDao.queryById(con, id);
        if (orgRecord == null){
            OrgRecord orgRecord1 = new OrgRecord();
            orgRecord1.setId(id);
            orgRecord1.setModifier(user.getId());
            orgRecord1.setModifyTime(DateUtil.formatDateTime(System.currentTimeMillis()));
            this.orgRecordDao.insert(con, orgRecord1);
        }else {
            this.orgRecordDao.updateModifier(con, id, user.getId(), DateUtil.formatDateTime(System.currentTimeMillis()));
        }
    }
    @Post
    @Path("/update")
    public void update(@JdbcConn(true) Connection con, Organization orgn,@Nullable String fn) throws SQLException, IOException {
        if(fn != null){
    public void update(@JdbcConn(true) Connection con, Organization orgn, @Nullable String fn,@LoginUser ConsoleAuthUser user) throws SQLException, IOException {
        if (fn != null) {
            this.saveOrgLogo(orgn.getId(), fn);
        }
        this.orgDao.update(con, orgn);
        OrgRecord orgRecord = this.orgRecordDao.queryById(con, orgn.getId());
        if (orgRecord == null){
            OrgRecord orgRecord1 = new OrgRecord();
            orgRecord1.setId(orgn.getId());
            orgRecord1.setModifier(user.getId());
            orgRecord1.setModifyTime(DateUtil.formatDateTime(System.currentTimeMillis()));
            this.orgRecordDao.insert(con, orgRecord1);
        }else {
            this.orgRecordDao.updateModifier(con, orgn.getId(), user.getId(),DateUtil.formatDateTime(System.currentTimeMillis()));
        }
    }
    @Post
    @Path("/updateBusinessData")
    public void updateBusinessData(@JdbcConn(true) Connection con,String id,@Nullable String authStatus,@Nullable Long sortNum)throws SQLException{
        this.orgDao.updateBusinessData(con, id, authStatus, sortNum);
    }
    @Get
    @Path("/pq")
    public PageQueryResult<OrganizationInfo> pageQuery(@JdbcConn Connection con, @LoginUser ConsoleAuthUser cau, @Nullable @Like String name, @Nullable @Like String industry, @Nullable @Like String subject, @Nullable @Like String city, @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize) throws SQLException {
        String cName = null;
        if (name != null) {
            cName = "%" + name + "%";
        }
        String cIndustry = null;
        if (industry != null) {
            cIndustry = "%" + industry + "%";
        }
        String cSubject = null;
        if (subject != null) {
            cSubject = "%" + subject + "%";
        }
        String cCity = null;
        if (city != null) {
            cCity = "%" + city + "%";
    public PageQueryResult<OrganizationInfo> pageQuery(@JdbcConn Connection con, @Nullable String name, @Nullable String industry, @Nullable String subject, @Nullable String city,@Nullable String authStatus,int orderBy, @Nullable String bt, @Nullable String et,  @DefaultValue("1") int pageNo, @DefaultValue("10") int pageSize) throws SQLException {
        if (orderBy == 1) {
            return this.orgDao.queryTime(con, name == null ? null : "%" + name + "%", industry == null ? null : "%" + industry + "%", subject == null ? null : "%" + subject + "%", city == null ? null : "%" + city + "%", authStatus, bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
        }else{
            return this.orgDao.queryViews(con, name == null ? null : "%" + name + "%", industry == null ? null : "%" + industry + "%", subject == null ? null : "%" + subject + "%", city == null ? null : "%" + city + "%", authStatus, bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
        }
        return this.orgDao.query(con,cau.getId(), cName, cIndustry, cSubject, cCity, pageSize, pageNo);
    }
    @Get
@@ -369,5 +489,36 @@ public class OrgService extends com.ekexiu.console.service.Upload {
        return id;
    }
    public static class Account{
        private String id;
        private String email;
        private String name;
        public String getId() {
            return id;
        }
        public void setId(String id) {
            this.id = id;
        }
        public String getEmail() {
            return email;
        }
        public void setEmail(String email) {
            this.email = email;
        }
        public String getName() {
            return name;
        }
        public void setName(String name) {
            this.name = name;
        }
    }
}

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

@@ -141,4 +141,10 @@ public class ProfessorService {
        this.professorDao.updateAuthType(con, ids, authType);
        this.professorDao.updateAuthStatusExpert(con, ids, authStatusExpert);
    }
    @Get
    @Path("/getName/{id}")
    public String getName(@JdbcConn Connection con,@PathVar String id) throws SQLException {
        return this.professorDao.queryById(con, id);
    }
}

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

@@ -170,8 +170,8 @@ public class UserInfoService {
    @Path("/pqAll")
    @Get
    PageQueryResult<UserInfo> pageQueryAll(@JdbcConn Connection con,@Nullable String creatorName, @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, creatorName == null ? null : "%" + creatorName + "%", name == null ? null : "%" + name + "%", orgName == null ? null : "%" + orgName + "%", state, bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
    PageQueryResult<UserInfo> pageQueryAll(@JdbcConn Connection con, @Nullable String creatorName, @Nullable Stringname, @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, creatorName == null ? null : "%" + creatorName + "%",name == null ? null : "%" + name + "%", orgName == null ? null : "%" + orgName + "%", state, bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
    }
    @Path("/entryCheck")
@@ -184,6 +184,22 @@ public class UserInfoService {
        return userInfo1 == null && userInfo2 == null && luser1 == null && luser2 == null;
    }
    @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))){
            return false;
        }
        String orgId1 = this.userInfoDao.queryByKey(con, email);
        if ((orgId1 != null) && (!Objects.equals(orgId, id))){
            return false;
        }
        Luser luser1 = this.luserDao.check(con, mobile);
        Luser luser2 = this.luserDao.check(con, email);
        return luser1 == null && luser2 == null;
    }
    @Path("/reviewCheck")
    @Get
    public Boolean reviewCheck(@JdbcConn Connection con, @Nullable String mobile, @Nullable String email) throws SQLException {

src/main/resources/database.sql

@@ -26,4 +26,28 @@ COMMENT ON COLUMN public.user_info.email IS '注册邮箱';
-- ----------------------------
-- Uniques structure for table user_info
-- ----------------------------
ALTER TABLE USER_INFO ADD PRIMARY KEY (ID);
ALTER TABLE USER_INFO ADD PRIMARY KEY (ID);
-- ----------------------------
-- Table structure for org_record
-- ----------------------------
CREATE TABLE public.org_record (
  id CHARACTER(32) PRIMARY KEY NOT NULL,
  creator CHARACTER(32), -- 创建人ID
  modifier CHARACTER(32), -- 修改人
  create_time CHARACTER(14), -- 创建时间
  modify_time CHARACTER(14) -- 修改时间
);
COMMENT ON COLUMN public.org_record.creator IS '创建人ID';
COMMENT ON COLUMN public.org_record.modifier IS '修改人ID';
COMMENT ON COLUMN public.org_record.create_time IS '创建时间';
COMMENT ON COLUMN public.org_record.modify_time IS '修改时间';
ALTER TABLE feedback ADD COLUMN operator  CHAR(32);
COMMENT ON COLUMN feedback.operator IS '处理人ID';
ALTER TABLE feedback ADD COLUMN operate_time  TEXT;
COMMENT ON COLUMN feedback.operate_time IS '处理时间';
ALTER TABLE feedback ADD COLUMN operate_descp TEXT;
COMMENT ON COLUMN feedback.operate_descp IS '处理备注';