Merge branch 'develop' of http://39.106.31.193:9211/mengff/jihe-dc into develop

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

@@ -119,7 +119,7 @@ public class DCPerceivedEventsWarningController extends BaseController {
             return AjaxResult.error("参数数据异常");
         }
         if (type.equals("quarter")) {
-            List<HashMap<String, Object>> total = perceivedEventsWarningService.selectWarningSectionTypeCountQuarter(dcWarning);
+            String total = perceivedEventsWarningService.selectWarningSectionTypeCountQuarter(dcWarning);
             map.put("total",total);
         } else {
             String total = perceivedEventsWarningService.selectWarningSectionTypeCount(dcWarning);
@@ -140,8 +140,21 @@ public class DCPerceivedEventsWarningController extends BaseController {
         if (StringUtils.isBlank(direction)){
             return AjaxResult.error("参数异常");
         }
-        return AjaxResult.success(perceivedEventsWarningService.selectSectionMark(dcWarning));
+        return AjaxResult.success(perceivedEventsWarningService.selectSectionMarkOptimize(dcWarning));
     }
+    //查询某个路段下的全部桩号
+//    @PostMapping("/sectionMarkNumberOptimize")
+//    public AjaxResult getSectionMarkOptimize(@RequestBody DcWarning dcWarning){
+//        String sectionId = dcWarning.getSectionId();
+//        if (StringUtils.isBlank(sectionId)){
+//            return AjaxResult.error("参数异常");
+//        }
+//        String direction = dcWarning.getDirection();
+//        if (StringUtils.isBlank(direction)){
+//            return AjaxResult.error("参数异常");
+//        }
+//        return AjaxResult.success(perceivedEventsWarningService.selectSectionMarkOptimize(dcWarning));
+//    }
 
     //预警事件,事件列表 查询状态为上报的感知事件
     @PostMapping("/warningEscalation")

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

@@ -162,6 +162,8 @@ public class DcTrafficIncidentsController {
      *
      * @author liuwenge
      * @date 2024/1/15 17:31
+     * @param searchType 查询条件(1:站点,2:原因)
+     * @param facilityIdList 站点id
      * @param controlType 类型(1:封闭,2:限行)
      * @param startTime 开始时间
      * @param endTime 结束时间
@@ -169,10 +171,12 @@ public class DcTrafficIncidentsController {
      */
     @ApiOperation("收费站统计分析table")
     @PostMapping("/selectTollStationAnalysis")
-    public AjaxResult selectTollStationAnalysis(@ApiParam(value="类型(1:封闭,2:限行)", name="controlType", required=true) @RequestParam ("controlType") String controlType,
+    public AjaxResult selectTollStationAnalysis(@ApiParam(value="查询条件(1:站点,2:原因)", name="searchType", required=true) @RequestParam ("searchType") String searchType,
+                                                @ApiParam(value="站点id", name="facilityId", required=false) @RequestParam (name="facilityId",required = false) String[] facilityIdList,
+                                                @ApiParam(value="类型(1:封闭,2:限行)", name="controlType", required=false) @RequestParam (name="controlType",required = false) String controlType,
                                                 @ApiParam(value="开始时间", name="startTime", required=true) @RequestParam ("startTime") String startTime,
                                                 @ApiParam(value="结束时间", name="endTime", required=true) @RequestParam ("endTime") String endTime){
-        return trafficIncidentsService.selectTollStationAnalysis(controlType,startTime,endTime);
+        return trafficIncidentsService.selectTollStationAnalysis(searchType,facilityIdList,controlType,startTime,endTime);
     }
 
     /**

zc-business/src/main/java/com/zc/business/domain/DcWarning.java

@@ -25,10 +25,7 @@ public class DcWarning extends BaseEntity
     @Excel(name = "所在桩号")
     private String stakeMark;
 
-    /** 方向：
-            1-上行
-            2-中
-            3-下行 */
+    /** 方向：1-上行2-中3-下行 */
     @Excel(name = "方向： 1-上行 2-中 3-下行")
     private String direction;
 
@@ -36,30 +33,20 @@ public class DcWarning extends BaseEntity
     @Excel(name = "所属部门")
     private Long deptId;
 
-    /** 警情状态：
-            1-上报
-            2-已完成
-            3-已终止
-            4-自动结束 */
+    /** 警情状态：1-上报2-已完成3-已终止4-自动结束 */
     @Excel(name = "警情状态： 1-上报 2-已完成 3-已终止 4-自动结束")
     private Integer warningState;
 
     /** 预警时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "预警时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    @Excel(name = "预警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date warningTime;
 
     /** 处理人员 */
     @Excel(name = "处理人员")
     private Long userId;
 
-    /** 信息来源：
-            1-视频AI
-            2-雷达识别
-            3-锥桶
-            4-护栏碰撞
-            5-扫码报警
-            6-非机预警 */
+    /** 信息来源：1-视频AI2-雷达识别3-锥桶4-护栏碰撞5-扫码报警6-非机预警 */
     @Excel(name = "信息来源： 1-视频AI 2-雷达识别 3-锥桶 4-护栏碰撞 5-扫码报警 6-非机预警")
     private Integer warningSource;
 
@@ -67,22 +54,11 @@ public class DcWarning extends BaseEntity
     @Excel(name = "预警级别")
     private Integer warningLevel;
 
-    /** 事件主类：
-            1-交通拥堵
-            2-行人
-            3-非机动车
-            4-停车
-            5-倒车/逆行
-            6-烟火
-            7-撒落物
-            8-异常天气
-            9-护栏碰撞 */
+    /** 事件主类：1-交通拥堵2-行人3-非机动车4-停车5-倒车/逆行6-烟火7-撒落物8-异常天气9-护栏碰撞 */
     @Excel(name = "事件主类： 1-交通拥堵 2-行人 3-非机动车 4-停车 5-倒车/逆行 6-烟火 7-撒落物 8-异常天气 9-护栏碰撞")
     private Integer warningType;
 
-    /** 事件子类：
-            1-1 拥堵
-            1-2 缓行 */
+    /** 事件子类：1-1 拥堵1-2 缓行 */
     @Excel(name = "事件子类： 1-1 拥堵 1-2 缓行")
     private String warningSubclass;
 
@@ -112,7 +88,8 @@ public class DcWarning extends BaseEntity
     private String longitude;
 
     private String latitude;
-
+    /** 车辆类型  */
+    @Excel(name = "车辆类型")
     private String vehicleType;
 
     public String getVehicleType() {

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

@@ -43,6 +43,22 @@ public interface DcMeteorologicalDetectorDataMapper
      */
     int updateDcMeteorologicalDetectorData(DcMeteorologicalDetectorData dcMeteorologicalDetectorData);
 
+    /**
+     * 中间库新增气象检测器数据
+     *
+     * @param dcMeteorologicalDetectorData 气象检测器数据
+     * @return 结果
+     */
+    Boolean insertIntermediateWarehouseData(DcMeteorologicalDetectorData dcMeteorologicalDetectorData);
+
+    /**
+     * 中间库修改气象检测器数据
+     *
+     * @param dcMeteorologicalDetectorData 气象检测器数据
+     * @return 结果
+     */
+    Boolean updateIntermediateWarehouseData(DcMeteorologicalDetectorData dcMeteorologicalDetectorData);
+
     /**
      * 删除气象检测器数据
      * 

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

@@ -56,7 +56,7 @@ public interface DcPerceivedEventsWarningMapper {
     String selectWarningSectionTypeMonthCount(DcWarning dcWarning);
     //感知事件某路段类型季占比
     List<HashMap<String,Object>> selectWarningSectionTypeQuarter(DcWarning dcWarning);
-    List<HashMap<String,Object>> selectWarningSectionTypeQuarterCount(DcWarning dcWarning);
+    String selectWarningSectionTypeQuarterCount(DcWarning dcWarning);
     //感知事件某路段类型年占比
     List<HashMap<String,Object>> selectWarningSectionTypeYear(DcWarning dcWarning);
     String selectWarningSectionTypeYearCount(DcWarning dcWarning);
@@ -73,4 +73,8 @@ public interface DcPerceivedEventsWarningMapper {
     String selectWarningMarkMonth(DcWarning dcWarning);
     List<HashMap<String,String>> selectWarningMarkQuarter(DcWarning dcWarning);
     String selectWarningMarkYear(DcWarning dcWarning);
+
+    List<HashMap<String,String>>  selectWarningMarkDayOptimize(DcWarning dcWarning);
+    List<HashMap<String,String>> selectWarningMarkQuarterOptimize(DcWarning dcWarning);
+
 }

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

@@ -181,12 +181,25 @@ public interface DcTrafficIncidentsMapper {
      *
      * @author liuwenge
      * @date 2024/1/16 14:18
+     * @param facilityIdList 站点id
      * @param controlType 类型(1:封闭,2:限行)
      * @param startTime 开始时间
      * @param endTime 结束时间
      * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
      */
-    List<Map<String,Object>> selectTollStationAnalysis(@Param("controlType") String controlType,@Param("startTime") String startTime,@Param("endTime") String endTime);
+    List<Map<String,Object>> selectTollStationAnalysis(@Param("facilityIdList") String[] facilityIdList,@Param("controlType") String controlType,@Param("startTime") String startTime,@Param("endTime") String endTime);
+
+    /**
+     * @Description 收费站统计分析table 根据站点
+     *
+     * @author liuwenge
+     * @date 2024/2/6 15:18
+     * @param facilityIdList 站点id
+    * @param startTime 开始时间
+    * @param endTime 结束时间
+     * @return java.util.List<java.util.Map<java.lang.String,java.lang.Object>>
+     */
+    List<Map<String,Object>> selectTollStationAnalysisByFacility(@Param("facilityIdList") String[] facilityIdList,@Param("startTime") String startTime,@Param("endTime") String endTime);
 
     /**
      * @Description 收费站统计分析echarts

zc-business/src/main/java/com/zc/business/message/device/listener/DevicePropertyReportListener.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.google.gson.JsonObject;
 import com.zc.business.domain.DcDevice;
 import com.zc.business.domain.DcMeteorologicalDetectorData;
+import com.zc.business.enums.IotProductEnum;
 import com.zc.business.service.IDcMeteorologicalDetectorDataService;
 import com.zc.common.core.redis.stream.RedisStream;
 import org.slf4j.Logger;
@@ -47,11 +48,14 @@ public class DevicePropertyReportListener implements StreamListener<String, Obje
             if (headers.get("productId") != null){
                 String productId = headers.get("productId").toString();
                 //气象检测器
-                if ("zc-meteorological".equals(productId)){
+                if (IotProductEnum.WEATHER_DETECTOR.value().equals(productId)){
                     DcMeteorologicalDetectorData meteorologicalDetectorData = (DcMeteorologicalDetectorData) data.get("properties");
                     meteorologicalDetectorData.setIotDeviceId(data.get("deviceId").toString());
                     meteorologicalDetectorDataService.insertDcMeteorologicalDetectorData(meteorologicalDetectorData);
-                } else if ("zc-yzsqkdc-3131".equals(productId)){
+
+                    //设计院中间库
+                    meteorologicalDetectorDataService.insertIntermediateWarehouseData(meteorologicalDetectorData);
+                } else if (IotProductEnum.ONE_STOP_PRODUCT.value().equals(productId)){
                 //交调
 
                 }

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

@@ -41,9 +41,10 @@ public interface IDCPerceivedEventsWarningService {
     //感知事件某路段类型占比
     List<HashMap<String,Object>> selectWarningSectionType(DcWarning dcWarning);
     String  selectWarningSectionTypeCount(DcWarning dcWarning);
-    List<HashMap<String,Object>>  selectWarningSectionTypeCountQuarter(DcWarning dcWarning);
+    String  selectWarningSectionTypeCountQuarter(DcWarning dcWarning);
     //查询某个路段下的全部桩号
     List<HashMap<String,Object>> selectSectionMark(DcWarning dcWarning);
+    List<HashMap<String,String>> selectSectionMarkOptimize(DcWarning dcWarning);
     //预警事件,事件列表 查询状态为上报的感知事件
     List<HashMap<String,Object>> selectWarningEscalation(DcWarning dcWarning);
     //修改感知事件信息

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

@@ -35,6 +35,14 @@ public interface IDcMeteorologicalDetectorDataService
      */
     int insertDcMeteorologicalDetectorData(DcMeteorologicalDetectorData dcMeteorologicalDetectorData);
 
+    /**
+     * 中间库新增气象检测器数据
+     *
+     * @param dcMeteorologicalDetectorData 气象检测器数据
+     * @return 结果
+     */
+    boolean insertIntermediateWarehouseData(DcMeteorologicalDetectorData dcMeteorologicalDetectorData);
+
     /**
      * 修改气象检测器数据
      * 

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

@@ -103,12 +103,14 @@ public interface IDcTrafficIncidentsService {
      * @return com.ruoyi.common.core.domain.AjaxResult
      * @Description 路网管控-事件管控分析-收费站统计分析table
      * @author liuwenge
+     * @param searchType 查询条件
+     * @param facilityIdList 站点id
      * @param controlType 类型(1:封闭,2:限行)
      * @param startTime 开始时间
      * @param endTime 结束时间
      * @date 2024/1/15 17:31
      */
-    AjaxResult selectTollStationAnalysis(String controlType,String startTime,String endTime);
+    AjaxResult selectTollStationAnalysis(String searchType,String[] facilityIdList,String controlType,String startTime,String endTime);
 
     /**
      * @Description 路网管控-事件管控分析-收费站统计分析echarts(当月)

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

@@ -1,6 +1,10 @@
 package com.zc.business.service.impl;
 
 import java.util.List;
+
+import com.ruoyi.common.annotation.DataSource;
+import com.ruoyi.common.enums.DataSourceType;
+import com.zc.business.domain.DcDevice;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.zc.business.mapper.DcMeteorologicalDetectorDataMapper;
@@ -55,6 +59,22 @@ public class DcMeteorologicalDetectorDataServiceImpl implements IDcMeteorologica
         return dcMeteorologicalDetectorDataMapper.insertDcMeteorologicalDetectorData(dcMeteorologicalDetectorData);
     }
 
+    /**
+     * 中间库新增气象检测器数据
+     *
+     * @param dcMeteorologicalDetectorData 气象检测器数据
+     * @return 结果
+     */
+    @DataSource(value = DataSourceType.SLAVE)//切换数据源
+    @Override
+    public boolean insertIntermediateWarehouseData(DcMeteorologicalDetectorData dcMeteorologicalDetectorData)
+    {
+        if (!dcMeteorologicalDetectorDataMapper.updateIntermediateWarehouseData(dcMeteorologicalDetectorData)){
+            return dcMeteorologicalDetectorDataMapper.insertIntermediateWarehouseData(dcMeteorologicalDetectorData);
+        }
+        return false;
+    }
+
     /**
      * 修改气象检测器数据
      *

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

@@ -8,6 +8,7 @@ import com.zc.business.service.IDCPerceivedEventsWarningService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.sound.midi.Soundbank;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -159,7 +160,7 @@ public class DcPerceivedEventsWarningServiceImpl implements IDCPerceivedEventsWa
     }
 
     @Override
-    public List<HashMap<String,Object>> selectWarningSectionTypeCountQuarter(DcWarning dcWarning) {
+    public String selectWarningSectionTypeCountQuarter(DcWarning dcWarning) {
         if (dcWarning.getType().equals("quarter")==false){
             return null;
         }
@@ -209,6 +210,16 @@ public class DcPerceivedEventsWarningServiceImpl implements IDCPerceivedEventsWa
     }
 
 
+    @Override
+    public List<HashMap<String, String>> selectSectionMarkOptimize(DcWarning dcWarning) {
+        if (dcWarning.getType().equals("quarter")){
+            return  perceivedEventsWarningMapper.selectWarningMarkQuarterOptimize(dcWarning);
+        }else {
+            return  perceivedEventsWarningMapper.selectWarningMarkDayOptimize(dcWarning);
+        }
+    }
+
+
     //预警事件,事件列表 查询状态为上报的感知事件
     @Override
     public List<HashMap<String, Object>> selectWarningEscalation(DcWarning dcWarning) {

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

@@ -2,6 +2,7 @@ package com.zc.business.service.impl;
 
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.utils.StakeMarkUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.zc.business.domain.DcEvent;
 import com.zc.business.domain.DcEventType;
 import com.zc.business.mapper.DcTrafficIncidentsMapper;
@@ -15,6 +16,7 @@ import java.math.RoundingMode;
 import java.text.SimpleDateFormat;
 import java.time.Year;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description 交通事件统计Service业务层处理
@@ -352,111 +354,129 @@ public class DcTrafficIncidentsServiceImpl implements IDcTrafficIncidentsService
      * @Description 路网管控-事件管控分析-收费站统计分析table
      * @return com.ruoyi.common.core.domain.AjaxResult
      * @author liuwenge
+     * @param searchType 查询条件
+     * @param facilityIdList 站点id
      * @param controlType 类型(1:封闭,2:限行)
      * @param startTime 开始时间
      * @param endTime 结束时间
      * @date 2024/1/15 17:31
      */
     @Override
-    public AjaxResult selectTollStationAnalysis(String controlType,String startTime,String endTime){
-
-        //目标时段
-        List<Map<String,Object>> list = trafficIncidentsMapper.selectTollStationAnalysis(controlType,startTime,endTime);
-        BigDecimal allNum = BigDecimal.ZERO;
-        BigDecimal allTime = BigDecimal.ZERO;
-        for (Map<String, Object> data : list) {
-            allNum = allNum.add(new BigDecimal(data.get("num").toString()));
-            allTime = allTime.add(new BigDecimal(data.get("minuteTime").toString()));
-        }
-        for (Map<String, Object> data : list) {
-            //计算站次占比
-            if (allNum.compareTo(BigDecimal.ZERO) > 0){
-                BigDecimal numRatio = new BigDecimal(data.get("num").toString()).multiply(new BigDecimal("100")).divide(allNum,2, RoundingMode.HALF_UP);
-                data.put("numRatio",numRatio);
-            } else {
-                data.put("numRatio",0);
-            }
+    public AjaxResult selectTollStationAnalysis(String searchType,String[] facilityIdList,String controlType,String startTime,String endTime){
 
-            //计算时长占比
-            if (allTime.compareTo(BigDecimal.ZERO) > 0){
-                BigDecimal timeRatio = new BigDecimal(data.get("minuteTime").toString()).multiply(new BigDecimal("100")).divide(allTime,2, RoundingMode.HALF_UP);
-                data.put("timeRatio",timeRatio);
-            } else {
-                data.put("timeRatio",0);
-            }
-        }
+        //站点
+        if ("1".equals(searchType)){
+            List<Map<String,Object>> list = trafficIncidentsMapper.selectTollStationAnalysisByFacility(facilityIdList,startTime,endTime);
+            return AjaxResult.success(list);
 
-        //去年同期
-        try {
-            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-            Calendar cal = Calendar.getInstance();
-
-            Date startDate = dateFormat.parse(startTime);
-            cal.setTime(startDate);
-            cal.add(Calendar.YEAR,-1);
-            String lastStartTime = dateFormat.format(cal.getTime());
-
-            Date endDate = dateFormat.parse(endTime);
-            cal.setTime(endDate);
-            cal.add(Calendar.YEAR,-1);
-            String lastEndTime = dateFormat.format(cal.getTime());
-
-            List<Map<String,Object>> lastList = trafficIncidentsMapper.selectTollStationAnalysis(controlType,lastStartTime,lastEndTime);
-            BigDecimal lastAllNum = BigDecimal.ZERO;
-            BigDecimal lastAllTime = BigDecimal.ZERO;
-
-            for (int i = 0; i < lastList.size(); i++) {
-                //去年同期站次
-                lastAllNum = lastAllNum.add(new BigDecimal(lastList.get(i).get("num").toString()));
-                list.get(i).put("lastYearNum",lastList.get(i).get("num").toString());
-
-                //去年同期时长
-                lastAllTime = lastAllTime.add(new BigDecimal(lastList.get(i).get("minuteTime").toString()));
-                list.get(i).put("lastYearTime",lastList.get(i).get("minuteTime").toString());
-            }
+        } else {
+        //原因
 
-            for (int i = 0; i < lastList.size(); i++) {
-                //去年同期站次占比
-                if (lastAllNum.compareTo(BigDecimal.ZERO) > 0){
-                    BigDecimal numRatio = new BigDecimal(lastList.get(i).get("num").toString()).multiply(new BigDecimal("100")).divide(lastAllNum,2, RoundingMode.HALF_UP);
-                    list.get(i).put("lastYearNumRatio",numRatio);
+            if (StringUtils.isEmpty(controlType)){
+                return AjaxResult.error("请选择事件类型");
+            }
+            //目标时段
+            List<Map<String,Object>> list = trafficIncidentsMapper.selectTollStationAnalysis(facilityIdList,controlType,startTime,endTime);
+            BigDecimal allNum = BigDecimal.ZERO;
+            BigDecimal allTime = BigDecimal.ZERO;
+            for (Map<String, Object> data : list) {
+                allNum = allNum.add(new BigDecimal(data.get("num").toString()));
+                allTime = allTime.add(new BigDecimal(data.get("minuteTime").toString()));
+            }
+            for (Map<String, Object> data : list) {
+                //计算站次占比
+                if (allNum.compareTo(BigDecimal.ZERO) > 0){
+                    BigDecimal numRatio = new BigDecimal(data.get("num").toString()).multiply(new BigDecimal("100")).divide(allNum,2, RoundingMode.HALF_UP);
+                    data.put("numRatio",numRatio);
                 } else {
-                    list.get(i).put("lastYearNumRatio",0);
+                    data.put("numRatio",0);
                 }
-                ////去年同期时长占比
-                if (lastAllTime.compareTo(BigDecimal.ZERO) > 0) {
-                    BigDecimal timeRatio = new BigDecimal(lastList.get(i).get("minuteTime").toString()).multiply(new BigDecimal("100")).divide(lastAllTime, 2, RoundingMode.HALF_UP);
-                    list.get(i).put("lastYearTimeRatio", timeRatio);
+
+                //计算时长占比
+                if (allTime.compareTo(BigDecimal.ZERO) > 0){
+                    BigDecimal timeRatio = new BigDecimal(data.get("minuteTime").toString()).multiply(new BigDecimal("100")).divide(allTime,2, RoundingMode.HALF_UP);
+                    data.put("timeRatio",timeRatio);
                 } else {
-                    list.get(i).put("lastYearTimeRatio", 0);
+                    data.put("timeRatio",0);
                 }
             }
 
-            //同比
-            for (Map<String, Object> map : list) {
-                //站次同比
-                if (new BigDecimal(map.get("lastYearNum").toString()).compareTo(BigDecimal.ZERO) > 0){
-                    BigDecimal yearNumRatio = new BigDecimal(map.get("num").toString()).multiply(new BigDecimal("100")).divide(new BigDecimal(map.get("lastYearNum").toString()),2, RoundingMode.HALF_UP);
-                    map.put("yearNumRatio",yearNumRatio);
-                } else {
-                    map.put("yearNumRatio",0);
+            //去年同期
+            try {
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Calendar cal = Calendar.getInstance();
+
+                Date startDate = dateFormat.parse(startTime);
+                cal.setTime(startDate);
+                cal.add(Calendar.YEAR,-1);
+                String lastStartTime = dateFormat.format(cal.getTime());
+
+                Date endDate = dateFormat.parse(endTime);
+                cal.setTime(endDate);
+                cal.add(Calendar.YEAR,-1);
+                String lastEndTime = dateFormat.format(cal.getTime());
+
+                List<Map<String,Object>> lastList = trafficIncidentsMapper.selectTollStationAnalysis(facilityIdList,controlType,lastStartTime,lastEndTime);
+                BigDecimal lastAllNum = BigDecimal.ZERO;
+                BigDecimal lastAllTime = BigDecimal.ZERO;
+
+                for (int i = 0; i < lastList.size(); i++) {
+                    //去年同期站次
+                    lastAllNum = lastAllNum.add(new BigDecimal(lastList.get(i).get("num").toString()));
+                    list.get(i).put("lastYearNum",lastList.get(i).get("num").toString());
+
+                    //去年同期时长
+                    lastAllTime = lastAllTime.add(new BigDecimal(lastList.get(i).get("minuteTime").toString()));
+                    list.get(i).put("lastYearTime",lastList.get(i).get("minuteTime").toString());
                 }
 
-                //时长同比
-                if (new BigDecimal(map.get("lastYearTime").toString()).compareTo(BigDecimal.ZERO) > 0){
-                    BigDecimal yearTimeRatio = new BigDecimal(map.get("minuteTime").toString()).multiply(new BigDecimal("100")).divide(new BigDecimal(map.get("lastYearTime").toString()),2, RoundingMode.HALF_UP);
-                    map.put("yearTimeRatio",yearTimeRatio);
-                } else {
-                    map.put("yearTimeRatio",0);
+                for (int i = 0; i < lastList.size(); i++) {
+                    //去年同期站次占比
+                    if (lastAllNum.compareTo(BigDecimal.ZERO) > 0){
+                        BigDecimal numRatio = new BigDecimal(lastList.get(i).get("num").toString()).multiply(new BigDecimal("100")).divide(lastAllNum,2, RoundingMode.HALF_UP);
+                        list.get(i).put("lastYearNumRatio",numRatio);
+                    } else {
+                        list.get(i).put("lastYearNumRatio",0);
+                    }
+                    ////去年同期时长占比
+                    if (lastAllTime.compareTo(BigDecimal.ZERO) > 0) {
+                        BigDecimal timeRatio = new BigDecimal(lastList.get(i).get("minuteTime").toString()).multiply(new BigDecimal("100")).divide(lastAllTime, 2, RoundingMode.HALF_UP);
+                        list.get(i).put("lastYearTimeRatio", timeRatio);
+                    } else {
+                        list.get(i).put("lastYearTimeRatio", 0);
+                    }
+                }
+
+                //同比
+                for (Map<String, Object> map : list) {
+                    //站次同比
+                    if (new BigDecimal(map.get("lastYearNum").toString()).compareTo(BigDecimal.ZERO) > 0){
+                        BigDecimal yearNumRatio = new BigDecimal(map.get("num").toString()).multiply(new BigDecimal("100")).divide(new BigDecimal(map.get("lastYearNum").toString()),2, RoundingMode.HALF_UP);
+                        map.put("yearNumRatio",yearNumRatio);
+                    } else {
+                        map.put("yearNumRatio",0);
+                    }
+
+                    //时长同比
+                    if (new BigDecimal(map.get("lastYearTime").toString()).compareTo(BigDecimal.ZERO) > 0){
+                        BigDecimal yearTimeRatio = new BigDecimal(map.get("minuteTime").toString()).multiply(new BigDecimal("100")).divide(new BigDecimal(map.get("lastYearTime").toString()),2, RoundingMode.HALF_UP);
+                        map.put("yearTimeRatio",yearTimeRatio);
+                    } else {
+                        map.put("yearTimeRatio",0);
+                    }
                 }
+
+            } catch (Exception e){
+                e.printStackTrace();
             }
 
-        } catch (Exception e){
-            e.printStackTrace();
-        }
+            return AjaxResult.success(list);
 
-        return AjaxResult.success(list);
+        }
+    }
 
+    private  String customKey(Map<String,Object> map){
+        return map.get("facilityId").toString();
     }
 
     /**

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

@@ -146,6 +146,44 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
+    <insert id="insertIntermediateWarehouseData" parameterType="DcMeteorologicalDetectorData" useGeneratedKeys="true" keyProperty="id">
+        insert into meteorological_detector_data
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="iotDeviceId != null">device_id,</if>
+            <if test="temperature != null">temperature,</if>
+            <if test="humidity != null">humidity,</if>
+            <if test="precipitationType != null">precipitation_type,</if>
+            <if test="rainfall != null">rainfall,</if>
+            <if test="roadSurfaceStatus != null">road_surface_status,</if>
+            <if test="waterFilmThickness != null">water_film_thickness,</if>
+            update_time
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="iotDeviceId != null">#{iotDeviceId},</if>
+            <if test="temperature != null">#{temperature},</if>
+            <if test="humidity != null">#{humidity},</if>
+            <if test="precipitationType != null">#{precipitationType},</if>
+            <if test="rainfall != null">#{rainfall},</if>
+            <if test="roadSurfaceStatus != null">#{roadSurfaceStatus},</if>
+            <if test="waterFilmThickness != null">#{waterFilmThickness},</if>
+            current_date
+        </trim>
+    </insert>
+
+    <update id="updateIntermediateWarehouseData" parameterType="DcMeteorologicalDetectorData">
+        update meteorological_detector_data
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="temperature != null">temperature = #{temperature},</if>
+            <if test="humidity != null">humidity = #{humidity},</if>
+            <if test="precipitationType != null">precipitation_type = #{precipitationType},</if>
+            <if test="rainfall != null">rainfall = #{rainfall},</if>
+            <if test="roadSurfaceStatus != null">road_surface_status = #{roadSurfaceStatus},</if>
+            <if test="waterFilmThickness != null">water_film_thickness = #{waterFilmThickness},</if>
+            update_time = current_date
+        </trim>
+        where device_id = #{iotDeviceId}
+    </update>
+
     <delete id="deleteDcMeteorologicalDetectorDataById" parameterType="Long">
         delete from dc_meteorological_detector_data where id = #{id}
     </delete>

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

@@ -39,19 +39,25 @@
         </where>
     </select>
     <select id="selectSectionPerceivedEventsList" resultType="hashmap">
-        SELECT COUNT(1) as number,section.section_name sectionName  FROM dc_warning AS warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark
-        LEFT JOIN dc_road_section AS  section ON mark.section_id=section.id
-        where DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
-        group by section.section_name
+        select s.section_name sectionName,
+        (select COUNT(1) FROM `dc_warning` as w  where
+        DATE_FORMAT(w.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
+        and mark.stake_mark=w.stake_mark)number from dc_warning as w
+        left JOIN  dc_stake_mark as mark  ON mark.stake_mark=w.stake_mark
+        LEFT JOIN dc_road_section as s ON mark.section_id=s.id
+        where mark.stake_mark is not null
+        group by w.stake_mark
         order by number desc
     </select>
     <select id="selectSectionPerceivedNumber" resultType="java.util.HashMap">
-        SELECT COUNT(1) as number,section.section_name sectionName  FROM dc_warning AS warning
-        LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark
-        LEFT JOIN dc_road_section AS  section ON mark.section_id=section.id
-        where DATE_FORMAT(warning.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
-        group by section.section_name
+        select s.section_name sectionName,
+       (select COUNT(1) FROM `dc_warning` as w  where
+       DATE_FORMAT(w.create_time,'%Y-%m-%d')=DATE_FORMAT(#{createTime},'%Y-%m-%d')
+       and mark.stake_mark=w.stake_mark)number from dc_warning as w
+        left JOIN  dc_stake_mark as mark  ON mark.stake_mark=w.stake_mark
+        LEFT JOIN dc_road_section as s ON mark.section_id=s.id
+        where mark.stake_mark is not null
+        group by w.stake_mark
     </select>
     <select id="selectDailyCumulative" resultType="java.util.HashMap">
         SELECT DATE_FORMAT(create_time, '%Y-%m-%d %H') AS time, COUNT(*) AS number
@@ -168,20 +174,14 @@
         GROUP BY warning_type
         ORDER BY number DESC
     </select>
-    <select id="selectWarningSectionTypeQuarterCount" resultType="hashmap">
+    <select id="selectWarningSectionTypeQuarterCount" resultType="string">
         SELECT
-            CASE
-                WHEN MONTH(warning.create_time) BETWEEN 1 AND 3 THEN '第一季度'
-                WHEN MONTH(warning.create_time) BETWEEN 4 AND 6 THEN '第二季度'
-                WHEN MONTH(warning.create_time) BETWEEN 7 AND 9 THEN '第三季度'
-                ELSE '第四季度'
-                END AS QUARTER,COUNT(*) AS number
+               COUNT(*) AS number
         FROM dc_warning as warning
                  LEFT JOIN dc_stake_mark AS mark ON warning.stake_mark=mark.stake_mark
         WHERE YEAR(warning.create_time) =DATE_FORMAT(#{createTime},'%Y')
           AND warning.direction=#{direction}
           and mark.`section_id`=#{sectionId}
-        GROUP BY QUARTER
     </select>
     <select id="selectWarningSectionTypeQuarter" resultType="java.util.HashMap">
         SELECT
@@ -278,7 +278,7 @@
                    END AS QUARTER
         from dc_warning where stake_mark=#{stakeMark} and
             YEAR(create_time) =DATE_FORMAT(#{createTime},'%Y')
-            AND direction=#{direction}
+            AND direction=#{direction} and stake_mark is not null
         GROUP BY QUARTER
         ORDER BY QUARTER;
     </select>
@@ -286,5 +286,30 @@
         select count(1) from dc_warning
     </select>
 
+    <select id="selectWarningMarkQuarterOptimize" resultType="java.util.HashMap">
+        SELECT count( 1 ) sectionNumber,
+            CASE
+                WHEN MONTH ( w.create_time ) BETWEEN 1 AND 3 THEN '第一季度'
+                WHEN MONTH ( w.create_time ) BETWEEN 4 AND 6 THEN '第二季度'
+                WHEN MONTH ( w.create_time ) BETWEEN 7 AND 9 THEN '第三季度'
+                ELSE '第四季度'
+                END AS QUARTER
+        FROM dc_warning w
+        LEFT JOIN dc_stake_mark m ON w.stake_mark = m.stake_mark
+        WHERE m.stake_mark IS NOT null and w.direction=#{direction}
+          and  YEAR(w.create_time) =DATE_FORMAT(#{createTime},'%Y')
+        GROUP BY QUARTER
+        ORDER BY QUARTER;
+    </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
+        <if test = 'type == "day"' >and DATE(w.create_time)= DATE_FORMAT(#{createTime},'%Y-%m-%d')</if>
+        <if test = 'type == "month"' >and  DATE_FORMAT(w.create_time,'%Y-%m') =DATE_FORMAT(#{createTime},'%Y-%m')</if>
+        <if test = 'type == "year"' >and YEAR(w.create_time) =DATE_FORMAT(#{createTime},'%Y')</if>
+        AND w.direction = #{direction}) sectionNumber FROM dc_stake_mark AS m
+        WHERE m.section_id = #{sectionId}
+    </select>
+
 
 </mapper>

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

@@ -225,15 +225,46 @@
                 then TIMESTAMPDIFF(MINUTE,t1.start_time,t1.end_time)
                 else 0 end) minuteTime
             from dc_event t1 LEFT JOIN dc_event_traffic_control t2 on t1.id = t2.id
-            where
-                t1.event_type = '3' and t1.event_subclass = '3-2' and t2.control_type = #{controlType}
+            <where>
+                t1.event_type = '3' and t1.event_subclass = '3-2'
+                <if test="facilityIdList != null and facilityIdList.length > 0">
+                    AND t2.facility_id in
+                    <foreach collection="facilityIdList" item="facilityId" open="(" separator="," close=")">
+                        #{facilityId}
+                    </foreach>
+                </if>
                 and  date_format(t1.start_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
                 and (date_format(t1.end_time,'%Y-%m-%d %H:%i:%s') > date_format(#{startTime},'%Y-%m-%d %H:%i:%s') or ISNULL(t1.end_time))
+            </where>
             GROUP BY t2.control_cause,t2.cause_type) t4
         on t3.control_cause = t4.control_cause and t3.cause_type = t4.cause_type
         ORDER BY t3.control_cause, t3.cause_type
     </select>
 
+    <select id="selectTollStationAnalysisByFacility"  resultType="java.util.Map">
+        select
+            t2.facility_id facilityId,t3.facility_name facilityName,classify,
+            SUM(case when t2.classify = '6' then 1 else 0 end) facilityClose,
+            SUM(case when t2.classify = '7' then 1 else 0 end) facilityRestriction,
+            SUM(case when t2.classify = '9' then 1 else 0 end) facilityInterval
+        from dc_event t1
+        LEFT JOIN dc_event_traffic_control t2 on t1.id = t2.id
+        LEFT JOIN dc_facility t3 on t3.id = t2.facility_id
+        <where>
+            t1.event_type = '3' and t1.event_subclass = '3-2'
+            and  date_format(t1.start_time,'%Y-%m-%d %H:%i:%s') &lt;= date_format(#{endTime},'%Y-%m-%d %H:%i:%s')
+            and (date_format(t1.end_time,'%Y-%m-%d %H:%i:%s') > date_format(#{startTime},'%Y-%m-%d %H:%i:%s') or ISNULL(t1.end_time))
+            and t2.classify in ('6','7','9')
+            <if test="facilityIdList != null and facilityIdList.length > 0">
+                AND t2.facility_id in
+                <foreach collection="facilityIdList" item="facilityId" open="(" separator="," close=")">
+                    #{facilityId}
+                </foreach>
+            </if>
+        </where>
+        GROUP BY t2.facility_id
+    </select>
+
     <select id="getTollStationAnalysis" resultType="java.util.Map">
         select t3.facility_name facilityName,ifNull(t4.trafficClose,0) trafficClose, ifnull(t4.trafficRestriction,0) trafficRestriction
         from