Merge remote-tracking branch 'origin/develop' into develop

ruoyi-ui/src/utils/auth.js

@@ -1,6 +1,6 @@
 import Cookies from 'js-cookie'
 
-const TokenKey = 'Admin-Token'
+const TokenKey = 'DC-Token'
 
 export function getToken() {
   return Cookies.get(TokenKey)

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

@@ -226,7 +226,7 @@
                 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'
+                t1.event_type = '3' and t1.event_subclass = '3-2' and t2.control_type = #{controlType}
                 <if test="facilityIdList != null and facilityIdList.length > 0">
                     AND t2.facility_id in
                     <foreach collection="facilityIdList" item="facilityId" open="(" separator="," close=")">