灯杆解绑fix

zhanzhiqin

2022-09-09 5e2fe6ce6e80dea99f6eda304dba6fafbb30ad63

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

@@ -1009,14 +1009,14 @@
    /**
     * 获取用户所有的设备码
     */
    public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode) {
    public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode,String orderBy) {
        List<String> list;
        if (SecurityUtils.getClientId() != null) {
            PageHelper.startPage(pageNo, pageSize);
            list = baseMapper.listCode(SecurityUtils.getUserId(), keyword, deviceCode);
        } else {

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

@@ -1031,6 +1031,24 @@
        lights.forEach(light -> {
            light.setPower1(lightPowerSettingParam.getPower1());
            light.setPower2(lightPowerSettingParam.getPower2());
            //存在非0功率  即为存在该灯头
            if (lightPowerSettingParam.getPower1() != null || lightPowerSettingParam.getPower1() != 0) {
                light.setLight1(1);
            } else if (lightPowerSettingParam.getPower1() == 0) {
                //手动设置灯头功率为0  即不存在该灯头
                light.setLight1(0);
            } else {
                light.setLight1(0);
            }
            //存在非0功率  即为存在该灯头
            if (lightPowerSettingParam.getPower2() != null || lightPowerSettingParam.getPower2() != 0) {
                light.setLight2(1);
            } else if (lightPowerSettingParam.getPower2() == 0) {
                //手动设置灯头功率为0  即不存在该灯头
                light.setLight2(0);
            } else {
                light.setLight2(0);
            }
            light.setLightCount(lightPowerSettingParam.getLightCount());
        });
        return updateBatchById(lights);