From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeWorkOrder.java | 58 ++++++++++++++++++++++++++++++++++------------------------
1 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeWorkOrder.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeWorkOrder.java
index ee6848d..b98ec7f 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeWorkOrder.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoOp/OpeWorkOrder.java
@@ -28,71 +28,81 @@
public static final long serialVersionUID = 202411061136001L;
/**
- * 涓婚敭
- */
+ * 涓婚敭
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
@TableId(type = IdType.INPUT)
private Long id;
/**
- * 娲惧崟浜篒D
- */
+ * 娲惧崟浜篒D
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long dispatcherId;
/**
- * 宸℃鍛業D
- */
+ * 宸℃鍛業D
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long inspectorId;
/**
- * 浠诲姟绫诲瀷ID
- */
+ * 浠诲姟绫诲瀷ID
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long taskTypeId;
/**
- * 浠诲姟鍐呭
- */
+ * 浠诲姟鍐呭
+ */
private String taskContent;
/**
- * 瀹屾垚鏍囧噯
- */
+ * 瀹屾垚鏍囧噯
+ */
private String completeCriteria;
/**
- * 瑕佹眰瀹屾垚鏃堕棿;绮剧‘鍒板垎
- */
+ * 瑕佹眰瀹屾垚鏃堕棿;绮剧‘鍒板垎
+ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date deadLine;
/**
- * 浠诲姟瀹屾垚鏃堕棿;绮剧‘鍒板垎
- */
+ * 浠诲姟瀹屾垚鏃堕棿;绮剧‘鍒板垎
+ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
private Date completeTime;
/**
- * 娲惧崟鏃堕棿
- */
+ * 娲惧崟鏃堕棿
+ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date dispatchTime;
/**
- * 鐘舵��;1-鏈畬鎴愶紝2-宸插畬鎴�
- */
+ * 鍐滄埛闂涓婃姤ID
+ */
+ private Long clientReportId;
+
+ /**
+ * 宸℃鍛橀棶棰樹笂鎶D
+ */
+ private Long inspectorReportId;
+
+ /**
+ * 鐘舵��;1-鏈畬鎴愶紝2-宸插畬鎴�
+ */
private Byte state;
/**
- * 椹冲洖娆℃暟
- */
+ * 椹冲洖娆℃暟
+ */
private Integer rejectTimes;
/**
- * 閫昏緫鍒犻櫎鏍囪瘑;鏈垹闄や负0锛屽凡鍒犻櫎涓哄垹闄ゆ椂闂�
- */
+ * 閫昏緫鍒犻櫎鏍囪瘑;鏈垹闄や负0锛屽凡鍒犻櫎涓哄垹闄ゆ椂闂�
+ */
@JSONField(serializeUsing= ObjectWriterImplToString.class)
private Long deleted;
}
\ No newline at end of file
--
Gitblit v1.8.0