diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index be8b87b2..71e0af91 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -28,6 +28,8 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserServic import com.jero.modules.laws.enterprise.service.EnterpriseStandardInspectContentService; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; import com.jero.modules.laws.enterprise.util.WaterMarkUtil; +import com.jero.modules.laws.home.common.LawsHomeSearchCommon; +import com.jero.modules.laws.home.service.ILawsHomeSearchService; import com.jero.modules.laws.standard.entity.*; import com.jero.modules.laws.standard.service.*; import com.jero.modules.laws.standardization.entity.LawsStandardization; @@ -146,6 +148,8 @@ public class LawsCommonServiceImpl implements ILawsCommonService { private ILawsEnterpriseStandardService lawsEnterpriseStandardService; @Resource private EnterpriseStandardAuthDeptService enterpriseAuthDeptService; + @Resource + private ILawsHomeSearchService lawsHomeSearchService; /** * @Author: liao @@ -676,6 +680,10 @@ public class LawsCommonServiceImpl implements ILawsCommonService { lawsEnterpriseStandardService.update(esWrapper); } } + + // 同步es数据库 + lawsHomeSearchService.updateEsData(module, id, LawsHomeSearchCommon.LAWS_ES_ADD); + return ResultCommon.OK; } @@ -813,6 +821,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService { esAuthUserService.resetAuthDept(id, parameterMap.get(FieldCommon.AUTH_DEPT).toString()); } + // 同步es数据库 + lawsHomeSearchService.updateEsData(module, id, LawsHomeSearchCommon.LAWS_ES_UPDATE); + return ResultCommon.OK; } @@ -1184,6 +1195,10 @@ public class LawsCommonServiceImpl implements ILawsCommonService { List idList = Arrays.asList(ids.split(",")); // 操作数据库进行删除操作 lawsCommonMapper.logicalDeleteByIdsAndModule(tableName, idList); + + // 同步es数据库 + lawsHomeSearchService.updateEsData(module, ids, LawsHomeSearchCommon.LAWS_ES_DELETE); + return MessageUtils.getMessage(ResultCommon.OK); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java index 09c5b23c..67e03104 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsNewsFeedController.java @@ -7,7 +7,6 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.Translation; import com.jero.common.exception.JeroBootException; -import com.jero.common.util.MessageUtils; import com.jero.common.api.vo.ResultCommon; import com.jero.modules.laws.standard.entity.LawsNewsFeed; import com.jero.modules.laws.standard.service.ILawsNewsFeedService; diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java index ad2df391..5662d90a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsNewsFeedServiceImpl.java @@ -9,6 +9,8 @@ import com.jero.modules.laws.common.constant.FieldCommon; import com.jero.modules.laws.common.constant.MessageTemplateCodeCommon; import com.jero.common.api.vo.ResultCommon; import com.jero.modules.laws.common.util.CurrentUserUtil; +import com.jero.modules.laws.home.common.LawsHomeSearchCommon; +import com.jero.modules.laws.home.service.ILawsHomeSearchService; import com.jero.modules.laws.standard.entity.LawsNewsFeed; import com.jero.modules.laws.standard.entity.LawsPushRange; import com.jero.modules.laws.standard.mapper.LawsNewsFeedMapper; @@ -32,6 +34,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import javax.annotation.Resource; + /** * @Description: 动态消息 @@ -51,6 +55,8 @@ public class LawsNewsFeedServiceImpl extends ServiceImpl newsFeedList = listByIds(ids); newsFeedList.forEach(lawsNewsFeed -> isHaveOperateAuth(lawsNewsFeed)); removeByIds(ids); + // 更新es数据库 + lawsHomeSearchService.updateEsData(LawsHomeSearchCommon.LAWS_NEWS_FEED, StringUtils.join(ids, ","), LawsHomeSearchCommon.LAWS_ES_DELETE); } /**