diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java index 85587e22..001e0e99 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java @@ -18,4 +18,8 @@ public interface ISarBussStandMenuService extends IService { List selectAllMenuByStandId(SarBussStandMenu sarStandMenuEO); int deleteByMenuId (SarBussStandMenu sarStandMenuEO); + + void deleteStandSystemByStandId(String id); + + void addStandSystemRelation(String standSystemId, String id); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java index ba1309d8..713f8f63 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java @@ -1,15 +1,20 @@ package com.adc.da.slrs.sarBussStandMenu.service.impl; +import com.adc.da.exception.AdcDaBaseException; import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu; import com.adc.da.slrs.sarBussStandMenu.dao.SarBussStandMenuDao; import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService; import com.adc.da.slrs.sarResource.service.ITsResourceService; +import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; +import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; @@ -30,6 +35,7 @@ public class SarBussStandMenuServiceImpl extends ServiceImpl menuIds = new ArrayList<>(); @@ -42,6 +48,28 @@ public class SarBussStandMenuServiceImpl extends ServiceImpl sarStandMenuWrapper = new LambdaUpdateWrapper<>(); + sarStandMenuWrapper.eq(SarBussStandMenu::getBussStandId, id); + remove(sarStandMenuWrapper); + } + + @Override + public void addStandSystemRelation(String standSystem, String id) { + // 校验standSystem是否有效 + SarMenuStandard standMenu = iSarMenuStandardService.getById(standSystem); + if (standMenu == null) { + throw new AdcDaBaseException("无效的标准体系"); + } + SarBussStandMenu sarBussStandMenu = new SarBussStandMenu(); + // 生成不带横杠的UUID + sarBussStandMenu.setId(java.util.UUID.randomUUID().toString().replaceAll("-", "")); + sarBussStandMenu.setBussStandId(id).setMenuId(standSystem).setValidFlag(0); + save(sarBussStandMenu); + } + @Override public List selectAllMenuByStandId(SarBussStandMenu sarStandMenuEO){ return this.baseMapper.selectAllMenuByStandId(sarStandMenuEO); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java index cd45358c..d70fa400 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarBussionessStand.controller; +import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.ZipUtil; import com.adc.da.Log.BusinessType; import com.adc.da.Log.EpcLog; @@ -11,6 +12,7 @@ import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanInfo; import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao; import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo; +import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; @@ -52,6 +54,7 @@ import io.swagger.annotations.Api; import com.adc.da.base.web.BaseController; import org.springframework.web.multipart.MultipartFile; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.*; @@ -105,6 +108,9 @@ public class SarBussionessStandController extends BaseController updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception { + // 标准体系 + String standSystemId = sarBussionessStandEO.getTxlbId(); + sarBussStandMenuService.deleteStandSystemByStandId(sarBussionessStandEO.getId()); + if (StrUtil.isNotBlank(standSystemId)) { + sarBussStandMenuService.addStandSystemRelation(standSystemId, sarBussionessStandEO.getId()); + } //校验编号和名称是否存在 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq(null!=sarBussionessStandEO.getStandCode(),"STAND_CODE",sarBussionessStandEO.getStandCode()) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index 250c4a57..4533ad40 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -49,6 +49,7 @@ import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; +import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu; import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao; import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO; import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; 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 c8893e01..ddbabb3b 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 @@ -1,10 +1,13 @@ package com.adc.da.slrs.sarStandMenu.service.impl; +import com.adc.da.exception.AdcDaBaseException; import com.adc.da.slrs.sarMenu.service.ISarMenuService; 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.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; +import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -30,6 +33,9 @@ public class SarStandMenuServiceImpl extends ServiceImpl menuIds = sarMenuEOService.getChildMenuList(sarStandMenuEO.getOldMenuId()); @@ -51,6 +57,11 @@ public class SarStandMenuServiceImpl extends ServiceImpl