Merge branch 'dev' of 123.57.213.14:guoqiang.duan/zgzt-sys-java into dev

jeecg-module-gather/src/main/java/org/jeecg/modules/gatherData/entity/FpgGatherData.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.gatherData.entity;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -69,22 +70,18 @@ public class FpgGatherData implements Serializable {
 	/**运行电流*/
 	@Excel(name = "运行电流", width = 15)
     @ApiModelProperty(value = "运行电流")
-    private java.lang.Double current;
+    private BigDecimal current;
 	/**有功功率*/
 	@Excel(name = "有功功率", width = 15)
     @ApiModelProperty(value = "有功功率")
-    private java.lang.Double activePower;
+    private BigDecimal activePower;
 	/**电压*/
 	@Excel(name = "电压", width = 15)
     @ApiModelProperty(value = "电压")
-    private java.lang.Double voltage;
+    private BigDecimal voltage;
 	/**峰平谷类型*/
 	@Excel(name = "峰平谷类型", width = 15, dicCode = "fpg_type")
 	@Dict(dicCode = "fpg_type")
     @ApiModelProperty(value = "峰平谷类型")
     private java.lang.String fpgType;
-
-
-    @ApiModelProperty(value = "采集时间")
-    private Date time;
 }

jeecg-module-gather/src/main/java/org/jeecg/modules/leanEventWarn/entity/LeanEventWarnInfo.java

@@ -1,27 +1,17 @@
 package org.jeecg.modules.leanEventWarn.entity;
-
-import java.io.Serializable;
-<<<<<<<< HEAD:jeecg-module-gather/src/main/java/org/jeecg/modules/leanEventWarn/entity/LeanEventWarnInfo.java
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
-========
-import java.math.BigDecimal;
-
->>>>>>>> f7c25db (数据采集告警信息触发001):jeecg-module-gather/src/main/java/org/jeecg/modules/gatherData/entity/FpgGatherData.java
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Description: 精益事件告警信息表
@@ -63,7 +53,6 @@ public class LeanEventWarnInfo implements Serializable {
 	/**区域ID*/
 	@Excel(name = "区域ID", width = 15)
     @ApiModelProperty(value = "区域ID")
-<<<<<<<< HEAD:jeecg-module-gather/src/main/java/org/jeecg/modules/leanEventWarn/entity/LeanEventWarnInfo.java
     private String deviceRegionId;
 	/**设备ID*/
 	@Excel(name = "设备ID", width = 15)
@@ -89,28 +78,4 @@ public class LeanEventWarnInfo implements Serializable {
 	@Excel(name = "拓展字段", width = 15)
     @ApiModelProperty(value = "拓展字段")
     private String remark;
-========
-    private java.lang.String deviceRegionId;
-	/**设备id*/
-	@Excel(name = "设备id", width = 15)
-    @ApiModelProperty(value = "设备id")
-    private java.lang.String deviceInformationId;
-	/**运行电流*/
-	@Excel(name = "运行电流", width = 15)
-    @ApiModelProperty(value = "运行电流")
-    private BigDecimal current;
-	/**有功功率*/
-	@Excel(name = "有功功率", width = 15)
-    @ApiModelProperty(value = "有功功率")
-    private BigDecimal activePower;
-	/**电压*/
-	@Excel(name = "电压", width = 15)
-    @ApiModelProperty(value = "电压")
-    private BigDecimal voltage;
-	/**峰平谷类型*/
-	@Excel(name = "峰平谷类型", width = 15, dicCode = "fpg_type")
-	@Dict(dicCode = "fpg_type")
-    @ApiModelProperty(value = "峰平谷类型")
-    private java.lang.String fpgType;
->>>>>>>> f7c25db (数据采集告警信息触发001):jeecg-module-gather/src/main/java/org/jeecg/modules/gatherData/entity/FpgGatherData.java
 }

jeecg-module-gather/src/main/java/org/jeecg/modules/leanEventWarn/service/impl/LeanEventWarnInfoServiceImpl.java

@@ -1,16 +1,11 @@
 package org.jeecg.modules.leanEventWarn.service.impl;
-
 import org.jeecg.modules.leanEventWarn.entity.LeanEventWarnInfo;
 import org.jeecg.modules.leanEventWarn.mapper.LeanEventWarnInfoMapper;
 import org.jeecg.modules.leanEventWarn.service.ILeanEventWarnInfoService;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.gatherData.entity.FpgGatherData;
 import org.jeecg.modules.gatherData.service.IFpgGatherDataService;
-import org.jeecg.modules.leanEventWarn.entity.LeanEventWarnInfo;
-import org.jeecg.modules.leanEventWarn.mapper.LeanEventWarnInfoMapper;
-import org.jeecg.modules.leanEventWarn.service.ILeanEventWarnInfoService;
 import org.jeecg.modules.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
 import org.jeecg.modules.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfigParam;
 import org.jeecg.modules.peaksAndValleysTimeConfig.service.IPeaksAndValleysTimeConfigService;