调试

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

@@ -1,7 +1,6 @@
 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;
@@ -9,9 +8,6 @@ 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;
@@ -31,9 +27,6 @@ public class HomePageDataServiceImpl implements IHomePageDataService {
     @Autowired
     private IDeviceRegionService deviceRegionService;
 
-    @Autowired
-    private IDeviceInformationService deviceInformationService;
-
     @Autowired
     private DevicePointMapper devicePointMapper;
 
@@ -46,9 +39,6 @@ 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/service/impl/PeaksAndValleysTimeConfigServiceImpl.java

@@ -1,11 +1,14 @@
 package org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfigParam;
 import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.mapper.PeaksAndValleysTimeConfigMapper;
 import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.service.IPeaksAndValleysTimeConfigService;
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
 /**
  * @Description: 峰平谷时段配置
  * @Author: jeecg-boot
@@ -15,4 +18,44 @@ import org.springframework.stereotype.Service;
 @Service
 public class PeaksAndValleysTimeConfigServiceImpl extends ServiceImpl<PeaksAndValleysTimeConfigMapper, PeaksAndValleysTimeConfig> implements IPeaksAndValleysTimeConfigService {
 
+    @Override
+    public PeaksAndValleysTimeConfigParam get() {
+        PeaksAndValleysTimeConfigParam res = new PeaksAndValleysTimeConfigParam();
+        //获取尖
+        res.setTops(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
+                .eq(PeaksAndValleysTimeConfig::getType,"tops").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
+        //获取峰
+        res.setPeaks(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
+                .eq(PeaksAndValleysTimeConfig::getType,"peaks").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
+        //获取平
+        res.setFlat(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
+                .eq(PeaksAndValleysTimeConfig::getType,"flat").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
+        //获取谷
+        res.setValleys(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
+                .eq(PeaksAndValleysTimeConfig::getType,"valleys").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
+        return res;
+    }
+
+    @Override
+    public void edit(PeaksAndValleysTimeConfigParam peaksAndValleysTimeConfigParam) {
+        //先删后增
+        //删除所有配置
+        baseMapper.delete(null);
+        //添加尖时段配置
+        peaksAndValleysTimeConfigParam.getTops().forEach(peaksAndValleysTimeConfig -> {
+            baseMapper.insert(peaksAndValleysTimeConfig);
+        });
+        //添加峰时段配置
+        peaksAndValleysTimeConfigParam.getPeaks().forEach(peaksAndValleysTimeConfig -> {
+            baseMapper.insert(peaksAndValleysTimeConfig);
+        });
+        //添加平时段配置
+        peaksAndValleysTimeConfigParam.getFlat().forEach(peaksAndValleysTimeConfig -> {
+            baseMapper.insert(peaksAndValleysTimeConfig);
+        });
+        //添加谷时段配置
+        peaksAndValleysTimeConfigParam.getValleys().forEach(peaksAndValleysTimeConfig -> {
+            baseMapper.insert(peaksAndValleysTimeConfig);
+        });
+    }
 }