diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/ActPhraseController.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/ActPhraseController.java index baf2fc840..ed28c54f4 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/ActPhraseController.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/controller/ActPhraseController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.modules.phrases.entity.ActPhraseRedisEntity; import com.elink.esua.epdc.modules.phrases.excel.ActPhraseExcel; import com.elink.esua.epdc.modules.phrases.service.ActPhraseService; import com.elink.esua.epdc.phrases.ActPhraseDTO; @@ -91,11 +92,16 @@ public class ActPhraseController { ExcelUtils.exportExcelToTarget(response, null, list, ActPhraseExcel.class); } - @PostMapping("sagenumAddOne") + @GetMapping(value="sagenumAddOneById",produces = "text/plain;charset=UTF-8") public Result sagenumAddOne(String id) { - actPhraseService.updateUsagenumAddOne(id); return new Result().ok("使用次数加一成功"); } + @GetMapping(value="getPhraseList",produces = "text/plain;charset=UTF-8") + public Result getPhraseList() { + List object = actPhraseService.getPhraseList(); + return new Result().ok(object); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/ActPhraseService.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/ActPhraseService.java index 5a9ba04b2..a5889a536 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/ActPhraseService.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/service/ActPhraseService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.modules.phrases.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.modules.phrases.entity.ActPhraseEntity; +import com.elink.esua.epdc.modules.phrases.entity.ActPhraseRedisEntity; import com.elink.esua.epdc.phrases.ActPhraseDTO; import java.util.List; @@ -107,4 +108,12 @@ public interface ActPhraseService extends BaseService { * @date 2019-12-12 */ void updateUsagenumAddOne(String id); + + /** + * 从redis直接读取常用语 + * @author wanggongfeng + * @date 2019-12-12 + * @return 常用语列表 + */ + List getPhraseList(); } \ No newline at end of file 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 3bf395be1..354f3deb7 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 @@ -37,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -170,4 +171,19 @@ public class ActPhraseServiceImpl extends BaseServiceImpl getPhraseList(){ + String key = RedisKeys.getPhraseListKey(); + Object object = redisUtils.get(key); + List list = new ArrayList(); + if(object != null){ + list = (List)object; + } + return list; + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/phrases/ActPhraseDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/phrases/ActPhraseDao.xml index d30f9e580..27600c6fa 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/phrases/ActPhraseDao.xml +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/phrases/ActPhraseDao.xml @@ -21,7 +21,7 @@ - update epdc_act_phrase set USAGE_NUM = USAGE_NUM + 1 where id = {#id} + update epdc_act_phrase set USAGE_NUM = USAGE_NUM + 1 where id = #{id}