From 7c4b855f0ddd1a32224832aa4e627a1bb4a2edd7 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 17 Nov 2023 17:41:01 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=9B=BD=E6=A0=87=E5=A4=96=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E6=A0=87=E5=87=86=E4=BD=93?= =?UTF-8?q?=E7=B3=BB=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/ISarStandMenuService.java | 3 +++ .../service/impl/SarStandMenuServiceImpl.java | 18 ++++++++++++++++++ .../entity/SarStandardsInfo.java | 2 ++ .../impl/SarStandardsInfoServiceImpl.java | 8 +++++++- 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java index c96f9818..f163580b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/ISarStandMenuService.java @@ -19,4 +19,7 @@ public interface ISarStandMenuService extends IService { List selectAllMenuByStandId(SarStandMenu sarStandMenuEO); + void deleteStandSystemByStandId(String id); + + void addStandSystemRelation(String standSystem, String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java index 889b796e..c8893e01 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java @@ -5,6 +5,8 @@ import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao; import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -40,4 +42,20 @@ public class SarStandMenuServiceImpl extends ServiceImpl sarStandMenuWrapper = new LambdaUpdateWrapper<>(); + sarStandMenuWrapper.eq(SarStandMenu::getStandId, id); + remove(sarStandMenuWrapper); + } + + @Override + public void addStandSystemRelation(String standSystem, String id) { + SarStandMenu sarStandMenu = new SarStandMenu(); + // 生成不带横杠的UUID + sarStandMenu.setId(java.util.UUID.randomUUID().toString().replaceAll("-", "")); + sarStandMenu.setStandId(id).setMenuId(standSystem).setValidFlag(0); + save(sarStandMenu); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index 2ba4759f..86e8879f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -243,6 +243,8 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private String standSystemName; + @TableField(exist = false) + private String standSystemId; public static long getSerialVersionUID() { return serialVersionUID; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 3284c365..676b1ec5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -114,6 +114,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; @@ -1996,7 +1997,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl */ public int updateSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception { - // TODO 体系 + // 标准体系 + sarStandMenuService.deleteStandSystemByStandId(sarStandardsInfoEO.getId()); + if (StringUtils.isNotEmpty(sarStandardsInfoEO.getStandSystemId())) { + sarStandMenuService.addStandSystemRelation(sarStandardsInfoEO.getStandSystemId(), sarStandardsInfoEO.getId()); + } + /** * 加入对应"国家/地区"的清单列表 */