From 3666dda9dec18e1c6b92daa194ed435b00930195 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Thu, 3 Jun 2021 14:16:02 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BF=81=E7=A7=BB=E5=9B=BD=E5=86=85?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84=E9=83=A8=E5=88=864=20?= =?UTF-8?q?=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86=E6=B3=95=E8=A7=84-?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandardsInfoController.java | 12 ++ .../dao/SarStandardsInfoDao.java | 1 - .../service/ISarStandardsInfoService.java | 2 +- .../impl/SarStandardsInfoServiceImpl.java | 103 ++++++++++++++++++ 4 files changed, 116 insertions(+), 2 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index ac543139..c3e56761 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -167,6 +167,18 @@ public class SarStandardsInfoController extends BaseController } } + @ApiOperation(value = "|SarStandardsInfoEO|删除") + @PostMapping("/deleteSarStandards") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarStandardsInfo:delete") + public ResponseMessage delete(String ids) throws Exception { + int result = sarStandardsInfoEOService.deleteSarStandards(ids); + if (result > 0) { + return Result.success("0", "删除成功", result); + } else { + return Result.error("删除失败"); + } + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java index 55aec82b..98bc1851 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/dao/SarStandardsInfoDao.java @@ -17,7 +17,6 @@ import java.util.List; * @author super_liu * @since 2021-05-31 */ -@Resource public interface SarStandardsInfoDao extends BaseMapper { List getSarStandardsInfoPage(SarStandardsInfoEOPage page); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java index 92e09989..ccf35969 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/ISarStandardsInfoService.java @@ -26,7 +26,7 @@ public interface ISarStandardsInfoService extends IService { int updateSarStandardsInfo(SarStandardsInfo sarStandardsInfoEO) throws Exception; // -// int deleteSarStandards(String ids); + int deleteSarStandards(String ids); // // List getExportDatas (StandardsInfoExcelVO standardsInfoExcelVO) throws Exception; // 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 69c4ddd9..a5b4467a 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 @@ -3,6 +3,8 @@ package com.adc.da.slrs.sarStandardsInfo.service.impl; import com.adc.da.att.entity.AttFileEO; import com.adc.da.att.service.IAttFileEOService; import com.adc.da.common.*; +import com.adc.da.person.dao.PersonCollectEODao; +import com.adc.da.person.dao.PersonShareEODao; import com.adc.da.person.entity.PersonMsgEO; import com.adc.da.person.service.IPersonCollectEOService; import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao; @@ -72,6 +74,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl listFile = sarStandFileEODao.selectFileByStandId(id); +// if (listFile != null) { +// if (!listFile.isEmpty()) { +// for (int f = 0; f < listFile.size(); f++) { +// //删除文件信息表数据 +// sarFileInfoEODao.deleteByfileId(listFile.get(f).getId()); +// //删除转换表ot_convert数据 +// otConvertEODao.deleteByAttId(listFile.get(f).getAttId()); +// } +// } +// } + //删除代替关系 + updateStandReplaceConnect(getDelStandInfoList); + //删除收藏表中数据 + personCollectEODao.deleteByResId(id); + // 删除分享表中数据 + personShareEODao.deleteByResId(id); +// if(elasflag) { +// //删除成功后，将索引中对应数据删除 +// StandLawsEO standLawsEO = new StandLawsEO(); +// standLawsEO.setId(sarStandardsInfoEO.getId()); +// standLawsEO.setType("stand"); +// sarStandAndLawsEOService.deleteFomrIndex(standLawsEO); +// } + } + return countResult; + } + + /** + * 删除标准同时删除代替关系 + * @param getDelStandInfo + */ + public void updateStandReplaceConnect(SarStandardsInfo getDelStandInfo){ + if(getDelStandInfo != null){ + //查询该条标准代替过的标准 + SarStandardsInfoEOPage sarStandardsInfoEOPage = new SarStandardsInfoEOPage(); + String standNum = ""; + if(StringUtils.isNotEmpty(getDelStandInfo.getStandYear())){ + standNum = getDelStandInfo.getStandSort()+" "+getDelStandInfo.getStandNumber()+"-"+getDelStandInfo.getStandYear(); + }else{ + standNum = getDelStandInfo.getStandSort()+" "+getDelStandInfo.getStandNumber(); + } + sarStandardsInfoEOPage.setReplacedStandNum(standNum); + List getReplacedStands = dao.getSarStandardsInfoPage(sarStandardsInfoEOPage); + if(getReplacedStands != null && !getReplacedStands.isEmpty()){ + for(SarStandardsInfo stand : getReplacedStands){ + SarStandardsInfo newStand = new SarStandardsInfo(); + newStand.setId(stand.getId()); + String replacedNum = stand.getReplacedStandNum(); + List numList = Arrays.asList(replacedNum.split(",")); + if(numList.contains(standNum)){ + //被代替标准号都已逗号分隔存在一个字段里，如果存在字符串中间，后面会有一个逗号， + // 存在字符串末尾则没有逗号 + if(numList.contains(standNum+",")){ + newStand.setReplacedStandNum(stand.getReplacedStandNum().replaceAll(standNum+",","")); + dao.updateById(newStand); + } else { + if (numList.contains(","+standNum)) { + newStand.setReplacedStandNum(stand.getReplacedStandNum().replace(","+standNum,"")); + } else { + newStand.setReplacedStandNum(stand.getReplacedStandNum().replace(standNum,"")); + } + dao.updateById(newStand); + } + } + } + } + } + } + }