From 5614a7d312f6867a056db9d366d6678236520eb6 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 18 Nov 2020 14:33:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=8E=92=E5=BA=8F+=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E7=B1=BB=E5=9E=8B=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../category/entity/CategoryEntity.java | 8 ++-- .../epdc/service/impl/NoticeServiceImpl.java | 37 +++++++++++++++++++ .../resources/mapper/ModuleCategoryDao.xml | 6 +-- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java index 79f60d25..e5c2aa90 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/entity/CategoryEntity.java @@ -17,13 +17,14 @@ package com.elink.esua.epdc.modules.category.entity; -import com.baomidou.mybatisplus.annotation.*; - +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; import com.elink.esua.epdc.commons.mybatis.entity.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.util.Date; /** @@ -73,6 +74,7 @@ public class CategoryEntity extends BaseEntity { * 删除标识 0：未删除 1：删除 */ @TableField(fill = FieldFill.INSERT) + @TableLogic private Integer delFlag; /** diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java index b17ab894..4dcd7618 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/java/com/elink/esua/epdc/service/impl/NoticeServiceImpl.java @@ -29,6 +29,7 @@ import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dao.ModuleCategoryDao; import com.elink.esua.epdc.dao.NoticeDao; import com.elink.esua.epdc.dto.NoticeDTO; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; @@ -38,6 +39,7 @@ import com.elink.esua.epdc.dto.epdc.form.EpdcNoticeListFormDTO; import com.elink.esua.epdc.dto.epdc.form.v2.EpdcNoticeListV2FormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeDetailResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcNoticeListResultDTO; +import com.elink.esua.epdc.entity.ModuleCategoryEntity; import com.elink.esua.epdc.entity.NoticeEntity; import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.redis.NoticeRedis; @@ -74,6 +76,9 @@ public class NoticeServiceImpl extends BaseServiceImpl @Autowired private ModuleCategoryService moduleCategoryService; + @Autowired + private ModuleCategoryDao moduleCategoryDao; + @Override public PageData page(Map params) { String noticeTitle = (String) params.get("noticeTitle"); @@ -224,6 +229,36 @@ public class NoticeServiceImpl extends BaseServiceImpl this.noticeDepartmentService.save(entity.getId(), noticeGridList); } + /** + * @Description 更新通知模块的更新时间 + * @Author songyunpeng + * @Date 2020/11/18 + * @Param [noticeCategory] + * @return void + **/ + private void updateModuleCategoryUpdateTime(String noticeId) { + try { + NoticeEntity noticeEntity = baseDao.selectById(noticeId); + Map param = new HashMap<>(); + param.put("CATEGORY_CODE",noticeEntity.getNoticeCategory()); + List moduleCategoryEntities = moduleCategoryDao.selectByMap(param); + if(moduleCategoryEntities!=null && moduleCategoryEntities.size()>0){ + ModuleCategoryEntity moduleCategoryEntity = moduleCategoryEntities.get(0); + //获取第二层模块 + String[] pIds = moduleCategoryEntity.getPids().split(","); + //长度大于等于2代表处于大于或等于三级模块，此时只更新二级模块顺序 + if(pIds.length>=2){ + ModuleCategoryEntity secModuleCategory = moduleCategoryDao.selectById(pIds[1]); + if(secModuleCategory!=null){ + secModuleCategory.setSort(0); + moduleCategoryDao.updateById(secModuleCategory); + } + } + } + }catch (Exception e){ + e.printStackTrace(); + } + } @Override @Transactional(rollbackFor = Exception.class) @@ -242,6 +277,8 @@ public class NoticeServiceImpl extends BaseServiceImpl entity.setNoticeReleaseState(YesOrNoEnum.YES.value()); entity.setReleaseTime(new Date()); this.updateById(entity); + //更新通知模块的更新时间 + updateModuleCategoryUpdateTime(noticeId); } @Override diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml index 89fa81f2..ec685852 100644 --- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml +++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/ModuleCategoryDao.xml @@ -26,12 +26,12 @@