Browse Source

修改事件统计参数

master
luyan 2 years ago
parent
commit
4055311830
  1. 5
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java
  2. 2
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java
  3. 2
      epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

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

@ -589,9 +589,8 @@ public class IcEventController {
*/ */
@GetMapping("getEventRate") @GetMapping("getEventRate")
public Result<EventRateResultDTO> getEventRate(@RequestParam("orgId") String orgId, public Result<EventRateResultDTO> getEventRate(@RequestParam("orgId") String orgId,
@RequestParam("orgType") String orgType, @RequestParam("orgType") String orgType) {
@RequestParam("eventType") String eventType) { return new Result<EventRateResultDTO>().ok(icEventService.getEventRate(orgId, orgType));
return new Result<EventRateResultDTO>().ok(icEventService.getEventRate(orgId, orgType, eventType));
} }
/** /**

2
epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java

@ -257,7 +257,7 @@ public interface IcEventService extends BaseService<IcEventEntity> {
* *
* @return * @return
*/ */
EventRateResultDTO getEventRate(String orgId, String orgType, String eventType); EventRateResultDTO getEventRate(String orgId, String orgType);
/** /**
* 事件分析数据获取 * 事件分析数据获取

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

@ -1925,7 +1925,7 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
} }
@Override @Override
public EventRateResultDTO getEventRate(String orgId, String orgType, String eventType) { public EventRateResultDTO getEventRate(String orgId, String orgType) {
EventRateResultDTO erDto = baseDao.getEventCount(getOrgPath(orgId, orgType));//事件总量和灯数量,占比 EventRateResultDTO erDto = baseDao.getEventCount(getOrgPath(orgId, orgType));//事件总量和灯数量,占比
List<Map<String, Integer>> dataMap = baseDao.getAnalysis(getOrgPath(orgId, orgType));//按分类获取数量 List<Map<String, Integer>> dataMap = baseDao.getAnalysis(getOrgPath(orgId, orgType));//按分类获取数量
Map<String, Integer> temp = new HashMap<>(); Map<String, Integer> temp = new HashMap<>();

Loading…
Cancel
Save