feat(emergency event): add saveEvent

src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/entity/EmergencyEvent.java

 package com.elephant.framework.galaxy.aroad.module.emergencyevent.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -64,6 +65,11 @@ private static final long serialVersionUID = 1L;
    * 上报人id
    */
   private Integer reporterId;
+  /**
+   * 上报人id
+   */
+  @TableField(exist = false)
+  private String reporter;
   /**
    * 上报时间
    */

src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/entity/Evendeal.java

@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
+import lombok.*;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -18,6 +18,9 @@ import java.util.Date;
  * @date 2019-05-08 14:43:56
  */
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @TableName("event_deal")
 @EqualsAndHashCode(callSuper = true)
 public class Evendeal extends Model<Evendeal> {
@@ -30,7 +33,7 @@ private static final long serialVersionUID = 1L;
   /**
    * 事件id
    */
-  private String eventId;
+  private Integer eventId;
   /**
    * 处置内容
    */
@@ -38,7 +41,7 @@ private static final long serialVersionUID = 1L;
   /**
    * 处置类型： 0：下达指令 1：处置反馈
    */
-  private Boolean dealType;
+  private Integer dealType;
   /**
    * 处置时间
    */

src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/mapper/EmergencyEventMapper.java

@@ -11,4 +11,5 @@ import com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.Emergenc
  */
 public interface EmergencyEventMapper extends BaseMapper<EmergencyEvent> {
 
+    boolean saveEvent(EmergencyEvent event);
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/impl/EmergencyEventServiceImpl.java

@@ -2,11 +2,14 @@ package com.elephant.framework.galaxy.aroad.module.emergencyevent.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.EmergencyEvent;
+import com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.Evendeal;
 import com.elephant.framework.galaxy.aroad.module.emergencyevent.mapper.EmergencyEventMapper;
 import com.elephant.framework.galaxy.aroad.module.emergencyevent.service.EmergencyEventService;
+import com.elephant.framework.galaxy.aroad.module.emergencyevent.service.EvendealService;
 import com.elephant.framework.galaxy.aroad.module.system.service.DeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 应急事件表
@@ -16,21 +19,36 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class EmergencyEventServiceImpl extends ServiceImpl<EmergencyEventMapper, EmergencyEvent> implements EmergencyEventService {
-
     @Autowired
     private DeptService deptService;
 
+    @Autowired
+    private EvendealService evendealService;
+
     /** 
     * @Description: 新增（上报）应急事件
     * @Param: [event] 
     * @return: boolean 
     * @Author: songwenjie 
     * @Date: 2019/5/8 
-    */ 
+    */
+    @Transactional
     public boolean saveEvent(EmergencyEvent event){
         int reportingDeptId = event.getReportingDeptId();
         String deptName = deptService.getDeptName(reportingDeptId);
         event.setReportingDept(deptName);
-        return save(event);
+        baseMapper.saveEvent(event);
+
+        Evendeal eventdeal = Evendeal.builder()
+                .eventId(event.getEventId())
+                .dealType(2)//"事件上报"
+                .dealContent(event.getEventDetail())
+                .dealTime(event.getReportingTime())
+                .userId(event.getReporterId())
+                .user(event.getReporter())
+                .deptId(event.getReportingDeptId())
+                .dept(event.getReportingDept())
+                .build();
+        return evendealService.save(eventdeal);
     }
 }

src/main/resources/mapper/emergencyevent/EmergencyEventMapper.xml

@@ -18,4 +18,13 @@
         <result property="reportingTime" column="reporting_time"/>
         <result property="status" column="status"/>
   </resultMap>
+
+  <insert id="saveEvent" useGeneratedKeys="true" keyProperty="eventId">
+    insert into
+      emergency_event(event_name, event_type,event_detail,influence,road,station_number,
+      reporting_dept,reporting_dept_id,reporter_id,reporting_time,status)
+    values
+      (#{eventName}, #{eventType},#{eventDetail},#{influence},#{road},#{stationNumber},
+      #{reportingDept},#{reportingDeptId},#{reporterId},#{reportingTime},#{status})
+  </insert>
 </mapper>