Merge remote-tracking branch 'origin/dev' into dev

db/event.sql

@@ -162,4 +162,14 @@ insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`,
     values ( '91000', null, 'event_down', '1', null, '1', '91001', '0', '2018-05-15 21:35:18', '0', '2018-07-29 13:38:59', '下达指令');
 -- 上报事件
 insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
-    values ( '91000', null, 'event_up', '1', null, '1', '91002', '0', '2018-05-15 21:35:18', '1', '2018-07-29 13:38:59', '上报事件');
+    values ( '91000', null, 'event_report', '1', null, '1', '91002', '0', '2018-05-15 21:35:18', '1', '2018-07-29 13:38:59', '上报事件');
+-- 事件反馈
+insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
+    values ( '91000', null, 'event_up', '1', null, '1', '91003', '0', '2018-05-15 21:35:18', '2', '2018-07-29 13:38:59', '事件反馈');
+
+-- 编辑
+insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
+    values ( '91000', null, 'event_update', '1', null, '1', '91004', '0', '2018-05-15 21:35:18', '2', '2018-07-29 13:38:59', '编辑');
+-- 删除
+insert into `sys_menu` ( `parent_id`, `component`, `permission`, `type`, `path`, `icon`, `menu_id`, `del_flag`, `create_time`, `sort`, `update_time`, `name`)
+    values ( '91000', null, 'event_delete', '1', null, '1', '91005', '0', '2018-05-15 21:35:18', '2', '2018-07-29 13:38:59', '删除');
\ No newline at end of file

db/init.sql

@@ -30,8 +30,10 @@ CREATE TABLE `sys_dept` (
   `del_flag` char(1) DEFAULT '0' COMMENT '是否删除  -1：已删除  0：正常',
   `parent_id` int(11) DEFAULT NULL,
   `tenant_id` int(11) DEFAULT NULL,
+  `type` varchar(10) DEFAULT '' COMMENT '类型：省厅|市局|省厅部门|市局部门',
   PRIMARY KEY (`dept_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='部门管理';
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='部门管理';
+
 
 -- ----------------------------
 -- Records of sys_dept

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

@@ -32,7 +32,7 @@ public class EmergencyEventController extends BaseController  {
    */
   @GetMapping("/page")
   public R getEmergencyEventPage(Page page, EmergencyEvent emergencyEvent) {
-    return  new R<>(emergencyEventService.page(page,Wrappers.query(emergencyEvent)));
+    return  new R<>(emergencyEventService.getEventPage(page,emergencyEvent));
   }
 
 

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

@@ -35,6 +35,16 @@ public class EvendealController extends BaseController  {
     return  new R<>(evendealService.page(page,Wrappers.query(evendeal)));
   }
 
+  /**
+   * 列表查询
+   * @param evendeal 事件处置表
+   * @return
+   */
+  @GetMapping("/list")
+  public R getEvendealList(Evendeal evendeal) {
+    return  new R<>(evendealService.list(Wrappers.query(evendeal)));
+  }
+
 
   /**
    * 通过id查询事件处置表
@@ -54,7 +64,7 @@ public class EvendealController extends BaseController  {
   @SysLog("新增事件处置表")
   @PostMapping
   public R save(@RequestBody Evendeal evendeal){
-    return new R<>(evendealService.save(evendeal));
+    return new R<>(evendealService.saveEventDeal(evendeal));
   }
 
   /**

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

@@ -4,10 +4,12 @@ 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 lombok.Data;
-import lombok.EqualsAndHashCode;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.*;
+
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 事件处置表
@@ -16,11 +18,13 @@ import java.time.LocalDateTime;
  * @date 2019-05-08 14:43:56
  */
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @TableName("event_deal")
 @EqualsAndHashCode(callSuper = true)
 public class Evendeal extends Model<Evendeal> {
 private static final long serialVersionUID = 1L;
-
   /**
    * 
    */
@@ -29,7 +33,7 @@ private static final long serialVersionUID = 1L;
   /**
    * 事件id
    */
-  private String eventId;
+  private Integer eventId;
   /**
    * 处置内容
    */
@@ -37,11 +41,12 @@ private static final long serialVersionUID = 1L;
   /**
    * 处置类型： 0：下达指令 1：处置反馈
    */
-  private Boolean dealType;
+  private Integer dealType;
   /**
    * 处置时间
    */
-  private LocalDateTime dealTime;
+  @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
+  private Date dealTime;
   /**
    * 处置人id
    */
@@ -50,5 +55,12 @@ private static final long serialVersionUID = 1L;
    * 处置人
    */
   private String user;
-
+  /**
+   * 处理部门id
+   */
+  private Integer deptId;
+  /**
+   * 处理部门
+   */
+  private String dept;
 }

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

 package com.elephant.framework.galaxy.aroad.module.emergencyevent.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.EmergencyEvent;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 应急事件表
@@ -11,4 +13,32 @@ import com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.Emergenc
  */
 public interface EmergencyEventMapper extends BaseMapper<EmergencyEvent> {
 
+    /** 
+    * @Description: 新增应急事件 
+    * @param: [event]
+    * @return: boolean 
+    * @Author: songwenjie
+    * @Date: 2019/5/15 
+    */ 
+    boolean saveEvent(EmergencyEvent event);
+
+
+    /** 
+    * @Description: 更新应急事件状态
+    * @param: [enevtId, status]
+    * @return: boolean 
+    * @Author: songwenjie
+    * @Date: 2019/5/15 
+    */ 
+    boolean updateStatus(@Param("eventId")Integer enevtId,@Param("status")String status);
+
+
+    /** 
+    * @Description: 分页获取应急事件
+    * @param: [page, repotingDept]
+    * @return: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.EmergencyEvent> 
+    * @Author: songwenjie
+    * @Date: 2019/5/15 
+    */ 
+    Page<EmergencyEvent> getEventPage (Page page,String reportingDept);
 }

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

 package com.elephant.framework.galaxy.aroad.module.emergencyevent.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.EmergencyEvent;
 
@@ -11,6 +12,15 @@ import com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.Emergenc
  */
 public interface EmergencyEventService extends IService<EmergencyEvent> {
 
+    /**
+     * @Description: 分页获取应急事件
+     * @param: [page, event]
+     * @return: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.EmergencyEvent>
+     * @Author: songwenjie
+     * @Date: 2019/5/15
+     */
+    Page<EmergencyEvent> getEventPage (Page page, EmergencyEvent event);
+
     /**
      * @Description: 新增（上报）应急事件
      * @Param: [event]
@@ -19,4 +29,13 @@ public interface EmergencyEventService extends IService<EmergencyEvent> {
      * @Date: 2019/5/8
      */
     boolean saveEvent(EmergencyEvent event);
+
+    /**
+     * @Description: 更新应急事件的状态
+     * @param:
+     * @return:
+     * @Author: songwenjie
+     * @Date: 2019/5/15
+     */
+    boolean updateStatus(Integer eventId,String status);
 }

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

@@ -11,4 +11,5 @@ import com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.Evendeal
  */
 public interface EvendealService extends IService<Evendeal> {
 
+    boolean saveEventDeal(Evendeal eventdeal);
 }

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

 package com.elephant.framework.galaxy.aroad.module.emergencyevent.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 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 com.sun.xml.internal.bind.v2.TODO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 应急事件表
@@ -16,10 +21,29 @@ 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: [page, event]
+   * @return: com.baomidou.mybatisplus.extension.plugins.pagination.Page<com.elephant.framework.galaxy.aroad.module.emergencyevent.entity.EmergencyEvent> 
+   * @Author: songwenjie
+   * @Date: 2019/5/15 
+   */ 
+    public Page<EmergencyEvent> getEventPage (Page page, EmergencyEvent event){
+        int reportingDeptId = event.getReportingDeptId();
+        boolean isProvince = deptService.isProvince(reportingDeptId);
+        if(isProvince){
+            return baseMapper.getEventPage(page,null);
+        }
+        String deptName = deptService.getDeptName(reportingDeptId);
+        return baseMapper.getEventPage(page,deptName);
+    }
+
     /** 
     * @Description: 新增（上报）应急事件
     * @Param: [event] 
@@ -27,10 +51,34 @@ public class EmergencyEventServiceImpl extends ServiceImpl<EmergencyEventMapper,
     * @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);
+    }
+
+    /** 
+    * @Description: 更新应急事件的状态
+    * @param: 
+    * @return:  
+    * @Author: songwenjie
+    * @Date: 2019/5/15 
+    */  
+    public boolean updateStatus(Integer eventId,String status){
+        return baseMapper.updateStatus(eventId,status);
     }
 }

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

@@ -3,8 +3,12 @@ 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.Evendeal;
 import com.elephant.framework.galaxy.aroad.module.emergencyevent.mapper.EvendealMapper;
+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;
 
 /**
  * 事件处置表
@@ -14,5 +18,33 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class EvendealServiceImpl extends ServiceImpl<EvendealMapper, Evendeal> implements EvendealService {
+    @Autowired
+    private DeptService deptService;
 
+    @Autowired
+    private EmergencyEventService emergencyEventService;
+
+    /** 
+    * @Description: 新增事件处理信息
+    * @param: [eventdeal]
+    * @return: boolean 
+    * @Author: songwenjie
+    * @Date: 2019/5/15 
+    */ 
+    @Transactional
+    public boolean saveEventDeal(Evendeal eventdeal){
+        int reportingDeptId = eventdeal.getDeptId();
+        String dept = deptService.getDeptName(reportingDeptId);
+        eventdeal.setDept(dept);
+
+        int dealType = eventdeal.getDealType();
+        if(dealType == 0){
+            emergencyEventService.updateStatus(eventdeal.getEventId(),"已下达");
+        }
+        if(dealType == 1){
+            emergencyEventService.updateStatus(eventdeal.getEventId(),"已反馈");
+        }
+
+        return save(eventdeal);
+    }
 }

src/main/java/com/elephant/framework/galaxy/aroad/module/system/service/DeptService.java

@@ -3,8 +3,10 @@ package com.elephant.framework.galaxy.aroad.module.system.service;
 import com.elephant.framework.galaxy.aroad.module.system.dto.DeptTree;
 import com.elephant.framework.galaxy.aroad.module.system.entity.Dept;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.cache.annotation.Cacheable;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -54,6 +56,7 @@ public interface DeptService extends IService<Dept> {
      */
     Boolean updateDeptById(Dept sysDept);
 
+
     /**
      * @Description: 根据部门id获取二级单位名称
      * @Param: [deptId]

src/main/java/com/elephant/framework/galaxy/aroad/module/system/service/impl/DeptServiceImpl.java

@@ -13,6 +13,8 @@ import com.elephant.framework.galaxy.aroad.util.TreeUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,9 +37,6 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
 
     private final DeptRelationService deptRelationService;
 
-    //部门映射 key:三级节点部门id  value:二级单位
-    private final Map<Integer,Dept> deptMap;
-
     /**
      * 添加信息部门
      *
@@ -187,6 +186,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
     * @Author: songwenjie 
     * @Date: 2019/5/8 
     */
+    @Cacheable(value = "deptName")
     public String getDeptName(int deptId){
         Dept dept = baseMapper.getDeptById(deptId)
                 .stream()

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

@@ -18,4 +18,25 @@
         <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>
+
+  <update id="updateStatus">
+     update emergency_event set status=#{status} where event_id=#{eventId}
+  </update>
+
+  <select id="getEventPage" resultMap="emergencyEventMap">
+    select * from emergency_event
+    <if test="reportingDept != null">
+        where reporting_dept = #{reportingDept}
+    </if>
+    order by reporting_time desc
+  </select>
 </mapper>