From 30b4fe30d36b48a103b281aff631fc45af849636 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期二, 18 三月 2025 16:58:59 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java index 09307bc..b5d3963 100644 --- a/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java +++ b/smartor/src/main/java/com/smartor/service/impl/PatArchiveServiceImpl.java @@ -149,6 +149,33 @@ //淇敼 patArchiveVO.setIsoperation(2); patArchiveMapper.updatePatArchive(patArchive); + if (StringUtils.isNotEmpty(patArchive.getNotrequiredFlag()) && patArchive.getNotrequiredFlag().equals("1")) { + //涓嶉渶瑕佹湇鍔′簡锛岄渶瑕侀�氳繃patid鍜宻endstate=2鎴栬�卻endstate=1鍘绘煡璇竴涓嬶紝service_subtask閲屾槸鍚︽湁姝e湪鎵ц鐨勪换鍔★紝鏈夌殑璇濓紝绔嬪嵆鍋滀簡 + ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO(); + serviceSubtaskVO.setPatid(patArchive.getId()); + serviceSubtaskVO.setSendstate(2L); + List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO); + serviceSubtaskVO.setSendstate(1L); + List<ServiceSubtask> serviceSubtaskList1 = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO); + if (CollectionUtils.isNotEmpty(serviceSubtaskList)) { + if (CollectionUtils.isNotEmpty(serviceSubtaskList1)) serviceSubtaskList.addAll(serviceSubtaskList1); + } else { + if (CollectionUtils.isNotEmpty(serviceSubtaskList1)) serviceSubtaskList = serviceSubtaskList1; + } + //鍘籸edis涓紝鏌ヨ鏄惁鏈塻ubid锛屾湁鐨勮瘽绉婚櫎cache-exist + if (CollectionUtils.isNotEmpty(serviceSubtaskList)) { + for (ServiceSubtask serviceSubtask : serviceSubtaskList) { + log.error("闇�瑕佺Щ闄ょ殑subId涓猴細{}", serviceSubtask.getId().toString()); + serviceSubtaskMapper.deleteServiceSubtaskById(serviceSubtask.getId()); + redisCache.removeElementFromList("cache-exist", serviceSubtask.getId().toString()); + redisCache.removeElementFromList("cache-0", serviceSubtask.getId().toString()); + redisCache.removeElementFromList("cache-1", serviceSubtask.getId().toString()); + redisCache.removeElementFromList("cache-2", serviceSubtask.getId().toString()); + redisCache.removeElementFromList("cache-3", serviceSubtask.getId().toString()); + redisCache.removeElementFromList("cache-4", serviceSubtask.getId().toString()); + } + } + } } if (CollectionUtils.isNotEmpty(patArchiveVO.getTagList())) { @@ -157,6 +184,22 @@ patArchivetag.setGuid(patArchiveVO.getGuid()); patArchivetag.setOrgid(patArchiveVO.getOrgid()); if (patArchivetag.getIsoperation() != null && patArchivetag.getIsoperation() == 1 || patArchivetag.getIsoperation() == null && patArchiveVO.getIsoperation() == 1) { + //鍒ゆ柇涓�涓媌ase_tag閲屾槸涓嶆槸瀛樺湪锛屽鏋滀笉瀛樺湪锛屽厛鏂板 + BaseTag baseTag = new BaseTag(); + baseTag.setTagname(patArchivetag.getTagname().trim()); + List<BaseTag> baseTags = baseTagMapper.selectBaseTagListByTagname(baseTag); + if (CollectionUtils.isEmpty(baseTags)) { + //鍏堢粰鏀惧埌鏈垎绫讳腑 + baseTag.setTagcategoryid(6L); + baseTag.setOrgid(patArchiveVO.getOrgid()); + baseTag.setDelFlag("0"); + baseTag.setUpdateTime(new Date()); + baseTag.setCreateTime(new Date()); + baseTagMapper.insertBaseTag(baseTag); + patArchivetag.setTagid(baseTag.getTagid()); + } else { + patArchivetag.setTagid(baseTags.get(0).getTagid()); + } //鏂板 patArchivetag.setUpdateBy(null); patArchivetag.setCreateTime(new Date()); -- Gitblit v1.9.3