Skip to content

石磊 / cihai

Go to a project
Commit c5867c98 by 石头
Options

首页整合

1 parent e741f194
Inline Side-by-side
Showing 11 changed files with 531 additions and 83 deletions
serverside/cihai-core/src/main/java/com/dookay/cihai/core/theme/domain/ThemeDomain.java
package com.dookay.cihai.core.theme.domain;
import lombok.Data;
import java.io.Serializable;
import javax.persistence.Id;
import javax.persistence.Table;
......@@ -8,47 +9,51 @@ import java.util.Date;
import java.util.List;
/**
* 专题
* @author wangwei
* @since 2017年12月06日
* @version V1.0
*/
* 专题
*
* @author wangwei
* @version V1.0
* @since 2017年12月06日
*/
@Data
@Table(name = "t_theme")
public class ThemeDomain implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
private static final long serialVersionUID = 1L;
/**
*
*/
@Id
private Long id;
/**
*
*/
private String title;
/**
*
*/
private String introduce;
/**
*
*/
private String basicInfo;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
private Long id;
/**
*
*/
private String title;
private String subTitle;
/**
*
*/
private String introduce;
/**
*
*/
private String basicInfo;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
}
serverside/cihai-core/src/main/java/com/dookay/cihai/core/theme/query/ThemeQuery.java
package com.dookay.cihai.core.theme.query;
import com.dookay.coral.common.core.persistence.Query;
import lombok.Data;
import tk.mybatis.mapper.entity.Example;
import com.dookay.coral.common.core.persistence.criteria.QueryCriteria;
import com.dookay.cihai.core.theme.domain.ThemeDomain;
......@@ -11,13 +12,19 @@ import com.dookay.cihai.core.theme.domain.ThemeDomain;
* @since 2017年12月06日
* @version V1.0
*/
@Data
public class ThemeQuery extends Query {
private String keyword;
@Override
public QueryCriteria toCriteria() {
QueryCriteria queryCriteria = new QueryCriteria(ThemeDomain.class);
Example.Criteria criteria = queryCriteria.createCriteria();
if (valid(keyword)) {
String str = "%" + keyword + "%";
criteria.andCondition(String.format("(title like '%s' or sub_title like '%s')", str, str));
}
//todo 写查询逻辑
return queryCriteria;
}
......
serverside/cihai-core/src/main/java/com/dookay/cihai/core/word/query/WordQuery.java
package com.dookay.cihai.core.word.query;
import com.dookay.coral.common.core.persistence.Query;
import lombok.Data;
import tk.mybatis.mapper.entity.Example;
import com.dookay.coral.common.core.persistence.criteria.QueryCriteria;
import com.dookay.cihai.core.word.domain.WordDomain;
/**
* 词条
* @author wangwei
* @since 2017年12月06日
* @version V1.0
*/
* 词条
*
* @author wangwei
* @version V1.0
* @since 2017年12月06日
*/
@Data
public class WordQuery extends Query {
@Override
public QueryCriteria toCriteria() {
QueryCriteria queryCriteria = new QueryCriteria(WordDomain.class);
Example.Criteria criteria = queryCriteria.createCriteria();
private String keyword;
@Override
public QueryCriteria toCriteria() {
QueryCriteria queryCriteria = new QueryCriteria(WordDomain.class);
Example.Criteria criteria = queryCriteria.createCriteria();
if (valid(keyword)) {
}
//todo 写查询逻辑
return queryCriteria;
}
//todo 写查询逻辑
return queryCriteria;
}
}
serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/config/WechatSecurityConfig.java 0 → 100644
/*****************************************
* *
* @dookay.com Internet make it happen *
* ----------- ----------------------- *
* dddd ddddd Internet make it happen *
* o o o Internet make it happen *
* k k k Internet make it happen *
* a a a Internet make it happen *
* yyyy yyyyy Internet make it happen *
* ----------- ----------------------- *
* NO BUG ENJOY LIFE *
* *
****************************************/
package com.dookay.cihai.wechat.config;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.annotation.Order;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
/**
* @author 石磊
* @date 2017/12/7
*/
@EnableWebSecurity
@Order
public class WechatSecurityConfig extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity http) throws Exception {
http.csrf().disable();
}
}
serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/HomeController.java
......@@ -14,12 +14,20 @@
package com.dookay.cihai.wechat.controller;
import com.dookay.cihai.core.aip.AipUtilBean;
import com.dookay.cihai.core.theme.domain.ThemeDomain;
import com.dookay.cihai.core.theme.query.ThemeQuery;
import com.dookay.cihai.core.theme.service.IThemeService;
import com.dookay.cihai.core.word.domain.WordDomain;
import com.dookay.cihai.core.word.query.WordQuery;
import com.dookay.cihai.core.word.service.IWordService;
import com.dookay.coral.common.web.controller.BaseController;
import com.dookay.coral.common.web.response.JsonResult;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
/**
......@@ -33,6 +41,12 @@ public class HomeController extends BaseController {
@Autowired
private IWordService wordService;
@Autowired
private IThemeService themeService;
@Autowired
private AipUtilBean aipUtilBean;
/**
* @author 石磊
* @date 2017/12/6
......@@ -43,16 +57,26 @@ public class HomeController extends BaseController {
ModelAndView mv = new ModelAndView("portal/home/index");
return mv;
}
/**
* @author 石磊
* @date 2017/12/6
* @description 搜索
*/
@RequestMapping(value="/serach",method = RequestMethod.GET)
public ModelAndView search(String keyword) {
ModelAndView mv = new ModelAndView("");
return mv;
@RequestMapping(value = "/home/search", method = RequestMethod.GET)
@ResponseBody
public JsonResult search(String keyword) {
System.out.println("进入搜索");
try {
String result = aipUtilBean.extractQueryKeyword(keyword);
ThemeQuery query = new ThemeQuery();
query.setKeyword(keyword);
ThemeDomain themeDomain = themeService.getFirst(query);
if (themeDomain == null) return errorResult("暂无检索结果");
System.out.println(themeDomain);
return successResult("success", "/theme/detail/" + themeDomain.getId());
} catch (Exception ex) {
return errorResult("暂无检索结果");
}
}
}
serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/ThemeController.java 0 → 100644
/*****************************************
* *
* @dookay.com Internet make it happen *
* ----------- ----------------------- *
* dddd ddddd Internet make it happen *
* o o o Internet make it happen *
* k k k Internet make it happen *
* a a a Internet make it happen *
* yyyy yyyyy Internet make it happen *
* ----------- ----------------------- *
* NO BUG ENJOY LIFE *
* *
****************************************/
package com.dookay.cihai.wechat.controller;
import com.dookay.cihai.core.theme.domain.ThemeDomain;
import com.dookay.cihai.core.theme.service.IThemeService;
import com.dookay.coral.common.web.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.servlet.ModelAndView;
/**
* @author 石磊
* @date 2017/12/6
*/
@Controller
@RequestMapping(value = "/theme")
public class ThemeController extends BaseController {
@Autowired
private IThemeService themeService;
/**
* @author 石磊
* @date 2017/12/6
* @description 详情
*/
@RequestMapping(value = "/detail/{id}", method = RequestMethod.GET)
public ModelAndView detail(@PathVariable Long id) {
ThemeDomain themeDomain = themeService.get(id);
ModelAndView mv = new ModelAndView("portal/theme/detail");
mv.addObject("theme", themeDomain);
return mv;
}
}
serverside/cihai-wechat/src/main/resources/application-dev.properties
......@@ -27,4 +27,8 @@ coral.wechat.WechatConfig.token=eGgg3CoOihZQwCf1sr8jU8zmBfx4u5WT
coral.wechat.WechatConfig.encodingAESKey=agkC7tsPUoOtbbUyxxcCLVJZVqVOCTeJgxUCXAx87op
# 是否加密
coral.wechat.WechatConfig.messageEncrypt=false
# 微信授权回调地址
\ No newline at end of file
# 微信授权回调地址
aip.app-id=10486245
aip.api-key=ws8qdxT51xm2qbWufxzRedI3
aip.secret-key=8b6g9ZyR69dFl6aqYdIOGa4IbOGgkdjh
\ No newline at end of file
serverside/cihai-wechat/src/main/resources/application.properties
......@@ -30,3 +30,4 @@ coral.web.view.error.internal-error=500
coral.web.view.error.service=service
coral.web.view.error.other=other
serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/portal/home/index.jsp
......@@ -54,19 +54,3 @@
<script src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
<script src="/wechat/jsConfig"></script>
<jsp:include page="/WEB-INF/jsp/include/footer.jsp"/>
<script>
$(function () {
function touchstart(){
alert('d');
e.preventDefault();
}
$('#voice').click(function (e) {
e.preventDefault();
})
})
</script>
\ No newline at end of file
serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/portal/theme/detail.jsp 0 → 100644
<%@ include file="/WEB-INF/jsp/include/taglib.jsp" %>
<%@ page contentType="text/html;charset=UTF-8" language="java" %>
<jsp:include page="/WEB-INF/jsp/include/header.jsp">
<jsp:param name="pageTitle" value="首页"/>
</jsp:include>
<div id="app">
<div class="statusbar"></div>
<div class="view view-main view-init ios-edges" data-url="/">
<div class="page">
<div class="page-content special-content">
<!--专题简介-->
<div class="intro-box">
<div class="block block-strong inset">
<div class="top-tip">
<img src="images/special-top.png">
</div>
<div class="txt-content">
<p class="intro-txt">中国共产党第十九次全国代表大会（简称党的十九大）于2017年10月18日至10月24日在北京召开。</p>
<p class="intro-txt">2017年10月18日上午9:00，中国共产党第十九次全国代表大会在人民大会堂开幕。习近平代表第十八届中央委员会向大会作了题为《决胜全面建成小康社会 夺取新时代中国特色社会主义伟大胜利》的报告。</p>
<p class="intro-txt">这次大会的主题是：不忘初心，牢记使命，高举中国特色社会主义伟大旗帜，决胜全面建成小康社会，夺取新时代中国特色社会主义伟大胜利，为实现中华民族伟大复兴的中国梦不懈奋斗。</p>
</div>
<div class="read-more js-read-more">
<span class="txt">展开阅读全部</span>
<span class="iconfont icon-zhankai"></span>
</div>
<h5 class="sub-title">基本信息</h5>
<div class="basic-msg">
<b>中文名称：</b>中国共产党第十九次全国代表大会</div>
<div class="basic-msg">
<b>会议简称：</b>党的十九大</div>
<div class="basic-msg">
<b>会议时间：</b>2017年10月18日-24日</div>
<div class="basic-msg">
<b>会议地点：</b>北京</div>
<div class="basic-msg">
<b>代表人数：</b>2287（确认2280名代表资格有效）</div>
</div>
</div>
<!--相关词条-->
<div class="about-word">
<div class="special-title">
<div class="tip">
<img src="images/special-tip.png">
</div>
<div class="title">相关词条</div>
</div>
<div class="block block-strong inset">
<div class="show-pic">
<img src="images/special-pic-01.jpg">
<div class="over-intro">
<div class="sub-title">习近平：新时代的领路人</div>
<div class="txt">2017年10月18日上午，习近平站在人民大会堂万人大礼堂的讲台前作中共十九大报告，历时近3个半小时。</div>
</div>
</div>
<div class="intro-detail">
<div class="name">习近平</div>
<div class="txt">习近平，男，汉族，1953年6月生，陕西富平人，1969年1月参加工作，1974年1月加入中国共产党，清华大学人文社会学院马克思主义理论与思想政治教育专业毕业，在职研究生学历，法学博士学位。</div>
<div class="txt">现任中国共产党中央委员会总书记，中共中央军事委员会主席，中华人民共和国主席，中华人民共和国中央军事委员会主席。</div>
</div>
<div class="extend-word">
<div class="name">延伸词条</div>
<div class="word-list">
<div class="item">新时代</div>
<div class="item">主要矛盾</div>
<div class="item">四个伟大</div>
<div class="item">全面小康</div>
<div class="item">新征程</div>
<div class="item">新时代</div>
<div class="item">中国特色社会主义思想</div>
<div class="item">土地承包</div>
<div class="item">全面依法治国</div>
<div class="item">青春梦想</div>
</div>
</div>
</div>
</div>
<!--"数"说十九大-->
<div class="num-progress">
<div class="special-title">
<div class="tip">
<img src="images/special-tip.png">
</div>
<div class="title">"数"说十九大</div>
</div>
<div class="block block-strong inset">
<div class="swiper-button-prev iconfont icon-jiantou"></div>
<div class="swiper-button-next iconfont icon-jiantou"></div>
<div class="swiper-container num-swiper">
<div class="swiper-wrapper">
<div class="swiper-slide active">350公里</div>
<div class="swiper-slide">6000多万</div>
<div class="swiper-slide">103个国家</div>
<div class="swiper-slide">1.2亿吨</div>
<div class="swiper-slide active">350公里</div>
<div class="swiper-slide">6000多万</div>
</div>
</div>
<div class="swiper-container num-content-swiper">
<div class="swiper-wrapper">
<div class="swiper-slide">
<div class="time">2017年9月21号</div>
<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p>
<div class="key-word">
<span class="name">延展关键词：</span>
<span class="item">高铁</span>
<span class="item">速度</span>
<span class="item">铁路</span>
<span class="item">复兴号</span>
</div>
<div class="pic">
<img src="images/special-pic-02.jpg">
</div>
<div class="pic">
<img src="images/special-pic-08.jpg">
</div>
</div>
<div class="swiper-slide">
<div class="time">2017年9月22号</div>
<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p>
<div class="key-word">
<span class="name">延展关键词：</span>
<span class="item">高铁</span>
<span class="item">速度</span>
<span class="item">铁路</span>
<span class="item">复兴号</span>
</div>
<div class="pic">
<img src="images/special-pic-02.jpg">
</div>
<div class="pic">
<img src="images/special-pic-08.jpg">
</div>
</div>
<div class="swiper-slide">
<div class="time">2017年9月23号</div>
<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p>
<div class="key-word">
<span class="name">延展关键词：</span>
<span class="item">高铁</span>
<span class="item">速度</span>
<span class="item">铁路</span>
<span class="item">复兴号</span>
</div>
<div class="pic">
<img src="images/special-pic-02.jpg">
</div>
<div class="pic">
<img src="images/special-pic-08.jpg">
</div>
</div>
<div class="swiper-slide">
<div class="time">2017年9月24号</div>
<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p>
<div class="key-word">
<span class="name">延展关键词：</span>
<span class="item">高铁</span>
<span class="item">速度</span>
<span class="item">铁路</span>
<span class="item">复兴号</span>
</div>
<div class="pic">
<img src="images/special-pic-02.jpg">
</div>
<div class="pic">
<img src="images/special-pic-08.jpg">
</div>
</div>
<div class="swiper-slide">
<div class="time">2017年9月21号</div>
<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p>
<div class="key-word">
<span class="name">延展关键词：</span>
<span class="item">高铁</span>
<span class="item">速度</span>
<span class="item">铁路</span>
<span class="item">复兴号</span>
</div>
<div class="pic">
<img src="images/special-pic-02.jpg">
</div>
<div class="pic">
<img src="images/special-pic-08.jpg">
</div>
</div>
<div class="swiper-slide">
<div class="time">2017年9月22号</div>
<p class="txt">中车生产的自主知识产权的中国高铁“复兴号”在京沪线上以每小时350公里的速度正式运营。中车产品出口到世界七大洲 103个国家。</p>
<div class="key-word">
<span class="name">延展关键词：</span>
<span class="item">高铁</span>
<span class="item">速度</span>
<span class="item">铁路</span>
<span class="item">复兴号</span>
</div>
<div class="pic">
<img src="images/special-pic-02.jpg">
</div>
<div class="pic">
<img src="images/special-pic-08.jpg">
</div>
</div>
</div>
</div>
</div>
</div>
<!--十九大图谱-->
<div class="relation-pic">
<div class="special-title">
<div class="tip">
<img src="images/special-tip.png">
</div>
<div class="title">十九大图谱</div>
</div>
<div id="mynetwork"></div>
</div>
<!--词云解析-->
<div class="word-analysis">
<div class="special-title">
<div class="tip">
<img src="images/special-tip.png">
</div>
<div class="title">词云解析</div>
</div>
<div class="inner">
<img src="images/special-pic-07.png">
</div>
</div>
<!--相关新闻-->
<div class="about-news">
<div class="special-title">
<div class="tip">
<img src="images/special-tip.png">
</div>
<div class="title">相关新闻</div>
</div>
<div class="card">
<div class="card-header">中外媒体看十九大：“科技创新”持续受关注。</div>
<div class="card-content card-content-padding">
<img src="images/special-pic-03.jpg">
</div>
<div class="card-footer">美国媒体道琼斯通讯社、美联社、彭博社、CNBC和英国路透社等涉及十九大的报道热度均相对较高。</div>
</div>
<div class="card">
<div class="card-header">不忘初心，牢记使命，不断提高党的创造力。</div>
<div class="card-content card-content-padding">
<img src="images/special-pic-04.jpg">
</div>
<div class="card-footer">党的十九大报告指出，五年来，党的创造力、凝聚力、战斗力显著增强。</div>
</div>
<div class="card">
<div class="card-header">十九大报告：中国特色社会主义进入新时代的“宣言书”</div>
<div class="card-content card-content-padding">
<img src="images/special-pic-05.jpg">
</div>
<div class="card-footer">中国共产党第十九次全国代表大会，中国特色社会主义进入新时代的关键时期召开的一次十分重要的大会。</div>
</div>
<div class="more-btn">加载更多</div>
</div>
<!--图说十九大-->
<div class="pic-show">
<div class="special-title">
<div class="tip">
<img src="images/special-tip.png">
</div>
<div class="title">图说十九大</div>
</div>
<div class="swiper-container pic-swiper">
<div class="swiper-wrapper">
<div class="swiper-slide">
<img src="images/special-pic-06.jpg">
</div>
<div class="swiper-slide">
<img src="images/special-pic-06.jpg">
</div>
<div class="swiper-slide">
<img src="images/special-pic-06.jpg">
</div>
</div>
</div>
</div>
<!--相关专题-->
<div class="about-topic">
<div class="special-title">
<div class="tip">
<img src="images/special-tip.png">
</div>
<div class="title">相关专题</div>
</div>
<div class="swiper-container topic-swiper">
<div class="swiper-wrapper">
<div class="swiper-slide">
<div class="title">世界互联网大会</div>
<div class="txt">全球互联网再次进入“乌镇时间”。12月3日，第四届世界互联网大会在浙江省乌镇开幕。国家主席习近平发来贺信。</div>
</div>
<div class="swiper-slide">
<div class="title">世界互联网大会</div>
<div class="txt">全球互联网再次进入“乌镇时间”。12月3日，第四届世界互联网大会在浙江省乌镇开幕。国家主席习近平发来贺信。</div>
</div>
<div class="swiper-slide">
<div class="title">世界互联网大会</div>
<div class="txt">全球互联网再次进入“乌镇时间”。12月3日，第四届世界互联网大会在浙江省乌镇开幕。国家主席习近平发来贺信。</div>
</div>
</div>
<div class="swiper-pagination"></div>
</div>
</div>
</div>
</div>
</div>
</div>
<jsp:include page="/WEB-INF/jsp/include/footer.jsp"/>
<script>
$(function () {
})
</script>
\ No newline at end of file
serverside/cihai-wechat/src/main/webapp/static/js/index.js
......@@ -11,6 +11,16 @@ setTimeout(function () {
$loading.remove();
},300);
$('.search-area-inner').on('click', function () {
jQuery.get("/home/search",{keyword:"什么是十九大"},function (data) {
if(data.code=="OK"){
myApp.view.main.router.load({
url:data.data
});
}else{
myApp.dialog.alert(data.message);
}
})
wx.startRecord();
myApp.dialog.create({
title: '正在录音...',
......@@ -19,20 +29,23 @@ $('.search-area-inner').on('click', function () {
text: '完成',
onClick:function () {
wx.stopRecord({
success: function (res) {
var localId = res.localId;
wx.translateVoice({
localId: localId, // 需要识别的音频的本地Id，由录音相关接口获得
isShowProgressTips: 1, // 默认为1，显示进度提示
isShowProgressTips: 0, // 默认为1，显示进度提示
success: function (res) {
myApp.view.main.router.load({
url:'/home/search?keyword='+res.translateResult
});
alert(res.translateResult);
$.post("/home/search",{keyword:res.translateResult},function (data) {
alert(data.code);
if(data.code=="OK"){
myApp.view.main.router.load({
url:data.data
});
}else{
myApp.dialog.alert(data.message);
}
})
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!