From d4fa84251e2daad520e84d12f9ee3afc78016315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Tue, 7 Apr 2020 09:46:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B8=B8=E7=94=A8=E8=AF=ADap?=
 =?UTF-8?q?i=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ActPhraseServiceImpl.java    | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java
index a99b11df9..9e730a8f6 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/impl/ActPhraseServiceImpl.java
@@ -67,6 +67,7 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
 
     /**
      * 条件查询
+     *
      * @param params
      * @return
      */
@@ -74,8 +75,8 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
     public PageData<ActPhraseDTO> getPhrasePage(Map<String, Object> params) {
         String phrase = ((String) params.get("phrase")).trim();
         String code = ((String) params.get("code")).trim();
-        params.put("phrase",phrase);
-        params.put("code",code);
+        params.put("phrase", phrase);
+        params.put("code", code);
         IPage<ActPhraseDTO> page = getPage(params);
         List<ActPhraseDTO> list = baseDao.getPhrasePage(params);
         return new PageData<>(list, page.getTotal());
@@ -88,8 +89,8 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
         return ConvertUtils.sourceToTarget(entityList, ActPhraseDTO.class);
     }
 
-    private QueryWrapper<ActPhraseEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<ActPhraseEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<ActPhraseEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -134,7 +135,7 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
         String key = RedisKeys.getPhraseListKey();
         redisUtils.delete(key);
         List<ActPhraseRedisEntity> list = baseDao.selectListPhraseInOrder();
-        redisUtils.set(key,list);
+        redisUtils.set(key, list);
 
     }
 
@@ -148,11 +149,12 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
         String key = RedisKeys.getPhraseListKey();
         redisUtils.delete(key);
         List<ActPhraseRedisEntity> list = baseDao.selectListPhraseInOrder();
-        redisUtils.set(key,list);
+        redisUtils.set(key, list);
     }
 
     /**
      * 统计编码数量
+     *
      * @param dto
      * @return
      */
@@ -167,38 +169,43 @@ public class ActPhraseServiceImpl extends BaseServiceImpl<ActPhraseDao, ActPhras
 
     /**
      * 查询启动时需存入radis内的常用语
+     *
      * @return
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertPhraseListToRedis(){
+    public void insertPhraseListToRedis() {
         //redis存储
         String key = RedisKeys.getPhraseListKey();
         redisUtils.delete(key);
         List<ActPhraseRedisEntity> list = baseDao.selectListPhraseInOrder();
-        redisUtils.set(key,list);
+        redisUtils.set(key, list);
     }
 
     /**
      * 使用次数加一
+     *
      * @param id
      */
     @Override
-    public void updateUsagenumAddOne(String id){
+    public void updateUsagenumAddOne(String id) {
         baseDao.updateUsagenumAddOne(id);
     }
 
     /**
      * 从redis直接读取常用语
+     *
      * @return
      */
     @Override
-    public List<ActPhraseRedisEntity> getPhraseList(){
+    public List<ActPhraseRedisEntity> getPhraseList() {
         String key = RedisKeys.getPhraseListKey();
         Object object = redisUtils.get(key);
         List<ActPhraseRedisEntity> list = new ArrayList<ActPhraseRedisEntity>();
-        if(object != null){
-            list = (List<ActPhraseRedisEntity>)object;
+        if (object != null) {
+            list = (List<ActPhraseRedisEntity>) object;
+        } else {
+            list = baseDao.selectListPhraseInOrder();
         }
         return list;
     }