Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!208 查询上一个订单最后一天食谱计划改为成交时间排序

Browse Source 
Merge pull request !208 from 德仔/xzj
This commit is contained in:
德仔
2021-04-15 18:28:11 +08:00
committed by Gitee
parent c0bdb0ebf2 15e9561327
commit 437ad87adc
16 changed files with 246 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
stdiet-admin/src/main/filters/dev/application.yml
View File

@ -181,4 +181,8 @@ aliyun:
Buckets: stdiet
EndPoint: https://oss-cn-shenzhen.aliyuncs.com
#案例文件夹路径
casePrefix: case/
casePrefix: case/
lucene:
index:
nutritionQuestion: /home/api/manage.shengtangdiet.com/test/uploadPath/nutritionQuestion

6
stdiet-admin/src/main/filters/local/application.yml
View File

@ -19,7 +19,7 @@ stdiet:
# 开发环境配置
server:
# 服务器的HTTP端口，默认为8080
port: 8090
port: 8091
servlet:
# 应用的访问路径
context-path: /
@ -184,3 +184,7 @@ aliyun:
#案例文件夹路径
casePrefix: case/
lucene:
index:
nutritionQuestion: D:\develop\LuceneIndex\nutritionQuestion

6
stdiet-admin/src/main/filters/prod/application.yml
View File

@ -181,4 +181,8 @@ aliyun:
Buckets: stdiet
EndPoint: https://oss-cn-shenzhen.aliyuncs.com
#案例文件夹路径
casePrefix: case/
casePrefix: case/
lucene:
index:
nutritionQuestion: /home/api/manage.shengtangdiet.com/uploadPath/nutritionQuestion

10
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysNutritionQuestionController.java
View File

@ -100,4 +100,14 @@ public class SysNutritionQuestionController extends BaseController
{
return toAjax(sysNutritionQuestionService.deleteSysNutritionQuestionByIds(ids));
}
/**
* 重新生成知识问答索引
*/
@Log(title = "重新生成知识问答索引", businessType = BusinessType.UPDATE)
@GetMapping("/regenerateNutritionQuestionIndex")
public AjaxResult regenerateNutritionQuestionIndex()
{
return toAjax(sysNutritionQuestionService.regenerateNutritionQuestionIndex() ? 1 : 0);
}
}

17
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
View File

@ -14,10 +14,7 @@ import com.stdiet.common.utils.sign.AesUtils;
import com.stdiet.custom.domain.*;
import com.stdiet.custom.dto.response.CustomerCaseResponse;
import com.stdiet.custom.page.WxLogInfo;
import com.stdiet.custom.service.ISysCustomerCaseService;
import com.stdiet.custom.service.ISysOrderService;
import com.stdiet.custom.service.ISysWxUserInfoService;
import com.stdiet.custom.service.ISysWxUserLogService;
import com.stdiet.custom.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@ -47,6 +44,9 @@ public class WechatAppletController extends BaseController {
@Autowired
private ISysOrderService sysOrderService;
@Autowired
private ISysNutritionQuestionService sysNutritionQuestionService;
/**
* 查询微信小程序中展示的客户案例
*/
@ -283,4 +283,13 @@ public class WechatAppletController extends BaseController {
return AjaxResult.error("文件上传失败");
}
}
/**
* 获取微信用户记录详细信息
*/
@GetMapping(value = "/getNutritionQuestionList")
public AjaxResult getNutritionQuestionList(SysNutritionQuestion sysNutritionQuestion, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum, @RequestParam(value = "pageSize", defaultValue = "10")int pageSize) {
Map<String,Object> result = sysNutritionQuestionService.getNutritionQuestionListByKey(sysNutritionQuestion, pageNum, pageSize);
return AjaxResult.success(result);
}
}