commit all end

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

@@ -0,0 +1,105 @@
+package com.inspur.web.controller.work;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.inspur.domain.ElevatorInfo;
+import com.inspur.service.IElevatorInfoService;
+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-10-12
+ */
+@RestController
+@RequestMapping("/elevator/info")
+public class ElevatorInfoController extends BaseController
+{
+    @Autowired
+    private IElevatorInfoService elevatorInfoService;
+
+    /**
+     * 查询电梯信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('elevator:info:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ElevatorInfo elevatorInfo)
+    {
+        startPage();
+        List<ElevatorInfo> list = elevatorInfoService.selectElevatorInfoList(elevatorInfo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出电梯信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('elevator:info:export')")
+    @Log(title = "电梯信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ElevatorInfo elevatorInfo)
+    {
+        List<ElevatorInfo> list = elevatorInfoService.selectElevatorInfoList(elevatorInfo);
+        ExcelUtil<ElevatorInfo> util = new ExcelUtil<ElevatorInfo>(ElevatorInfo.class);
+        util.exportExcel(response, list, "电梯信息数据");
+    }
+
+    /**
+     * 获取电梯信息详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('elevator:info:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(elevatorInfoService.selectElevatorInfoById(id));
+    }
+
+    /**
+     * 新增电梯信息
+     */
+    @PreAuthorize("@ss.hasPermi('elevator:info:add')")
+    @Log(title = "电梯信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ElevatorInfo elevatorInfo)
+    {
+        return toAjax(elevatorInfoService.insertElevatorInfo(elevatorInfo));
+    }
+
+    /**
+     * 修改电梯信息
+     */
+    @PreAuthorize("@ss.hasPermi('elevator:info:edit')")
+    @Log(title = "电梯信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ElevatorInfo elevatorInfo)
+    {
+        return toAjax(elevatorInfoService.updateElevatorInfo(elevatorInfo));
+    }
+
+    /**
+     * 删除电梯信息
+     */
+    @PreAuthorize("@ss.hasPermi('elevator:info:remove')")
+    @Log(title = "电梯信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(elevatorInfoService.deleteElevatorInfoByIds(ids));
+    }
+}

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

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

inspur-ui/src/views/work/elevator_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="inArea">
+        <el-input v-model="queryParams.inArea" placeholder="请输入所在区域" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="详细地点" prop="inVillage">
+        <el-input v-model="queryParams.inVillage" 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="['elevator: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="['elevator: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="['elevator: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="['elevator: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="name" width="200" :show-overflow-tooltip="true"/>
+<!--      <el-table-column label="区域编码" align="center" prop="areaCode" />-->
+      <el-table-column label="所在区域" align="left" prop="inArea" width="200" :show-overflow-tooltip="true"/>
+      <el-table-column label="详细是有地点" align="left" prop="inVillage" width="200" :show-overflow-tooltip="true"/>
+<!--      <el-table-column label="所在楼栋" align="center" prop="inBuild" />-->
+      <el-table-column label="电梯安全码" align="left" prop="safeCode" />
+      <el-table-column label="维保单位" align="left" prop="unitName" />
+      <el-table-column label="统一社会代码" align="left" prop="unitCode" />
+      <el-table-column label="出厂日期" align="left" prop="factoryOutTime" />
+      <el-table-column label="设备编码" align="left" prop="deviceNo" />
+      <el-table-column label="注册编码" align="left" prop="deviceSn" />
+<!--      <el-table-column label="设备ID" align="left" prop="deviceId" />-->
+      <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="['elevator:info:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)" v-hasPermi="['elevator: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="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="电梯名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入电梯名称" />
+        </el-form-item>
+        <el-form-item label="区域编码" prop="areaCode">
+          <el-input v-model="form.areaCode" placeholder="请输入区域编码" />
+        </el-form-item>
+        <el-form-item label="所在区域" prop="inArea">
+          <el-input v-model="form.inArea" placeholder="请输入所在区域" />
+        </el-form-item>
+        <el-form-item label="使用地点" prop="inVillage">
+          <el-input v-model="form.inVillage" 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="unitName">
+          <el-input v-model="form.unitName" placeholder="请输入维保单位" />
+        </el-form-item>
+        <el-form-item label="社会代码" prop="unitCode">
+          <el-input v-model="form.unitCode" placeholder="请输入维保单位统一社会代码" />
+        </el-form-item>
+        <el-form-item label="出厂日期" prop="factoryOutTime">
+          <el-input v-model="form.factoryOutTime" placeholder="请输入出厂日期" />
+        </el-form-item>
+        <el-form-item label="设备编码" prop="deviceNo">
+          <el-input v-model="form.deviceNo" placeholder="请输入设备编码" />
+        </el-form-item>
+        <el-form-item label="注册编码" prop="deviceSn">
+          <el-input v-model="form.deviceSn" placeholder="请输入设备注册编码" />
+        </el-form-item>
+        <el-form-item label="设备ID" prop="deviceId">
+          <el-input v-model="form.deviceId" placeholder="请输入设备ID" />
+        </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/elevator";
+
+export default {
+  name: "Info",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 电梯信息表格数据
+      infoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        areaCode: null,
+        inArea: null,
+        inVillage: null,
+        inBuild: null,
+        safeCode: null,
+        unitName: null,
+        unitCode: null,
+        factoryOutTime: null,
+        deviceNo: null,
+        deviceSn: null,
+        deviceId: 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,
+        name: null,
+        areaCode: null,
+        inArea: null,
+        inVillage: null,
+        inBuild: null,
+        safeCode: null,
+        unitName: null,
+        unitCode: null,
+        factoryOutTime: null,
+        createTime: null,
+        deviceNo: null,
+        deviceSn: null,
+        deviceId: 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('elevator/info/export', {
+        ...this.queryParams
+      }, `info_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

inspur-ui/vue.config.js

@@ -35,7 +35,8 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8080`,
+        target: `http://localhost:9610/workOrder`,
+        // target: `http://localhost:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

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

@@ -0,0 +1,62 @@
+package com.inspur.service;
+
+import com.inspur.domain.ElevatorInfo;
+
+import java.util.List;
+
+/**
+ * 电梯信息Service接口
+ *
+ * @author inspur
+ * @date 2024-10-12
+ */
+public interface IElevatorInfoService
+{
+    /**
+     * 查询电梯信息
+     *
+     * @param id 电梯信息主键
+     * @return 电梯信息
+     */
+    public ElevatorInfo selectElevatorInfoById(Long id);
+
+    /**
+     * 查询电梯信息列表
+     *
+     * @param elevatorInfo 电梯信息
+     * @return 电梯信息集合
+     */
+    public List<ElevatorInfo> selectElevatorInfoList(ElevatorInfo elevatorInfo);
+
+    /**
+     * 新增电梯信息
+     *
+     * @param elevatorInfo 电梯信息
+     * @return 结果
+     */
+    public int insertElevatorInfo(ElevatorInfo elevatorInfo);
+
+    /**
+     * 修改电梯信息
+     *
+     * @param elevatorInfo 电梯信息
+     * @return 结果
+     */
+    public int updateElevatorInfo(ElevatorInfo elevatorInfo);
+
+    /**
+     * 批量删除电梯信息
+     *
+     * @param ids 需要删除的电梯信息主键集合
+     * @return 结果
+     */
+    public int deleteElevatorInfoByIds(Long[] ids);
+
+    /**
+     * 删除电梯信息信息
+     *
+     * @param id 电梯信息主键
+     * @return 结果
+     */
+    public int deleteElevatorInfoById(Long id);
+}

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

@@ -0,0 +1,108 @@
+package com.inspur.service.impl;
+
+import java.util.List;
+import com.inspur.common.utils.DateUtils;
+import com.inspur.domain.ElevatorInfo;
+import com.inspur.domain.ElevatorPersonInfo;
+import com.inspur.mapper.ElevatorInfoMapper;
+import com.inspur.mapper.ElevatorPersonInfoMapper;
+import com.inspur.service.IElevatorInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 电梯信息Service业务层处理
+ *
+ * @author inspur
+ * @date 2024-10-12
+ */
+@Service
+public class ElevatorInfoServiceImpl implements IElevatorInfoService
+{
+    @Autowired
+    private ElevatorInfoMapper elevatorInfoMapper;
+
+    @Autowired
+    private ElevatorPersonInfoMapper elevatorPersonInfoMapper;
+
+    /**
+     * 查询电梯信息
+     *
+     * @param id 电梯信息主键
+     * @return 电梯信息
+     */
+    @Override
+    public ElevatorInfo selectElevatorInfoById(Long id)
+    {
+        ElevatorInfo elevatorInfo = elevatorInfoMapper.selectElevatorInfoById(id);
+        if (null == elevatorInfo) {
+            return elevatorInfo;
+        }
+        // 增加查询人员信息
+        String elevatorId = elevatorInfo.getDeviceId();
+        List<ElevatorPersonInfo> personInfos = elevatorPersonInfoMapper.selectElevatorPersonInfoByElevatorId(elevatorId);
+        elevatorInfo.setPersonInfos(personInfos);
+        return elevatorInfo;
+    }
+
+    /**
+     * 查询电梯信息列表
+     *
+     * @param elevatorInfo 电梯信息
+     * @return 电梯信息
+     */
+    @Override
+    public List<ElevatorInfo> selectElevatorInfoList(ElevatorInfo elevatorInfo)
+    {
+        return elevatorInfoMapper.selectElevatorInfoList(elevatorInfo);
+    }
+
+    /**
+     * 新增电梯信息
+     *
+     * @param elevatorInfo 电梯信息
+     * @return 结果
+     */
+    @Override
+    public int insertElevatorInfo(ElevatorInfo elevatorInfo)
+    {
+        elevatorInfo.setCreateTime(DateUtils.getNowDate());
+        return elevatorInfoMapper.insertElevatorInfo(elevatorInfo);
+    }
+
+    /**
+     * 修改电梯信息
+     *
+     * @param elevatorInfo 电梯信息
+     * @return 结果
+     */
+    @Override
+    public int updateElevatorInfo(ElevatorInfo elevatorInfo)
+    {
+        return elevatorInfoMapper.updateElevatorInfo(elevatorInfo);
+    }
+
+    /**
+     * 批量删除电梯信息
+     *
+     * @param ids 需要删除的电梯信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteElevatorInfoByIds(Long[] ids)
+    {
+        return elevatorInfoMapper.deleteElevatorInfoByIds(ids);
+    }
+
+    /**
+     * 删除电梯信息信息
+     *
+     * @param id 电梯信息主键
+     * @return 结果
+     */
+    @Override
+    public int deleteElevatorInfoById(Long id)
+    {
+        return elevatorInfoMapper.deleteElevatorInfoById(id);
+    }
+}

inspur-work/src/main/java/com/inspur/websoket/client/bean/RecordingDetails.java

@@ -0,0 +1,38 @@
+package com.inspur.websoket.client.bean;
+
+import lombok.Data;
+
+/**
+ * 录音文件详情
+ * @author lihao16
+ */
+@Data
+public class RecordingDetails {
+
+    private Integer id;
+
+    /** 接听或拨打该通通话的时间 */
+    private String time;
+
+    /** 进行录音的通话的 CDR 唯一 ID */
+    private String uid;
+
+    /** 主叫的号码和名称 */
+    private String call_from;
+
+    /** 被叫的号码和名称 */
+    private String call_to;
+
+    /** 呼叫时长 */
+    private String duration;
+
+    /** 录音文件大小 */
+    private String size;
+
+    /** 通讯类型 */
+    private String call_type;
+
+    /** 文件名 */
+    private String file;
+
+}

inspur-work/src/main/java/com/inspur/websoket/client/bean/ws/WsCallDetails.java

@@ -0,0 +1,54 @@
+package com.inspur.websoket.client.bean.ws;
+
+import lombok.Data;
+
+/**
+ * 通话记录详情。
+ * @author lihao16
+ */
+@Data
+public class WsCallDetails {
+
+    /** 通话的唯一 ID*/
+    private String call_id;
+
+    /** 接听或拨打该通通话的时间 */
+    private String time_start;
+
+    /** 主叫号码 */
+    private String call_from;
+
+    /** 被叫号码 */
+    private String call_to;
+
+    /** 通话时长 */
+    private String call_duration;
+
+    /** 接听时长 */
+    private String talk_duration;
+
+    /** 源中继名称 */
+    private String src_trunk_name;
+
+    /** 目的中继名称 */
+    private String dst_trunk_name;
+
+    /** 密码 */
+    private String pin_code;
+
+    /** 通话状态 */
+    private String status;
+
+    /** 通话类型 */
+    private String type;
+
+    /** 全局录音文件名 */
+    private String recording;
+
+    /** 来电用户拨打的号码 */
+    private String did_number;
+
+    /** 坐席从响铃到接听的时间 S */
+    private String agent_ring_time;
+
+}

inspur-work/src/main/java/com/inspur/websoket/client/bean/ws/WsNewCallDetailsMessage.java

@@ -0,0 +1,14 @@
+package com.inspur.websoket.client.bean.ws;
+
+import lombok.Data;
+
+/**
+ * ws 新通话记录
+ * @author lihao16
+ */
+@Data
+public class WsNewCallDetailsMessage extends WsPMessage{
+
+    private WsCallDetails msg;
+
+}