From d378a5ed0f7a90e36c11f2d9e0316acb697e9cbc Mon Sep 17 00:00:00 2001
From: LiWeiJie <3491909454@qq.com>
Date: Fri, 5 Jan 2024 09:21:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=BA=86=E5=B8=82=E6=B0=B8=E5=B7=9D?=
=?UTF-8?q?=E5=8C=BA=E4=BA=A7=E4=B8=9A=E5=9B=AD=E7=BB=BC=E5=90=88=E8=A7=86?=
=?UTF-8?q?=E8=A7=89=E7=AE=A1=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A7=86=E9=A2=91?=
=?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=A1=B9=E7=9B=AE,=E5=89=8D=E7=AB=AF?=
=?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=8E=A5=E5=85=A5->=E9=9B=86=E6=88=90?=
=?UTF-8?q?=E5=9E=8B=E8=AE=BE=E5=A4=87update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CyysjIntegratedMoldingEquipment.java | 31 ++++++++++++++++++-
...IntegratedMoldingEquipmentServiceImpl.java | 2 +-
.../CyysjIntegratedMoldingEquipmentMapper.xml | 13 +++++++-
.../moldingEquipment/index.vue | 29 +++++++++++++++++
4 files changed, 72 insertions(+), 3 deletions(-)
diff --git a/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/domain/CyysjIntegratedMoldingEquipment.java b/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/domain/CyysjIntegratedMoldingEquipment.java
index 0c1edd38..35e0a1ee 100644
--- a/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/domain/CyysjIntegratedMoldingEquipment.java
+++ b/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/domain/CyysjIntegratedMoldingEquipment.java
@@ -9,7 +9,7 @@ import com.god.common.core.domain.BaseEntity;
* 集成型设备对象 cyysj_integrated_molding_equipment
*
* @author liweijie
- * @date 2024-01-04
+ * @date 2024-01-05
*/
public class CyysjIntegratedMoldingEquipment extends BaseEntity
{
@@ -26,6 +26,14 @@ public class CyysjIntegratedMoldingEquipment extends BaseEntity
@Excel(name = "密码")
private String password;
+ /** 设备名称 */
+ @Excel(name = "设备名称")
+ private String deviceName;
+
+ /** 设备监控位置 */
+ @Excel(name = "设备监控位置")
+ private String equipmentMonitoringPosition;
+
/** 厂商类型 */
@Excel(name = "厂商类型")
private String vendorType;
@@ -47,6 +55,7 @@ public class CyysjIntegratedMoldingEquipment extends BaseEntity
private String integrationUrl;
/** 视频上传 */
+ @Excel(name = "视频上传")
private String videoUpload;
public void setId(String id)
@@ -76,6 +85,24 @@ public class CyysjIntegratedMoldingEquipment extends BaseEntity
{
return password;
}
+ public void setDeviceName(String deviceName)
+ {
+ this.deviceName = deviceName;
+ }
+
+ public String getDeviceName()
+ {
+ return deviceName;
+ }
+ public void setEquipmentMonitoringPosition(String equipmentMonitoringPosition)
+ {
+ this.equipmentMonitoringPosition = equipmentMonitoringPosition;
+ }
+
+ public String getEquipmentMonitoringPosition()
+ {
+ return equipmentMonitoringPosition;
+ }
public void setVendorType(String vendorType)
{
this.vendorType = vendorType;
@@ -137,6 +164,8 @@ public class CyysjIntegratedMoldingEquipment extends BaseEntity
.append("id", getId())
.append("username", getUsername())
.append("password", getPassword())
+ .append("deviceName", getDeviceName())
+ .append("equipmentMonitoringPosition", getEquipmentMonitoringPosition())
.append("vendorType", getVendorType())
.append("deviceModel", getDeviceModel())
.append("deviceStatus", getDeviceStatus())
diff --git a/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/service/impl/CyysjIntegratedMoldingEquipmentServiceImpl.java b/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/service/impl/CyysjIntegratedMoldingEquipmentServiceImpl.java
index fff656b0..9024f527 100644
--- a/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/service/impl/CyysjIntegratedMoldingEquipmentServiceImpl.java
+++ b/God-Vue-master/god-system/src/main/java/com/god/cyysjIntegrated/service/impl/CyysjIntegratedMoldingEquipmentServiceImpl.java
@@ -53,7 +53,7 @@ public class CyysjIntegratedMoldingEquipmentServiceImpl implements ICyysjIntegra
@Override
public int insertCyysjIntegratedMoldingEquipment(CyysjIntegratedMoldingEquipment cyysjIntegratedMoldingEquipment)
{
- cyysjIntegratedMoldingEquipment.setId(IdUtils.fastSimpleUUID());
+ cyysjIntegratedMoldingEquipment.setId(IdUtils.fastSimpleUUID() );
return cyysjIntegratedMoldingEquipmentMapper.insertCyysjIntegratedMoldingEquipment(cyysjIntegratedMoldingEquipment);
}
diff --git a/God-Vue-master/god-system/src/main/resources/mapper/cyysjIntegrated/CyysjIntegratedMoldingEquipmentMapper.xml b/God-Vue-master/god-system/src/main/resources/mapper/cyysjIntegrated/CyysjIntegratedMoldingEquipmentMapper.xml
index 7619912d..847e06dc 100644
--- a/God-Vue-master/god-system/src/main/resources/mapper/cyysjIntegrated/CyysjIntegratedMoldingEquipmentMapper.xml
+++ b/God-Vue-master/god-system/src/main/resources/mapper/cyysjIntegrated/CyysjIntegratedMoldingEquipmentMapper.xml
@@ -8,6 +8,8 @@
+
+
@@ -17,7 +19,7 @@
- select id, username, password, vendor_type, device_model, device_status, last_update_time, integration_url, video_upload from cyysj_integrated_molding_equipment
+ select id, username, password, device_name, equipment_monitoring_position, vendor_type, device_model, device_status, last_update_time, integration_url, video_upload from cyysj_integrated_molding_equipment
@@ -44,6 +49,8 @@
id,
username,
password,
+ device_name,
+ equipment_monitoring_position,
vendor_type,
device_model,
device_status,
@@ -55,6 +62,8 @@
#{id},
#{username},
#{password},
+ #{deviceName},
+ #{equipmentMonitoringPosition},
#{vendorType},
#{deviceModel},
#{deviceStatus},
@@ -69,6 +78,8 @@
username = #{username},
password = #{password},
+ device_name = #{deviceName},
+ equipment_monitoring_position = #{equipmentMonitoringPosition},
vendor_type = #{vendorType},
device_model = #{deviceModel},
device_status = #{deviceStatus},
diff --git a/god-ui/src/views/cyysjIntegrated/cyysjIntegrated/moldingEquipment/index.vue b/god-ui/src/views/cyysjIntegrated/cyysjIntegrated/moldingEquipment/index.vue
index 4a72f6ae..836d6c2b 100644
--- a/god-ui/src/views/cyysjIntegrated/cyysjIntegrated/moldingEquipment/index.vue
+++ b/god-ui/src/views/cyysjIntegrated/cyysjIntegrated/moldingEquipment/index.vue
@@ -18,6 +18,23 @@
/>
+
+
+
+
+
+
+
-->
+
+
@@ -190,6 +209,12 @@
+
+
+
+
+
+
@@ -290,6 +315,8 @@ export default {
pageSize: 10,
username: null,
password: null,
+ deviceName: null,
+ equipmentMonitoringPosition: null,
vendorType: null,
deviceModel: null,
deviceStatus: null,
@@ -431,6 +458,8 @@ export default {
id: null,
username: null,
password: null,
+ deviceName: null,
+ equipmentMonitoringPosition: null,
vendorType: null,
deviceModel: null,
deviceStatus: null,