From d0231d11438faf86dfedb233cb78782dffd23008 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 12 Dec 2019 16:16:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=8E=8B=E5=85=AC=E5=B3=B0=EF=BC=9A=E5=B8=B8?= =?UTF-8?q?=E7=94=A8=E8=AF=AD=E7=B3=BB=E7=BB=9F=E5=90=AF=E5=8A=A8=E6=9B=B4?= =?UTF-8?q?=E6=96=B0redis?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/commons/tools/redis/RedisKeys.java | 8 +++ .../elink/esua/epdc/phrases/ActPhraseDTO.java | 5 ++ .../controller/ActPhraseController.java | 17 ++++- .../modules/phrases/dao/ActPhraseDao.java | 10 ++- .../phrases/entity/ActPhraseEntity.java | 5 ++ .../phrases/entity/ActPhraseRedisEntity.java | 46 +++++++++++++ .../phrases/service/ActPhraseService.java | 7 +- .../service/impl/ActPhraseServiceImpl.java | 64 ++++++++++++++++++- .../epdc/support/initbean/InitRedisCache.java | 19 ++++++ .../resources/mapper/phrases/ActPhraseDao.xml | 4 ++ 10 files changed, 179 insertions(+), 6 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/entity/ActPhraseRedisEntity.java create mode 100644 esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/support/initbean/InitRedisCache.java diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java index fe63c4596..6465b9584 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/redis/RedisKeys.java @@ -146,6 +146,14 @@ public class RedisKeys { return rootPrefix.concat("options:category:events"); } + /** + * @Author wanggongfeng + * @Description常用语 + */ + public static String getPhraseListKey() { + return rootPrefix.concat("epdc:heart:phrase:list"); + } + /** * @param ruleCode 积分规则编码 * @return java.lang.String diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/phrases/ActPhraseDTO.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/phrases/ActPhraseDTO.java index b475bfddc..cb1143675 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/phrases/ActPhraseDTO.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-client/src/main/java/com/elink/esua/epdc/phrases/ActPhraseDTO.java @@ -84,4 +84,9 @@ public class ActPhraseDTO implements Serializable { */ private Date updatedTime; + /** + * code + */ + private String code; + } \ 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/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 6359fee0f..d793cfbcd 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 @@ -23,11 +23,11 @@ import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.AssertUtils; 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.UpdateGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; -import com.elink.esua.epdc.phrases.ActPhraseDTO; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; 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; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -91,4 +91,17 @@ public class ActPhraseController { ExcelUtils.exportExcelToTarget(response, null, list, ActPhraseExcel.class); } + /** + * 查询常用语，更新Redis + */ + public void insertPhraseListToRedis(){ + actPhraseService.insertPhraseListToRedis(); + } + + /*@PostMapping("queryCategoryInfo") + public Result> queryCategoryInfo(@RequestBody CategoryInfoFormDTO formDTO) { + List data = categoryService.listCategoryInfo(formDTO); + return new Result>().ok(data); + }*/ + } \ 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/dao/ActPhraseDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/dao/ActPhraseDao.java index efe3e25f4..427c37dc5 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/dao/ActPhraseDao.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/dao/ActPhraseDao.java @@ -19,8 +19,11 @@ package com.elink.esua.epdc.modules.phrases.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.modules.phrases.entity.ActPhraseEntity; +import com.elink.esua.epdc.modules.phrases.entity.ActPhraseRedisEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 常用语表 * @@ -29,5 +32,10 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface ActPhraseDao extends BaseDao { - + + /** + * 按序号顺序查询常用语 + * @return + */ + List selectListPhraseInOrder(); } \ 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/entity/ActPhraseEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/entity/ActPhraseEntity.java index b9213617e..453fa00b7 100644 --- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/entity/ActPhraseEntity.java +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/entity/ActPhraseEntity.java @@ -55,4 +55,9 @@ public class ActPhraseEntity extends BaseEpdcEntity { */ private Integer usageNum; + /** + * code + */ + private String code; + } \ 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/entity/ActPhraseRedisEntity.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/entity/ActPhraseRedisEntity.java new file mode 100644 index 000000000..883ed5b53 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/phrases/entity/ActPhraseRedisEntity.java @@ -0,0 +1,46 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.phrases.entity; + +import lombok.Data; + +/** + * 常用语表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2019-12-11 + */ +@Data +public class ActPhraseRedisEntity { + + /** + * ID + */ + private String id; + + /** + * 常用语 + */ + private String phrase; + + /** + * code + */ + private String code; + +} \ 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 5fb63b983..9d18096cd 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 @@ -19,8 +19,8 @@ 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.phrases.ActPhraseDTO; import com.elink.esua.epdc.modules.phrases.entity.ActPhraseEntity; +import com.elink.esua.epdc.phrases.ActPhraseDTO; import java.util.List; import java.util.Map; @@ -92,4 +92,9 @@ public interface ActPhraseService extends BaseService { * @date 2019-12-11 */ void delete(String[] ids); + + /** + * 查询常用语，更新Radis + */ + void insertPhraseListToRedis(); } \ 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 fbc24181d..a794ec203 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 @@ -20,14 +20,18 @@ package com.elink.esua.epdc.modules.phrases.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.redis.RedisKeys; +import com.elink.esua.epdc.commons.tools.redis.RedisUtils; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; -import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.modules.phrases.dao.ActPhraseDao; -import com.elink.esua.epdc.phrases.ActPhraseDTO; import com.elink.esua.epdc.modules.phrases.entity.ActPhraseEntity; +import com.elink.esua.epdc.modules.phrases.entity.ActPhraseRedisEntity; import com.elink.esua.epdc.modules.phrases.redis.ActPhraseRedis; import com.elink.esua.epdc.modules.phrases.service.ActPhraseService; +import com.elink.esua.epdc.phrases.ActPhraseDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,6 +52,8 @@ public class ActPhraseServiceImpl extends BaseServiceImpl page(Map params) { @@ -83,8 +89,21 @@ public class ActPhraseServiceImpl extends BaseServiceImpl 0) { + throw new RenException("您输入的编码已存在"); + } + } ActPhraseEntity entity = ConvertUtils.sourceToTarget(dto, ActPhraseEntity.class); insert(entity); + + //redis存储 + String key = RedisKeys.getPhraseListKey(); + redisUtils.delete(key); + List list = baseDao.selectListPhraseInOrder(); + redisUtils.set(key,list); + } @Override @@ -92,6 +111,13 @@ public class ActPhraseServiceImpl extends BaseServiceImpl list = baseDao.selectListPhraseInOrder(); + redisUtils.set(key,list); + } @Override @@ -99,6 +125,40 @@ public class ActPhraseServiceImpl extends BaseServiceImpl list = baseDao.selectListPhraseInOrder(); + redisUtils.set(key,list); + } + + /** + * 统计编码数量 + * @param dto + * @return + */ + public Integer getCodeCount(ActPhraseDTO dto) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("code", dto.getCode()); + String id = dto.getId(); + wrapper.ne(id != null, "id", dto.getId()); + wrapper.eq("del_flag", "0"); + return baseDao.selectCount(wrapper); + } + + /** + * 查询启动时需存入radis内的常用语 + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void insertPhraseListToRedis(){ + //redis存储 + String key = RedisKeys.getPhraseListKey(); + redisUtils.delete(key); + List list = baseDao.selectListPhraseInOrder(); + redisUtils.set(key,list); } } \ 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/support/initbean/InitRedisCache.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/support/initbean/InitRedisCache.java new file mode 100644 index 000000000..7817b5d71 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/support/initbean/InitRedisCache.java @@ -0,0 +1,19 @@ +package com.elink.esua.epdc.support.initbean; + +import com.elink.esua.epdc.modules.phrases.controller.ActPhraseController; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +@Component +public class InitRedisCache implements InitializingBean { + + @Autowired + private ActPhraseController actPhraseController; + + @Override + public void afterPropertiesSet() throws Exception{ + //redis存储常用语 + actPhraseController.insertPhraseListToRedis(); + } +} 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 8ae32b471..5d2c5c628 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 @@ -16,5 +16,9 @@ + + \ No newline at end of file