新增服务

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

@@ -0,0 +1,75 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.Ware;
import com.ekexiu.console.system.pojo.WareInfo;
import org.jfw.apt.annotation.Nullable;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.Exclude;
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.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.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.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.annotation.dao.param.Set;
import org.jfw.apt.orm.annotation.dao.param.SqlColumn;
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 2018/3/20.
 */
@DAO
public interface WareDao {
    @SelectOne
    @Nullable
    Ware queryById(Connection con, String id) throws SQLException;
    @Update
    @Exclude("modifyTime")
    int update(Connection con, Ware ware) throws SQLException;
    @Nullable
    @QueryOne
    WareInfo query(Connection con, String id) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY modify_time DESC NULLS LAST")
    @Where("state='1'")
    @Exclude("descp")
    PageQueryResult<WareInfo> queryByTime(Connection con, @Nullable @Like String name,@Nullable @SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String author, @Nullable @GtEq @Alias("modifyTime") String bt, @Nullable @Alias("modifyTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @PageQuery
    @OrderBy(" ORDER BY page_views DESC NULLS LAST")
    @Where("state='1'")
    @Exclude("descp")
    PageQueryResult<WareInfo> queryByPV(Connection con, @Nullable @Like String name,@Nullable @SqlColumn(value = {"(p.name is null or p.name like ?)", "(o.name is null or o.name like ?)"}, handlerClass = StringHandler.class) String author, @Nullable @GtEq @Alias("modifyTime") String bt, @Nullable @Alias("modifyTime") @LtEq String et, int pageSize, int pageNo) throws SQLException;
    @Batch
    @UpdateWith
    @From(Ware.class)
    @Where("STATE<>'0'")
    @SetSentence("STATE = '0'")
    int[] logicDelete(Connection con, @Batch String[] id) throws SQLException;
    @UpdateWith
    @From(Ware.class)
    int updateSortFirst(Connection con, String id, @Set long sortFirst) throws SQLException;
    @UpdateWith
    @From(Ware.class)
    int updateKw(Connection con, String id, @Set String keywords) throws SQLException;
}

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

@@ -0,0 +1,27 @@
package com.ekexiu.console.system.dao;
import com.ekexiu.console.system.po.WareKeyWord;
import org.jfw.apt.orm.annotation.dao.Batch;
import org.jfw.apt.orm.annotation.dao.DAO;
import org.jfw.apt.orm.annotation.dao.method.From;
import org.jfw.apt.orm.annotation.dao.method.operator.DeleteWith;
import org.jfw.apt.orm.annotation.dao.method.operator.Insert;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2018/3/22.
 */
@DAO
public interface WareKeyWordDao {
    @Insert
    @Batch
    int[] insert(Connection con, WareKeyWord[] pkw) throws SQLException;
    @DeleteWith
    @From(WareKeyWord.class)
    int delete(Connection con, String id) throws SQLException;
}

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

@@ -57,6 +57,8 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
    private Integer professorState;
    private Integer sortFirst;
    private long pageViews;
    private String sex;
    private String birthday;
    private List<ResearchArea> researchAreas;
    
@@ -336,5 +338,23 @@ public class Professor implements CreateTimeSupported,ModifyTimeSupported {
    public void setResearchAreas(List<ResearchArea> researchAreas) {
        this.researchAreas = researchAreas;
    }
    @Column(DE.Text_de)
    public String getSex() {
        return sex;
    }
    public void setSex(String sex) {
        this.sex = sex;
    }
    @Column(DE.Text_de)
    public String getBirthday() {
        return birthday;
    }
    public void setBirthday(String birthday) {
        this.birthday = birthday;
    }
}

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

@@ -0,0 +1,198 @@
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.LongHandler;
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2018/3/20.
 */
@PrimaryKey("id")
@Table
public class Ware implements CreateTimeSupported, ModifyTimeSupported {
    private String id;
    private String name;
    /**
     * 关键字
     */
    private String keywords;
    /**
     * 服务内容
     */
    private String cnt;
    /**
     * 合作备注
     */
    private String cooperation;
    /**
     * 详细描述
     */
    private String descp;
    /**
     * 类型：1：个人  2：企业
     */
    private String category;
    /**
     * 发布人
     */
    private String owner;
    private String images;
    /**
     * 状态  0：删除，1:发布的 ，2：草稿
     */
    private String state;
    /**
     * 创建时间
     */
    private String createTime;
    /**
     * 最后修改时间
     */
    private String modifyTime;
    private long shareId;
    private long pageViews;
    private long sortFirst;
    @Column(handlerClass = LongHandler.class, dbType = "INT8", nullable = true, renewable = false, fixSqlValueWithInsert = "0")
    public long getPageViews() {
        return pageViews;
    }
    public void setPageViews(long pageViews) {
        this.pageViews = pageViews;
    }
    @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.Text_de)
    public String getKeywords() {
        return keywords;
    }
    public void setKeywords(String keywords) {
        this.keywords = keywords;
    }
    @Column(DE.Text_de)
    public String getCnt() {
        return cnt;
    }
    public void setCnt(String context) {
        this.cnt = context;
    }
    @Column(DE.Text_de)
    public String getCooperation() {
        return cooperation;
    }
    public void setCooperation(String cooperation) {
        this.cooperation = cooperation;
    }
    @Column(DE.Text_de)
    public String getDescp() {
        return descp;
    }
    public void setDescp(String descp) {
        this.descp = descp;
    }
    @Column(handlerClass = FixLenStringHandler.class, dbType = "CHAR(1)", insertable = true, nullable = false, queryable = true, renewable = false)
    public String getCategory() {
        return category;
    }
    public void setCategory(String category) {
        this.category = category;
    }
    @Column(handlerClass = StringHandler.class, dbType = "TEXT", insertable = true, nullable = false, queryable = true, renewable = false)
    public String getOwner() {
        return owner;
    }
    public void setOwner(String owner) {
        this.owner = owner;
    }
    @Column(DE.Text_de)
    public String getImages() {
        return images;
    }
    public void setImages(String images) {
        this.images = images;
    }
    @Column(DE.singleChar)
    public String getState() {
        return state;
    }
    public void setState(String state) {
        this.state = state;
    }
    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.bigSerial)
    public long getShareId() {
        return shareId;
    }
    public void setShareId(long shareId) {
        this.shareId = shareId;
    }
    @Column(handlerClass = LongHandler.class, dbType = "INT8", fixSqlValueWithInsert = "0", insertable = true, renewable = false, queryable = true, nullable = false)
    public long getSortFirst() {
        return sortFirst;
    }
    public void setSortFirst(long sortFirst) {
        this.sortFirst = sortFirst;
    }
}

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

@@ -0,0 +1,34 @@
package com.ekexiu.console.system.po;
        import org.jfw.apt.orm.annotation.entry.Column;
        import org.jfw.apt.orm.annotation.entry.Table;
        import org.jfw.apt.orm.core.enums.DE;
/**
 * Created by TT on 2018/3/22.
 */
@Table("wre_key_word")
public class WareKeyWord {
    private String id;
    private String kw;
    @Column(DE.id_32)
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    @Column(DE.text_de)
    public String getKw() {
        return kw;
    }
    public void setKw(String kw) {
        this.kw = kw;
    }
}

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

@@ -0,0 +1,33 @@
package com.ekexiu.console.system.pojo;
import com.ekexiu.console.system.po.Ware;
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 2018/3/21.
 */
@ExtendView(fromSentence = "ware w LEFT JOIN professor p on p.id = w.owner LEFT JOIN organization o on o.id = w.owner ",tableAlias = "w")
public class WareInfo extends Ware {
    private String professorName;
    private String orgName;
    @CalcColumn(handlerClass = StringHandler.class, column = "p.name")
    public String getProfessorName() {
        return professorName;
    }
    public void setProfessorName(String professorName) {
        this.professorName = professorName;
    }
    @CalcColumn(handlerClass = StringHandler.class, column = "o.name")
    public String getOrgName() {
        return orgName;
    }
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
}

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

@@ -6,6 +6,8 @@ import com.ekexiu.console.system.dao.ProfessorDao;
import com.ekexiu.console.system.po.AuthApply;
import com.ekexiu.console.system.pojo.AuthApplyInfo;
import com.ekexiu.console.system.pojo.OrgApplyInfo;
import com.ekexiu.console.util.HttpService;
import com.ekexiu.console.util.HttpServiceImpl;
import org.jfw.apt.annotation.Autowrie;
import org.jfw.apt.annotation.DefaultValue;
import org.jfw.apt.annotation.Nullable;
@@ -18,7 +20,9 @@ import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.apt.web.annotation.param.RequestBody;
import org.jfw.util.PageQueryResult;
import org.jfw.util.exception.JfwBaseException;
import java.io.IOException;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.List;
@@ -29,6 +33,7 @@ import java.util.List;
@Path("/authApply")
public class AuthApplyService {
    private static HttpService http = new HttpServiceImpl();
    @Autowrie
    private AuthApplyDao authApplyDao;
@@ -75,14 +80,20 @@ public class AuthApplyService {
    @Post
    @Path("/state")
    public void updateState(@JdbcConn(true) Connection con, String authApplyId, Integer solveStatus, Integer applyType, String professorId,@Nullable String idCard) throws SQLException {
    public void updateState(@JdbcConn(true) Connection con, String authApplyId, Integer solveStatus, Integer applyType, String professorId,@Nullable String idCard) throws SQLException, IOException, JfwBaseException {
        this.authApplyDao.updateSolveStatus(con, solveStatus, authApplyId);
        if (applyType == 1) {
            this.professorDao.updateAuthStatus(con, professorId, solveStatus,idCard);
            //通过实名认证给用户增加积分
            if(solveStatus==3){
                http.post("http://www.ekexiu.com/ajax/growth/authRealName","professorId=" + professorId,null);
            }
        } else if (applyType == 2) {
            this.professorDao.updateAuthStatusExpert(con, professorId, solveStatus);
            if (solveStatus == 3) {
                this.professorDao.updateAuthType(con, professorId, 1);
                //通过专家认证给用户增加积分
                http.post("http://www.ekexiu.com/ajax/growth/authExpert","professorId=" + professorId,null);
            }
        } else if (applyType == 3) {
            this.orgDao.updateAuthStatus(con, professorId, String.valueOf(solveStatus));

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

@@ -10,10 +10,12 @@ import com.ekexiu.console.system.dao.ProfessorDao;
import com.ekexiu.console.system.dao.QuestionDao;
import com.ekexiu.console.system.dao.ResourceDao;
import com.ekexiu.console.system.dao.UserDao;
import com.ekexiu.console.system.dao.WareDao;
import com.ekexiu.console.system.po.Demand;
import com.ekexiu.console.system.po.Feedback;
import com.ekexiu.console.system.po.Professor;
import com.ekexiu.console.system.po.Question;
import com.ekexiu.console.system.po.Ware;
import com.ekexiu.console.system.pojo.AnswerInfo;
import com.ekexiu.console.system.vo.ConsoleAuthUser;
import org.jfw.apt.annotation.Autowrie;
@@ -58,6 +60,8 @@ public class FeedbackService {
    private DemandDao demandDao;
    @Autowrie
    private QuestionDao questionDao;
    @Autowrie
    private WareDao wareDao;
    public FeedbackDao getFeedbackDao() {
@@ -140,6 +144,14 @@ public class FeedbackService {
        this.questionDao = questionDao;
    }
    public WareDao getWareDao() {
        return wareDao;
    }
    public void setWareDao(WareDao wareDao) {
        this.wareDao = wareDao;
    }
    @Path("/update")
    @Post
    public void update(@JdbcConn(true) Connection con,long id,String state,@Nullable String operateDescp,@LoginUser ConsoleAuthUser user) throws SQLException {
@@ -218,6 +230,12 @@ public class FeedbackService {
                    feedback.setAnswerCnt(answer.getCnt());
                }
            }
            if (feedback.getSchema() == 10) {
                Ware ware = this.wareDao.queryById(con, feedback.getParam());
                if (ware != null) {
                    feedback.setDataName(ware.getName());
                }
            }
        }
        return feedback;
    }

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

@@ -30,6 +30,8 @@ public class KeyWordService {
    private PapKeyWordDao papKeyWordDao;
    @Autowrie
    private ResResultKeyWordDao resResultKeyWordDao;
    @Autowrie
    private WareKeyWordDao wareKeyWordDao;
    public ProKeyWordDao getProKeyWordDao() {
        return proKeyWordDao;
@@ -87,6 +89,14 @@ public class KeyWordService {
        this.resResultKeyWordDao = resResultKeyWordDao;
    }
    public WareKeyWordDao getWareKeyWordDao() {
        return wareKeyWordDao;
    }
    public void setWareKeyWordDao(WareKeyWordDao wareKeyWordDao) {
        this.wareKeyWordDao = wareKeyWordDao;
    }
    public void refreshProfessor(Connection con, String id, String kw) throws SQLException {
        String[] kws = splitKeyWord(kw);
        proKeyWordDao.delete(con, id);
@@ -192,6 +202,24 @@ public class KeyWordService {
        }
    }
    public void refreshWare(Connection con,String id,String kw)throws SQLException{
        String[] kws = splitKeyWord(kw);
        wareKeyWordDao.delete(con, id);
        if (kws != null && kws.length > 0) {
            WareKeyWord[] okws = new WareKeyWord[kws.length];
            for (int i = 0; i < kws.length; ++i) {
                WareKeyWord okw = new WareKeyWord();
                okw.setId(id);
                okw.setKw(kws[i]);
                okws[i] = okw;
            }
            wareKeyWordDao.insert(con, okws);
        }
    }
    public void deleteWare(Connection con,String id)throws SQLException{
        wareKeyWordDao.delete(con, id);
    }
    public static String[] splitKeyWord(String kws) {
        if (kws == null || kws.trim().length() == 0) return null;
        kws = kws.trim();

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

@@ -0,0 +1,159 @@
package com.ekexiu.console.system.service;
import com.ekexiu.console.system.dao.WareDao;
import com.ekexiu.console.system.pojo.WareInfo;
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.operate.Post;
import org.jfw.apt.web.annotation.param.JdbcConn;
import org.jfw.apt.web.annotation.param.PathVar;
import org.jfw.util.PageQueryResult;
import java.io.File;
import java.sql.Connection;
import java.sql.SQLException;
/**
 * Created by TT on 2018/3/21.
 */
@Path("/ware")
public class WareService {
    private File imgPath;
    @Autowrie
    private WareDao wareDao;
    @Autowrie
    private KeyWordService keyWordService;
    public File getImgPath() {
        return imgPath;
    }
    public void setImgPath(File imgPath) {
        this.imgPath = imgPath;
    }
    public WareDao getWareDao() {
        return wareDao;
    }
    public void setWareDao(WareDao wareDao) {
        this.wareDao = wareDao;
    }
    public KeyWordService getKeyWordService() {
        return keyWordService;
    }
    public void setKeyWordService(KeyWordService keyWordService) {
        this.keyWordService = keyWordService;
    }
    //public boolean update(Connection con, Ware ware, String[] professor, String[] resource) throws SQLException, IOException {
    //    String id = ware.getId();
    //    if (wareDao.update(con, ware) > 0) {
    //        this.saveSmallImg(ware.getImages());
    //        if (ware.getState().equals("1")) {
    //            keyWordService.refreshWare(con, id, ware.getKeywords());
    //        } else {
    //            keyWordService.deleteWare(con, id);
    //        }
    //        wareDao.deleteWareRes(con, id);
    //        if (resource != null && resource.length > 0) {
    //            for (String rid : resource) {
    //                WareRes wr = new WareRes();
    //                wr.setId(id);
    //                wr.setResource(rid);
    //                wareDao.insert(con, wr);
    //            }
    //        }
    //        wareDao.deleteWarePro(con, id);
    //        if (professor != null && professor.length > 0) {
    //            for (String pid : professor) {
    //                WarePro wp = new WarePro();
    //                wp.setId(id);
    //                wp.setProfessor(pid);
    //                wareDao.insert(con, wp);
    //            }
    //        }
    //        return true;
    //    }
    //    return false;
    //}
    //
    //private void saveSmallImg(String imgs) throws IOException {
    //    if (imgs != null) {
    //        List<String> list = ListUtil.splitTrimExcludeEmpty(imgs, ',');
    //        if (list.size() > 0) {
    //            String oname = list.get(0);
    //            if (oname != null) {
    //                if (oname.startsWith("/")) {
    //                    oname = oname.substring(1);
    //                    int idx = oname.indexOf('.');
    //                    if (idx > 0) {
    //                        String dname = oname.substring(0, idx) + "_s.jpg";
    //                        File dest = new File(this.imgPath, dname);
    //                        if (dest.exists())
    //                            return;
    //                        File src = new File(this.imgPath, oname);
    //                        if (src.exists()) {
    //                            byte[] obs = IoUtil.readStream(new FileInputStream(src), true);
    //                            obs = JpgUtil.read(obs);
    //                            FileOutputStream out = new FileOutputStream(dest);
    //                            try {
    //                                JpgUtil.scalingZoom(new ByteArrayInputStream(obs), out, this.imgMaxWidth);
    //                                out.flush();
    //                            } finally {
    //                                IoUtil.close(out);
    //                            }
    //                        }
    //                    }
    //                }
    //            }
    //        }
    //    }
    //}
    @Path("/pq")
    @Get
    public PageQueryResult<WareInfo> pageQueryResult (@JdbcConn Connection con, @Nullable String name, @Nullable String author, int orderBy, @Nullable String bt, @Nullable String et, @DefaultValue("1")int pageNo,@DefaultValue("10")int pageSize)throws SQLException {
        if (orderBy == 1) {
            return this.wareDao.queryByTime(con,name==null?null:"%"+name+"%",author==null?null:"%"+author+"%",bt == null?null:bt+"000000", et == null ? null : et + "235959", pageSize, pageNo);
        } else if (orderBy == 2) {
            return this.wareDao.queryByPV(con, name == null ? null : "%" + name + "%", author == null ? null : "%" + author + "%", bt == null ? null : bt + "000000", et == null ? null : et + "235959", pageSize, pageNo);
        }else {
            return null;
        }
    }
    @Post
    @Path(" /deleteWare")
    public void deleteWare(@JdbcConn(true)Connection con,String[] ids)throws SQLException {
        this.wareDao.logicDelete(con, ids);
    }
    @Post
    @Path("/sortFirst")
    public void updateSortFirst(@JdbcConn(true)Connection con,String id,long sortFirst)throws SQLException {
        this.wareDao.updateSortFirst(con, id, sortFirst);
    }
    @Get
    @Path("/id/{id}")
    public WareInfo query(@JdbcConn Connection con,@PathVar String id)throws SQLException {
        return this.wareDao.query(con, id);
    }
    @Post
    @Path("/kw")
    public void updateKw(@JdbcConn(true)Connection con,String id,@Nullable String kw)throws SQLException {
        this.wareDao.updateKw(con, id, kw);
        this.keyWordService.refreshWare(con, id, kw);
    }
}