首页感知事件列表接口返回数量处理

zc-business/src/main/java/com/zc/business/controller/DCPerceivedEventsWarningController.java

@@ -57,7 +57,7 @@ public class DCPerceivedEventsWarningController extends BaseController {
     //首页感知事件列表
     @PostMapping("/warningList")
     public AjaxResult getWarningList(@RequestBody DcWarning dcWarning){
-        return  AjaxResult.success(perceivedEventsWarningService.selectPerceivedEventsList(dcWarning));
+        return  AjaxResult.success(perceivedEventsWarningService.selectWarningList(dcWarning));
     }
     //查询感知数量按照路段数量进行排名
     @PostMapping("/sectionPerceivedList")

zc-business/src/main/java/com/zc/business/mapper/DcPerceivedEventsWarningMapper.java

@@ -23,6 +23,8 @@ public interface DcPerceivedEventsWarningMapper {
     DcWarning selectWarningById(String id);
     //根据类型查询预计事件
     List<DcWarning> selectPerceivedEventsList(DcWarning dcWarning);
+    //首页感知事件列表
+    List<DcWarning> selectWarningList(DcWarning dcWarning);
     //查询感知数量按照路段进行排名
     List<HashMap<String,Object>> selectSectionPerceivedEventsList(DcWarning dcWarning);
     //查询感知数量按照路段进行区分

zc-business/src/main/java/com/zc/business/service/IDCPerceivedEventsWarningService.java

@@ -21,6 +21,8 @@ public interface IDCPerceivedEventsWarningService {
 
     //根据类型查询预计事件
     List<DcWarning> selectPerceivedEventsList(DcWarning dcWarning);
+    //首页敢直视事件
+    List<DcWarning> selectWarningList(DcWarning dcWarning);
     //查询感知数量按照路段进行排名
     List<HashMap<String,Object>> selectSectionPerceivedEventsList ();
     //查询感知数量按照路段进行区分

zc-business/src/main/java/com/zc/business/service/impl/DcPerceivedEventsWarningServiceImpl.java

@@ -59,6 +59,20 @@ public class DcPerceivedEventsWarningServiceImpl implements IDCPerceivedEventsWa
         }
         return perceivedEventsWarningMapper.selectPerceivedEventsList(dcWarning);
     }
+    //首页敢直视事件
+    @Override
+    public List<DcWarning> selectWarningList(DcWarning dcWarning) {
+        if (StringUtils.isNotEmpty(dcWarning.getStartStakeMark())){
+            String startStakeMark = StakeMarkUtils.formatMetre(dcWarning.getStartStakeMark());
+            dcWarning.setStartStakeMark(startStakeMark);
+        }
+
+        if (StringUtils.isNotEmpty(dcWarning.getEndStakeMark())){
+            String endStakeMark = StakeMarkUtils.formatMetre(dcWarning.getEndStakeMark());
+            dcWarning.setEndStakeMark(endStakeMark);
+        }
+        return perceivedEventsWarningMapper.selectPerceivedEventsList(dcWarning);
+    }
 
     @Override
     public List<HashMap<String,Object>> selectSectionPerceivedEventsList( )  {

zc-business/src/main/resources/mapper/business/DcPerceivedEventsWarningMapper.xml

@@ -37,10 +37,10 @@
         warning.`other_config` FROM dc_warning AS warning
         left JOIN dc_stake_mark AS mark ON mark.stake_mark=warning.stake_mark and mark.direction=warning.direction
         <where>
+            warning.warning_source!=6
             <if test="warningState != null  and warningState != ''"> and warning.warning_state = #{warningState}</if>
             <if test="warningType != null  and warningType != ''"> and warning.warning_type = #{warningType}</if>
             <if test="warningSubclass != null  and warningSubclass != ''"> and warning.warning_subclass = #{warningSubclass}</if>
-            <if test="warningSource != null  and warningSource != ''"> and warning.warning_source = #{warningSource}</if>
             <if test="direction != null  and direction != ''"> and warning.direction = #{direction}</if>
             <if test="stakeMark != null  and stakeMark != ''"> and warning.stake_mark = #{stakeMark}</if>
             <if test="startTime != null  and completeTime != null ">
@@ -341,6 +341,34 @@
         AND direction = #{direction}  GROUP BY   stake_mark  ) AS wc ON m.stake_mark = wc.stake_mark
         WHERE    m.section_id = #{sectionId}
     </select>
+    <select id="selectWarningList" resultType="com.zc.business.domain.DcWarning">
+        SELECT   warning.`id`,warning.`stake_mark`, warning.`direction`,
+        mark.longitude,mark.latitude,warning.lane,duration,
+        warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
+        warning.`user_id`, warning.`warning_source`,warning.`warning_level`,
+        warning.`remark`, warning.`create_time`,warning.`update_time`,
+        warning.`warning_type`,warning.`warning_subclass`,warning.`warning_title`,
+        warning.`other_config` FROM dc_warning AS warning
+        left JOIN dc_stake_mark AS mark ON mark.stake_mark=warning.stake_mark and mark.direction=warning.direction
+        <where>
+            <if test="warningState != null  and warningState != ''"> and warning.warning_state = #{warningState}</if>
+            <if test="warningSubclass != null  and warningSubclass != ''"> and warning.warning_subclass = #{warningSubclass}</if>
+            <if test="warningSource != null  and warningSource != ''"> and warning.warning_source = #{warningSource}</if>
+            <if test="direction != null  and direction != ''"> and warning.direction = #{direction}</if>
+            <if test="stakeMark != null  and stakeMark != ''"> and warning.stake_mark = #{stakeMark}</if>
+            <if test="startTime != null  and completeTime != null ">
+                and warning.warning_time between #{startTime} and #{completeTime}</if>
+            <if test="startStakeMark != null  and startStakeMark != ''">
+                and    CAST(SUBSTRING(SUBSTRING_INDEX(warning.stake_mark,'+',1),2)AS UNSIGNED)*1000
+                +CAST(SUBSTRING_INDEX(warning.stake_mark,  '+', -1) AS UNSIGNED)&gt;#{startStakeMark}
+            </if>
+            <if test=" endStakeMark != null  and endStakeMark != '' ">
+                and   CAST(SUBSTRING(SUBSTRING_INDEX(warning.stake_mark,'+',1),2)AS UNSIGNED)*1000
+                +CAST(SUBSTRING_INDEX(warning.stake_mark,  '+', -1) AS UNSIGNED)&lt;#{endStakeMark}
+            </if>
+        </where>
+        order by warning.warning_time desc
+    </select>
     <!--    <select id="selectWarningMarkDayOptimize" resultType="java.util.HashMap">-->
 <!--        SELECT DISTINCT m.stake_mark stakeMarkId,-->
 <!--        (SELECT count( 0 ) FROM dc_warning w WHERE w.stake_mark = m.stake_mark-->