From a0bcee3aa22b79f592c44cdb3dcdbd681490f265 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期一, 15 一月 2024 10:34:31 +0800 Subject: [PATCH] 代码提交 --- smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java | 54 ++++++++++++++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 22 deletions(-) diff --git a/smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java index df6385a..b04ad51 100644 --- a/smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java +++ b/smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java @@ -8,8 +8,10 @@ import com.smartor.domain.HeLibrary; import com.smartor.domain.HeLibraryTag; import com.smartor.domain.HeLibraryVO; +import com.smartor.domain.TempDetpRelevance; import com.smartor.mapper.HeLibraryMapper; import com.smartor.mapper.HeLibraryTagMapper; +import com.smartor.mapper.TempDetpRelevanceMapper; import com.smartor.service.IHeLibraryService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -30,6 +32,9 @@ @Autowired private HeLibraryTagMapper heLibraryTagMapper; + + @Autowired + private TempDetpRelevanceMapper tempDetpRelevanceMapper; /** * 鏌ヨ瀹f暀璧勬枡搴� @@ -85,19 +90,13 @@ */ @Override public int deleteHeLibraryByIds(Long[] ids) { - return heLibraryMapper.deleteHeLibraryByIds(ids); + Integer i = null; + for (Long id : ids) { + i = heLibraryMapper.deleteHeLibraryById(id); + } + return i; } - /** - * 鍒犻櫎瀹f暀璧勬枡搴撲俊鎭� - * - * @param id 瀹f暀璧勬枡搴撲富閿� - * @return 缁撴灉 - */ - @Override - public int deleteHeLibraryById(Long id) { - return heLibraryMapper.deleteHeLibraryById(id); - } /** * 鏂板鎴栦慨鏀瑰鏁欒鎯� @@ -135,26 +134,37 @@ } } + //瀵圭瀹よ繘琛屽鐞� + for (TempDetpRelevance tempDetpRelevance : heLibraryVO.getTempDetpRelevances()) { + if (tempDetpRelevance.getId() == null) { + //鏂板 + tempDetpRelevance.setTempid(heLibrary.getId()); + tempDetpRelevance.setType(3L); + tempDetpRelevanceMapper.insertTempDetpRelevance(tempDetpRelevance); + } else { + tempDetpRelevanceMapper.updateTempDetpRelevance(tempDetpRelevance); + } + } + return i; } @Override - public HeLibraryVO selectInfoByCondition(HeLibrary heLibrary) { + public List<HeLibraryVO> selectInfoByCondition(HeLibrary heLibrary) { log.info("鏌ヨ妯℃澘璇︽儏鏍规嵁鏉′欢鐨勫叆鍙備负锛歿}", heLibrary); List<HeLibrary> heLibraries = selectHeLibraryList(heLibrary); if (CollectionUtils.isEmpty(heLibraries)) { log.info("鎻愪緵鐨勬潯浠�,鏌ヨ瀹f暀鏁版嵁涓虹┖锛歿}", heLibraries); throw new BaseException("鎻愪緵鐨勬潯浠�,鏌ヨ瀹f暀鏁版嵁涓虹┖"); } - - //鐢ㄤ簬杩斿弬 - HeLibraryVO heLibraryVO = DtoConversionUtils.sourceToTarget(heLibraries.get(0), HeLibraryVO.class); - //鏍规嵁瀹f暀ID鏌ヨ瀹f暀鎸囨爣闆嗗悎 - HeLibraryTag heLibraryTag = new HeLibraryTag(); - heLibraryTag.setHeid(heLibraryVO.getId()); - List<HeLibraryTag> heLibraryTags = heLibraryTagMapper.selectHeLibraryTagList(heLibraryTag); - heLibraryVO.setHeLibraryTagList(heLibraryTags); - - return heLibraryVO; + List<HeLibraryVO> heLibraryVOS = DtoConversionUtils.sourceToTarget(heLibraries, HeLibraryVO.class); + if (CollectionUtils.isNotEmpty(heLibraryVOS) && heLibraryVOS.size() == 1) { + //鏍规嵁瀹f暀ID鏌ヨ瀹f暀鎸囨爣闆嗗悎 + HeLibraryTag heLibraryTag = new HeLibraryTag(); + heLibraryTag.setHeid(heLibraryVOS.get(0).getId()); + List<HeLibraryTag> heLibraryTags = heLibraryTagMapper.selectHeLibraryTagList(heLibraryTag); + heLibraryVOS.get(0).setHeLibraryTagList(heLibraryTags); + } + return heLibraryVOS; } } -- Gitblit v1.9.3