Merge remote-tracking branch 'origin/master'

signal-optimize-service/src/main/resources/mapper/HoloEventMapper.xml

@@ -211,10 +211,10 @@
             sum( TIMESTAMPDIFF( SECOND, start_time, ifnull( end_time, now())) ) duration,
             count(*) as count,
             case
-                when #{timeType}=5 then DATE_FORMAT(concat( date( start_time ), ' ', HOUR ( start_time ), ':', floor( MINUTE ( start_time ) / 10 ) * 10 ),'%H:%i' )
-                when #{timeType}=1 then DATE_FORMAT(concat( date( start_time ), ' ', HOUR ( start_time ), ':', floor( MINUTE ( start_time ) / 15 ) * 15 ),'%H:%i' )
-                when #{timeType}=2 then DATE_FORMAT(concat( date( start_time ), ' ', HOUR ( start_time ), ':', floor( MINUTE ( start_time ) / 30 ) * 30 ),'%H:%i' )
-                when #{timeType}=3 then DATE_FORMAT( start_time, '%H:00' )
+                when #{timeType}=5 then DATE_FORMAT( DATE_ADD( start_time, INTERVAL ( 10 - ( MINUTE ( start_time ) % 10 )) % 10 MINUTE ), '%H:%i' )
+                when #{timeType}=1 then DATE_FORMAT( DATE_ADD( start_time, INTERVAL ( 15 - ( MINUTE ( start_time ) % 15 )) % 15 MINUTE ), '%H:%i' )
+                when #{timeType}=2 then DATE_FORMAT( DATE_ADD( start_time, INTERVAL ( 30 - ( MINUTE ( start_time ) % 30 )) % 30 MINUTE ), '%H:%i' )
+                when #{timeType}=3 then DATE_FORMAT( DATE_ADD( start_time, INTERVAL ( 60 - ( MINUTE ( start_time ) % 60 )) % 60 MINUTE ), '%H:%i' )
             end as time_axis_start
         FROM
             t_event_info

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/service/impl/StaticInfoServiceImpl.java

@@ -488,6 +488,9 @@ public class StaticInfoServiceImpl implements StaticInfoService {
             for (RingPhaseDTO phaseDTO : ringPhaseList) {
                 Integer phaseId = phaseDTO.getPhaseId();
                 long channe = Long.valueOf(channelDim[phaseId - 1]);
+                if (channe == 0L){
+                    continue;
+                }
                 String binaryString = Long.toBinaryString(channe);
                 //获取方向转向分组
                 List<String> binaryList = CommonUtils.groupStringFromRight(binaryString);
@@ -498,6 +501,7 @@ public class StaticInfoServiceImpl implements StaticInfoService {
                     String turn = readUtf8Line.substring(3);
                     Integer wjLightsDir = HiseseDirEnum.getWjLightsDir(Integer.parseInt(dir, 2));
                     Integer wjLightsTurn = HisenseTurnEnum.getWjLightsTurn(Integer.parseInt(turn, 2));
+                    log.error("readUtf8Line = {},dir={},turn={},wjLightsDir={},wjLightsTurn={}",readUtf8Line,dir,turn,wjLightsDir,wjLightsTurn);
                     if (wjLightsDir == 0 && wjLightsTurn == 0){
                         continue;
                     }