bigScreenControlle已经修改完成

src/main/java/com/welampiot/dao/BroadcastDao.java

@@ -43,4 +43,5 @@ public interface BroadcastDao {
     void updateBroadcastById(BroadcastDTO dto);
     List<BroadcastDTO> getListByIds(@Param("ids")String ids);
     BroadcastDTO getOneDataByLampPoleId(Integer lampPoleId);
+    BroadcastDTO getData(Integer lampPoleId);
 }

src/main/java/com/welampiot/dao/ChargeDao.java

@@ -53,4 +53,5 @@ public interface ChargeDao {
     ChargeDTO getOneCharge(HashMap<String,Object> map);
     ChargeDTO getOneChargeByLampPoleId(Integer lampPoleId);
     ChargeDTO getOne(Integer lampPoleId);
+    List<ChargeDTO> getList(ChargeDTO dto);
 }

src/main/java/com/welampiot/dao/ChargeDataDao.java

@@ -14,4 +14,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface ChargeDataDao {
     ChargeDataDTO getChargeDataByLampPoleId(@Param("lampPoleId") Integer lampPoleId);
+    ChargeDataDTO getOne(Integer chargeId);
 }

src/main/java/com/welampiot/dao/EmergencyDao.java

@@ -42,4 +42,6 @@ public interface EmergencyDao {
     List<EmergencyDTO> getEmergencyJoinList(EmergencyVO vo);
     EmergencyDTO getSectionOne(Integer id);
     EmergencyDTO getOneEmergency(HashMap<String,Object> map);
+    EmergencyDTO getOne(Integer lampPoleId);
+    List<EmergencyDTO> getList(EmergencyDTO dto);
 }

src/main/java/com/welampiot/dao/EmergencyInfoLogDao.java

@@ -27,4 +27,5 @@ public interface EmergencyInfoLogDao {
     List<EmergencyInfoLogDTO> getHisLogListByLampPoleId(@Param("lampPoleId") Integer lampPoleId);
 
     List<EmergencyInfoLogDTO> getEmergencyListByDevNum(@Param("num") String num);
+    List<EmergencyInfoLogDTO> getList(EmergencyInfoLogDTO dto);
 }

src/main/java/com/welampiot/dao/EnvmonitorDao.java

@@ -72,4 +72,6 @@ public interface EnvmonitorDao {
     List<EnvmonitorDTO> getNewMapDataByVO(MapDataVO vo);
     EnvmonitorDTO getOneEnvmonitor(HashMap<String,Object> map);
     EnvmonitorDTO getOne(Integer lampPoleId);
+    List<EnvmonitorDTO> getList(EnvmonitorDTO dto);
+    void updateWeatherInfo(EnvmonitorDTO dto);
 }

src/main/java/com/welampiot/dao/LampInfoLogDao.java

@@ -17,4 +17,5 @@ public interface LampInfoLogDao {
     List<LampInfoLogDTO> consumptionTOP(LampInfoLogDTO dto);
     AllAlarmInfoLogVO alarmCountChart(LampInfoLogDTO dto);
     LampInfoLogDTO getOne(Integer lampId);
+    List<LampInfoLogDTO> getList(LampInfoLogDTO dto);
 }

src/main/java/com/welampiot/dao/LampPoleAlarmLogDao.java

@@ -8,4 +8,6 @@ import java.util.List;
 public interface LampPoleAlarmLogDao {
     List<LampPoleAlarmLogDTO> getListByLampPoleIdList(@Param("lampPoleIdList") List lampPoleIdList);
     Integer getCountByLampPoleIdList(@Param("lampPoleIdList") List lampPoleIdList);
+    Integer getOneData(Integer lampPoleId);
+    List<LampPoleAlarmLogDTO> getList(Integer lampPoleId);
 }

src/main/java/com/welampiot/dao/WebsocketClientDao.java

@@ -0,0 +1,8 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.WebsocketClientDTO;
+
+public interface WebsocketClientDao {
+     WebsocketClientDTO getOne(Integer clientId);
+    void addData(WebsocketClientDTO dto);
+}

src/main/java/com/welampiot/dao/WifiInfoLogDao.java

@@ -27,4 +27,5 @@ public interface WifiInfoLogDao {
     WifiInfoLogDTO getWifiDayTotalCom(@Param("id") Integer id, @Param("startDate") String startDate);
     List<WifiInfoLogDTO> getWifiLog(HashMap<String,Object> hashMap);
     List<WifiInfoLogDTO> getList(WifiInfoLogDTO dto);
+    WifiInfoLogDTO getOne(Integer wifiId);
 }

src/main/java/com/welampiot/dto/BroadcastDTO.java

@@ -81,4 +81,5 @@ public class BroadcastDTO implements Serializable {
     private List<Integer> sectionList;
 
     private static final long serialVersionUID = 1L;
+    private String itemName;
 }

src/main/java/com/welampiot/dto/ChargeDTO.java

@@ -150,4 +150,11 @@ public class ChargeDTO implements Serializable {
     private List<?> sectionList;
 
     private static final long serialVersionUID = 1L;
+    private Float totalMoney;
+    private Float totalPower;
+    private String sectionName;
+    private String number;
+    private Integer chargeId;
+    private String devType;
+    private String totalTime;
 }

src/main/java/com/welampiot/dto/EmergencyDTO.java

@@ -3,7 +3,6 @@ package com.welampiot.dto;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.List;
 
 /**
  * ClassName: EmergencyDTO
@@ -56,4 +55,6 @@ public class EmergencyDTO implements Serializable {
 
     private String beginDate;
     private String name;
+    private Integer version;
+    private String area;
 }

src/main/java/com/welampiot/dto/EmergencyInfoLogDTO.java

@@ -3,6 +3,7 @@ package com.welampiot.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * ClassName: EmergencyInfoLogDTO
@@ -30,4 +31,6 @@ public class EmergencyInfoLogDTO implements Serializable {
     private String updateTime;
 
     private String time;
+    private List<Integer> ids;
+    private String area;
 }

src/main/java/com/welampiot/dto/EnvmonitorDTO.java

@@ -167,7 +167,7 @@ public class EnvmonitorDTO implements Serializable {
     private Float windSpeed;
 
     /** 风向 **/
-    private Integer windDire;
+    private String windDire;
 
     /** 雨量 **/
     private Float rainfall;
@@ -214,7 +214,8 @@ public class EnvmonitorDTO implements Serializable {
     private String province;
     private String location;
 
-    private WeatherDTO weatherData;
+//    private WeatherDTO weatherData;
+    private NetworkWeather weatherData;
     private List<NetworkWeather> weatherList;
     List<WeatherRS485DevInfoDTO> devList;
 
@@ -225,4 +226,6 @@ public class EnvmonitorDTO implements Serializable {
     private String airLevel;
 
     private static final long serialVersionUID = 1L;
+    private String sectionName;
+    private Integer version;
 }

src/main/java/com/welampiot/dto/EnvmonitorInfoLogDTO.java

@@ -60,4 +60,8 @@ public class EnvmonitorInfoLogDTO implements Serializable {
     private String tsp;
     private String devType;
     private List<NetworkWeather> weatherList;
+    private Integer level;
+    private Integer netType;
+    private String aqi;
+    private NetworkWeather weatherInfo;
 }

src/main/java/com/welampiot/dto/LampInfoDTO.java

@@ -108,6 +108,7 @@ public class LampInfoDTO {
     private List<Object> dateList; // 日期列表
     private List<Object> energyList; // 用电量列表
     private List<Object> powerSaveList; // 省电量列表
+    private List<Object> saveList; // 省电量列表
     private String deviceId;
     public LampInfoDTO(){
     }

src/main/java/com/welampiot/dto/LampInfoLogDTO.java

@@ -41,4 +41,6 @@ public class LampInfoLogDTO {
     private Float gridPF;
     private Integer workTimeTotal;
     private Float usedEnergyTotal;
+    private Float totalEleSave;
+    private Integer sumPowerSave;
 }

src/main/java/com/welampiot/dto/LampPoleAlarmLogDTO.java

@@ -9,4 +9,9 @@ public class LampPoleAlarmLogDTO {
     private String updateTime;
     private Integer status;
     private Integer devType;
+    private Integer alarmType;
+    private String alarmInfo;
+    private String handleTime;
+    private Integer alarmStatus;
+    private String endDate;
 }

src/main/java/com/welampiot/dto/ScreenDTO.java

@@ -163,4 +163,5 @@ public class ScreenDTO implements Serializable {
     private String path;  // 截屏地址
 
     private static final long serialVersionUID = 1L;
+    private String next;
 }

src/main/java/com/welampiot/dto/VideoMonitorDTO.java

@@ -82,4 +82,6 @@ public class VideoMonitorDTO {
     private List<VideoCarDTO> carList; // 车牌识别列表
     private List<TrailInfoDTO> trailList; // 轨迹搜索图片
     private List<TrailInfoDTO> smailList; // 相似度列表
+    private String rtmpHdT;
+    private String rtmpT;
 }

src/main/java/com/welampiot/dto/WebsocketClientDTO.java

@@ -0,0 +1,13 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+@Data
+public class WebsocketClientDTO {
+    private Integer id;
+    private Integer clientId;
+    private Integer type;
+    private Integer deviceId;
+    private Integer isWss;
+    private Integer version;
+}

src/main/java/com/welampiot/dto/WifiDTO.java

@@ -324,5 +324,6 @@ public class WifiDTO implements Serializable {
     private List<Object> flowList;
     private Integer totalDevice;
     private List<Object> xDataList;
-    private Float totalFlow;
+    private Object totalFlow;
+    private Integer dayDevice;
 }

src/main/java/com/welampiot/service/BroadcastService.java

@@ -39,4 +39,5 @@ public interface BroadcastService {
     List<BroadcastDTO> getListByIds(@Param("ids")String ids);
     Integer getTotalBySectionList(BroadcastDTO dto);
     BroadcastDTO getOneDataByLampPoleId(Integer lampPoleId);
+    BroadcastDTO getData(Integer lampPoleId);
 }

src/main/java/com/welampiot/service/ChargeDataService.java

@@ -13,4 +13,5 @@ import com.welampiot.dto.ChargeDataDTO;
  */
 public interface ChargeDataService {
     ChargeDataDTO getChargeDataByLampPoleId(Integer lampPoleId);
+    ChargeDataDTO getOne(Integer chargeId);
 }

src/main/java/com/welampiot/service/ChargeService.java

@@ -40,4 +40,5 @@ public interface ChargeService {
     ChargeDTO getOneCharge(HashMap<String,Object> map);
     ChargeDTO getOneChargeByLampPoleId(Integer lampPoleId);
     ChargeDTO getOne(Integer lampPoleId);
+    List<ChargeDTO> getList(ChargeDTO dto);
 }

src/main/java/com/welampiot/service/EmergencyInfoLogService.java

@@ -27,4 +27,5 @@ public interface EmergencyInfoLogService {
     List<EmergencyInfoLogDTO> getHisLogListByLampPoleId(Integer lampPoleId);
 
     List<EmergencyInfoLogDTO> getEmergencyListByDevNum(String num) throws ParseException;
+    List<EmergencyInfoLogDTO> getList(EmergencyInfoLogDTO dto);
 }

src/main/java/com/welampiot/service/EmergencyService.java

@@ -41,4 +41,6 @@ public interface EmergencyService {
     List<EmergencyDTO> getEmergencyJoinList(EmergencyVO vo);
     EmergencyDTO getSectionOne(Integer id);
     EmergencyDTO getOneEmergency(HashMap<String,Object> map);
+    EmergencyDTO getOne(Integer lampPoleId);
+    List<EmergencyDTO> getList(EmergencyDTO dto);
 }

src/main/java/com/welampiot/service/EnvmonitorService.java

@@ -69,4 +69,6 @@ public interface EnvmonitorService {
     List<EnvmonitorDTO> getNewMapDataByVO(MapDataVO vo);
     EnvmonitorDTO getOneEnvmonitor(HashMap<String,Object> map);
     EnvmonitorDTO getOne(Integer lampPoleId);
+    List<EnvmonitorDTO> getList(EnvmonitorDTO dto);
+    void updateWeatherInfo(EnvmonitorDTO dto);
 }

src/main/java/com/welampiot/service/LampInfoLogService.java

@@ -16,4 +16,5 @@ public interface LampInfoLogService {
     List<LampInfoLogDTO> consumptionTOP(LampInfoLogDTO dto);
     AllAlarmInfoLogVO alarmCountChart(LampInfoLogDTO dto);
     LampInfoLogDTO getOne(Integer lampId);
+    List<LampInfoLogDTO> getList(LampInfoLogDTO dto);
 }

src/main/java/com/welampiot/service/LampPoleAlarmLogService.java

@@ -8,4 +8,7 @@ import java.util.List;
 public interface LampPoleAlarmLogService {
     List<LampPoleAlarmLogDTO> getListByLampPoleIdList(@Param("lampPoleIdList") List lampPoleIdList);
     Integer getCountByLampPoleIdList(@Param("lampPoleIdList") List lampPoleIdList);
+    List<LampPoleAlarmLogDTO> getList(Integer lampPoleId);
+    Integer getOneData(Integer lampPoleId);
+
 }

src/main/java/com/welampiot/service/WebsocketClientService.java

@@ -0,0 +1,9 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.WebsocketClientDTO;
+
+public interface WebsocketClientService {
+     WebsocketClientDTO getOne(Integer clientId);
+     void addData(WebsocketClientDTO dto);
+
+}

src/main/java/com/welampiot/service/WifiInfoLogService.java

@@ -28,4 +28,5 @@ public interface WifiInfoLogService {
     WifiInfoLogDTO getWifiDayTotalCom(Integer id, String startDate);
     List<WifiInfoLogDTO> getWifiLog(HashMap<String,Object> hashMap);
     List<WifiInfoLogDTO> getList(WifiInfoLogDTO dto);
+    WifiInfoLogDTO getOne(Integer wifiId);
 }

src/main/java/com/welampiot/service/impl/BroadcastServiceImpl.java

@@ -177,4 +177,8 @@ public class BroadcastServiceImpl implements BroadcastService {
     public BroadcastDTO getOneDataByLampPoleId(Integer lampPoleId){
         return broadcastDao.getOneDataByLampPoleId(lampPoleId);
     }
+    @Override
+    public BroadcastDTO getData(Integer lampPoleId){
+        return broadcastDao.getData(lampPoleId);
+    }
 }

src/main/java/com/welampiot/service/impl/ChargeDataServiceImpl.java

@@ -24,4 +24,8 @@ public class ChargeDataServiceImpl implements ChargeDataService {
     public ChargeDataDTO getChargeDataByLampPoleId(Integer lampPoleId) {
         return chargeDataDao.getChargeDataByLampPoleId(lampPoleId);
     }
+    @Override
+    public ChargeDataDTO getOne(Integer chargeId){
+        return chargeDataDao.getOne(chargeId);
+    }
 }

src/main/java/com/welampiot/service/impl/ChargeServiceImpl.java

@@ -225,4 +225,8 @@ public class ChargeServiceImpl implements ChargeService {
     public ChargeDTO getOne(Integer lampPoleId){
         return chargeDao.getOne(lampPoleId);
     }
+    @Override
+    public List<ChargeDTO> getList(ChargeDTO dto){
+        return chargeDao.getList(dto);
+    }
 }

src/main/java/com/welampiot/service/impl/EmergencyInfoLogServiceImpl.java

@@ -69,4 +69,9 @@ public class EmergencyInfoLogServiceImpl implements EmergencyInfoLogService {
         }
         return list;
     }
+
+    @Override
+    public List<EmergencyInfoLogDTO> getList(EmergencyInfoLogDTO dto){
+        return emergencyInfoLogDao.getList(dto);
+    }
 }

src/main/java/com/welampiot/service/impl/EmergencyServiceImpl.java

@@ -90,4 +90,12 @@ public class EmergencyServiceImpl implements EmergencyService {
     public EmergencyDTO getOneEmergency(HashMap<String,Object> map){
         return emergencyDao.getOneEmergency(map);
     }
+    @Override
+    public EmergencyDTO getOne(Integer lampPoleId){
+        return emergencyDao.getOne(lampPoleId);
+    }
+    @Override
+    public List<EmergencyDTO> getList(EmergencyDTO dto){
+        return emergencyDao.getList(dto);
+    }
 }

src/main/java/com/welampiot/service/impl/EnvmonitorServiceImpl.java

@@ -110,7 +110,7 @@ public class EnvmonitorServiceImpl implements EnvmonitorService {
                 envmonitorDTO.setWindSpeed(0.0f);
             }
             if (envmonitorDTO.getWindDire() == null){
-                envmonitorDTO.setWindDire(0);
+                envmonitorDTO.setWindDire("0");
             }
             if (envmonitorDTO.getRainfall() == null){
                 envmonitorDTO.setRainfall(0.0f);
@@ -315,4 +315,12 @@ public class EnvmonitorServiceImpl implements EnvmonitorService {
     public EnvmonitorDTO getOne(Integer lampPoleId){
         return envmonitorDao.getOne(lampPoleId);
     }
+    @Override
+    public List<EnvmonitorDTO> getList(EnvmonitorDTO dto){
+        return envmonitorDao.getList(dto);
+    }
+    @Override
+    public void updateWeatherInfo(EnvmonitorDTO dto){
+        envmonitorDao.updateWeatherInfo(dto);
+    }
 }

src/main/java/com/welampiot/service/impl/LampInfoLogServiceImpl.java

@@ -55,4 +55,8 @@ public class LampInfoLogServiceImpl implements LampInfoLogService {
     public LampInfoLogDTO getOne(Integer lampId){
         return lampInfoLogDao.getOne(lampId);
     }
+    @Override
+    public List<LampInfoLogDTO> getList(LampInfoLogDTO dto){
+        return lampInfoLogDao.getList(dto);
+    }
 }

src/main/java/com/welampiot/service/impl/LampPoleAlarmLogServiceImpl.java

@@ -23,4 +23,12 @@ public class LampPoleAlarmLogServiceImpl implements LampPoleAlarmLogService {
         Integer countByLampPoleIdList = lampPoleAlarmLogDao.getCountByLampPoleIdList(lampPoleIdList);
         return countByLampPoleIdList;
     }
+    @Override
+    public List<LampPoleAlarmLogDTO> getList(Integer lampPoleId){
+        return lampPoleAlarmLogDao.getList(lampPoleId);
+    }
+    @Override
+    public Integer getOneData(Integer lampPoleId){
+        return lampPoleAlarmLogDao.getOneData(lampPoleId);
+    }
 }

src/main/java/com/welampiot/service/impl/WebsocketClientSeviceImpl.java

@@ -0,0 +1,22 @@
+package com.welampiot.service.impl;
+
+import com.welampiot.dao.WebsocketClientDao;
+import com.welampiot.dto.WebsocketClientDTO;
+import com.welampiot.service.WebsocketClientService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class WebsocketClientSeviceImpl implements WebsocketClientService {
+    @Autowired
+    private WebsocketClientDao websocketClientDao;
+
+    @Override
+    public WebsocketClientDTO getOne(Integer clientId) {
+        return websocketClientDao.getOne(clientId);
+    }
+    @Override
+    public void addData(WebsocketClientDTO dto){
+        websocketClientDao.addData(dto);
+    }
+}

src/main/java/com/welampiot/service/impl/WifiInfoLogServiceImpl.java

@@ -61,4 +61,8 @@ public class WifiInfoLogServiceImpl implements WifiInfoLogService {
     public List<WifiInfoLogDTO> getList(WifiInfoLogDTO dto){
         return wifiInfoLogDao.getList(dto);
     }
+    @Override
+    public WifiInfoLogDTO getOne(Integer wifiId){
+        return wifiInfoLogDao.getOne(wifiId);
+    }
 }

src/main/java/com/welampiot/utils/ToolUtils.java

@@ -1981,4 +1981,152 @@ System.out.println(res);
         }
         return res;
     }
+
+    // 风向信息翻译
+    public String windTranslateEn(int code,int devType){
+        ArrayList<String> data = new ArrayList<>();
+        if (devType == 7){
+            data.add("North wind");
+            data.add("northeast wind");
+            data.add("East wind");
+            data.add("Southeast wind");
+            data.add("South wind");
+            data.add("Southwest wind");
+            data.add("West Wind");
+            data.add("Northwest wind");
+        }else {
+            data.add("North northeast");
+            data.add("Northeast");
+            data.add("East Northeast");
+            data.add("Due east");
+            data.add("Southeast to East");
+            data.add("Southeast");
+            data.add("Southeast to South");
+            data.add("Due south");
+            data.add("Southwest to South");
+            data.add("Southwest");
+            data.add("Southwest by West");
+            data.add("due west");
+            data.add("Northwest by West");
+            data.add("Northwest");
+            data.add("Northwest northwest");
+            data.add("Due north");
+        }
+        return data.get(code) == null ? "" : data.get(code);
+    }
+
+    // 风向信息翻译
+    public String windTranslateCn(int code,int devType){
+        ArrayList<String> data = new ArrayList<>();
+        if (devType == 7){
+            data.add("北风");
+            data.add("东北风");
+            data.add("东风");
+            data.add("东南风");
+            data.add("南风");
+            data.add("西南风");
+            data.add("西风");
+            data.add("西北风");
+        }else {
+            data.add("东北偏北");
+            data.add("东北");
+            data.add("东北偏东");
+            data.add("正东");
+            data.add("东南偏东");
+            data.add("东南");
+            data.add("东南偏南");
+            data.add("正南");
+            data.add("西南偏南");
+            data.add("西南");
+            data.add("西南偏西");
+            data.add("正西");
+            data.add("西北偏西");
+            data.add("西北");
+            data.add("西北偏北");
+            data.add("正北");
+        }
+        return data.get(code) == null ? "" : data.get(code);
+    }
+    // 风向信息翻译
+    public String windTranslateRn(int code,int devType){
+        ArrayList<String> data = new ArrayList<>();
+        if (devType == 7){
+            data.add("Северный ветер");
+            data.add("северо-восточный ветер");
+            data.add("Восточный ветер");
+            data.add("Юго-восточный ветер");
+            data.add("Южный ветер");
+            data.add("Юго-западный ветер");
+            data.add("Западный ветер");
+            data.add("Северо-западный ветер");
+        }else {
+            data.add("Северо-Восток, Север");
+            data.add("В северо-восточной");
+            data.add("Северо-Восток");
+            data.add("восток");
+            data.add("Юго-Восток, северо-Восток");
+            data.add("В юго-восточной");
+            data.add("Юго-Восток, юго-Запад");
+            data.add("юг");
+            data.add("Юго-Запад, юго-Запад");
+            data.add("Юго-западный");
+            data.add("Юго-Запад, Запад");
+            data.add("Западу от");
+            data.add("Северо-Запад");
+            data.add("Северо -");
+            data.add("Северо-Запад, Север");
+            data.add("северное");
+        }
+        return data.get(code) == null ? "" : data.get(code);
+    }
+    // 获取国标摄像头播放地址
+    public String getOnvifPlayAddress(String num,Integer model,String stream) throws IOException {
+        String url = "http://"+ToolUtils.gbHost+":8060/index/api/getMediaList?secret=weclouds123";
+        String res = this.sendHttp("get",url,null,5,null,null);
+        String address = "";
+        if (res != null){
+            JSONObject parseObject = JSON.parseObject(res);
+            Integer code = parseObject.getInteger("code");
+            if (code == 0){
+                //成功
+                int flag = 0;
+                JSONArray data = parseObject.getJSONArray("data");
+                for (Object obj:data) {
+                    JSONObject temp = (JSONObject)obj;
+                    String resStream = temp.getString("stream");
+                    Integer bytesSpeed = temp.getInteger("bytesSpeed");
+                    if (resStream.toLowerCase().equals(stream.toLowerCase()) && !bytesSpeed.equals(0)){
+                        flag = 1;
+                        break;
+                    }
+                }
+                if (flag == 1){
+                    address = "https://gb.lampmind.com:8087/gb3/live/"+stream+"/hls.m3u8";
+                }else {
+                    String top = "";
+                    if (model == 0){
+                        top = "WEGW";
+                    } else if (model == 1 || model == 5) {
+                        top = "WEGW2";
+                    }else {
+                        top = "WEGW3";
+                    }
+                    JSONObject json = new JSONObject();
+                    json.put("reqId", 20);
+                    json.put("msgType", "startStream");
+                    json.put("op", "W");
+                    JSONObject jsonStream = new JSONObject();
+                    jsonStream.put("uuid", stream);
+                    json.put("prop", jsonStream);
+                    String sendData = json.toString();
+                    String sendTopic = "/"+top+"/DevManagerIn/"+num;
+                    String backTopic = "/"+top+"/DevManagerIn/"+num;
+                    String back = this.sendWifiMqttCmd(sendTopic, sendData, backTopic, 5);
+                    address = "https://gb.lampmind.com:8087/gb3/live/"+stream+"/hls.m3u8";
+                }
+                return address;
+            }
+        }
+        return address;
+    }
 }

src/main/java/com/welampiot/vo/EmergencyVO.java

@@ -20,4 +20,6 @@ public class EmergencyVO implements Serializable {
     private List<EmergencyDTO> list;
 
     private List<String> sectionList;
+    private List<?> emList;
+    private List<?> logList;
 }

src/main/java/com/welampiot/vo/LampPoleDataVO.java

@@ -53,4 +53,7 @@ public class LampPoleDataVO implements Serializable {
     private ManholeDTO tiltDevData; // 倾斜监测数据
     private LightStripDevDTO lightStripData; // 灯带数据
     private EmergencyDTO emerData; // 报警数据
+    private String devType;
+    private Integer sectionId;
+    private Integer areaId;
 }

src/main/resources/mapper/BroadcastMapper.xml

@@ -161,4 +161,11 @@
         from broadcast
         where lamp_pole_id = #{lampPoleId} order by id desc
     </select>
+    
+    <select id="getData" resultType="BroadcastDTO">
+        select a.id,a.online,a.isPlay,a.type,b.name as itemName,c.name as proName
+        from broadcast a left join broadcast_item b on a.itemId = b.id
+            left join broadcast_pro_list c on a.proId = c.id
+        where a.lamp_pole_id = #{lampPoleId}
+    </select>
 </mapper>

src/main/resources/mapper/ChargeDataMapper.xml

@@ -19,4 +19,7 @@
         LIMIT 1
     </select>
 
+    <select id="getOne" resultType="ChargeDataDTO">
+        select status from charge_data where chargeid = #{chargeId}
+    </select>
 </mapper>

src/main/resources/mapper/ChargeMapper.xml

@@ -305,7 +305,43 @@
     </select>
 
     <select id="getOne" resultType="ChargeDTO" parameterType="Integer">
-        select free,duration,equipmentElectricity,connectorNum
+        select id,free,duration,equipmentElectricity,connectorNum
         from charge where lamp_pole_id = #{lampPoleId}
     </select>
+
+    <select id="getList" parameterType="ChargeDTO" resultType="ChargeDTO">
+        select CD.startChargeSeq,CD.current,CD.voltage,CD.totalMoney,CD.totalPower,CD.startTime,CD.endTime,CD.status,S.name as sectionName,LP.number,C.id AS chargeId
+        <choose>
+            <when test="version == 0">
+                ,G.chinese_name as area
+            </when>
+            <when test="version == 1">
+                ,G.english_name as area
+            </when>
+            <otherwise>
+                ,G.ru_name as area
+            </otherwise>
+        </choose>
+        from charge C left join lamp_pole LP on LP.id = C.lamp_pole_id
+        left join charge_data AS CD on C.id = CD.chargeid
+        left join section AS S on S.id = LP.sectionid
+        left join global_location AS G on S.pid = G.id
+        where  LP.devtype like '%${devType}%'
+        <if test="areaId != null and areaId != 0">
+          and  LP.areaid = #{areaId}
+        </if>
+        <if test="sectionId != null and sectionId != 0">
+           and LP.sectionid = #{sectionId}
+        </if>
+        <if test="sectionList != null and !sectionList.isEmpty()">
+            and LP.sectionid in
+            <foreach collection="sectionList" item="dto" open="(" separator="," close=")">
+                #{dto}
+            </foreach>
+        </if>
+        <if test="page >= 0 and count > 0">
+            limit #{page},#{count}
+        </if>
+        order by LP.id DESC
+    </select>
 </mapper>

src/main/resources/mapper/EmergencyInfoLogMapper.xml

@@ -95,4 +95,15 @@
         order by e1.beginDate desc
     </select>
 
+
+    <select id="getList" resultType="EmergencyInfoLogDTO" parameterType="EmergencyInfoLogDTO">
+        select beginDate from emergency_info_log where
+        <if test="ids != null and !ids.isEmpty()">
+            deviceid in
+            <foreach item="dto" collection="ids" open="(" separator="," close=")">
+                #{dto}
+            </foreach>
+        </if>
+        order by beginDate desc limit 100
+    </select>
 </mapper>

src/main/resources/mapper/EmergencyMapper.xml

@@ -160,4 +160,28 @@
             </otherwise>
         </choose>
     </select>
+    <select id="getOne" resultType="EmergencyDTO">
+        select id,num,model,devType,gb_address as gbAddress,status
+        from emergency where lamp_pole_id = #{lampPoleId}
+    </select>
+    
+    <select id="getList" resultType="EmergencyDTO" parameterType="EmergencyDTO">
+        select a.devType,a.num,a.model,a.status,a.id,c.name as section
+        <choose>
+            <when test="version == 0">
+                ,d.chinese_name as area
+            </when>
+            <when test="version == 1">
+                ,d.english_name as area
+            </when>
+            <otherwise>
+                ,d.ru_name as area
+            </otherwise>
+        </choose>
+        from emergency a
+            left join lamp_pole b on a.lamp_pole_id = b.id
+            left join section c on b.sectionid = c.id
+            left join global_location d on c.pid = d.id
+        where lamp_pole_id = #{lampPoleId}
+    </select>
 </mapper>

src/main/resources/mapper/EnvmonitorMapper.xml

@@ -107,6 +107,15 @@
         <if test="id != null and id != 0">
             and e.id != #{id}
         </if>
+        <if test="lampPoleId != 0">
+            and e.lamp_pole_id != 0
+        </if>
+        <if test="sectionList != null and !sectionList.isEmpty()">
+            and e.sectionid in
+            <foreach collection="sectionList" item="dto" open="(" separator="," close=")">
+                #{dto}
+            </foreach>
+        </if>
     </select>
 
     <select id="findSectionIdById" resultType="Integer">
@@ -670,8 +679,48 @@
     </select>
 
     <select id="getOne" parameterType="integer" resultType="EnvmonitorDTO">
-        select id,areaid as areaId,weatherUpdatetime,netType,weatherInfo
+        select id,areaid as areaId,weatherUpdatetime,netType,weatherInfo,devType,pramType
         from envmonitor
         where lamp_pole_id = #{lampPoleId}
     </select>
+
+    <select id="getList" resultType="EnvmonitorDTO" parameterType="EnvmonitorDTO">
+        select EI.humidity,EI.temperature,EI.noise,EI.PM25,EI.PM10,EI.illumination,EI.windSpeed,EI.windDire,W.weatherInfo,W.weatherUpdatetime,W.areaid as areaId,W.id,S.name as sectionName,LP.number,W.devType
+        <choose>
+            <when test="version == 0">
+                ,G.chinese_name as area
+            </when>
+            <when test="version == 1">
+                ,G.english_name as area
+            </when>
+            <otherwise>
+                ,G.ru_name as area
+            </otherwise>
+        </choose>
+        from envmonitor W left join (select t1.* from envmonitor_info_log AS t1 join (select max(updatetime) as maxTime,envmonitorid from envmonitor_info_log group by envmonitorid) AS t2 ON t1.updatetime = t2.maxTime AND t1.envmonitorid = t2.envmonitorid) AS EI on EI.envmonitorid = W.id
+        left join section AS S on S.id = W.sectionid
+        left join global_location AS G on S.pid = G.id
+        left join lamp_pole AS LP on LP.id = W.lamp_pole_id
+        where W.lamp_pole_id != 0
+        <if test="areaId != null and areaId != 0">
+            and W.areaid = #{areaId}
+        </if>
+        <if test="sectionId != null and sectionId != 0">
+            and W.sectionid = #{sectionId}
+        </if>
+        <if test="sectionList != null and !sectionList.isEmpty()">
+            and W.sectionid in
+            <foreach collection="sectionList" item="dto" open="(" separator="," close=")">
+                #{dto}
+            </foreach>
+        </if>
+        <if test="page >= 0 and count > 0">
+            limit #{page},#{count}
+        </if>
+    </select>
+
+    <update id="updateWeatherInfo" parameterType="EnvmonitorDTO">
+        update envmonitor set weatherInfo = #{weatherInfo},weatherUpdatetime = #{weatherUpdatetime}
+        where id = #{id}
+    </update>
 </mapper>

src/main/resources/mapper/LampInfoLogMapper.xml

@@ -138,9 +138,19 @@
     </select>
     
     <select id="getOne" resultType="LampInfoLogDTO">
-        select gridvolt,gridcurr,grid_active_power,gridPF,work_time_total,used_energy_total
+        select gridvolt,gridcurr,grid_active_power as gridActivePower,gridPF,work_time_total as workTimeTotal,used_energy_total as usedEnergyTotal
         from lamp_info_log
         where lampid = #{lampId} order by updatetime DESC
 
     </select>
+
+    <select id="getList" resultType="LampInfoLogDTO">
+        select used_energy_total  as usedEnergyTotal,updatetime as updateTime,total_ele_save as totalEleSave
+        from lamp_info_log
+        where lampid = #{lampId} and updatetime >= #{startDate} AND updatetime &lt;= #{endDate}
+        <if test="sumPowerSave == 1">
+           and sum_power_save = 1
+        </if>
+        order by updatetime DESC
+    </select>
 </mapper>

src/main/resources/mapper/LampPoleAlarmLogMapper.xml

@@ -24,4 +24,14 @@
         </if>
         and (status = 1 OR status = 0) group by lamp_pole_id) a
     </select>
+
+    <select id="getList" resultType="LampPoleAlarmLogDTO">
+        select devtype as devType,alarm_type as alarmType,alarm_info as alarmInfo,updatetime as updateTime,id,status,handleTime
+        from lamp_pole_alarm_log
+        where lamp_pole_id = #{lampPoleId}
+    </select>
+
+    <select id="getOneData" resultType="integer">
+        select count(*) as total from lamp_pole_alarm_log where lamp_pole_id = #{lampPoleId}
+    </select>
 </mapper>

src/main/resources/mapper/LampPoleMapper.xml

@@ -1410,9 +1410,14 @@
     </select>
 
     <select id="getSimpleOne" resultType="LampPoleDTO" parameterType="LampPoleDTO">
-        select id from lamp_pole
+        select id,devtype devType,sectionid as sectionId,areaid as areaId,createtime as createTime from lamp_pole
         <trim prefix="where" suffixOverrides="and|or">
-            sn = #{sn} and
+            <if test="sn != null">
+                sn = #{sn} and
+            </if>
+            <if test="id != null and id != 0">
+                id = #{id} and
+            </if>
         </trim>
     </select>
 

src/main/resources/mapper/LoopMapper.xml

@@ -365,8 +365,9 @@
     <select id="getLoopListByLampPoleId" resultType="LoopDTO">
         select l.id,l.name,l.net_status as netStatus,l.volPa,l.volPc,l.volPb,
                l.cura as curA,l.curb as curB,l.curc as curC,l.insPa,l.insPb,l.insPc,
-               l.epT,l.devType,l.status,l.updatetime as updateTime
-        from `loop` l
+               l.epT,l.devType,l.status,l.updatetime as updateTime,S.timezone
+        from `loop` l left join section as S on S.id = l.sectionid
+        left join global_location as G on G.id = S.pid
         where l.lamp_pole_id = #{lampPoleId}
     </select>
 

src/main/resources/mapper/ScreenMapper.xml

@@ -250,7 +250,7 @@
     </select>
 
     <select id="getScreenAndProgram" resultType="ScreenDTO" parameterType="integer">
-        select S.width,S.height,P.name,S.type,S.num,S.netStatus
+        select S.width,S.height,P.name,S.type,S.num,S.netStatus,S.status,S.light,S.volume,S.maxLight,S.id
         from screen as S left join program as P on S.playingid = P.id
         where S.lamp_pole_id = #{lampPoleId}
     </select>

src/main/resources/mapper/SectionMapper.xml

@@ -128,7 +128,7 @@
         where g.id = #{id}
     </select>
     <select id="getDataByVO" resultType="SectionDTO">
-        select id,name,pid,alarmUser from section
+        select id,name,pid,alarmUser,timezone from section
         <trim prefix="where" suffixOverrides="and|or">
             <if test="id != null">
                 id = #{id}

src/main/resources/mapper/WebsocketClientMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.welampiot.dao.WebsocketClientDao">
+    <select id="getOne" parameterType="integer" resultType="WebsocketClientDTO">
+        select id from websocket_client where clientid = #{clientId}
+    </select>
+
+    <insert id="addData" parameterType="WebsocketClientDTO" keyProperty="id" useGeneratedKeys="true">
+        insert into websocket_client (clientid,type,deviceid,version,is_wss) values (#{clientId},#{type},#{deviceId},#{version},#{isWss})
+    </insert>
+</mapper>

src/main/resources/mapper/WifiInfoLogMapper.xml

@@ -95,6 +95,17 @@
 
     <select id="getList" parameterType="WifiInfoLogDTO" resultType="WifiInfoLogDTO">
         select device_count as deviceCount,flow,updatetime as updateTime
-        from wifi_info_log where wifiid = #{wifiId} AND updatetime &lt;= #{endDate} AND updatetime >= #{startDate} order by updatetime DESC
+        from wifi_info_log where wifiid = #{wifiId}
+        <if test="endDate != null">
+            AND updatetime &lt;= #{endDate}
+        </if>
+        <if test="startDate != null">
+            AND updatetime >= #{startDate}
+        </if>
+        order by updatetime DESC
+    </select>
+
+    <select id="getOne" resultType="WifiInfoLogDTO">
+        select device_count as deviceCount from wifi_info_log where wifiid = #{wifiId} limit 1
     </select>
 </mapper>

src/main/resources/mapper/WifiMapper.xml

@@ -313,7 +313,7 @@
     </select>
 
     <select id="getOneWifiByLampPoleId" parameterType="integer" resultType="WifiDTO">
-        select day_flow as dayFlow,id from wifi where lamp_pole_id = #{id}
+        select day_flow as dayFlow,id,num,status,lanStatus from wifi where lamp_pole_id = #{id}
     </select>
     
     <update id="updataWifiBySn" parameterType="WifiDTO">