事件优化记录查询请求字段问题修正

告警优化路口事件数按事件类型/持续时间分布情况x时间轴优化请求字段问题修正

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/eventoptimize/TEventOptimizeInfoController.java

@@ -35,8 +35,8 @@ public class TEventOptimizeInfoController {
             @ApiImplicitParam(name = "pageSize", value = "每页条数", required = true, dataType = "int",defaultValue = "10"),
             @ApiImplicitParam(name = "startTime", value = "开始时间，格式：yyyy-MM-dd HH:mm:ss", required = true, dataType = "String",defaultValue = "2025-03-21 00:00:00"),
             @ApiImplicitParam(name = "endTime", value = "结束时间，格式：yyyy-MM-dd HH:mm:ss", required = true, dataType = "String",defaultValue = "2025-03-21 23:00:00"),
-            @ApiImplicitParam(name = "crossId", value = "路口id", required = true, dataType = "String",defaultValue = "",example = "13NAF0B5PH0"),
-            @ApiImplicitParam(name = "greenId", value = "干线id", required = true, dataType = "int",defaultValue = "",example = "4"),
+            @ApiImplicitParam(name = "crossId", value = "路口id", required = false, dataType = "String",defaultValue = "",example = "13NAF0B5PH0"),
+            @ApiImplicitParam(name = "greenId", value = "干线id", required = false, dataType = "int",defaultValue = "",example = "4"),
     })
     @GetMapping("/selectPageWithCrossIdAndGreenId")
     public JsonViewObject selectPageWithCrossIdAndGreenId(
@@ -44,7 +44,7 @@ public class TEventOptimizeInfoController {
             @RequestParam int pageSize,
             @RequestParam(required = false) String startTime,
             @RequestParam(required = false) String endTime,
-            @RequestParam(required = false) int greenId,
+            @RequestParam(required = false) Integer greenId,
             @RequestParam(required = false) String crossId) {
 
         JsonViewObject jsonView = JsonViewObject.newInstance();
@@ -89,7 +89,8 @@ public class TEventOptimizeInfoController {
 
     @ApiOperation(value = "路口事件数按事件数/持续时间分布情况", notes = "路口事件数按事件数/持续时间分布情况", httpMethod = "GET")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "crossId", value = "路口ID", required = true, dataType = "String"),
+            @ApiImplicitParam(name = "greenId", value = "干线ID", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "crossId", value = "路口ID", required = false, dataType = "String"),
             @ApiImplicitParam(name = "startTime", value = "查询截止时间，格式yyyy-MM-dd HH:mm:ss", required = true, dataType = "String"),
             @ApiImplicitParam(name = "endTime", value = "查询截止时间，格式yyyy-MM-dd HH:mm:ss", required = true, dataType = "String"),
             @ApiImplicitParam(name = "groupType", value = "时间粒度类型 0：5分钟粒度 1：15分钟粒度 2：30分钟粒度 3：小时粒度 4：天粒度", required = true, dataType = "Integer",defaultValue = "1"),
@@ -98,10 +99,15 @@ public class TEventOptimizeInfoController {
     @ApiResponses({
             @ApiResponse(code = 200, message = "OK", response = CrossProblemDistributeAnalysisResult.class),
     })
-    public JsonViewObject getCrossOptimizeDistribute(String crossId, String startTime, String endTime, Integer groupType) {
+    public JsonViewObject getCrossOptimizeDistribute(
+            @RequestParam(required = false) Integer greenId,
+            @RequestParam(required = false) String crossId,
+            @RequestParam String startTime,
+            @RequestParam String endTime,
+            @RequestParam Integer groupType) {
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         try {
-            JSONObject result = tEventOptimizeInfoService.getCrossOptimizeDistribute(crossId,startTime,endTime,groupType);
+            JSONObject result = tEventOptimizeInfoService.getCrossOptimizeDistribute(greenId,crossId,startTime,endTime,groupType);
             return jsonViewObject.success(result);
         } catch (Exception e) {
             log.error("路口事件数按事件数/持续时间分布情况", e);

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

@@ -26,7 +26,8 @@ public interface TEventOptimizeInfoMapper extends BaseMapper<TEventOptimizeInfo>
     List<Map<String,String>> getCrossOptimizeDistribute(@Param("groupType") Integer groupType,
                                                         @Param("startTime") String startTime,
                                                         @Param("endTime") String endTime,
-                                                        @Param("crossId") String crossId);
+                                                        @Param("crossId") String crossId,
+                                                        @Param("greenId") Integer greenId);
 
     String getEventLabel(@Param("eventType") String eventType);
 

signal-optimize-service/src/main/java/net/wanji/opt/entity/eventoptimize/TEventOptimizeInfo.java

@@ -81,5 +81,9 @@ public class TEventOptimizeInfo {
     //事件类型
     private String eventLabel;
 
+    @TableField(value = "event_labal",exist = false)
+    @ApiModelProperty(value = "事件类型")
+    private String eventLabal;
+
 
 }
\ No newline at end of file

signal-optimize-service/src/main/java/net/wanji/opt/entity/eventoptimize/TEventOptimizeInfoVO.java

@@ -18,6 +18,9 @@ public class TEventOptimizeInfoVO {
     @ApiModelProperty(value = "二级类别")
     private String eventType;
 
+    @ApiModelProperty(value = "事件类型")
+    private String eventLabal;
+
     @TableField("opt_status")
     @ApiModelProperty(value = "优化状态 0 未优化 1-优化过 根据上面告警状态如果有2 3状态认为优化过")
     private Integer optStatus;
@@ -33,7 +36,6 @@ public class TEventOptimizeInfoVO {
     @ApiModelProperty(value = "优化时长，单位秒")
     private Integer optDuration;
 
-    @TableField("green_id")
     @ApiModelProperty(value = "干线ID")
     private Integer greenId;
 

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/eventoptimize/TEventOptimizeInfoService.java

@@ -13,7 +13,7 @@ public interface TEventOptimizeInfoService extends IService<TEventOptimizeInfo>
 
     Page<TEventOptimizeInfoVO> selectPageWithCrossIdAndGreenId(int currentPage, int pageSize, String startTime, String endTime, String crossId, int greenId);
 
-    JSONObject getCrossOptimizeDistribute(String crossId, String startTime, String endTime, Integer groupType);
+    JSONObject getCrossOptimizeDistribute(Integer greenId, String crossId, String startTime, String endTime, Integer groupType);
 
     Page<TEventOptimizeInfo> pageWithLineConditions(int currentPage, int pageSize, String startTime, String endTime, Integer greenId);
 }
\ No newline at end of file

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/eventoptimize/impl/TEventOptimizeInfoServiceImpl.java

@@ -29,7 +29,11 @@ public class TEventOptimizeInfoServiceImpl extends ServiceImpl<TEventOptimizeInf
     @Override
     public Page<TEventOptimizeInfo> queryPageWithConditions(int currentPage, int pageSize, String startTime, String endTime, String crossId) {
         Page<TEventOptimizeInfo> page = new Page<>(currentPage, pageSize);
-        return baseMapper.selectPageWithConditions(page, startTime, endTime, crossId);
+        Page<TEventOptimizeInfo> tEventOptimizeInfoPage = baseMapper.selectPageWithConditions(page, startTime, endTime, crossId);
+        tEventOptimizeInfoPage.getRecords().forEach(x->{
+            x.setEventLabal(getEventLabel(x.getEventType()));
+        });
+        return tEventOptimizeInfoPage;
     }
 
     @Override
@@ -39,6 +43,7 @@ public class TEventOptimizeInfoServiceImpl extends ServiceImpl<TEventOptimizeInf
         List<TEventOptimizeInfoVO> collect = tEventOptimizeInfoPage.getRecords().stream().map(x -> {
             TEventOptimizeInfoVO tEventOptimizeInfoVO = new TEventOptimizeInfoVO();
             BeanUtils.copyProperties(x, tEventOptimizeInfoVO);
+            tEventOptimizeInfoVO.setEventLabal(getEventLabel(x.getEventType()));
             return tEventOptimizeInfoVO;
         }).collect(Collectors.toList());
 
@@ -49,16 +54,9 @@ public class TEventOptimizeInfoServiceImpl extends ServiceImpl<TEventOptimizeInf
     }
 
     @Override
-    public JSONObject getCrossOptimizeDistribute(String crossId, String startTime, String endTime, Integer groupType) {
-        List<Map<String, String>> crossOptimizeDistribute = tEventOptimizeInfoMapper.getCrossOptimizeDistribute(groupType, startTime, endTime, crossId);
-//        List<String> timeLabelList = crossOptimizeDistribute.stream().map(x -> {
-//                    return x.get("time_label");
-//                })
-//                .distinct()
-//                .sorted()
-//                .collect(Collectors.toList());
-        List<String> sortedSet = EsDateIndexUtil.getTimeGranularityAxisAll(String.valueOf(groupType), startTime, endTime);
-        // 按事件类型分组
+    public JSONObject getCrossOptimizeDistribute(Integer greenId, String crossId, String startTime, String endTime, Integer groupType) {
+        List<Map<String, String>> crossOptimizeDistribute = tEventOptimizeInfoMapper.getCrossOptimizeDistribute(groupType, startTime, endTime, crossId,greenId);
+        List<String> sortedSet = EsDateIndexUtil.getTimeGranularityAxisAll(String.valueOf(groupType), startTime, endTime);// 按事件类型分组
         Map<String, EventOptimizeCountPo> eventTypeMap = new HashMap<>();
         for (Map<String, String> data : crossOptimizeDistribute) {
             String eventType = data.get("event_type");

signal-optimize-service/src/main/resources/mapper/eventoptimize/TEventOptimizeInfoMapper.xml

@@ -45,6 +45,9 @@
         <if test="crossId != null and crossId != ''">
             AND cross_id = #{crossId}
         </if>
+        <if test="greenId != null and greenId != ''">
+            AND green_id = #{greenId}
+        </if>
         <if test="startTime != null and endTime != null">
             AND happen_start_time >= #{startTime}
             AND happen_start_time &lt; #{endTime}