bug修改
This commit is contained in:
parent
eb2501a85e
commit
b0bd16e358
@ -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<RtTool> delete(@ApiIgnore @RequestBody HashMap<String, Object> map) {
|
||||
String id = MapUtils.getString(map, "id");
|
||||
Result<RtTool> result = new Result<RtTool>();
|
||||
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();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -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<RtTool> {
|
||||
CountRtToolVo countRtTool(HashMap<String, Object> paramMap);
|
||||
|
||||
FlexibleBigScreenVo countRtToolTrend(HashMap<String, Object> paramMap);
|
||||
|
||||
|
||||
void delete(HashMap<String, Object> map);
|
||||
}
|
||||
|
||||
@ -181,6 +181,16 @@ public class RtToolServiceImpl extends ServiceImpl<RtToolMapper, RtTool> impleme
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void delete(HashMap<String, Object> map) {
|
||||
String id = MapUtils.getString(map, "id");
|
||||
RtTool rtTool = getById(id);
|
||||
if (rtTool != null) {
|
||||
baseMapper.deleteById(id);
|
||||
rtToolHistoryMapper.delete(new LambdaQueryWrapper<RtToolHistory>().eq(RtToolHistory::getDevSn, rtTool.getDevSn()));
|
||||
}
|
||||
}
|
||||
|
||||
private void setExitTimeIf(RtTool rtTool) {
|
||||
if (Objects.equals(rtTool.getToolStatus(), 2)) {
|
||||
rtTool.setExitTime(new Date());
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user