Merge remote-tracking branch 'origin/dev_heart' into dev_heart

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/ActPhraseController.java

@@ -91,13 +91,6 @@ public class ActPhraseController {
         ExcelUtils.exportExcelToTarget(response, null, list, ActPhraseExcel.class);
     }
 
-    /**
-     * 查询常用语，更新Redis
-     */
-    public void insertPhraseListToRedis(){
-        actPhraseService.insertPhraseListToRedis();
-    }
-
     /*@PostMapping("queryCategoryInfo")
     public Result<List<CategoryInfoResultDTO>> queryCategoryInfo(@RequestBody CategoryInfoFormDTO formDTO) {
         List<CategoryInfoResultDTO> data = categoryService.listCategoryInfo(formDTO);

esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/support/initbean/InitRedisCache.java

@@ -1,6 +1,6 @@
 package com.elink.esua.epdc.support.initbean;
 
-import com.elink.esua.epdc.modules.phrases.controller.ActPhraseController;
+import com.elink.esua.epdc.modules.phrases.service.ActPhraseService;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -9,11 +9,11 @@ import org.springframework.stereotype.Component;
 public class InitRedisCache implements InitializingBean {
 
     @Autowired
-    private ActPhraseController actPhraseController;
+    private ActPhraseService actPhraseService;
 
     @Override
     public void afterPropertiesSet() throws Exception{
         //redis存储常用语
-        actPhraseController.insertPhraseListToRedis();
+        actPhraseService.insertPhraseListToRedis();
     }
 }