GIS地图接口

pom.xml

@@ -115,6 +115,25 @@
             <artifactId>commons-httpclient</artifactId>
             <version>3.1</version>
         </dependency>
+
+        <!-- 读取远程服务器文件-->
+        <!-- shh2 -->
+        <dependency>
+            <groupId>ch.ethz.ganymed</groupId>
+            <artifactId>ganymed-ssh2</artifactId>
+            <version>262</version>
+        </dependency>
+        <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jsch</artifactId>
+            <version>0.1.53</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>3.4</version>
+        </dependency>
+
     </dependencies>
 
     <repositories>  <!-- 配置阿里云镜像仓库 -->

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

@@ -83,7 +83,14 @@ public enum InterfaceResultEnum {
     LACK_SMOKE_SENSATION_NAME_ERROR("0276","烟感名称不能为空","The smoke sensor name cannot be empty","Имя табака не может быть пустым"),
     SMOKE_SENSATION_NAME_UNIQUE_ERROR("0277","烟感名称重复！","The smoke sensor name is duplicate","Курение повторяется"),
     LACK_SMOKE_SENSATION_ADDRESS_ERROR("0278","烟感地址不能为空","The smoke sensor address cannot be empty","Адрес табака не может быть пустым"),
-    SMOKE_SENSATION_ADDRESS_UNIQUE_ERROR("0279","烟感地址重复！","The smoke sensor address is duplicate","Повторите адрес"),
+    SMOKE_SENSATION_ADDRESS_UNIQUE_ERROR("0279","烟感地址重复！","The smoke sensor of address is duplicate","Повторите адрес"),
+    LACK_ENVMONITOR_NAME_ERROR("0280","气象站名称不能为空","The weather station of name cannot be empty","Название метеостанции не может быть пустым"),
+    ENVMONITOR_NAME_UNIQUE_ERROR("0281","气象站名称重复！","The weather station of name is duplicate","Название метеостанции повторяется"),
+    LACK_ENVMONITOR_ADDRESS_ERROR("0282","气象站模块地址不能为空","The weather station of address cannot be empty","Адрес метеостанции не может быть пустым"),
+    ENVMONITOR_ADDRESS_UNIQUE_ERROR("0283","气象站模块地址重复！","The weather station of address is duplicate","Повторяю адрес метеостанции"),
+    LACK_NETWORK_TYPE_ERROR("0284","网络类型不能为空","The network type cannot be empty","Тип сети не может быть пустым"),
+    DATE_CHOOSE_ERROR("0285","选择时间错误，请重新选择！","The selected time is wrong, please choose again!","Пожалуйста, выберите другое время!"),
+    LACK_LOCATION_ERROR("0286","经纬度不能为空","The latitude and longitude cannot be empty","Широта и долгота не могут быть пустыми"),
     ;
     private String code;
     private String msgCn;

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

@@ -1,15 +1,17 @@
 package com.welampiot.controller;
 
 import com.welampiot.common.BaseResult;
+import com.welampiot.common.InterfaceResultEnum;
+import com.welampiot.dto.AlarmTypeDTO;
 import com.welampiot.dto.GlobalLocationDTO;
 import com.welampiot.service.GlobalLocationService;
+import com.welampiot.utils.ToolUtils;
+import com.welampiot.vo.AlarmTypeVO;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -29,6 +31,9 @@ public class CommonController {
     @Autowired
     private GlobalLocationService globalLocationService;
 
+    @Autowired
+    private ToolUtils toolUtils;
+
     /**
      * 获取国家下拉列表
      * @param request
@@ -149,4 +154,43 @@ public class CommonController {
         }
         return BaseResult.success(areaList);
     }
+
+    /**
+     * 故障列表
+     * @param request version
+     * @return list
+     */
+    @RequestMapping(value = "/alarmType", method = RequestMethod.POST)
+    public BaseResult<?> alarmType(HttpServletRequest request) {
+        Integer version = (Integer) toolUtils.getRequestContent(request,"version",1);
+        List<AlarmTypeDTO> list = new ArrayList<>();
+        if (version == 2) {
+            list.add(new AlarmTypeDTO("供电异常","Аномалия электроснабжения"));
+            list.add(new AlarmTypeDTO("灯闪","Свет заморга"));
+            list.add(new AlarmTypeDTO("灯坏","Свет не работа"));
+            list.add(new AlarmTypeDTO("LED驱动故障","Неисправность светодиодного двигателя"));
+            list.add(new AlarmTypeDTO("数据同步失败","Сбой синхронизации данных"));
+            list.add(new AlarmTypeDTO("开灯故障","Свет не работает"));
+            list.add(new AlarmTypeDTO("离线故障","Сбой в сети"));
+        } else if (version == 1) {
+            list.add(new AlarmTypeDTO("供电异常","Abnormal power supply"));
+            list.add(new AlarmTypeDTO("灯闪","Light flash"));
+            list.add(new AlarmTypeDTO("灯坏","Light broken"));
+            list.add(new AlarmTypeDTO("LED驱动故障","LED drive fault"));
+            list.add(new AlarmTypeDTO("数据同步失败","Data synchronization failure"));
+            list.add(new AlarmTypeDTO("开灯故障","Light failure"));
+            list.add(new AlarmTypeDTO("离线故障","Offline fault"));
+        } else {
+            list.add(new AlarmTypeDTO("供电异常","供电异常"));
+            list.add(new AlarmTypeDTO("灯闪","灯闪"));
+            list.add(new AlarmTypeDTO("灯坏","灯坏"));
+            list.add(new AlarmTypeDTO("LED驱动故障","LED驱动故障"));
+            list.add(new AlarmTypeDTO("数据同步失败","数据同步失败"));
+            list.add(new AlarmTypeDTO("开灯故障","开灯故障"));
+            list.add(new AlarmTypeDTO("离线故障","离线故障"));
+        }
+        AlarmTypeVO alarmTypeVO = new AlarmTypeVO();
+        alarmTypeVO.setList(list);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,alarmTypeVO);
+    }
 }

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

@@ -14,15 +14,19 @@ import com.welampiot.utils.ToolUtils;
 import com.welampiot.vo.LampPoleVO;
 import com.welampiot.vo.ListResponseVO;
 import com.welampiot.vo.ScreenDetailsVO;
+import com.welampiot.vo.ScreenVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import org.springframework.web.bind.annotation.*;
+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.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * ClassName: LampPoleController
@@ -170,4 +174,29 @@ public class LampPoleController {
         }
         return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version);
     }
+
+    /**
+     * 获取同一路段下的所有屏幕
+     * @param request 灯杆id
+     * @return 屏幕列表
+     */
+    @RequestMapping(value = "/screenList", method = RequestMethod.POST)
+    public BaseResult<?> screenList(HttpServletRequest request) throws ParseException {
+        Integer version = (Integer) toolUtils.getRequestContent(request,"version",1);
+        Integer id = (Integer) toolUtils.getRequestContent(request,"id",1);
+        if (id == 0) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
+        Integer sectionId = lampPoleService.getSectionIdByLampPoleId(id);
+        if (sectionId == null || sectionId == 0) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
+        List<ScreenDTO> allScreenList = screenService.getAllScreenListBySectionId(sectionId);
+        List<ScreenDTO> list = new ArrayList<>();
+        allScreenList.forEach(dto -> {
+            if (dto.getPlaying() == null) {
+                dto.setPlaying("");
+            }
+            list.add(dto);
+        });
+        ScreenVO screenVO = new ScreenVO();
+        screenVO.setList(list);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,screenVO);
+    }
 }

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

@@ -1,9 +1,12 @@
 package com.welampiot.controller;
 
 import com.welampiot.common.BaseResult;
-import com.welampiot.dto.ScreenDTO;
-import com.welampiot.service.ScreenService;
+import com.welampiot.common.InterfaceResultEnum;
+import com.welampiot.dto.*;
+import com.welampiot.service.*;
+import com.welampiot.utils.SHH2Util;
 import com.welampiot.utils.ToolUtils;
+import com.welampiot.vo.ProgramVO;
 import com.welampiot.vo.ScreenVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
@@ -12,6 +15,10 @@ 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.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * ClassName: ScreenController
@@ -33,6 +40,18 @@ public class ScreenController {
     @Autowired
     private ToolUtils toolUtils;
 
+    @Autowired
+    private ProgramService programService;
+
+    @Autowired
+    private ProgramInfoService programInfoService;
+
+    @Autowired
+    private ProgramInfoItemService programInfoItemService;
+
+    @Autowired
+    private UserService userService;
+
     /**
      * 获取屏幕下拉列表
      * @param request
@@ -45,4 +64,119 @@ public class ScreenController {
         ScreenVO vo = screenService.getScreenNavByDTO(dto);
         return BaseResult.success(vo);
     }
+
+    /**
+     * 节目列表
+     * @param request username
+     * @return 节目列表
+     */
+    @RequestMapping(value = "/programList", method = RequestMethod.POST)
+    public BaseResult<?> programList(HttpServletRequest request)
+            throws NoSuchFieldException, IllegalAccessException, IOException {
+        Integer version = (Integer) toolUtils.getRequestContent(request,"version",1);
+        String username = (String) toolUtils.getRequestContent(request,"username",2);
+        UserDTO userDTO = userService.queryUserIdByUsername(username);
+        if (userDTO == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
+        List<ProgramDTO> programList = programService.getProgramListByUserid(userDTO.getId());
+        List<ProgramDTO> list = new ArrayList<>();
+        for (ProgramDTO programDTO : programList) {
+            if (userDTO.getId() != null && userDTO.getId() != 0) {
+                programDTO.setCreator(username);
+            }
+            /*if (programDTO.getFileType() != null && (programDTO.getFileType() == 2 || programDTO.getFileType() == 1)) {
+                if (programDTO.getPath() != null && !programDTO.getPath().equals("")) {
+                    String fileSize = toolUtils.getFileSize(programDTO.getPath());
+                    if (fileSize != null) {
+                        programDTO.setFileSize(fileSize + "M");
+                    } else {
+                        programDTO.setFileSize("0M");
+                    }
+                }
+            }*/
+            if (programDTO.getFileType() != null && programDTO.getFileType() == 3) {
+                programDTO.setFileTypeStr("液位监测");
+            } else if (programDTO.getFileType() != null && programDTO.getFileType() == 2) {
+                programDTO.setFileTypeStr("视屏");
+            } else if (programDTO.getFileType() != null && programDTO.getFileType() == 1) {
+                programDTO.setFileTypeStr("图片");
+            } else {
+                programDTO.setFileTypeStr("压缩文件");
+            }
+            if (programDTO.getType() != null && programDTO.getType() == 2) {
+                ProgramInfoDTO programInfoDTO = programInfoService.getProgramInfoByProgramId(programDTO.getId());
+                if (programInfoDTO == null) {
+                    list.add(programDTO);
+                    continue;
+                }
+                if (programInfoDTO.getType() != null && programInfoDTO.getType() == 1) {
+                    programDTO.setProgramType(1);
+                } else {
+                    programDTO.setProgramType(0);
+                }
+                if (programInfoDTO.getBeginDate() != null && !programInfoDTO.getBeginDate().equals("")) {
+                    programDTO.setBeginDate(programInfoDTO.getBeginDate());
+                } else {
+                    programDTO.setBeginDate("");
+                }
+                if (programInfoDTO.getEndDate() != null && !programInfoDTO.getEndDate().equals("")) {
+                    programDTO.setEndDate(programInfoDTO.getEndDate());
+                } else {
+                    programDTO.setEndDate("");
+                }
+                List<ProgramTimeDTO> timeList = new ArrayList<>();
+                for (int i = 1; i <= 10; i++) {
+                    Field beginTimeField = programInfoDTO.getClass().getDeclaredField("beginTime" + i); // 获取time属性的值
+                    Field endTimeField = programInfoDTO.getClass().getDeclaredField("endTime" + i);
+                    beginTimeField.setAccessible(true); // 设置可以访问
+                    endTimeField.setAccessible(true);
+                    String beginTime = (String) beginTimeField.get(programInfoDTO);
+                    String endTime = (String) endTimeField.get(programInfoDTO);
+                    if (beginTime != null && !beginTime.equals("") && endTime != null && !endTime.equals("")) {
+                        timeList.add(new ProgramTimeDTO(beginTime,endTime));
+                    }
+                }
+                programDTO.setTimeList(timeList);
+                List<ProgramInfoItemDTO> programItemList = programInfoItemService.getProgramItemListByInfoId(programInfoDTO.getId());
+                List<ProgramInfoItemDTO> sourceList = new ArrayList<>();
+                for (ProgramInfoItemDTO dto : programItemList) {
+                    if (dto != null) {
+                        if (dto.getSourceId() != null && dto.getTime() != null && dto.getType() != null) {
+                            sourceList.add(new ProgramInfoItemDTO(dto.getSourceId(),dto.getTime(),dto.getType()));
+                        }
+                    }
+                }
+                programDTO.setSourceList(sourceList);
+            }
+            list.add(programDTO);
+        }
+        ProgramVO programVO = new ProgramVO();
+        programVO.setDataList(list);
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version,programVO);
+    }
+
+    /**
+     * 删除节目
+     * @param request programId
+     * @return 删除数据及文件
+     */
+    @RequestMapping(value = "/del", method = RequestMethod.POST)
+    public BaseResult<?> del(HttpServletRequest request) {
+        Integer version = (Integer) toolUtils.getRequestContent(request,"version",1);
+        Integer programId = (Integer) toolUtils.getRequestContent(request,"programId",1);
+        if (programId == 0) return toolUtils.response(InterfaceResultEnum.LACK_PARAM_ERROR,version);
+        ProgramDTO programDTO = programService.getProgramDTOById(programId);
+        if (programDTO == null) return toolUtils.response(InterfaceResultEnum.PARAM_FAIL,version);
+        programService.deleteProgramDataById(programId);
+        if (programDTO.getPath() != null && !programDTO.getPath().equals("")) {
+            SHH2Util.removeSipFile(programDTO.getPath());
+        }
+        if (programDTO.getType() != null && programDTO.getType() == 2) {
+            ProgramInfoDTO programInfo = programInfoService.getProgramInfoByProgramId(programId);
+            if (programInfo != null && programInfo.getId() != null && programInfo.getId() != 0) {
+                programInfoService.deleteProgramInfoDataById(programInfo.getId());
+                programInfoItemService.deleteProgramInfoItemDataById(programInfo.getId());
+            }
+        }
+        return toolUtils.response(InterfaceResultEnum.OPERATION_SUCCESS,version);
+    }
 }

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

@@ -2,6 +2,7 @@ package com.welampiot.dao;
 
 import com.welampiot.dto.AllAlarmInfoLogDTO;
 import com.welampiot.vo.AllAlarmInfoLogVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -13,4 +14,5 @@ public interface AllAlarmInfoLogDao {
     Integer getHandleCountByStatus(AllAlarmInfoLogVO vo);
     void updateAlarmStatusByAlarmId(AllAlarmInfoLogDTO dto);
     Integer getAlarmTotalByStatus(AllAlarmInfoLogVO vo);
+    List<AllAlarmInfoLogDTO> getAlarmListBySectionList(@Param("sectionList") List<Integer> sectionList);
 }

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

@@ -0,0 +1,24 @@
+package com.welampiot.dao;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * ClassName: AreaDataDao
+ * Package: com.welampiot.dao
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/5 - 16:41
+ * @Version: v1.0
+ */
+public interface AreaDataDao {
+    Integer getLampCountByAreaId(@Param("areaId") Integer areaId, @Param("sectionList")List<Integer> sectionList);
+
+    Integer getGroupCountByAreaId(@Param("areaId") Integer areaId, @Param("sectionList")List<Integer> sectionList);
+
+    Integer getLoopCountByAreaId(@Param("areaId") Integer areaId, @Param("sectionList")List<Integer> sectionList);
+
+    Integer getNetworkCountByAreaId(@Param("areaId") Integer areaId, @Param("sectionList")List<Integer> sectionList);
+}

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

@@ -1,6 +1,7 @@
 package com.welampiot.dao;
 
 import com.welampiot.dto.ChargeDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -29,4 +30,6 @@ public interface ChargeDao {
     List<ChargeDTO> getChargeMoneyBySectionList(ChargeDTO dto);
 
     List<ChargeDTO> getChargeEnergyBySectionList(ChargeDTO dto);
+
+    ChargeDTO getChargeInfoByLampPoleId(@Param("lampPoleId") Integer lampPoleId);
 }

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

@@ -0,0 +1,17 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.ChargeDataDTO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * ClassName: ChargeDataDao
+ * Package: com.welampiot.dao
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/16 - 14:21
+ * @Version: v1.0
+ */
+public interface ChargeDataDao {
+    ChargeDataDTO getChargeDataByLampPoleId(@Param("lampPoleId") Integer lampPoleId);
+}

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

@@ -0,0 +1,25 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.ChargeInfoLogDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * ClassName: ChargeInfoLogDao
+ * Package: com.welampiot.dao
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/14 - 16:50
+ * @Version: v1.0
+ */
+public interface ChargeInfoLogDao {
+    ChargeInfoLogDTO getTodayChargeDataByLampPoleId(@Param("lampPoleId") Integer lampPoleId);
+
+    List<ChargeInfoLogDTO> getMonthChargeListByDTO(ChargeInfoLogDTO dto);
+
+    List<ChargeInfoLogDTO> getAllChargeDataByDTO(ChargeInfoLogDTO dto);
+
+    List<ChargeInfoLogDTO> getAllChargeListByDTO(ChargeInfoLogDTO dto);
+}

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

@@ -27,4 +27,5 @@ public interface ElectricBoxDao {
     Integer checkData(ElectricBoxDTO dto);
     Integer delete(ElectricBoxDTO dto);
     ElectricBoxDTO getDetailsById(@Param("id") Integer id);
+    void changeElectricBoxLocationById(ElectricBoxDTO dto);
 }

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

@@ -1,6 +1,7 @@
 package com.welampiot.dao;
 
 import com.welampiot.dto.EnvmonitorDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,4 +21,14 @@ public interface EnvmonitorDao {
     Integer getTotalBySectionList(EnvmonitorDTO dto);
 
     Integer getOnlineTotalBySectionList(EnvmonitorDTO dto);
+
+    void updateDataByEnvmonitorDTO(EnvmonitorDTO dto);
+
+    Integer findDataByEnvmonitorDTO(EnvmonitorDTO dto);
+
+    Integer findSectionIdById(@Param("id") Integer id);
+
+    List<EnvmonitorDTO> getEnvmonitorListByDTO(@Param("sectionList") List<Integer> sectionList);
+
+    void changeEnvmonitorLocationById(EnvmonitorDTO dto);
 }

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

@@ -0,0 +1,28 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.EnvmonitorDTO;
+import com.welampiot.dto.EnvmonitorInfoLogDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * ClassName: EnvmonitorInfoLogDao
+ * Package: com.welampiot.dao
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/8 - 17:20
+ * @Version: v1.0
+ */
+public interface EnvmonitorInfoLogDao {
+    List<EnvmonitorInfoLogDTO> getEnvStatisticsInfoByDTO(EnvmonitorDTO dto);
+
+    Integer getTimezoneByLampPoleId(@Param("lampPoleId") Integer lampPoleId);
+
+    List<EnvmonitorInfoLogDTO> getAvgDataListByEnvmonitorDTO(EnvmonitorDTO dto);
+
+    List<EnvmonitorInfoLogDTO> getMoreDayAvgDataListByDTO(EnvmonitorDTO dto);
+
+    List<EnvmonitorInfoLogDTO> getEnvStatisticsListByDTO(EnvmonitorDTO dto);
+}

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

@@ -24,4 +24,6 @@ public interface GlobalLocationDao {
     List<GlobalLocationDTO> getListByPidList(@Param("pids") List pids);
     List<GlobalLocationDTO> getUserProvinceNav(GlobalLocationVO globalLocationVO);
     GlobalLocationDTO getOneById(@Param("id") Integer id);
+
+    GlobalLocationDTO getAreaById(@Param("id") Integer id, @Param("version") Integer version);
 }

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

@@ -15,4 +15,7 @@ public interface GroupDao {
     Integer update(GroupDTO groupDTO);
     Integer checkData(GroupDTO groupDTO);
     Integer deleteById(@Param("id")Integer id);
+    List<GroupDTO> getGroupListByDTO(GroupVO vo);
+    String findPolicyNameByValue(@Param("id") Integer id);
+    Integer getGroupTotalByDTO(GroupDTO dto);
 }

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

@@ -24,4 +24,14 @@ public interface LampDao {
     List<LampInfoDTO> groupSelectLamp(LampListResponseVO lampListResponseVO);
     List<LampInfoDTO> getNavByVO(LampListResponseVO lampListResponseVO);
     List<LampInfoDTO> getLampPoleDetailListByLampPoleId(@Param("lampPoleId")Integer lampPoleId);
+    List<LampInfoDTO> getLampInfoListByDTO(LampInfoDTO dto);
+    List<LampInfoDTO> getLampLocationByGroupId(@Param("id") Integer id);
+    List<LampInfoDTO> getLampLocationByLoopId(@Param("id") Integer id);
+    Integer getLampInstallTotalByDTO(LampInfoDTO dto);
+    Integer getLampLightTotalByDTO(LampInfoDTO dto);
+    Integer getLampOnlineTotalByDTO(LampInfoDTO dto);
+    Integer getLampFaultTotalByDTO(LampInfoDTO dto);
+    void changeLampLocationById(LampInfoDTO dto);
+    Integer getSectionOfLampCountBySectionId(@Param("id") Integer id);
+    String getNameOrNumber(@Param("type") Integer type,@Param("value") Integer value,@Param("version") Integer version);
 }

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

@@ -0,0 +1,25 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.LampInfoCacheByDayDTO;
+import com.welampiot.dto.LampInfoDTO;
+
+import java.util.List;
+
+/**
+ * ClassName: LampInfoCacheByDayDao
+ * Package: com.welampiot.dao
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/8 - 9:49
+ * @Version: v1.0
+ */
+public interface LampInfoCacheByDayDao {
+    List<LampInfoCacheByDayDTO> getDayEleListByDTO(LampInfoDTO dto);
+
+    Integer getTimezoneBySectionId();
+
+    List<LampInfoCacheByDayDTO> getMonthConSum(LampInfoCacheByDayDTO dto);
+
+    List<LampInfoCacheByDayDTO> getYearConSum(LampInfoCacheByDayDTO dto);
+}

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

@@ -9,4 +9,5 @@ import java.util.List;
 public interface LampInfoLogDao {
     Integer deleteByLampId(@Param("lampId")Integer lampId);
     List<LampInfoLogDTO> getListByVO(LampLogVO lampLogVO);
+    List<LampInfoLogDTO> getDayEleUsedList(@Param("type") Integer type, @Param("value") Integer value);
 }

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

@@ -0,0 +1,24 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.LampInfoDTO;
+import com.welampiot.dto.LampInfoLogNewDTO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * ClassName: LampInfoLogNewDao
+ * Package: com.welampiot.dao
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/5 - 15:28
+ * @Version: v1.0
+ */
+public interface LampInfoLogNewDao {
+    LampInfoLogNewDTO getLampInfoByLampId(@Param("id") Integer id);
+
+    LampInfoLogNewDTO getSumEleByDTO(LampInfoDTO dto);
+
+    LampInfoLogNewDTO getTodayEleByDTO(LampInfoDTO dto);
+
+    LampInfoLogNewDTO getGeneraEnergy(@Param("type") Integer type, @Param("value") Integer value);
+}

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

@@ -18,4 +18,16 @@ public interface LampPoleDao {
     Integer update(LampPoleDTO lampPoleDTO);
     LampPoleDTO getDetailById(@Param("id")Integer id);
     Integer deleteById(@Param("id")Integer id);
+    List<LampPoleDTO> getLampPoleListByDTO(LampPoleDTO dto);
+    Integer getLampPoleInstallTotalByDTO(LampPoleDTO dto);
+    Integer getVideoCount(LampPoleDTO dto);
+    Integer getScreenCount(LampPoleDTO dto);
+    Integer getWifiCount(LampPoleDTO dto);
+    Integer getWeatherCount(LampPoleDTO dto);
+    Integer getChargeCount(LampPoleDTO dto);
+    Integer getEmergencyCount(LampPoleDTO dto);
+    Integer getRfidCount(LampPoleDTO dto);
+    Integer getBroadcastCount(LampPoleDTO dto);
+    Integer getSectionIdByLampPoleId(@Param("id") Integer id);
+    void changeLampPoleLocationById(LampPoleDTO dto);
 }

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

@@ -36,4 +36,14 @@ public interface LoopDao {
     void deleteLoopLogDataById(@Param("id") Integer id);
 
     void deleteLoopLogNewDataById(@Param("id") Integer id);
+
+    List<LoopDTO> findLoopListByDTO(LoopDTO dto);
+
+    Integer getLoopTotalByDTO(LoopDTO dto);
+
+    Integer getOpenLoopTotalByDTO(LoopDTO dto);
+
+    Integer getCloseLoopTotalByDTO(LoopDTO dto);
+
+    void changeLoopLocationById(LoopDTO dto);
 }

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

@@ -5,6 +5,8 @@ import com.welampiot.dto.ElectricBoxDTO;
 import com.welampiot.dto.LoopPolicyCmdDTO;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * ClassName: LoopPolicyCmdDao
  * Package: com.welampiot.dao
@@ -22,4 +24,6 @@ public interface LoopPolicyCmdDao {
     void updateElectricBoxPolicyByDTO(AirSwitchInfoDTO dto);
 
     void updateAirSwitchPolicyByDTO(AirSwitchInfoDTO dto);
+
+    List<LoopPolicyCmdDTO> getLoopPolicyCmdListByPolicyId(@Param("policyId") Integer policyId);
 }

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

@@ -0,0 +1,21 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.LoopPolicyDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * ClassName: LoopPolicyDao
+ * Package: com.welampiot.dao
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/7 - 10:15
+ * @Version: v1.0
+ */
+public interface LoopPolicyDao {
+    List<LoopPolicyDTO> getLoopPolicyListByUserid(@Param("userid") Integer userid);
+
+    List<LoopPolicyDTO> getAllLoopPolicyList();
+}

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

@@ -38,4 +38,6 @@ public interface ManholeDao {
     void deleteManholeDataById(@Param("id") Integer id);
 
     void deleteManholeLogDataById(@Param("id") Integer id);
+
+    void changeManholeLocationById(ManholeDTO dto);
 }

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

@@ -2,7 +2,10 @@ package com.welampiot.dao;
 
 import com.welampiot.dto.NetworkDTO;
 
+import java.util.List;
+
 public interface NetworkDao {
     Integer add(NetworkDTO networkDTO);
     Integer update(NetworkDTO networkDTO);
+    List<NetworkDTO> getNetListByDTO(NetworkDTO networkDTO);
 }

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

@@ -7,4 +7,5 @@ import java.util.List;
 
 public interface PolicyCmdDao {
     List<PolicyCmdDTO> getListByPolicyId(@Param("policyId")Integer policyId);
+    List<PolicyCmdDTO> getPolicyCmdListByDTO(PolicyCmdDTO dto);
 }

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

@@ -2,10 +2,15 @@ package com.welampiot.dao;
 
 import com.welampiot.dto.PolicyDTO;
 import com.welampiot.vo.PolicyVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface PolicyDao {
     List<PolicyDTO> getListByVO(PolicyVO policyVO);
     Integer getCountByVO(PolicyVO policyVO);
+    List<PolicyDTO> getPolicyListByDTO(PolicyDTO dto);
+    List<PolicyDTO> getAllPolicyListByDTO(PolicyDTO dto);
+    Integer getPolicyCountByUserid(@Param("userId") Integer userId);
+    Integer getAllPolicyCount();
 }

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

@@ -0,0 +1,23 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.ProgramDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * ClassName: ProgramDao
+ * Package: com.welampiot.dao
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/12 - 17:35
+ * @Version: v1.0
+ */
+public interface ProgramDao {
+    List<ProgramDTO> getProgramListByUserid(@Param("userid") Integer userid);
+
+    void deleteProgramDataById(@Param("programId") Integer programId);
+
+    ProgramDTO getProgramDTOById(@Param("programId") Integer programId);
+}

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

@@ -0,0 +1,19 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.ProgramInfoDTO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * ClassName: ProgramInfoDao
+ * Package: com.welampiot.dao
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/12 - 17:38
+ * @Version: v1.0
+ */
+public interface ProgramInfoDao {
+    ProgramInfoDTO getProgramInfoByProgramId(@Param("programId") Integer programId);
+
+    void deleteProgramInfoDataById(@Param("programId") Integer programId);
+}

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

@@ -0,0 +1,21 @@
+package com.welampiot.dao;
+
+import com.welampiot.dto.ProgramInfoItemDTO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * ClassName: ProgramInfoItemDao
+ * Package: com.welampiot.dao
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/12 - 17:47
+ * @Version: v1.0
+ */
+public interface ProgramInfoItemDao {
+    List<ProgramInfoItemDTO> getProgramItemListByInfoId(@Param("programId") Integer programId);
+
+    void deleteProgramInfoItemDataById(@Param("programId") Integer programId);
+}

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

@@ -1,6 +1,7 @@
 package com.welampiot.dao;
 
 import com.welampiot.dto.ScreenDTO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,4 +24,6 @@ public interface ScreenDao {
     List<ScreenDTO> getScreenNavByDTO(ScreenDTO dto);
 
     ScreenDTO getScreenDetailsByDTO(ScreenDTO dto);
+
+    List<ScreenDTO> getAllScreenListBySectionId(@Param("sectionId") Integer sectionId);
 }

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

@@ -11,4 +11,6 @@ public interface SectionDao {
     List<SectionDTO> getListByPidList(@Param("pidList") List pidList);
     List<SectionDTO> getListByIdList(@Param("idList") List idList);
     SectionDTO getOneById(@Param("id") Integer id);
+    List<SectionDTO> getPidBySectionList(SectionDTO dto);
+    List<SectionDTO> getSectionListByDTO(SectionDTO dto);
 }

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

@@ -40,4 +40,6 @@ public interface TranshInfoDao {
     void deleteTrashDevById(@Param("id") Integer id);
 
     void deleteTrashDevLogById(@Param("id") Integer id);
+
+    void changeTranshLocationById(TranshInfoDTO dto);
 }

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

@@ -2,9 +2,12 @@ package com.welampiot.dao;
 
 import com.welampiot.dto.VideoMonitorDTO;
 import com.welampiot.vo.VideoMonitorVO;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface VideoMonitorDao {
     List<VideoMonitorDTO> getListByVO(VideoMonitorVO vo);
+    List<VideoMonitorDTO> getVideoListBySectionList(@Param("sectionList") List<Integer> sectionList);
+    void changeVideoMonitorLocationById(VideoMonitorDTO dto);
 }

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

@@ -19,4 +19,8 @@ public interface WifiInfoLogDao {
 
     Integer getTimezoneById(WifiInfoLogDTO dto);
     Integer deleteByWifiId(@Param("wifiId")Integer wifiId);
+
+    List<WifiInfoLogDTO> getWifiStatisticsListByDTO(WifiInfoLogDTO dto);
+
+    List<WifiInfoLogDTO> getWifiInfoLogListByDTO(WifiInfoLogDTO dto);
 }

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

@@ -0,0 +1,22 @@
+package com.welampiot.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * ClassName: AlarmTypeDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/5 - 17:59
+ * @Version: v1.0
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class AlarmTypeDTO {
+    private String key;
+    private String value;
+}

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

@@ -18,4 +18,7 @@ public class AllAlarmInfoLogDTO {
     private Integer isSend;
     private String name;
     private Integer timezone;
+    private String statusStr;
+    private Integer repairUserid;
+    private String repairTime;
 }

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

@@ -0,0 +1,41 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * ClassName: ChargeDataDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/16 - 11:40
+ * @Version: v1.0
+ */
+@Data
+public class ChargeDataDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private Integer chargeId;
+
+    private String startChargeSeq; // 订单号
+
+    private String current; // 电流
+
+    private String voltage; // 电压
+
+    private String totalMoney; // 总金额
+
+    private String startTime; // 订单开始时间
+
+    private String endTime; // 本次采样时间
+
+    private String totalPower; // 累计充电量
+
+    private Integer status; // 充电状态（0 空闲，1 充电）
+
+    private String updateTime; // 更新时间
+}

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

@@ -0,0 +1,39 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * ClassName: ChargeInfoLogDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/14 - 10:33
+ * @Version: v1.0
+ */
+@Data
+public class ChargeInfoLogDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private Integer chargeId;
+
+    private Integer connectorNum; // 当天充电次数
+
+    private String equipmentElectricity; // 当天充电量
+
+    private String free; // 当天充电费用
+
+    private String updateTime; // 数据更新时间
+
+    private Integer duration; // 当天充电时间
+
+    private String startDate;
+
+    private String endDate;
+
+    private Integer lampPoleId;
+}

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

@@ -0,0 +1,24 @@
+package com.welampiot.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * ClassName: ConsumptionEleDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/8 - 10:02
+ * @Version: v1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ConsumptionEleDTO {
+    private List<Object> dateList; // 时间列表
+    private List<Object> valueList; // 数值列表
+}

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

@@ -200,5 +200,11 @@ public class EnvmonitorDTO implements Serializable {
     /** 在线状态 **/
     private Integer online;
 
+    private String startDate;
+
+    private String endDate;
+
+    private Integer dayNumber;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -0,0 +1,59 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * ClassName: EnvmonitorInfoLogDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/8 - 16:00
+ * @Version: v1.0
+ */
+@Data
+public class EnvmonitorInfoLogDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private Integer envmonitorId;
+
+    private Integer areaId;
+
+    private String humidity; // 湿度
+
+    private String temperature; // 温度
+
+    private String PM100;
+
+    private String noise; // 噪声
+
+    private String formaldehyde; // 甲醛
+
+    private String PM25;
+
+    private String PM10;
+
+    private String atmosPressue; // 大气压强
+
+    private String illumination; // 光照强度
+
+    private String windSpeed; // 风速
+
+    private String windDire; // 风向
+
+    private String rainfall; // 雨量
+
+    private String radiation; // 太阳辐射
+
+    private String updateTime; // 更新时间
+
+    private String co2;
+
+    private String co;
+
+    private String tsp;
+}

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

@@ -3,6 +3,7 @@ package com.welampiot.dto;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * ClassName: GlobalLocationDTO
@@ -52,5 +53,7 @@ public class GlobalLocationDTO implements Serializable {
     private String name2;
     private String name3;
 
+    private List<SectionDTO> sectionList;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -2,6 +2,8 @@ package com.welampiot.dto;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class GroupDTO {
     private Integer id;
@@ -26,5 +28,6 @@ public class GroupDTO {
     private Integer version;
     private Integer status;
     private Integer light;
-//    private String illumination;
+    private Integer timezone;
+    private List<Integer> sectionList;
 }

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

@@ -0,0 +1,43 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+/**
+ * ClassName: LampInfoCacheByDayDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/7 - 18:33
+ * @Version: v1.0
+ */
+@Data
+public class LampInfoCacheByDayDTO {
+    private Integer id;
+
+    private Integer areaId;
+
+    private Integer sectionId;
+
+    private Integer lampId;
+
+    private String conSum; // 当天用电量
+
+    private String conSumTotal;
+
+    private String powerSave; // 当天省电量
+
+    private String powerSaveTotal;
+
+    private Integer lightTime; // 当天亮灯时间
+
+    private String updateTime; // 更新时间
+
+    private Integer type;
+
+    private Integer value;
+
+    private String startDate;
+
+    private String endDate;
+}

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

@@ -2,6 +2,8 @@ package com.welampiot.dto;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class LampInfoDTO {
     private Integer id;
@@ -14,12 +16,15 @@ public class LampInfoDTO {
     private Integer sectionId;
     private Integer timezone;
     private int lighteness;
+    private Integer status;
+    private String gridPF;
     private String name;
     private String voltage;
     private String current;
     private String power;
     private Integer lightTime;
     private Float totalEnergy;
+    private String usedEnergyTonight;
     private String cmdTime;
     private Integer ledLuxValue;
     private Float leakageCur;
@@ -64,4 +69,10 @@ public class LampInfoDTO {
     private int version;
     private int select;
     private int lampPoleId;
+    private Integer loopId;
+    private String colourVal;
+    private String keyword;
+    private List<Integer> sectionList;
+    private Integer type;
+    private Integer alarmType;
 }

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

@@ -9,4 +9,6 @@ public class LampInfoLogDTO {
     private String power;
     private String dimValue;
     private String updateTime;
+    private String sumMinEle;
+    private String sumMaxEle;
 }

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

@@ -0,0 +1,81 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * ClassName: LampInfoLogNewDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/5 - 14:15
+ * @Version: v1.0
+ */
+@Data
+public class LampInfoLogNewDTO implements Serializable {
+    private Integer id;
+
+    private String number;
+
+    private String address;
+
+    private String temper; // 路灯温度
+
+    private String workTimeTotal; // 累计亮灯时间
+
+    private String usedEnergyTotal; // 累计用电量
+
+    private String ledLuxValue; // 灯头照度值
+
+    private String dayPPpk; // 当天负载峰值功率
+
+    private String historyPPpk; // 历史负载峰值功率
+
+    private String dayMoneySave; // 当日经济效益
+
+    private String dayGeneraEnergy; // 当日用电量
+
+    private String dayCo2Reduce; // 当日CO2减排
+
+    private String monthGeneraEnergy; // 当月用电量
+
+    private String monthMoneySave; // 当月经济效益
+
+    private String monthCo2Reduce; // 当月CO2减排
+
+    private String yearGeneraEnergy; // 当年用电量
+
+    private String yearMoneySave; // 当年经济效益
+
+    private String yearCo2Reduce; // 当年CO2减排
+
+    private String longitude; // 经度
+
+    private String latitude; // 纬度
+
+    private Integer status;
+
+    private String lighteness; // 路灯亮度值
+
+    private String monthGeneraEnergyCache;
+
+    private String yearGeneraEnergyCache;
+
+    private String totalGeneraEnergyCache;
+
+    private String monthEleSaveCache;
+
+    private String yearEleSaveCache;
+
+    private String totalEleSaveCache;
+
+    private String sumTotalEleSave; // 累计省电量之和
+
+    private String sumTotalGeneraEnergy; // 累计用电量之和
+
+    private String sumDayGeneraEnergy; // 当天用电量之和
+
+    private String sumDayEleSave; // 当天省电量之和
+}

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

@@ -15,6 +15,8 @@ public class LampPoleDTO {
     private String devType;
     private String createTime;
     private Integer online;
+    private String online1;
+    private Integer status;
     private String sn;
     private String area;
     private String section;
@@ -28,7 +30,18 @@ public class LampPoleDTO {
     private Integer policyType;
     private Integer lighteness;
     private String power;
+    private String gridVolt;
+    private String gridCurr;
+    private String lightTime;
+    private String snr;
+    private String rssi;
+    private Integer lampId;
+    private Integer videoId;
+    private Integer alarmType;
+    private List<Integer> sectionList;
+    private Integer version;
     private Integer faultstatus;
+    private String alarmStatusStr;
     private String location;
     private String alarmInfo;
     private Integer height;

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

@@ -202,5 +202,7 @@ public class LoopDTO implements Serializable {
     /** 获取所有路段id **/
     private List sectionList;
 
+    private Integer version1;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -0,0 +1,25 @@
+package com.welampiot.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * ClassName: LoopPolicyContentDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/7 - 10:06
+ * @Version: v1.0
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class LoopPolicyContentDTO {
+    private String date;
+
+    private List<LoopPolicyTimeValueDTO> timeList;
+}

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

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * ClassName: LoopPolicyDTO
@@ -31,5 +32,7 @@ public class LoopPolicyDTO implements Serializable {
     /** 是否更新策略信息 **/
     private Integer isUpdate;
 
+    private List<LoopPolicyContentDTO> content;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -0,0 +1,23 @@
+package com.welampiot.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * ClassName: LoopPolicyTimeValueDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/7 - 10:07
+ * @Version: v1.0
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class LoopPolicyTimeValueDTO {
+    private String time;
+
+    private Integer status;
+}

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

@@ -2,17 +2,30 @@ package com.welampiot.dto;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class NetworkDTO {
-    private int id;
+    private Integer id;
     private String gatewayType;  // 网关类型
-    private int protocolType;  // 协议类型
-    private int areaId;  // 区域id
-    private int sectionId;  // 路段id
+    private Integer protocolType;  // 协议类型
+    private String protocolTypeStr;
+    private Integer areaId;  // 区域id
+    private Integer sectionId;  // 路段id
     private String deviceSn;  // sn 地址
-    private int deviceType;  // 设备型号
+    private Integer deviceType;  // 设备型号
     private String networkName;  // 网络名称
-    private int netType;  // 网落类型 0 组网，1直连
+    private Integer netType;  // 网落类型 0 组网，1直连
     private String createTime;  // 创建时间
-    private int userId;  // 创建人
+    private Integer userId;  // 创建人
+    private String area;
+    private String section;
+    private Integer lampCount;
+    private Integer freBandInfo; // 频段信息
+    private String freBandInfoStr;
+    private String simCard;
+    private String operator;
+    private Integer status;
+    private Integer version;
+    private List<Integer> sectionList;
 }

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

@@ -0,0 +1,24 @@
+package com.welampiot.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * ClassName: PolicyContentDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/6 - 14:46
+ * @Version: v1.0
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PolicyContentDTO {
+    private String date;
+    private List<PolicyTimeValueDTO> timeList;
+}

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

@@ -13,4 +13,7 @@ public class PolicyDTO {
     private Integer policyType;
     private List list;
     private Integer select;
+    private Integer page;
+    private Integer count;
+    private List<PolicyContentDTO> content;
 }

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

@@ -0,0 +1,22 @@
+package com.welampiot.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * ClassName: PolicyTimeValueDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/6 - 15:39
+ * @Version: v1.0
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class PolicyTimeValueDTO {
+    private String time;
+    private Integer value;
+}

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

@@ -0,0 +1,86 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * ClassName: ProgramDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/12 - 15:14
+ * @Version: v1.0
+ */
+@Data
+public class ProgramDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private String name; // 节目名称
+
+    private String path; // 节目文件路径
+
+    private Integer type; // 节目类型（0 普通节目，1 高级节目，2 复杂节目，3 网页节目）
+
+    private String sdPath; // 节目sd卡路径
+
+    private Integer top; // 距离顶部的位置
+
+    private Integer left; // 距离左边的位置
+
+    private Integer speed; // 文字滚动的速度
+
+    private Integer direction; // 文字滚动的方向
+
+    private Integer userid; // 用户id
+
+    private String content; // 节目内容
+
+    private String backColor; // 背景颜色
+
+    private String color; // 字体
+
+    private String createTime;
+
+    private String time; // 播放时长
+
+    private Integer size; // 字体大小
+
+    private String location; // 位置
+
+    private Integer fileType; // 文件类型（0 压缩文件，1 图片，2 视屏，3 液位监测）
+
+    private String fileTypeStr;
+
+    private String kaLaiTeUrl; // 卡莱特文件播放地址
+
+    private Integer examineStatus; // 素材审核状态（0 未审核，1 已通过，2 未通过）
+
+    private Integer kaLaiTeReId; // 卡莱特素材id
+
+    private Integer bigSize; // 正常情况下突出字体
+
+    private Integer alarmNormalSize; // 告警时普通字体的大小
+
+    private Integer alarmBigSize; // 告警时突出字体的大小
+
+    private String alarmSizeColor; // 告警时字体的颜色
+
+    private String fileSize; // 文件大小
+
+    private String creator; // 创建者
+
+    private List<ProgramInfoItemDTO> sourceList;
+
+    private Integer programType; // 播放类型（0 顺序播放，1 定时播放）
+
+    private String beginDate; // 开始播放日期
+
+    private String endDate; // 结束播放日期
+
+    private List<ProgramTimeDTO> timeList; // 播放时间列表
+}

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

@@ -0,0 +1,129 @@
+package com.welampiot.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * ClassName: ProgramInfoDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/12 - 15:14
+ * @Version: v1.0
+ */
+@Data
+public class ProgramInfoDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private Integer programId; // 节目id
+
+    private Integer type; // 节目类型（0 连续播放，1 定时播放）
+
+    private Integer sourceId1; // 素材1id
+
+    private String time1; // 素材1播放时长（HH:MM:SS）
+
+    private Integer type1; // 节目类型（1 图片，2 视屏，3 气象站）
+
+    private Integer sourceId2; // 素材2id
+
+    private String time2; // 素材2播放时长（HH:MM:SS）
+
+    private Integer type2; // 节目类型（1 图片，2 视屏，3 气象站）
+
+    private Integer sourceId3; // 素材3id
+
+    private String time3; // 素材3播放时长（HH:MM:SS）
+
+    private Integer type3; // 节目类型（1 图片，2 视屏，3 气象站）
+
+    private Integer sourceId4; // 素材4id
+
+    private String time4; // 素材4播放时长（HH:MM:SS）
+
+    private Integer type4; // 节目类型（1 图片，2 视屏，3 气象站）
+
+    private Integer sourceId5; // 素材5id
+
+    private String time5; // 素材5播放时长（HH:MM:SS）
+
+    private Integer type5; // 节目类型（1 图片，2 视屏，3 气象站）
+
+    private Integer sourceId6; // 素材6id
+
+    private String time6; // 素材6播放时长（HH:MM:SS）
+
+    private Integer type6; // 节目类型（1 图片，2 视屏，3 气象站）
+
+    private Integer sourceId7; // 素材7id
+
+    private String time7; // 素材7播放时长（HH:MM:SS）
+
+    private Integer type7; // 节目类型（1 图片，2 视屏，3 气象站）
+
+    private Integer sourceId8; // 素材8id
+
+    private String time8; // 素材8播放时长（HH:MM:SS）
+
+    private Integer type8; // 节目类型（1 图片，2 视屏，3 气象站）
+
+    private Integer sourceId9; // 素材9id
+
+    private String time9; // 素材9播放时长（HH:MM:SS）
+
+    private Integer type9; // 节目类型（1 图片，2 视屏，3 气象站）
+
+    private Integer sourceId10; // 素材10id
+
+    private String time10; // 素材10播放时长（HH:MM:SS）
+
+    private Integer type10; // 节目类型（1 图片，2 视屏，3 气象站）
+
+    private String beginDate; // 开始播放日期
+
+    private String endDate; // 结束播放日期
+
+    private String beginTime1; // 第一段播放开始时间
+
+    private String endTime1; // 第一段播放结束时间
+
+    private String beginTime2; // 第二段播放开始时间
+
+    private String endTime2; // 第二段播放结束时间
+
+    private String beginTime3; // 第三段播放开始时间
+
+    private String endTime3; // 第三段播放结束时间
+
+    private String beginTime4; // 第四段播放开始时间
+
+    private String endTime4; // 第四段播放结束时间
+
+    private String beginTime5; // 第五段播放开始时间
+
+    private String endTime5; // 第五段播放结束时间
+
+    private String beginTime6; // 第六段播放开始时间
+
+    private String endTime6; // 第六段播放结束时间
+
+    private String beginTime7; // 第七段播放开始时间
+
+    private String endTime7; // 第七段播放结束时间
+
+    private String beginTime8; // 第八段播放开始时间
+
+    private String endTime8; // 第八段播放结束时间
+
+    private String beginTime9; // 第九段播放开始时间
+
+    private String endTime9; // 第九段播放结束时间
+
+    private String beginTime10; // 第十段播放开始时间
+
+    private String endTime10; // 第十段播放结束时间
+}

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

@@ -0,0 +1,39 @@
+package com.welampiot.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * ClassName: ProgramInfoItemDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/12 - 15:14
+ * @Version: v1.0
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProgramInfoItemDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    private Integer programId;
+
+    private Integer sourceId;
+
+    private String time;
+
+    private Integer type;
+
+    public ProgramInfoItemDTO(Integer sourceId,String time,Integer type) {
+        this.sourceId = sourceId;
+        this.time = time;
+        this.type = type;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.welampiot.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * ClassName: ProgramTimeDTO
+ * Package: com.welampiot.dto
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/12 - 18:20
+ * @Version: v1.0
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProgramTimeDTO {
+    private String beginTime;
+    private String endTime;
+}

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

@@ -61,6 +61,9 @@ public class ScreenDTO implements Serializable {
     /** 正在播放的节目id **/
     private Integer playingId;
 
+    /** 节目名称 **/
+    private String playing;
+
     /** 屏幕播放类型（0 节目，1 气象站，2 视屏监控,3 网页）**/
     private Integer type;
 

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

@@ -4,6 +4,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * ClassName: SectionDTO
@@ -64,5 +65,7 @@ public class SectionDTO implements Serializable {
     /** 日出日落更新时间 **/
     private Date sunUpdateTime;
 
+    private List<Integer> sectionList;
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -7,4 +7,6 @@ public class VideoMonitorDTO {
     private Integer id;
     private String name;
     private String image;
+    private String longitude;
+    private String latitude;
 }

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

@@ -106,6 +106,20 @@ public class WifiInfoLogDTO implements Serializable {
     /** 获取路段id **/
     private List<Integer> sectionList;
 
+    private Integer dayNumber;
+
+    private Integer dayNum;
+
+    private Integer lampPoleId;
+
+    private String maxFlow;
+
+    private String minFlow;
+
+    private Integer maxDevCount;
+
+    private Integer minDevCount;
+
     private String startDate;
 
     private String endDate;

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

@@ -13,4 +13,5 @@ public interface AllAlarmInfoLogService {
     Integer getHandleCountByStatus(AllAlarmInfoLogVO vo);
     void updateAlarmStatusByAlarmId(AllAlarmInfoLogDTO dto);
     Integer getAlarmTotalByStatus(AllAlarmInfoLogVO vo);
+    AllAlarmInfoLogVO getAlarmListBySectionList(List<Integer> sectionList);
 }

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

@@ -0,0 +1,18 @@
+package com.welampiot.service;
+
+import com.welampiot.vo.AreaDataVO;
+
+import java.util.List;
+
+/**
+ * ClassName: AreaDataService
+ * Package: com.welampiot.service
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/5 - 16:43
+ * @Version: v1.0
+ */
+public interface AreaDataService {
+    AreaDataVO getAreaData(Integer areaId, List<Integer> sectionList);
+}

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

@@ -0,0 +1,16 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.ChargeDataDTO;
+
+/**
+ * ClassName: ChargeDataService
+ * Package: com.welampiot.service
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/16 - 14:22
+ * @Version: v1.0
+ */
+public interface ChargeDataService {
+    ChargeDataDTO getChargeDataByLampPoleId(Integer lampPoleId);
+}

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

@@ -0,0 +1,24 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.ChargeInfoLogDTO;
+
+import java.util.List;
+
+/**
+ * ClassName: ChargeInfoLogService
+ * Package: com.welampiot.service
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/14 - 16:58
+ * @Version: v1.0
+ */
+public interface ChargeInfoLogService {
+    ChargeInfoLogDTO getTodayChargeDataByLampPoleId(Integer lampPoleId);
+
+    List<ChargeInfoLogDTO> getMonthChargeListByDTO(ChargeInfoLogDTO dto);
+
+    List<ChargeInfoLogDTO> getAllChargeDataByDTO(ChargeInfoLogDTO dto);
+
+    List<ChargeInfoLogDTO> getAllChargeListByDTO(ChargeInfoLogDTO dto);
+}

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

@@ -16,4 +16,6 @@ public interface ChargeService {
     ChargeVO getDevListByChargeDTO(ChargeDTO dto);
 
     ChargeVO getDataByChargeDTO(ChargeDTO dto);
+
+    ChargeDTO getChargeInfoByLampPoleId(Integer lampPoleId);
 }

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

@@ -1,7 +1,6 @@
 package com.welampiot.service;
 
 import com.welampiot.common.BaseResult;
-import com.welampiot.dto.AirSwitchInfoDTO;
 import com.welampiot.dto.ElectricBoxDTO;
 import com.welampiot.vo.ElectricBoxReturnVO;
 import org.apache.ibatis.annotations.Param;
@@ -29,4 +28,6 @@ public interface ElectricBoxService {
     Integer checkData(ElectricBoxDTO dto);
     Integer delete(ElectricBoxDTO dto);
     ElectricBoxDTO getDetailsById(@Param("id") Integer id);
+
+    void changeElectricBoxLocationById(ElectricBoxDTO dto);
 }

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

@@ -0,0 +1,27 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.EnvmonitorDTO;
+import com.welampiot.dto.EnvmonitorInfoLogDTO;
+
+import java.util.List;
+
+/**
+ * ClassName: EnvmonitorInfoLogService
+ * Package: com.welampiot.service
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/8 - 17:26
+ * @Version: v1.0
+ */
+public interface EnvmonitorInfoLogService {
+    List<EnvmonitorInfoLogDTO> getEnvStatisticsInfoByDTO(EnvmonitorDTO dto);
+
+    Integer getTimezoneByLampPoleId(Integer lampPoleId);
+
+    List<EnvmonitorInfoLogDTO> getAvgDataListByEnvmonitorDTO(EnvmonitorDTO dto);
+
+    List<EnvmonitorInfoLogDTO> getMoreDayAvgDataListByDTO(EnvmonitorDTO dto);
+
+    List<EnvmonitorInfoLogDTO> getEnvStatisticsListByDTO(EnvmonitorDTO dto);
+}

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

@@ -3,6 +3,8 @@ package com.welampiot.service;
 import com.welampiot.dto.EnvmonitorDTO;
 import com.welampiot.vo.EnvmonitorVO;
 
+import java.util.List;
+
 /**
  * ClassName: EnvmonitorService
  * Package: com.welampiot.service
@@ -17,4 +19,14 @@ public interface EnvmonitorService {
 
     EnvmonitorVO getDeviceCountBySectionList(EnvmonitorDTO dto);
     EnvmonitorDTO getDetailByDTO(EnvmonitorDTO dto);
+
+    void updateDataByEnvmonitorDTO(EnvmonitorDTO dto);
+
+    Integer findDataByEnvmonitorDTO(EnvmonitorDTO dto);
+
+    Integer findSectionIdById(Integer id);
+
+    EnvmonitorVO getEnvmonitorListByDTO(List<Integer> sectionList);
+
+    void changeEnvmonitorLocationById(EnvmonitorDTO dto);
 }

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

@@ -25,4 +25,5 @@ public interface GlobalLocationService {
     List<GlobalLocationDTO> getUserCityNav(GlobalLocationVO globalLocationVO);
     List<GlobalLocationDTO> getUserAreaNav(GlobalLocationVO globalLocationVO);
     GlobalLocationDTO getOneById(@Param("id") Integer id);
+    GlobalLocationDTO getAreaById(Integer id, Integer version);
 }

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

@@ -17,4 +17,7 @@ public interface GroupService {
     BaseResult update(GroupDTO groupDTO);
     Integer checkData(GroupDTO groupDTO);
     Integer deleteById(@Param("id")Integer id);
+    List<GroupDTO> getGroupListByDTO(GroupVO vo);
+    String findPolicyNameByValue(Integer id);
+    Integer getGroupTotalByDTO(GroupDTO dto);
 }

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

@@ -0,0 +1,25 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.LampInfoCacheByDayDTO;
+import com.welampiot.dto.LampInfoDTO;
+
+import java.util.List;
+
+/**
+ * ClassName: LampInfoCacheByDayService
+ * Package: com.welampiot.service
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/8 - 9:50
+ * @Version: v1.0
+ */
+public interface LampInfoCacheByDayService {
+    List<LampInfoCacheByDayDTO> getDayEleListByDTO(LampInfoDTO dto);
+
+    Integer getTimezoneBySectionId();
+
+    List<LampInfoCacheByDayDTO> getMonthConSum(LampInfoCacheByDayDTO dto);
+
+    List<LampInfoCacheByDayDTO> getYearConSum(LampInfoCacheByDayDTO dto);
+}

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

@@ -0,0 +1,24 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.LampInfoDTO;
+import com.welampiot.dto.LampInfoLogNewDTO;
+import com.welampiot.vo.LampInfoLogNewVO;
+
+/**
+ * ClassName: LampInfoLogNewService
+ * Package: com.welampiot.service
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/5 - 15:34
+ * @Version: v1.0
+ */
+public interface LampInfoLogNewService {
+    LampInfoLogNewVO getLampInfoByLampId(Integer id);
+
+    LampInfoLogNewDTO getSumEleByDTO(LampInfoDTO dto);
+
+    LampInfoLogNewDTO getTodayEleByDTO(LampInfoDTO dto);
+
+    LampInfoLogNewDTO getGeneraEnergy(Integer type,Integer value);
+}

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

@@ -2,11 +2,11 @@ package com.welampiot.service;
 
 import com.welampiot.dto.LampInfoLogDTO;
 import com.welampiot.vo.LampLogVO;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface LampInfoLogService {
     Integer deleteByLampId(Integer lampId);
     List<LampInfoLogDTO> getListByVO(LampLogVO lampLogVO);
+    List<LampInfoLogDTO> getDayEleUsedList(Integer type, Integer value);
 }

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

@@ -1,8 +1,10 @@
 package com.welampiot.service;
 
 import com.welampiot.common.BaseResult;
+import com.welampiot.dto.LampInfoDTO;
 import com.welampiot.dto.LampPoleDTO;
 import com.welampiot.vo.LampPoleCountVO;
+import com.welampiot.vo.LampPoleInfoVO;
 import com.welampiot.vo.LampPoleVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -18,4 +20,8 @@ public interface LampPoleService {
     BaseResult update(LampPoleVO lampPoleVO);
     LampPoleDTO getDetailById(@Param("id")Integer id);
     Integer deleteById(@Param("id")Integer id);
+    LampPoleVO getLampPoleListByDTO(LampPoleDTO dto);
+    LampPoleInfoVO getLampPoleCount(LampPoleDTO lampPoleDTO, LampInfoDTO lampInfoDTO);
+    Integer getSectionIdByLampPoleId(Integer id);
+    void changeLampPoleLocationById(LampPoleDTO dto);
 }

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

@@ -26,4 +26,14 @@ public interface LampService {
     List<LampInfoDTO> groupSelectLamp(LampListResponseVO lampListResponseVO);
     List<LampInfoDTO> getNavByVO(LampListResponseVO lampListResponseVO);
     List<LampInfoDTO> getLampPoleDetailListByLampPoleId(@Param("lampPoleId")Integer lampPoleId);
+    List<LampInfoDTO> getLampInfoListByDTO(LampInfoDTO dto);
+    List<LampInfoDTO> getLampLocationByGroupId(Integer id);
+    List<LampInfoDTO> getLampLocationByLoopId(Integer id);
+    Integer getLampInstallTotalByDTO(LampInfoDTO dto);
+    Integer getLampLightTotalByDTO(LampInfoDTO dto);
+    Integer getLampOnlineTotalByDTO(LampInfoDTO dto);
+    Integer getLampFaultTotalByDTO(LampInfoDTO dto);
+    void changeLampLocationById(LampInfoDTO dto);
+    Integer getSectionOfLampCountBySectionId(Integer id);
+    String getNameOrNumber(Integer type,Integer value,Integer version);
 }

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

@@ -4,6 +4,8 @@ import com.welampiot.dto.AirSwitchInfoDTO;
 import com.welampiot.dto.ElectricBoxDTO;
 import com.welampiot.dto.LoopPolicyCmdDTO;
 
+import java.util.List;
+
 /**
  * ClassName: LoopPolicyCmdService
  * Package: com.welampiot.service
@@ -21,4 +23,6 @@ public interface LoopPolicyCmdService {
     void updateElectricBoxPolicyByDTO(AirSwitchInfoDTO dto);
 
     void updateAirSwitchPolicyByDTO(AirSwitchInfoDTO dto);
+
+    List<LoopPolicyCmdDTO> getLoopPolicyCmdListByPolicyId(Integer policyId);
 }

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

@@ -0,0 +1,20 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.LoopPolicyDTO;
+
+import java.util.List;
+
+/**
+ * ClassName: LoopPolicyService
+ * Package: com.welampiot.service
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/7 - 10:17
+ * @Version: v1.0
+ */
+public interface LoopPolicyService {
+    List<LoopPolicyDTO> getLoopPolicyListByUserid(Integer userid);
+
+    List<LoopPolicyDTO> getAllLoopPolicyList();
+}

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

@@ -36,4 +36,14 @@ public interface LoopService {
     void deleteLoopLogDataById(@Param("id") Integer id);
 
     void deleteLoopLogNewDataById(@Param("id") Integer id);
+
+    LoopVO findLoopListByDTO(LoopDTO dto);
+
+    Integer getLoopTotalByDTO(LoopDTO dto);
+
+    Integer getOpenLoopTotalByDTO(LoopDTO dto);
+
+    Integer getCloseLoopTotalByDTO(LoopDTO dto);
+
+    void changeLoopLocationById(LoopDTO dto);
 }

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

@@ -31,4 +31,6 @@ public interface ManholeService {
     void deleteManholeDataById(@Param("id") Integer id);
 
     void deleteManholeLogDataById(@Param("id") Integer id);
+
+    void changeManholeLocationById(ManholeDTO dto);
 }

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

@@ -1,8 +1,10 @@
 package com.welampiot.service;
 
 import com.welampiot.dto.NetworkDTO;
+import com.welampiot.vo.NetworkVO;
 
 public interface NetworkService {
     Integer add(NetworkDTO networkDTO);
     Integer update(NetworkDTO networkDTO);
+    NetworkVO getNetListByDTO(NetworkDTO networkDTO);
 }

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

@@ -7,4 +7,5 @@ import java.util.List;
 
 public interface PolicyCmdService {
     List<PolicyCmdDTO> getListByPolicyId(@Param("policyId")Integer policyId);
+    List<PolicyCmdDTO> getPolicyCmdListByDTO(PolicyCmdDTO dto);
 }

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

@@ -9,4 +9,8 @@ public interface PolicyService {
     List<PolicyDTO> getListByVO(PolicyVO policyVO);
     Integer getCountByVO(PolicyVO policyVO);
     public List<PolicyDTO> getNavByVO(PolicyVO policyVO);
+    List<PolicyDTO> getPolicyListByDTO(PolicyDTO dto);
+    List<PolicyDTO> getAllPolicyListByDTO(PolicyDTO dto);
+    Integer getPolicyCountByUserid(Integer userId);
+    Integer getAllPolicyCount();
 }

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

@@ -0,0 +1,20 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.ProgramInfoItemDTO;
+
+import java.util.List;
+
+/**
+ * ClassName: ProgramInfoItemService
+ * Package: com.welampiot.service
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/12 - 17:49
+ * @Version: v1.0
+ */
+public interface ProgramInfoItemService {
+    List<ProgramInfoItemDTO> getProgramItemListByInfoId(Integer programId);
+
+    void deleteProgramInfoItemDataById(Integer programId);
+}

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

@@ -0,0 +1,18 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.ProgramInfoDTO;
+
+/**
+ * ClassName: ProgramInfoService
+ * Package: com.welampiot.service
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/12 - 17:44
+ * @Version: v1.0
+ */
+public interface ProgramInfoService {
+    ProgramInfoDTO getProgramInfoByProgramId(Integer programId);
+
+    void deleteProgramInfoDataById(Integer programId);
+}

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

@@ -0,0 +1,22 @@
+package com.welampiot.service;
+
+import com.welampiot.dto.ProgramDTO;
+
+import java.util.List;
+
+/**
+ * ClassName: ProgramService
+ * Package: com.welampiot.service
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/12 - 17:36
+ * @Version: v1.0
+ */
+public interface ProgramService {
+    List<ProgramDTO> getProgramListByUserid(Integer userid);
+
+    void deleteProgramDataById(Integer programId);
+
+    ProgramDTO getProgramDTOById(Integer programId);
+}

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

@@ -4,6 +4,8 @@ import com.welampiot.dto.ScreenDTO;
 import com.welampiot.vo.ScreenDetailsVO;
 import com.welampiot.vo.ScreenVO;
 
+import java.util.List;
+
 /**
  * ClassName: ScreenService
  * Package: com.welampiot.service
@@ -19,4 +21,6 @@ public interface ScreenService {
     ScreenVO getScreenNavByDTO(ScreenDTO dto);
 
     ScreenDetailsVO getScreenDetails(ScreenDTO dto);
+
+    List<ScreenDTO> getAllScreenListBySectionId(Integer sectionId);
 }

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

@@ -12,4 +12,6 @@ public interface SectionService {
     List<SectionDTO> getListByPidList(List pidList);
     List<SectionDTO> getListByIdList(@Param("idList") List idList);
     SectionDTO getOneById(@Param("id") Integer id);
+    List<SectionDTO> getPidBySectionList(SectionDTO dto);
+    List<SectionDTO> getSectionListByDTO(SectionDTO dto);
 }

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

@@ -29,4 +29,6 @@ public interface TranshInfoService {
     void deleteTrashDevById(Integer id);
 
     void deleteTrashDevLogById(Integer id);
+
+    void changeTranshLocationById(TranshInfoDTO dto);
 }

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

@@ -7,4 +7,6 @@ import java.util.List;
 
 public interface VideoMonitorService {
     List<VideoMonitorDTO> getListByVO(VideoMonitorVO vo);
+    VideoMonitorVO getVideoListBySectionList(List<Integer> sectionList);
+    void changeVideoMonitorLocationById(VideoMonitorDTO dto);
 }

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

@@ -19,4 +19,8 @@ public interface WifiInfoLogService {
 
     Integer getTimezoneById(WifiInfoLogDTO dto);
     Integer deleteByWifiId(@Param("wifiId")Integer wifiId);
+
+    List<WifiInfoLogDTO> getWifiStatisticsListByDTO(WifiInfoLogDTO dto);
+
+    List<WifiInfoLogDTO> getWifiInfoLogListByDTO(WifiInfoLogDTO dto);
 }

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

@@ -7,6 +7,10 @@ import com.welampiot.vo.AllAlarmInfoLogVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @Service
@@ -45,4 +49,51 @@ public class AllAlarmInfoLogServiceImpl implements AllAlarmInfoLogService {
     public Integer getAlarmTotalByStatus(AllAlarmInfoLogVO vo) {
         return allAlarmInfoLogDao.getAlarmTotalByStatus(vo);
     }
+
+    @Override
+    public AllAlarmInfoLogVO getAlarmListBySectionList(List<Integer> sectionList) {
+        List<AllAlarmInfoLogDTO> alarmListBySectionList = allAlarmInfoLogDao.getAlarmListBySectionList(sectionList);
+        List<AllAlarmInfoLogDTO> list = new ArrayList<>();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        alarmListBySectionList.forEach(dto -> {
+            if (dto.getStrAlarmType() == null) {
+                dto.setStrAlarmType("");
+            }
+            if (dto.getStatus() != null && dto.getStatus() == 2) {
+                dto.setStatusStr("已处理");
+            } else if (dto.getStatus() != null && dto.getStatus() == 1) {
+                dto.setStatusStr("处理中");
+            } else {
+                dto.setStatusStr("未指派");
+            }
+            if (dto.getUpdateTime() != null && !dto.getUpdateTime().equals("")) {
+                Date cmdTime;
+                try {
+                    cmdTime = simpleDateFormat.parse(dto.getUpdateTime());
+                } catch (ParseException e) {
+                    throw new RuntimeException(e);
+                }
+                //判断时区，为null默认东八区
+                long timezone = dto.getTimezone() == null ? 8 : dto.getTimezone();
+                long l = cmdTime.getTime() + timezone * 3600 * 1000;
+                cmdTime = new Date(l);
+                dto.setUpdateTime(simpleDateFormat.format(cmdTime));
+            } else {
+                dto.setUpdateTime("");
+            }
+            if (dto.getRepairTime() != null && !dto.getRepairTime().equals("")) {
+                try {
+                    dto.setRepairTime(simpleDateFormat.format(simpleDateFormat.parse(dto.getRepairTime())));
+                } catch (ParseException e) {
+                    throw new RuntimeException(e);
+                }
+            } else {
+                dto.setRepairTime("");
+            }
+            list.add(dto);
+        });
+        AllAlarmInfoLogVO allAlarmInfoLogVO = new AllAlarmInfoLogVO();
+        allAlarmInfoLogVO.setList(list);
+        return allAlarmInfoLogVO;
+    }
 }

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

@@ -0,0 +1,34 @@
+package com.welampiot.service.impl;
+
+import com.welampiot.dao.AreaDataDao;
+import com.welampiot.service.AreaDataService;
+import com.welampiot.vo.AreaDataVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * ClassName: AreaDataServiceImpl
+ * Package: com.welampiot.service.impl
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/5 - 16:45
+ * @Version: v1.0
+ */
+@Service
+public class AreaDataServiceImpl implements AreaDataService {
+    @Autowired
+    private AreaDataDao areaDataDao;
+
+    @Override
+    public AreaDataVO getAreaData(Integer areaId, List<Integer> sectionList) {
+        AreaDataVO areaDataVO = new AreaDataVO();
+        areaDataVO.setLampCount(areaDataDao.getLampCountByAreaId(areaId,sectionList));
+        areaDataVO.setGroupCount(areaDataDao.getGroupCountByAreaId(areaId,sectionList));
+        areaDataVO.setLoopCount(areaDataDao.getLoopCountByAreaId(areaId,sectionList));
+        areaDataVO.setNetworkCount(areaDataDao.getNetworkCountByAreaId(areaId,sectionList));
+        return areaDataVO;
+    }
+}

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

@@ -0,0 +1,27 @@
+package com.welampiot.service.impl;
+
+import com.welampiot.dao.ChargeDataDao;
+import com.welampiot.dto.ChargeDataDTO;
+import com.welampiot.service.ChargeDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * ClassName: ChargeDataServiceImpl
+ * Package: com.welampiot.service.impl
+ * Description:
+ *
+ * @Author: zhj_Start
+ * @Create: 2023/6/16 - 14:23
+ * @Version: v1.0
+ */
+@Service
+public class ChargeDataServiceImpl implements ChargeDataService {
+    @Autowired
+    private ChargeDataDao chargeDataDao;
+
+    @Override
+    public ChargeDataDTO getChargeDataByLampPoleId(Integer lampPoleId) {
+        return chargeDataDao.getChargeDataByLampPoleId(lampPoleId);
+    }
+}