!257 优化推送模板

Merge pull request !257 from 德仔/develop
2021-05-24 11:20:51 +08:00
parent e5202f2992 416189781f
commit 869a5743b4
13 changed files with 479 additions and 195 deletions
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/MyApplicationRunner.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/MyApplicationRunner.java
@@ -1,27 +1,13 @@
 package com.stdiet.web.controller;

-import com.stdiet.common.config.AliyunOSSConfig;
-import com.stdiet.common.core.domain.AjaxResult;
-import com.stdiet.common.core.domain.entity.SysUser;
 import com.stdiet.common.utils.StringUtils;
-import com.stdiet.common.utils.oss.AliyunOSSUtils;
 import com.stdiet.common.utils.poi.ExcelUtil;
 import com.stdiet.custom.domain.SysNutritionQuestion;
 import com.stdiet.custom.domain.SysNutritionalVideo;
-import com.stdiet.custom.domain.SysWxUserInfo;
-import com.stdiet.custom.domain.SysWxUserLog;
-import com.stdiet.custom.mapper.SysCustomerPhysicalSignsMapper;
-import com.stdiet.custom.mapper.SysNutritionQuestionMapper;
 import com.stdiet.custom.mapper.SysWxUserInfoMapper;
 import com.stdiet.custom.mapper.SysWxUserLogMapper;
 import com.stdiet.custom.service.ISysNutritionQuestionService;
 import com.stdiet.custom.service.ISysNutritionalVideoService;
-import com.stdiet.custom.service.ISysWxUserLogService;
-import com.stdiet.custom.utils.LuceneIndexUtils;
-import com.stdiet.framework.web.domain.server.Sys;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.TextField;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
@@ -37,11 +23,11 @@ import java.util.Map;
@Order(value = 1)
 public class MyApplicationRunner implements ApplicationRunner {

-    @Autowired
-    private SysWxUserLogMapper sysWxUserLogMapper;
+//    @Autowired
+//    private SysWxUserLogMapper sysWxUserLogMapper;

-    @Autowired
-    private SysWxUserInfoMapper sysWxUserInfoMapper;
+//    @Autowired
+//    private SysWxUserInfoMapper sysWxUserInfoMapper;

    @Autowired
    private ISysNutritionQuestionService sysNutritionQuestionService;
@@ -50,7 +36,6 @@ public class MyApplicationRunner implements ApplicationRunner {
    private ISysNutritionalVideoService sysNutritionalVideoService;


-
    @Override
    public void run(ApplicationArguments args) throws Exception {
        System.out.println("--------------项目启动调用方法开始----------");
@@ -59,11 +44,10 @@ public class MyApplicationRunner implements ApplicationRunner {
    }


-
    /**
     * 从微信用户表中查询openid更新到用户打卡日志表中
     */
-    public void dealWxUserLog(){
+    public void dealWxUserLog() {
        /*List<String> phoneList = sysWxUserLogMapper.getAllSysWxUserLogPhone();
        SysWxUserLog sysWxUserLog = new SysWxUserLog();
        if(phoneList.size() > 0){
@@ -83,10 +67,11 @@ public class MyApplicationRunner implements ApplicationRunner {

    /**
     * 导入营养小知识方法
+     *
     * @param path
     */
-    public void importNutritionQuestion(String path){
-        try{
+    public void importNutritionQuestion(String path) {
+        try {
            int count = 0;
            ExcelUtil<SysNutritionQuestion> util = new ExcelUtil<SysNutritionQuestion>(SysNutritionQuestion.class);
            File file = new File(path);
@@ -94,11 +79,11 @@ public class MyApplicationRunner implements ApplicationRunner {
            System.out.println(questionList.size());
            for (SysNutritionQuestion sysNutritionQuestion : questionList) {
                //System.out.println(sysNutritionQuestion);
-                if(StringUtils.isNotEmpty(sysNutritionQuestion.getTitle())
-                    && StringUtils.isNotEmpty(sysNutritionQuestion.getContent())){
+                if (StringUtils.isNotEmpty(sysNutritionQuestion.getTitle())
+                        && StringUtils.isNotEmpty(sysNutritionQuestion.getContent())) {
                    //System.out.println(sysNutritionQuestion.getTitle() + "\n");
                    sysNutritionQuestion.setShowFlag(1);
-                    if(sysNutritionQuestionService.insertSysNutritionQuestion(sysNutritionQuestion) > 0){
+                    if (sysNutritionQuestionService.insertSysNutritionQuestion(sysNutritionQuestion) > 0) {
                        count++;
                        Thread.sleep(100);
                        System.out.println(count);
@@ -106,18 +91,18 @@ public class MyApplicationRunner implements ApplicationRunner {

                }
            }
-            System.out.println("结束："+count);
-        }catch (Exception e){
+            System.out.println("结束：" + count);
+        } catch (Exception e) {
            e.printStackTrace();
        }

    }

-    public void updateVideo(){
-        Map<String, Object> map = sysNutritionalVideoService.searchVideo(null, null, 1,100, null);
-        if(map != null){
-            List<SysNutritionalVideo> list = (List<SysNutritionalVideo>)map.get("nutritionalVideoList");
-            if(list != null && list.size() > 0){
+    public void updateVideo() {
+        Map<String, Object> map = sysNutritionalVideoService.searchVideo(null, null, 1, 100, null);
+        if (map != null) {
+            List<SysNutritionalVideo> list = (List<SysNutritionalVideo>) map.get("nutritionalVideoList");
+            if (list != null && list.size() > 0) {
                for (SysNutritionalVideo video : list) {
                    sysNutritionalVideoService.insertSysNutritionalVideo(video);
                }
@@ -126,5 +111,4 @@ public class MyApplicationRunner implements ApplicationRunner {
    }


-
 }
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerHealthyController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCustomerHealthyController.java
@@ -1,4 +1,4 @@
-package com.stdiet.custom.controller;
+package com.stdiet.web.controller.custom;

 import java.util.List;

--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysNutritionQuestionController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysNutritionQuestionController.java
@@ -1,4 +1,4 @@
-package com.stdiet.custom.controller;
+package com.stdiet.web.controller.custom;

 import java.util.List;

--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderNutritionistReplaceRecordController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderNutritionistReplaceRecordController.java
@@ -1,4 +1,4 @@
-package com.stdiet.custom.controller;
+package com.stdiet.web.controller.custom;

 import java.time.temporal.ChronoUnit;
 import java.util.List;
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysServiceQuestionController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysServiceQuestionController.java
@@ -0,0 +1,26 @@
+package com.stdiet.web.controller.custom;
+
+import com.stdiet.common.core.controller.BaseController;
+import com.stdiet.common.core.domain.AjaxResult;
+import com.stdiet.custom.domain.SysServicesQuestion;
+import com.stdiet.custom.service.ISysServicesQuestionService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/services/question")
+public class SysServiceQuestionController extends BaseController {
+
+    @Autowired
+    private ISysServicesQuestionService sysServicesQuestionService;
+
+    @PostMapping(value = "/list")
+    public AjaxResult list(@RequestBody SysServicesQuestion sysServicesQuestion) {
+        return AjaxResult.success(sysServicesQuestionService.selectSysServicesQuestionByUserIdAndRole(sysServicesQuestion));
+    }
+
+    @PutMapping(value = "/updateStatus")
+    public AjaxResult reply(@RequestBody SysServicesQuestion sysServicesQuestion) {
+        return toAjax(sysServicesQuestionService.updateSysServicesQuestionStatus(sysServicesQuestion));
+    }
+}
--- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
+++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/WechatAppletController.java
@@ -68,6 +68,8 @@ public class WechatAppletController extends BaseController {
    private ISysDictTypeService iSysDictTypeService;
    @Autowired
    private IWechatAppletService iWechatAppletService;
+    @Autowired
+    private ISysServicesQuestionService iSysServicesQuestionService;

    /**
     * 查询微信小程序中展示的客户案例
@@ -571,9 +573,12 @@ public class WechatAppletController extends BaseController {
 //    }

    @GetMapping("/trans")
-    public AjaxResult transId(@RequestParam String customerId) {
-        Long cusId = StringUtils.isNotEmpty(customerId) ? Long.parseLong(AesUtils.decrypt(customerId)) : 0L;
-        return AjaxResult.success(String.valueOf(cusId));
+    public AjaxResult transId(@RequestParam String customerId, @RequestParam Long cusId) {
+        if (StringUtils.isNotEmpty(customerId)) {
+            return AjaxResult.success(AesUtils.decrypt(customerId));
+        }
+
+        return AjaxResult.success(AesUtils.encrypt(String.valueOf(cusId)));
    }

    @GetMapping("/subscribe")
@@ -587,6 +592,19 @@ public class WechatAppletController extends BaseController {
        return AjaxResult.success(sysRecipesPlanService.updateSysRecipesPlan(info));
    }

+    @GetMapping("/fetchServiceQuestion")
+    public AjaxResult fetchServiceQuestion(@RequestParam String customerId, @RequestParam Integer pageNum, @RequestParam Integer pageSize) {
+        startPage();
+
+        Long cusId = StringUtils.isNotEmpty(customerId) ? Long.parseLong(AesUtils.decrypt(customerId)) : 0L;
+
+        SysServicesQuestion servicesQuestion = new SysServicesQuestion();
+        servicesQuestion.setRole("customer");
+        servicesQuestion.setUserId(cusId);
+
+        return AjaxResult.success(iSysServicesQuestionService.selectSysServicesQuestionByUserIdAndRole(servicesQuestion));
+    }
+

 }