[add]merge

signal-optimize-service/src/main/java/net/wanji/opt/controller/EventController.java

@@ -4,13 +4,15 @@ import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import net.wanji.common.framework.exception.DubboProviderException;
 import net.wanji.common.framework.rest.JsonViewObject;
+import net.wanji.databus.dto.EventInfoTrafficStatusDTO;
+import net.wanji.databus.vo.EventInfoTrafficStatusVO;
+import net.wanji.opt.entity.EventAlarmInfo;
 import net.wanji.opt.po.base.EventStatisticPo;
 import net.wanji.opt.service.EventService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.validation.Valid;
 import java.util.List;
 import java.util.Map;
 

signal-optimize-service/src/main/java/net/wanji/opt/dao/mapper/HoloEventMapper.java

 package net.wanji.opt.dao.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import net.wanji.databus.dto.EventInfoTrafficStatusDTO;
+import net.wanji.databus.po.EventInfoTrafficStatusPO;
+import net.wanji.opt.entity.EventAlarmInfo;
 import net.wanji.opt.po.base.EventStatisticPo;
 import net.wanji.opt.po.trend.EventInfoSimplePo;
 import net.wanji.opt.po.trend.HoloEventInfoPO;
@@ -31,6 +34,6 @@ public interface HoloEventMapper extends BaseMapper<HoloEventInfoPO> {
 
     List<EventInfoTrafficStatusPO> trafficStatus(EventInfoTrafficStatusDTO eventInfoTrafficStatusDTO);
 
-    List<EventAlarmInfo> findEventAlarmInfo(String realtimeType,String eventType,String name);
+    List<EventAlarmInfo> findEventAlarmInfo(String realtimeType, String eventType, String name);
 
 }

signal-optimize-service/src/main/java/net/wanji/opt/service/EventService.java

 package net.wanji.opt.service;
 
 import net.wanji.common.framework.exception.DubboProviderException;
+import net.wanji.databus.dto.EventInfoTrafficStatusDTO;
+import net.wanji.databus.vo.EventInfoTrafficStatusVO;
+import net.wanji.opt.entity.EventAlarmInfo;
 import net.wanji.opt.po.base.EventStatisticPo;
 
 import java.util.List;
@@ -46,5 +49,5 @@ public interface EventService {
      * @return
      * @throws DubboProviderException
      */
-    List<EventAlarmInfo> findEventAlarmInfo(String realtimeType,String eventType,String name) throws DubboProviderException;
+    List<EventAlarmInfo> findEventAlarmInfo(String realtimeType, String eventType, String name) throws DubboProviderException;
 }