From 02654bd47dbcaf14e56d368010a5098dc03dccdc Mon Sep 17 00:00:00 2001 From: wangzhijiang Date: Mon, 24 Apr 2023 17:20:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E8=AE=A4=E8=AF=81=E3=80=81?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=88=A0=E9=99=A4=E5=AE=8C?= =?UTF-8?q?=E5=96=84=E3=80=82=EF=BC=88=E5=8E=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E3=80=82=EF=BC=89=EF=BC=8C=E8=AE=A4=E8=AF=81?= =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B8=85=E5=8D=95=E5=8F=91=E9=80=81=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AuthDummyInventoryBaseEOServiceImpl.java | 85 +++++++++++++++---- .../dummy/entity/DummyInventoryBaseEO.java | 2 +- .../impl/DummyInventoryBaseEOServiceImpl.java | 16 +++- 3 files changed, 85 insertions(+), 18 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java index 86e077a74..dd55752ed 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/authDummy/service/impl/AuthDummyInventoryBaseEOServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.MessageTypeEnum; +import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.modules.authDummy.entity.*; @@ -23,6 +24,7 @@ import com.jero.modules.dummy.entity.DummyInventoryInfoEO; import com.jero.modules.dummy.entity.DummyReadEO; import com.jero.modules.dummy.enums.InventoryStateEnum; import com.jero.modules.dummy.enums.ReadFlagEnum; +import com.jero.modules.feishu.enums.TemplateInfoEnum2; import com.jero.modules.feishu.service.IFeishuService; import com.jero.modules.feishu.vo.FeishuMsgVo; import com.jero.modules.log.entity.MarketListVersionUpdateLogEO; @@ -40,10 +42,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Date; +import java.util.*; import java.util.stream.Collectors; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -144,6 +143,35 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl ids) { removeByIds(ids); + + // 市场认证清单明细数据 + QueryWrapper adiRemoveWrap = new QueryWrapper<>(); + adiRemoveWrap.lambda().in(AuthDummyInventoryInfoEO::getAuthDummyInventoryBaseId,ids); + this.iAuthDummyInventoryInfoEOService.remove(adiRemoveWrap); + + // 内容变更表数据 + QueryWrapper adccConnectIdRemoveWrap = new QueryWrapper<>(); + adccConnectIdRemoveWrap.lambda().in(AuthDummyContentChangeEO::getConnectId,ids); + this.iAuthDummyContentChangeEOService.remove(adccConnectIdRemoveWrap); + QueryWrapper adccPidRemoveWrap = new QueryWrapper<>(); + adccPidRemoveWrap.lambda().in(AuthDummyContentChangeEO::getParentId,ids); + this.iAuthDummyContentChangeEOService.remove(adccPidRemoveWrap); + + // 更新log数据 + QueryWrapper adlRemoveWrap = new QueryWrapper<>(); + adlRemoveWrap.lambda().in(AuthDummyLog::getAuthDummyInventoryBaseId,ids); + this.authDummyLogService.remove(adlRemoveWrap); + + // 订阅数据 + QueryWrapper adrRemoveWrap = new QueryWrapper<>(); + adrRemoveWrap.lambda().in(AuthDummyReadEO::getAuthDummyInventoryBaseId,ids); + this.authDummyReadEOService.remove(adrRemoveWrap); + + // 市场清单版本历史数据 + QueryWrapper mlvLogRemoveWrap = new QueryWrapper<>(); + mlvLogRemoveWrap.lambda().eq(MarketListVersionUpdateLogEO::getListType,ListTypeEnum.MARKET_CERTIFICATION_LIST.getValue()); + mlvLogRemoveWrap.lambda().in(MarketListVersionUpdateLogEO::getListId,ids); + this.marketListVersionUpdateLogEOService.remove(mlvLogRemoveWrap); } /** @@ -260,7 +288,7 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl wrapper =new LambdaQueryWrapper<>(); wrapper.in(AuthDummyContentChangeEO::getConnectId,authDummyInventoryBaseEO.getId()); @@ -411,8 +439,9 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl userNameList = authDummyReadEOService.queryReadUserInfo(authDummyInventoryBaseEO.getId()); List thirdIdList = new ArrayList<>(); + List userIdList = new ArrayList<>(); if(userNameList.size() != 0){ - List userIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getId()).collect(Collectors.toList()); + userIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getId()).collect(Collectors.toList()); thirdIdList = sysUserService.queryUserIdListByNameList(userNameList).stream().map(e -> e.getThirdId()).collect(Collectors.toList()); if(userIdList.size() != 0){ //封装消息的实体类 @@ -434,15 +463,41 @@ public class AuthDummyInventoryBaseEOServiceImpl extends ServiceImpl params = new HashMap<>(); + params.put("contentInfoFeiCn",contentInfoFeiCn + "\n" + contentCn); + params.put("contentInfoFeiEn",contentLogFeishuTemp + "\n" + contentEn); + params.put("userIdList",userIdList); + params.put("back_url",href); + params.put("titleCn", TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameCn()); + params.put("titleEn",TemplateInfoEnum2.SUBSCRIPTION_INFORM.getNameEn()); + iFeishuService.sendMessageSubscriptionNotification(TemplateInfoEnum2.SUBSCRIPTION_INFORM.getValue(),params); + } catch (Exception e) { e.printStackTrace(); } } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java index 495f89dde..8c2b99a50 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/entity/DummyInventoryBaseEO.java @@ -103,7 +103,7 @@ public class DummyInventoryBaseEO implements Serializable { @ApiModelProperty(value = "升版说明") private String upgradeExplanation; - // 是否升级 1是2否 + // 是否升级 1是0否 对应枚举类 YesOrNoEnum @TableField(exist = false) private String upgradeOrNot; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 23e81a068..d6d1bed3d 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.CutEnum; import com.jero.common.constant.enums.MessageTypeEnum; +import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.common.exception.JeroBootException; import com.jero.common.system.vo.LoginUser; import com.jero.modules.document.service.impl.BussDocumentLibraryEOServiceImpl; @@ -232,6 +233,17 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl logEOQueryWrapper = new QueryWrapper<>(); logEOQueryWrapper.in("dummy_inventory_base_id",ids); dummyLogEOService.remove(logEOQueryWrapper); + + // 订阅数据 + QueryWrapper drRemoveWrap = new QueryWrapper<>(); + drRemoveWrap.lambda().in(DummyReadEO::getDummyInventoryBaseId,ids); + this.dummyReadEOService.remove(drRemoveWrap); + + // 市场清单版本历史数据 + QueryWrapper mlvLogRemoveWrap = new QueryWrapper<>(); + mlvLogRemoveWrap.lambda().eq(MarketListVersionUpdateLogEO::getListType,ListTypeEnum.MARKET_REGULATION_LIST.getValue()); + mlvLogRemoveWrap.lambda().in(MarketListVersionUpdateLogEO::getListId,ids); + this.marketListVersionUpdateLogEOService.remove(mlvLogRemoveWrap); } /** @@ -351,7 +363,7 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl发布 2-->撤回 //撤回需要发消息 - if(InventoryStateEnum.ISSUE.getValue().equals(dummyInventoryBaseEO.getState()) && StringUtils.equals(dummyInventoryBaseEO.getUpgradeOrNot(),"1")){ + if(InventoryStateEnum.ISSUE.getValue().equals(dummyInventoryBaseEO.getState()) && StringUtils.equals(dummyInventoryBaseEO.getUpgradeOrNot(),YesOrNoEnum.YES.getValue())){ //先判断第一次发布的时候是否保存过数据 LambdaQueryWrapper wrapper =new LambdaQueryWrapper<>(); wrapper.in(DummyContentChangeEO::getConnectId,dummyInventoryBaseEO.getId());