http

mybusiness/src/main/java/com/business/slfh/app/event/service/AppEventService.java

@@ -5,6 +5,8 @@ import com.business.slfh.app.event.domain.AppEventQueryVo;
 import com.business.slfh.app.event.domain.AppEventVo;
 import com.business.slfh.manager.firemanager.domain.TUEventFire;
 
+import java.util.List;
+
 public interface AppEventService {
 
     public AppDataModel queryAppEventList(AppEventQueryVo appEventQueryVo);
@@ -23,4 +25,6 @@ public interface AppEventService {
 
     public AppDataModel getEventCount();
 
+    public List queryAllEventList(AppEventQueryVo appEventQueryVo);
+
 }

mybusiness/src/main/java/com/business/slfh/app/event/service/impl/AppEventServiceImpl.java

@@ -116,6 +116,13 @@ public class AppEventServiceImpl extends AppBaseService implements AppEventServi
     }
 
     @Override
+    @DataScope(deptAlias = "s")
+    public List queryAllEventList(AppEventQueryVo appEventQueryVo){
+        List list = appEventMapper.queryAllEventList(appEventQueryVo);
+        return list;
+    }
+
+    @Override
     public AppDataModel queryEventDetail(TUEventFire tuEventFire) {
         AppDataModel appDataModel = getAppDataModel();
         try {

mybusiness/src/main/java/com/business/slfh/app/mainpage/domain/MainPageVO.java

@@ -1,11 +1,12 @@
 package com.business.slfh.app.mainpage.domain;
 
+import com.sooka.common.core.domain.BaseEntity;
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 @Setter
-public class MainPageVO {
+public class MainPageVO extends BaseEntity {
 
 
     Long userId;

mybusiness/src/main/java/com/business/slfh/app/mainpage/service/impl/AppMainPageServiceImpl.java

@@ -5,6 +5,7 @@ import com.business.slfh.app.appbase.service.AppBaseService;
 import com.business.slfh.app.camera.domain.AppTResCamera;
 import com.business.slfh.app.event.domain.AppEventQueryVo;
 import com.business.slfh.app.event.mapper.AppEventMapper;
+import com.business.slfh.app.event.service.AppEventService;
 import com.business.slfh.app.mainpage.domain.MainPageVO;
 import com.business.slfh.app.mainpage.mapper.AppMainPageMapper;
 import com.business.slfh.app.mainpage.service.AppMainPageService;
@@ -45,6 +46,8 @@ import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 @Service
 public class AppMainPageServiceImpl extends AppBaseService implements AppMainPageService {
@@ -54,7 +57,7 @@ public class AppMainPageServiceImpl extends AppBaseService implements AppMainPag
 
 
     @Resource
-    AppEventMapper appEventMapper;
+    AppEventService appEventService;
     @Resource
     TUEventFireMapper tuEventFireMapper;
 
@@ -136,7 +139,7 @@ public class AppMainPageServiceImpl extends AppBaseService implements AppMainPag
             AppEventQueryVo appEventQueryVo =new AppEventQueryVo();
             appEventQueryVo.setUserId(mainPageVO.getUserId());
             appEventQueryVo.setDepts(depts);
-            List ls = appEventMapper.queryAllEventList(appEventQueryVo);
+            List ls = appEventService.queryAllEventList(appEventQueryVo);
             appDataModel.data.put("eventlist",ls);
 
             BigData_Inspection_TodayWindPower today_info = bigData_Inspection_Mapper.selectTodayWindPower();