路况事件对接紧急事件

db/road_condition_event/road_condition_event.sql

@@ -23,8 +23,7 @@ SET FOREIGN_KEY_CHECKS = 0;
 DROP TABLE IF EXISTS `road_condition_event`;
 CREATE TABLE `road_condition_event`
 (
-    `id`            int(11) NOT NULL AUTO_INCREMENT,
-    `event_id`      varchar(30)  DEFAULT NULL COMMENT '事件id',
+    `event_id`      varchar(30) NOT NULL COMMENT '事件id',
     `road_code`     varchar(20)  DEFAULT NULL COMMENT '路线编码',
     `road_name`     varchar(20)  DEFAULT NULL COMMENT '路线名称',
     `maintain_unit` varchar(30)  DEFAULT NULL COMMENT '管养单位',
@@ -55,9 +54,8 @@ CREATE TABLE `road_condition_event`
     `latitude`      varchar(50)  DEFAULT NULL COMMENT '纬度',
     `current`       varchar(10)  DEFAULT NULL COMMENT '当前页',
     `size`          varchar(10)  DEFAULT NULL,
-    PRIMARY KEY (`id`) USING BTREE
+    PRIMARY KEY (`event_id`) USING BTREE
 ) ENGINE = InnoDB
-  AUTO_INCREMENT = 5987
   DEFAULT CHARSET = utf8mb4 COMMENT ='路况事件管理';
 
 SET FOREIGN_KEY_CHECKS = 1;

db/road_condition_event/路况-紧急事件对接表

+DROP TABLE IF EXISTS `roadcondition_unit`;
+CREATE TABLE `roadcondition_unit`
+(
+    `unit_id`   varchar(20) NOT NULL COMMENT '单位ID',
+    `unit_name` varchar(20) DEFAULT NULL COMMENT '单位名称',
+    PRIMARY KEY (`unit_id`) USING BTREE
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='路况管养单位表';
+
+DROP TABLE IF EXISTS `roadcondition_emergencyevent`;
+CREATE TABLE `roadcondition_emergencyevent`
+(
+    `dept_id` int(20) NOT NULL COMMENT '部门ID',
+    `unit_id` varchar(20) DEFAULT NULL COMMENT '单位ID'
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4 COMMENT ='路况事件_紧急事件对应权限表';
+
+DROP TABLE IF EXISTS `roadcondition_emergency`;
+CREATE TABLE `roadcondition_emergency` (
+                                           `event_id` varchar(30) NOT NULL,
+                                           `emergency_event_id` varchar(30) NOT NULL,
+                                           PRIMARY KEY (`event_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='路况事件_应急事件对应事件表';
\ No newline at end of file

db/road_condition_event/路况-紧急事件权限表

-DROP TABLE IF EXISTS `roadcondition_unit`;
-CREATE TABLE `roadcondition_unit` (
-                                      `unit_id` varchar(20) NOT NULL COMMENT '单位ID',
-                                      `unit_name` varchar(20) DEFAULT NULL COMMENT '单位名称',
-                                      PRIMARY KEY (`unit_id`) USING BTREE
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='路况管养单位表';
-
-DROP TABLE IF EXISTS `roadcondition_emergencyevent`;
-CREATE TABLE `roadcondition_emergencyevent` (
-                                                `dept_id` int(20) NOT NULL COMMENT '部门ID',
-                                                `unit_id` varchar(20) DEFAULT NULL COMMENT '单位ID'
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='路况事件_紧急事件对应权限表';

db/traffic/初始化菜单.sql

-INSERT INTO `sys_menu` VALUES (90000, '交通量分析', NULL, '/traffic', -1, NULL, '', 8, '0', '0', '2019-04-28 20:38:32', '2019-04-28 20:38:46', '0');
-INSERT INTO `sys_menu` VALUES (91000, '观测站点', NULL, '/spot', 90000, NULL, 'views/traffic/trafficspot/index', 1, '0', '0', '2019-04-28 20:44:03', '2019-04-28 20:44:22', '0');
-INSERT INTO `sys_menu` VALUES (92000, '路线交通量分析', NULL, '/trafficroute', 90000, NULL, 'views/traffic/trafficroute/index', 2, '0', '0', '2019-04-28 20:46:10', '2019-04-29 13:52:04', '0');
-INSERT INTO `sys_menu` VALUES (93000, '路段交通量分析', NULL, '/trafficroadsection', 90000, NULL, 'views/traffic/trafficroadsection/index', 3, '0', '0', '2019-04-28 20:47:18', '2019-04-29 13:52:07', '0');
+INSERT INTO `sys_menu` VALUES (100000, '交通量分析', NULL, '/traffic', -1, NULL, '', 10, '0', '0', '2019-04-28 20:38:32', '2019-04-28 20:38:46', '0');
+INSERT INTO `sys_menu` VALUES (101000, '观测站点', NULL, '/spot', 100000, NULL, 'views/traffic/trafficspot/index', 1, '0', '0', '2019-04-28 20:44:03', '2019-04-28 20:44:22', '0');
+INSERT INTO `sys_menu` VALUES (102000, '路线交通量分析', NULL, '/trafficroute', 100000, NULL, 'views/traffic/trafficroute/index', 2, '0', '0', '2019-04-28 20:46:10', '2019-04-29 13:52:04', '0');
+INSERT INTO `sys_menu` VALUES (103000, '路段交通量分析', NULL, '/trafficroadsection', 100000, NULL, 'views/traffic/trafficroadsection/index', 3, '0', '0', '2019-04-28 20:47:18', '2019-04-29 13:52:07', '0');

src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/controller/EmergencyEventController.java

 package com.elephant.framework.galaxy.aroad.module.emergencyevent.controller;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.elephant.framework.galaxy.aroad.module.emergencyevent.dto.EventStatusDto;
-import com.elephant.framework.galaxy.aroad.response.R;
 import com.elephant.framework.galaxy.aroad.module.common.annotation.SysLog;
+import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
+import com.elephant.framework.galaxy.aroad.module.emergencyevent.dto.EventStatusDto;
 import com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.EmergencyEvent;
 import com.elephant.framework.galaxy.aroad.module.emergencyevent.service.EmergencyEventService;
+import com.elephant.framework.galaxy.aroad.response.R;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
-import com.elephant.framework.galaxy.aroad.module.common.controller.BaseController;
 
 
 /**
@@ -58,6 +57,17 @@ public class EmergencyEventController extends BaseController  {
     return new R<>(emergencyEventService.saveEvent(emergencyEvent));
   }
 
+  /**
+   * 新增应急事件表(路况事件导入，返回ID)
+   * @param emergencyEvent 应急事件表
+   * @return R
+   */
+  @SysLog("新增应急事件表")
+  @PostMapping("/setemergency")
+  public R setEmergency(@RequestBody EmergencyEvent emergencyEvent){
+    return new R<>(emergencyEventService.joinEvent(emergencyEvent));
+  }
+
   /**
    * 修改应急事件表
    * @param emergencyEvent 应急事件表
@@ -81,12 +91,12 @@ public class EmergencyEventController extends BaseController  {
   }
 
 
- /** 
+ /**
  * @Description: 更新评估总结文档信息
  * @param: [event]
- * @return: com.elephant.framework.galaxy.aroad.response.R 
+ * @return: com.elephant.framework.galaxy.aroad.response.R
  * @Author: songwenjie
- * @Date: 2019/5/16 
+ * @Date: 2019/5/16
  */
   @PutMapping("/updateFile")
   public R updateFile(@RequestBody EmergencyEvent event){

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

@@ -8,8 +8,7 @@ import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.io.Serializable;
-import java.time.LocalDateTime;
+
 import java.util.Date;
 
 /**
@@ -73,7 +72,7 @@ private static final long serialVersionUID = 1L;
   /**
    * 上报时间
    */
-  @JsonFormat(timezone = "GMT+8")
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
   private Date reportingTime;
   /**
    * 状态

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/controller/RoadConditionEventController.java

@@ -44,12 +44,11 @@ public class RoadConditionEventController extends BaseController {
    */
   @PostMapping("/page")
   public R getRoadConditionEventPage(
-      Page page, @RequestBody RoadConditionEvent roadConditionEvent,String units) {
+      Page page, @RequestBody RoadConditionEvent roadConditionEvent) {
     //        log.error("接收实体：{}", roadConditionEvent);
     page.setCurrent(roadConditionEvent.getCurrent());
     page.setSize(roadConditionEvent.getSize());
-    units = "";
-    return new R<>(roadConditionEventService.getRoadConditionEventPage(page, roadConditionEvent,units));
+    return new R<>(roadConditionEventService.getRoadConditionEventPage(page, roadConditionEvent));
   }
 
   @GetMapping("/unitTree")
@@ -167,12 +166,12 @@ public class RoadConditionEventController extends BaseController {
    * @return R
    */
   @GetMapping("/coordinates/{deptId}")
-  public R getCoordinates(@PathVariable("deptId")String deptId) {
+  public R getCoordinates(@PathVariable("deptId") String deptId) {
     return new R<>(roadConditionEventService.getCoordinates(deptId));
   }
 
   @GetMapping("/getunitbydept/{deptId}")
-  public R getUnitByDept(@PathVariable("deptId")String deptId){
+  public R getUnitByDept(@PathVariable("deptId") String deptId) {
     return new R<>(roadConditionEventService.getUnitByDept(deptId));
   }
 
@@ -205,19 +204,41 @@ public class RoadConditionEventController extends BaseController {
    */
   @GetMapping("/saveunitwithdept/{params}")
   public R saveUnitWithDept(@PathVariable("params") String params) {
-    return new R<> (roadConditionEventService.saveUnitWithDept(params));
+    return new R<>(roadConditionEventService.saveUnitWithDept(params));
+  }
+
+  /**
+   * @description : 部门和管理单位权限管理
+   * @author : Xingyuyang
+   * @date : 2019/5/21 0021 11:28
+   * @param params :
+   * @return : com.elephant.framework.galaxy.aroad.response.R
+   */
+  @GetMapping("/saveemergencyunit/{params}")
+  public R saveEmergencyUnit(@PathVariable("params") String params) {
+    return new R<>(roadConditionEventService.saveEmergencyUnit(params));
+  }
+
+  @DeleteMapping("/deleteemergencyunit/{eventId}")
+  public R deleteEmergencyUnit(@PathVariable("eventId") String eventId) {
+    return new R<>(roadConditionEventService.deleteEmergencyUnit(eventId));
+  }
+
+  @DeleteMapping("/deleteemergencyevent/{eventId}")
+  public R deleteEmergencyEvent(@PathVariable("eventId")  String eventId) {
+    return new R<>(roadConditionEventService.deleteEmergencyEvent(eventId));
   }
 
   /**
    * 通过id查询路况事件统计
    *
-   * @param id id
+   * @param eventId eventId
    * @return R
    */
-  @GetMapping("/{id}")
-  public R getById(@PathVariable("id") Integer id) {
+  @GetMapping("/{eventId}")
+  public R getById(@PathVariable("eventId") String eventId) {
     //    Integer idi = Integer.parseInt(id);
-    return new R<>(roadConditionEventService.getById(id));
+    return new R<>(roadConditionEventService.getById(eventId));
   }
 
   /**
@@ -247,13 +268,13 @@ public class RoadConditionEventController extends BaseController {
   /**
    * 通过id删除路况事件统计
    *
-   * @param id id
+   * @param eventId eventId
    * @return R
    */
   @SysLog("删除路况事件统计")
   @DeleteMapping("/{id}")
-  public R removeById(@PathVariable Integer id) {
-    return new R<>(roadConditionEventService.removeById(id));
+  public R removeById(@PathVariable String eventId) {
+    return new R<>(roadConditionEventService.removeById(eventId));
   }
 
   /**

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/dto/CoordinateDto.java

@@ -19,7 +19,7 @@ import java.io.Serializable;
 @AllArgsConstructor
 public class CoordinateDto implements Serializable {
   /** 主键 */
-  private int id;
+  private String eventId;
   /** 事件标题 */
   private String eventTitle;
   /** 事件类型 */

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/dto/EmergencyUnitDto.java

+package com.elephant.framework.galaxy.aroad.module.roadcondition.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @program:
+ * @description: 坐标类
+ * @author: songwenjie
+ * @create: 2019-04-02 10:55
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class EmergencyUnitDto implements Serializable {
+  /** 单位ID */
+  private String eventId;
+  /** 部门ID */
+  private String emergencyEventId;
+}

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/entity/RoadConditionEvent.java

 package com.elephant.framework.galaxy.aroad.module.roadcondition.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-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;
@@ -25,10 +23,6 @@ import java.util.Date;
 public class RoadConditionEvent extends Model<RoadConditionEvent> {
   private static final long serialVersionUID = 1L;
 
-  /** */
-  @TableId(type = IdType.AUTO)
-  private Integer id;
-
   @ApiModelProperty(value = "事件ID", name = "eventId")
   private String eventId;
   /** 路线编码 */
@@ -128,4 +122,7 @@ public class RoadConditionEvent extends Model<RoadConditionEvent> {
   /** 部门ID */
   @ApiModelProperty(value = "部门ID", name = "deptId")
   private String deptId;
+
+  /** 应急事件数量(0-否 1-是) **/
+  private String count;
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/mapper/RoadConditionEventMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elephant.framework.galaxy.aroad.module.roadcondition.dto.*;
 import com.elephant.framework.galaxy.aroad.module.roadcondition.entity.RoadConditionEvent;
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -16,7 +18,7 @@ import java.util.List;
  */
 public interface RoadConditionEventMapper extends BaseMapper<RoadConditionEvent> {
   IPage<RoadConditionEvent> getRoadConditionEventPage(
-      IPage<RoadConditionEvent> page, RoadConditionEvent roadConditionEvent,@Param("units")String units);
+      IPage<RoadConditionEvent> page, RoadConditionEvent roadConditionEvent,@Param("units")List units);
 
   List<SaveUnitDto> getUnitTree();
 
@@ -34,7 +36,7 @@ public interface RoadConditionEventMapper extends BaseMapper<RoadConditionEvent>
 
   List<DeptUnitDto> getUnitByDept(@Param("deptId") String deptId);
 
-  List<CoordinateDto> getCoordinates(@Param("units") String units);
+  List<CoordinateDto> getCoordinates(@Param("units") List units);
 
   List<CoordinateDto> getTQCoordinates();
 
@@ -54,13 +56,19 @@ public interface RoadConditionEventMapper extends BaseMapper<RoadConditionEvent>
    */
   List<CityNameDto> getTree();
 
-  RoadConditionEvent getById(@Param("id") Integer id);
+  RoadConditionEvent getById(@Param("eventId") String eventId);
 
-  boolean saveUnitWithDept(
-      @Param("deptId") String deptId, @Param("unit") String unit);
+  @Insert("insert into roadcondition_emergencyevent (dept_id, unit_id) values (#{deptId},#{unit})")
+  boolean saveUnitWithDept(@Param("deptId") String deptId, @Param("unit") String unit);
 
+  @Delete("delete from roadcondition_emergencyevent where dept_id=#{deptId}")
   boolean deleteUnitByDept(@Param("deptId") String deptId);
 
+  @Insert("INSERT INTO roadcondition_emergency ( event_id, emergency_event_id )\n"
+          + "\t\tvalues (#{eventId},#{emergencyEventId})")
+  boolean saveEmergencyUnit(
+      @Param("eventId") String eventId, @Param("emergencyEventId") String emergencyEventId);
+
   /**
    * 查询数据库是否存在该实体
    *
@@ -85,7 +93,20 @@ public interface RoadConditionEventMapper extends BaseMapper<RoadConditionEvent>
    */
   Integer deleteBatchByEvent(RoadConditionEvent event);
 
+  @Insert("\t\tINSERT INTO roadcondition_unit ( unit_id, unit_name )\n"
+          + "\t\tSELECT start_unit_no, maintain_unit FROM road_condition_event\n"
+          + "\t\tGROUP BY start_unit_no, maintain_unit")
   boolean saveUnit();
 
+  @Delete("delete from emergency_event where event_id=(select emergency_event_id from roadcondition_emergency where event_id=#{eventId})")
+  boolean deleteEmergencyEvent(@Param("eventId")String eventId);
+
+  @Delete("delete from roadcondition_emergency where event_id=#{eventId}")
+  boolean deleteEmergencyUnit(@Param("eventId")String eventId);
+
+  @Delete("delete from roadcondition_unit;")
   boolean deleteUnit();
+
+  @Delete("delete from road_condition_event")
+  boolean deleteEvent();
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/service/RoadConditionEventService.java

@@ -76,7 +76,7 @@ public interface RoadConditionEventService extends IService<RoadConditionEvent>
       String yccd);
 
   IPage<RoadConditionEvent> getRoadConditionEventPage(
-      Page<RoadConditionEvent> page, RoadConditionEvent roadConditionEvent,String units);
+      Page<RoadConditionEvent> page, RoadConditionEvent roadConditionEvent);
 
   List<SaveUnitDto> getUnitTree();
 
@@ -148,9 +148,15 @@ public interface RoadConditionEventService extends IService<RoadConditionEvent>
    */
   BaseTreeDto getTree();
 
+  boolean deleteEmergencyEvent(String eventId);
+
+  boolean deleteEmergencyUnit(String eventId);
+
+  boolean saveEmergencyUnit(String params);
+
   boolean saveUnitWithDept(String params);
 
-  RoadConditionEvent getById(Integer id);
+  RoadConditionEvent getById(String eventId);
 
   List<CoordinateDto> getYHCoordinates();
 
@@ -167,4 +173,6 @@ public interface RoadConditionEventService extends IService<RoadConditionEvent>
   boolean saveUnit();
 
   boolean deleteUnit();
+
+  boolean deleteEvent();
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/service/impl/GetRoadPlatformImpl.java

@@ -41,42 +41,35 @@ public class GetRoadPlatformImpl implements GetRoadPlatformService {
       Map mapTypes = JSON.parseObject(res);
       if(mapTypes!=null){
         roadConditionEventService.deleteUnit();
+        roadConditionEventService.deleteEvent();
       }
       for (Object obj : mapTypes.keySet()) {
         JSONArray ojb = (JSONArray) mapTypes.get("ROADINFO");
         Object[] array = ojb.toArray();
         for (Object o : array) {
           SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-          Integer rowNum = null;
-          rowNum =
-              roadConditionEventService.getRoadMaintainEventByRoadPlatform(
-                  //                  ((JSONObject) o).get("infid").toString(),
-                  ((JSONObject) o).get("inftypename").toString(),
-                  ((JSONObject) o).get("inftitle").toString(),
-                  ((JSONObject) o).get("infcontent").toString(),
-                  ((JSONObject) o).get("infwrinter").toString(),
-                  formatter.parse(((JSONObject) o).get("writerdate").toString()),
-                  ((JSONObject) o).get("infchecker").toString(),
-                  formatter.parse(((JSONObject) o).get("checkdate").toString()),
-                   formatter.parse(((JSONObject)o).get("removedate").toString().equals("null")?"1900-01-01 00:00:00":((JSONObject) o).get("removedate").toString()),
-//                  ((JSONObject) o).get("remark").toString(),
-                  ((JSONObject) o).get("glno").toString(),
-                  ((JSONObject) o).get("writerno").toString(),
-                  ((JSONObject) o).get("loctx").toString(),
-                  ((JSONObject) o).get("locty").toString(),
-                  ((JSONObject) o).get("zhuanghao").toString(),
-                  ((JSONObject) o).get("daolu").toString(),
-                  // ((JSONObject) o).get("removereson").toString(),
-                  //                  ((JSONObject) o).get("departname").toString(),
-                  //                  ((JSONObject) o).get("removedepart").toString(),
-                  //                  formatter.parse(((JSONObject) o).get("expdate").toString()),
-                  //                  ((JSONObject) o).get("impact").toString(),
-                  //                  ((JSONObject) o).get("zhfrom").toString(),
-                  //                  ((JSONObject) o).get("zhto").toString(),
-                  ((JSONObject) o).get("yccd").toString());
-          if (rowNum > 0) {
-            continue;
-          } else {
+//          Integer rowNum = null;
+//          rowNum =
+//              roadConditionEventService.getRoadMaintainEventByRoadPlatform(
+//                  //                  ((JSONObject) o).get("infid").toString(),
+//                  ((JSONObject) o).get("inftypename").toString(),
+//                  ((JSONObject) o).get("inftitle").toString(),
+//                  ((JSONObject) o).get("infcontent").toString(),
+//                  ((JSONObject) o).get("infwrinter").toString(),
+//                  formatter.parse(((JSONObject) o).get("writerdate").toString()),
+//                  ((JSONObject) o).get("infchecker").toString(),
+//                  formatter.parse(((JSONObject) o).get("checkdate").toString()),
+//                   formatter.parse(((JSONObject)o).get("removedate").toString().equals("null")?"1900-01-01 00:00:00":((JSONObject) o).get("removedate").toString()),
+//                  ((JSONObject) o).get("glno").toString(),
+//                  ((JSONObject) o).get("writerno").toString(),
+//                  ((JSONObject) o).get("loctx").toString(),
+//                  ((JSONObject) o).get("locty").toString(),
+//                  ((JSONObject) o).get("zhuanghao").toString(),
+//                  ((JSONObject) o).get("daolu").toString(),
+//                  ((JSONObject) o).get("yccd").toString());
+//          if (rowNum > 0) {
+//            continue;
+//          } else {
             roadConditionEventService.save(
                 RoadConditionEvent.builder()
                     .eventId(((JSONObject) o).get("infid").toString())
@@ -109,7 +102,7 @@ public class GetRoadPlatformImpl implements GetRoadPlatformService {
                         .endBz("")
                         .endPerson("")
                     .build());
-          }
+//          }
         }
       }
       if(mapTypes!=null){

src/main/java/com/elephant/framework/galaxy/aroad/module/roadcondition/service/impl/RoadConditionEventServiceImpl.java

@@ -39,7 +39,7 @@ public class RoadConditionEventServiceImpl
    */
   public Integer getRoadMaintainEventByEventID(String eventID) {
     return roadConditionEventMapper.selectCount(
-        Wrappers.<RoadConditionEvent>query().lambda().eq(RoadConditionEvent::getId, eventID));
+        Wrappers.<RoadConditionEvent>query().lambda().eq(RoadConditionEvent::getEventId, eventID));
   }
 
   /**
@@ -120,8 +120,30 @@ public class RoadConditionEventServiceImpl
             .eq(RoadConditionEvent::getCarsLength, yccd));
   }
 
-  public RoadConditionEvent getById(@Param("id") Integer id) {
-    return baseMapper.getById(id);
+  public RoadConditionEvent getById(@Param("eventId") String eventId) {
+    return baseMapper.getById(eventId);
+  }
+
+  public boolean deleteEmergencyEvent(@Param("eventId")String eventId){
+    return baseMapper.deleteEmergencyEvent(eventId);
+  }
+
+  public boolean deleteEmergencyUnit(@Param("eventId")String eventId){
+    boolean eFlag = baseMapper.deleteEmergencyEvent(eventId);
+    boolean uFlag = baseMapper.deleteEmergencyUnit(eventId);
+    return eFlag&&uFlag;
+//    try{
+//
+//    }catch (RuntimeException r){
+//      throw r;
+//    }
+  }
+
+  public boolean saveEmergencyUnit(@Param("params") String params){
+    String[] arr = params.split(",");
+    String eventId = arr[0];
+    String emergencyEventId = arr[1];
+    return baseMapper.saveEmergencyUnit(eventId,emergencyEventId);
   }
 
   public boolean saveUnitWithDept(@Param("params") String params) {
@@ -143,13 +165,13 @@ public class RoadConditionEventServiceImpl
   }
 
   public IPage<RoadConditionEvent> getRoadConditionEventPage(
-      Page<RoadConditionEvent> page, RoadConditionEvent roadConditionEvent,String units) {
+      Page<RoadConditionEvent> page, RoadConditionEvent roadConditionEvent) {
     List<DeptUnitDto> unitList = baseMapper.getUnitByDept(roadConditionEvent.getDeptId());
+    List<String> units = new ArrayList<>();
     if (unitList.size() > 0) {
       for (int i = 0; i < unitList.size(); i++) {
-        units += ",'" + unitList.get(i).getUnitId() + "'";
+        units.add(unitList.get(i).getUnitId());
       }
-      units = units.substring(1, units.length());
     }
     return baseMapper.getRoadConditionEventPage(page, roadConditionEvent,units);
   }
@@ -228,12 +250,11 @@ public class RoadConditionEventServiceImpl
   //  @Cacheable(value = "roadConditionCoordinates")
   public List<CoordinateDto> getCoordinates(@Param("deptId") String deptId) {
     List<DeptUnitDto> unitList = baseMapper.getUnitByDept(deptId);
-    String units = "";
+    List<String> units = new ArrayList<>();
     if (unitList.size() > 0) {
       for (int i = 0; i < unitList.size(); i++) {
-        units += ",'" + unitList.get(i).getUnitId() + "'";
+        units.add(unitList.get(i).getUnitId());
       }
-      units = units.substring(1, units.length());
     }
     return baseMapper.getCoordinates(units);
   }
@@ -266,6 +287,10 @@ public class RoadConditionEventServiceImpl
     return baseMapper.deleteUnit();
   }
 
+  public boolean deleteEvent(){
+    return baseMapper.deleteEvent();
+  }
+
   /**
    * @description : 根据城市查询
    * @author : Xingyuyang

src/main/resources/mapper/roadcondition/RoadConditionEventMapper.xml

@@ -6,7 +6,6 @@
 
 	<resultMap id="roadConditionEventMap"
 	           type="com.elephant.framework.galaxy.aroad.module.roadcondition.entity.RoadConditionEvent">
-		<id property="id" column="id"/>
 		<result property="eventId" column="event_id"/>
 		<result property="roadCode" column="road_code"/>
 		<result property="roadName" column="road_name"/>
@@ -38,6 +37,7 @@
 		<result property="latitude" column="latitude"/>
 		<result property="current" column="current"/>
 		<result property="size" column="size"/>
+		<result property="count" column="count"/>
 	</resultMap>
 
 	<resultMap id="staticByEventTypeMap"
@@ -85,7 +85,7 @@
 
 	<resultMap id="CoordinateDtoMap"
 	           type="com.elephant.framework.galaxy.aroad.module.roadcondition.dto.CoordinateDto">
-		<id column="id" property="id"/>
+		<result property="eventId" column="event_id"/>
 		<result property="eventType" column="event_type"/>
 		<result property="eventTitle" column="event_title"/>
 		<result column="longitude" property="longitude"/>
@@ -104,39 +104,56 @@
 		<result property="deptId" column="dept_id"/>
 	</resultMap>
 
+	<resultMap id="EmergencyUnitMap"
+	           type="com.elephant.framework.galaxy.aroad.module.roadcondition.dto.EmergencyUnitDto">
+		<result property="eventId" column="event_id"/>
+		<result property="emergencyEventId" column="emergency_event_id"/>
+	</resultMap>
+
+	<!--	<insert id="saveEmergencyUnit">-->
+	<!--		INSERT INTO roadcondition_emergency ( event_id, emergency_event_id )-->
+	<!--		values (#{eventId},#{emergencyEventId})-->
+	<!--	</insert>-->
+
 	<select id="getUnitTree" resultMap="SaveUnitMap">
-		select  * from roadcondition_unit
+		select *
+		from roadcondition_unit
 	</select>
 
-	<delete id="deleteUnit">
-		delete from roadcondition_unit;
-	</delete>
-	<insert id="saveUnit">
-		INSERT INTO roadcondition_unit ( unit_id, unit_name )
-		SELECT start_unit_no, maintain_unit FROM road_condition_event
-		GROUP BY start_unit_no, maintain_unit
-	</insert>
+	<!--	<insert id="saveUnit">-->
+	<!--		INSERT INTO roadcondition_unit ( unit_id, unit_name )-->
+	<!--		SELECT start_unit_no, maintain_unit FROM road_condition_event-->
+	<!--		GROUP BY start_unit_no, maintain_unit-->
+	<!--	</insert>-->
 
-	<delete id="deleteUnitByDept">
-		delete from roadcondition_emergencyevent where dept_id=#{deptId}
-	</delete>
+	<!--	<delete id="deleteUnitByDept">-->
+	<!--		delete from roadcondition_emergencyevent where dept_id=#{deptId}-->
+	<!--	</delete>-->
 
-	<insert id="saveUnitWithDept">
-		insert into roadcondition_emergencyevent (dept_id, unit_id) values (#{deptId},#{unit})
-	</insert>
+	<!--	<insert id="saveUnitWithDept">-->
+	<!--		insert into roadcondition_emergencyevent (dept_id, unit_id) values (#{deptId},#{unit})-->
+	<!--	</insert>-->
 
 	<select id="getRoadConditionEventPage" resultMap="roadConditionEventMap"
 	        parameterType="com.elephant.framework.galaxy.aroad.module.roadcondition.entity.RoadConditionEvent">
-		SELECT
-		*
-		FROM road_condition_event
+		SELECT rce.*,count(re.event_id) as count
+		FROM `road_condition_event` rce left join `roadcondition_emergency` re
+		on (rce.event_id = re.event_id)
 		<where>
-			<if test="roadConditionEvent.startUnit != null">maintain_unit like CONCAT('%',#{roadConditionEvent.startUnit},'%') and</if>
-			<if test="roadConditionEvent.eventType != null">event_type like concat('%',#{roadConditionEvent.eventType},'%') and</if>
+			<if test="roadConditionEvent.startUnit != null">maintain_unit like
+				CONCAT('%',#{roadConditionEvent.startUnit},'%') and
+			</if>
+			<if test="roadConditionEvent.eventType != null">event_type like
+				concat('%',#{roadConditionEvent.eventType},'%') and
+			</if>
 			<if test="roadConditionEvent.influence != null">influence = #{roadConditionEvent.influence} and</if>
 			<if test="roadConditionEvent.startTime != null">start_time &gt; #{roadConditionEvent.startTime} and</if>
 			<if test="roadConditionEvent.endTime != null">end_time &lt; #{roadConditionEvent.endTime} and</if>
-			start_unit_no in (#{units})
+			start_unit_no in
+			<foreach item="item" collection="units" separator="," open="(" close=")" index="">
+				#{item}
+			</foreach>
+			group by event_id
 		</where>
 	</select>
 
@@ -148,7 +165,7 @@
 	<select id="getById" resultMap="roadConditionEventMap">
 		SELECT *
 		FROM road_condition_event
-		where id = #{id}
+		where event_id = #{eventId}
 	</select>
 
 	<select id="staticByEventType" resultMap="staticByEventTypeMap">
@@ -184,19 +201,16 @@
 	</select>
 
 	<select id="staticByCity" resultMap="staticByCityMap">
-		SELECT
-			count( * ) AS count,
+		SELECT count(*)                              AS count,
 # 			maintain_unit,
-			SUBSTRING( maintain_unit FROM 1 FOR 2 ) as city
-		FROM
-			road_condition_event
-		where SUBSTRING( maintain_unit FROM 1 FOR 2 )!='山东'
-		GROUP BY
-			maintain_unit
+               SUBSTRING(maintain_unit FROM 1 FOR 2) as city
+		FROM road_condition_event
+		where SUBSTRING(maintain_unit FROM 1 FOR 2) != '山东'
+		GROUP BY maintain_unit
 	</select>
 
 	<select id="staticByYHCity" resultMap="staticByYHCityMap">
-		SELECT count(*)   as count,
+		SELECT count(*)      as count,
 		       maintain_unit as startunit
 		FROM road_condition_event
 		WHERE event_type = '养护施工信息'
@@ -214,51 +228,49 @@
 	</select>
 
 	<select id="getUnitByDept" resultMap="DeptUnitMap">
-		select unit_id from roadcondition_emergencyevent
+		select unit_id
+		from roadcondition_emergencyevent
 		where dept_id = #{deptId}
 	</select>
 
-	<select id="getCoordinates" resultMap="CoordinateDtoMap">
-		select id, longitude, latitude, event_type,event_title
+	<select id="getCoordinates" resultMap="CoordinateDtoMap" parameterType="list">
+		select event_id, longitude, latitude, event_type,event_title
 		from `road_condition_event`
-		where start_unit_no in (#{units});
+		where start_unit_no in
+		<foreach item="item" collection="units" separator="," open="(" close=")" index="">
+			#{item}
+		</foreach>
 	</select>
 
 	<select id="getTQCoordinates" resultMap="CoordinateDtoMap">
-		select id, longitude, latitude, event_type,event_title
+		select event_id, longitude, latitude, event_type, event_title
 		from `road_condition_event`
 		where event_title = '异常天气';
 	</select>
 
 	<select id="getYHCoordinates" resultMap="roadConditionEventMap">
-		select id, longitude, latitude, event_type,event_title
+		select event_id, longitude, latitude, event_type, event_title
 		from `road_condition_event`
 		where event_title = '养护施工';
 	</select>
 
 	<select id="getTFCoordinates" resultMap="CoordinateDtoMap">
-		select id, longitude, latitude, event_type,event_title
+		select event_id, longitude, latitude, event_type, event_title
 		from `road_condition_event`
 		where event_title = '突发事件';
 	</select>
 
 	<select id="getSFZCoordinates" resultMap="CoordinateDtoMap">
-		select id, longitude, latitude, event_type,event_title
+		select event_id, longitude, latitude, event_type, event_title
 		from `road_condition_event`
 		where event_title = '收费站异常';
 	</select>
 
 	<select id="selectRoadMaintainEvent"
-	        parameterType="com.elephant.framework.galaxy.aroad.module.roadcondition.entity.RoadConditionEvent" resultMap="roadConditionEventMap">
+	        parameterType="com.elephant.framework.galaxy.aroad.module.roadcondition.entity.RoadConditionEvent"
+	        resultMap="roadConditionEventMap">
 		SELECT * FROM road_condition_event
 		WHERE
-		<if test="id != null">
-			id = #{id} AND
-		</if>
-		<if test="id == null">
-			ISNULL(id) AND
-		</if>
-
 		<if test="eventId != null">
 			event_id = #{eventId} AND
 		</if>
@@ -463,9 +475,9 @@
 		</if>
 	</select>
 
-	<update id="updateBatchByEventId"  parameterType="java.util.List">
-		UPDATE  road_condition_event
-		WHERE  event_id IN
+	<update id="updateBatchByEventId" parameterType="java.util.List">
+		UPDATE road_condition_event
+		WHERE event_id IN
 		<foreach collection="eventIdList" item="id" open="(" separator="," close=")">
 			#{id}
 		</foreach>
@@ -473,14 +485,8 @@
 
 	<update id="deleteBatchByEvent"
 	        parameterType="com.elephant.framework.galaxy.aroad.module.roadcondition.entity.RoadConditionEvent">
-		UPDATE  road_condition_event
+		UPDATE road_condition_event
 		WHERE
-		<if test="id != null">
-			id = #{id} AND
-		</if>
-		<if test="id == null">
-			ISNULL(id) AND
-		</if>
 
 		<if test="eventId != null">
 			event_id = #{eventId} AND