pipIrr-SV.git - Gitblit

			@@ -1,4 +1,10 @@
			package com.dy.pipIrrGlobal.pojoRm;
			/**
			* @author ZhuBaoMin
			* @date 2024-05-24 10:46
			* @LastEditTime 2024-05-24 10:46
			* @Description
			*/

			import com.alibaba.fastjson2.JSONObject;
			import com.alibaba.fastjson2.annotation.JSONField;
			@@ -9,6 +15,7 @@
			import com.baomidou.mybatisplus.annotation.TableName;
			import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
			import com.dy.common.po.BaseEntity;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import jakarta.validation.constraints.NotBlank;
			import jakarta.validation.constraints.NotNull;
			import lombok.*;
			@@ -16,22 +23,15 @@
			import java.util.Date;

			/**
			* @author ZhuBaoMin
			* @date 2024-05-21 16:53
			* @LastEditTime 2024-05-21 16:53
			* @Description 命令日志实体类
			*/
			/**
			* 命令日志表
			*/

			@TableName(value = "rm_command_history", autoResultMap = true)
			@Data
			@Builder
			@ToString
			@NoArgsConstructor
			@AllArgsConstructor
			public class RmCommandHistory implements BaseEntity{
			public class RmCommandHistory implements BaseEntity {
			public static final long serialVersionUID = 202401151517005L;

			/**
			@@ -39,7 +39,7 @@
			*/
			@JSONField(serializeUsing = ObjectWriterImplToString.class)
			@TableId(type = IdType.INPUT)
			private Long id;
			private Long comId;

			/**
			* 功能码
			@@ -54,28 +54,23 @@
			private String commandName;

			/**
			* 取水口ID
			*/
			@JSONField(serializeUsing= ObjectWriterImplToString.class)
			@NotNull(message = "取水口ID不能为空")
			private Long intakeId;

			/**
			* 阀控器地址
			*/
			@NotBlank(message = "阀控器地址不能为空")
			private String rtuaddr;
			private String rtuAddr;

			/**
			* 通讯协议
			*/
			@NotBlank(message = "通讯协议不能为空")
			private String protocol;

			/**
			* 命令类型
			*/
			@NotBlank(message = "命令类型不能为空")
			private String commandType;

			/**
			* 回调URL
			*/
			@NotBlank(message = "回调URL不能为空")
			private String callback;

			/**
			* 参数数据
			@@ -87,6 +82,7 @@
			* 发送命令时间
			*/
			@NotNull(message = "发送命令时间不能为空")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
			private Date sendTime;

			/**
			@@ -110,7 +106,6 @@
			/**
			* 命令结果内容
			*/
			@TableField(typeHandler = JacksonTypeHandler.class)
			private JSONObject resultText;
			private String resultText;

			}