Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-28 7c3738df442e6b456ca68670e086357fbb08d521

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java

@@ -5,6 +5,7 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.CommonPage;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.redis.RedisService;
import com.sandu.common.service.impl.BaseServiceImpl;
@@ -18,6 +19,7 @@
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.LightControlParam;
import com.sandu.ximon.admin.param.LightPowerSettingParam;
import com.sandu.ximon.admin.param.LightRemarkParam;
import com.sandu.ximon.admin.redis.LightKey;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -116,7 +118,7 @@
                );
                for (LightReportData lightReportData : reportDataList) {
                    if (StrUtil.equals(lightBo.getDeviceCode(), lightReportData.getDeviceCode())) {
                        lightBo.setReportTime(lightReportData.getCreateTime());
                        lightBo.setReportTime(lightReportData.getCreateTime1());
                        break;
                    }
                }
@@ -166,7 +168,7 @@

        List<Map<String, Object>> resultList = new ArrayList<>();
        for (LightControlParam param : paramList) {
            A5LightBrightnessReqInnerFrame lightControlFrame = new A5LightBrightnessReqInnerFrame(param.getBrightness());
            A5LightBrightnessReqInnerFrame lightControlFrame = new A5LightBrightnessReqInnerFrame(param.getBrightness(), param.getLightAddress());
            A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_LIGHT_DATA.getCode(), lightControlFrame);
            Map<String, Object> map = new HashMap<>();
            try {
@@ -470,8 +472,31 @@
    /**
     * 获取用户所有的设备码
     */
    public List<String> listDeviceCode(/*int start, int end*/) {
        return baseMapper.listCode(/*start,end,*/SecurityUtils.getClientId());
    public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode) {
        List<String> list;
        if (SecurityUtils.getClientId() != null) {
            PageHelper.startPage(pageNo, pageSize);
            list = baseMapper.listCode(SecurityUtils.getUserId(), keyword, deviceCode);
        } else {

            PageHelper.startPage(pageNo, pageSize);
            list = baseMapper.listCode(null, keyword, deviceCode);
        }

        return CommonPage.restPage(list);
    }

    public boolean setPower(LightPowerSettingParam lightPowerSettingParam) {
        if (lightPowerSettingParam.getLightIds().size() == 0) {
            throw new BusinessException("灯杆ID不能为空");
        }
        List<Light> lights = listByIds(lightPowerSettingParam.getLightIds());
        lights.forEach(light -> {
                    light.setPower1(lightPowerSettingParam.getPower1());
                    light.setPower2(lightPowerSettingParam.getPower2());
                    light.setLightCount(lightPowerSettingParam.getLightCount());
                }
        );
        return updateBatchById(lights);
    }
}