From 4c42dde55f381f2631c60390cdb91995e9f4d748 Mon Sep 17 00:00:00 2001 From: hansha Date: Sat, 7 Dec 2024 15:16:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E6=97=B6=E4=BF=AE=E6=94=B9=E3=80=81?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=88=A0=E9=99=A4=E4=B8=8E=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=86=E5=BC=80=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/dangan/service/IDaBirthDjService.java | 2 + .../da/dangan/service/IDaCzrkdjService.java | 2 + .../com/da/dangan/service/IDaQyzService.java | 2 + .../com/da/dangan/service/IDaYtzmService.java | 2 + .../da/dangan/service/IDaZfnyhkcgService.java | 2 + .../com/da/dangan/service/IDaZqzService.java | 2 + .../service/impl/DaBirthDjServiceImpl.java | 28 +++++++++++++ .../service/impl/DaCzrkdjServiceImpl.java | 39 +++++++++++++++++++ .../dangan/service/impl/DaQyzServiceImpl.java | 29 ++++++++++++++ .../service/impl/DaTaskServiceImpl.java | 12 +++--- .../service/impl/DaYtzmServiceImpl.java | 28 +++++++++++++ .../service/impl/DaZfnyhkcgServiceImpl.java | 28 +++++++++++++ .../dangan/service/impl/DaZqzServiceImpl.java | 28 +++++++++++++ dangan-ui/src/utils/request.js | 2 +- 14 files changed, 199 insertions(+), 7 deletions(-) diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaBirthDjService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaBirthDjService.java index 36aa07b..316d9bb 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaBirthDjService.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaBirthDjService.java @@ -63,4 +63,6 @@ public interface IDaBirthDjService List searchDaBirthDjList(DaBirthDj daBirthDj); List searchDaBirthDjList1(DaBirthDj daBirthDj); + + int deleteDaBirthDjByIds1(Long[] toArray); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaCzrkdjService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaCzrkdjService.java index fef1611..536d8dd 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaCzrkdjService.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaCzrkdjService.java @@ -56,4 +56,6 @@ public interface IDaCzrkdjService List searchDaCzrkdjList(DaCzrkdj daCzrkdj); List searchDaCzrkdjList1(DaCzrkdj daCzrkdj); + + int deleteDaCzrkdjByIds1(Long[] toArray); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaQyzService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaQyzService.java index aecd743..7bffd1d 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaQyzService.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaQyzService.java @@ -63,4 +63,6 @@ public interface IDaQyzService List searchDaQyzList(DaQyz daQyz); List searchDaQyzList1(DaQyz daQyz); + + int deleteDaQyzByIds1(Long[] toArray); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaYtzmService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaYtzmService.java index 8f5a8f9..b4c0e1a 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaYtzmService.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaYtzmService.java @@ -63,4 +63,6 @@ public interface IDaYtzmService List searchYtzmList(DaYtzm daYtzm); List searchYtzmList1(DaYtzm daYtzm); + + int deleteDaYtzmByIds1(Long[] toArray); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaZfnyhkcgService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaZfnyhkcgService.java index 66d49a2..7557ca1 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaZfnyhkcgService.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaZfnyhkcgService.java @@ -63,4 +63,6 @@ public interface IDaZfnyhkcgService List searchDaZfnyhkcgList(DaZfnyhkcg daZfnyhkcg); List searchDaZfnyhkcgList1(DaZfnyhkcg daZfnyhkcg); + + int deleteDaZfnyhkcgByIds1(Long[] toArray); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/IDaZqzService.java b/dangan-dangan/src/main/java/com/da/dangan/service/IDaZqzService.java index 5480f7e..51fed0b 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/IDaZqzService.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/IDaZqzService.java @@ -63,4 +63,6 @@ public interface IDaZqzService List searchDaZqzList(DaZqz daZqz); List searchDaZqzList1(DaZqz daZqz); + + int deleteDaZqzByIds1(Long[] toArray); } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java index aca25a2..12865f5 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaBirthDjServiceImpl.java @@ -156,6 +156,34 @@ public class DaBirthDjServiceImpl implements IDaBirthDjService @Override @Transactional public int deleteDaBirthDjByIds(Long[] ids) + { + if(ids.length>0){ + //1-根据muId 查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值 + DaBirthDj daBirthDj = daBirthDjMapper.selectDaBirthDjById(ids[0]); + DaCatalog catalog = daCatalogMapper.selectDaCatalogById(daBirthDj.getMuId()); + List ancestors = Arrays.stream( + catalog.getAncestors().split(",")).map(s->Long.parseLong(s.trim())).collect(Collectors.toList()); + ancestors.add(daBirthDj.getMuId()); + ancestors.remove(0L); + //1-修改该muId及父级catalog id中的countNum值 + for(Long muId :ancestors ){ + daCatalogMapper.minusDaCatalogCountNumById(muId,((Integer)ids.length).longValue()); + } + //修改对应的图片为未识别 ----前端已设置只能单条删除 + List picIds = Stream.of(daBirthDj.getPicIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + for(Long picId :picIds){ + DaPicturesRecard pic = new DaPicturesRecard(); + pic.setId(picId); + pic.setRecognize("0");//未识别 + pic.setErrorCorrect("0"); + daPicturesRecardMapper.updateDaPicturesRecard(pic); + } + } + int i = daBirthDjMapper.deleteDaBirthDjByIds(ids); + return i; + } + @Transactional + public int deleteDaBirthDjByIds1(Long[] ids) { if(ids.length>0){ //1-根据muId 查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值 diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java index 1b4bb3b..d3789c1 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaCzrkdjServiceImpl.java @@ -165,6 +165,45 @@ public class DaCzrkdjServiceImpl implements IDaCzrkdjService { @Override @Transactional public int deleteDaCzrkdjByIds(Long[] ids) { + if(ids.length>0){ + //1-根据muId 查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值 + DaCzrkdj daCzrkdj = daCzrkdjMapper.selectDaCzrkdjById(ids[0]); + DaCatalog catalog = daCatalogMapper.selectDaCatalogById(daCzrkdj.getMuId()); + List ancestors = Arrays.stream( + catalog.getAncestors().split(",")).map(s->Long.parseLong(s.trim())).collect(Collectors.toList()); + ancestors.add(daCzrkdj.getMuId()); + ancestors.remove(0L); + //1-修改该muId及父级catalog id中的countNum值 + for(Long muId :ancestors ){ + daCatalogMapper.minusDaCatalogCountNumById(muId,((Integer)ids.length).longValue()); + } + + //修改对应的图片为未识别 ----前端已设置只能单条删除 + List picIds = Stream.of(daCzrkdj.getPicIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + DaCzrkdj daCzrkdj1= new DaCzrkdj(); + daCzrkdj1.setPicIds(daCzrkdj.getPicIds()); + List daCzrkdjs = daCzrkdjMapper.selectDaCzrkdjList(daCzrkdj1); + if(daCzrkdjs.size()<=1){ //当前需删除图片id不止存在一条记录时 不修改图片识别状态 + for(Long picId :picIds){ + DaPicturesRecard pic = new DaPicturesRecard(); + pic.setId(picId); + pic.setRecognize("0");//未识别 + pic.setErrorCorrect("0"); + daPicturesRecardMapper.updateDaPicturesRecard(pic); + } + } + } + int i = daCzrkdjMapper.deleteDaCzrkdjByIds(ids); + return i; + } + + /** + * 从任务删除的时候 使用这个方法 + * @param ids + * @return + */ + @Transactional + public int deleteDaCzrkdjByIds1(Long[] ids) { if(ids.length>0){ //1-根据muId 查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值 DaCzrkdj daCzrkdj = daCzrkdjMapper.selectDaCzrkdjById(ids[0]); diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java index ab49949..16b801b 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaQyzServiceImpl.java @@ -155,6 +155,35 @@ public class DaQyzServiceImpl implements IDaQyzService @Override @Transactional public int deleteDaQyzByIds(Long[] ids) + { + if(ids.length>0){ + //1-根据muId 查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值 + DaQyz daQyz = daQyzMapper.selectDaQyzById(ids[0]); + DaCatalog catalog = daCatalogMapper.selectDaCatalogById(daQyz.getMuId()); + List ancestors = Arrays.stream( + catalog.getAncestors().split(",")).map(s->Long.parseLong(s.trim())).collect(Collectors.toList()); + ancestors.add(daQyz.getMuId()); + ancestors.remove(0L); + //1-修改该muId及父级catalog id中的countNum值 + for(Long muId :ancestors ){ + daCatalogMapper.minusDaCatalogCountNumById(muId,((Integer)ids.length).longValue()); + } + //修改对应的图片为未识别 ----前端已设置只能单条删除 + List picIds = Stream.of(daQyz.getPicIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + for(Long picId :picIds){ + DaPicturesRecard pic = new DaPicturesRecard(); + pic.setId(picId); + pic.setRecognize("0");//未识别 + pic.setErrorCorrect("0"); + daPicturesRecardMapper.updateDaPicturesRecard(pic); + } + } + int i = daQyzMapper.deleteDaQyzByIds(ids); + return i; + } + + @Transactional + public int deleteDaQyzByIds1(Long[] ids) { if(ids.length>0){ //1-根据muId 查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值 diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaTaskServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaTaskServiceImpl.java index 5867b16..0a3a514 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaTaskServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaTaskServiceImpl.java @@ -134,7 +134,7 @@ public class DaTaskServiceImpl implements IDaTaskService List daCzrkdjs = daCzrkdjService.selectDaCzrkdjList(czrkdj); if(daCzrkdjs!=null&&daCzrkdjs.size()>0){ List czrkIds = daCzrkdjs.stream().map(DaCzrkdj::getId).collect(Collectors.toList()); - daCzrkdjService.deleteDaCzrkdjByIds(czrkIds.toArray(new Long[czrkIds.size()])); + daCzrkdjService.deleteDaCzrkdjByIds1(czrkIds.toArray(new Long[czrkIds.size()])); } break; case "option4": @@ -144,7 +144,7 @@ public class DaTaskServiceImpl implements IDaTaskService List daBirthDjs = daBirthDjService.selectDaBirthDjList(birthDj); if(daBirthDjs!=null&&daBirthDjs.size()>0){ List cszmIds = daBirthDjs.stream().map(DaBirthDj::getId).collect(Collectors.toList()); - daBirthDjService.deleteDaBirthDjByIds(cszmIds.toArray(new Long[cszmIds.size()])); + daBirthDjService.deleteDaBirthDjByIds1(cszmIds.toArray(new Long[cszmIds.size()])); } break; case "option5": @@ -154,7 +154,7 @@ public class DaTaskServiceImpl implements IDaTaskService List qyzs = daQyzService.selectDaQyzList(qyz); if(qyzs!=null&&qyzs.size()>0){ List qyzIds = qyzs.stream().map(DaQyz::getId).collect(Collectors.toList()); - daQyzService.deleteDaQyzByIds(qyzIds.toArray(new Long[qyzIds.size()])); + daQyzService.deleteDaQyzByIds1(qyzIds.toArray(new Long[qyzIds.size()])); } break; case "option6": @@ -164,7 +164,7 @@ public class DaTaskServiceImpl implements IDaTaskService List ytzms = daYtzmService.selectDaYtzmList(ytzm); if(ytzms!=null&&ytzms.size()>0){ List ytzmIds = ytzms.stream().map(DaYtzm::getId).collect(Collectors.toList()); - daYtzmService.deleteDaYtzmByIds(ytzmIds.toArray(new Long[ytzmIds.size()])); + daYtzmService.deleteDaYtzmByIds1(ytzmIds.toArray(new Long[ytzmIds.size()])); } break; case "option7": @@ -174,7 +174,7 @@ public class DaTaskServiceImpl implements IDaTaskService List zfnyhkcgs = daZfnyhkcgService.selectDaZfnyhkcgList(zfnyhkcg); if(zfnyhkcgs!=null&&zfnyhkcgs.size()>0){ List zfIds = zfnyhkcgs.stream().map(DaZfnyhkcg::getId).collect(Collectors.toList()); - daZfnyhkcgService.deleteDaZfnyhkcgByIds(zfIds.toArray(new Long[zfIds.size()])); + daZfnyhkcgService.deleteDaZfnyhkcgByIds1(zfIds.toArray(new Long[zfIds.size()])); } break; case "option8": @@ -184,7 +184,7 @@ public class DaTaskServiceImpl implements IDaTaskService List zqzs = daZqzService.selectDaZqzList(zqz); if(zqzs!=null&&zqzs.size()>0){ List zqzIds = zqzs.stream().map(DaZqz::getId).collect(Collectors.toList()); - daZqzService.deleteDaZqzByIds(zqzIds.toArray(new Long[zqzIds.size()])); + daZqzService.deleteDaZqzByIds1(zqzIds.toArray(new Long[zqzIds.size()])); } break; } diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java index 7586004..91bacd8 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaYtzmServiceImpl.java @@ -156,6 +156,34 @@ public class DaYtzmServiceImpl implements IDaYtzmService @Override @Transactional public int deleteDaYtzmByIds(Long[] ids) + { + if(ids.length>0){ + //1-根据muId 查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值 + DaYtzm daYtzm = daYtzmMapper.selectDaYtzmById(ids[0]); + DaCatalog catalog = daCatalogMapper.selectDaCatalogById(daYtzm.getMuId()); + List ancestors = Arrays.stream( + catalog.getAncestors().split(",")).map(s->Long.parseLong(s.trim())).collect(Collectors.toList()); + ancestors.add(daYtzm.getMuId()); + ancestors.remove(0L); + //1-修改该muId及父级catalog id中的countNum值 + for(Long muId :ancestors ){ + daCatalogMapper.minusDaCatalogCountNumById(muId,((Integer)ids.length).longValue()); + } + //修改对应的图片为未识别 ----前端已设置只能单条删除 + List picIds = Stream.of(daYtzm.getPicIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + for(Long picId :picIds){ + DaPicturesRecard pic = new DaPicturesRecard(); + pic.setId(picId); + pic.setRecognize("0");//未识别 + pic.setErrorCorrect("0"); + daPicturesRecardMapper.updateDaPicturesRecard(pic); + } + } + int i = daYtzmMapper.deleteDaYtzmByIds(ids); + return i; + } + @Transactional + public int deleteDaYtzmByIds1(Long[] ids) { if(ids.length>0){ //1-根据muId 查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值 diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java index 6e5b086..50ceba0 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZfnyhkcgServiceImpl.java @@ -154,6 +154,34 @@ public class DaZfnyhkcgServiceImpl implements IDaZfnyhkcgService @Override @Transactional public int deleteDaZfnyhkcgByIds(Long[] ids) + { + if(ids.length>0){ + //1-根据muId 查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值 + DaZfnyhkcg daZfnyhkcg = daZfnyhkcgMapper.selectDaZfnyhkcgById(ids[0]); + DaCatalog catalog = daCatalogMapper.selectDaCatalogById(daZfnyhkcg.getMuId()); + List ancestors = Arrays.stream( + catalog.getAncestors().split(",")).map(s->Long.parseLong(s.trim())).collect(Collectors.toList()); + ancestors.add(daZfnyhkcg.getMuId()); + ancestors.remove(0L); + //1-修改该muId及父级catalog id中的countNum值 + for(Long muId :ancestors ){ + daCatalogMapper.minusDaCatalogCountNumById(muId,((Integer)ids.length).longValue()); + } + //修改对应的图片为未识别 ----前端已设置只能单条删除 + List picIds = Stream.of(daZfnyhkcg.getPicIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + for(Long picId :picIds){ + DaPicturesRecard pic = new DaPicturesRecard(); + pic.setId(picId); + pic.setRecognize("0");//未识别 + pic.setErrorCorrect("0"); + daPicturesRecardMapper.updateDaPicturesRecard(pic); + } + } + int i = daZfnyhkcgMapper.deleteDaZfnyhkcgByIds(ids); + return i; + } + @Transactional + public int deleteDaZfnyhkcgByIds1(Long[] ids) { if(ids.length>0){ //1-根据muId 查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值 diff --git a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java index b0d7cb2..0e9f1e3 100644 --- a/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java +++ b/dangan-dangan/src/main/java/com/da/dangan/service/impl/DaZqzServiceImpl.java @@ -155,6 +155,34 @@ public class DaZqzServiceImpl implements IDaZqzService @Override @Transactional public int deleteDaZqzByIds(Long[] ids) + { + if(ids.length>0){ + //1-根据muId 查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值 + DaZqz daZqz = daZqzMapper.selectDaZqzById(ids[0]); + DaCatalog catalog = daCatalogMapper.selectDaCatalogById(daZqz.getMuId()); + List ancestors = Arrays.stream( + catalog.getAncestors().split(",")).map(s->Long.parseLong(s.trim())).collect(Collectors.toList()); + ancestors.add(daZqz.getMuId()); + ancestors.remove(0L); + //1-修改该muId及父级catalog id中的countNum值 + for(Long muId :ancestors ){ + daCatalogMapper.minusDaCatalogCountNumById(muId,((Integer)ids.length).longValue()); + } + //修改对应的图片为未识别 ----前端已设置只能单条删除 + List picIds = Stream.of(daZqz.getPicIds().split(",")).map(Long::parseLong).collect(Collectors.toList()); + for(Long picId :picIds){ + DaPicturesRecard pic = new DaPicturesRecard(); + pic.setId(picId); + pic.setRecognize("0");//未识别 + pic.setErrorCorrect("0"); + daPicturesRecardMapper.updateDaPicturesRecard(pic); + } + } + int i = daZqzMapper.deleteDaZqzByIds(ids); + return i; + } + @Transactional + public int deleteDaZqzByIds1(Long[] ids) { if(ids.length>0){ //1-根据muId 查询该muId的所有父级集合，当数据添加成功后-----修改该muId及父级catalog中的countNum值 diff --git a/dangan-ui/src/utils/request.js b/dangan-ui/src/utils/request.js index a243422..e508976 100644 --- a/dangan-ui/src/utils/request.js +++ b/dangan-ui/src/utils/request.js @@ -17,7 +17,7 @@ const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 baseURL: process.env.VUE_APP_BASE_API, // 10s超时 - timeout: 60000 + timeout: 300000 }) // request拦截器