文章字段修改，新增平台

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

@@ -4,11 +4,20 @@ import com.ekexiu.console.system.po.Demand;
import com.ekexiu.console.system.pojo.DemandInfo;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.*;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
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.SetSentence;
import org.jfw.apt.orm.annotation.dao.method.Where;
import org.jfw.apt.orm.annotation.dao.method.operator.PageQuery;
import org.jfw.apt.orm.annotation.dao.method.operator.QueryOne;
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.*;
import org.jfw.apt.orm.annotation.dao.param.Alias;
import org.jfw.apt.orm.annotation.dao.param.GtEq;
import org.jfw.apt.orm.annotation.dao.param.Like;
import org.jfw.apt.orm.annotation.dao.param.LtEq;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
@@ -27,7 +36,7 @@ public interface DemandDao {
    @PageQuery
    @Exclude("descp")
    @OrderBy("ORDER BY CREATE_TIME DESC")
    PageQueryResult<DemandInfo> pageQuery(Connection con, @Nullable @Like String title, @Nullable @Like String professorName,@Nullable String state, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageNo, int pageSize)throws SQLException;
    PageQueryResult<DemandInfo> pageQuery(Connection con, @Nullable @Like String title, @Nullable @Like String professorName,@Nullable String state,@Nullable String source, @Nullable @GtEq @Alias("createTime") String bt, @Nullable @Alias("createTime") @LtEq String et, int pageNo, int pageSize)throws SQLException;
    @UpdateWith
    @Where("STATE IN ('0','1')")
@@ -42,4 +51,8 @@ public interface DemandDao {
    @IncludeFixSet
    @From(Demand.class)
    int closeByCreator(Connection con,String creator)throws SQLException;
    @Update
    @Where("STATE IN ('0','1')")
    int update(Connection con,Demand demand) throws SQLException;
}

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

@@ -17,7 +17,7 @@ import org.jfw.apt.orm.core.enums.DE;
@PrimaryKey("articleId")
public class Article implements CreateTimeSupported, ModifyTimeSupported {
    private String articleId;
    private String professorId;
    //private String professorId;
    private String articleTitle;
    private String articleContent;
    private String subject;
@@ -26,7 +26,7 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
    private String modifyTime;
    private String publishTime;
    private String articleImg;
    private String orgId;
    //private String orgId;
    private String articleType;
    private int articleAgree;
    private int pageViews;
@@ -35,6 +35,8 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
    private long sortNum;
    private int colNum;
    private String ownerId;
    @Column(DE.id_32)
    public String getArticleId() {
        return articleId;
@@ -42,13 +44,13 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
    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(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;
@@ -103,13 +105,13 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
    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(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;
@@ -162,5 +164,14 @@ public class Article implements CreateTimeSupported, ModifyTimeSupported {
    public void setColNum(int colNum) {
        this.colNum = colNum;
    }
    @Column(handlerClass=FixLenStringHandler.class,dbType="CHAR(32)",nullable=true,renewable=false)
    public String getOwnerId() {
        return ownerId;
    }
    public void setOwnerId(String ownerId) {
        this.ownerId = ownerId;
    }
}

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

@@ -26,12 +26,13 @@ public class Demand implements CreateTimeSupported, ModifyTimeSupported {
    private String contactNum;
    private String state;
    private String orgId;
    private String orgName;
    private String modifier;
    private String creator;
    private String createTime;
    private String modifyTime;
    private String descp;
    private String source;
    private long pageViews;
@@ -155,16 +156,26 @@ public class Demand implements CreateTimeSupported, ModifyTimeSupported {
    }
    /**
     * 发布人发布时所在机构ID
     * 发布人发布时所在机构
     * @return
     */
    @Column(handlerClass = FixLenStringHandler.class, dbType = "CHAR(32)", insertable = true, nullable = false, queryable = true, renewable = false)
    public String getOrgId() {
        return orgId;
    @Column(DE.text_de)
    public String getOrgName() {
        return orgName;
    }
    public void setOrgId(String orgId) {
        this.orgId = orgId;
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    /**
     * 发布来源
     * @return
     */
    @Column(DE.text_de)
    public String getSource() {
        return source;
    }
    public void setSource(String source) {
        this.source = source;
    }
    /**

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

@@ -8,7 +8,7 @@ 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 LEFT JOIN organization o on o.id = a.onerg_id ", tableAlias = "a")
@ExtendView(fromSentence = "article a LEFT JOIN professor p on p.id = a.owner_id LEFT JOIN organization o on o.id = a.ownener_id ", tableAlias = "a")
public class ArticleInfo extends Article{
    private String professorName;
    private String organizationName;

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

@@ -2,6 +2,7 @@ package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.ConsultDao;
import com.ekexiu.console.system.dao.DemandDao;
import com.ekexiu.console.system.po.Demand;
import com.ekexiu.console.system.pojo.ConsultInfo;
import com.ekexiu.console.system.pojo.DemandInfo;
import org.jfw.apt.annotation.Autowrie;
@@ -12,6 +13,7 @@ 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.apt.web.annotation.param.RequestParam;
import org.jfw.util.PageQueryResult;
import java.sql.Connection;
@@ -53,7 +55,7 @@ public class DemandService {
    @Get
    @Path("/pq")
    public PageQueryResult<DemandInfo> pageQuery(@JdbcConn Connection con, @Nullable String title, @Nullable String professorName,@Nullable String state, @Nullable String bt, @Nullable String et, @DefaultValue("5") int pageSize, @DefaultValue("1") int pageNo)throws SQLException {
    public PageQueryResult<DemandInfo> pageQuery(@JdbcConn Connection con, @Nullable String title, @Nullable String professorName,@Nullable String state,@Nullable String source, @Nullable String bt, @Nullable String et, @DefaultValue("5") int pageSize, @DefaultValue("1") int pageNo)throws SQLException {
        String demandTitle =null;
        if(title!=null)
        {
@@ -68,7 +70,7 @@ public class DemandService {
            bt = bt + "000000";
        if (et != null)
            et = et + "235959";
        return this.demandDao.pageQuery(con,demandTitle, name,state,bt,et, pageNo, pageSize);
        return this.demandDao.pageQuery(con,demandTitle, name,state,source,bt,et, pageNo, pageSize);
    }
    @Get
@@ -82,4 +84,21 @@ public class DemandService {
    public void closeDemand(@JdbcConn(true) Connection con,String id)throws SQLException{
        this.demandDao.close(con, id);
    }
    @Post
    @Path("/modify")
    public boolean update(@JdbcConn(true) Connection con,
                          @RequestParam(excludeFields = { "state", "createTime", "modifyTime", "creator", "pageViews", "shareId" }) Demand demand)
            throws SQLException {
        if (demand.getCost() == null) {
            demand.setCost("0");
        }
        if (demand.getDuration() == null) {
            demand.setDuration("0");
        }
        demand.setState("1");
        return this.demandDao.update(con, demand) > 0;
    }
}

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

@@ -38,6 +38,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
@Path("/sys/org")
@@ -350,6 +351,30 @@ public class OrgService {
        return ret;
    }
    @Get
    @Path("/orgId")
    public List<TestService.TypeaheadItem> getId(@JdbcConn Connection con, String q , @DefaultValue("10")int s)throws SQLException {
        if (q != null) {
            q = "%" + q + "%";
        }
        List<TestService.TypeaheadItem> ret = new ArrayList<>(s);
        final String finalKey = q;
        List<Map<String,Object>> typeahead = JdbcUtil.queryMaps(con, "SELECT name,id FROM organization WHERE name LIKE ?", new PreparedStatementConfig() {
            @Override
            public void config(PreparedStatement preparedStatement) throws SQLException {
                preparedStatement.setString(1, finalKey);
            }
        });
        for (Map<String,Object> s1 : typeahead) {
            TestService.TypeaheadItem thi = new TestService.TypeaheadItem();
            thi.setCode((String) s1.get("id"));
            thi.setCaption((String) s1.get("name"));
            ret.add(thi);
        }
        return ret;
    }
    @Get
    @Path("/querylimit")
    public List<Object> queryLimit(@JdbcConn Connection con, @Nullable String name, @DefaultValue("3") int rows) throws SQLException, JfwBaseException, IOException {

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

@@ -0,0 +1,34 @@
package com.ekexiu.console.system.service;
import org.jfw.apt.web.annotation.Path;
import org.jfw.apt.web.annotation.operate.Get;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.util.jdbc.JdbcUtil;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * Created by TT on 2018/5/25.
 */
@Path("/platform")
public class PlatformService {
    @Get
    @Path("/name")
    public List<TestService.TypeaheadItem>  get(@JdbcConn Connection con)throws SQLException {
        List<TestService.TypeaheadItem> ret = new ArrayList<>();
        //final String finalKey = key;
        List<Map<String,Object>> typeahead = JdbcUtil.queryMaps(con, "SELECT NAME,ID FROM PLATFORM_INFO");
        for (Map<String,Object> s1 : typeahead) {
            TestService.TypeaheadItem thi = new TestService.TypeaheadItem();
            thi.setCode((String) s1.get("id"));
            thi.setCaption((String) s1.get("name"));
            ret.add(thi);
        }
        return ret;
    }
}