From 4f0c98099f43028d29546c7000ef48bc89282dc4 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 06 五月 2022 18:35:52 +0800
Subject: [PATCH] Changes

---
 dao/src/main/resources/mapper/LightTaskMapper.xml                                 |    2 
 dao/src/main/java/com/sandu/ximon/dao/mapper/PoleLightemitEntityMapper.java       |    5 +
 dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml                       |   18 ++++
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java   |   13 +++
 dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java             |    6 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java         |   15 ++-
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java       |    5 +
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java   |   26 ++----
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java |   38 +++++++--
 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java    |   12 --
 ximon-admin/src/main/java/com/sandu/ximon/admin/security/test.java                |   37 ++++-----
 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java         |   36 ++++-----
 12 files changed, 129 insertions(+), 84 deletions(-)

diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java b/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
index 5477e90..a1715ea 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
@@ -73,6 +73,7 @@
     /**
      * 鍒涘缓鑰匢D
      */
+    @JsonIgnore
     private Long createUserId;
 
     /**
@@ -105,7 +106,10 @@
      * led灞忓箷寮�鍏�
      */
     @TableField(exist = false)
-    private Boolean isOpen;
+    private String isOpen;
+
+    @TableField(exist = false)
+    private boolean isOnLine;
 
     /*
      * 鐏潌鍚嶇О
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/PoleLightemitEntityMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/PoleLightemitEntityMapper.java
index 66dd645..4df9286 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/PoleLightemitEntityMapper.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/mapper/PoleLightemitEntityMapper.java
@@ -1,7 +1,8 @@
 package com.sandu.ximon.dao.mapper;
 
-import com.sandu.ximon.dao.domain.PoleLightemitEntity;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.sandu.ximon.dao.domain.Pole;
+import com.sandu.ximon.dao.domain.PoleLightemitEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -17,6 +18,8 @@
     void updateRequestBody(@Param("ledCode")String ledCode, @Param("postBody")String postBody);
 
     List<PoleLightemitEntity> listLed(String keyword, Long userid);
+
+    Pole getpole(String lightemitControlCode);
 }
 
 
diff --git a/dao/src/main/resources/mapper/LightTaskMapper.xml b/dao/src/main/resources/mapper/LightTaskMapper.xml
index fcc4895..c5d110d 100644
--- a/dao/src/main/resources/mapper/LightTaskMapper.xml
+++ b/dao/src/main/resources/mapper/LightTaskMapper.xml
@@ -55,7 +55,7 @@
         t3.device_type=0
         <if test=" taskId != null">
             AND
-            task_id = taskId
+            t2.task_id = #{taskId}
         </if>
     </select>
 </mapper>
diff --git a/dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml b/dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml
index f859bd9..ebc8067 100644
--- a/dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml
+++ b/dao/src/main/resources/mapper/PoleLightemitEntityMapper.xml
@@ -22,7 +22,8 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        lightemit_id,lightemit_name,lightemit_control_code,
+        lightemit_id
+        ,lightemit_name,lightemit_control_code,
         url,play_time,add_time,
         request_body,player_setting,status,
         remark,create_user_id,create_time
@@ -37,7 +38,7 @@
     <select id="listLed" resultType="com.sandu.ximon.dao.domain.PoleLightemitEntity">
         SELECT
         t1.*, t2.pole_id,
-        t3.pole_name  , t3.id
+        t3.pole_name , t3.id
         FROM
         pole_lightemit t1
         LEFT JOIN pole_binding t2 ON t1.lightemit_control_code = t2.device_code
@@ -54,4 +55,17 @@
             </if>
         </where>
     </select>
+    <select id="getpole" resultType="com.sandu.ximon.dao.domain.Pole" parameterType="java.lang.String">
+        SELECT
+        t1.*
+        FROM
+        pole t1
+        LEFT JOIN pole_binding t2 ON t1.id = t2.pole_id
+        LEFT JOIN pole_lightemit t3 ON t2.device_code = t3.lightemit_control_code
+        WHERE
+        t2.device_type = 10
+        <if test="lightemitControlCode != null">
+            AND t3.lightemit_control_code = #{lightemitControlCode}
+        </if>
+    </select>
 </mapper>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
index ce82c7a..3c4576f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
@@ -72,9 +72,9 @@
             return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
         }
         CommonPage commonPage = lightReportDataService.listReportData(conditionVO.getPageNo(), conditionVO.getPageSize(), keyword, deviceCode);
-        List<LightReportDataBo> lightReportDataBos = ( List<LightReportDataBo>)commonPage.getList();
+        List<LightReportDataBo> lightReportDataBos = (List<LightReportDataBo>) commonPage.getList();
 
-        if(lightReportDataBos == null){
+        if (lightReportDataBos == null) {
             return ResponseUtil.success(CommonPage.restPage(new ArrayList<>()));
         }
         CommonPage commonPage1 = CommonPage.restPage(lightReportDataBos);
@@ -116,32 +116,26 @@
         return ResponseUtil.success(list);
     }
 
-    @PostMapping("/EnergySaving")
-    public ResponseVO<Object> controlEnergySaving() {
-        return ResponseUtil.success(lightService.controlEnergySaving());
-    }
-
-
     @PostMapping("/Energy")
     @AnonymousAccess
     public ResponseVO<Object> Energy() {
         return ResponseUtil.success(lightService.controlEnergy());
     }
 
-//    /**
-//     * 鑾峰彇璁惧鐮�
-//     */
-//    @GetMapping("/deviceCode")
-//    public ResponseVO<Object> getDeviceCode(BaseConditionVO baseConditionVO) {
-//        return ResponseUtil.success(lightService.listDeviceCode(baseConditionVO.getPageNo() , baseConditionVO.getPageSize()));
-//    }
+    @AnonymousAccess
+    @PostMapping("/EnergySaving")
+    public ResponseVO<Object> controlEnergySaving() {
+        return ResponseUtil.success(lightService.controlEnergySaving());
+    }
+
+
 
     /**
      * 璁剧疆鍔熺巼
      */
     @PostMapping("/setPower")
     public ResponseVO<Object> setPower(@RequestBody LightPowerSettingParam lightPowerSettingParam) {
-        boolean resule= lightService.setPower(lightPowerSettingParam);
+        boolean resule = lightService.setPower(lightPowerSettingParam);
         return ResponseUtil.success(resule);
     }
 }
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
index 30f6786..4db242a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java
@@ -9,7 +9,6 @@
 import com.sandu.common.object.BaseConditionVO;
 import com.sandu.common.security.annotation.AnonymousAccess;
 import com.sandu.common.util.ResponseUtil;
-import com.sandu.common.util.SpringContextHolder;
 import com.sandu.ximon.admin.dto.DeviceStatus;
 import com.sandu.ximon.admin.param.PoleBindParam;
 import com.sandu.ximon.admin.param.PoleBindingParam;
@@ -26,7 +25,6 @@
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.sql.Wrapper;
 import java.util.List;
 
 /**
@@ -89,6 +87,7 @@
     /**
      * 鍦ㄧ嚎鏁伴噺
      */
+    @AnonymousAccess
     @GetMapping("/online")
     public ResponseVO<Object> online() {
         return ResponseUtil.success(poleService.poleCount());
@@ -244,20 +243,13 @@
     public ResponseVO<Object> getOwnerPole(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword
             , @PathVariable Long cilentId) {
         List<Pole> results = poleService.getOwnerPole(baseConditionVO, keyword, cilentId);
-//        CommonPage commonPage = CommonPage.restPage(results);
-//        int size = results.size();
-//        commonPage.setTotal((long) size);
-//        commonPage.setTotalPage(size / baseConditionVO.getPageSize() + 1);
-//        if (size % baseConditionVO.getPageSize() == 0) {
-//            commonPage.setTotalPage(size / baseConditionVO.getPageSize());
-//        }
-//        return ResponseUtil.success(commonPage);
         return ResponseUtil.success(results);
     }
 
     /**
      * 鏌ョ湅鐏潌缁戝畾鐨勮澶�
      */
+    @AnonymousAccess
     @PostMapping("/getPoleBindDevice/{poleId}")
     public ResponseVO<Object> getPoleBindDevice(@PathVariable Long poleId) {
         return ResponseUtil.success(poleService.getBindByPoleId(poleId));
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
index b94de67..ec6b235 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -7,6 +7,7 @@
 import com.sandu.common.domain.ResponseVO;
 import com.sandu.common.execption.BusinessException;
 import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.security.annotation.AnonymousAccess;
 import com.sandu.common.util.ResponseUtil;
 import com.sandu.common.util.SpringContextHolder;
 import com.sandu.ximon.admin.entity.ProgramPro;
@@ -302,6 +303,18 @@
     }
 
 
+    /**
+     * 娴嬭瘯
+     * @param
+     * @return
+     */
+    @AnonymousAccess
+    @PostMapping("/test/{str}")
+    public ResponseVO<Object> setBrightness(@PathVariable String str) {
+       return ResponseUtil.success(lightemitUtils.getIsScreenOpen(str));
+    }
+
+
     /*
     璁剧疆浜害
    */
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/test.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/test.java
index db7a44e..0ee479f 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/test.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/test.java
@@ -3,9 +3,6 @@
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.crypto.password.PasswordEncoder;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-
 /**
  * @Author liuhaonan
  * @Date 2022/2/24 10:15
@@ -13,29 +10,29 @@
  */
 public class test {
     public static void main(String[] args) {
-//
-//        String s="123456";//$2a$10$t0t9gaLuWT/1XFDfbjbUueWcj2G/Dx5vQCrtyRKWNlqkz6C/y.oXK
-//        PasswordEncoder pw= new BCryptPasswordEncoder();
-//        //鍔犲瘑
-//        String encode=pw.encode(s);
-//        System.out.println(encode);
-//        //姣旇緝瀵嗙爜
-//        boolean matches=pw.matches(s,encode);
-//        System.out.println("==============================");
-//        System.out.println(matches);
+
+        String s="123456";//$2a$10$t0t9gaLuWT/1XFDfbjbUueWcj2G/Dx5vQCrtyRKWNlqkz6C/y.oXK
+        PasswordEncoder pw= new BCryptPasswordEncoder();
+        //鍔犲瘑
+        String encode=pw.encode(s);
+        System.out.println(encode);
+        //姣旇緝瀵嗙爜
+        boolean matches=pw.matches(s,encode);
+        System.out.println("==============================");
+        System.out.println(matches);
 //
 // //       LocalDateTime now = LocalDateTime.now();
 ////        Integer week = now.getDayOfWeek().getValue();
 ////        System.out.println("鑾峰彇褰撳墠鍛�:" + week);
 ////
 
-        String format = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        System.out.println(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-        /**
-         * 鏃堕棿瀛楃涓茶浆涓篖ocalDateTime
-         */
-        LocalDateTime parse = LocalDateTime.parse(format, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
-        System.out.println(parse);
+//        String format = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//        System.out.println(LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+//        /**
+//         * 鏃堕棿瀛楃涓茶浆涓篖ocalDateTime
+//         */
+//        LocalDateTime parse = LocalDateTime.parse(format, DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
+//        System.out.println(parse);
 
     }
 }
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
index 58aa5cf..e51607a 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightService.java
@@ -327,8 +327,7 @@
             if (week < 1) {
                 week = 7;
             }
-            map.put(i, "鍛�" + week);
-            map.put(i, getlist(week));
+            map.put(i, getlistEnergy(week));
         }
 
 
@@ -546,7 +545,7 @@
             ControlLightCommandVO startTime = parseSwitchLightCommand(Task.getOpenOrder());
             ControlLightCommandVO endTime = parseSwitchLightCommand(Task.getCloseOrder());
             //鑾峰彇鍒板崟鐏换鍔$殑鑺傝兘鐜�
-            if (Task.getControlOrder() != null) {//鏈夋帶绛夋寚浠� 鎷嗗垎璁$畻
+            if (!Task.getControlOrder().isEmpty()) {//鏈夋帶绛夋寚浠� 鎷嗗垎璁$畻
                 List<ControlLightCommandVO> controlLightCommandVOS = parseControlLightCommand(Task.getControlOrder());
 
 
@@ -571,6 +570,7 @@
                 }
             } else {//鏃犳帶鐏寚浠� 鐩存帴璁$畻
                 BigDecimal bigDecimal = calculateEnergySaving(startTime, endTime);
+                //璁$畻鑳借��(閮ㄥ垎   鏃堕暱*浜害)
                 BigDecimal Energy = calculateEnergyConsumption(startTime, endTime);
                 //璁$畻鑳借��(鎬�   鏃堕暱*浜害*鍔熺巼)
                 BigDecimal totalEnergy = totalEnergy(Energy, Task.getLightAdress(), poleTaskLightPowerBos);
@@ -661,7 +661,14 @@
     //璁$畻鑳借��(閮ㄥ垎    鏃堕暱*浜害)
     public BigDecimal calculateEnergyConsumption(ControlLightCommandVO v1, ControlLightCommandVO v2) {
         //璁$畻鏃堕暱
-        BigDecimal hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
+        BigDecimal hour;
+        if (v2.getHour() > v1.getHour()){
+            hour = BigDecimal.valueOf((v2.getHour() - v1.getHour()));
+        }else if (v2.getHour() < v1.getHour()) {
+            hour = BigDecimal.valueOf((v2.getHour() + 24 - v1.getHour()));
+        } else {
+            hour = BigDecimal.valueOf(0);
+        }
         BigDecimal min = BigDecimal.valueOf((v2.getMin() - v1.getMin()) / 60);
         BigDecimal totalTime = (hour.add(min));
         //璁$畻浜伅鏃堕暱*浜害
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
index dbb3a1b..be5e1dc 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -99,6 +99,11 @@
             }
         }
 
+        if(baseConditionVO==null){
+            baseConditionVO = new BaseConditionVO();
+            baseConditionVO.setPageSize(null);
+            baseConditionVO.setPageNo(null);
+        }
         CommonPage commonPage = ListPagingUtils.pages(temp, baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
         return commonPage;
     }
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
index fdae699..9f03fab 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleLightemitService.java
@@ -11,6 +11,7 @@
 import com.sandu.ximon.admin.utils.FileUtil;
 import com.sandu.ximon.admin.utils.HtmlTemplateUtils;
 import com.sandu.ximon.admin.utils.LightemitUtils;
+import com.sandu.ximon.dao.domain.Pole;
 import com.sandu.ximon.dao.domain.PoleLightemitEntity;
 import com.sandu.ximon.dao.mapper.PoleLightemitEntityMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,22 +76,38 @@
         }
     }
 
+    /**
+     * 鍙栧嚭鍦ㄧ嚎鐨勭啓璁�
+     * @param list
+     * @return
+     */
     public List<PoleLightemitEntity> ledOnline(List<PoleLightemitEntity> list) {
         List<PoleLightemitEntity> onLineList = new ArrayList<>();
         for (PoleLightemitEntity poleLightemitEntity : list) {
-            poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true"));
-            if (poleLightemitEntity.getIsOpen()) {
+//            if(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true")){
+//                poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true"));
+//            }
+            poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()));
+            boolean ledOnLine = lightemitUtils.getLedOnLine(poleLightemitEntity.getLightemitControlCode());
+            if (ledOnLine) {
+                poleLightemitEntity.setOnLine(true);
                 onLineList.add(poleLightemitEntity);
+            } else {
+                poleLightemitEntity.setOnLine(false);
             }
         }
         return onLineList;
     }
 
 
+    /**
+     * 璁剧疆鍦ㄧ嚎鐘舵��
+     * @param list
+     */
     public void ledOnlineCheck(List<PoleLightemitEntity> list) {
         for (PoleLightemitEntity poleLightemitEntity : list) {
-            poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()).contains("true"));
-
+            poleLightemitEntity.setIsOpen(lightemitUtils.getIsScreenOpen(poleLightemitEntity.getLightemitControlCode()));
+            poleLightemitEntity.setOnLine(lightemitUtils.getLedOnLine(poleLightemitEntity.getLightemitControlCode()));
         }
     }
 
@@ -103,14 +120,17 @@
      */
     public PoleLightemitEntity getLedByLightControlCode(String lightControlCode) {
         PoleLightemitEntity xiXun = getOne(Wrappers.lambdaQuery(PoleLightemitEntity.class).eq(PoleLightemitEntity::getLightemitControlCode, lightControlCode));
+        Pole getpole = poleLightemitDao.getpole(lightControlCode);
         if (xiXun == null) {
             return null;
         }
-        String isScreenOpen = lightemitUtils.getIsScreenOpen(xiXun.getLightemitControlCode());
-        if (isScreenOpen.contains("true")) {
-            xiXun.setIsOpen(true);
-        }
-        xiXun.setIsOpen(false);
+        boolean isScreenOpen = lightemitUtils.getLedOnLine(xiXun.getLightemitControlCode());
+
+        xiXun.setIsOpen(lightemitUtils.getIsScreenOpen(lightControlCode));
+        xiXun.setOnLine(isScreenOpen);
+        xiXun.setStreetlightName(getpole.getPoleName());
+        xiXun.setStreetlightId(getpole.getId());
+
         return xiXun;
     }
 
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
index a43f36d..ee17684 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
@@ -259,6 +259,7 @@
      */
     public String getIsScreenOpen(String ledCode) {
         String result = this.post(realtimeServerBean.getCommand() + ledCode, new Gson().toJson(new IsScreenOpen()));
+        LogUtils.error("getIsScreenOpen:" + result);
         //鑾峰彇base64鍥剧墖鏁版嵁
         if (StringUtils.isNotBlank(result)) {
             String re;
@@ -273,28 +274,23 @@
         }
     }
 
-    /*
-    鍚姩xwalk
-     */
-    /*public void startActivity(String ledCode){
-        String result = this.post(realtimeServerBean.getCommand() + ledCode, new Gson().toJson(new StartActivity()));
-    }*/
 
-    /*
-    浣跨敤xwalk鍔犺浇缃戦〉
-     */
-    /*public void callXwalkFn(String ledCode,String username){
+    public boolean getLedOnLine(String ledCode) {
+        String result = this.post(realtimeServerBean.getCommand() + ledCode, new Gson().toJson(new IsScreenOpen()));
+        LogUtils.error("getLedOnLine:" + result);
+        //鑾峰彇base64鍥剧墖鏁版嵁
+        if (StringUtils.isNotBlank(result)) {
+            String re;
+            if (result.contains("not exist")) {
+                return false;
+            } else {
+                return true;
+            }
+        } else {
+            return false;
+        }
+    }
 
-        CallXwalkFn callXwalkFn = new CallXwalkFn();
-
-        callXwalkFn.setArgUrl(realtimeServerBean.getUrl() + username + "_" + ledCode + ".html");
-        String postBody = new Gson().toJson(callXwalkFn);
-
-        //璇锋眰鍦板潃
-        String url = realtimeServerBean.getCommand() + ledCode;
-        //璇锋眰
-        String result =  post(url,postBody);
-    }*/
 
     /*
    鎺у埗灞忓箷寮�鍏�

--
Gitblit v1.9.3