feat(emergency event): add permission control when event paged query

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/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;
 
@@ -12,8 +13,32 @@ import org.apache.ibatis.annotations.Param;
  */
 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]

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;
@@ -26,6 +27,23 @@ public class EmergencyEventServiceImpl extends ServiceImpl<EmergencyEventMapper,
     @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] 

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

@@ -25,7 +25,7 @@ public class EvendealServiceImpl extends ServiceImpl<EvendealMapper, Evendeal> i
     private EmergencyEventService emergencyEventService;
 
     /** 
-    * @Description: 新增事件处理信息 
+    * @Description: 新增事件处理信息
     * @param: [eventdeal]
     * @return: boolean 
     * @Author: songwenjie

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;
-
     /**
      * 添加信息部门
      *
@@ -155,7 +154,7 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
     * @return: java.util.Map<java.lang.Integer,com.elephant.framework.galaxy.aroad.module.system.entity.Dept> 
     * @Author: songwenjie 
     * @Date: 2019/5/8 
-    */ 
+    */
     private Map<Integer,Dept> getDeptMap(){
         //二级节点单位
         List<Dept> secondaryDepts = baseMapper.getDeptByParentId(1);
@@ -186,7 +185,8 @@ public class DeptServiceImpl extends ServiceImpl<DeptMapper, Dept> implements De
     * @return: java.lang.String 
     * @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

@@ -31,4 +31,12 @@
   <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>