Merge remote-tracking branch 'origin/master'

signal-optimize-data-compute/src/main/resources/mapper/report/GreenWaveWeekDataMapper.xml

@@ -54,11 +54,11 @@
         select * from t_config_peak_hours;
     </select>
     <select id="selectGreenWaveWeekDataByTime" resultType="net.wanji.opt.entity.report.GreenWaveWeekData">
-        SELECT green_id,road_direction,max(traffic_index) max_congest_index,avg(traffic_index) congest_index,sum(status>=3)*60*5 congest_duration,avg(speed) speed,sum(trval_time) travel_time
+        SELECT green_id,road_direction,max(traffic_index) max_congest_index,avg(traffic_index) congest_index,sum(status>=3 and status &lt;=4)*60*5 congest_duration,avg(speed) speed,sum(trval_time) travel_time
         from t_greenwave_hist where start_time BETWEEN #{startDate} AND #{endDate} 	AND TIME( start_time ) BETWEEN #{startTime} AND #{endTime} GROUP BY green_id,road_direction
     </select>
     <select id="selectGreenWaveWeekData" resultType="net.wanji.opt.entity.report.GreenWaveWeekData">
-        SELECT green_id,road_direction,max(traffic_index) max_congest_index,avg(traffic_index) congest_index,sum(status>=3)*60*5 congest_duration,avg(speed) speed,sum(trval_time) travel_time
+        SELECT green_id,road_direction,max(traffic_index) max_congest_index,avg(traffic_index) congest_index,sum(status>=3 and status&lt;=4)*60*5 congest_duration,avg(speed) speed,sum(trval_time) travel_time
         from t_greenwave_hist where start_time BETWEEN #{startDate} AND #{endDate} GROUP BY green_id,road_direction
     </select>
 
@@ -81,7 +81,7 @@
                                            and TIME( start_time ) BETWEEN #{startTime} AND #{endTime}
                                        </if>
                                        and green_id = #{greenId}
-                                         and status >= 3 and road_direction = #{roadDirection} order by start_time
+                                         and status >= 3 and status &lt;= 4 and road_direction = #{roadDirection} order by start_time
     </select>
     <select id="getDataByWeek" resultType="net.wanji.opt.entity.report.GreenWaveWeekData">
         SELECT

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/report/BaseAreaInfoController.java

@@ -15,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -49,7 +51,7 @@ public class BaseAreaInfoController {
         return jsonViewObject;
     }
 
-    @ApiOperation(httpMethod="GET",value="区域基础信息-根据区划类型查询对应集合数据", notes="")
+    @ApiOperation(httpMethod="GET",value="区域基础信息-根据区域ID删除区域记录", notes="")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "areaId", value = "区域ID", required = false, dataType = "Integer", defaultValue = ""),
     })
@@ -72,11 +74,21 @@ public class BaseAreaInfoController {
     }
 
     @ApiOperation(httpMethod="GET",value="区域基础信息-根据区划类型查询对应集合数据", notes="")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "customQueryFlag", value = "是否查询自定义区域", required = false, dataType = "Boolean", defaultValue = "false"),
+    })
     @GetMapping(value = "/byCondition")
-    public JsonViewObject getListByType(@RequestParam(value = "type", required = false, defaultValue = "2") String type) {
+    public JsonViewObject getListByType(@RequestParam(value = "type", required = false, defaultValue = "2") String type,
+                                        @RequestParam(value = "customQueryFlag", required = false, defaultValue = "false") boolean customQueryFlag) {
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         try {
             List<BaseAreaInfoPO> list = baseAreaInfoService.selectByType(type);
+            if (!list.isEmpty()) {
+                if (!customQueryFlag) {
+                    //不查询自定义区域时，删除自定义区域记录
+                   list.removeIf(o->Objects.equals(99,o.getCode()));
+                }
+            }
             jsonViewObject.success(list);
         } catch (Exception e) {
             jsonViewObject.fail(I18nResourceBundle.getConstants("GET_FAILED_MSG"));

signal-optimize-service/src/main/java/net/wanji/opt/controllerv2/report/vo/ReportDataBody.java

+package net.wanji.opt.controllerv2.report.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author fengyi
+ * @date 2025/3/31
+ * @description
+ */
+@Data
+public class ReportDataBody {
+
+    @ApiModelProperty(value = "文件名称", example = "",required = true)
+    String fileName;
+
+    @ApiModelProperty(required = true,value = "数据体")
+    String body;
+
+
+}

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

@@ -51,4 +51,11 @@ public interface TEventOptimizeInfoMapper extends BaseMapper<TEventOptimizeInfo>
                                                     @Param("startDuration") Integer startDuration,
                                                     @Param("endDuration") Integer endDuration
                                                     );
+
+    List<String> getCrossIdList(@Param("greenId") Integer greenId);
+
+    Page<TEventOptimizeInfo> selectPageWithCrossIds(@Param("page") Page<TEventOptimizeInfo> page,
+                                                    @Param("startTime") String startTime,
+                                                    @Param("endTime") String endTime,
+                                                    @Param("crossIds") List<String> crossIds);
 }
\ No newline at end of file

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

 package net.wanji.opt.servicev2.eventoptimize.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -38,19 +39,39 @@ public class TEventOptimizeInfoServiceImpl extends ServiceImpl<TEventOptimizeInf
 
     @Override
     public Page<TEventOptimizeInfoVO> selectPageWithCrossIdAndGreenId(int currentPage, int pageSize, String startTime, String endTime, String crossId, Integer greenId) {
-        Page<TEventOptimizeInfo> page = new Page<>(currentPage, pageSize);
-        Page<TEventOptimizeInfo> tEventOptimizeInfoPage = baseMapper.selectPageWithCrossIdAndGreenId(page, startTime, endTime, crossId, greenId);
-        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());
-
-        Page<TEventOptimizeInfoVO> pageVO = new Page<>(currentPage, pageSize);
-        pageVO.setTotal(page.getTotal());
-        pageVO.setRecords(collect);
-        return pageVO;
+        if(ObjectUtil.isNotEmpty(greenId)){
+            List<String> crossIds = tEventOptimizeInfoMapper.getCrossIdList(greenId);
+            Page<TEventOptimizeInfo> page = new Page<>(currentPage, pageSize);
+            Page<TEventOptimizeInfo> tEventOptimizeInfoPage = baseMapper.selectPageWithCrossIds(page, startTime, endTime, crossIds);
+            List<TEventOptimizeInfoVO> collect = tEventOptimizeInfoPage.getRecords().stream().map(x -> {
+                TEventOptimizeInfoVO tEventOptimizeInfoVO = new TEventOptimizeInfoVO();
+                BeanUtils.copyProperties(x, tEventOptimizeInfoVO);
+                tEventOptimizeInfoVO.setEventLabal(getEventLabel1(x.getEventType()));
+                tEventOptimizeInfoVO.setOptStatus(1);
+                tEventOptimizeInfoVO.setGreenId(greenId);
+                return tEventOptimizeInfoVO;
+            }).collect(Collectors.toList());
+
+            Page<TEventOptimizeInfoVO> pageVO = new Page<>(currentPage, pageSize);
+            pageVO.setTotal(page.getTotal());
+            pageVO.setRecords(collect);
+            return pageVO;
+        }else {
+            Page<TEventOptimizeInfo> page = new Page<>(currentPage, pageSize);
+            Page<TEventOptimizeInfo> tEventOptimizeInfoPage = baseMapper.selectPageWithCrossIdAndGreenId(page, startTime, endTime, crossId, greenId);
+            List<TEventOptimizeInfoVO> collect = tEventOptimizeInfoPage.getRecords().stream().map(x -> {
+                TEventOptimizeInfoVO tEventOptimizeInfoVO = new TEventOptimizeInfoVO();
+                BeanUtils.copyProperties(x, tEventOptimizeInfoVO);
+                tEventOptimizeInfoVO.setEventLabal(getEventLabel1(x.getEventType()));
+                tEventOptimizeInfoVO.setOptStatus(1);
+                return tEventOptimizeInfoVO;
+            }).collect(Collectors.toList());
+
+            Page<TEventOptimizeInfoVO> pageVO = new Page<>(currentPage, pageSize);
+            pageVO.setTotal(page.getTotal());
+            pageVO.setRecords(collect);
+            return pageVO;
+        }
     }
 
     @Override
@@ -113,7 +134,19 @@ public class TEventOptimizeInfoServiceImpl extends ServiceImpl<TEventOptimizeInf
             return eventLabel;
         }
     }
-
+    // 获取事件名称（可以根据实际需求扩展）
+    private String getEventLabel1(String eventType) {
+        switch (eventType){
+            case "1":
+                return "绿灯空放";
+            case "2":
+                return "失衡";
+            case "3":
+                return "溢出";
+            default:
+                return "未知事件";
+        }
+    }
     // 新增干线接口用于带有条件的分页查询
     @Override
     public Page<TEventOptimizeInfo> pageWithLineConditions(int currentPage, int pageSize, String startTime, String endTime, Integer greenId, String eventType, Integer optStatus, Integer duration,Integer startOptDuration,Integer endOptDuration,Integer startDuration, Integer endDuration) {

signal-optimize-service/src/main/java/net/wanji/opt/servicev2/report/impl/GreenWaveWeekDataServiceImpl.java

 package net.wanji.opt.servicev2.report.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -328,11 +329,14 @@ public class GreenWaveWeekDataServiceImpl extends ServiceImpl<GreenWaveWeekDataM
     public List<GreenReportSamePeriodCompareData>  getSamePeriodCompare(Integer year, Integer week, String ids) {
         Integer yearWeek = Integer.valueOf(year + "" + week);
         Integer yearWeekLast = Integer.valueOf(year + "" + (week-1));
-        List<Integer> greenIdList = Arrays.stream(ids.split(","))
-                .map(String::trim) // 去除可能的空格
-                .filter(s -> !s.isEmpty()) // 过滤掉空字符串
-                .map(Integer::parseInt) // 转换为整数
-                .collect(Collectors.toList());
+        List<Integer> greenIdList = new ArrayList<>();
+        if(ObjectUtil.isNotEmpty(ids)){
+            greenIdList = Arrays.stream(ids.split(","))
+                    .map(String::trim) // 去除可能的空格
+                    .filter(s -> !s.isEmpty()) // 过滤掉空字符串
+                    .map(Integer::parseInt) // 转换为整数
+                    .collect(Collectors.toList());
+        }
         List<GreenWaveWeekData> greenWaveWeekDatas = greenWaveWeekDataMapper.getDataByWeek(greenIdList,yearWeek);
         List<GreenWaveWeekData> greenWaveWeekDatasLast = greenWaveWeekDataMapper.getDataByWeek(greenIdList,yearWeek-1);
         List<GreenReportSamePeriodCompareData> result = new ArrayList<>();

signal-optimize-service/src/main/resources/mapper/evaluation/EventInfoMapper.xml

@@ -436,7 +436,7 @@
 
     <select id="getListByStartAndEnd" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT DATE_FORMAT(start_time,'%Y-%m-%d %H:%i:%s')  startTime,
-               DATE_FORMAT(end_time,'%Y-%m-%d %H:%i:%s')  endTime,
+               DATE_FORMAT(ifnull(end_time,now()) ,'%Y-%m-%d %H:%i:%s')  endTime,
                ABS(TIMESTAMPDIFF( SECOND, start_time, ifnull(end_time,now()) )) AS duration,
                info.type,
                c.label as typeName,
@@ -444,8 +444,7 @@
         FROM t_event_info info
         JOIN t_config_event_category c ON info.type = c.event_type
         WHERE cross_id = #{crossId}
-           and start_time BETWEEN #{startTime}
-          AND start_time AND #{endTime}
+           and start_time BETWEEN #{startTime} AND #{endTime}
          <!-- AND end_time is not null -->
         ORDER BY
             start_time DESC

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

@@ -37,14 +37,34 @@
         ORDER BY happen_start_time desc
     </select>
    <select id="selectPageWithCrossIdAndGreenId" parameterType="map" resultType="net.wanji.opt.entity.eventoptimize.TEventOptimizeInfo">
-        SELECT *
-        FROM t_event_optimize_info
-        WHERE (#{startTime} IS NULL OR happen_start_time >= #{startTime})
-        AND (#{endTime} IS NULL OR happen_end_time &lt;= #{endTime})
-        AND (#{crossId} IS NULL OR cross_id = #{crossId})
-        AND (#{greenId} IS NULL OR green_id = #{greenId})
-        AND opt_status != 0
+       SELECT
+       cross_id,
+       current_algo AS event_type,
+       issue_time AS opt_start_time,
+       duration AS opt_duration,
+       DATE_ADD( issue_time, INTERVAL duration SECOND ) AS opt_end_time
+       FROM
+       t_strategy_cross_result
+       WHERE
+             1=1
+       <if test="startTime != null and endTime != null">
+           AND issue_time >= #{startTime}
+           AND issue_time &lt; #{endTime}
+       </if>
+       <if test="crossId != null" >
+           AND cross_id = #{crossId}
+       </if>
+       AND response_code = 200
     </select>
+<!--    <select id="selectPageWithCrossIdAndGreenId" parameterType="map" resultType="net.wanji.opt.entity.eventoptimize.TEventOptimizeInfo">-->
+<!--        SELECT *-->
+<!--        FROM t_event_optimize_info-->
+<!--        WHERE (#{startTime} IS NULL OR happen_start_time >= #{startTime})-->
+<!--        AND (#{endTime} IS NULL OR happen_end_time &lt;= #{endTime})-->
+<!--        AND (#{crossId} IS NULL OR cross_id = #{crossId})-->
+<!--        AND (#{greenId} IS NULL OR green_id = #{greenId})-->
+<!--        AND opt_status != 0-->
+<!--    </select>-->
 
     <select id="getCrossOptimizeDistribute" parameterType="map" resultType="java.util.Map">
         SELECT
@@ -123,4 +143,30 @@
         </if>
         ORDER BY happen_start_time desc
     </select>
+    <select id="getCrossIdList" resultType="java.lang.String">
+        select cross_id from t_greenwave_cross where green_id = #{greenId}
+    </select>
+    <select id="selectPageWithCrossIds" resultType="net.wanji.opt.entity.eventoptimize.TEventOptimizeInfo">
+        SELECT
+        cross_id,
+        current_algo AS event_type,
+        issue_time AS opt_start_time,
+        duration AS opt_duration,
+        DATE_ADD( issue_time, INTERVAL duration SECOND ) AS opt_end_time
+        FROM
+        t_strategy_cross_result
+        WHERE
+        1=1
+        <if test="startTime != null and endTime != null">
+            AND issue_time >= #{startTime}
+            AND issue_time &lt; #{endTime}
+        </if>
+        <if test="crossIds != null" >
+            AND cross_id in
+          <foreach collection="crossIds" item="crossId" open="(" close=")" separator=",">
+               #{crossId}
+          </foreach>
+        </if>
+        AND response_code = 200
+    </select>
 </mapper>
\ No newline at end of file