Skip to content

石磊 / cihai

Go to a project
Commit 04701e41 by 侯昆
Options

Merge branch 'master' of http://gitlab.coralcodes.com:30000/shil0009/cihai 

# Conflicts:
#	serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/HomeController.java
2 parents 10d7f02d c72ee280
Inline Side-by-side
Showing 5 changed files with 20 additions and 25 deletions
serverside/cihai-core/src/main/java/com/dookay/cihai/core/theme/query/ThemeQuery.java
...@@ -7,11 +7,12 @@ import com.dookay.coral.common.core.persistence.criteria.QueryCriteria; ...@@ -7,11 +7,12 @@ import com.dookay.coral.common.core.persistence.criteria.QueryCriteria;
import com.dookay.cihai.core.theme.domain.ThemeDomain; import com.dookay.cihai.core.theme.domain.ThemeDomain;
/** /**
* 专题 * 专题
* @author wangwei *
* @since 2017年12月06日 * @author wangwei
* @version V1.0 * @version V1.0
*/ * @since 2017年12月06日
*/
@Data @Data
public class ThemeQuery extends Query { public class ThemeQuery extends Query {
...@@ -22,8 +23,8 @@ public class ThemeQuery extends Query { ...@@ -22,8 +23,8 @@ public class ThemeQuery extends Query {
QueryCriteria queryCriteria = new QueryCriteria(ThemeDomain.class); QueryCriteria queryCriteria = new QueryCriteria(ThemeDomain.class);
Example.Criteria criteria = queryCriteria.createCriteria(); Example.Criteria criteria = queryCriteria.createCriteria();
if (valid(keyword)) { if (valid(keyword)) {
String str = "%" + keyword + "%"; String str = keyword + "%";
criteria.andCondition(String.format("(title like '%s' or sub_title like '%s')", str, str)); criteria.andCondition(String.format("(title like '%s' or FIND_IN_SET('%s',sub_title))", str, keyword));
} }
//todo 写查询逻辑 //todo 写查询逻辑
return queryCriteria; return queryCriteria;
......
serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/CihaiJspApplication.java
package com.dookay.cihai.wechat; package com.dookay.cihai.wechat;
import com.dookay.cihai.core.CihaiCoreApplication; import com.dookay.cihai.core.CiHaiCoreApplication;
import com.dookay.coral.common.core.CoralCommonCoreMarker; import com.dookay.coral.common.core.CoralCommonCoreMarker;
import com.dookay.coral.common.web.CoralCommonWebMarker; import com.dookay.coral.common.web.CoralCommonWebMarker;
import org.mybatis.spring.annotation.MapperScan; import org.mybatis.spring.annotation.MapperScan;
...@@ -22,14 +22,14 @@ import org.springframework.cache.annotation.EnableCaching; ...@@ -22,14 +22,14 @@ import org.springframework.cache.annotation.EnableCaching;
scanBasePackageClasses = { scanBasePackageClasses = {
CoralCommonCoreMarker.class, CoralCommonCoreMarker.class,
CoralCommonWebMarker.class, CoralCommonWebMarker.class,
CihaiCoreApplication.class, CiHaiCoreApplication.class,
CihaiJspApplication.class, CihaiJspApplication.class,
}) })
@MapperScan(basePackageClasses = CihaiCoreApplication.class) @MapperScan(basePackageClasses = CiHaiCoreApplication.class)
@ServletComponentScan(basePackageClasses = { @ServletComponentScan(basePackageClasses = {
CoralCommonWebMarker.class, CoralCommonWebMarker.class,
CihaiJspApplication.class, CihaiJspApplication.class,
CihaiCoreApplication.class CiHaiCoreApplication.class
}) })
@EnableCaching @EnableCaching
public class CihaiJspApplication extends SpringBootServletInitializer { public class CihaiJspApplication extends SpringBootServletInitializer {
......
serverside/cihai-wechat/src/main/java/com/dookay/cihai/wechat/controller/HomeController.java
...@@ -18,6 +18,8 @@ import com.dookay.cihai.core.aip.AipWordUtilBean; ...@@ -18,6 +18,8 @@ import com.dookay.cihai.core.aip.AipWordUtilBean;
import com.dookay.cihai.core.theme.domain.ThemeDomain; import com.dookay.cihai.core.theme.domain.ThemeDomain;
import com.dookay.cihai.core.theme.query.ThemeQuery; import com.dookay.cihai.core.theme.query.ThemeQuery;
import com.dookay.cihai.core.theme.service.IThemeService; 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.cihai.core.word.service.IWordService;
import com.dookay.coral.common.web.controller.BaseController; import com.dookay.coral.common.web.controller.BaseController;
import com.dookay.coral.common.web.response.JsonResult; import com.dookay.coral.common.web.response.JsonResult;
......
serverside/cihai-wechat/src/main/webapp/WEB-INF/jsp/portal/home/index.jsp
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<img src="${ctx}/static/images/logo-zhiyun.png"> <img src="${ctx}/static/images/logo-zhiyun.png">
</div> </div>
<form class="search-area-inner"> <form class="search-area-inner">
<input class="form-control" type="text" placeholder="1,786,069 个语词"> <input class="form-control j_search_input" type="text" placeholder="1,786,069 个语词">
<a class="search-area-voice" type="button"> <a class="search-area-voice" type="button">
<span class="icon icon-microphone"></span> <span class="icon icon-microphone"></span>
</a> </a>
......
serverside/cihai-wechat/src/main/webapp/static/js/index.js
...@@ -11,16 +11,6 @@ setTimeout(function () { ...@@ -11,16 +11,6 @@ setTimeout(function () {
$loading.remove(); $loading.remove();
},300); },300);
$('.search-area-inner').on('click', function () { $('.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(); wx.startRecord();
myApp.dialog.create({ myApp.dialog.create({
title: '正在录音...', title: '正在录音...',
...@@ -30,20 +20,22 @@ $('.search-area-inner').on('click', function () { ...@@ -30,20 +20,22 @@ $('.search-area-inner').on('click', function () {
onClick:function () { onClick:function () {
wx.stopRecord({ wx.stopRecord({
success: function (res) { success: function (res) {
myApp.dialog.preloader();
var localId = res.localId; var localId = res.localId;
wx.translateVoice({ wx.translateVoice({
localId: localId, // 需要识别的音频的本地Id，由录音相关接口获得 localId: localId, // 需要识别的音频的本地Id，由录音相关接口获得
isShowProgressTips: 0, // 默认为1，显示进度提示 isShowProgressTips: 0, // 默认为1，显示进度提示
success: function (res) { success: function (res) {
alert(res.translateResult); jQuery.get("/home/search",{keyword:res.translateResult},function (data) {
$.post("/home/search",{keyword:res.translateResult},function (data) { myApp.dialog.close();
alert(data.code);
if(data.code=="OK"){ if(data.code=="OK"){
myApp.view.main.router.load({ myApp.view.main.router.load({
url:data.data url:data.data
}); });
}else{ }else{
myApp.dialog.alert(data.message); myApp.dialog.alert(data.message);
$('.j_search_input').val(res.translateResult);
} }
}) })
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!