From d25b985bbd528071a4ca1d1a2468c10b174e6237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Fri, 7 Jun 2024 10:23:46 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/DevOperateTypeController.java | 8 +++++++ .../model/form/DeleteOperateForm.java | 13 +++++++++++ .../service/DevOperateTypeService.java | 5 ++++ .../impl/DevOperateTypeServiceImpl.java | 23 +++++++++++++++++++ src/main/resources/mapper/CustomerMapper.xml | 3 +++ .../resources/mapper/DeviceStaticMapper.xml | 3 +++ 6 files changed, 55 insertions(+) create mode 100644 src/main/java/com/bellmann/model/form/DeleteOperateForm.java diff --git a/src/main/java/com/bellmann/controller/DevOperateTypeController.java b/src/main/java/com/bellmann/controller/DevOperateTypeController.java index bcb49f3..5a38b77 100644 --- a/src/main/java/com/bellmann/controller/DevOperateTypeController.java +++ b/src/main/java/com/bellmann/controller/DevOperateTypeController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bellmann.common.base.BasePageQuery; import com.bellmann.common.result.PageResult; import com.bellmann.common.result.Result; +import com.bellmann.model.form.DeleteOperateForm; import com.bellmann.model.form.DevOperateTypeForm; import com.bellmann.model.vo.DevOperateTypeVO; import com.bellmann.service.DevOperateTypeService; @@ -13,6 +14,8 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; + @Tag(name = "17.设备操作组件") @RestController @RequiredArgsConstructor @@ -44,4 +47,9 @@ public class DevOperateTypeController { public Result editOperateFile(@PathVariable Long fileId, @PathVariable String operateName){ return devOperateTypeService.editOperateFile(fileId,operateName); } + @PostMapping("delete") + @Operation(summary = "删除设备操作组件") + public Result deleteOperate(@RequestBody List ids){ + return devOperateTypeService.deleteOperate(ids); + } } diff --git a/src/main/java/com/bellmann/model/form/DeleteOperateForm.java b/src/main/java/com/bellmann/model/form/DeleteOperateForm.java new file mode 100644 index 0000000..b634e23 --- /dev/null +++ b/src/main/java/com/bellmann/model/form/DeleteOperateForm.java @@ -0,0 +1,13 @@ +package com.bellmann.model.form; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "删除设备操作组件表单") +public class DeleteOperateForm { + + private Long fileId; + + private String operateName; +} diff --git a/src/main/java/com/bellmann/service/DevOperateTypeService.java b/src/main/java/com/bellmann/service/DevOperateTypeService.java index e144e8c..27d87e4 100644 --- a/src/main/java/com/bellmann/service/DevOperateTypeService.java +++ b/src/main/java/com/bellmann/service/DevOperateTypeService.java @@ -3,9 +3,12 @@ package com.bellmann.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bellmann.common.base.BasePageQuery; import com.bellmann.common.result.Result; +import com.bellmann.model.form.DeleteOperateForm; import com.bellmann.model.form.DevOperateTypeForm; import com.bellmann.model.vo.DevOperateTypeVO; +import java.util.List; + public interface DevOperateTypeService { Page page(BasePageQuery query); @@ -15,4 +18,6 @@ public interface DevOperateTypeService { Result editOperateFile(Long fileId, String operateName); + Result deleteOperate(List ids); + } diff --git a/src/main/java/com/bellmann/service/impl/DevOperateTypeServiceImpl.java b/src/main/java/com/bellmann/service/impl/DevOperateTypeServiceImpl.java index 74eec8a..2eda14d 100644 --- a/src/main/java/com/bellmann/service/impl/DevOperateTypeServiceImpl.java +++ b/src/main/java/com/bellmann/service/impl/DevOperateTypeServiceImpl.java @@ -1,5 +1,6 @@ package com.bellmann.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.bellmann.common.base.BasePageQuery; @@ -9,6 +10,7 @@ import com.bellmann.manger.FileRecordManager; import com.bellmann.mapper.DevOperateTypeMapper; import com.bellmann.model.entity.DevOperateType; import com.bellmann.model.entity.FileRecord; +import com.bellmann.model.form.DeleteOperateForm; import com.bellmann.model.form.DevOperateTypeForm; import com.bellmann.model.vo.DevOperateTypeVO; import com.bellmann.service.DevOperateTypeService; @@ -18,6 +20,8 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.List; + @Service @RequiredArgsConstructor public class DevOperateTypeServiceImpl implements DevOperateTypeService { @@ -69,4 +73,23 @@ public class DevOperateTypeServiceImpl implements DevOperateTypeService { ); return Result.success(); } + + @Override + @Transactional + public Result deleteOperate(List ids) { + if (ids.isEmpty()){ + return Result.failed(ResultCode.IDS_IS_NULL); + } + for (DeleteOperateForm form: ids){ + Long fileId = form.getFileId(); + String operateName = form.getOperateName(); + if (fileId!=null){ + deleteOperateFile(fileId); + } + devOperateTypeMapper.delete(new LambdaQueryWrapper() + .eq(DevOperateType::getOperateName,operateName) + ); + } + return Result.success(); + } } diff --git a/src/main/resources/mapper/CustomerMapper.xml b/src/main/resources/mapper/CustomerMapper.xml index 3473770..44255b8 100644 --- a/src/main/resources/mapper/CustomerMapper.xml +++ b/src/main/resources/mapper/CustomerMapper.xml @@ -16,6 +16,9 @@ and cust_name = #{value} + + and region_area_id = #{value} + diff --git a/src/main/resources/mapper/DeviceStaticMapper.xml b/src/main/resources/mapper/DeviceStaticMapper.xml index 41e28cb..638b5d4 100644 --- a/src/main/resources/mapper/DeviceStaticMapper.xml +++ b/src/main/resources/mapper/DeviceStaticMapper.xml @@ -33,6 +33,9 @@ and s.dev_ad_no = #{value} + + and s.dev_sno = #{value} + and itms_customer.cust_name = #{value}