From e64d268cbd922418d78d6d3cc0f39c7e20f2f90a Mon Sep 17 00:00:00 2001 From: "Mr.Wang" Date: Mon, 13 May 2024 17:53:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AEid=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BA=8B=E4=BB=B6=E9=A2=84=E6=A1=88=E5=85=B3=E8=81=94?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=20=E4=BF=AE=E6=94=B9=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E7=A1=AE=E8=AE=A4=E5=AD=98=E5=82=A8=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E9=A2=84=E6=A1=88=E5=85=B3=E8=81=94=E8=A1=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BD=A2=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DcEmergencyPlansController.java | 9 ++++ .../business/mapper/EventPlanAssocMapper.java | 11 ++++- .../service/DcEmergencyPlansService.java | 10 ++++- .../impl/DcEmergencyPlansServiceImpl.java | 43 ++++++++++--------- .../mapper/business/EventPlanAssocMapper.xml | 9 +++- 5 files changed, 58 insertions(+), 24 deletions(-) diff --git a/zc-business/src/main/java/com/zc/business/controller/DcEmergencyPlansController.java b/zc-business/src/main/java/com/zc/business/controller/DcEmergencyPlansController.java index 9f5b213f..307f08f6 100644 --- a/zc-business/src/main/java/com/zc/business/controller/DcEmergencyPlansController.java +++ b/zc-business/src/main/java/com/zc/business/controller/DcEmergencyPlansController.java @@ -136,6 +136,15 @@ public class DcEmergencyPlansController extends BaseController { return AjaxResult.success(dcEmergencyPlansService.selectEventPlanAssocByEventId(id)); } + /** + * 根据id-查询预案事件关联表 + */ + @ApiOperation("根据id-查询预案事件关联表") + @GetMapping("/event/assoc/{assocId}") + public AjaxResult eventConfirmById(@PathVariable("assocId") Long assocId) { + return AjaxResult.success(dcEmergencyPlansService.selectEventPlanAssocById(assocId)); + } + /** * 感知事件确定 */ diff --git a/zc-business/src/main/java/com/zc/business/mapper/EventPlanAssocMapper.java b/zc-business/src/main/java/com/zc/business/mapper/EventPlanAssocMapper.java index 15c13da3..411a1c9c 100644 --- a/zc-business/src/main/java/com/zc/business/mapper/EventPlanAssocMapper.java +++ b/zc-business/src/main/java/com/zc/business/mapper/EventPlanAssocMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.zc.business.domain.EventPlanAssoc; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 预案事件关联Mapper接口 * @@ -19,12 +21,19 @@ public interface EventPlanAssocMapper extends BaseMapper { */ int insertEventPlanAssoc(EventPlanAssoc eventPlanAssoc); + /** + * 根据id查询事件预案关联 + * @param eventPlanAssoc + * @return + */ + EventPlanAssoc selectById(EventPlanAssoc eventPlanAssoc); + /** * 根据事件id查询事件预案关联 * @param eventPlanAssoc * @return */ - EventPlanAssoc selectByEventId(EventPlanAssoc eventPlanAssoc); + List selectByEvent(EventPlanAssoc eventPlanAssoc); /** * 修改事件预案关联 diff --git a/zc-business/src/main/java/com/zc/business/service/DcEmergencyPlansService.java b/zc-business/src/main/java/com/zc/business/service/DcEmergencyPlansService.java index 02d4d32a..7a1687a8 100644 --- a/zc-business/src/main/java/com/zc/business/service/DcEmergencyPlansService.java +++ b/zc-business/src/main/java/com/zc/business/service/DcEmergencyPlansService.java @@ -76,7 +76,15 @@ public interface DcEmergencyPlansService { * @param eventId 事件id * @return 结果 */ - EventPlanAssoc selectEventPlanAssocByEventId(String eventId); + List selectEventPlanAssocByEventId(String eventId); + + /** + * 根据id-查询预案事件关联表 + * + * @param id id + * @return 结果 + */ + EventPlanAssoc selectEventPlanAssocById(Long id); /** * 感知事件确定 diff --git a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java index c0dddd88..156e68a0 100644 --- a/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java +++ b/zc-business/src/main/java/com/zc/business/service/impl/DcEmergencyPlansServiceImpl.java @@ -557,10 +557,22 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { * @return */ @Override - public EventPlanAssoc selectEventPlanAssocByEventId(String eventId) { + public List selectEventPlanAssocByEventId(String eventId) { EventPlanAssoc eventPlanAssoc = new EventPlanAssoc(); eventPlanAssoc.setEventId(eventId); - return eventPlanAssocMapper.selectByEventId(eventPlanAssoc); + return eventPlanAssocMapper.selectByEvent(eventPlanAssoc); + } + + /** + * 根据id-查询预案事件关联表 + * @param id id + * @return + */ + @Override + public EventPlanAssoc selectEventPlanAssocById(Long id) { + EventPlanAssoc eventPlanAssoc = new EventPlanAssoc(); + eventPlanAssoc.setId(id); + return eventPlanAssocMapper.selectById(eventPlanAssoc); } /** @@ -735,24 +747,15 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService { // 事件编号 eventPlanAssoc.setEventId(id); eventPlanAssoc.setOperationType(dcEventAnDcEmergencyPlans.getOperationType()); - EventPlanAssoc selectEventPlanAssoc = eventPlanAssocMapper.selectByEventId(eventPlanAssoc); - - if (selectEventPlanAssoc == null) { - // 执行新增 - eventPlanAssoc.setEmergencyPlansId(dcEmergencyPlans.getId()); - eventPlanAssoc.setControlDevice(deviceIds.toString().replaceFirst(";", "")); - eventPlanAssoc.setControlResult(resultArray.toJSONString()); - eventPlanAssoc.setCreateTime(DateUtils.getNowDate()); - eventPlanAssocMapper.insertEventPlanAssoc(eventPlanAssoc); - resultObject.put("eventPlanAssocId",eventPlanAssoc.getId()); - }else { - // 执行修改操作 - selectEventPlanAssoc.setUpdateTime(DateUtils.getNowDate()); - selectEventPlanAssoc.setControlDevice(deviceIds.toString().replaceFirst(";", "")); - selectEventPlanAssoc.setControlResult(resultArray.toJSONString()); - eventPlanAssocMapper.updateEventPlanAssoc(selectEventPlanAssoc); - resultObject.put("eventPlanAssocId",selectEventPlanAssoc.getId()); - } + + // 新增事件预案关联表数据 + eventPlanAssoc.setEmergencyPlansId(dcEmergencyPlans.getId()); + eventPlanAssoc.setControlDevice(deviceIds.toString().replaceFirst(";", "")); + eventPlanAssoc.setControlResult(resultArray.toJSONString()); + eventPlanAssoc.setCreateTime(DateUtils.getNowDate()); + eventPlanAssocMapper.insertEventPlanAssoc(eventPlanAssoc); + resultObject.put("eventPlanAssocId",eventPlanAssoc.getId()); + DcEventProcess dcEventProcess = new DcEventProcess(); dcEventProcess.setEventId(id); dcEventProcess.setSource(1); diff --git a/zc-business/src/main/resources/mapper/business/EventPlanAssocMapper.xml b/zc-business/src/main/resources/mapper/business/EventPlanAssocMapper.xml index abda69d3..c0c79aca 100644 --- a/zc-business/src/main/resources/mapper/business/EventPlanAssocMapper.xml +++ b/zc-business/src/main/resources/mapper/business/EventPlanAssocMapper.xml @@ -44,9 +44,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from event_plan_assoc - - where event_id = #{eventId} and operation_type = #{operationType} + where id = #{id} + + +