From 5ebea680d776c0647f83a5e4d1038b8708b3f3e7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 14 十二月 2023 11:23:42 +0800
Subject: [PATCH] 1、优化多数据源模块代码； 2、优化通信中间件代码； 3、通信中间件数据库插入数据测试Po、Mapper.java、Mapper.xml
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRtu.java | 26 +++++---------------------
1 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRTU.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRtu.java
similarity index 60%
rename from pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRTU.java
rename to pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRtu.java
index 0f4841a..b538645 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRTU.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/pojoBa/BaRtu.java
@@ -15,14 +15,14 @@
/**
* 鎺у埗鍣ㄥ疄浣擄紝RTU闃�鎺т竴浣撴満
*/
-@TableName(value = "ba_intake", autoResultMap = true)
+@TableName(value = "ba_rtu", autoResultMap = true)
@Data
@Builder
@ToString
@NoArgsConstructor
@AllArgsConstructor
@Schema(name = "RTU闃�鎺т竴浣撴満瀹炰綋")
-public class BaRTU implements BaseEntity {
+public class BaRtu implements BaseEntity {
public static final long serialVersionUID = 202312011021001L;
@@ -32,73 +32,57 @@
public Long id;
/**
- * 鎺у埗鍣ㄧ紪鍙�
+ * 鎺у埗鍣ㄥ湴鍧�
*/
- @Schema(description = "鎺у埗鍣ㄧ紪鍙�", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "鎺у埗鍣ㄧ紪鍙蜂笉鑳戒负绌�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "鎺у埗鍣ㄧ紪鍙蜂笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
- public String num;
+ @Schema(description = "鎺у埗鍣ㄥ湴鍧�", requiredMode = Schema.RequiredMode.REQUIRED)
+ public String rtuAddr;
/**
* 澶栭敭锛屾寚鍚戝彇姘村彛
*/
@JSONField(serializeUsing = ObjectWriterImplToString.class)
- @Schema(description = "鎵�鍦ㄥ彇姘村彛ID", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "鎵�鍦ㄥ彇姘村彛涓嶈兘涓虹┖") //涓嶈兘涓簄ull
public Long intakeId;
/**
* 澶栭敭锛屾寚鍚戝啘鎴凤紙鐢ㄦ按鎴凤級
*/
@JSONField(serializeUsing = ObjectWriterImplToString.class)
- @Schema(description = "鎵�灞炲啘鎴稩D", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotNull(message = "鎵�灞炲啘鎴蜂笉鑳戒负绌�") //涓嶈兘涓簄ull
public Long clientId;
/**
* 璐熻矗浜�
*/
@Schema(description = "璐熻矗浜�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "璐熻矗浜轰笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
public String header;
/**
* 鑱旂郴鐢佃瘽
*/
@Schema(description = "鑱旂郴鐢佃瘽", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "鑱旂郴鐢佃瘽涓嶈兘涓虹┖") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "鑱旂郴鐢佃瘽蹇呴』{max}浣嶆暟鎹�", min = 11, max = 11)
public String phone;
/**
* 寮�鍏抽榾
*/
@Schema(description = "寮�鍏抽榾", requiredMode = Schema.RequiredMode.REQUIRED)
- @NotEmpty(message = "0鍏抽榾锛�1寮�闃�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "鑱旂郴鐢佃瘽蹇呴』{max}浣嶆暟鎹�", min = 1, max = 1)
public Byte isOpen;
/**
* 鎺у埗鍣ㄥ悕绉�
*/
@Schema(description = "鎺у埗鍣ㄥ悕绉�", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotEmpty(message = "鎺у埗鍣ㄥ悕绉伴潪蹇呭～") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "鎺у埗鍣ㄥ悕绉颁笉澶т簬{max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
public String name;
/**
* 鍘傚鍚嶇О
*/
@Schema(description = "鍘傚鍚嶇О", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @NotEmpty(message = "鍘傚鍚嶇О闈炲繀濉�") //涓嶈兘涓虹┖涔熶笉鑳戒负null
- @Length(message = "鍘傚鍚嶇О涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 25)
public String manufacturer;
/**
* 澶囨敞
*/
@Schema(description = "澶囨敞", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
- @Length(message = "澶囨敞涓嶅ぇ浜巤max}瀛楋紝涓嶅皬浜巤min}瀛�", min = 1, max = 50)
public String remark;
/**
--
Gitblit v1.8.0