feat: 设备操作组件删除

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<String> editOperateFile(@PathVariable Long fileId, @PathVariable String operateName){
         return devOperateTypeService.editOperateFile(fileId,operateName);
     }
+    @PostMapping("delete")
+    @Operation(summary = "删除设备操作组件")
+    public Result<String> deleteOperate(@RequestBody List<DeleteOperateForm> ids){
+        return devOperateTypeService.deleteOperate(ids);
+    }
 }

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;
+}

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<DevOperateTypeVO> page(BasePageQuery query);
 
@@ -15,4 +18,6 @@ public interface DevOperateTypeService {
 
     Result<String> editOperateFile(Long fileId, String operateName);
 
+    Result<String> deleteOperate(List<DeleteOperateForm> ids);
+
 }

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<String> deleteOperate(List<DeleteOperateForm> 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<DevOperateType>()
+                            .eq(DevOperateType::getOperateName,operateName)
+            );
+        }
+        return Result.success();
+    }
 }

src/main/resources/mapper/CustomerMapper.xml

@@ -16,6 +16,9 @@
             <if test="column=='customName' and column!=null and column!=''">
                 and cust_name = #{value}
             </if>
+            <if test="column=='regionAreaId' and column!=null and column!=''">
+                and region_area_id = #{value}
+            </if>
         </where>
     </select>
 </mapper>

src/main/resources/mapper/DeviceStaticMapper.xml

@@ -33,6 +33,9 @@
             <if test="column=='devAdNo' and column!=null and column!=''">
                 and s.dev_ad_no = #{value}
             </if>
+            <if test="column=='devSno' and column!=null and column!=''">
+                and s.dev_sno = #{value}
+            </if>
             <if test="column=='customName' and column!=null and column!=''">
                 and itms_customer.cust_name =  #{value}
             </if>