2021与蓝度共同重构项目,服务端
liuhaonan
2022-02-25 aeec50b8f8ac920884bb2f466cca27e8ee8bc089
功能完善
已修改5个文件
35 ■■■■■ 文件已修改
ximon-admin/pom.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/resources/application.yml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/pom.xml
@@ -52,6 +52,11 @@
            <artifactId>aliyun-sdk-oss</artifactId>
            <version>3.13.1</version>
        </dependency>
        <dependency>
            <groupId>com.github.jsqlparser</groupId>
            <artifactId>jsqlparser</artifactId>
            <version>4.3</version>
        </dependency>
        <!--阿里云物联网 -->
    </dependencies>
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -15,6 +15,7 @@
import com.sandu.ximon.admin.service.ClientService;
import com.sandu.ximon.admin.service.PoleLightemitService;
import com.sandu.ximon.admin.service.XiXunPlayerService;
import com.sandu.ximon.admin.utils.LightemitUtils;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.PlayPlanNv;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
@@ -39,6 +40,7 @@
    private final XiXunPlayerService xiXunPlayerService;
    private final ClientService clientService;
    private final PoleLightemitService poleLightemitService;
    private final LightemitUtils lightemitUtils;
    @PostMapping("/addProgram")
    public ResponseVO<Object> addProgram(@RequestBody ProgramPro programPro){
@@ -143,4 +145,21 @@
        }
        return ResponseUtil.success(poleLightemitService.list(wrapper));
    }
    /*
  获取led实时画面
   */
    @GetMapping("/getPicture/{id}")
    public ResponseVO<Object> getPicture(@PathVariable Long id){
        if(id == null){
           throw new BusinessException("未选择LED屏");
        }
        PoleLightemitEntity poleLightemitEntity = poleLightemitService.getById(id);
        if(poleLightemitEntity != null){
            String result = lightemitUtils.getPicture(poleLightemitEntity.getLightemitControlCode());
            return ResponseUtil.success(result);
        }else {
            throw new BusinessException("未选择LED屏");
        }
    }
}
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.service;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -90,6 +91,9 @@
        queryWrapper.eq("program_id", programId);
        poleXixunPlayerEntity = this.getOne(queryWrapper);
        String json = poleXixunPlayerEntity.getRequestBody();
        System.out.println( JSON.parseArray(json, ProgramPro.class));
        try {
            pro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
        } catch (Exception e) {
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
@@ -117,6 +117,7 @@
        //请求
//        poleLightemitService.updateRequestBody(ledCode, "");
        String result = post(url, postBody);
        LogUtils.error("清屏结果:"+result);
    }
    /**
ximon-admin/src/main/resources/application.yml
@@ -32,8 +32,10 @@
# led屏幕服务器地址(更改需要同时更改)
realtime-server:
  command: http://101.132.131.91:8081/payload/
  url: http://101.132.131.91:8081/
#  command: http://101.132.131.91:8081/payload/
#  url: http://101.132.131.91:8081/
  command: http://112.74.63.130:20018/command/
  url: http://112.74.63.130:20018/
# nginx相关地址
nginx: