!215 营养小知识修改优化

Merge pull request !215 from 德仔/xzj

stdiet-admin/src/main/java/com/stdiet/web/controller/MyApplicationRunner.java

@@ -1,7 +1,10 @@
 package com.stdiet.web.controller;
 
 import com.stdiet.common.config.AliyunOSSConfig;
+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.SysWxUserInfo;
 import com.stdiet.custom.domain.SysWxUserLog;
@@ -23,6 +26,7 @@ import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 
 import java.io.File;
+import java.io.FileInputStream;
 import java.util.List;
 
 @Component
@@ -38,19 +42,13 @@ public class MyApplicationRunner implements ApplicationRunner {
     @Autowired
     private ISysNutritionQuestionService sysNutritionQuestionService;
 
-    @Autowired
-    private ISysWxUserLogService sysWxUserLogService;
+
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
-        System.out.println("项目启动调用方法");
-
-        /*SysNutritionQuestion sysNutritionQuestion = new SysNutritionQuestion();
-        sysNutritionQuestion.setTitle("如何防止猝死");
-        sysNutritionQuestion.setContent("少熬夜，少暴饮暴食");
-        sysNutritionQuestion.setKey("猝死");
-        sysNutritionQuestionService.insertSysNutritionQuestion(sysNutritionQuestion);*/
+        System.out.println("--------------项目启动调用方法开始----------");
 
+        System.out.println("--------------项目启动调用方法结束-------------");
     }
 
 
@@ -75,4 +73,36 @@ public class MyApplicationRunner implements ApplicationRunner {
             }
         }*/
     }
+
+    /**
+     * 导入营养小知识方法
+     * @param path
+     */
+    public void importNutritionQuestion(String path){
+        try{
+            int count = 0;
+            ExcelUtil<SysNutritionQuestion> util = new ExcelUtil<SysNutritionQuestion>(SysNutritionQuestion.class);
+            File file = new File(path);
+            List<SysNutritionQuestion> questionList = util.importExcel(new FileInputStream(file));
+            System.out.println(questionList.size());
+            for (SysNutritionQuestion sysNutritionQuestion : questionList) {
+                //System.out.println(sysNutritionQuestion);
+                if(StringUtils.isNotEmpty(sysNutritionQuestion.getTitle())
+                    && StringUtils.isNotEmpty(sysNutritionQuestion.getContent())){
+                    //System.out.println(sysNutritionQuestion.getTitle() + "\n");
+                    sysNutritionQuestion.setShowFlag(1);
+                    if(sysNutritionQuestionService.insertSysNutritionQuestion(sysNutritionQuestion) > 0){
+                        count++;
+                        Thread.sleep(100);
+                        System.out.println(count);
+                    }
+
+                }
+            }
+            System.out.println("结束："+count);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+    }
 }

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

@@ -2,6 +2,9 @@ package com.stdiet.custom.controller;
 
 import java.util.List;
 
+import com.stdiet.common.utils.StringUtils;
+import com.stdiet.custom.domain.SysCustomerCase;
+import org.apache.ibatis.annotations.Param;
 import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -104,4 +107,19 @@ public class SysNutritionQuestionController extends BaseController
     {
         return toAjax(sysNutritionQuestionService.regenerateNutritionQuestionIndex() ? 1 : 0);
     }
+
+    /**
+     * 修改营养小知识是否微信展示状态
+     */
+    @PreAuthorize("@ss.hasPermi('custom:nutritionQuestion:edit')")
+    @Log(title = "微信展示状态修改", businessType = BusinessType.UPDATE)
+    @GetMapping("/updateWxShow")
+    public AjaxResult updateWxShow(@RequestParam("id")String id, @RequestParam("showFlag")Integer showFlag)
+    {
+        if(StringUtils.isEmpty(id) || showFlag == null){
+            return AjaxResult.error();
+        }
+        Long[] ids = {Long.parseLong(id)};
+        return toAjax(sysNutritionQuestionService.updateWxShowByIds(showFlag, ids));
+    }
 }

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

@@ -285,10 +285,11 @@ public class WechatAppletController extends BaseController {
     }
 
     /**
-     * 获取微信用户记录详细信息
+     * 获取小程序展示的营养小知识列表
      */
     @GetMapping(value = "/getNutritionQuestionList")
     public AjaxResult getNutritionQuestionList(SysNutritionQuestion sysNutritionQuestion, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,  @RequestParam(value = "pageSize", defaultValue = "10")int pageSize) {
+        sysNutritionQuestion.setShowFlag(1);
         Map<String,Object> result = sysNutritionQuestionService.getNutritionQuestionListByKey(sysNutritionQuestion, pageNum, pageSize);
         return AjaxResult.success(result);
     }