From 1b4beef6ba1a33ebd84aba0390eebeac01158855 Mon Sep 17 00:00:00 2001 From: shenzhouyu Date: Tue, 26 May 2026 13:06:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A5=87=E9=BE=99=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PropertyModelDetailController.java | 16 ++++++++++++++++ .../mapper/PropertyModelDetailMapper.java | 2 ++ .../service/PropertyModelDetailService.java | 2 +- .../impl/PropertyModelDetailServiceImpl.java | 15 +++++++++++---- src/main/resources/application-dev.yml | 14 -------------- .../property/PropertyModelDetailMapper.xml | 7 +++++++ 6 files changed, 37 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/gaotao/modules/property/controller/PropertyModelDetailController.java b/src/main/java/com/gaotao/modules/property/controller/PropertyModelDetailController.java index 57bcc59..6f56395 100644 --- a/src/main/java/com/gaotao/modules/property/controller/PropertyModelDetailController.java +++ b/src/main/java/com/gaotao/modules/property/controller/PropertyModelDetailController.java @@ -44,4 +44,20 @@ public class PropertyModelDetailController { } return R.error("操作失败"); } + + @PostMapping("/remove") + public R removePropertyModelDetail(@RequestBody PropertyModelDetail modelDetail)throws Exception { + propertyModelDetailService.removePropertyModelDetail(modelDetail); + + return R.ok("操作成功"); + } + + @PostMapping("/batch/remove") + public R batchRemovePropertyModelDetail(@RequestBody List modelDetailList)throws Exception { + Boolean flag = propertyModelDetailService.batchRemovePropertyModelDetail(modelDetailList); + if (flag){ + return R.ok("操作成功"); + } + return R.error("操作失败"); + } } diff --git a/src/main/java/com/gaotao/modules/property/mapper/PropertyModelDetailMapper.java b/src/main/java/com/gaotao/modules/property/mapper/PropertyModelDetailMapper.java index 60f67a1..c5f0e8b 100644 --- a/src/main/java/com/gaotao/modules/property/mapper/PropertyModelDetailMapper.java +++ b/src/main/java/com/gaotao/modules/property/mapper/PropertyModelDetailMapper.java @@ -15,5 +15,7 @@ public interface PropertyModelDetailMapper extends BaseMapper queryPropertyModelDetailItem(PropertyModelDetail modelDetail); Integer getMaxSeq(PropertyModelDetail propertyModelDetail); + + int deleteBatchIds(@Param("ids") List ids); } diff --git a/src/main/java/com/gaotao/modules/property/service/PropertyModelDetailService.java b/src/main/java/com/gaotao/modules/property/service/PropertyModelDetailService.java index 3e9ad50..f103881 100644 --- a/src/main/java/com/gaotao/modules/property/service/PropertyModelDetailService.java +++ b/src/main/java/com/gaotao/modules/property/service/PropertyModelDetailService.java @@ -15,7 +15,7 @@ public interface PropertyModelDetailService extends IService modelDetailList)throws Exception ; - void batchRemovePropertyModelDetail(List modelDetailList); + boolean batchRemovePropertyModelDetail(List modelDetailList); List queryPropertyModelDetailItem(PropertyModelDetail modelDetail); diff --git a/src/main/java/com/gaotao/modules/property/service/impl/PropertyModelDetailServiceImpl.java b/src/main/java/com/gaotao/modules/property/service/impl/PropertyModelDetailServiceImpl.java index 623fbcf..cdabdef 100644 --- a/src/main/java/com/gaotao/modules/property/service/impl/PropertyModelDetailServiceImpl.java +++ b/src/main/java/com/gaotao/modules/property/service/impl/PropertyModelDetailServiceImpl.java @@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -30,7 +31,10 @@ public class PropertyModelDetailServiceImpl extends ServiceImpl modelDetailList) { - List collect = modelDetailList.stream().map(PropertyModelDetail::getId).collect(Collectors.toList()); - lambdaUpdate().in(PropertyModelDetail::getId, collect).remove(); + public boolean batchRemovePropertyModelDetail(List modelDetailList) { + List ids = modelDetailList.stream().map(PropertyModelDetail::getId).collect(Collectors.toList()); + if (ids.isEmpty()) { + return false; + } + return baseMapper.deleteBatchIds(ids) > 0; } @Override diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 4758658..16ff579 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -43,20 +43,6 @@ spring: session-stat-enable: true -##多数据源的配置 -dynamic: - datasource: - slave1: - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://xujiesoft.vicp.net:11515;databaseName=ckp-tid-report - username: sa - password: XJsoft123 - slave2: - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - url: jdbc:sqlserver://xujiesoft.vicp.net:11515;databaseName=ckp-tid - username: sa - password: XJsoft123 - sys-file: file-path: 'D:\ql-file'#不可以放入中文字符 diff --git a/src/main/resources/mapper/property/PropertyModelDetailMapper.xml b/src/main/resources/mapper/property/PropertyModelDetailMapper.xml index 2009dd3..e41aec1 100644 --- a/src/main/resources/mapper/property/PropertyModelDetailMapper.xml +++ b/src/main/resources/mapper/property/PropertyModelDetailMapper.xml @@ -67,4 +67,11 @@ select isnull(max(seq_no),0)+1 from plm_properties_model_detail where header_id = #{headerId} + + delete from plm_properties_model_detail where id in + + #{id} + + + \ No newline at end of file