diff --git a/src/main/java/com/whdc/controller/QXWarnController.java b/src/main/java/com/whdc/controller/QXWarnController.java index 05b612f..a351fe6 100644 --- a/src/main/java/com/whdc/controller/QXWarnController.java +++ b/src/main/java/com/whdc/controller/QXWarnController.java @@ -116,6 +116,28 @@ public class QXWarnController { return ResultJson.ok(warnDpples); } + /** + * 确认处理完成 + */ + @ApiOperation(value = "确认处理完成") + @PostMapping("/confirmHandle") + @Cacheable(value = THIS_REDIS_KEY, key = "#root.method.name+':'+#dto.toString()") + public ResultJson> confirmHandle( + @RequestBody WarnMsgFB dto) { + //根据warnid和phone判断是否重复 + if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty( + warnMsgFBService.lambdaQuery() + .eq(WarnMsgFB::getWarnid,dto.getWarnid()) + .eq(WarnMsgFB::getCalledPhone,String.valueOf(dto.getCalledPhone())).list() + ) + ){ + return ResultJson.error("该名称或编码重复"); + } + + boolean save = warnMsgFBService.save(dto); + return ResultJson.ok(save); + } + /** * 历史气象预警统计 * @@ -275,7 +297,7 @@ public class QXWarnController { * @param dto * @return */ - @ApiOperation(value = "历史气象预警统计") + @ApiOperation(value = "历史气象预警查询") @PostMapping("/getHistoryWarning") @Cacheable(value = THIS_REDIS_KEY, key = "#root.method.name+':'+#dto.toString()") public ResultJson getHistoryGroupWarning(@RequestBody GroupWarningDto dto) { diff --git a/src/main/java/com/whdc/controller/WarnMsgFBController.java b/src/main/java/com/whdc/controller/WarnMsgFBController.java new file mode 100644 index 0000000..99af26e --- /dev/null +++ b/src/main/java/com/whdc/controller/WarnMsgFBController.java @@ -0,0 +1,52 @@ +package com.whdc.controller; + +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.whdc.model.entity.WarnMsgFB; +import com.whdc.service.IWarnMsgFBService; +import com.whdc.utils.ResultJson; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@Api(tags = "预警叫应 - Controller") +@RestController +@RequestMapping("/warnmsgfb") +public class WarnMsgFBController { + @Autowired + private IWarnMsgFBService service; + //增 + @ApiOperation(value = "新增") + @PostMapping(value = "/add") + public ResultJson insert(@RequestBody @Validated WarnMsgFB dto) { + + //根据warnid和phone判断是否重复 + if (CollectionUtils.isNotEmpty( + service.lambdaQuery() + .eq(WarnMsgFB::getWarnid,dto.getWarnid()) + .eq(WarnMsgFB::getCalledPhone,String.valueOf(dto.getCalledPhone())).list() + ) + ){ + return ResultJson.error("该名称或编码重复"); + } + + boolean save = service.save(dto); + return ResultJson.ok(save); + } + //删 + //改 + //查 + @ApiOperation(value = "查询所有") + @PostMapping(value = "/find") + public ResultJson find(@RequestBody WarnMsgFB dto) { + + return ResultJson.ok(service.find(dto)); + + } +}