2021与蓝度共同重构项目,服务端
liuhaonan
2022-04-02 f04d30ab99bbf96b9ece042478e7054a5130aab3
熙讯亮度调节接口新增
已修改3个文件
已添加2个文件
85 ■■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/param/SetBrightnessParam.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/SetBrightness.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -12,6 +12,7 @@
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.entity.ProgramPro;
import com.sandu.ximon.admin.param.LEDScheduleParam_xixun;
import com.sandu.ximon.admin.param.SetBrightnessParam;
import com.sandu.ximon.admin.param.SetScreenOpenParam;
import com.sandu.ximon.admin.param.SetVolumeParam;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -23,7 +24,6 @@
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import lombok.AllArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@@ -63,7 +63,7 @@
     */
    @PostMapping("/updateProgram")
    // @RequiresPermissions("pole:polexixunplayer:update")
    public ResponseVO<Object> update(@RequestBody  ProgramPro programPro) {
    public ResponseVO<Object> update(@RequestBody ProgramPro programPro) {
        PoleXixunPlayerEntity byId = xiXunPlayerService.getById(programPro.getProgramId());
        if (byId == null) {
            throw new BusinessException("未选择LED屏");
@@ -352,6 +352,29 @@
    /*
  è®¾ç½®éŸ³é‡
   */
    @PostMapping("/setBrightness")
    public ResponseVO<Object> setBrightness(@RequestBody SetBrightnessParam setBrightnessParam) {
        if (setBrightnessParam == null || setBrightnessParam.getIds() == null || setBrightnessParam.getBrightness() > 255) {
            throw new BusinessException("参数错误为空或亮度不能超过255");
        }
        Collection poleLightemitControllers = poleLightemitService.listByIds(Arrays.asList(setBrightnessParam.getIds()));
        if (!poleLightemitControllers.isEmpty()) {
            Iterator iterator = poleLightemitControllers.iterator();
            while (iterator.hasNext()) {
                PoleLightemitEntity poleLightemitEntity = (PoleLightemitEntity) iterator.next();
                poleLightemitService.setBrightness(poleLightemitEntity.getLightemitControlCode(), setBrightnessParam.getBrightness());
            }
            return ResponseUtil.success("设置亮度成功");
        } else {
            throw new BusinessException("未选择LED屏");
        }
    }
    /*
 è®¾ç½®éŸ³é‡
  */
    @PostMapping("/setVolume")
    public ResponseVO<Object> setVolume(@RequestBody SetVolumeParam setVolumeEntity) {
ximon-admin/src/main/java/com/sandu/ximon/admin/param/SetBrightnessParam.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.sandu.ximon.admin.param;
import lombok.Data;
/**
 * @program: machine-fast
 * @description: è®¾ç½®äº®åº¦
 * @author: YSS
 * @create: 2019-09-18 10:46
 **/
@Data
public class SetBrightnessParam {
    private Long[] ids;
    private Integer brightness ;
}
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -546,6 +546,15 @@
    public void setVolume(String lightemitControlCode, Integer volume) {
        lightemitUtils.setVoiume(lightemitControlCode, volume);
    }
       /*
    æ ¹æ®led屏编码设置音量
     */
    @Async("taskExecutor")
    public void setBrightness(String lightemitControlCode, Integer brightness) {
        lightemitUtils.setBrightness(lightemitControlCode, brightness);
    }
//    public List<PoleLightemitEntity> listOfStreetlight(String streetlightId) {
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
@@ -345,6 +345,21 @@
        LogUtils.error("设置结果:-------------------" + result);
    }
    /*
  è®¾ç½®led亮度
   */
    public void setBrightness(String ledCode, Integer brightness) {
        SetBrightness setBrightness = new SetBrightness();
        setBrightness.arg1 = brightness;
        String postBody = new Gson().toJson(setBrightness);
        //请求
        String result = post(realtimeServerBean.getCommand() + ledCode, postBody);
        LogUtils.error("设置结果:-------------------" + result);
    }
    //    èŽ·å–led音量
    public String getVoiume(String ledCode) {
        GetVolume getVolume = new GetVolume();
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/SetBrightness.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.sandu.ximon.admin.utils.request;
/**
 * @program:
 * @description: è®¾ç½®äº®åº¦
 * @author: YSS
 * @create: 2019-09-17 18:03
 **/
public class SetBrightness {
    public final String type = "callCardService";
    public final String fn = "setBrightness";
    public Integer arg1 = 6;
}