add some menu

inspur-admin/pom.xml

@@ -8,7 +8,7 @@
         <version>3.8.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <artifactId>elevator-workOrder</artifactId>
 
     <description>
@@ -86,17 +86,17 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>   
-                <groupId>org.apache.maven.plugins</groupId>   
-                <artifactId>maven-war-plugin</artifactId>   
-                <version>3.1.0</version>   
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <version>3.1.0</version>
                 <configuration>
                     <failOnMissingWebXml>false</failOnMissingWebXml>
                     <warName>${project.artifactId}</warName>
-                </configuration>   
-           </plugin>   
+                </configuration>
+           </plugin>
         </plugins>
         <finalName>${project.artifactId}</finalName>
     </build>
 
-</project>
+</project>

inspur-admin/src/main/java/com/inspur/web/controller/work/ElevatorGatewayInfoController.java

@@ -0,0 +1,105 @@
+package com.inspur.web.controller.work;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.inspur.domain.ElevatorGatewayInfo;
+import com.inspur.service.IElevatorGatewayInfoService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.inspur.common.annotation.Log;
+import com.inspur.common.core.controller.BaseController;
+import com.inspur.common.core.domain.AjaxResult;
+import com.inspur.common.enums.BusinessType;
+import com.inspur.common.utils.poi.ExcelUtil;
+import com.inspur.common.core.page.TableDataInfo;
+
+/**
+ * 语音网关Controller
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+@RestController
+@RequestMapping("/gateway/info")
+public class ElevatorGatewayInfoController extends BaseController
+{
+    @Autowired
+    private IElevatorGatewayInfoService elevatorGatewayInfoService;
+
+    /**
+     * 查询语音网关列表
+     */
+    @PreAuthorize("@ss.hasPermi('gateway:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ElevatorGatewayInfo elevatorGatewayInfo)
+    {
+        startPage();
+        List<ElevatorGatewayInfo> list = elevatorGatewayInfoService.selectElevatorGatewayInfoList(elevatorGatewayInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出语音网关列表
+     */
+    @PreAuthorize("@ss.hasPermi('gateway:info:export')")
+    @Log(title = "语音网关", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ElevatorGatewayInfo elevatorGatewayInfo)
+    {
+        List<ElevatorGatewayInfo> list = elevatorGatewayInfoService.selectElevatorGatewayInfoList(elevatorGatewayInfo);
+        ExcelUtil<ElevatorGatewayInfo> util = new ExcelUtil<ElevatorGatewayInfo>(ElevatorGatewayInfo.class);
+        util.exportExcel(response, list, "语音网关数据");
+    }
+
+    /**
+     * 获取语音网关详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('gateway:info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(elevatorGatewayInfoService.selectElevatorGatewayInfoById(id));
+    }
+
+    /**
+     * 新增语音网关
+     */
+    @PreAuthorize("@ss.hasPermi('gateway:info:add')")
+    @Log(title = "语音网关", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ElevatorGatewayInfo elevatorGatewayInfo)
+    {
+        return toAjax(elevatorGatewayInfoService.insertElevatorGatewayInfo(elevatorGatewayInfo));
+    }
+
+    /**
+     * 修改语音网关
+     */
+    @PreAuthorize("@ss.hasPermi('gateway:info:edit')")
+    @Log(title = "语音网关", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ElevatorGatewayInfo elevatorGatewayInfo)
+    {
+        return toAjax(elevatorGatewayInfoService.updateElevatorGatewayInfo(elevatorGatewayInfo));
+    }
+
+    /**
+     * 删除语音网关
+     */
+    @PreAuthorize("@ss.hasPermi('gateway:info:remove')")
+    @Log(title = "语音网关", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(elevatorGatewayInfoService.deleteElevatorGatewayInfoByIds(ids));
+    }
+}

inspur-admin/src/main/java/com/inspur/web/controller/work/ElevatorPbxInfoController.java

@@ -0,0 +1,105 @@
+package com.inspur.web.controller.work;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.inspur.domain.ElevatorPbxInfo;
+import com.inspur.service.IElevatorPbxInfoService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.inspur.common.annotation.Log;
+import com.inspur.common.core.controller.BaseController;
+import com.inspur.common.core.domain.AjaxResult;
+import com.inspur.common.enums.BusinessType;
+import com.inspur.common.utils.poi.ExcelUtil;
+import com.inspur.common.core.page.TableDataInfo;
+
+/**
+ * PBXController
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+@RestController
+@RequestMapping("/pbx/info")
+public class ElevatorPbxInfoController extends BaseController
+{
+    @Autowired
+    private IElevatorPbxInfoService elevatorPbxInfoService;
+
+    /**
+     * 查询PBX列表
+     */
+    @PreAuthorize("@ss.hasPermi('pbx:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ElevatorPbxInfo elevatorPbxInfo)
+    {
+        startPage();
+        List<ElevatorPbxInfo> list = elevatorPbxInfoService.selectElevatorPbxInfoList(elevatorPbxInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出PBX列表
+     */
+    @PreAuthorize("@ss.hasPermi('pbx:info:export')")
+    @Log(title = "PBX", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ElevatorPbxInfo elevatorPbxInfo)
+    {
+        List<ElevatorPbxInfo> list = elevatorPbxInfoService.selectElevatorPbxInfoList(elevatorPbxInfo);
+        ExcelUtil<ElevatorPbxInfo> util = new ExcelUtil<ElevatorPbxInfo>(ElevatorPbxInfo.class);
+        util.exportExcel(response, list, "PBX数据");
+    }
+
+    /**
+     * 获取PBX详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('pbx:info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(elevatorPbxInfoService.selectElevatorPbxInfoById(id));
+    }
+
+    /**
+     * 新增PBX
+     */
+    @PreAuthorize("@ss.hasPermi('pbx:info:add')")
+    @Log(title = "PBX", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ElevatorPbxInfo elevatorPbxInfo)
+    {
+        return toAjax(elevatorPbxInfoService.insertElevatorPbxInfo(elevatorPbxInfo));
+    }
+
+    /**
+     * 修改PBX
+     */
+    @PreAuthorize("@ss.hasPermi('pbx:info:edit')")
+    @Log(title = "PBX", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ElevatorPbxInfo elevatorPbxInfo)
+    {
+        return toAjax(elevatorPbxInfoService.updateElevatorPbxInfo(elevatorPbxInfo));
+    }
+
+    /**
+     * 删除PBX
+     */
+    @PreAuthorize("@ss.hasPermi('pbx:info:remove')")
+    @Log(title = "PBX", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(elevatorPbxInfoService.deleteElevatorPbxInfoByIds(ids));
+    }
+}

inspur-admin/src/main/java/com/inspur/web/controller/work/ElevatorPersonInfoController.java

@@ -0,0 +1,105 @@
+package com.inspur.web.controller.work;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.inspur.domain.ElevatorPersonInfo;
+import com.inspur.service.IElevatorPersonInfoService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.inspur.common.annotation.Log;
+import com.inspur.common.core.controller.BaseController;
+import com.inspur.common.core.domain.AjaxResult;
+import com.inspur.common.enums.BusinessType;
+import com.inspur.common.utils.poi.ExcelUtil;
+import com.inspur.common.core.page.TableDataInfo;
+
+/**
+ * 人员信息Controller
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+@RestController
+@RequestMapping("/person/info")
+public class ElevatorPersonInfoController extends BaseController
+{
+    @Autowired
+    private IElevatorPersonInfoService elevatorPersonInfoService;
+
+    /**
+     * 查询人员信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('person:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ElevatorPersonInfo elevatorPersonInfo)
+    {
+        startPage();
+        List<ElevatorPersonInfo> list = elevatorPersonInfoService.selectElevatorPersonInfoList(elevatorPersonInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出人员信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('person:info:export')")
+    @Log(title = "人员信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ElevatorPersonInfo elevatorPersonInfo)
+    {
+        List<ElevatorPersonInfo> list = elevatorPersonInfoService.selectElevatorPersonInfoList(elevatorPersonInfo);
+        ExcelUtil<ElevatorPersonInfo> util = new ExcelUtil<ElevatorPersonInfo>(ElevatorPersonInfo.class);
+        util.exportExcel(response, list, "人员信息数据");
+    }
+
+    /**
+     * 获取人员信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('person:info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(elevatorPersonInfoService.selectElevatorPersonInfoById(id));
+    }
+
+    /**
+     * 新增人员信息
+     */
+    @PreAuthorize("@ss.hasPermi('person:info:add')")
+    @Log(title = "人员信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ElevatorPersonInfo elevatorPersonInfo)
+    {
+        return toAjax(elevatorPersonInfoService.insertElevatorPersonInfo(elevatorPersonInfo));
+    }
+
+    /**
+     * 修改人员信息
+     */
+    @PreAuthorize("@ss.hasPermi('person:info:edit')")
+    @Log(title = "人员信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ElevatorPersonInfo elevatorPersonInfo)
+    {
+        return toAjax(elevatorPersonInfoService.updateElevatorPersonInfo(elevatorPersonInfo));
+    }
+
+    /**
+     * 删除人员信息
+     */
+    @PreAuthorize("@ss.hasPermi('person:info:remove')")
+    @Log(title = "人员信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(elevatorPersonInfoService.deleteElevatorPersonInfoByIds(ids));
+    }
+}

inspur-admin/src/main/resources/application-druid.yml

@@ -6,16 +6,16 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://192.168.2.120:3306/elevator_emergency?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+                url: jdbc:mysql://117.73.3.135:3306/elevator_emergency?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
                 username: root
                 password: Hycpb@123
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
                 enabled: false
-                url: 
-                username: 
-                password: 
+                url:
+                username:
+                password:
             # 初始连接数
             initialSize: 5
             # 最小连接池数量
@@ -39,7 +39,7 @@ spring:
             testWhileIdle: true
             testOnBorrow: false
             testOnReturn: false
-            webStatFilter: 
+            webStatFilter:
                 enabled: true
             statViewServlet:
                 enabled: true
@@ -58,4 +58,4 @@ spring:
                     merge-sql: true
                 wall:
                     config:
-                        multi-statement-allow: true
+                        multi-statement-allow: true

inspur-admin/src/main/resources/application.yml

@@ -7,7 +7,7 @@ inspur:
   # 版权年份
   copyrightYear: 2024
   # 文件路径 示例（ Windows配置D:/inspur/uploadPath，Linux配置 /home/inspur/uploadPath）
-  profile: D:/inspur/uploadPath
+  profile: /home/inspur/elevator/96133/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -18,7 +18,7 @@ server:
   port: 8080
   servlet:
     # 应用的访问路径
-    context-path: /elevator-workOrder
+    context-path: /
   tomcat:
     # tomcat的URI编码
     uri-encoding: UTF-8
@@ -67,11 +67,11 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.2.120
+    host: 117.73.3.135
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 0
+    database: 12
     # 密码
     password: Hycpb@123
     # 连接超时时间

inspur-ui/.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 96133应急安全服务平台
 ENV = 'development'
 
 # 96133应急安全服务平台/开发环境
-VUE_APP_BASE_API = 'http://192.168.2.21/dev-api'
+VUE_APP_BASE_API = '/dev-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

inspur-ui/.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 96133应急安全服务平台
 ENV = 'production'
 
 # 96133应急安全服务平台/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'http://117.73.3.135:8080/elevator_96133'

inspur-ui/src/api/work/gateway_info.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询语音网关列表
+export function listInfo(query) {
+  return request({
+    url: '/gateway/info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询语音网关详细
+export function getInfo(id) {
+  return request({
+    url: '/gateway/info/' + id,
+    method: 'get'
+  })
+}
+
+// 新增语音网关
+export function addInfo(data) {
+  return request({
+    url: '/gateway/info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改语音网关
+export function updateInfo(data) {
+  return request({
+    url: '/gateway/info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除语音网关
+export function delInfo(id) {
+  return request({
+    url: '/gateway/info/' + id,
+    method: 'delete'
+  })
+}

inspur-ui/src/api/work/pbx_info.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询PBX列表
+export function listInfo(query) {
+  return request({
+    url: '/pbx/info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询PBX详细
+export function getInfo(id) {
+  return request({
+    url: '/pbx/info/' + id,
+    method: 'get'
+  })
+}
+
+// 新增PBX
+export function addInfo(data) {
+  return request({
+    url: '/pbx/info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改PBX
+export function updateInfo(data) {
+  return request({
+    url: '/pbx/info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除PBX
+export function delInfo(id) {
+  return request({
+    url: '/pbx/info/' + id,
+    method: 'delete'
+  })
+}

inspur-ui/src/api/work/person.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询人员信息列表
+export function listInfo(query) {
+  return request({
+    url: '/person/info/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询人员信息详细
+export function getInfo(id) {
+  return request({
+    url: '/person/info/' + id,
+    method: 'get'
+  })
+}
+
+// 新增人员信息
+export function addInfo(data) {
+  return request({
+    url: '/person/info',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改人员信息
+export function updateInfo(data) {
+  return request({
+    url: '/person/info',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除人员信息
+export function delInfo(id) {
+  return request({
+    url: '/person/info/' + id,
+    method: 'delete'
+  })
+}

inspur-ui/src/layout/components/Navbar.vue

@@ -103,7 +103,8 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          // location.href = '/index';
+          this.$router.push("/index")
         })
       }).catch(() => { });
     }

inspur-ui/src/layout/components/Sidebar/Logo.vue

@@ -2,11 +2,11 @@
   <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
     <transition name="sidebarLogoFade">
       <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+<!--        <img v-if="logo" :src="logo" class="sidebar-logo" />-->
+        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/">
-        <img v-if="logo" :src="logo" class="sidebar-logo" />
+<!--        <img v-if="logo" :src="logo" class="sidebar-logo" />-->
         <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
       </router-link>
     </transition>

inspur-ui/src/views/index.vue

@@ -2,10 +2,10 @@
   <div class="app-container home">
     <el-row :gutter="20">
       <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>96133应急安全服务平台框架</h2>
+        <h2>96133应急安全服务平台</h2>
       </el-col>
     </el-row>
-    <el-divider />
+<!--    <el-divider />-->
   </div>
 </template>
 

inspur-ui/src/views/work/gateway_info/index.vue

@@ -0,0 +1,277 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="设备名称" prop="deviceName">
+        <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" style="width: 145px"/>
+      </el-form-item>
+      <el-form-item label="设备厂商" prop="deviceBrand">
+        <el-input v-model="queryParams.deviceBrand" placeholder="请输入设备厂商" clearable @keyup.enter.native="handleQuery" style="width: 145px"/>
+      </el-form-item>
+      <el-form-item label="设备型号" prop="deviceModel">
+        <el-input v-model="queryParams.deviceModel" placeholder="请输入设备型号" clearable @keyup.enter.native="handleQuery" style="width: 145px"/>
+      </el-form-item>
+      <el-form-item label="设备IP" prop="deviceIp">
+        <el-input v-model="queryParams.deviceIp" placeholder="请输入设备IP" clearable @keyup.enter.native="handleQuery" style="width: 145px"/>
+      </el-form-item>
+      <el-form-item label="MAC" prop="deviceMac">
+        <el-input v-model="queryParams.deviceMac" placeholder="请输入设备mac" clearable @keyup.enter.native="handleQuery" style="width: 145px"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:info:add']">新增</el-button>
+      </el-form-item>
+    </el-form>
+
+<!--    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:info:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:info:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:info:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>-->
+
+    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
+<!--      <el-table-column type="selection" width="55" align="center" />-->
+      <el-table-column label="ID" align="center" prop="id" width="80"/>
+      <el-table-column label="设备名称" align="left" prop="deviceName" width="200" :show-overflow-tooltip="true"/>
+      <el-table-column label="设备厂商" align="left" prop="deviceBrand" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column label="设备型号" align="left" prop="deviceModel" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column label="设备IP" align="left" prop="deviceIp" width="180" :show-overflow-tooltip="true"/>
+      <el-table-column label="设备MAC" align="left" prop="deviceMac" width="180" :show-overflow-tooltip="true"/>
+      <el-table-column label="设备状态" align="center" prop="deviceState" width="100" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_device_state" :value="scope.row.deviceState" />
+        </template>
+      </el-table-column>
+      <el-table-column label="用户名称" align="left" prop="userName" width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="left" prop="createTime" width="150" />
+      <el-table-column label="创建时间" align="left" prop="updateTime" width="150" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:info:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:info:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
+
+    <!-- 添加或修改语音网关对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+        </el-form-item>
+        <el-form-item label="设备厂商" prop="deviceBrand">
+          <el-input v-model="form.deviceBrand" placeholder="请输入设备厂商" />
+        </el-form-item>
+        <el-form-item label="设备型号" prop="deviceModel">
+          <el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
+        </el-form-item>
+        <el-form-item label="设备IP" prop="deviceIp">
+          <el-input v-model="form.deviceIp" placeholder="请输入设备IP" />
+        </el-form-item>
+        <el-form-item label="设备mac" prop="deviceMac">
+          <el-input v-model="form.deviceMac" placeholder="请输入设备mac" />
+        </el-form-item>
+        <el-form-item label="设备状态" prop="deviceState">
+<!--          <el-input v-model="form.deviceState" placeholder="请输入设备状态" />-->
+          <el-radio-group v-model="form.deviceState" size="small">
+            <el-radio-button label="0">禁用</el-radio-button>
+            <el-radio-button label="1">正常</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="用户名称" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入用户名称" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/work/gateway_info";
+
+export default {
+  name: "Info",
+  dicts: ["sys_device_state"],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 语音网关表格数据
+      infoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deviceName: null,
+        deviceBrand: null,
+        deviceModel: null,
+        deviceIp: null,
+        deviceMac: null,
+        deviceState: null,
+        userName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询语音网关列表 */
+    getList() {
+      this.loading = true;
+      listInfo(this.queryParams).then(response => {
+        this.infoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        deviceName: null,
+        deviceBrand: null,
+        deviceModel: null,
+        deviceIp: null,
+        deviceMac: null,
+        deviceState: null,
+        userName: null,
+        createTime: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加语音网关";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getInfo(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改语音网关";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除语音网关编号为"' + ids + '"的数据项？').then(function() {
+        return delInfo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/info/export', {
+        ...this.queryParams
+      }, `info_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

inspur-ui/src/views/work/node/index.vue

@@ -1,53 +1,18 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="工单id" prop="workOrderId">
-        <el-input
-          v-model="queryParams.workOrderId"
-          placeholder="请输入工单id"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="节点名称" prop="nodeName">
-        <el-input
-          v-model="queryParams.nodeName"
-          placeholder="请输入节点名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.nodeName" placeholder="请输入节点名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="节点时间" prop="nodeTime">
-        <el-date-picker clearable
-          v-model="queryParams.nodeTime"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="请选择节点时间">
+        <el-date-picker clearable v-model="queryParams.nodeTime" type="date" value-format="yyyy-MM-dd HH:mm:ss" placeholder="请选择节点时间">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="联系人名称" prop="contentName">
-        <el-input
-          v-model="queryParams.contentName"
-          placeholder="请输入联系人名称"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="contentRemark">
-        <el-input
-          v-model="queryParams.contentRemark"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+      <el-form-item label="联系人" prop="contentName">
+        <el-input v-model="queryParams.contentName" placeholder="请输入联系人名称" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="是否成功" prop="isSuccess">
-        <el-input
-          v-model="queryParams.isSuccess"
-          placeholder="请输入是否成功"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.isSuccess" placeholder="请输入是否成功" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -55,7 +20,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+<!--    <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -99,38 +64,35 @@
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row>-->
 
     <el-table v-loading="loading" :data="nodeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="主键" align="center" prop="id" />
-      <el-table-column label="工单id" align="center" prop="workOrderId" />
-      <el-table-column label="节点名称" align="center" prop="nodeName" />
-      <el-table-column label="节点时间" align="center" prop="nodeTime" width="180">
+<!--      <el-table-column type="selection" width="55" align="center" />-->
+<!--      <el-table-column label="主键" align="center" prop="id" />-->
+      <el-table-column label="工单ID" align="center" prop="workOrderId" width="100"/>
+      <el-table-column label="节点名称" align="left" prop="nodeName" />
+      <el-table-column label="联系人名称" align="left" prop="contentName" />
+      <el-table-column label="节点类型" align="center" prop="type" width="120" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_node_type" :value="scope.row.type" />
+        </template>
+      </el-table-column>
+      <el-table-column label="是否成功" align="center" prop="isSuccess" width="120" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_is_success" :value="scope.row.isSuccess" />
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="left" prop="contentRemark" />
+      <el-table-column label="节点时间" align="left" prop="nodeTime" width="150">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.nodeTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="联系人名称" align="center" prop="contentName" />
-      <el-table-column label="备注" align="center" prop="contentRemark" />
-      <el-table-column label="节点类型 1：发起申请 2：提供安全码3：联系人员4：电话结束" align="center" prop="type" />
-      <el-table-column label="是否成功" align="center" prop="isSuccess" />
+      <el-table-column label="创建时间" align="left" prop="createTime" width="150" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['work:node:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['work:node:remove']"
-          >删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['work:node:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['work:node:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -182,6 +144,7 @@
 import { listNode, getNode, delNode, addNode, updateNode } from "@/api/work/node";
 
 export default {
+  dicts: ['sys_node_type','sys_is_success'],
   name: "Node",
   data() {
     return {

inspur-ui/src/views/work/pbx_info/index.vue

@@ -0,0 +1,283 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="设备名称" prop="deviceName">
+        <el-input v-model="queryParams.deviceName" placeholder="请输入设备名称" clearable @keyup.enter.native="handleQuery" style="width: 145px"/>
+      </el-form-item>
+      <el-form-item label="设备厂商" prop="deviceBrand">
+        <el-input v-model="queryParams.deviceBrand" placeholder="请输入设备厂商" clearable @keyup.enter.native="handleQuery" style="width: 145px"/>
+      </el-form-item>
+      <el-form-item label="设备型号" prop="deviceModel">
+        <el-input v-model="queryParams.deviceModel" placeholder="请输入设备型号" clearable @keyup.enter.native="handleQuery" style="width: 145px"/>
+      </el-form-item>
+      <el-form-item label="设备IP" prop="deviceIp">
+        <el-input v-model="queryParams.deviceIp" placeholder="请输入设备IP" clearable @keyup.enter.native="handleQuery" style="width: 145px"/>
+      </el-form-item>
+      <el-form-item label="MAC" prop="deviceMac">
+        <el-input v-model="queryParams.deviceMac" placeholder="请输入设备mac" clearable @keyup.enter.native="handleQuery" style="width: 145px"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:info:add']">新增</el-button>
+      </el-form-item>
+    </el-form>
+
+<!--    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['system:info:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:info:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:info:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:info:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>-->
+
+    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
+      <el-table-column label="ID" align="center" prop="id" width="80"/>
+      <el-table-column label="设备名称" align="left" prop="deviceName" width="200" :show-overflow-tooltip="true"/>
+      <el-table-column label="设备厂商" align="left" prop="deviceBrand" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column label="设备型号" align="left" prop="deviceModel" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column label="设备IP" align="left" prop="deviceIp" width="180" :show-overflow-tooltip="true"/>
+      <el-table-column label="设备MAC" align="left" prop="deviceMac" width="180" :show-overflow-tooltip="true"/>
+      <el-table-column label="设备状态" align="center" prop="deviceState" width="100" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_device_state" :value="scope.row.deviceState" />
+        </template>
+      </el-table-column>
+      <el-table-column label="用户名称" align="left" prop="userName" width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="left" prop="createTime" width="150" />
+      <el-table-column label="创建时间" align="left" prop="updateTime" width="150" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:info:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:info:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
+
+    <!-- 添加或修改PBX对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model="form.deviceName" placeholder="请输入设备名称" />
+        </el-form-item>
+        <el-form-item label="设备厂商" prop="deviceBrand">
+          <el-input v-model="form.deviceBrand" placeholder="请输入设备厂商" />
+        </el-form-item>
+        <el-form-item label="设备型号" prop="deviceModel">
+          <el-input v-model="form.deviceModel" placeholder="请输入设备型号" />
+        </el-form-item>
+        <el-form-item label="设备IP" prop="deviceIp">
+          <el-input v-model="form.deviceIp" placeholder="请输入设备IP" />
+        </el-form-item>
+        <el-form-item label="设备mac" prop="deviceMac">
+          <el-input v-model="form.deviceMac" placeholder="请输入设备mac" />
+        </el-form-item>
+        <el-form-item label="设备状态" prop="deviceState">
+<!--          <el-input v-model="form.deviceState" placeholder="请输入设备状态" />-->
+          <el-radio-group v-model="form.deviceState" size="small">
+            <el-radio-button label="0">禁用</el-radio-button>
+            <el-radio-button label="1">正常</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="用户名称" prop="userName">
+          <el-input v-model="form.userName" placeholder="请输入用户名称" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/work/pbx_info";
+
+export default {
+  name: "Info",
+  dicts: ["sys_device_state"],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // PBX表格数据
+      infoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        deviceName: null,
+        deviceBrand: null,
+        deviceModel: null,
+        deviceIp: null,
+        deviceMac: null,
+        deviceState: null,
+        userName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询PBX列表 */
+    getList() {
+      this.loading = true;
+      listInfo(this.queryParams).then(response => {
+        this.infoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        deviceName: null,
+        deviceBrand: null,
+        deviceModel: null,
+        deviceIp: null,
+        deviceMac: null,
+        deviceState: null,
+        userName: null,
+        createTime: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加PBX";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getInfo(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改PBX";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除PBX编号为"' + ids + '"的数据项？').then(function() {
+        return delInfo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/info/export', {
+        ...this.queryParams
+      }, `info_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

inspur-ui/src/views/work/person/index.vue

@@ -0,0 +1,263 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="人员姓名" prop="personName">
+        <el-input v-model="queryParams.personName" placeholder="请输入人员姓名" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="单位名称" prop="unitName">
+        <el-input v-model="queryParams.unitName" placeholder="请输入单位名称" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="phoneNo">
+        <el-input v-model="queryParams.phoneNo" placeholder="请输入联系电话" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['system:info:add']">新增</el-button>
+      </el-form-item>
+    </el-form>
+
+<!--    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:info:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:info:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:info:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>-->
+
+    <el-table v-loading="loading" :data="infoList" @selection-change="handleSelectionChange">
+      <el-table-column label="ID" align="center" prop="id" width="80"/>
+      <el-table-column label="人员姓名" align="left" prop="personName" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column label="单位名称" align="left" prop="unitName" width="250" :show-overflow-tooltip="true"/>
+      <el-table-column label="联系电话" align="left" prop="phoneNo" width="200" :show-overflow-tooltip="true"/>
+      <el-table-column label="安全码" align="left" prop="safeCode" width="180" :show-overflow-tooltip="true"/>
+      <el-table-column label="救援码" align="left" prop="rescueCode" width="180" :show-overflow-tooltip="true"/>
+      <el-table-column label="人员类型" align="center" prop="personType" width="150" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.sys_person_type" :value="scope.row.personType" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="left" prop="createTime" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column label="更新时间" align="left" prop="updateTime" width="150" :show-overflow-tooltip="true"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:info:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['system:info:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList"/>
+
+    <!-- 添加或修改人员信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="人员姓名" prop="personName">
+          <el-input v-model="form.personName" placeholder="请输入人员姓名" />
+        </el-form-item>
+        <el-form-item label="单位名称" prop="unitName">
+          <el-input v-model="form.unitName" placeholder="请输入单位名称" />
+        </el-form-item>
+        <el-form-item label="联系电话" prop="phoneNo">
+          <el-input v-model="form.phoneNo" placeholder="请输入联系电话" />
+        </el-form-item>
+        <el-form-item label="安全码" prop="safeCode">
+          <el-input v-model="form.safeCode" placeholder="请输入安全码" />
+        </el-form-item>
+        <el-form-item label="救援码" prop="rescueCode">
+          <el-input v-model="form.rescueCode" placeholder="请输入救援码" />
+        </el-form-item>
+        <el-form-item label="人员类型" prop="personType">
+          <el-radio-group v-model="form.personType" size="small">
+            <el-radio-button label="1">物业</el-radio-button>
+            <el-radio-button label="2">维保</el-radio-button>
+            <el-radio-button label="3">救援</el-radio-button>
+          </el-radio-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listInfo, getInfo, delInfo, addInfo, updateInfo } from "@/api/work/person";
+
+export default {
+  name: "Info",
+  dicts: ['sys_person_type'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 人员信息表格数据
+      infoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        personName: null,
+        unitName: null,
+        phoneNo: null,
+        safeCode: null,
+        rescueCode: null,
+        personType: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询人员信息列表 */
+    getList() {
+      this.loading = true;
+      listInfo(this.queryParams).then(response => {
+        this.infoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        personName: null,
+        unitName: null,
+        phoneNo: null,
+        safeCode: null,
+        rescueCode: null,
+        personType: null,
+        createTime: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加人员信息";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getInfo(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改人员信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除人员信息编号为"' + ids + '"的数据项？').then(function() {
+        return delInfo(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/info/export', {
+        ...this.queryParams
+      }, `info_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

inspur-ui/src/views/work/workOrder/index.vue

@@ -84,24 +84,19 @@
     </el-row>-->
 
     <el-table v-loading="loading" :data="workOrderList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <!--      <el-table-column label="主键" align="center" prop="id" />-->
-      <el-table-column label="被困人员电话" align="center" prop="trappedPersonTel" />
-      <!--      <el-table-column label="所在地区" align="center" prop="region" />
-      <el-table-column label="所在小区" align="center" prop="community" />
-      <el-table-column label="所在楼栋" align="center" prop="building" />-->
-      <el-table-column label="电梯名称" align="center" prop="elevatorName" />
-      <el-table-column label="电梯安全码" align="center" prop="securityCode" />
-      <el-table-column label="接单状态" align="center" prop="status">
+<!--      <el-table-column type="selection" width="55" align="center" />-->
+      <el-table-column label="ID" align="center" prop="id" width="80"/>
+      <el-table-column label="联系电话" align="left" prop="trappedPersonTel" width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="所在地区" align="left" prop="region" width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="所在小区" align="left" prop="community" width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="所在楼栋" align="left" prop="building" width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="电梯名称" align="left" prop="elevatorName" width="200" :show-overflow-tooltip="true"/>
+      <el-table-column label="电梯安全码" align="left" prop="securityCode" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column label="接单状态" align="left" prop="status" width="100">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.sys_accept_status" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="创建日期" align="center" prop="createDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
       <!--      <el-table-column label="录音时长" align="center" prop="recordingDuration" />
       <el-table-column label="通话录音地址" align="center" prop="callRecording" />
       <el-table-column label="维保公司" align="center" prop="maintCompany" />
@@ -111,9 +106,10 @@
       <el-table-column label="维保人员2电话" align="center" prop="maintSecondTel" />
       <el-table-column label="物业人员" align="center" prop="tenementPerson" />
       <el-table-column label="物业电话" align="center" prop="tenementTel" />-->
-      <el-table-column label="处理人" align="center" prop="handler" />
-      <el-table-column label="处理部门" align="center" prop="handleDepart" />
-      <el-table-column label="人员电话" align="center" prop="handleContactTel" />
+      <el-table-column label="处理人" align="left" prop="handler" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column label="处理部门" align="left" prop="handleDepart" width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="人员电话" align="left" prop="handleContactTel" width="120" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建日期" align="left" prop="createTime" width="150" />
       <!--      <el-table-column label="处理时间" align="center" prop="handleTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.handleTime, '{y}-{m}-{d}') }}</span>
@@ -304,7 +300,7 @@
                 <div>{{ item.nodeTime }}</div>
               </div>
               <div style="flex-direction: row;display: flex;justify-content: space-between;margin-top: 10px;">
-                <div style="height: 30px;background-color:gainsboro;border-radius: 4px;padding: 5px;"
+                <div style="height: 30px;background-color:#efefef;border-radius: 4px;padding: 5px;"
                   v-if="item.contentName != null">
                   {{ item.contentName }}</div>
                 <div v-else></div>
@@ -316,7 +312,7 @@
                 </div>
               </div>
               <div v-if="item.contentRemark != null"
-                style="height: 30px;background-color:gainsboro;border-radius: 4px;padding: 5px;margin-top: 10px;">
+                style="height: 30px;background-color:#efefef;border-radius: 4px;padding: 5px;margin-top: 10px;">
                 <div> {{ item.contentRemark }}</div>
               </div>
             </div>

inspur-ui/vue.config.js

@@ -20,9 +20,9 @@ module.exports = {
   // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
   publicPath: process.env.NODE_ENV === "production" ? "/" : "/",
   // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
-  outputDir: 'dist',
+  outputDir: 'elevator_web',
   // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
-  assetsDir: 'static',
+  assetsDir: 'elevator_web/static',
   // 是否开启eslint保存检测，有效值：ture | false | 'error'
   lintOnSave: process.env.NODE_ENV === 'development',
   // 如果你不需要生产环境的 source map，可以将其设置为 false 以加速生产环境构建。
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080/elevator-workOrder`,
+        target: `http://localhost:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

inspur-work/src/main/java/com/inspur/domain/ElevatorGatewayInfo.java

@@ -0,0 +1,137 @@
+package com.inspur.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.inspur.common.annotation.Excel;
+import com.inspur.common.core.domain.BaseEntity;
+
+/**
+ * 语音网关对象 elevator_gateway_info
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+public class ElevatorGatewayInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 设备厂商 */
+    @Excel(name = "设备厂商")
+    private String deviceBrand;
+
+    /** 设备型号 */
+    @Excel(name = "设备型号")
+    private String deviceModel;
+
+    /** 设备IP */
+    @Excel(name = "设备IP")
+    private String deviceIp;
+
+    /** 设备mac */
+    @Excel(name = "设备mac")
+    private String deviceMac;
+
+    /** 设备状态 */
+    @Excel(name = "设备状态")
+    private Integer deviceState;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String userName;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setDeviceName(String deviceName)
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName()
+    {
+        return deviceName;
+    }
+    public void setDeviceBrand(String deviceBrand)
+    {
+        this.deviceBrand = deviceBrand;
+    }
+
+    public String getDeviceBrand()
+    {
+        return deviceBrand;
+    }
+    public void setDeviceModel(String deviceModel)
+    {
+        this.deviceModel = deviceModel;
+    }
+
+    public String getDeviceModel()
+    {
+        return deviceModel;
+    }
+    public void setDeviceIp(String deviceIp)
+    {
+        this.deviceIp = deviceIp;
+    }
+
+    public String getDeviceIp()
+    {
+        return deviceIp;
+    }
+    public void setDeviceMac(String deviceMac)
+    {
+        this.deviceMac = deviceMac;
+    }
+
+    public String getDeviceMac()
+    {
+        return deviceMac;
+    }
+    public void setDeviceState(Integer deviceState)
+    {
+        this.deviceState = deviceState;
+    }
+
+    public Integer getDeviceState()
+    {
+        return deviceState;
+    }
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName()
+    {
+        return userName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("deviceName", getDeviceName())
+                .append("deviceBrand", getDeviceBrand())
+                .append("deviceModel", getDeviceModel())
+                .append("deviceIp", getDeviceIp())
+                .append("deviceMac", getDeviceMac())
+                .append("deviceState", getDeviceState())
+                .append("userName", getUserName())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

inspur-work/src/main/java/com/inspur/domain/ElevatorPbxInfo.java

@@ -0,0 +1,137 @@
+package com.inspur.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.inspur.common.annotation.Excel;
+import com.inspur.common.core.domain.BaseEntity;
+
+/**
+ * PBX对象 elevator_pbx_info
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+public class ElevatorPbxInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 设备名称 */
+    @Excel(name = "设备名称")
+    private String deviceName;
+
+    /** 设备厂商 */
+    @Excel(name = "设备厂商")
+    private String deviceBrand;
+
+    /** 设备型号 */
+    @Excel(name = "设备型号")
+    private String deviceModel;
+
+    /** 设备IP */
+    @Excel(name = "设备IP")
+    private String deviceIp;
+
+    /** 设备mac */
+    @Excel(name = "设备mac")
+    private String deviceMac;
+
+    /** 设备状态 */
+    @Excel(name = "设备状态")
+    private Integer deviceState;
+
+    /** 用户名称 */
+    @Excel(name = "用户名称")
+    private String userName;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setDeviceName(String deviceName)
+    {
+        this.deviceName = deviceName;
+    }
+
+    public String getDeviceName()
+    {
+        return deviceName;
+    }
+    public void setDeviceBrand(String deviceBrand)
+    {
+        this.deviceBrand = deviceBrand;
+    }
+
+    public String getDeviceBrand()
+    {
+        return deviceBrand;
+    }
+    public void setDeviceModel(String deviceModel)
+    {
+        this.deviceModel = deviceModel;
+    }
+
+    public String getDeviceModel()
+    {
+        return deviceModel;
+    }
+    public void setDeviceIp(String deviceIp)
+    {
+        this.deviceIp = deviceIp;
+    }
+
+    public String getDeviceIp()
+    {
+        return deviceIp;
+    }
+    public void setDeviceMac(String deviceMac)
+    {
+        this.deviceMac = deviceMac;
+    }
+
+    public String getDeviceMac()
+    {
+        return deviceMac;
+    }
+    public void setDeviceState(Integer deviceState)
+    {
+        this.deviceState = deviceState;
+    }
+
+    public Integer getDeviceState()
+    {
+        return deviceState;
+    }
+    public void setUserName(String userName)
+    {
+        this.userName = userName;
+    }
+
+    public String getUserName()
+    {
+        return userName;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("deviceName", getDeviceName())
+                .append("deviceBrand", getDeviceBrand())
+                .append("deviceModel", getDeviceModel())
+                .append("deviceIp", getDeviceIp())
+                .append("deviceMac", getDeviceMac())
+                .append("deviceState", getDeviceState())
+                .append("userName", getUserName())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

inspur-work/src/main/java/com/inspur/domain/ElevatorPersonInfo.java

@@ -0,0 +1,123 @@
+package com.inspur.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.inspur.common.annotation.Excel;
+import com.inspur.common.core.domain.BaseEntity;
+
+/**
+ * 人员信息对象 elevator_person_info
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+public class ElevatorPersonInfo extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** ID */
+    private Long id;
+
+    /** 人员姓名 */
+    @Excel(name = "人员姓名")
+    private String personName;
+
+    /** 单位名称 */
+    @Excel(name = "单位名称")
+    private String unitName;
+
+    /** 联系电话 */
+    @Excel(name = "联系电话")
+    private String phoneNo;
+
+    /** 安全码 */
+    @Excel(name = "安全码")
+    private String safeCode;
+
+    /** 救援码 */
+    @Excel(name = "救援码")
+    private String rescueCode;
+
+    /** 人员类型 1-物业人员 2-维保人员  3-救援人员 */
+    @Excel(name = "人员类型 1-物业人员 2-维保人员  3-救援人员")
+    private Long personType;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setPersonName(String personName)
+    {
+        this.personName = personName;
+    }
+
+    public String getPersonName()
+    {
+        return personName;
+    }
+    public void setUnitName(String unitName)
+    {
+        this.unitName = unitName;
+    }
+
+    public String getUnitName()
+    {
+        return unitName;
+    }
+    public void setPhoneNo(String phoneNo)
+    {
+        this.phoneNo = phoneNo;
+    }
+
+    public String getPhoneNo()
+    {
+        return phoneNo;
+    }
+    public void setSafeCode(String safeCode)
+    {
+        this.safeCode = safeCode;
+    }
+
+    public String getSafeCode()
+    {
+        return safeCode;
+    }
+    public void setRescueCode(String rescueCode)
+    {
+        this.rescueCode = rescueCode;
+    }
+
+    public String getRescueCode()
+    {
+        return rescueCode;
+    }
+    public void setPersonType(Long personType)
+    {
+        this.personType = personType;
+    }
+
+    public Long getPersonType()
+    {
+        return personType;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("personName", getPersonName())
+                .append("unitName", getUnitName())
+                .append("phoneNo", getPhoneNo())
+                .append("safeCode", getSafeCode())
+                .append("rescueCode", getRescueCode())
+                .append("personType", getPersonType())
+                .append("createTime", getCreateTime())
+                .append("updateTime", getUpdateTime())
+                .toString();
+    }
+}

inspur-work/src/main/java/com/inspur/mapper/ElevatorGatewayInfoMapper.java

@@ -0,0 +1,61 @@
+package com.inspur.mapper;
+
+import com.inspur.domain.ElevatorGatewayInfo;
+import java.util.List;
+
+/**
+ * 语音网关Mapper接口
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+public interface ElevatorGatewayInfoMapper
+{
+    /**
+     * 查询语音网关
+     *
+     * @param id 语音网关主键
+     * @return 语音网关
+     */
+    public ElevatorGatewayInfo selectElevatorGatewayInfoById(Long id);
+
+    /**
+     * 查询语音网关列表
+     *
+     * @param elevatorGatewayInfo 语音网关
+     * @return 语音网关集合
+     */
+    public List<ElevatorGatewayInfo> selectElevatorGatewayInfoList(ElevatorGatewayInfo elevatorGatewayInfo);
+
+    /**
+     * 新增语音网关
+     *
+     * @param elevatorGatewayInfo 语音网关
+     * @return 结果
+     */
+    public int insertElevatorGatewayInfo(ElevatorGatewayInfo elevatorGatewayInfo);
+
+    /**
+     * 修改语音网关
+     *
+     * @param elevatorGatewayInfo 语音网关
+     * @return 结果
+     */
+    public int updateElevatorGatewayInfo(ElevatorGatewayInfo elevatorGatewayInfo);
+
+    /**
+     * 删除语音网关
+     *
+     * @param id 语音网关主键
+     * @return 结果
+     */
+    public int deleteElevatorGatewayInfoById(Long id);
+
+    /**
+     * 批量删除语音网关
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteElevatorGatewayInfoByIds(Long[] ids);
+}

inspur-work/src/main/java/com/inspur/mapper/ElevatorPbxInfoMapper.java

@@ -0,0 +1,61 @@
+package com.inspur.mapper;
+
+import java.util.List;
+import com.inspur.domain.ElevatorPbxInfo;
+
+/**
+ * PBXMapper接口
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+public interface ElevatorPbxInfoMapper
+{
+    /**
+     * 查询PBX
+     *
+     * @param id PBX主键
+     * @return PBX
+     */
+    public ElevatorPbxInfo selectElevatorPbxInfoById(Long id);
+
+    /**
+     * 查询PBX列表
+     *
+     * @param elevatorPbxInfo PBX
+     * @return PBX集合
+     */
+    public List<ElevatorPbxInfo> selectElevatorPbxInfoList(ElevatorPbxInfo elevatorPbxInfo);
+
+    /**
+     * 新增PBX
+     *
+     * @param elevatorPbxInfo PBX
+     * @return 结果
+     */
+    public int insertElevatorPbxInfo(ElevatorPbxInfo elevatorPbxInfo);
+
+    /**
+     * 修改PBX
+     *
+     * @param elevatorPbxInfo PBX
+     * @return 结果
+     */
+    public int updateElevatorPbxInfo(ElevatorPbxInfo elevatorPbxInfo);
+
+    /**
+     * 删除PBX
+     *
+     * @param id PBX主键
+     * @return 结果
+     */
+    public int deleteElevatorPbxInfoById(Long id);
+
+    /**
+     * 批量删除PBX
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteElevatorPbxInfoByIds(Long[] ids);
+}

inspur-work/src/main/java/com/inspur/mapper/ElevatorPersonInfoMapper.java

@@ -0,0 +1,62 @@
+package com.inspur.mapper;
+
+import com.inspur.domain.ElevatorPersonInfo;
+
+import java.util.List;
+
+/**
+ * 人员信息Mapper接口
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+public interface ElevatorPersonInfoMapper
+{
+    /**
+     * 查询人员信息
+     *
+     * @param id 人员信息主键
+     * @return 人员信息
+     */
+    public ElevatorPersonInfo selectElevatorPersonInfoById(Long id);
+
+    /**
+     * 查询人员信息列表
+     *
+     * @param elevatorPersonInfo 人员信息
+     * @return 人员信息集合
+     */
+    public List<ElevatorPersonInfo> selectElevatorPersonInfoList(ElevatorPersonInfo elevatorPersonInfo);
+
+    /**
+     * 新增人员信息
+     *
+     * @param elevatorPersonInfo 人员信息
+     * @return 结果
+     */
+    public int insertElevatorPersonInfo(ElevatorPersonInfo elevatorPersonInfo);
+
+    /**
+     * 修改人员信息
+     *
+     * @param elevatorPersonInfo 人员信息
+     * @return 结果
+     */
+    public int updateElevatorPersonInfo(ElevatorPersonInfo elevatorPersonInfo);
+
+    /**
+     * 删除人员信息
+     *
+     * @param id 人员信息主键
+     * @return 结果
+     */
+    public int deleteElevatorPersonInfoById(Long id);
+
+    /**
+     * 批量删除人员信息
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteElevatorPersonInfoByIds(Long[] ids);
+}

inspur-work/src/main/java/com/inspur/service/IElevatorGatewayInfoService.java

@@ -0,0 +1,61 @@
+package com.inspur.service;
+
+import com.inspur.domain.ElevatorGatewayInfo;
+import java.util.List;
+
+/**
+ * 语音网关Service接口
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+public interface IElevatorGatewayInfoService
+{
+    /**
+     * 查询语音网关
+     *
+     * @param id 语音网关主键
+     * @return 语音网关
+     */
+    public ElevatorGatewayInfo selectElevatorGatewayInfoById(Long id);
+
+    /**
+     * 查询语音网关列表
+     *
+     * @param elevatorGatewayInfo 语音网关
+     * @return 语音网关集合
+     */
+    public List<ElevatorGatewayInfo> selectElevatorGatewayInfoList(ElevatorGatewayInfo elevatorGatewayInfo);
+
+    /**
+     * 新增语音网关
+     *
+     * @param elevatorGatewayInfo 语音网关
+     * @return 结果
+     */
+    public int insertElevatorGatewayInfo(ElevatorGatewayInfo elevatorGatewayInfo);
+
+    /**
+     * 修改语音网关
+     *
+     * @param elevatorGatewayInfo 语音网关
+     * @return 结果
+     */
+    public int updateElevatorGatewayInfo(ElevatorGatewayInfo elevatorGatewayInfo);
+
+    /**
+     * 批量删除语音网关
+     *
+     * @param ids 需要删除的语音网关主键集合
+     * @return 结果
+     */
+    public int deleteElevatorGatewayInfoByIds(Long[] ids);
+
+    /**
+     * 删除语音网关信息
+     *
+     * @param id 语音网关主键
+     * @return 结果
+     */
+    public int deleteElevatorGatewayInfoById(Long id);
+}

inspur-work/src/main/java/com/inspur/service/IElevatorPbxInfoService.java

@@ -0,0 +1,61 @@
+package com.inspur.service;
+
+import java.util.List;
+import com.inspur.domain.ElevatorPbxInfo;
+
+/**
+ * PBXService接口
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+public interface IElevatorPbxInfoService
+{
+    /**
+     * 查询PBX
+     *
+     * @param id PBX主键
+     * @return PBX
+     */
+    public ElevatorPbxInfo selectElevatorPbxInfoById(Long id);
+
+    /**
+     * 查询PBX列表
+     *
+     * @param elevatorPbxInfo PBX
+     * @return PBX集合
+     */
+    public List<ElevatorPbxInfo> selectElevatorPbxInfoList(ElevatorPbxInfo elevatorPbxInfo);
+
+    /**
+     * 新增PBX
+     *
+     * @param elevatorPbxInfo PBX
+     * @return 结果
+     */
+    public int insertElevatorPbxInfo(ElevatorPbxInfo elevatorPbxInfo);
+
+    /**
+     * 修改PBX
+     *
+     * @param elevatorPbxInfo PBX
+     * @return 结果
+     */
+    public int updateElevatorPbxInfo(ElevatorPbxInfo elevatorPbxInfo);
+
+    /**
+     * 批量删除PBX
+     *
+     * @param ids 需要删除的PBX主键集合
+     * @return 结果
+     */
+    public int deleteElevatorPbxInfoByIds(Long[] ids);
+
+    /**
+     * 删除PBX信息
+     *
+     * @param id PBX主键
+     * @return 结果
+     */
+    public int deleteElevatorPbxInfoById(Long id);
+}

inspur-work/src/main/java/com/inspur/service/IElevatorPersonInfoService.java

@@ -0,0 +1,61 @@
+package com.inspur.service;
+
+import com.inspur.domain.ElevatorPersonInfo;
+import java.util.List;
+
+/**
+ * 人员信息Service接口
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+public interface IElevatorPersonInfoService
+{
+    /**
+     * 查询人员信息
+     *
+     * @param id 人员信息主键
+     * @return 人员信息
+     */
+    public ElevatorPersonInfo selectElevatorPersonInfoById(Long id);
+
+    /**
+     * 查询人员信息列表
+     *
+     * @param elevatorPersonInfo 人员信息
+     * @return 人员信息集合
+     */
+    public List<ElevatorPersonInfo> selectElevatorPersonInfoList(ElevatorPersonInfo elevatorPersonInfo);
+
+    /**
+     * 新增人员信息
+     *
+     * @param elevatorPersonInfo 人员信息
+     * @return 结果
+     */
+    public int insertElevatorPersonInfo(ElevatorPersonInfo elevatorPersonInfo);
+
+    /**
+     * 修改人员信息
+     *
+     * @param elevatorPersonInfo 人员信息
+     * @return 结果
+     */
+    public int updateElevatorPersonInfo(ElevatorPersonInfo elevatorPersonInfo);
+
+    /**
+     * 批量删除人员信息
+     *
+     * @param ids 需要删除的人员信息主键集合
+     * @return 结果
+     */
+    public int deleteElevatorPersonInfoByIds(Long[] ids);
+
+    /**
+     * 删除人员信息信息
+     *
+     * @param id 人员信息主键
+     * @return 结果
+     */
+    public int deleteElevatorPersonInfoById(Long id);
+}

inspur-work/src/main/java/com/inspur/service/impl/ElevatorGatewayInfoServiceImpl.java

@@ -0,0 +1,96 @@
+package com.inspur.service.impl;
+
+import java.util.List;
+import com.inspur.common.utils.DateUtils;
+import com.inspur.domain.ElevatorGatewayInfo;
+import com.inspur.mapper.ElevatorGatewayInfoMapper;
+import com.inspur.service.IElevatorGatewayInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 语音网关Service业务层处理
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+@Service
+public class ElevatorGatewayInfoServiceImpl implements IElevatorGatewayInfoService
+{
+    @Autowired
+    private ElevatorGatewayInfoMapper elevatorGatewayInfoMapper;
+
+    /**
+     * 查询语音网关
+     *
+     * @param id 语音网关主键
+     * @return 语音网关
+     */
+    @Override
+    public ElevatorGatewayInfo selectElevatorGatewayInfoById(Long id)
+    {
+        return elevatorGatewayInfoMapper.selectElevatorGatewayInfoById(id);
+    }
+
+    /**
+     * 查询语音网关列表
+     *
+     * @param elevatorGatewayInfo 语音网关
+     * @return 语音网关
+     */
+    @Override
+    public List<ElevatorGatewayInfo> selectElevatorGatewayInfoList(ElevatorGatewayInfo elevatorGatewayInfo)
+    {
+        return elevatorGatewayInfoMapper.selectElevatorGatewayInfoList(elevatorGatewayInfo);
+    }
+
+    /**
+     * 新增语音网关
+     *
+     * @param elevatorGatewayInfo 语音网关
+     * @return 结果
+     */
+    @Override
+    public int insertElevatorGatewayInfo(ElevatorGatewayInfo elevatorGatewayInfo)
+    {
+        elevatorGatewayInfo.setCreateTime(DateUtils.getNowDate());
+        return elevatorGatewayInfoMapper.insertElevatorGatewayInfo(elevatorGatewayInfo);
+    }
+
+    /**
+     * 修改语音网关
+     *
+     * @param elevatorGatewayInfo 语音网关
+     * @return 结果
+     */
+    @Override
+    public int updateElevatorGatewayInfo(ElevatorGatewayInfo elevatorGatewayInfo)
+    {
+        elevatorGatewayInfo.setUpdateTime(DateUtils.getNowDate());
+        return elevatorGatewayInfoMapper.updateElevatorGatewayInfo(elevatorGatewayInfo);
+    }
+
+    /**
+     * 批量删除语音网关
+     *
+     * @param ids 需要删除的语音网关主键
+     * @return 结果
+     */
+    @Override
+    public int deleteElevatorGatewayInfoByIds(Long[] ids)
+    {
+        return elevatorGatewayInfoMapper.deleteElevatorGatewayInfoByIds(ids);
+    }
+
+    /**
+     * 删除语音网关信息
+     *
+     * @param id 语音网关主键
+     * @return 结果
+     */
+    @Override
+    public int deleteElevatorGatewayInfoById(Long id)
+    {
+        return elevatorGatewayInfoMapper.deleteElevatorGatewayInfoById(id);
+    }
+}

inspur-work/src/main/java/com/inspur/service/impl/ElevatorPbxInfoServiceImpl.java

@@ -0,0 +1,96 @@
+package com.inspur.service.impl;
+
+import java.util.List;
+import com.inspur.common.utils.DateUtils;
+import com.inspur.domain.ElevatorPbxInfo;
+import com.inspur.mapper.ElevatorPbxInfoMapper;
+import com.inspur.service.IElevatorPbxInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * PBXService业务层处理
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+@Service
+public class ElevatorPbxInfoServiceImpl implements IElevatorPbxInfoService
+{
+    @Autowired
+    private ElevatorPbxInfoMapper elevatorPbxInfoMapper;
+
+    /**
+     * 查询PBX
+     *
+     * @param id PBX主键
+     * @return PBX
+     */
+    @Override
+    public ElevatorPbxInfo selectElevatorPbxInfoById(Long id)
+    {
+        return elevatorPbxInfoMapper.selectElevatorPbxInfoById(id);
+    }
+
+    /**
+     * 查询PBX列表
+     *
+     * @param elevatorPbxInfo PBX
+     * @return PBX
+     */
+    @Override
+    public List<ElevatorPbxInfo> selectElevatorPbxInfoList(ElevatorPbxInfo elevatorPbxInfo)
+    {
+        return elevatorPbxInfoMapper.selectElevatorPbxInfoList(elevatorPbxInfo);
+    }
+
+    /**
+     * 新增PBX
+     *
+     * @param elevatorPbxInfo PBX
+     * @return 结果
+     */
+    @Override
+    public int insertElevatorPbxInfo(ElevatorPbxInfo elevatorPbxInfo)
+    {
+        elevatorPbxInfo.setCreateTime(DateUtils.getNowDate());
+        return elevatorPbxInfoMapper.insertElevatorPbxInfo(elevatorPbxInfo);
+    }
+
+    /**
+     * 修改PBX
+     *
+     * @param elevatorPbxInfo PBX
+     * @return 结果
+     */
+    @Override
+    public int updateElevatorPbxInfo(ElevatorPbxInfo elevatorPbxInfo)
+    {
+        elevatorPbxInfo.setUpdateTime(DateUtils.getNowDate());
+        return elevatorPbxInfoMapper.updateElevatorPbxInfo(elevatorPbxInfo);
+    }
+
+    /**
+     * 批量删除PBX
+     *
+     * @param ids 需要删除的PBX主键
+     * @return 结果
+     */
+    @Override
+    public int deleteElevatorPbxInfoByIds(Long[] ids)
+    {
+        return elevatorPbxInfoMapper.deleteElevatorPbxInfoByIds(ids);
+    }
+
+    /**
+     * 删除PBX信息
+     *
+     * @param id PBX主键
+     * @return 结果
+     */
+    @Override
+    public int deleteElevatorPbxInfoById(Long id)
+    {
+        return elevatorPbxInfoMapper.deleteElevatorPbxInfoById(id);
+    }
+}

inspur-work/src/main/java/com/inspur/service/impl/ElevatorPersonInfoServiceImpl.java

@@ -0,0 +1,96 @@
+package com.inspur.service.impl;
+
+import java.util.List;
+import com.inspur.common.utils.DateUtils;
+import com.inspur.domain.ElevatorPersonInfo;
+import com.inspur.mapper.ElevatorPersonInfoMapper;
+import com.inspur.service.IElevatorPersonInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 人员信息Service业务层处理
+ *
+ * @author inspur
+ * @date 2024-09-30
+ */
+@Service
+public class ElevatorPersonInfoServiceImpl implements IElevatorPersonInfoService
+{
+    @Autowired
+    private ElevatorPersonInfoMapper elevatorPersonInfoMapper;
+
+    /**
+     * 查询人员信息
+     *
+     * @param id 人员信息主键
+     * @return 人员信息
+     */
+    @Override
+    public ElevatorPersonInfo selectElevatorPersonInfoById(Long id)
+    {
+        return elevatorPersonInfoMapper.selectElevatorPersonInfoById(id);
+    }
+
+    /**
+     * 查询人员信息列表
+     *
+     * @param elevatorPersonInfo 人员信息
+     * @return 人员信息
+     */
+    @Override
+    public List<ElevatorPersonInfo> selectElevatorPersonInfoList(ElevatorPersonInfo elevatorPersonInfo)
+    {
+        return elevatorPersonInfoMapper.selectElevatorPersonInfoList(elevatorPersonInfo);
+    }
+
+    /**
+     * 新增人员信息
+     *
+     * @param elevatorPersonInfo 人员信息
+     * @return 结果
+     */
+    @Override
+    public int insertElevatorPersonInfo(ElevatorPersonInfo elevatorPersonInfo)
+    {
+        elevatorPersonInfo.setCreateTime(DateUtils.getNowDate());
+        return elevatorPersonInfoMapper.insertElevatorPersonInfo(elevatorPersonInfo);
+    }
+
+    /**
+     * 修改人员信息
+     *
+     * @param elevatorPersonInfo 人员信息
+     * @return 结果
+     */
+    @Override
+    public int updateElevatorPersonInfo(ElevatorPersonInfo elevatorPersonInfo)
+    {
+        elevatorPersonInfo.setUpdateTime(DateUtils.getNowDate());
+        return elevatorPersonInfoMapper.updateElevatorPersonInfo(elevatorPersonInfo);
+    }
+
+    /**
+     * 批量删除人员信息
+     *
+     * @param ids 需要删除的人员信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteElevatorPersonInfoByIds(Long[] ids)
+    {
+        return elevatorPersonInfoMapper.deleteElevatorPersonInfoByIds(ids);
+    }
+
+    /**
+     * 删除人员信息信息
+     *
+     * @param id 人员信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteElevatorPersonInfoById(Long id)
+    {
+        return elevatorPersonInfoMapper.deleteElevatorPersonInfoById(id);
+    }
+}

inspur-work/src/main/java/com/inspur/websoket/client/util/PBXWebSocketUtils.java

@@ -5,22 +5,24 @@ import com.inspur.websoket.client.PBXWebSocketClient;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 
 @Slf4j
+@Component
 public class PBXWebSocketUtils {
 
     @Value("${pbx.ws.path:ws://{pbx_ip}:{http_port}/{api_path}/subscribe?access_token=}")
-    private String wsPath;
+    private static String wsPath;
 
     @Autowired
-    private IPBXService ipbxService;
+    private static IPBXService ipbxService;
 
-    private PBXWebSocketClient client;
+    private static PBXWebSocketClient client;
 
-    public PBXWebSocketClient webSocketClient() {
+    public static PBXWebSocketClient webSocketClient() {
         try {
             // 获取token
             String accessToken = ipbxService.getAccessToken();
@@ -39,7 +41,7 @@ public class PBXWebSocketUtils {
      * 获取websocket客户端
      * @return
      */
-    public PBXWebSocketClient getWBClient() {
+    public static PBXWebSocketClient getWBClient() {
         if(null != client){
             return client;
         }
@@ -57,4 +59,4 @@ public class PBXWebSocketUtils {
 
     }
 
-}
+}

inspur-work/src/main/resources/mapper/work/ElevatorGatewayInfoMapper.xml

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.inspur.mapper.ElevatorGatewayInfoMapper">
+
+    <resultMap type="com.inspur.domain.ElevatorGatewayInfo" id="ElevatorGatewayInfoResult">
+        <result property="id"    column="id"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="deviceBrand"    column="device_brand"    />
+        <result property="deviceModel"    column="device_model"    />
+        <result property="deviceIp"    column="device_ip"    />
+        <result property="deviceMac"    column="device_mac"    />
+        <result property="deviceState"    column="device_state"    />
+        <result property="userName"    column="user_name"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectElevatorGatewayInfoVo">
+        select id, device_name, device_brand, device_model, device_ip, device_mac, device_state, user_name, create_time, update_time from elevator_gateway_info
+    </sql>
+
+    <select id="selectElevatorGatewayInfoList" parameterType="com.inspur.domain.ElevatorGatewayInfo" resultMap="ElevatorGatewayInfoResult">
+        <include refid="selectElevatorGatewayInfoVo"/>
+        <where>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceBrand != null  and deviceBrand != ''"> and device_brand = #{deviceBrand}</if>
+            <if test="deviceModel != null  and deviceModel != ''"> and device_model = #{deviceModel}</if>
+            <if test="deviceIp != null  and deviceIp != ''"> and device_ip = #{deviceIp}</if>
+            <if test="deviceMac != null  and deviceMac != ''"> and device_mac = #{deviceMac}</if>
+            <if test="deviceState != null "> and device_state = #{deviceState}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+        </where>
+    </select>
+
+    <select id="selectElevatorGatewayInfoById" parameterType="Long" resultMap="ElevatorGatewayInfoResult">
+        <include refid="selectElevatorGatewayInfoVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertElevatorGatewayInfo" parameterType="com.inspur.domain.ElevatorGatewayInfo">
+        insert into elevator_gateway_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="deviceName != null">device_name,</if>
+            <if test="deviceBrand != null">device_brand,</if>
+            <if test="deviceModel != null">device_model,</if>
+            <if test="deviceIp != null">device_ip,</if>
+            <if test="deviceMac != null">device_mac,</if>
+            <if test="deviceState != null">device_state,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="deviceBrand != null">#{deviceBrand},</if>
+            <if test="deviceModel != null">#{deviceModel},</if>
+            <if test="deviceIp != null">#{deviceIp},</if>
+            <if test="deviceMac != null">#{deviceMac},</if>
+            <if test="deviceState != null">#{deviceState},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateElevatorGatewayInfo" parameterType="com.inspur.domain.ElevatorGatewayInfo">
+        update elevator_gateway_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="deviceBrand != null">device_brand = #{deviceBrand},</if>
+            <if test="deviceModel != null">device_model = #{deviceModel},</if>
+            <if test="deviceIp != null">device_ip = #{deviceIp},</if>
+            <if test="deviceMac != null">device_mac = #{deviceMac},</if>
+            <if test="deviceState != null">device_state = #{deviceState},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteElevatorGatewayInfoById" parameterType="Long">
+        delete from elevator_gateway_info where id = #{id}
+    </delete>
+
+    <delete id="deleteElevatorGatewayInfoByIds" parameterType="String">
+        delete from elevator_gateway_info where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

inspur-work/src/main/resources/mapper/work/ElevatorPbxInfoMapper.xml

@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.inspur.mapper.ElevatorPbxInfoMapper">
+
+    <resultMap type="com.inspur.domain.ElevatorPbxInfo" id="ElevatorPbxInfoResult">
+        <result property="id"    column="id"    />
+        <result property="deviceName"    column="device_name"    />
+        <result property="deviceBrand"    column="device_brand"    />
+        <result property="deviceModel"    column="device_model"    />
+        <result property="deviceIp"    column="device_ip"    />
+        <result property="deviceMac"    column="device_mac"    />
+        <result property="deviceState"    column="device_state"    />
+        <result property="userName"    column="user_name"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectElevatorPbxInfoVo">
+        select id, device_name, device_brand, device_model, device_ip, device_mac, device_state, user_name, create_time, update_time from elevator_pbx_info
+    </sql>
+
+    <select id="selectElevatorPbxInfoList" parameterType="com.inspur.domain.ElevatorPbxInfo" resultMap="ElevatorPbxInfoResult">
+        <include refid="selectElevatorPbxInfoVo"/>
+        <where>
+            <if test="deviceName != null  and deviceName != ''"> and device_name like concat('%', #{deviceName}, '%')</if>
+            <if test="deviceBrand != null  and deviceBrand != ''"> and device_brand = #{deviceBrand}</if>
+            <if test="deviceModel != null  and deviceModel != ''"> and device_model = #{deviceModel}</if>
+            <if test="deviceIp != null  and deviceIp != ''"> and device_ip = #{deviceIp}</if>
+            <if test="deviceMac != null  and deviceMac != ''"> and device_mac = #{deviceMac}</if>
+            <if test="deviceState != null "> and device_state = #{deviceState}</if>
+            <if test="userName != null  and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
+        </where>
+    </select>
+
+    <select id="selectElevatorPbxInfoById" parameterType="Long" resultMap="ElevatorPbxInfoResult">
+        <include refid="selectElevatorPbxInfoVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertElevatorPbxInfo" parameterType="com.inspur.domain.ElevatorPbxInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into elevator_pbx_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="deviceName != null">device_name,</if>
+            <if test="deviceBrand != null">device_brand,</if>
+            <if test="deviceModel != null">device_model,</if>
+            <if test="deviceIp != null">device_ip,</if>
+            <if test="deviceMac != null">device_mac,</if>
+            <if test="deviceState != null">device_state,</if>
+            <if test="userName != null">user_name,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="deviceName != null">#{deviceName},</if>
+            <if test="deviceBrand != null">#{deviceBrand},</if>
+            <if test="deviceModel != null">#{deviceModel},</if>
+            <if test="deviceIp != null">#{deviceIp},</if>
+            <if test="deviceMac != null">#{deviceMac},</if>
+            <if test="deviceState != null">#{deviceState},</if>
+            <if test="userName != null">#{userName},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateElevatorPbxInfo" parameterType="com.inspur.domain.ElevatorPbxInfo">
+        update elevator_pbx_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="deviceName != null">device_name = #{deviceName},</if>
+            <if test="deviceBrand != null">device_brand = #{deviceBrand},</if>
+            <if test="deviceModel != null">device_model = #{deviceModel},</if>
+            <if test="deviceIp != null">device_ip = #{deviceIp},</if>
+            <if test="deviceMac != null">device_mac = #{deviceMac},</if>
+            <if test="deviceState != null">device_state = #{deviceState},</if>
+            <if test="userName != null">user_name = #{userName},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteElevatorPbxInfoById" parameterType="Long">
+        delete from elevator_pbx_info where id = #{id}
+    </delete>
+
+    <delete id="deleteElevatorPbxInfoByIds" parameterType="String">
+        delete from elevator_pbx_info where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

inspur-work/src/main/resources/mapper/work/ElevatorPersonInfoMapper.xml

@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.inspur.mapper.ElevatorPersonInfoMapper">
+
+    <resultMap type="com.inspur.domain.ElevatorPersonInfo" id="ElevatorPersonInfoResult">
+        <result property="id"    column="id"    />
+        <result property="personName"    column="person_name"    />
+        <result property="unitName"    column="unit_name"    />
+        <result property="phoneNo"    column="phone_no"    />
+        <result property="safeCode"    column="safe_code"    />
+        <result property="rescueCode"    column="rescue_code"    />
+        <result property="personType"    column="person_type"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+    </resultMap>
+
+    <sql id="selectElevatorPersonInfoVo">
+        select id, person_name, unit_name, phone_no, safe_code, rescue_code, person_type, create_time, update_time from elevator_person_info
+    </sql>
+
+    <select id="selectElevatorPersonInfoList" parameterType="com.inspur.domain.ElevatorPersonInfo" resultMap="ElevatorPersonInfoResult">
+        <include refid="selectElevatorPersonInfoVo"/>
+        <where>
+            <if test="personName != null  and personName != ''"> and person_name like concat('%', #{personName}, '%')</if>
+            <if test="unitName != null  and unitName != ''"> and unit_name like concat('%', #{unitName}, '%')</if>
+            <if test="phoneNo != null  and phoneNo != ''"> and phone_no = #{phoneNo}</if>
+            <if test="safeCode != null  and safeCode != ''"> and safe_code = #{safeCode}</if>
+            <if test="rescueCode != null  and rescueCode != ''"> and rescue_code = #{rescueCode}</if>
+            <if test="personType != null "> and person_type = #{personType}</if>
+        </where>
+    </select>
+
+    <select id="selectElevatorPersonInfoById" parameterType="Long" resultMap="ElevatorPersonInfoResult">
+        <include refid="selectElevatorPersonInfoVo"/>
+        where id = #{id}
+    </select>
+
+    <insert id="insertElevatorPersonInfo" parameterType="com.inspur.domain.ElevatorPersonInfo">
+        insert into elevator_person_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="personName != null">person_name,</if>
+            <if test="unitName != null">unit_name,</if>
+            <if test="phoneNo != null">phone_no,</if>
+            <if test="safeCode != null">safe_code,</if>
+            <if test="rescueCode != null">rescue_code,</if>
+            <if test="personType != null">person_type,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="personName != null">#{personName},</if>
+            <if test="unitName != null">#{unitName},</if>
+            <if test="phoneNo != null">#{phoneNo},</if>
+            <if test="safeCode != null">#{safeCode},</if>
+            <if test="rescueCode != null">#{rescueCode},</if>
+            <if test="personType != null">#{personType},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+        </trim>
+    </insert>
+
+    <update id="updateElevatorPersonInfo" parameterType="com.inspur.domain.ElevatorPersonInfo">
+        update elevator_person_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="personName != null">person_name = #{personName},</if>
+            <if test="unitName != null">unit_name = #{unitName},</if>
+            <if test="phoneNo != null">phone_no = #{phoneNo},</if>
+            <if test="safeCode != null">safe_code = #{safeCode},</if>
+            <if test="rescueCode != null">rescue_code = #{rescueCode},</if>
+            <if test="personType != null">person_type = #{personType},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteElevatorPersonInfoById" parameterType="Long">
+        delete from elevator_person_info where id = #{id}
+    </delete>
+
+    <delete id="deleteElevatorPersonInfoByIds" parameterType="String">
+        delete from elevator_person_info where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>