奇龙修改

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<PropertyModelDetail> modelDetailList)throws Exception {
+        Boolean flag = propertyModelDetailService.batchRemovePropertyModelDetail(modelDetailList);
+        if (flag){
+            return R.ok("操作成功");
+        }
+        return R.error("操作失败");
+    }
 }

src/main/java/com/gaotao/modules/property/mapper/PropertyModelDetailMapper.java

@@ -15,5 +15,7 @@ public interface PropertyModelDetailMapper extends BaseMapper<PropertyModelDetai
     List<PropertyModelDetail> queryPropertyModelDetailItem(PropertyModelDetail modelDetail);
 
     Integer getMaxSeq(PropertyModelDetail propertyModelDetail);
+
+    int deleteBatchIds(@Param("ids") List<Long> ids);
 }
 

src/main/java/com/gaotao/modules/property/service/PropertyModelDetailService.java

@@ -15,7 +15,7 @@ public interface PropertyModelDetailService extends IService<PropertyModelDetail
 
     String batchSavePropertyModelDetail(List<PropertyModelDetail> modelDetailList)throws Exception ;
 
-    void batchRemovePropertyModelDetail(List<PropertyModelDetail> modelDetailList);
+    boolean batchRemovePropertyModelDetail(List<PropertyModelDetail> modelDetailList);
 
     List<PropertyModelDetail> queryPropertyModelDetailItem(PropertyModelDetail modelDetail);
 

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<PropertyModelDet
     @Override
     @Transactional
     public void removePropertyModelDetail(PropertyModelDetail modelDetail) {
-        removeById(modelDetail.getId());
+        if (modelDetail.getId() == null) {
+            return;
+        }
+        baseMapper.deleteBatchIds(Collections.singletonList(modelDetail.getId()));
     }
 
     @Override
@@ -52,9 +56,12 @@ public class PropertyModelDetailServiceImpl extends ServiceImpl<PropertyModelDet
 
     @Override
     @Transactional
-    public void batchRemovePropertyModelDetail(List<PropertyModelDetail> modelDetailList) {
-        List<Long> collect = modelDetailList.stream().map(PropertyModelDetail::getId).collect(Collectors.toList());
-        lambdaUpdate().in(PropertyModelDetail::getId, collect).remove();
+    public boolean batchRemovePropertyModelDetail(List<PropertyModelDetail> modelDetailList) {
+        List<Long> ids = modelDetailList.stream().map(PropertyModelDetail::getId).collect(Collectors.toList());
+        if (ids.isEmpty()) {
+            return false;
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
     }
 
     @Override

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'#不可以放入中文字符
 

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}
     </select>
 
+    <update id="deleteBatchIds" parameterType="java.lang.Long">
+        delete from plm_properties_model_detail where id in
+        <foreach item="id" collection="ids" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
 </mapper>