diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java index 72d43f4cd..27dcfe8a0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java @@ -108,19 +108,8 @@ public class RtToolController { @ApiImplicitParam(name = "id", value = "榕图-工器具ID", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") @PostMapping(value = "/delete") public Result delete(@ApiIgnore @RequestBody HashMap map) { - String id = MapUtils.getString(map, "id"); - Result result = new Result(); - RtTool rtTool = rtToolService.getById(id); - if (rtTool == null) { - result.error500("未找到对应实体"); - } else { - boolean ok = rtToolService.removeById(id); - if (ok) { - result.success("删除成功!"); - } - } - - return result; + rtToolService.delete(map); + return Result.ok(); } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java index 25ac50c3d..a99b62caf 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.rt.service; +import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo; import com.zhgd.xmgl.modules.rt.entity.RtTool; import com.baomidou.mybatisplus.extension.service.IService; @@ -30,4 +31,7 @@ public interface IRtToolService extends IService { CountRtToolVo countRtTool(HashMap paramMap); FlexibleBigScreenVo countRtToolTrend(HashMap paramMap); + + + void delete(HashMap map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java index 7fba3713d..bb944838e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java @@ -181,6 +181,16 @@ public class RtToolServiceImpl extends ServiceImpl impleme return null; } + @Override + public void delete(HashMap map) { + String id = MapUtils.getString(map, "id"); + RtTool rtTool = getById(id); + if (rtTool != null) { + baseMapper.deleteById(id); + rtToolHistoryMapper.delete(new LambdaQueryWrapper().eq(RtToolHistory::getDevSn, rtTool.getDevSn())); + } + } + private void setExitTimeIf(RtTool rtTool) { if (Objects.equals(rtTool.getToolStatus(), 2)) { rtTool.setExitTime(new Date());