增加根据id查询事件预案关联表数据

修改事件确认存储事件预案关联表数据形式

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));
+    }
+
     /**
      * 感知事件确定
      */

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<EventPlanAssoc> {
      */
     int insertEventPlanAssoc(EventPlanAssoc eventPlanAssoc);
 
+    /**
+     * 根据id查询事件预案关联
+     * @param eventPlanAssoc
+     * @return
+     */
+    EventPlanAssoc selectById(EventPlanAssoc eventPlanAssoc);
+
     /**
      * 根据事件id查询事件预案关联
      * @param eventPlanAssoc
      * @return
      */
-    EventPlanAssoc selectByEventId(EventPlanAssoc eventPlanAssoc);
+    List<EventPlanAssoc> selectByEvent(EventPlanAssoc eventPlanAssoc);
 
     /**
      * 修改事件预案关联

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<EventPlanAssoc> selectEventPlanAssocByEventId(String eventId);
+
+    /**
+     * 根据id-查询预案事件关联表
+     *
+     * @param id id
+     * @return 结果
+     */
+    EventPlanAssoc selectEventPlanAssocById(Long id);
 
     /**
      * 感知事件确定

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<EventPlanAssoc> 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);

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
     </sql>
 
-    <select id="selectByEventId" parameterType="EventPlanAssoc" resultType="EventPlanAssoc">
+    <select id="selectById" parameterType="EventPlanAssoc" resultType="EventPlanAssoc">
         <include refid="selectEventPlanAssocVo"/>
-        where event_id = #{eventId} and operation_type = #{operationType}
+        where id = #{id}
+    </select>
+
+    <select id="selectByEvent" parameterType="EventPlanAssoc" resultType="EventPlanAssoc">
+        <include refid="selectEventPlanAssocVo"/>
+        where event_id = #{eventId}
     </select>
 
     <update id="updateEventPlanAssoc" parameterType="EventPlanAssoc">