From d3bf339bd64d7b7efddc0afdd4beb1866b8b5a04 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期六, 21 九月 2024 00:47:55 +0800
Subject: [PATCH] 代码提交
---
smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java | 100 ++++++++++++++++++++++++++------------------------
1 files changed, 52 insertions(+), 48 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..41500c4 100644
--- a/smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/HeLibraryServiceImpl.java
@@ -1,7 +1,5 @@
package com.smartor.service.impl;
-import java.util.List;
-
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.DtoConversionUtils;
@@ -15,6 +13,8 @@
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 瀹ｆ暀璧勬枡搴揝ervice涓氬姟灞傚鐞�
@@ -85,76 +85,80 @@
*/
@Override
public int deleteHeLibraryByIds(Long[] ids) {
- return heLibraryMapper.deleteHeLibraryByIds(ids);
+ Integer i = null;
+ for (Long id : ids) {
+ i = heLibraryMapper.deleteHeLibraryById(id);
+ }
+ return i;
}
- /**
- * 鍒犻櫎瀹ｆ暀璧勬枡搴撲俊鎭�
- *
- * @param id 瀹ｆ暀璧勬枡搴撲富閿�
- * @return 缁撴灉
- */
- @Override
- public int deleteHeLibraryById(Long id) {
- return heLibraryMapper.deleteHeLibraryById(id);
- }
/**
* 鏂板鎴栦慨鏀瑰鏁欒鎯�
*/
@Override
public Integer saveOrUpdateScript(HeLibraryVO heLibraryVO) {
- Integer i = null;
HeLibrary heLibrary = DtoConversionUtils.sourceToTarget(heLibraryVO, HeLibrary.class);
if (heLibraryVO.getIsoperation() != null && heLibraryVO.getIsoperation() == 1) {
//鏂板
- i = heLibraryMapper.insertHeLibrary(heLibrary);
+ heLibraryMapper.insertHeLibrary(heLibrary);
} else if (heLibraryVO.getIsoperation() != null && heLibraryVO.getIsoperation() == 2) {
//淇敼
- i = heLibraryMapper.updateHeLibrary(heLibrary);
+ heLibraryMapper.updateHeLibrary(heLibrary);
}
log.info("鏂板鎴栦慨鏀瑰鏁欒鎯呯殑id涓猴細{}", heLibrary.getId());
+//
+// //瀵规爣绛捐繘琛屽鐞�
+// for (HeLibraryTag heLibraryTag : heLibraryVO.getHeLibraryTagList()) {
+// if (heLibraryTag.getIsoperation() != null && heLibraryTag.getIsoperation() == 1) {
+// //鏂板
+// heLibraryTag.setHeid(heLibrary.getId());
+// heLibraryTagMapper.insertHeLibraryTag(heLibraryTag);
+// } else if (heLibraryTag.getIsoperation() != null && heLibraryTag.getIsoperation() == 2) {
+// //淇敼
+// heLibraryTag.setHeid(heLibrary.getId());
+// heLibraryTagMapper.updateHeLibraryTag(heLibraryTag);
+// } else if (heLibraryTag.getIsoperation() != null && heLibraryTag.getIsoperation() == 3) {
+// //鍒犻櫎
+// if (heLibraryTag.getId() == null) {
+// log.info("鍒犻櫎澶辫触,妯℃澘鎸囨爣id涓虹┖");
+// } else {
+// heLibraryTagMapper.deleteHeLibraryTagById(heLibraryTag.getId());
+// }
+// }
+// }
+//
+// //瀵圭瀹よ繘琛屽鐞�
+// for (TempDetpRelevance tempDetpRelevance : heLibraryVO.getTempDetpRelevances()) {
+// if (tempDetpRelevance.getId() == null) {
+// //鏂板
+// tempDetpRelevance.setTempid(heLibrary.getId());
+// tempDetpRelevance.setType(3L);
+// tempDetpRelevanceMapper.insertTempDetpRelevance(tempDetpRelevance);
+// } else {
+// tempDetpRelevanceMapper.updateTempDetpRelevance(tempDetpRelevance);
+// }
+// }
- //瀵规爣绛捐繘琛屽鐞�
- for (HeLibraryTag heLibraryTag : heLibraryVO.getHeLibraryTagList()) {
- if (heLibraryTag.getIsoperation() != null && heLibraryTag.getIsoperation() == 1) {
- //鏂板
- heLibraryTag.setHeid(heLibrary.getId());
- heLibraryTagMapper.insertHeLibraryTag(heLibraryTag);
- } else if (heLibraryTag.getIsoperation() != null && heLibraryTag.getIsoperation() == 2) {
- //淇敼
- heLibraryTag.setHeid(heLibrary.getId());
- heLibraryTagMapper.updateHeLibraryTag(heLibraryTag);
- } else if (heLibraryTag.getIsoperation() != null && heLibraryTag.getIsoperation() == 3) {
- //鍒犻櫎
- if (heLibraryTag.getId() == null) {
- log.info("鍒犻櫎澶辫触,妯℃澘鎸囨爣id涓虹┖");
- } else {
- heLibraryTagMapper.deleteHeLibraryTagById(heLibraryTag.getId());
- }
- }
- }
-
- return i;
+ return heLibrary.getId().intValue();
}
@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("鎻愪緵鐨勬潯浠�,鏌ヨ瀹ｆ暀鏁版嵁涓虹┖锛歿}", heLibraries);
throw new BaseException("鎻愪緵鐨勬潯浠�,鏌ヨ瀹ｆ暀鏁版嵁涓虹┖");
}
-
- //鐢ㄤ簬杩斿弬
- HeLibraryVO heLibraryVO = DtoConversionUtils.sourceToTarget(heLibraries.get(0), HeLibraryVO.class);
- //鏍规嵁瀹ｆ暀ID鏌ヨ瀹ｆ暀鎸囨爣闆嗗悎
- 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) {
+ //鏍规嵁瀹ｆ暀ID鏌ヨ瀹ｆ暀鎸囨爣闆嗗悎
+ 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