From ac54b69a08912e87a04b918996121eac5a2799b0 Mon Sep 17 00:00:00 2001
From: "Mr.Wang" <wang@qq.com>
Date: Fri, 10 May 2024 16:17:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=8B=E4=BB=B6=E9=A2=84?=
 =?UTF-8?q?=E6=A1=88=E5=85=B3=E8=81=94=E8=A1=A8id=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zc/business/domain/EventPlanAssoc.java   |  2 +-
 .../impl/DcEmergencyPlansServiceImpl.java        |  2 --
 .../mapper/business/EventPlanAssocMapper.xml     | 16 +++++++++++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/domain/EventPlanAssoc.java b/zc-business/src/main/java/com/zc/business/domain/EventPlanAssoc.java
index d41b8c5d..98b5f157 100644
--- a/zc-business/src/main/java/com/zc/business/domain/EventPlanAssoc.java
+++ b/zc-business/src/main/java/com/zc/business/domain/EventPlanAssoc.java
@@ -22,7 +22,7 @@ import java.util.Date;
 public class EventPlanAssoc {
 
     @ApiModelProperty("预案事件关联id")
-    private String id;
+    private 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 6a61c259..c0dddd88 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
@@ -743,8 +743,6 @@ public class DcEmergencyPlansServiceImpl implements DcEmergencyPlansService {
             eventPlanAssoc.setControlDevice(deviceIds.toString().replaceFirst(";", ""));
             eventPlanAssoc.setControlResult(resultArray.toJSONString());
             eventPlanAssoc.setCreateTime(DateUtils.getNowDate());
-            // IdUtils.fastSimpleUUID()
-            eventPlanAssoc.setId(IdUtils.fastSimpleUUID());
             eventPlanAssocMapper.insertEventPlanAssoc(eventPlanAssoc);
             resultObject.put("eventPlanAssocId",eventPlanAssoc.getId());
         }else {
diff --git a/zc-business/src/main/resources/mapper/business/EventPlanAssocMapper.xml b/zc-business/src/main/resources/mapper/business/EventPlanAssocMapper.xml
index 58efcd2c..abda69d3 100644
--- a/zc-business/src/main/resources/mapper/business/EventPlanAssocMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/EventPlanAssocMapper.xml
@@ -4,10 +4,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zc.business.mapper.EventPlanAssocMapper">
 
-    <insert id="insertEventPlanAssoc" parameterType="EventPlanAssoc">
+    <resultMap type="EventPlanAssoc" id="EventPlanAssocResult">
+        <result property="id" column="id"/>
+        <result property="eventId" column="event_id"/>
+        <result property="emergencyPlansId" column="emergency_plans_id"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="operationType" column="operation_type"/>
+        <result property="controlDevice" column="control_device"/>
+        <result property="controlResult" column="control_result"/>
+    </resultMap>
+
+    <insert id="insertEventPlanAssoc" parameterType="EventPlanAssoc" useGeneratedKeys="true"
+            keyProperty="id">
         insert into event_plan_assoc
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null and id != ''">id,</if>
             <if test="eventId != null and eventId != ''">event_id,</if>
             <if test="emergencyPlansId != null">emergency_plans_id,</if>
             <if test="controlDevice != null and controlDevice != ''">control_device,</if>
@@ -17,7 +28,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="controlResult != null and controlResult !=''">control_result,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null and id != ''">#{id},</if>
             <if test="eventId != null and eventId != ''">#{eventId},</if>
             <if test="emergencyPlansId != null">#{emergencyPlansId},</if>
             <if test="controlDevice != null and controlDevice != ''">#{controlDevice},</if>