fix

zhanzhiqin

2022-04-28 72ce25c9c0a03c9279248dc473dbe3497b2d97dc

fix

 dao/src/main/java/com/sandu/ximon/dao/domain/Light.java

@@ -34,6 +34,11 @@
    private String remark;

    /**
     * 灯头数量，默认双灯头。1：单灯头，2：双灯头
     */
    private int lightCount;

    /**
     * 灯1亮度百分比，0-100
     */
    private Integer lightPercent;

 dao/src/main/resources/mapper/LightMapper.xml

@@ -8,6 +8,7 @@
        <id property="lightId" column="light_id" jdbcType="BIGINT"/>
        <result property="deviceCode" column="device_code" jdbcType="VARCHAR"/>
        <result property="remark" column="remark" jdbcType="VARCHAR"/>
        <result property="lighCount" column="light_count" jdbcType="INTEGER"/>
        <result property="lightPercent" column="light_percent" jdbcType="INTEGER"/>
        <result property="light2Percent" column="light2_percent" jdbcType="INTEGER"/>
        <result property="power1" column="power1" jdbcType="INTEGER"/>

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java

@@ -5,6 +5,7 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
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.security.PermissionConfig;
import com.sandu.ximon.admin.service.LightReportDataService;
@@ -131,11 +132,8 @@
     * 设置功率
     */
    @PostMapping("/setPower/{power1}/{power2}")
    public ResponseVO<Object> setPower(@RequestBody  List<Long> ids, @PathVariable Integer power1,@PathVariable Integer power2) {
        if(ids.isEmpty()||power1==null||power2==null){
            return ResponseUtil.fail("id为空或者功率为空");
        }
        boolean resule= lightService.setPower(ids,power1,power2);
    public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
        boolean resule= lightService.setPower(lightPowerSettingParam);
        return ResponseUtil.success(resule);
    }
}

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

@@ -19,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;
@@ -485,11 +486,15 @@
        return CommonPage.restPage(list);
    }

    public boolean setPower(List<Long> ids, Integer power1, Integer power2) {
        List<Light> lights = listByIds(ids);
    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(power1);
                    light.setPower2(power2);
                    light.setPower1(lightPowerSettingParam.getPower1());
                    light.setPower2(lightPowerSettingParam.getPower2());
                    light.setLightCount(lightPowerSettingParam.getLightCount());
                }
        );
        return updateBatchById(lights);