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

doum

3 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

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

@@ -254,7 +254,8 @@
        }
    }
    @Override
    public void setAllLedDefualtContent() {
    public void allLedDefualtContent() {
        log.error( "屏幕内容设置=======================开始========" );
        int speed = 13;
        try {
            speed = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LED_CONTENT_SPEED).getCode());
@@ -262,7 +263,7 @@
        }
        //所有月台关联设备信息
        List<PlatformDevice> list =  platformDeviceMapper.selectList(new MPJLambdaWrapper<PlatformDevice>().
                selectAll(PlatformDevice.class)
                 selectAll(PlatformDevice.class)
                .selectAs(Platform::getLedContent,PlatformDevice::getLedContent)
                .leftJoin(Platform.class,Platform::getId,PlatformDevice::getPlatformId)
                .eq(PlatformDevice::getType,Constants.ZERO)
@@ -273,15 +274,21 @@
            return;
        }
        for(PlatformDevice device :list){
            String content = device.getLedContent();
            if(StringUtils.isBlank(content)){
                continue;
            try {
                String content = device.getLedContent();
                if(StringUtils.isBlank(content)){
                    continue;
                }
                PlatformBroadcastLog log1  =  HkSyncPushServiceImpl.dealLedContentBiz(0,device.getHkNo(),device.getName(),content,speed,1);
                platformBroadcastLogMapper.insert(log1);
                if(log1.getHkStatus() == null || !Constants.equalsInteger(log1.getHkStatus(), Constants.TWO)){
                    log.error( "对不起，屏幕内容设置失败"+(log1!=null?log1.getHkInfo():""));
                }
            }catch (Exception e){
                log.error( "对不起，屏幕内容设置异常"+ device.getName());
            }
            PlatformBroadcastLog log1  =  HkSyncPushServiceImpl.dealLedContentBiz(device.getPlatformId(),device.getHkNo(),device.getName(),content,speed,1);
            platformBroadcastLogMapper.insert(log1);
            if(log1.getHkStatus() == null || !Constants.equalsInteger(log1.getHkStatus(), Constants.TWO)){
                log.error( "对不起，屏幕内容设置失败"+(log1!=null?log1.getHkInfo():""));
            }

        }
        log.error( "屏幕内容设置=======================结束========" );
    }
}