采集表新增字段

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

@@ -1,20 +1,21 @@
 package org.jeecg.modules.gatherData.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-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.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * @Description: 峰平谷数据采集
@@ -82,4 +83,19 @@ public class FpgGatherData implements Serializable {
 	@Dict(dicCode = "fpg_type")
     @ApiModelProperty(value = "峰平谷类型")
     private String fpgType;
+
+    /**峰平谷模型使用状态*/
+    @Excel(name = "设备启停统计/日统计尖峰平谷数据", width = 15)
+    @ApiModelProperty(value = "设备启停统计/日统计尖峰平谷数据")
+    private Date fpgTotalUpdatetime;
+
+    /**峰平谷类型*/
+    @Excel(name = "峰平谷模型使用完成更新", width = 15)
+    @ApiModelProperty(value = "峰平谷模型使用完成更新")
+    private Date fpgModelUpdatetime;
+
+    /**峰平谷类型*/
+    @Excel(name = "事件告警使用状态", width = 15)
+    @ApiModelProperty(value = "事件告警使用状态")
+    private Date eventWarnUpdatetime;
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/systemVariable/mapper/xml/SystemVariableMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.systemVariable.mapper.SystemVariableMapper">
+<mapper namespace="org.jeecg.modules.systemConfig.systemVariable.mapper.SystemVariableMapper">
 
 </mapper>