Merge remote-tracking branch 'origin/master'

k94314517

2024-09-24 deb2a67c1a9824b288ce4a7a228347ffd60964fe

 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java

@@ -1027,7 +1027,6 @@
     */
    private void dealCarsInErrorPlatformBiz( PlatformJob model,EventPlatformCarsStatusInfoRequest status) {
        //TODO-----------------处理车辆进入错误月台业务逻辑

        List<PlatformDevice> deviceList = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda()
                .eq(PlatformDevice::getPlatformId,model.getPlatformId())
                .eq(PlatformDevice::getIsdeleted,Constants.ZERO));
@@ -1041,7 +1040,6 @@
                continue;
            }
            if(Constants.equalsInteger(device.getType(),Constants.ZERO)){

                //如果是LED
                TransparentChannelBodyRequest body = new TransparentChannelBodyRequest();
                TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
@@ -1053,16 +1051,21 @@
                body.setMethod("ControlLedGereral");//固定值
                request.setIndexCode(device.getHkId());
                request.setOperationType(219);//固定值
                regions.setActionType(0);
                regions.setActionType(32);
                regions.setContent(content);
                regions.setRegionNo(1);
                regions.setRegionType(14);
                regions.setFontColor(2);
                regions.setFontColor(1);
                regions.setCircleTimes(1);//循环次数
                regions.setFontSize(31);//
                regions.setFontSize(32);//
                regions.setStayTime(1);//单位？？
                regions.setRegionLeftTopXPos(0);
                regions.setRegionLeftTopYPos(0);
                regions.setRegionRightBottomXPos(255);
                regions.setRegionRightBottomYPos(31);
                request.setRegions(new ArrayList<>());
                request.getRegions().add(regions);
                regions.setSpeed(13);
                body.setParams(request);
                HKService.transparentchannel(head,body);
            }else  if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
@@ -1073,9 +1076,9 @@
        if(broadcastList.size()>0){
            CustomBroadcastRequest request = new CustomBroadcastRequest();
            request.setAudioPointIndexCode(broadcastList);
            request.setPlayDuration(60);//单位秒
            request.setPlayDuration(15);//单位秒
            request.setBroadCastMode("tts");
            request.setPriority(15);
            request.setPriority(1);
            request.setState(1);//播放/停止标识 1-播放，0-停止
            request.setPlayTtsContent(content);
            HKService.customBroadcast(request);