历史报警导出字段修改

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmAlarm/controller/ItdmAlarmController.java

@@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 历史报警表
  * @Author: jeecg-boot
- * @Date:   2023-05-18
+ * @Date:   2023-05-20
  * @Version: V1.0
  */
 @Api(tags="历史报警表")

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmAlarm/entity/ItdmAlarm.java

@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 历史报警表
  * @Author: jeecg-boot
- * @Date:   2023-05-18
+ * @Date:   2023-05-20
  * @Version: V1.0
  */
 @Data
@@ -39,10 +39,11 @@ public class ItdmAlarm implements Serializable {
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
     private java.lang.String createBy;
-	/**创建日期*/
+	/**采集日期*/
+    @Excel(name = "采集日期", width = 20, dictTable = "itdm_device", exportFormat = "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 = "创建日期")
+    @ApiModelProperty(value = "采集日期")
     private java.util.Date createTime;
 	/**更新人*/
     @ApiModelProperty(value = "更新人")
@@ -56,7 +57,8 @@ public class ItdmAlarm implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
 	/**设备id*/
-	@Excel(name = "设备id", width = 15)
+//	@Excel(name = "设备id", width = 15, dictTable = "itdm_device", dicText = "device_name", dicCode = "id")
+	@Dict(dictTable = "itdm_device", dicText = "device_name", dicCode = "id")
     @ApiModelProperty(value = "设备id")
     private java.lang.String deviceId;
 	/**设备名称*/
@@ -67,6 +69,10 @@ public class ItdmAlarm implements Serializable {
 	@Excel(name = "设备编号", width = 15)
     @ApiModelProperty(value = "设备编号")
     private java.lang.String deviceNo;
+	/**设备类型*/
+	@Excel(name = "设备类型", width = 15)
+    @ApiModelProperty(value = "设备类型")
+    private java.lang.String deviceStatus;
 	/**数据类型*/
 	@Excel(name = "数据类型", width = 15)
     @ApiModelProperty(value = "数据类型")

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmAlarm/mapper/ItdmAlarmMapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 /**
  * @Description: 历史报警表
  * @Author: jeecg-boot
- * @Date:   2023-05-18
+ * @Date:   2023-05-20
  * @Version: V1.0
  */
 public interface ItdmAlarmMapper extends BaseMapper<ItdmAlarm> {

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmAlarm/service/IItdmAlarmService.java

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 /**
  * @Description: 历史报警表
  * @Author: jeecg-boot
- * @Date:   2023-05-18
+ * @Date:   2023-05-20
  * @Version: V1.0
  */
 public interface IItdmAlarmService extends IService<ItdmAlarm> {

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmAlarm/service/impl/ItdmAlarmServiceImpl.java

@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 历史报警表
  * @Author: jeecg-boot
- * @Date:   2023-05-18
+ * @Date:   2023-05-20
  * @Version: V1.0
  */
 @Service