From c739b7a067827a3ea7b9a0ce43a38267759536be Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 16 八月 2024 09:59:53 +0800
Subject: [PATCH] 平台管理添加优化
---
ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java | 2 +-
ycl-pojo/src/main/java/com/ycl/platform/domain/form/PlatformForm.java | 3 +++
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Platform.java | 8 ++++++--
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/PlatformVO.java | 6 ++++++
ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml | 11 +++++------
5 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Platform.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Platform.java
index 5a6bb96..0a4a0c5 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Platform.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/Platform.java
@@ -22,10 +22,14 @@
/** 骞冲彴鍚嶇О */
private String platformName;
- @TableField("platform_contact")
- /** 骞冲彴鑱旂郴浜� */
+ @TableField("platform_ip")
+ /** 骞冲彴鍚嶇О */
private String platformIP;
+ @TableField("area")
+ /** 鍖哄煙 */
+ private String area;
+
@TableField("status")
/** 鐘舵�侊細1姝ｅ父 2寮傚父 */
private Integer status;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/PlatformForm.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/PlatformForm.java
index c8059e4..d81528d 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/form/PlatformForm.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/form/PlatformForm.java
@@ -32,6 +32,9 @@
@ApiModelProperty("骞冲彴IP")
private String platformIP;
+ @ApiModelProperty("琛屾斂鍖哄煙")
+ private String area;
+
// @NotBlank(message = "骞冲彴鑱旂郴浜轰笉鑳戒负绌�", groups = {Add.class, Update.class})
// @ApiModelProperty("骞冲彴鑱旂郴浜�")
// private String platformContact;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/PlatformVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/PlatformVO.java
index 4013e09..a2b62a9 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/PlatformVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/PlatformVO.java
@@ -19,6 +19,9 @@
/** 骞冲彴鍚嶇О */
private String platformName;
+ /** 骞冲彴IP */
+ private String platformIP;
+
/** 骞冲彴鑱旂郴浜� */
private String platformContact;
@@ -28,6 +31,9 @@
/** 鐘舵�侊細1姝ｅ父 2寮傚父 */
private Integer status;
+ /** 琛屾斂鍖哄煙 */
+ private String area;
+
/** 澶囨敞 */
private String remark;
diff --git a/ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java b/ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java
index 7c5c7ea..5a5af92 100644
--- a/ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java
+++ b/ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java
@@ -40,7 +40,7 @@
calculators.put(CalculationStrategyConstants.Face_DirectConsistent, new FaceConsistentCalculation());
//涓�鏈轰竴妗ｆ敞鍐岀巼銆佹。妗堣�冩牳姣�
- calculators.put(CalculationStrategyConstants.Video_MonitorRegis_ArchiveRate,new MonitorRegistrationCalculation())
+ calculators.put(CalculationStrategyConstants.Video_MonitorRegis_ArchiveRate,new MonitorRegistrationCalculation());
//涓�鏈轰竴妗ｅ悎鏍肩巼
calculators.put(CalculationStrategyConstants.Video_MonitorQualify, new MonitorQualifyCalculation());
//瑙嗛鐐逛綅鍦ㄧ嚎鐜�
diff --git a/ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml
index 0d6e2c9..c7f08b3 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/PlatformMapper.xml
@@ -5,10 +5,9 @@
<!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
<resultMap id="BaseResultMap" type="com.ycl.platform.domain.vo.PlatformVO">
<result column="platform_name" property="platformName" />
- <result column="platform_contact" property="platformContact" />
- <result column="platform_contact_phone" property="platformContactPhone" />
<result column="status" property="status" />
<result column="remark" property="remark" />
+ <result column="area" property="area" />
<result column="create_time" property="createTime" />
<result column="update_time" property="updateTime" />
</resultMap>
@@ -22,10 +21,10 @@
<select id="getById" resultMap="BaseResultMap">
SELECT
TP.platform_name,
- TP.platform_contact,
- TP.platform_contact_phone,
+ TP.platform_ip,
TP.status,
TP.remark,
+ TP.area,
TP.create_time,
TP.update_time,
TP.id
@@ -39,9 +38,9 @@
<select id="getPage" resultMap="BaseResultMap">
SELECT
TP.platform_name,
- TP.platform_contact,
- TP.platform_contact_phone,
+ TP.platform_ip,
TP.status,
+ TP.area,
TP.remark,
TP.create_time,
TP.update_time,
--
Gitblit v1.8.0