企业

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;
@@ -36,7 +35,11 @@ public interface OrgDao {
	@Nullable
	@QueryOne
	OrganizationInfo query(Connection con, String id) throws SQLException;
	Organization 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)
@@ -44,7 +47,11 @@ public interface OrgDao {
	@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;
	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")
	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,8 @@ 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;
}

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

@@ -1,8 +1,11 @@
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.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 java.sql.Connection;
import java.sql.SQLException;
@@ -16,4 +19,18 @@ public interface OrgUserDao {
    @Insert
    int insert(Connection con, OrgUser orgUser) throws SQLException;
    @Nullable
    @QueryOne
    OrgUser query(Connection con, String id) 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/UserInfoDao.java

@@ -44,7 +44,7 @@ public interface UserInfoDao {
    @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;
    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;
    @Or
    @Nullable

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/pojo/OrganizationInfo.java

@@ -12,7 +12,7 @@ import org.jfw.apt.orm.core.defaultImpl.StringHandler;
public class OrganizationInfo extends Organization {
    private String principal;
    private String inviterId;
    private String email;
    private String registerEmail;
    private boolean hasOrgLogo;
    public boolean isHasOrgLogo() {
@@ -24,12 +24,11 @@ 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")

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

@@ -15,13 +15,13 @@ 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.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.*;
@@ -260,21 +260,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,10 +278,66 @@ public class OrgService extends com.ekexiu.console.service.Upload {
        return orgUser.getId();
    }
    @Path("/entryCheck")
    @Get
    public void entryCheck(@JdbcConn Connection con, String name, String email) throws SQLException, JfwBaseException {
        OrgUser orgUser = this.orgUserDao.entryCheck(con, email);
        if (orgUser != null) {
            throw new JfwBaseException(1, "该邮箱已被注册");
        }
        String orgId = this.orgDao.queryByName(con, name);
        if ((orgId != null) && (this.orgUserDao.query(con, orgId) != null)) {
            throw new JfwBaseException(2, "该企业已注册科袖账号");
        }
    }
    @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(2, "该企业已注册科袖账号");
        }
        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);
    }
    @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) throws SQLException {
        this.orgUserDao.updateEmail(con, id, email);
        this.orgDao.updateOrgName(con, id, name);
    }
    @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) throws SQLException, IOException {
        if (fn != null) {
            this.saveOrgLogo(orgn.getId(), fn);
        }
        this.orgDao.update(con, orgn);
@@ -303,34 +345,18 @@ public class OrgService extends com.ekexiu.console.service.Upload {
    @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 @Like String name, @Nullable @Like String industry, @Nullable @Like String subject, @Nullable @Like 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
    @Path("/id/{id}")
    public OrganizationInfo query(@JdbcConn Connection con, @PathVar String id) throws SQLException {
        OrganizationInfo organizationInfo = this.orgDao.query(con, id);
        if (organizationInfo != null) {
            organizationInfo.setHasOrgLogo(this.hasOrgLogo(organizationInfo.getId()));
        }
        return organizationInfo;
    public Organization query(@JdbcConn Connection con, @PathVar String id) throws SQLException {
        return this.orgDao.query(con, id);
    }
    @Delete
@@ -369,5 +395,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/UserInfoService.java

@@ -170,8 +170,8 @@ public class UserInfoService {
    @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);
    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);
    }
    @Path("/entryCheck")