事件列表查询当前组织下网格数据

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventListFormDTO.java

@@ -23,6 +23,10 @@ public class IcEventListFormDTO implements Serializable {
      */
     @NotBlank(message = "事件ID不能为空", groups = Detail.class)
     private String icEventId;
+    /**
+     * 所属组织
+     */
+    private String agencyId;
     /**
      * 所属网格
      */

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java

@@ -237,7 +237,9 @@ public class IcEventController {
      * @Description 事件管理-详情
      **/
     @PostMapping("detail")
-    public Result<IcEventListResultDTO> detail(@RequestBody IcEventListFormDTO formDTO) {
+    public Result<IcEventListResultDTO> detail(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) {
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
         ValidatorUtils.validateEntity(formDTO, IcEventListFormDTO.Detail.class);
         return new Result<IcEventListResultDTO>().ok(icEventService.detail(formDTO));
     }

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -95,6 +95,14 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
 
     @Override
     public PageData<IcEventListResultDTO> list(IcEventListFormDTO formDTO) {
+        //获取当前工作人员缓存信息
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+        if (null == staffInfo) {
+            throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getStaffId()));
+        }
+        formDTO.setAgencyId(staffInfo.getAgencyId());
+
+        //分页查询当前组织下网格内事件数据
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
         List<IcEventListResultDTO> list = baseDao.icEventList(formDTO);
         PageInfo<IcEventListResultDTO> pageInfo = new PageInfo<>(list);

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml

@@ -178,6 +178,9 @@
         <if test="gridId != null and gridId != '' ">
             AND ie.grid_id = #{gridId}
         </if>
+        <if test="agencyId != null and agencyId != '' ">
+            AND ie.agency_id = #{agencyId}
+        </if>
         <if test="sourceType != null and sourceType != '' ">
             AND ie.source_type = #{sourceType}
         </if>
@@ -199,7 +202,7 @@
         <if test="status != null and status != '' ">
             AND ie.`status` = #{status}
         </if>
-        order by ie.latest_operated_time desc
+        order by ie.created_time desc, ie.latest_operated_time desc
     </select>
 
     <select id="listEventsByPCategoryInOrg" resultType="com.epmet.dto.result.IcEventResultDTO">