From d8ee16afd15fcf8a40b220b5b94e3be8ecbda0fc Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 02 二月 2024 23:07:27 +0800
Subject: [PATCH] 增加车间和工段的删除功能
---
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/SectionController.java | 18 ++++++++-
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/section/SectionService.java | 13 ++++++
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/IdsDTO.java | 3 +
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/plant/PlantQueryController.java | 4 +-
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/WorkshopEditController.java | 19 ++++++++-
mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/workshop/WorkshopEditService.java | 15 +++++++
6 files changed, 65 insertions(+), 7 deletions(-)
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/plant/PlantQueryController.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/plant/PlantQueryController.java
index 2dd6663..c39430c 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/plant/PlantQueryController.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/plant/PlantQueryController.java
@@ -6,6 +6,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,8 +40,7 @@
* @param request
* @return
*/
- //@GetMapping(value = "/list")
- @Deprecated
+ @GetMapping(value = "/list")
public OpResult<List<PlantDTO>> list() {
try {
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/SectionController.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/SectionController.java
index a9c47b3..11d09dc 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/SectionController.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/SectionController.java
@@ -17,6 +17,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.qianwen.mdc.common.OpResult;
+import com.qianwen.mdc.dto.IdsDTO;
import com.qianwen.mdc.dto.SectionDTO;
import com.qianwen.mdc.service.section.SectionService;
@@ -47,8 +48,8 @@
return OpResult.success();
}
- @PostMapping(value = "/modify")
- public OpResult<Void> modify(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
+ @PostMapping(value = "/update")
+ public OpResult<Void> update(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
@Validated(value = {Default.class}) @RequestBody SectionDTO sectionDTO) {
try {
@@ -61,6 +62,19 @@
return OpResult.success();
}
+ @PostMapping(value = "/delete")
+ public OpResult<Void> delete(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
+ @Validated @RequestBody IdsDTO idsDTO) {
+
+ try {
+ sectionService.delete(idsDTO);
+ }catch(Exception ex) {
+ logger.error("鏂板杞﹂棿澶辫触",ex);
+ return OpResult.fail(ex.getMessage());
+ }
+
+ return OpResult.success();
+ }
@GetMapping(value = "/listByWorkshop")
public OpResult<List<SectionDTO>> listByWorkshop(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/WorkshopEditController.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/WorkshopEditController.java
index 8fb46f5..451b814 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/WorkshopEditController.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/controller/workshop/WorkshopEditController.java
@@ -14,6 +14,7 @@
import org.springframework.web.bind.annotation.RestController;
import com.qianwen.mdc.common.OpResult;
+import com.qianwen.mdc.dto.IdsDTO;
import com.qianwen.mdc.dto.workshop.WorkshopDTO;
import com.qianwen.mdc.service.workshop.WorkshopEditService;
import com.qianwen.mdc.service.workshop.WorkshopService;
@@ -47,8 +48,8 @@
return OpResult.success();
}
- @PostMapping(value = "/modify")
- public OpResult<Void> modify(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
+ @PostMapping(value = "/update")
+ public OpResult<Void> update(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
@Validated(value = {Default.class}) @RequestBody WorkshopDTO workshopDTO) {
try {
@@ -61,6 +62,18 @@
return OpResult.success();
}
-
+ @PostMapping(value = "/delete")
+ public OpResult<Void> delete(@RequestHeader(value = "mdc-token", defaultValue = "") String token,
+ @Validated @RequestBody IdsDTO idsDTO) {
+
+ try {
+ editService.delete(idsDTO);
+ }catch(Exception ex) {
+ logger.error("鏂板杞﹂棿澶辫触",ex);
+ return OpResult.fail(ex.getMessage());
+ }
+
+ return OpResult.success();
+ }
}
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/IdsDTO.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/IdsDTO.java
index c9edc7f..70dda11 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/IdsDTO.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/dto/IdsDTO.java
@@ -2,10 +2,13 @@
import java.util.List;
+import javax.validation.constraints.NotEmpty;
+
/**
* 鍙湁ids(id List)鍙傛暟锛屼富瑕佺敤鎴锋壒閲忓垹闄よ繖绫诲満鏅殑鍙傛暟浼犻��
*/
public class IdsDTO {
+ @NotEmpty(message = "id涓嶈兘涓虹┖")
private List<Long> ids;
public List<Long> getIds() {
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/section/SectionService.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/section/SectionService.java
index c75250b..f295eba 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/section/SectionService.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/section/SectionService.java
@@ -8,7 +8,9 @@
import java.util.List;
import java.util.stream.Collectors;
+import com.qianwen.mdc.domain.DomainException;
import com.qianwen.mdc.domain.Section;
+import com.qianwen.mdc.dto.IdsDTO;
import com.qianwen.mdc.dto.SectionDTO;
import com.qianwen.mdc.mapper.SectionMapper;
@@ -49,4 +51,15 @@
return dto;
}).collect(Collectors.toList());
}
+
+ @Transactional
+ public void delete(IdsDTO idsDTO) {
+ if(idsDTO.getIds() == null) {
+ throw new DomainException("ids涓虹┖");
+ }
+
+ for(Long id :idsDTO.getIds()) {
+ sectionMapper.deleteById(id);
+ }
+ }
}
diff --git a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/workshop/WorkshopEditService.java b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/workshop/WorkshopEditService.java
index 022d551..dab1b6c 100644
--- a/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/workshop/WorkshopEditService.java
+++ b/mdc-parent/mdc-show/src/main/java/com/qianwen/mdc/service/workshop/WorkshopEditService.java
@@ -7,9 +7,11 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import com.qianwen.mdc.domain.DomainException;
import com.qianwen.mdc.domain.Section;
import com.qianwen.mdc.domain.workshop.Workshop;
import com.qianwen.mdc.domain.workshop.WorkshopAssembler;
+import com.qianwen.mdc.dto.IdsDTO;
import com.qianwen.mdc.dto.workshop.WorkshopDTO;
import com.qianwen.mdc.mapper.SectionMapper;
import com.qianwen.mdc.mapper.WorkshopMapper;
@@ -41,6 +43,19 @@
workshopMapper.updateById(ws);
}
+
+ @Transactional
+ public void delete(IdsDTO idsDTO) {
+
+
+ for(Long id :idsDTO.getIds()) {
+ if(!sectionMapper.queryByWorkshopId(id).isEmpty()) {
+ throw new DomainException("杞﹂棿鍖呭惈宸ユ锛岃鍏堝垹闄ゅ唴閮ㄥ伐娈点��");
+ }
+ workshopMapper.deleteById(id);
+ }
+
+ }
}
--
Gitblit v1.9.3