Merge remote-tracking branch 'origin/CIS_V1.0' into CIS_V1.0

src/main/java/com/welampiot/common/InterfaceResultEnum.java

@@ -250,13 +250,19 @@ public enum InterfaceResultEnum {
     PERSON_BIND_ERROR("0900","推送人员已经绑定了","The pusher is already bound","толкатель уже связал"),
     PERSON_OVER_ERROR("0901","推送人员不能超过10个","No more than 10 people can be pushed","Численность персонала не должна превышать 10 человек"),
 
-    //档案管理 1000-1999
-    LACK_FILE_NAME_ERROR("0901","请输入名称","Please enter a name","Введите имя"),
-    LACK_FILE_NUMBER_ERROR("0902","请输入编号","Please enter the number","Пожалуйста, войдите в номер."),
-    REPEAT_FILE_NAME_ERROR("0903","文件名称已存在","File name already exists","Имя файла уже существует"),
-    LACK_FILE_ERROR("0904","缺少文件","Missing file","Отсутствие документов"),
-    FILE_TYPE_ERROR("0905","文件不支持","File type not supported","Тип файла не поддерживается "),
-    UNKNOW_FILE_ERROR("0906","文件未知错误","Unknown file error","Файл Неизвестная ошибка"),
+    //档案管理 1000-1099
+    LACK_FILE_NAME_ERROR("1000","请输入名称","Please enter a name","Введите имя"),
+    LACK_FILE_NUMBER_ERROR("1001","请输入编号","Please enter the number","Пожалуйста, войдите в номер."),
+    REPEAT_FILE_NAME_ERROR("1002","文件名称已存在","File name already exists","Имя файла уже существует"),
+    LACK_FILE_ERROR("1003","缺少文件","Missing file","Отсутствие документов"),
+    FILE_TYPE_ERROR("1004","文件不支持","File type not supported","Тип файла не поддерживается "),
+    UNKNOW_FILE_ERROR("1005","文件未知错误","Unknown file error","Файл Неизвестная ошибка"),
+
+    //太阳能板凳设备 1100-1199
+    DEVICE_CONNECTED("1100","设备已连接","device connected","устройство подключено"),
+    DEVICE_CONNECTED_ELSE("1101","设备已被他人连接","The device is connected by someone else","устройство подключено"),
+    DEVICE_DISCONNECT("1102","请先断开其他设备","Please disconnect other devices first","Отключите сначала другое устройство"),
+    DEVICE_TURN_ON("1103","请先开启输出状态","Please turn on the output state first","состояние на выходе"),
 
     ;
     private String code;

src/main/java/com/welampiot/configuration/WifiMqttConfig.java

@@ -0,0 +1,9 @@
+package com.welampiot.configuration;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Component
+@ConfigurationProperties(prefix = "wifi.mqtt")
+public class WifiMqttConfig extends BaseMqttConfig{
+}

src/main/java/com/welampiot/controller/ArchiveManageController.java

@@ -348,7 +348,7 @@ public class ArchiveManageController {
     public BaseResult<?> updateFile(HttpServletRequest request) throws Exception {
         MultipartFile file = ((StandardMultipartHttpServletRequest) request).getFile("file");
 
-        String result = toolUtils.uploadFile(file, null, null,null);
+        String result = toolUtils.uploadFile(file,null, null,null);
         if (result.equals("0001")){
             //缺少文件
             return toolUtils.response(InterfaceResultEnum.LACK_FILE_ERROR,0);

src/main/java/com/welampiot/controller/BasePlatformController.java

@@ -1,11 +1,13 @@
 package com.welampiot.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.welampiot.common.BaseResult;
 import com.welampiot.common.InterfaceResultEnum;
 import com.welampiot.dto.*;
 import com.welampiot.service.*;
 import com.welampiot.utils.ToolUtils;
-import com.welampiot.utils.WeatherUtil;
 import com.welampiot.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -14,12 +16,13 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 /**
  * ClassName: BasePlatformController
@@ -46,6 +49,27 @@ public class BasePlatformController {
     private UserService userService;
     @Autowired
     private WifiInfoLogService wifiInfoLogService;
+    @Autowired
+    private LampService lampService;
+    @Autowired
+    private PolicyService policyService;
+    @Autowired
+    private VideoMonitorService videoMonitorService;
+    @Autowired
+    private ScreenService screenService;
+    @Autowired
+    private ProgramService programService;
+    @Autowired
+    private WifiService wifiService;
+    @Autowired
+    private ChargeService chargeService;
+    @Autowired
+    private BroadcastService broadcastService;
+    @Autowired
+    private BroadcastProListService broadcastProListService;
+    @Autowired
+    private BroadcastItemService broadcastItemService;
+
 
     /**
      * 基础平台全局概览
@@ -56,6 +80,20 @@ public class BasePlatformController {
     public BaseResult<?> data(HttpServletRequest request) {
         Integer version = (Integer) toolUtils.getRequestContent(request, "version", 1);
         List<?> sectionList = toolUtils.getSectionList(request);
+        LampPoleInfoVO lampPoleDevCount = null;
+        if (sectionList == null || sectionList.size() == 0){
+            lampPoleDevCount = new LampPoleInfoVO();
+            lampPoleDevCount.setLampPoleCount(0);
+            lampPoleDevCount.setCloudCount(0);
+            lampPoleDevCount.setBroadcastCount(0);
+            lampPoleDevCount.setVideoCount(0);
+            lampPoleDevCount.setWeatherCount(0);
+            lampPoleDevCount.setEmCount(0);
+            lampPoleDevCount.setChargeCount(0);
+            lampPoleDevCount.setScreenCount(0);
+            lampPoleDevCount.setLampPoleAlarmCount(0);
+            return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,lampPoleDevCount);
+        }
         LampInfoDTO lampInfoDTO = new LampInfoDTO();
         lampInfoDTO.setSectionList(sectionList);
         LampInfoLogNewDTO sumEleByDTO = lampInfoLogNewService.getSumEleByDTO(lampInfoDTO);
@@ -65,7 +103,7 @@ public class BasePlatformController {
         Integer lampPoleCount = lampPoleService.getLampPoleInstallTotal(lampPoleVO); // 灯杆总数
         LampPoleDTO lampPoleDTO = new LampPoleDTO();
         lampPoleDTO.setSectionList(sectionList);
-        LampPoleInfoVO lampPoleDevCount = lampPoleService.getLampPoleDevCount(lampPoleDTO);
+        lampPoleDevCount = lampPoleService.getLampPoleDevCount(lampPoleDTO);
         lampPoleDevCount.setCarRoadCount(0); // 车路协同数量
         lampPoleDevCount.setTrafficLightCount(0); // 交通灯数量
         lampPoleDevCount.setFiveGCount(0); // 5G基站数量
@@ -99,6 +137,27 @@ public class BasePlatformController {
         Integer version = (Integer) toolUtils.getRequestContent(request, "version", 1);
         String username = (String) toolUtils.getRequestContent(request, "username", 2);
         List<?> sectionList = toolUtils.getSectionList(request);
+        LampPoleInfoVO lampPoleDevCount = null;
+        if (sectionList == null || sectionList.size() == 0){
+            lampPoleDevCount = new LampPoleInfoVO();
+            lampPoleDevCount.setLampPoleCount(0);
+            lampPoleDevCount.setCloudCount(0);
+            lampPoleDevCount.setBroadcastCount(0);
+            lampPoleDevCount.setVideoCount(0);
+            lampPoleDevCount.setWeatherCount(0);
+            lampPoleDevCount.setEmCount(0);
+            lampPoleDevCount.setChargeCount(0);
+            lampPoleDevCount.setScreenCount(0);
+            lampPoleDevCount.setTrafficLightCount(0);
+            lampPoleDevCount.setLampPoleAlarmCount(0);
+            lampPoleDevCount.setTotalCom(0F);
+            lampPoleDevCount.setTotalSave(0F);
+            lampPoleDevCount.setActionList(new ArrayList<>());
+            lampPoleDevCount.setAlarmList(new ArrayList<>());
+            lampPoleDevCount.setLampPoleList(new ArrayList<>());
+            return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,lampPoleDevCount);
+        }
+
         LampInfoDTO lampInfoDTO = new LampInfoDTO();
         lampInfoDTO.setSectionList(sectionList);
         LampInfoLogNewDTO sumEleByDTO = lampInfoLogNewService.getSumEleByDTO(lampInfoDTO);
@@ -108,7 +167,7 @@ public class BasePlatformController {
         Integer lampPoleCount = lampPoleService.getLampPoleInstallTotal(lampPoleVO); // 灯杆总数
         LampPoleDTO lampPoleDTO = new LampPoleDTO();
         lampPoleDTO.setSectionList(sectionList);
-        LampPoleInfoVO lampPoleDevCount = lampPoleService.getLampPoleDevCount(lampPoleDTO);
+        lampPoleDevCount = lampPoleService.getLampPoleDevCount(lampPoleDTO);
         lampPoleDevCount.setCarRoadCount(0); // 车路协同数量
         lampPoleDevCount.setTrafficLightCount(0); // 交通灯数量
         lampPoleDevCount.setFiveGCount(0); // 5G基站数量
@@ -134,30 +193,56 @@ public class BasePlatformController {
         UserDTO userDTO = userService.queryUserIdByUsername(username);
         if (userDTO == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
         OperationLogVO operationLogVO = new OperationLogVO();
-        operationLogVO.setUserId(userDTO.getId());
-        operationLogVO.setRole(userDTO.getRole());
+        operationLogVO.setSectionList(sectionList);
         List<OperationLogDTO> logList = operationLogService.getLessOperationLogList(operationLogVO);
         lampPoleDevCount.setActionList(logList);
 
         // 故障列表
+        String[] alamDevArr = {"路灯","摄像头","云盒","RFID","LED屏","一键报警","充电桩","气象站","微基站","广播音柱"};
         List<LampPoleDTO> lampPoleAlarmInfoList = lampPoleService.getLampPoleAlarmInfoList(lampPoleVO);
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        for (LampPoleDTO dto:lampPoleAlarmInfoList) {
+            if (dto.getDType() != null){
+                dto.setContent(alamDevArr[dto.getDType()]+dto.getContent());
+            }
+            Date cmdTime = null;
+            try {
+                cmdTime = simpleDateFormat.parse(dto.getUpdateTime());
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+            long timeStamp = cmdTime.getTime() + dto.getTimezone() * 3600 * 1000;
+           String newUpdateTime = simpleDateFormat.format(new Date(timeStamp));
+            dto.setUpdateTime(newUpdateTime);
+            dto.setTimezone(null);
+            dto.setDType(null);
+        }
         lampPoleDevCount.setAlarmList(lampPoleAlarmInfoList);
 
         // 灯杆列表
         List<LampPoleDTO> list = lampPoleService.getNewLampPoleList3(lampPoleVO);
+        List<Integer> lampPoleIds = new ArrayList<>();
         for (LampPoleDTO dto : list) {
-            if (dto.getDevType() != null && !dto.getDevType().isEmpty()) {
-                String devType = dto.getDevType();
-                int length = devType.split(",").length;
-                dto.setDevCount(length);
-            } else {
-                dto.setDevCount(0);
+            lampPoleIds.add(dto.getId());
+        }
+        List<LampPoleDTO> tempList = new ArrayList<>();
+        if (lampPoleIds != null || lampPoleIds.size() != 0){
+            List<LampPoleDTO> alarmList = lampPoleService.getPoleAlarmLogList(lampPoleIds);
+            for (LampPoleDTO dto:alarmList) {
+                tempList.add(dto.getLampPoleId(),dto);
             }
-            if (dto.getAlarmStatus() != null && dto.getAlarmStatus() == 2) {
-                dto.setStatus(0);
-            } else if (dto.getAlarmStatus() != null && dto.getAlarmStatus() != 2) {
-                dto.setStatus(1);
+        }
+        for (LampPoleDTO dto : list) {
+            lampPoleIds.add(dto.getId());
+            if (tempList != null && tempList.size() != 0 && tempList.get(dto.getId()) != null){
+                dto.setLampPoleId(tempList.get(dto.getId()).getId());
+                dto.setDevType2(tempList.get(dto.getId()).getDevType());
+            }else {
+                dto.setLampPoleId(0);
+                dto.setDevType2("0");
             }
+            String[] devTypeList = dto.getDevType().split(",");
+            dto.setDevCount(devTypeList.length);
         }
         lampPoleDevCount.setLampPoleList(list);
         return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,lampPoleDevCount);
@@ -173,109 +258,301 @@ public class BasePlatformController {
         Integer version = (Integer) toolUtils.getRequestContent(request, "version", 1);
         Integer id = (Integer) toolUtils.getRequestContent(request, "id", 1);
         if (id == null) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
-
-        // 故障列表
-        List<LampPoleDTO> alarmList = lampPoleService.getLampPoleAlarmListByLampPoleId(id);
-        // 灯控列表
-        List<LampPoleDTO> lampList = lampPoleService.getLampListByLampPoleId(id);
-        // 灯杆详情
-        LampPoleDTO dto = lampPoleService.getNewLampPoleDetailsById(id);
-        if (dto == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
+        List<LampInfoDTO> lampJoinLogList = lampService.getLampJoinLogList(id);
 
         LampPoleDetailVO lampPoleDetailVO = new LampPoleDetailVO();
-        // 气象信息
-        String longitude = dto.getLongitude();
-        String latitude = dto.getLatitude();
-        WeatherDTO weatherInfo = WeatherUtil.getNowWeatherInfo(longitude, latitude);
-        lampPoleDetailVO.setWeatherInfo(weatherInfo);
-        // 音柱当前播放的节目
-        lampPoleDetailVO.setBroadcastPro(dto.getBroadcastPro());
-        // 音柱当前播放节目的id
-        lampPoleDetailVO.setProgramId(dto.getProgramId());
-        // 音柱id
-        lampPoleDetailVO.setBroadcastId(dto.getBroadcastId());
-        // 当天流量
-        lampPoleDetailVO.setDayFlow(dto.getDayFlow());
-        // 故障列表
-        lampPoleDetailVO.setAlarmList(alarmList);
-        // 灯控列表
-        lampPoleDetailVO.setLampList(lampList);
-        // 摄像头
-        VideoMonitorDTO videoMonitorDTO = new VideoMonitorDTO();
-        videoMonitorDTO.setId(dto.getVideoId());
-        videoMonitorDTO.setVideoAddress(dto.getVideoAddress());
-        lampPoleDetailVO.setVideo(videoMonitorDTO);
-        // 屏幕
-        ScreenDTO screenDTO = new ScreenDTO();
-        screenDTO.setId(dto.getScreenId());
-        screenDTO.setName(dto.getProgramName());
-        screenDTO.setStatus(dto.getScreenStatus());
-        screenDTO.setLight(dto.getLight());
-        screenDTO.setVolume(dto.getVolume());
-        screenDTO.setMaxLight(dto.getMaxLight());
-        screenDTO.setPlayingId(dto.getPlayingId());
-        screenDTO.setScreenImage(dto.getImage());
-        lampPoleDetailVO.setScreen(screenDTO);
-        // 充电桩
-        ChargeDTO chargeDTO = new ChargeDTO();
-        chargeDTO.setOnline(dto.getChargeOnline());
-        chargeDTO.setStatus(dto.getChargeStatus());
-        chargeDTO.setEquipmentElectricity(dto.getEquipmentElectricity());
-        if (dto.getBillAmt() != null) {
-            chargeDTO.setBillAmt(Float.parseFloat(dto.getBillAmt()));
+        if (lampJoinLogList == null || lampJoinLogList.size() == 0){
+            lampPoleDetailVO.setLampList(new ArrayList<>());
+            lampPoleDetailVO.setVideo(new VideoMonitorDTO());
+            lampPoleDetailVO.setScreen(new ScreenDTO());
+            lampPoleDetailVO.setWeatherInfo(new WeatherDTO());
+            lampPoleDetailVO.setDayFlow("0");
+            lampPoleDetailVO.setCharge(new ChargeDTO());
+            lampPoleDetailVO.setBroadcastId(0);
+            lampPoleDetailVO.setProgramId(0);
+            lampPoleDetailVO.setAlarmList(new ArrayList<>());
+            WifiInfoLogVO wifiInfoLogVO = new WifiInfoLogVO();
+            wifiInfoLogVO.setDate(new ArrayList<>());
+            wifiInfoLogVO.setFlow(new ArrayList<>());
+            lampPoleDetailVO.setFlowList(wifiInfoLogVO);
+            if (version == 0){
+                lampPoleDetailVO.setBroadcastPro("暂无节目");
+            } else if (version == 1) {
+                lampPoleDetailVO.setBroadcastPro("There are currently no programs available");
+            }else {
+                lampPoleDetailVO.setBroadcastPro("Нет программы");
+            }
+            lampPoleDetailVO.setIsPlay(0);
+            return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,lampPoleDetailVO);
+        }
+        for (LampInfoDTO dto:lampJoinLogList) {
+            //floor($lamp_info['workTimeTotal']/60).':'.substr('00'.$lamp_info['workTimeTotal']%60, -2);
+            Integer i = Integer.valueOf(dto.getWorkTimeTotal()) / 60;
+            String str = "00" + String.valueOf(Integer.valueOf(dto.getWorkTimeTotal()) % 60);
+            String substring = str.substring(str.length() - 2);
+            dto.setWorkTimeTotal(substring);
+            if (dto.getPolicyType() == 1){
+                PolicyDTO policy = policyService.getPolicyDTOById(dto.getPolicyId());
+                if (policy != null){
+                    dto.setPolicyName(policy.getName());
+                }else {
+                    if (version == 0){
+                        dto.setPolicyName("暂无策略");
+                    } else if (version == 1) {
+                        dto.setPolicyName("No strategy at the moment");
+                    }else {
+                        dto.setPolicyName("Нет стратегии");
+                    }
+                }
+            }else {
+                if (version == 0){
+                    dto.setPolicyName("暂无策略");
+                } else if (version == 1) {
+                    dto.setPolicyName("No strategy at the moment");
+                }else {
+                    dto.setPolicyName("Нет стратегии");
+                }
+            }
+        }
+        lampPoleDetailVO.setLampList(lampJoinLogList);
+        //摄像头
+        VideoMonitorDTO monitorDTO = videoMonitorService.geteMonitorData(id);
+        if (monitorDTO != null){
+            String gbPlayAddress = toolUtils.getGbPlayAddress(monitorDTO.getGbAddress(), null, null, null);
+            monitorDTO.setVideoAddress(gbPlayAddress);
+            lampPoleDetailVO.setVideo(monitorDTO);
+        }else {
+            lampPoleDetailVO.setVideo(new VideoMonitorDTO());
         }
-        lampPoleDetailVO.setCharge(chargeDTO);
-        // 流量列表
-        List<Object> dateList = new ArrayList<>();
-        List<Object> flowList = new ArrayList<>();
-        long l = System.currentTimeMillis();
-        long startTime = l - 24 * 3600 * 1000 * 6;
-        HashMap<String, Integer> objectObjectHashMap = new HashMap<>();
-        long timeT = startTime;
-        int i = 0;
+        //屏幕
+        ScreenDTO oneScreen = screenService.getOneScreenByLampPoleId(id);
+        if (oneScreen != null){
+            oneScreen.setName("");
+            oneScreen.setScreenImage("");
+            if (oneScreen.getType() == 1) oneScreen.setName("气象站");
+            if (oneScreen.getType() == 0){
+                ProgramDTO oneProgram = programService.getOneProgram(oneScreen.getPlayingId());
+                if (oneProgram != null) oneScreen.setName(oneProgram.getName());
+            }
+            String path = "/upload/image/"+oneScreen.getNum()+".png";
 
-        DecimalFormat decimalFormat = new DecimalFormat("0.00");
-        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:00:00");
-        SimpleDateFormat simpleDateFormat2 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        while (timeT <= l) {
-            objectObjectHashMap.put(simpleDateFormat.format(new Date(timeT)), i);
-            dateList.add(simpleDateFormat.format(new Date(timeT)));
-            flowList.add(0);
-            timeT += 3600 * 1000;
-            i++;
+            String rootPath = System.getProperty("user.dir");
+            int lastedIndex = rootPath.lastIndexOf("/");
+            rootPath = rootPath.substring(0,lastedIndex); //工程根目录
+
+            String filePath = rootPath+path;
+            Path p = Paths.get(filePath);
+            if (Files.exists(p)) oneScreen.setScreenImage(path);
+            lampPoleDetailVO.setScreen(oneScreen);
+        }else {
+            lampPoleDetailVO.setScreen(new ScreenDTO());
         }
 
-        int dayNumber = 1;
-        WifiInfoLogDTO wifiInfoLogDTO = new WifiInfoLogDTO();
-        wifiInfoLogDTO.setDayNum(7);
-        wifiInfoLogDTO.setDayNumber(dayNumber);
-        wifiInfoLogDTO.setLampPoleId(id);
-        List<WifiInfoLogDTO> wifiInfoLogList = wifiInfoLogService.getWifiStatisticsListByDTO(wifiInfoLogDTO);
-        for (WifiInfoLogDTO dto1 : wifiInfoLogList) {
-            Date date = new Date(simpleDateFormat2.parse(dto1.getUpdateTime()).getTime());
-            String s = simpleDateFormat.format(date);
-            long time = simpleDateFormat.parse(s).getTime();
-            String formatStart = simpleDateFormat.format(startTime);
-            startTime = simpleDateFormat.parse(formatStart).getTime();
-            long timespan = (time - startTime) / (3600 * 1000 * dayNumber);
-            long newTime = startTime + timespan * (3600 * 1000 * dayNumber);
-            date = new Date(newTime);
-            s = simpleDateFormat.format(date);
-            Integer integer = null;
-            if (objectObjectHashMap.containsKey(s)) {
-                integer = objectObjectHashMap.get(s);
+        //wifi
+        WifiDTO wifi = wifiService.getWifiByLampPoleId(id);
+        if (wifi != null){
+            // 获取当前时间
+            SimpleDateFormat fitDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            // 获取当前时间
+            Date now = new Date();
+            // 计算当前时间戳
+            long currentTimeMillis = now.getTime();
+            // 计算昨天和今天的开始和结束时间
+            long seconds = currentTimeMillis ;
+            Date startDate = new Date(seconds - 8 * 3600 * 1000 - 7 * 24 * 3600 * 1000);
+            Date endDate = new Date(seconds - 8 * 3600 * 1000);
+
+            // 打印结果
+            String startDateStr = fitDateFormat.format(startDate);
+            String endDateStr = fitDateFormat.format(endDate);
+
+
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            HashMap<String, HashMap<String, Integer>> shaMap = new HashMap<>();
+            for (int i = 0; i < 7; i++){
+                String in = sdf.format(new Date(seconds - i * 24 * 3600 * 1000));
+                HashMap<String, Integer> ObjectHashMap = new HashMap<>();
+                ObjectHashMap.put("max",0);
+                ObjectHashMap.put("min",0);
+                shaMap.put(in,ObjectHashMap);
+            }
+            HashMap<String, Object> flowMap = new HashMap<>();
+            flowMap.put("id",wifi.getId());
+            flowMap.put("startdate",startDateStr);
+            flowMap.put("enddate",endDateStr);
+
+            List<WifiInfoLogDTO> wifiLogList = wifiInfoLogService.getWifiLog(flowMap);
+            for (WifiInfoLogDTO dto:wifiLogList) {
+                Date updateParse = fitDateFormat.parse(dto.getUpdateTime());
+                long updateSta = updateParse.getTime() + 8 * 3600 * 1000;
+                String in = sdf.format(new Date(updateSta));
+                if (shaMap.get(in) != null){
+                    shaMap.get(in).put("min",Integer.valueOf(dto.getTotalCom()));
+                    if (shaMap.get(in).get("max") == 0){
+                        shaMap.get(in).put("max",Integer.valueOf(dto.getTotalCom()));
+                    }
+                }
+            }
+            HashMap<String,Object> flowHashMap = new HashMap<String,Object>();
+            ArrayList<Object> dateList = new ArrayList<>();
+            ArrayList<Object> flowList = new ArrayList<>();
+            SimpleDateFormat dateFormat1 = new SimpleDateFormat("MM-dd");
+
+            // 创建一个List来存储HashMap的key
+            ArrayList<String> keys = new ArrayList<>();
+            // 遍历HashMap，将key添加到List中
+            for (Map.Entry<String, HashMap<String,Integer>> entry : shaMap.entrySet()) {
+                keys.add(entry.getKey());
+            }
+            // 使用Collections.sort()方法对List进行排序
+            SimpleDateFormat sdformat = new SimpleDateFormat("yyyy-MM-dd");
+            Collections.sort(keys);
+            // 按照排序后的顺序获取List中的key
+            for (String key : keys) {
+                //System.out.println(key);
+                String time = dateFormat1.format(sdformat.parse(key));
+                dateList.add(time);
+                HashMap<String, Integer> stringIntegerHashMap = shaMap.get(key);
+                Integer max = stringIntegerHashMap.get("max");
+                Integer min = stringIntegerHashMap.get("min");
+                flowList.add(max > min ? max-min : 0);
             }
+            WifiInfoLogVO wifiInfoLogVO = new WifiInfoLogVO();
+            wifiInfoLogVO.setDate(dateList);
+            wifiInfoLogVO.setFlow(flowList);
+            lampPoleDetailVO.setFlowList(wifiInfoLogVO);
+        }else {
+            WifiInfoLogVO wifiInfoLogVO = new WifiInfoLogVO();
+            wifiInfoLogVO.setDate(new ArrayList<>());
+            wifiInfoLogVO.setFlow(new ArrayList<>());
+            lampPoleDetailVO.setFlowList(wifiInfoLogVO);
+        }
+
+        //weather
+        LampPoleDTO localDataById = lampPoleService.getLocalDataById(id);
+        String urlStr = "https://devapi.heweather.net/v7/weather/3d?location="+localDataById.getLongitude()+","+localDataById.getLatitude()+"&key="+ToolUtils.WEATHER_KEY;
+
+        //String info = toolUtils.sendHttp("get", urlStr, null, 5, ToolUtils.ContentTypeEnum.CONTENT_TYPE_FORM, null);
+        String zlibNetwork = toolUtils.zlibNetwork(urlStr);
+        WeatherDTO weather = new WeatherDTO();
+        if (!zlibNetwork.isEmpty()){
+            JSONObject jsonObject = JSON.parseObject(zlibNetwork);
+            String code = jsonObject.getString("code");
+            if (code.equals("200")){
+
+                JSONArray jsonArray = jsonObject.getJSONArray("daily");
+                JSONObject o = (JSONObject)jsonArray.get(0);
+                weather.setTempMax(o.getString("tempMax"));
+                weather.setTempMin(o.getString("tempMin"));
+
+                String weatherUrl = "https://devapi.heweather.net/v7/weather/now?location="+localDataById.getLongitude()+","+localDataById.getLatitude()+"&key="+ToolUtils.WEATHER_KEY;
+                String weatherResult = toolUtils.zlibNetwork(weatherUrl);
+                if (!weatherResult.isEmpty()){
+                    JSONObject weatherJsonObject = JSON.parseObject(weatherResult);
+                    if (weatherJsonObject.get("now") != null){
+                        String weatherCode = weatherJsonObject.getString("code");
+                        if (weatherCode.equals("200")){
+                            JSONObject w = (JSONObject)weatherJsonObject.get("now");
+                            weather.setTemp(w.getString("temp"));
+                            if (version == 0){
+                                weather.setWeatherText(w.getString("text"));
+                            } else if (version == 1) {
+                                weather.setWeatherText(toolUtils.weatherTranslateEn(w.getString("icon")));
+                            }else {
+                                weather.setWeatherText(toolUtils.weatherTranslateRu(w.getString("icon")));
+                            }
+                            weather.setWeatherCode(w.getString("icon"));
+                        }
+                    }
+                }
+                String airUrl = "https://devapi.heweather.net/v7/air/now?location="+localDataById.getLongitude()+","+localDataById.getLatitude()+"&key="+ToolUtils.WEATHER_KEY;
+                String airResult = toolUtils.zlibNetwork(airUrl);
+                if (!airResult.isEmpty()){
+                    JSONObject airJsonObject = JSONObject.parseObject(airResult);
+                    String airCode = airJsonObject.getString("code");
+                    if (airCode.equals("200")){
+                        JSONObject air = (JSONObject)airJsonObject.get("now");
+                        if (air != null){
+                            weather.setAqi(air.getString("aqi"));
+                            weather.setCategory(air.getString("level"));
+                        }
+                    }
+                }
+            }
+            lampPoleDetailVO.setWeatherInfo(weather);
+        }else {
+            lampPoleDetailVO.setWeatherInfo(new WeatherDTO());
+        }
+
+        //充电桩
+        ChargeDTO infoByLampPoleId = chargeService.getChargeInfoByLampPoleId(id);
+        if (infoByLampPoleId != null){
+            ChargeDTO chargeDTO = new ChargeDTO();
+            chargeDTO.setStatus(infoByLampPoleId.getStatus());
+            chargeDTO.setOnline(infoByLampPoleId.getOnline());
+            chargeDTO.setEquipmentElectricity(infoByLampPoleId.getEquipmentElectricity());
+            chargeDTO.setBillAmt(infoByLampPoleId.getBillAmt());
+        }else {
+            lampPoleDetailVO.setCharge(new ChargeDTO());
+        }
+
+        // 故障信息
+        String[] alamDevArr = {"路灯","摄像头","云盒","RFID","LED屏","一键报警","充电桩","气象站","微基站","广播音柱"};
+        LampPoleVO lampPoleVO = new LampPoleVO();
+        List<LampPoleDTO> lampPoleAlarmInfoList = lampPoleService.getLampPoleAlarmInfoList(lampPoleVO);
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        for (LampPoleDTO dto:lampPoleAlarmInfoList) {
+            if (dto.getDType() != null){
+                dto.setContent(alamDevArr[dto.getDType()]+dto.getContent());
+                dto.setAlarmTypeStr(dto.getContent());
+            }
+            Date cmdTime = null;
+            try {
+                cmdTime = simpleDateFormat.parse(dto.getUpdateTime());
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+            long timeStamp = cmdTime.getTime() + dto.getTimezone() * 3600 * 1000;
+            String newUpdateTime = simpleDateFormat.format(new Date(timeStamp));
+            dto.setUpdateTime(newUpdateTime);
+            dto.setTimezone(null);
+            dto.setDType(null);
+            dto.setContent(null);
+        }
+        if (lampPoleAlarmInfoList != null && lampPoleAlarmInfoList.size() != 0){
+            lampPoleDetailVO.setAlarmList(lampPoleAlarmInfoList);
+        }else {
+            lampPoleDetailVO.setAlarmList(new ArrayList<>());
+        }
 
-            if (dto1.getMinFlow() != null && !dto1.getMinFlow().equals("0") && integer != null &&
-                    dto1.getMaxFlow() != null && !dto1.getMaxFlow().equals("0")) {
-                Float flow = Float.parseFloat(dto1.getMaxFlow()) - Float.parseFloat(dto1.getMinFlow());
-                flowList.set(integer,Float.parseFloat(decimalFormat.format(flow)));
+        //广播
+        BroadcastDTO oneDataByLampPoleId = broadcastService.getOneDataByLampPoleId(id);
+        if (oneDataByLampPoleId != null){
+            //BroadcastDTO broadcastDTO = new BroadcastDTO();
+            lampPoleDetailVO.setIsPlay(oneDataByLampPoleId.getIsPlay());
+            lampPoleDetailVO.setBroadcastId(oneDataByLampPoleId.getId());
+            lampPoleDetailVO.setProgramId(oneDataByLampPoleId.getItemId());
+            if (oneDataByLampPoleId.getIsPlay() == 1){
+                if (oneDataByLampPoleId.getProId() != 0){
+                    BroadcastProListDTO oneById = broadcastProListService.getOneById(oneDataByLampPoleId.getProId());
+                    if (oneById != null){
+                        lampPoleDetailVO.setBroadcastPro(oneById.getName());
+                    }
+                }else {
+                    if (oneDataByLampPoleId.getItemId() !=0 ){
+                        BroadcastItemDTO oneDataById = broadcastItemService.getOneDataById(oneDataByLampPoleId.getItemId());
+                        if (oneDataById != null){
+                            lampPoleDetailVO.setBroadcastPro(oneDataById.getName());
+                        }
+                    }
+                }
             }
+        }else {
+            lampPoleDetailVO.setBroadcastPro("");
+            lampPoleDetailVO.setProgramId(0);
+            lampPoleDetailVO.setBroadcastId(0);
+            lampPoleDetailVO.setIsPlay(0);
         }
-        WifiInfoLogVO wifiInfoLogVO = new WifiInfoLogVO();
-        wifiInfoLogVO.setDate(dateList);
-        wifiInfoLogVO.setFlow(flowList);
-        lampPoleDetailVO.setFlowList(wifiInfoLogVO);
         return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,lampPoleDetailVO);
     }
 }

src/main/java/com/welampiot/controller/LampController.java

@@ -14,12 +14,7 @@ import com.welampiot.utils.AESUtils;
 import com.welampiot.utils.JwtUtil;
 import com.welampiot.utils.ToolUtils;
 import com.welampiot.vo.*;
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.lang3.ArrayUtils;
-import org.eclipse.paho.client.mqttv3.MqttMessage;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.DigestUtils;
@@ -28,18 +23,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.crypto.Cipher;
-import javax.crypto.SecretKey;
-import javax.crypto.spec.IvParameterSpec;
-import javax.crypto.spec.SecretKeySpec;
 import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
-import java.security.GeneralSecurityException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

src/main/java/com/welampiot/controller/MapController.java

@@ -9,7 +9,6 @@ import com.welampiot.dto.*;
 import com.welampiot.service.*;
 import com.welampiot.utils.ToolUtils;
 import com.welampiot.vo.*;
-import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -1527,8 +1526,8 @@ public class MapController{
             wifiInfoLogList = wifiInfoLogService.getWifiInfoLogListByDTO(wifiDTO);
             for (WifiInfoLogDTO dto : wifiInfoLogList) {
                 if (dto.getFlow() != null) {
-                    if (flowMax < Float.parseFloat(dto.getFlow())) {
-                        flowMax = Float.parseFloat(dto.getFlow());
+                    if (flowMax < dto.getFlow()) {
+                        flowMax = dto.getFlow();
                     }
                 }
             }

src/main/java/com/welampiot/controller/NewLampPoleController2.java

@@ -659,7 +659,7 @@ public class NewLampPoleController2 {
             envmonitor.setAirCount(weatherInfo.getAqi());
             envmonitor.setAirLevel(weatherInfo.getLevel());
             lampPoleDataVO.setDataType("lampPoleDataWeather");
-            lampPoleDataVO.setWeatherData(envmonitor);
+            //lampPoleDataVO.setWeatherData(envmonitor);
         } else if (type == 9) { // 广播音柱
             BroadcastDTO broadcastDTO = broadcastService.getBroadcastDTOByLampPoleId(id);
             lampPoleDataVO.setDataType("lampPoleDataBroadcast");

src/main/java/com/welampiot/controller/benchCommonController.java

@@ -0,0 +1,438 @@
+package com.welampiot.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.welampiot.common.BaseResult;
+import com.welampiot.common.InterfaceResultEnum;
+import com.welampiot.dto.BenchUserInfoDTO;
+import com.welampiot.dto.BenchUserLogDTO;
+import com.welampiot.dto.LampPoleDTO;
+import com.welampiot.dto.WifiDTO;
+import com.welampiot.service.*;
+import com.welampiot.utils.ToolUtils;
+import com.welampiot.vo.BenchDevInfoVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+@RestController
+@CrossOrigin
+@RequestMapping("/benchCommon")
+public class benchCommonController {
+    @Autowired
+    private ToolUtils toolUtils;
+    @Autowired
+    private BenchUserInfoService benchUserInfoService;
+    @Autowired
+    private BenchDevInfoService benchDevInfoService;
+    @Autowired
+    private LampPoleService lampPoleService;
+    @Autowired
+    private WifiService wifiService;
+    @Autowired
+    private BenchUserLogService benchUserLogService;
+
+    /**
+     * 登录
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/login", method = RequestMethod.POST)
+    public BaseResult<?> login(HttpServletRequest request) {
+        Integer version = (Integer) toolUtils.getRequestContent(request, "version", 1);
+        Integer code = request.getParameter("code") == null ? 0 : Integer.parseInt(request.getParameter("code"));
+        String nickname = request.getParameter("nickname");
+        String avaurl = request.getParameter("avaurl");
+        String sex = request.getParameter("sex");
+        String appid = "wx2a33d29d59659327";
+        String secret = "76beab10aad5b7c072dc249b16337c51";
+        String url = "https://api.weixin.qq.com/sns/jscode2session?appid="+appid+"&secret="+secret+"&js_code="+code+"&grant_type=authorization_code";
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String currentTime = simpleDateFormat.format(new Date());
+
+        try {
+            String getResult = toolUtils.sendHttp("get", url, null, 5, null, null);
+            JSONObject jsonObject = JSON.parseObject(getResult);
+            Integer errcode = jsonObject.getInteger("errcode");
+            if (errcode != null){
+                //失败
+                BaseResult<Object> objectBaseResult = new BaseResult<>(String.format("%d",errcode), jsonObject.getString("errmsg"), new Object());
+               return objectBaseResult;
+
+            }else {
+                //成功
+               String openid = jsonObject.getString("openid");
+               String sessionKey = jsonObject.getString("session_key");
+                BenchUserInfoDTO benchUserInfoDTO = new BenchUserInfoDTO();
+                benchUserInfoDTO.setOpenId(openid);
+                BenchUserInfoDTO oneData = benchUserInfoService.getOneData(benchUserInfoDTO);
+                if (oneData.getOpenId() == null){
+                    //添加数据 - 第一次
+                    benchUserInfoDTO.setNickName(nickname);
+                    benchUserInfoDTO.setAvaurl(avaurl);
+                    benchUserInfoDTO.setSex(sex);
+                    benchUserInfoDTO.setSessionKey(sessionKey);
+                    benchUserInfoDTO.setUpdateTime(currentTime);
+                    benchUserInfoDTO.setCreateTime(currentTime);
+                    benchUserInfoService.addData(benchUserInfoDTO);
+                    return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,benchUserInfoDTO);
+                }else {
+                    //已经登录过的
+                    benchUserInfoDTO.setNickName(nickname);
+                    benchUserInfoDTO.setAvaurl(avaurl);
+                    benchUserInfoDTO.setSex(sex);
+                    benchUserInfoDTO.setSessionKey(sessionKey);
+                    benchUserInfoDTO.setUpdateTime(currentTime);
+                    benchUserInfoService.updateData(benchUserInfoDTO);
+                    return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,benchUserInfoDTO);
+                }
+            }
+
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        //return toolUtils.response(InterfaceResultEnum.USER_LOGIN_ERROR,version,new Object());
+    }
+
+    /**
+     * 设备列表
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/getList", method = RequestMethod.POST)
+    public BaseResult<?> getList(HttpServletRequest request) {
+        Integer version = request.getParameter("version") == null? 0 : Integer.valueOf(request.getParameter("version"));
+        String openId = request.getParameter("openId");
+        String sessionKey = request.getParameter("sessionKey");
+        Integer page = request.getParameter("page") == null? 1 : Integer.valueOf(request.getParameter("page"));
+        Integer count = request.getParameter("count") == null ? 0 : Integer.valueOf(request.getParameter("count"));
+
+        if (openId == null || sessionKey == null) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version,new Object());
+        //查询用户是否存在
+        BenchDevInfoVO vo = new BenchDevInfoVO();
+        vo.setList(new ArrayList<>());
+        vo.setTotal(0);
+        BenchUserInfoDTO benchUserInfoDTO = new BenchUserInfoDTO();
+        benchUserInfoDTO.setOpenId(openId);
+        benchUserInfoDTO.setSessionKey(sessionKey);
+        BenchUserInfoDTO oneData = benchUserInfoService.getOneData(benchUserInfoDTO);
+        if (oneData == null) return toolUtils.response(InterfaceResultEnum.USER_EXISTS_ERROR,version,vo);
+
+        HashMap<String, Integer> map = new HashMap<>();
+        map.put("page",page-1);
+        map.put("count",(page-1) * count + count);
+        map.put("version",version);
+        List<BenchDevInfoVO> benchJoinList = benchDevInfoService.getBenchJoinList(map);
+        vo.setList(benchJoinList);
+        vo.setTotal(benchJoinList.size());
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,vo);
+    }
+
+    /**
+     * 周边设备
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/getAroundDevice", method = RequestMethod.POST)
+    public BaseResult<?> getAroundDevice(HttpServletRequest request) {
+        Integer version = request.getParameter("version") == null? 0 : Integer.valueOf(request.getParameter("version"));
+        String openId = request.getParameter("openId");
+        String sessionKey = request.getParameter("sessionKey");
+        Double longitude = request.getParameter("longitude") == null ? 0: Double.valueOf(request.getParameter("longitude"));
+        Double latitude = request.getParameter("latitude") == null ? 0: Double.valueOf(request.getParameter("latitude"));
+
+        BenchDevInfoVO vo = new BenchDevInfoVO();
+        vo.setList(new ArrayList<>());
+        vo.setTotal(0);
+        BenchUserInfoDTO benchUserInfoDTO = new BenchUserInfoDTO();
+        benchUserInfoDTO.setOpenId(openId);
+        benchUserInfoDTO.setSessionKey(sessionKey);
+        BenchUserInfoDTO oneData = benchUserInfoService.getOneData(benchUserInfoDTO);
+        if (oneData == null) return toolUtils.response(InterfaceResultEnum.USER_EXISTS_ERROR,version,vo);
+        //查询在线的设备(联合查询: 太阳能板凳,灯杆,云盒)
+        //1. 查询在这个范围内的所有灯杆 - 经纬度
+        //2. 筛选是太阳能板凳的灯杆 - id
+        //3. 筛选云盒,与太阳能板凳同时在线的设备 - 在线
+        HashMap<String, HashMap<String, Double>> map = this.returnSquarePoint(longitude, latitude, 20.0);
+        Double rightBottomLat = map.get("rightBottom").get("lat");//右下纬度
+        Double leftTopLat = map.get("leftTop").get("lat");//左上纬度
+        Double leftTopLng = map.get("leftTop").get("lng");//左上经度
+        Double rightBottomLng = map.get("rightBottom").get("lng");//右下经度
+
+        HashMap<String, Double> hashMap = new HashMap<>();
+        hashMap.put("rightBottomLat",rightBottomLat);
+        hashMap.put("leftTopLat",leftTopLat);
+        hashMap.put("leftTopLng",leftTopLng);
+        hashMap.put("rightBottomLng",rightBottomLng);
+        List<LampPoleDTO> rangeLampPole = lampPoleService.getRangeLampPole(hashMap);
+        ArrayList<Integer> lampPoldIdList = new ArrayList<>();
+        for (LampPoleDTO dto:rangeLampPole) {
+            if (dto.getId() != null){
+                lampPoldIdList.add(dto.getId());
+            }
+        }
+        if (lampPoldIdList != null && lampPoldIdList.size() > 0){
+            //联合查询相关的板凳的id,online,lamp_pole_id,number
+            List<BenchDevInfoVO> benchInfoByIds = benchDevInfoService.getBenchInfoByIds(lampPoldIdList);
+            vo.setList(benchInfoByIds);
+            vo.setTotal(benchInfoByIds.size());
+        }
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,vo);
+    }
+    /**
+     *计算某个经纬度的周围某段距离的正方形的四个点
+     * @param lng float 经度
+     * @param lat float 纬度
+     * @param distance float 该点所在圆的半径，该圆与此正方形内切，默认值为0.5千米
+     * @return array 正方形的四个点的经纬度坐标
+     */
+    public HashMap<String, HashMap<String, Double>> returnSquarePoint(Double longitude,Double latitude, Double distance) {
+        if (distance == null || distance == 0) distance = 0.5;
+
+        HashMap<String, HashMap<String, Double>> map = new HashMap<>();
+        // 地球半径
+        double earthRadius = 6371.0;
+        // 计算正方形的边长
+        double dlng = 2 * Math.asin(Math.sin(distance / (2 * earthRadius) / Math.cos(Math.toRadians(latitude))));
+        dlng = Math.toDegrees(dlng);
+
+        double dlat = distance / earthRadius;
+        dlat = Math.toDegrees(dlat);
+        // 计算顶点经纬度
+        // 左上顶点
+        HashMap<String, Double> leftTop = new HashMap<>();
+        leftTop.put("lat",latitude + dlat);
+        leftTop.put("lng",longitude - dlng);
+        map.put("leftTop",leftTop);
+        // 右上顶点
+        HashMap<String, Double> rightTop = new HashMap<>();
+        rightTop.put("lat",latitude + dlat);
+        rightTop.put("lng",longitude + dlng);
+        map.put("rightTop",rightTop);
+        // 左下顶点
+        HashMap<String, Double> leftBottom = new HashMap<>();
+        leftBottom.put("lat",latitude - dlat);
+        leftBottom.put("lng",longitude - dlng);
+        map.put("leftBottom",leftBottom);
+        // 右下顶点
+        HashMap<String, Double> rightBottom = new HashMap<>();
+        rightBottom.put("lat",latitude - dlat);
+        rightBottom.put("lng",longitude + dlng);
+        map.put("rightBottom",rightBottom);
+        return map;
+    }
+
+    /**
+     * 单个设备信息
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/getDevInfo", method = RequestMethod.POST)
+    public BaseResult<?> getDevInfo(HttpServletRequest request) {
+        Integer version = request.getParameter("version") == null ? 0 : Integer.valueOf(request.getParameter("version"));
+        String openId = request.getParameter("openId");
+        String sessionKey = request.getParameter("sessionKey");
+
+        Double devLongitude = request.getParameter("devLongitude") == null ? 0 : Double.valueOf(request.getParameter("devLongitude"));
+        Double devLatitude = request.getParameter("devLatitude")  == null ? 0 : Double.valueOf(request.getParameter("devLatitude"));
+        Double curLongitude = request.getParameter("curLongitude") == null ? 0 : Double.valueOf(request.getParameter("curLongitude"));
+        Double curLatitude = request.getParameter("curLatitude") == null ? 0 : Double.valueOf(request.getParameter("curLatitude"));
+        String deviceId = request.getParameter("deviceId");
+        if (openId == null || sessionKey == null) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version,new Object());
+        BenchUserInfoDTO benchUserInfoDTO = new BenchUserInfoDTO();
+        benchUserInfoDTO.setOpenId(openId);
+        benchUserInfoDTO.setSessionKey(sessionKey);
+        BenchUserInfoDTO oneData = benchUserInfoService.getOneData(benchUserInfoDTO);
+        if (oneData == null) return toolUtils.response(InterfaceResultEnum.USER_EXISTS_ERROR,version,new Object());
+        HashMap<String, Object> hashMap = new HashMap<>();
+        hashMap.put("version",version);
+        hashMap.put("deviceId",deviceId);
+        List<BenchDevInfoVO> listByDeviceId = benchDevInfoService.getListByDeviceId(hashMap);
+        Double distancefn = this.distancefn(devLatitude, devLongitude, curLatitude, curLongitude, true);
+        BenchDevInfoVO vo = listByDeviceId.get(0);
+        vo.setDistance(distancefn);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,vo);
+    }
+    //计算两个坐标之间的距离
+    private Double distancefn(Double lat1, Double lng1,Double lat2, Double lng2, boolean miles ){
+
+        Double pi80 = Math.PI / 180;
+        lat1 *= pi80;
+        lng1 *= pi80;
+        lat2 *= pi80;
+        lng2 *= pi80;
+        Double r = 6372.797; // mean radius of Earth in km
+        Double dlat = lat2 - lat1;
+        Double dlng = lng2 - lng1;
+        Double a = Math.sin(dlat / 2) * Math.sin(dlat / 2) + Math.cos(lat1) * Math.cos(lat2) * Math.sin(dlng / 2) * Math.sin(dlng /2);
+        Double c = 2 * Math.atan2(Math.sqrt(a),Math.sqrt(1-a));
+        Double km = r * c;
+        return (miles ? (km * 0.621371192) : km);
+    }
+    /**
+     * 连接设备
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/connectDevice", method = RequestMethod.POST)
+    public BaseResult<?> connectDevice(HttpServletRequest request) throws UnsupportedEncodingException {
+        Integer version = request.getParameter("version") == null ? 0 : Integer.valueOf(request.getParameter("version"));
+        String sessionKey = request.getParameter("sessionKey");
+        String openId = request.getParameter("openId");
+        String deviceId = request.getParameter("deviceId");
+        Integer type = request.getParameter("type") == null ? 0 : Integer.valueOf(request.getParameter("type"));
+        if (openId == null || sessionKey == null) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version,new Object());
+        BenchUserInfoDTO benchUserInfoDTO = new BenchUserInfoDTO();
+        benchUserInfoDTO.setOpenId(openId);
+        benchUserInfoDTO.setSessionKey(sessionKey);
+        BenchUserInfoDTO oneData = benchUserInfoService.getOneData(benchUserInfoDTO);
+        if (oneData == null) return toolUtils.response(InterfaceResultEnum.USER_EXISTS_ERROR,version,new Object());
+        BenchDevInfoVO lampPoleDevice = benchDevInfoService.getLampPoleDevice(deviceId);
+        if (lampPoleDevice == null) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version,new Object());
+
+        String sendTopic = "/WEGW2/WriteIn/"+lampPoleDevice.getSn();
+        String backTopic = "/WEGW2/WriteOut/"+lampPoleDevice.getSn();
+        String cmd = "";
+        if (type == 0) {
+            cmd = "{\"D8\":\"0000000000\"}";
+        } else {
+            cmd = "{\"D8\":\"0001000000\"}";
+        }
+        String hex = "060B";
+
+        String sendData = hex + cmd;
+        String back = toolUtils.sendWifiMqttCmd(sendTopic, sendData, backTopic, 5);
+        if (back != null && !back.equals("")){
+            WifiDTO wifiDTO = new WifiDTO();
+            wifiDTO.setNum(lampPoleDevice.getSn());
+            wifiDTO.setLna1Status(type);
+            wifiDTO.setType4(0);
+            wifiService.updataWifiBySn(wifiDTO);
+            if (type == 0){
+                BenchUserLogDTO benchUserLogDTO = new BenchUserLogDTO();
+                benchUserLogDTO.setSn(lampPoleDevice.getSn());
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                String currentTime = simpleDateFormat.format(new Date());
+                benchUserLogDTO.setCloseTime(currentTime);
+                benchUserLogService.updateUserLog(benchUserLogDTO);
+            }
+            return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,new Object());
+        }else {
+            return toolUtils.response(InterfaceResultEnum.SEND_CMD_TIME_OUT,version,new Object());
+        }
+    }
+
+    /**
+     * 扫描连接设备
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/scanDevQrcode", method = RequestMethod.POST)
+    public BaseResult<?> scanDevQrcode(HttpServletRequest request) throws IOException {
+
+        Integer version = request.getParameter("version") == null ? 0 : Integer.valueOf(request.getParameter("version"));
+        String openId = request.getParameter("openId");
+        String codeInfo = request.getParameter("codeInfo");
+        if (openId == null ) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version,new Object());
+        BenchUserInfoDTO benchUserInfoDTO = new BenchUserInfoDTO();
+        benchUserInfoDTO.setOpenId(openId);
+        //benchUserInfoDTO.setSessionKey(sessionKey);
+        BenchUserInfoDTO oneData = benchUserInfoService.getOneData(benchUserInfoDTO);
+        if (oneData == null) return toolUtils.response(InterfaceResultEnum.USER_EXISTS_ERROR,version,new Object());
+        String[] codeArr = codeInfo.split("-");
+        if (codeArr.length == 0 || codeArr[0] == null || codeArr[1] == null){
+            return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version,new Object());
+        }
+        String sn = codeArr[0];
+        String address = codeArr[1];
+        BenchUserLogDTO benchUserLogDTO = new BenchUserLogDTO();
+        benchUserLogDTO.setSn(sn);
+        benchUserLogDTO.setStatus(1);
+        BenchUserLogDTO one = benchUserLogService.getOne(benchUserLogDTO);
+        if (one != null){
+            if (one.getOpenId().equals(openId)){
+                return toolUtils.response(InterfaceResultEnum.DEVICE_CONNECTED,version,new Object());
+            }else {
+                return toolUtils.response(InterfaceResultEnum.DEVICE_CONNECTED_ELSE,version,new Object());
+            }
+        }
+        benchUserLogDTO.setOpenId(openId);
+        benchUserLogDTO.setSn(null);
+        BenchUserLogDTO res = benchUserLogService.getOne(benchUserLogDTO);
+        if (res != null) return toolUtils.response(InterfaceResultEnum.DEVICE_DISCONNECT,version,new Object());
+        LampPoleDTO lampPoleDTO = new LampPoleDTO();
+        lampPoleDTO.setSn(sn);
+        LampPoleDTO simpleOne = lampPoleService.getSimpleOne(lampPoleDTO);
+        String sendTopic = "/WEGW2/WriteIn/"+sn;
+        String backTopic = "/WEGW2/WriteOut/"+sn;
+        String cmd = "{\"D8\":\"0001000000\"}";
+        String hex = "060B";
+        String sendData = hex+cmd;
+        String back = toolUtils.sendWifiMqttCmd(sendTopic, sendData, backTopic, 5);
+        toolUtils.setLog("scan_dev_qrcode.txt",sendTopic);
+        toolUtils.setLog("scan_dev_qrcode.txt",backTopic);
+        toolUtils.setLog("scan_dev_qrcode.txt",cmd);
+        if (back != null && !back.equals("")){
+            toolUtils.setLog("scan_dev_qrcode.txt", back);
+            if (back.substring(back.length()-2).equals("01")) {
+                if (simpleOne != null) {
+                    benchDevInfoService.updateCount(simpleOne.getLampPoleId());
+                }
+                WifiDTO wifiDTO = new WifiDTO();
+                wifiDTO.setLna1Status(1);
+                wifiDTO.setType4(0);
+                wifiDTO.setNum(sn);
+                wifiService.updataWifiBySn(wifiDTO);
+                benchUserLogDTO.setSn(sn);
+                benchUserLogDTO.setAddress(address);
+                SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                String currentTime = simpleDateFormat.format(new Date());
+                benchUserLogDTO.setUpdateTime(currentTime);
+                benchUserLogService.addData(benchUserLogDTO);
+                return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,new Object());
+            }
+        }else {
+            return toolUtils.response(InterfaceResultEnum.SEND_CMD_TIME_OUT,version,new Object());
+        }
+        return toolUtils.response(InterfaceResultEnum.SEND_CMD_TIME_OUT,version,new Object());
+    }
+    /**
+     * 扫描连接设备
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/scanDevList", method = RequestMethod.POST)
+    public BaseResult<?> scanDevList(HttpServletRequest request) throws IOException, ParseException {
+
+        Integer version = request.getParameter("version") == null ? 0 : Integer.valueOf(request.getParameter("version"));
+        String openId = request.getParameter("openId");
+        if (openId == null ) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version,new Object());
+        BenchUserLogDTO benchUserLogDTO = new BenchUserLogDTO();
+        benchUserLogDTO.setStatus(1);
+        benchUserLogDTO.setOpenId(openId);
+        SimpleDateFormat outFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+        List<BenchUserLogDTO> devList = benchUserLogService.getDevList(benchUserLogDTO);
+        for (BenchUserLogDTO dto:devList) {
+            Date parse = simpleDateFormat.parse(dto.getUpdateTime());
+            dto.setUpdateTime(outFormat.format(parse));
+        }
+        BenchUserLogDTO dto = new BenchUserLogDTO();
+        dto.setList(devList);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,dto);
+    }
+}
+

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

@@ -56,4 +56,6 @@ public interface AllAlarmInfoLogDao {
     List<AllAlarmInfoLogDTO> getOneLampPoleAlarmList(@Param("lampPoleId") Integer lampPoleId);
 
     void addAlarmData(AllAlarmInfoLogDTO dto);
+    AllAlarmInfoLogVO getCountBySection(AllAlarmInfoLogVO vo);
+    List<AllAlarmInfoLogVO> alarmTOP(AllAlarmInfoLogVO vo);
 }

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

@@ -1,7 +1,12 @@
 package com.welampiot.dao;
 
+import com.welampiot.vo.BenchDevInfoVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * ClassName: BenchDevInfoDao
  * Package: com.welampiot.dao
@@ -17,4 +22,9 @@ public interface BenchDevInfoDao {
     Integer getLampPoleIdByBenchId(@Param("id") Integer id);
 
     Integer getBenchCountByLampPoleId(@Param("lampPoleId") Integer lampPoleId);
+    List<BenchDevInfoVO> getBenchJoinList(HashMap<String,Integer> map);
+    List<BenchDevInfoVO> getBenchInfoByIds(ArrayList<Integer> lampPoleIds);
+    List<BenchDevInfoVO> getListByDeviceId(HashMap<String,Object> map);
+    BenchDevInfoVO getLampPoleDevice(String deviceId);
+    void updateCount(Integer lampPoleId);
 }

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

@@ -0,0 +1,9 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.BenchUserInfoDTO;
+
+public interface BenchUserInfoDao {
+    BenchUserInfoDTO getOneData(BenchUserInfoDTO dto);
+    void addData(BenchUserInfoDTO dto);
+    void updateData(BenchUserInfoDTO dto);
+}

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

@@ -0,0 +1,12 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.BenchUserLogDTO;
+
+import java.util.List;
+
+public interface BenchUserLogDao {
+    void updateUserLog(BenchUserLogDTO dto);
+    BenchUserLogDTO getOne(BenchUserLogDTO dto);
+    void addData(BenchUserLogDTO dto);
+    List<BenchUserLogDTO> getDevList(BenchUserLogDTO dto);
+}

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

@@ -4,9 +4,7 @@ import com.welampiot.dto.BroadcastDTO;
 import com.welampiot.dto.BroadcastItemDTO;
 import com.welampiot.dto.BroadcastProListDTO;
 import org.apache.ibatis.annotations.Param;
-import org.springframework.security.core.parameters.P;
 
-import java.lang.reflect.Array;
 import java.util.List;
 
 /**
@@ -44,4 +42,6 @@ public interface BroadcastDao {
     Integer checkBroadcastData(BroadcastDTO dto);
     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/BroadcastItemDao.java

@@ -27,4 +27,5 @@ public interface BroadcastItemDao {
     List<BroadcastItemDTO> getBroadcastItemListByItemVO(BroadcastItemVO vo);
 
     Integer getBroadcastItemTotalByItemVO(BroadcastItemVO vo);
+    BroadcastItemDTO getOneDataById(Integer id);
 }

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

@@ -51,4 +51,7 @@ public interface ChargeDao {
     Integer getChargeTotalByDTO(ChargeDTO dto);
 
     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

@@ -71,5 +71,7 @@ public interface EnvmonitorDao {
     List<EnvmonitorDTO> getIlluminanceListByVO(EnvmonitorVO vo);
     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/EnvmonitorInfoLogDao.java

@@ -27,4 +27,5 @@ public interface EnvmonitorInfoLogDao {
     List<EnvmonitorInfoLogDTO> getEnvStatisticsListByDTO(EnvmonitorDTO dto);
 
     void deleteEnvmonitorInfoLogData(@Param("envmonitorId") Integer envmonitorId);
+    EnvmonitorInfoLogDTO getOne(Integer envmonitorId);
 }

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

@@ -0,0 +1,9 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.GbPlayDTO;
+
+public interface GbPlayDao {
+    GbPlayDTO getOneData(String address);
+    void addData(GbPlayDTO dto);
+    void updataData(GbPlayDTO dto);
+}

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

@@ -68,4 +68,7 @@ public interface LampDao {
     void addByDto(LampInfoDTO dto);
     void updateById(LampInfoDTO dto);
     LampInfoDTO getOneData(HashMap<String,Object> map);
+    List<LampInfoDTO> getLampJoinLogList(Integer id);
+    List<LampInfoDTO> getLampLocaltion(LampInfoDTO dto);
+    LampInfoDTO getLampById(Integer id);
 }

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

@@ -1,6 +1,7 @@
 package com.welampiot.dao;
 
 import com.welampiot.dto.LampInfoLogDTO;
+import com.welampiot.vo.AllAlarmInfoLogVO;
 import com.welampiot.vo.LampLogVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -11,4 +12,10 @@ public interface LampInfoLogDao {
     List<LampInfoLogDTO> getListByVO(LampLogVO lampLogVO);
     List<LampInfoLogDTO> getDayEleUsedList(@Param("type") Integer type, @Param("value") Integer value);
     void deleteLampInfoLogData(LampInfoLogDTO dto);
+    LampInfoLogDTO getDayConsumption(LampInfoLogDTO dto);
+    LampInfoLogDTO consumptiontSatistics(LampInfoLogDTO dto);
+    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/LampPoleDao.java

@@ -7,6 +7,7 @@ import com.welampiot.vo.LampPoleVO;
 import com.welampiot.vo.MapDataVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 
 public interface LampPoleDao {
@@ -62,4 +63,9 @@ public interface LampPoleDao {
     LampPoleDTO getNewLampPoleDetailsById(@Param("id") Integer id);
     List<LampPoleDTO> getLampListByLampPoleId(@Param("lampPoleId") Integer lampPoleId);
     void updateById(LampPoleDTO lampPoleDTO);
+    List<LampPoleDTO>getPoleAlarmLogList(List<Integer> lampPoleIds);
+    LampPoleDTO getLocalDataById(Integer id);
+    List<LampPoleDTO> getRangeLampPole(HashMap<String,Double> hashMap);
+    LampPoleDTO getSimpleOne(LampPoleDTO dto);
+    List<LampPoleDTO> getLampPoleLocation(LampPoleDTO dto);
 }

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

@@ -20,4 +20,5 @@ public interface ProgramDao {
     void deleteProgramDataById(@Param("programId") Integer programId);
 
     ProgramDTO getProgramDTOById(@Param("programId") Integer programId);
+    ProgramDTO getOneProgram(Integer id);
 }

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

@@ -42,4 +42,6 @@ public interface ScreenDao {
     ScreenDTO getScreenById(@Param("id")int id);
     void updateByDto(ScreenDTO dto);
     ScreenDTO getOneScreen(HashMap<String,Object> map);
+    ScreenDTO getOneScreenByLampPoleId(Integer lampPoleId);
+    ScreenDTO getScreenAndProgram(Integer lampPoleId);
 }

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

@@ -18,4 +18,7 @@ public interface TrailInfoDao {
     List<TrailInfoDTO> getTrailInfoListByVideoId(@Param("videoId") Integer videoId);
 
     List<TrailInfoDTO> getSmailListByVideoId(@Param("videoId") Integer videoId);
+    List<TrailInfoDTO> getList(Integer id);
+    TrailInfoDTO getSmaiListById(Integer id);
+    TrailInfoDTO getSmaiList(Integer id);
 }

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

@@ -18,4 +18,6 @@ public interface VideoCarDao {
     VideoCarDTO getVideoCarByVideoId(@Param("videoId") Integer videoId);
 
     List<VideoCarDTO> getVideoCarListByVideoId(@Param("videoId") Integer videoId);
+    List<VideoCarDTO> getList(Integer id);
+    Integer getTotal(VideoCarDTO dto);
 }

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

@@ -16,4 +16,6 @@ import java.util.List;
  */
 public interface VideoFaceDao {
     List<VideoFaceDTO> getVideoFaceListByVideoId(@Param("videoId") Integer videoId);
+    List<VideoFaceDTO> getList(Integer id);
+    Integer getTotal(VideoFaceDTO dto);
 }

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

@@ -53,4 +53,6 @@ public interface VideoMonitorDao {
     List<VideoMonitorDTO> getDataList(EmergencyDTO dto);
 
     VideoMonitorDTO getOneMonitor(HashMap<String,Object> map);
+    VideoMonitorDTO geteMonitorData(Integer lampPoleId);
+    VideoMonitorDTO getOneData(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/WifiDao.java

@@ -36,4 +36,6 @@ public interface WifiDao {
     WifiDTO getTotalWifiCountAndFlow(WifiDTO dto);
     WifiDTO getWifiByLampPoleId(@Param("lampPoleId") Integer lampPoleId);
     WifiDTO getOneWifi(HashMap<String,Object> map);
+    WifiDTO getOneWifiByLampPoleId(Integer id);
+    void updataWifiBySn(WifiDTO dto);
 }

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

@@ -3,6 +3,7 @@ package com.welampiot.dao;
 import com.welampiot.dto.WifiInfoLogDTO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -24,4 +25,7 @@ public interface WifiInfoLogDao {
 
     List<WifiInfoLogDTO> getWifiInfoLogListByDTO(WifiInfoLogDTO dto);
     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/BenchUserInfoDTO.java

@@ -0,0 +1,16 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+@Data
+public class BenchUserInfoDTO {
+    private Integer id;
+    private String nickName;
+    private String avaurl;
+    private String sex;
+    private String openId;
+    private String sessionKey;
+    private String updateTime;
+    private String createTime;
+
+}

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

@@ -0,0 +1,17 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BenchUserLogDTO {
+    private Integer id;
+    private String sn;
+    private String address;
+    private Integer status;
+    private String updateTime;
+    private String closeTime;
+    private String openId;
+    private List<BenchUserLogDTO> list;
+}

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

@@ -1,5 +1,6 @@
 package com.welampiot.dto;
 
+import com.welampiot.vo.NetworkWeather;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -166,7 +167,7 @@ public class EnvmonitorDTO implements Serializable {
     private Float windSpeed;
 
     /** 风向 **/
-    private Integer windDire;
+    private String windDire;
 
     /** 雨量 **/
     private Float rainfall;
@@ -213,8 +214,9 @@ public class EnvmonitorDTO implements Serializable {
     private String province;
     private String location;
 
-    private WeatherDTO weatherData;
-    private List<WeatherDTO> weatherList;
+//    private WeatherDTO weatherData;
+    private NetworkWeather weatherData;
+    private List<NetworkWeather> weatherList;
     List<WeatherRS485DevInfoDTO> devList;
 
     private String temp;
@@ -224,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

@@ -1,8 +1,10 @@
 package com.welampiot.dto;
 
+import com.welampiot.vo.NetworkWeather;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * ClassName: EnvmonitorInfoLogDTO
@@ -56,4 +58,10 @@ public class EnvmonitorInfoLogDTO implements Serializable {
     private String co;
 
     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/GbPlayDTO.java

@@ -0,0 +1,10 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+@Data
+public class GbPlayDTO {
+    private Integer id;
+    private String gbAddress;
+    private long time;
+}

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

@@ -18,15 +18,15 @@ public class LampInfoDTO {
     private String section;
     private Integer sectionId;
     private Integer timezone;
-    private int lighteness;
+    private Integer lighteness;
     private Integer status;
-    private String gridVolt;
-    private String girdCurr;
-    private String gridActivePower;
+    private Float gridVolt;
+    private Float gridCurr;
+    private Float gridActivePower;
     private String workTimeTotal;
-    private String usedEnergyTotal;
+    private Float usedEnergyTotal;
     private String powerSave;
-    private String gridPF;
+    private Float gridPF;
     private String name;
     private String voltage;
     private String current;
@@ -43,11 +43,11 @@ public class LampInfoDTO {
     private String lampOnline;
     private Integer rssi;
     private Integer snr;
-    private int protocolType;
+    private Integer protocolType;
     private String groupId;
     private String group;
     private String network;
-    private int networkId;
+    private Integer networkId;
     private Integer netStatus;
     private String lampPoleName;
     private String loopNumber;
@@ -56,7 +56,7 @@ public class LampInfoDTO {
     private Integer mode;
     private String hwVersion;
     private String swVersion;
-    private int controlType;
+    private Integer controlType;
     private String macAddress;
     private String devAddr;
     private Integer bindStatus;
@@ -74,13 +74,13 @@ public class LampInfoDTO {
     private String dueDate;
     private String controlTypeStr;
     private String createTime;
-    private int companyId;
-    private int ratedPower;
-    private int version;
-    private int select;
-    private int lampPoleId;
+    private Integer companyId;
+    private Integer ratedPower;
+    private Integer version;
+    private Integer select;
+    private Integer lampPoleId;
     private Integer loopId;
-    private String colourVal;
+    private Integer colourVal;
     private String keyword;
     private List<?> sectionList;
     private Integer alarmCount;
@@ -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

@@ -1,7 +1,10 @@
 package com.welampiot.dto;
 
+import com.welampiot.vo.LampInfoVO;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class LampInfoLogDTO {
     private String voltage;
@@ -18,4 +21,26 @@ public class LampInfoLogDTO {
     private Integer lampId;
     private String startDate;
     private String endDate;
+    private Double dayconsumption;
+    private Double totalconsumption;
+    private List<?> sectionList;
+    private Integer lampCount;
+    private Integer poleCount;
+    private List<LampPoleDTO> poleList;
+    private Integer lightCount;
+    private Integer alarmCount;
+    private LampInfoVO lampList;
+    private String area;
+    private List<Object> value; // 用电量
+    private List<Object> date; // 用电量
+    private Integer consumption;
+    private List<?> list;
+    private Float gridvolt;
+    private Float gridcurr;
+    private Float gridActivePower;
+    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/LampPoleDTO.java

@@ -132,4 +132,8 @@ public class LampPoleDTO {
     private Integer volume;
     private String broadcastPro;
     private Float equipmentElectricity; // 累计充电量
+    private Integer dType;
+    private String content;
+    private String modelType;
+    private String alarmTypeStr;
 }

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

@@ -8,17 +8,17 @@ public class OperationLogDTO {
     private String time;
     private String acount;
     private String remark;
-    private int operaType;
+    private Integer operaType;
     private String operation;
-    private int sectionId;
-    private int areaId;
+    private Integer sectionId;
+    private Integer areaId;
     private Integer os;
     private Integer type;
     private Integer userId;
     private Integer devType;
     private String deviceName;
     private String sn;
-    private int devId;
+    private Integer devId;
     private String sqlLog;
     private String ipAddr;
     private String location;
@@ -29,4 +29,5 @@ public class OperationLogDTO {
     private Integer timezone;
     private String company;
     private String logInfo;
+    private String content;
 }

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/TrailInfoDTO.java

@@ -21,7 +21,7 @@ public class TrailInfoDTO implements Serializable {
 
     private Integer videoId;
 
-    private String smail; // 相似度
+    private Float smail; // 相似度
 
     private String image; // 相似人脸图片地址
 
@@ -32,4 +32,5 @@ public class TrailInfoDTO implements Serializable {
     private String faceImage;
 
     private Integer isAuto;
+    private String faceImage2;
 }

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

@@ -30,4 +30,6 @@ public class VideoCarDTO implements Serializable {
     private String faceImage;
 
     private String bigImage; // 大图地址
+    private String beginDate;
+    private String endDate;
 }

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

@@ -34,4 +34,6 @@ public class VideoFaceDTO implements Serializable {
     private String updateTime; // 更新时间
 
     private String faceToken; // 人脸标识
+    private String beginDate;
+    private String endDate;
 }

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/WeatherDTO.java

@@ -29,4 +29,6 @@ public class WeatherDTO {
     private String date;
     private String sunrise; // 日出时间
     private String sunset; // 日落时间
+    private String weatherText;
+    private String weatherCode;
 }

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

@@ -322,4 +322,8 @@ public class WifiDTO implements Serializable {
 
     private List<Object> dateList;
     private List<Object> flowList;
+    private Integer totalDevice;
+    private List<Object> xDataList;
+    private Object totalFlow;
+    private Integer dayDevice;
 }

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

@@ -26,7 +26,7 @@ public class WifiInfoLogDTO implements Serializable {
     private Integer deviceCount;
 
     /** 使用流量数 **/
-    private String flow;
+    private Float flow;
 
     /** 数据更新时间 **/
     private String updateTime;

src/main/java/com/welampiot/security/ValidateImageCodeFilter.java

@@ -28,7 +28,7 @@ public class ValidateImageCodeFilter extends OncePerRequestFilter {
         @Override
         protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException {
             //请求路径中是否包含login这个关键词 && 发送的请求必须是post
-            if (StringUtils.contains(request.getRequestURI(), "login") && StringUtils.equalsIgnoreCase(request.getMethod(), "post")) {
+            if (StringUtils.contains(request.getRequestURI(), "common/login") && StringUtils.equalsIgnoreCase(request.getMethod(), "post")) {
                 try {
                 //开始验证
                 validateCode(new ServletWebRequest(request));

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

@@ -54,4 +54,7 @@ public interface AllAlarmInfoLogService {
 
     List<AllAlarmInfoLogDTO> getLessLampAlarmInfoList(AllAlarmInfoLogVO vo);
     void addAlarmData(AllAlarmInfoLogDTO dto);
+    AllAlarmInfoLogVO getCountBySection(AllAlarmInfoLogVO vo);
+//    AllAlarmInfoLogVO alarmTOP(AllAlarmInfoLogVO vo);
+    List<AllAlarmInfoLogVO> alarmTOP(AllAlarmInfoLogVO vo);
 }

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

@@ -1,5 +1,11 @@
 package com.welampiot.service;
 
+import com.welampiot.vo.BenchDevInfoVO;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * ClassName: BenchDevInfoService
  * Package: com.welampiot.service
@@ -15,4 +21,9 @@ public interface BenchDevInfoService {
     Integer getLampPoleIdByBenchId(Integer id);
 
     Integer getBenchCountByLampPoleId(Integer lampPoleId);
+    List<BenchDevInfoVO> getBenchJoinList(HashMap<String,Integer> map);
+    List<BenchDevInfoVO> getBenchInfoByIds(ArrayList<Integer> lampPoleIds);
+    List<BenchDevInfoVO> getListByDeviceId(HashMap<String,Object> map);
+    BenchDevInfoVO getLampPoleDevice(String deviceId);
+    void updateCount(Integer lampPoleId);
 }

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

@@ -0,0 +1,9 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.BenchUserInfoDTO;
+
+public interface BenchUserInfoService {
+    BenchUserInfoDTO getOneData(BenchUserInfoDTO dto);
+    void addData(BenchUserInfoDTO dto);
+    void updateData(BenchUserInfoDTO dto);
+}

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

@@ -0,0 +1,12 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.BenchUserLogDTO;
+
+import java.util.List;
+
+public interface BenchUserLogService {
+    void updateUserLog(BenchUserLogDTO dto);
+    BenchUserLogDTO getOne(BenchUserLogDTO dto);
+    void addData(BenchUserLogDTO dto);
+    List<BenchUserLogDTO> getDevList(BenchUserLogDTO dto);
+}

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

@@ -27,4 +27,5 @@ public interface BroadcastItemService {
     List<BroadcastItemDTO> getBroadcastItemListByItemVO(BroadcastItemVO vo);
 
     Integer getBroadcastItemTotalByItemVO(BroadcastItemVO vo);
+    BroadcastItemDTO getOneDataById(Integer id);
 }

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

@@ -38,4 +38,6 @@ public interface BroadcastService {
     void updateBroadcastById(BroadcastDTO dto);
     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

@@ -38,4 +38,7 @@ public interface ChargeService {
 
     Integer getChargeTotalByDTO(ChargeDTO dto);
     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/EnvmonitorInfoLogService.java

@@ -26,4 +26,5 @@ public interface EnvmonitorInfoLogService {
     List<EnvmonitorInfoLogDTO> getEnvStatisticsListByDTO(EnvmonitorDTO dto);
 
     void deleteEnvmonitorInfoLogData(Integer envmonitorId);
+    EnvmonitorInfoLogDTO getOne(Integer envmonitorId);
 }

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

@@ -68,4 +68,7 @@ public interface EnvmonitorService {
     List<EnvmonitorDTO> getIlluminanceListByVO(EnvmonitorVO vo);
     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/GbPlayService.java

@@ -0,0 +1,10 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.GbPlayDTO;
+
+public interface GbPlayService {
+    GbPlayDTO getOneData(String address);
+
+    void addData(GbPlayDTO dto);
+    void updataData(GbPlayDTO dto);
+}

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

@@ -1,6 +1,7 @@
 package com.welampiot.service;
 
 import com.welampiot.dto.LampInfoLogDTO;
+import com.welampiot.vo.AllAlarmInfoLogVO;
 import com.welampiot.vo.LampLogVO;
 
 import java.util.List;
@@ -10,4 +11,10 @@ public interface LampInfoLogService {
     List<LampInfoLogDTO> getListByVO(LampLogVO lampLogVO);
     List<LampInfoLogDTO> getDayEleUsedList(Integer type, Integer value);
     void deleteLampInfoLogData(LampInfoLogDTO dto);
+    LampInfoLogDTO getDayConsumption(LampInfoLogDTO dto);
+    LampInfoLogDTO consumptiontSatistics(LampInfoLogDTO dto);
+    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/LampPoleService.java

@@ -10,6 +10,7 @@ import com.welampiot.vo.LampPoleVO;
 import com.welampiot.vo.MapDataVO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 
 public interface LampPoleService {
@@ -54,4 +55,9 @@ public interface LampPoleService {
     List<LampPoleDTO> getLampListByLampPoleId(Integer lampPoleId);
     LampPoleInfoVO getLampPoleBigScreenCount(LampPoleDTO lampPoleDTO, LampInfoDTO lampInfoDTO);
     void updateById(LampPoleDTO lampPoleDTO);
+    List<LampPoleDTO>getPoleAlarmLogList(List<Integer> lampPoleIds);
+    LampPoleDTO getLocalDataById(Integer id);
+    List<LampPoleDTO> getRangeLampPole(HashMap<String,Double> hashMap);
+    LampPoleDTO getSimpleOne(LampPoleDTO dto);
+    List<LampPoleDTO> getLampPoleLocation(LampPoleDTO dto);
 }

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

@@ -68,4 +68,7 @@ public interface LampService {
     void addByDto(LampInfoDTO dto);
     void updateById(LampInfoDTO dto);
     LampInfoDTO getOneData(HashMap<String,Object> map);
+    List<LampInfoDTO> getLampJoinLogList(Integer id);
+    List<LampInfoDTO> getLampLocaltion(LampInfoDTO dto);
+    LampInfoDTO getLampById(Integer id);
 }

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

@@ -19,4 +19,5 @@ public interface ProgramService {
     void deleteProgramDataById(Integer programId);
 
     ProgramDTO getProgramDTOById(Integer programId);
+    ProgramDTO getOneProgram(Integer id);
 }

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

@@ -39,4 +39,6 @@ public interface ScreenService {
     ScreenDTO getScreenById(int id);
     void updateByDto(ScreenDTO dto);
     ScreenDTO getOneScreen(HashMap<String,Object> map);
+    ScreenDTO getOneScreenByLampPoleId(Integer lampPoleId);
+    ScreenDTO getScreenAndProgram(Integer lampPoleId);
 }

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

@@ -17,4 +17,7 @@ public interface TrailInfoService {
     List<TrailInfoDTO> getTrailInfoListByVideoId(Integer videoId);
 
     List<TrailInfoDTO> getSmailListByVideoId(Integer videoId);
+    List<TrailInfoDTO> getList(Integer id);
+    TrailInfoDTO getSmaiListById(Integer id);
+    TrailInfoDTO getSmaiList(Integer id);
 }

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

@@ -17,4 +17,6 @@ public interface VideoCarService {
     VideoCarDTO getVideoCarByVideoId(Integer videoId);
 
     List<VideoCarDTO> getVideoCarListByVideoId(Integer videoId);
+    List<VideoCarDTO> getList(Integer id);
+    Integer getTotal(VideoCarDTO dto);
 }

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

@@ -15,4 +15,6 @@ import java.util.List;
  */
 public interface VideoFaceService {
     List<VideoFaceDTO> getVideoFaceListByVideoId(Integer videoId);
+    List<VideoFaceDTO> getList(Integer id);
+    Integer getTotal(VideoFaceDTO dto);
 }

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

@@ -37,4 +37,6 @@ public interface VideoMonitorService {
     void updateIsAutoStatus(VideoMonitorDTO dto);
     List<VideoMonitorDTO> getDataList(EmergencyDTO dto);
     VideoMonitorDTO getOneMonitor(HashMap<String,Object> map);
+    VideoMonitorDTO geteMonitorData(Integer lampPoleId);
+    VideoMonitorDTO 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

@@ -3,6 +3,7 @@ package com.welampiot.service;
 import com.welampiot.dto.WifiInfoLogDTO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -25,4 +26,7 @@ public interface WifiInfoLogService {
     List<WifiInfoLogDTO> getWifiInfoLogListByDTO(WifiInfoLogDTO dto);
 
     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/WifiService.java

@@ -38,4 +38,6 @@ public interface WifiService {
     WifiDTO getTotalWifiCountAndFlow(WifiDTO dto);
     WifiDTO getWifiByLampPoleId(Integer lampPoleId);
     WifiDTO getOneWifi(HashMap<String,Object> map);
+    WifiDTO getOneWifiByLampPoleId(Integer id);
+    void updataWifiBySn(WifiDTO dto);
 }

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

@@ -216,4 +216,12 @@ public class AllAlarmInfoLogServiceImpl implements AllAlarmInfoLogService {
     public void addAlarmData(AllAlarmInfoLogDTO dto){
         allAlarmInfoLogDao.addAlarmData(dto);
     }
+    @Override
+    public AllAlarmInfoLogVO getCountBySection(AllAlarmInfoLogVO vo){
+        return allAlarmInfoLogDao.getCountBySection(vo);
+    }
+    @Override
+    public List<AllAlarmInfoLogVO> alarmTOP(AllAlarmInfoLogVO vo){
+        return allAlarmInfoLogDao.alarmTOP(vo);
+    }
 }

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

@@ -2,9 +2,14 @@ package com.welampiot.service.impl;
 
 import com.welampiot.dao.BenchDevInfoDao;
 import com.welampiot.service.BenchDevInfoService;
+import com.welampiot.vo.BenchDevInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * ClassName: BenchDevInfoServiceImpl
  * Package: com.welampiot.service.impl
@@ -33,4 +38,24 @@ public class BenchDevInfoServiceImpl implements BenchDevInfoService {
     public Integer getBenchCountByLampPoleId(Integer lampPoleId) {
         return benchDevInfoDao.getBenchCountByLampPoleId(lampPoleId);
     }
+    @Override
+    public List<BenchDevInfoVO> getBenchJoinList(HashMap<String,Integer> map){
+        return benchDevInfoDao.getBenchJoinList(map);
+    }
+    @Override
+    public List<BenchDevInfoVO> getBenchInfoByIds(ArrayList<Integer> lampPoleIds){
+        return benchDevInfoDao.getBenchInfoByIds(lampPoleIds);
+    }
+    @Override
+    public List<BenchDevInfoVO> getListByDeviceId(HashMap<String,Object> map){
+        return benchDevInfoDao.getListByDeviceId(map);
+    }
+    @Override
+    public BenchDevInfoVO getLampPoleDevice(String deviceId){
+        return benchDevInfoDao.getLampPoleDevice(deviceId);
+    }
+    @Override
+    public void updateCount(Integer lampPoleId){
+        benchDevInfoDao.updateCount(lampPoleId);
+    }
 }

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

@@ -0,0 +1,27 @@
+package com.welampiot.service.impl;
+
+import com.welampiot.dao.BenchUserInfoDao;
+import com.welampiot.dto.BenchUserInfoDTO;
+import com.welampiot.service.BenchUserInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class BenchUserInfoServiceImpl implements BenchUserInfoService {
+    @Autowired
+    private BenchUserInfoDao benchUserInfoDao;
+
+    @Override
+    public BenchUserInfoDTO getOneData(BenchUserInfoDTO dto) {
+        return benchUserInfoDao.getOneData(dto);
+    }
+    @Override
+    public void addData(BenchUserInfoDTO dto){
+        benchUserInfoDao.addData(dto);
+    }
+    @Override
+    public void updateData(BenchUserInfoDTO dto){
+        benchUserInfoDao.updateData(dto);
+    }
+
+}

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

@@ -0,0 +1,32 @@
+package com.welampiot.service.impl;
+
+import com.welampiot.dao.BenchUserLogDao;
+import com.welampiot.dto.BenchUserLogDTO;
+import com.welampiot.service.BenchUserLogService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class BenchUserLogServiceImpl implements BenchUserLogService {
+    @Autowired
+    private BenchUserLogDao benchUserLogDao;
+
+    @Override
+    public void updateUserLog(BenchUserLogDTO dto) {
+        benchUserLogDao.updateUserLog(dto);
+    }
+    @Override
+    public BenchUserLogDTO getOne(BenchUserLogDTO dto){
+        return benchUserLogDao.getOne(dto);
+    }
+    @Override
+    public void addData(BenchUserLogDTO dto){
+        benchUserLogDao.addData(dto);
+    }
+    @Override
+    public List<BenchUserLogDTO> getDevList(BenchUserLogDTO dto){
+        return benchUserLogDao.getDevList(dto);
+    }
+}

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

@@ -52,4 +52,8 @@ public class BroadcastItemServiceImpl implements BroadcastItemService {
     public Integer getBroadcastItemTotalByItemVO(BroadcastItemVO vo) {
         return broadcastItemDao.getBroadcastItemTotalByItemVO(vo);
     }
+    @Override
+    public BroadcastItemDTO getOneDataById(Integer id){
+        return broadcastItemDao.getOneDataById(id);
+    }
 }

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

@@ -173,4 +173,12 @@ public class BroadcastServiceImpl implements BroadcastService {
     public Integer getTotalBySectionList(BroadcastDTO dto) {
         return broadcastDao.getTotalBySectionList(dto);
     }
+    @Override
+    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

@@ -217,4 +217,16 @@ public class ChargeServiceImpl implements ChargeService {
     public ChargeDTO getOneCharge(HashMap<String,Object> map){
         return chargeDao.getOneCharge(map);
     }
+    @Override
+    public ChargeDTO getOneChargeByLampPoleId(Integer lampPoleId){
+        return chargeDao.getOneChargeByLampPoleId(lampPoleId);
+    }
+    @Override
+    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/EnvmonitorInfoLogServiceImpl.java

@@ -52,4 +52,8 @@ public class EnvmonitorInfoLogServiceImpl implements EnvmonitorInfoLogService {
     public void deleteEnvmonitorInfoLogData(Integer envmonitorId) {
         envmonitorInfoLogDao.deleteEnvmonitorInfoLogData(envmonitorId);
     }
+    @Override
+    public EnvmonitorInfoLogDTO getOne(Integer envmonitorId){
+        return envmonitorInfoLogDao.getOne(envmonitorId);
+    }
 }

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);
@@ -311,4 +311,16 @@ public class EnvmonitorServiceImpl implements EnvmonitorService {
     public EnvmonitorDTO getOneEnvmonitor(HashMap<String,Object> map){
         return envmonitorDao.getOneEnvmonitor(map);
     }
+    @Override
+    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/GbPlayServiceImpl.java

@@ -0,0 +1,29 @@
+package com.welampiot.service.impl;
+
+import com.welampiot.dao.GbPlayDao;
+import com.welampiot.dto.GbPlayDTO;
+import com.welampiot.service.GbPlayService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class GbPlayServiceImpl implements GbPlayService {
+    @Autowired
+    private GbPlayDao gbPlayDao;
+
+    @Override
+    public GbPlayDTO getOneData(String address) {
+        return gbPlayDao.getOneData(address);
+    }
+
+    @Override
+    public void addData(GbPlayDTO dto) {
+        gbPlayDao.addData(dto);
+    }
+
+    @Override
+    public void updataData(GbPlayDTO dto) {
+        gbPlayDao.updataData(dto);
+    }
+
+}

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

@@ -3,6 +3,7 @@ package com.welampiot.service.impl;
 import com.welampiot.dao.LampInfoLogDao;
 import com.welampiot.dto.LampInfoLogDTO;
 import com.welampiot.service.LampInfoLogService;
+import com.welampiot.vo.AllAlarmInfoLogVO;
 import com.welampiot.vo.LampLogVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -33,4 +34,29 @@ public class LampInfoLogServiceImpl implements LampInfoLogService {
     public void deleteLampInfoLogData(LampInfoLogDTO dto) {
         lampInfoLogDao.deleteLampInfoLogData(dto);
     }
+    @Override
+    public LampInfoLogDTO getDayConsumption(LampInfoLogDTO dto){
+        return lampInfoLogDao.getDayConsumption(dto);
+    }
+
+    @Override
+    public LampInfoLogDTO consumptiontSatistics(LampInfoLogDTO dto){
+        return lampInfoLogDao.consumptiontSatistics(dto);
+    }
+    @Override
+    public List<LampInfoLogDTO> consumptionTOP(LampInfoLogDTO dto){
+        return lampInfoLogDao.consumptionTOP(dto);
+    }
+    @Override
+    public AllAlarmInfoLogVO alarmCountChart(LampInfoLogDTO dto){
+        return lampInfoLogDao.alarmCountChart(dto);
+    }
+    @Override
+    public LampInfoLogDTO getOne(Integer lampId){
+        return lampInfoLogDao.getOne(lampId);
+    }
+    @Override
+    public List<LampInfoLogDTO> getList(LampInfoLogDTO dto){
+        return lampInfoLogDao.getList(dto);
+    }
 }