运维管理--巡检管理--巡检点:更改删除批量删除逻辑

jeecg_module_ems/src/main/java/org/jeecg/modules/cmmsInspectSpot/controller/CmmsInspectSpotController.java

@@ -21,6 +21,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
+import org.jeecg.modules.cmmsInspectSpotEquip.entity.CmmsInspectSpotEquip;
+import org.jeecg.modules.cmmsInspectSpotEquip.service.ICmmsInspectSpotEquipService;
 import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
@@ -49,7 +51,11 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 @Slf4j
 public class CmmsInspectSpotController extends JeecgController<CmmsInspectSpot, ICmmsInspectSpotService> {
 	@Autowired
+	@SuppressWarnings("all")
 	private ICmmsInspectSpotService cmmsInspectSpotService;
+	@Autowired
+	@SuppressWarnings("all")
+	private ICmmsInspectSpotEquipService inspectSpotEquipService;
 	
 	/**
 	 * 分页列表查询
@@ -124,8 +130,14 @@ public class CmmsInspectSpotController extends JeecgController<CmmsInspectSpot,
 	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot:delete")
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		cmmsInspectSpotService.removeById(id);
-		return Result.OK("删除成功!");
+		boolean b = cmmsInspectSpotService.removeById(id);
+		QueryWrapper<CmmsInspectSpotEquip> quer = new QueryWrapper<>();
+		quer.eq("inspectspotid",id);
+		boolean b1 = inspectSpotEquipService.remove(quer);
+		if (b && b1){
+			return Result.OK("删除成功!");
+		}
+		return Result.error("删除失败!");
 	}
 	
 	/**
@@ -139,8 +151,14 @@ public class CmmsInspectSpotController extends JeecgController<CmmsInspectSpot,
 	//@RequiresPermissions("org.jeecg.modules:ems_cmms_inspect_spot:deleteBatch")
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.cmmsInspectSpotService.removeByIds(Arrays.asList(ids.split(",")));
-		return Result.OK("批量删除成功!");
+		boolean b = this.cmmsInspectSpotService.removeByIds(Arrays.asList(ids.split(",")));
+		QueryWrapper<CmmsInspectSpotEquip> quer = new QueryWrapper<>();
+		quer.in("inspectspotid",Arrays.asList(ids.split(",")));
+		boolean b1 = inspectSpotEquipService.remove(quer);
+		if (b && b1){
+			return Result.OK("批量删除成功!");
+		}
+		return Result.error("批量删除失败!");
 	}
 	
 	/**