Merge branch 'dev' into lg-dev

# Conflicts:
#	zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/service/impl/LeanEventsHostServiceImpl.java
#	zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/homePageData/controller/HomePageDataController.java
#	zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/homePageData/service/IHomePageDataService.java
#	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/systemConfig/peaksAndValleysTimeConfig/entity/PeaksAndValleysTimeConfig.java
#	zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/service/IPeaksAndValleysTimeConfigService.java
#	zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/service/impl/PeaksAndValleysTimeConfigServiceImpl.java

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/service/impl/LeanEventsHostServiceImpl.java

@@ -29,13 +29,15 @@ public class LeanEventsHostServiceImpl extends ServiceImpl<LeanEventsHostMapper,
 
     @Override
     public void edit(LeanEventsHostEditParam leanEventsHostEditParam) {
-        if(oConvertUtils.listIsNotEmpty(leanEventsHostEditParam.getLeanEventsHosts())){
-            LambdaQueryWrapper<LeanEventsHost> deleteQuery = new LambdaQueryWrapper<LeanEventsHost>().eq(LeanEventsHost::getEventsId, leanEventsHostEditParam.getLeanEventsHosts().get(0).getEventsId());
+        if (oConvertUtils.listIsNotEmpty(leanEventsHostEditParam.getLeanEventsHosts())) {
+            List<LeanEventsHost> leanEventsHostList = leanEventsHostEditParam.getLeanEventsHosts();
+            LambdaQueryWrapper<LeanEventsHost> deleteQuery = new LambdaQueryWrapper<LeanEventsHost>().eq(LeanEventsHost::getEventsId, leanEventsHostList.get(0).getEventsId());
             baseMapper.delete(deleteQuery);
-            LeanEventsHost leanEventsHost = leanEventsHostEditParam.getLeanEventsHosts().get(0);
-            if (oConvertUtils.isNotEmpty(leanEventsHost.getDeviceInformationList())){
-                baseMapper.insert(leanEventsHost);
-            }
+            leanEventsHostList.forEach(x -> {
+                if (oConvertUtils.isNotEmpty(x.getDeviceInformationList())) {
+                    baseMapper.insert(x);
+                }
+            });
         }
     }
 

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/entity/PeaksAndValleysTimeConfig.java

@@ -29,43 +29,43 @@ import java.io.Serializable;
 public class PeaksAndValleysTimeConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty(value = "主键")
     private String id;
-	/**创建人*/
+    /**创建人*/
     @ApiModelProperty(value = "创建人")
     private String createBy;
-	/**创建日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "创建日期")
     private java.util.Date createTime;
-	/**更新人*/
+    /**更新人*/
     @ApiModelProperty(value = "更新人")
     private String updateBy;
-	/**更新日期*/
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新日期")
     private java.util.Date updateTime;
-	/**所属部门*/
+    /**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private String sysOrgCode;
-	/**开始时间*/
-	@Excel(name = "开始时间", width = 20, format = "HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+    /**开始时间*/
+    @Excel(name = "开始时间", width = 20, format = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @ApiModelProperty(value = "开始时间")
-    private String startTime;
-	/**结束时间*/
-	@Excel(name = "结束时间", width = 20, format = "HH:mm:ss")
-	@JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+    private java.util.Date startTime;
+    /**结束时间*/
+    @Excel(name = "结束时间", width = 20, format = "HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @ApiModelProperty(value = "结束时间")
-    private String endTime;
-	/**峰平谷类型*/
-	@Excel(name = "峰平谷类型", width = 15)
+    private java.util.Date endTime;
+    /**峰平谷类型*/
+    @Excel(name = "峰平谷类型", width = 15)
     @ApiModelProperty(value = "峰平谷类型(尖：tops 峰:peaks 平:flat 谷:valleys)")
     @Dict(dicCode = "fpg_type")
     private String type;

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/service/IPeaksAndValleysTimeConfigService.java

@@ -1,9 +1,7 @@
 package org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfigParam;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
 
 /**
  * @Description: 峰平谷时段配置
@@ -13,7 +11,4 @@ import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndV
  */
 public interface IPeaksAndValleysTimeConfigService extends IService<PeaksAndValleysTimeConfig> {
 
-    PeaksAndValleysTimeConfigParam get();
-
-    void edit(PeaksAndValleysTimeConfigParam peaksAndValleysTimeConfigParam);
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/service/impl/PeaksAndValleysTimeConfigServiceImpl.java

@@ -1,14 +1,11 @@
 package org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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
@@ -18,44 +15,4 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 @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);
-        });
-    }
 }