Merge branch 'master' into fpg-master

# Conflicts:
#	zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/homePageData/service/impl/HomePageDataServiceImpl.java

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/homePageData/service/impl/HomePageDataServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.homePageData.service.impl;
 
 import org.jeecg.common.util.oConvertUtils;
+<<<<<<< HEAD
 import org.jeecg.modules.deviceLesm.entity.*;
 import org.jeecg.modules.deviceLesm.mapper.DevicePointMapper;
 import org.jeecg.modules.deviceLesm.service.IDeviceInformationService;
@@ -8,6 +9,9 @@ import org.jeecg.modules.deviceLesm.service.IDeviceRegionService;
 import org.jeecg.modules.gatherData.entity.FpgMiddleTwoData;
 import org.jeecg.modules.gatherData.mapper.FpgGatherDataMapper;
 import org.jeecg.modules.deviceLesm.entity.DeviceRegion;
+import org.jeecg.modules.deviceLesm.entity.DeviceRegion;
+import org.jeecg.modules.deviceLesm.service.IDeviceInformationService;
+import org.jeecg.modules.deviceLesm.service.IDeviceRegionService;
 import org.jeecg.modules.homePageData.entity.LeanEventWarnInfoResult;
 import org.jeecg.modules.homePageData.mapper.LeanEventWarnInfoMapper;
 import org.jeecg.modules.homePageData.service.IHomePageDataService;
@@ -42,6 +46,9 @@ public class HomePageDataServiceImpl implements IHomePageDataService {
     @Autowired
     private LeanEventWarnInfoMapper leanEventWarnInfoMapper;
 
+    @Autowired
+    private LeanEventWarnInfoMapper leanEventWarnInfoMapper;
+
 
     @Override
     public List<Map<String, String>> regionPfvElectricity() {

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/controller/PeaksAndValleysTimeConfigController.java

@@ -1,27 +1,25 @@
 package org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.controller;
 
-import java.util.Arrays;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
-import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfigParam;
-import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.service.IPeaksAndValleysTimeConfigService;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfigParam;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.service.IPeaksAndValleysTimeConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 
  /**
  * @Description: 峰平谷时段配置
@@ -62,6 +60,7 @@ public class PeaksAndValleysTimeConfigController extends JeecgController<PeaksAn
 	 /**
 	  * 获取峰平谷时段配置
 	  *
+	  *
 	  * @return
 	  */
 	 //@AutoLog(value = "峰平谷时段配置-分页列表查询")