From 9dea31cfb90a06ecef9cc7826d08ba205a4cef7f Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 25 Mar 2021 18:02:23 +0800
Subject: [PATCH] 设备添加多级联系人id与组织机构id
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml | 4 ++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java | 30 +++++++++++++++++-------------
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml | 4 ++++
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java | 11 +++++++++++
4 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
index 9e0748a..64fe725 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/mapper/AlarmMapper.xml
@@ -42,6 +42,10 @@
a.alarmId,a.LEVEL,e.jd,e.wd,a.jtype,a.rname,a.jjTime,a.province,a.city,a.cid,
e.serialNumber,e.oneContacts,e.ThreeContacts,e.twoContacts,e.onePhone,e.twoPhone,e.ThreePhone,
e.stype,
+ e.oneId,
+ e.twoId,
+ e.threeId,
+ e.deptId,
e.channelNumber from sys_alarm a
LEFT JOIN sys_equipment e on e.deviceNumber=a.deviceNumber
where 1=1
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
index c08f6cf..4612f0b 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/vo/AlarmVO.java
@@ -32,17 +32,21 @@
@ApiModel(value = "AlarmVO对象", description = "AlarmVO对象")
public class AlarmVO extends Alarm {
private static final long serialVersionUID = 1L;
- private String addvnm;
- private String serialNumber;
- private String stype;
- private String channelNumber;
- private String beginTime;
- private String endTime;
- private String name;
- private String oneContacts;
- private String twoContacts;
- private String ThreeContacts;
- private String onePhone;
- private String twoPhone;
- private String ThreePhone;
+ private String addvnm;
+ private String serialNumber;
+ private String stype;
+ private String channelNumber;
+ private String beginTime;
+ private String endTime;
+ private String name;
+ private String oneContacts;
+ private String twoContacts;
+ private String ThreeContacts;
+ private String onePhone;
+ private String twoPhone;
+ private String ThreePhone;
+ private String oneId;
+ private String twoId;
+ private String threeId;
+ private String deptId;
}
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
index 46e9ac8..857968d 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/mapper/EquipmentMapper.xml
@@ -69,6 +69,10 @@
equipment.wd ,
equipment.state,equipment.reason,
equipment.street,catalog.pid,
+ equipment.oneContacts,equipment.onePhone,equipment.oneId,
+ equipment.twoContacts,equipment.twoPhone,equipment.twoId,
+ equipment.ThreeContacts,equipment.ThreePhone,equipment.threeId,
+ equipment.deptId,
equipment.addvcd,equipment.pay,equipment.expireTime from sys_equipment equipment
left join sys_catalog catalog on catalog.eqid = equipment.deviceNumber
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
index 8cb8946..d22967c 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/equipment/vo/EquipmentVO.java
@@ -39,4 +39,15 @@
private String endTime;
private String pid;
+ private String oneContacts;
+ private String twoContacts;
+ private String ThreeContacts;
+ private String onePhone;
+ private String twoPhone;
+ private String ThreePhone;
+ private String oneId;
+ private String twoId;
+ private String threeId;
+ private String deptId;
+
}
--
Gitblit v1.9.3