feat:列表添加标题

ruoyi-admin/src/main/java/com/ruoyi/web/controller/home/HomeController.java

@@ -6,9 +6,6 @@ import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.github.pagehelper.page.PageMethod;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.domain.KCategory;
 import com.ruoyi.system.domain.KCategoryVO;
 import com.ruoyi.system.domain.KContent;
@@ -28,7 +25,7 @@ import java.util.Objects;
 
 
 /**
- * 首页
+ * 知识库查询
  *  @author wangxy
  */
 @Controller
@@ -43,15 +40,14 @@ public class HomeController {
 
 	public static final String PAGE_SIZE = "15";
 
-	@Log(title = Constants.WEBSITE_ACCESS, businessType = BusinessType.OTHER)
+	@ApiOperation("知识库查询")
-	@ApiOperation("首页门户")
 	@GetMapping("/home")
 	public String home(ModelMap mmap,
 					   @RequestParam(required = false) Integer categoryid,
 					   @RequestParam(required = false) String kname,
 					   @RequestParam(required = false, defaultValue = "1", value = "p") Integer pageNum,
 					   @RequestParam(required = false ,defaultValue = PAGE_SIZE, value = "ps") Integer pageSize) {
-		//最新通知
+		//知识库查询
 		PageMethod.startPage(pageNum,pageSize);
 		List<KContent> list = contentService.lambdaQuery()
 				.eq(Objects.nonNull(categoryid), KContent::getCategoryid, categoryid)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/manager/FsChannelRecordManager.java

@@ -40,6 +40,12 @@ public class FsChannelRecordManager {
     }
 
 
+    public List<FsChannelRecordVo> selectTotalCallsList(FsChannelRecord record)
+    {
+        return recordService.selectFsChannelRecordList(record);
+    }
+
+
 
 
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TotalCallsController.java

@@ -0,0 +1,53 @@
+package com.ruoyi.web.controller.system;
+
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.system.domain.FsChannelRecord;
+import com.ruoyi.system.domain.FsChannelRecordVo;
+import com.ruoyi.web.controller.manager.FsChannelRecordManager;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * packageName com.ruoyi.web.controller.system
+ *
+ * @author wangxy
+ * @version JDK 8
+ * @className TotalCallsController
+ * @date 2024/4/8
+ * @description 呼叫总数
+ */
+@Controller
+@RequestMapping("/totalCalls")
+public class TotalCallsController extends BaseController {
+
+
+    @Autowired
+    private FsChannelRecordManager recordManager;
+
+    private String prefix = "system/calls";
+
+    @GetMapping()
+    public String totalCalls()
+    {
+        return prefix + "/calls";
+    }
+
+    /**
+     * 查询呼出列表
+     */
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(FsChannelRecord record)
+    {
+        startPage();
+        List<FsChannelRecordVo> list = recordManager.selectTotalCallsList(record);
+        return getDataTable(list);
+    }
+}

ruoyi-admin/src/main/resources/application-prod.yml

@@ -7,11 +7,11 @@ spring:
             # 主库数据源
             master:
                 #url: jdbc:mysql://192.168.254.6:3306/work-portal?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                url: jdbc:mysql://192.168.254.85:3306/java_cti?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://10.89.2.136:3306/java_cti?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                #username: root
+                #username: java
-                #password: fq3gG@Ep
+                #password: heheda.0
-                username: ENC(qIDwFzwTd7W+6W3NTJsfsQ==)
+                username: ENC(CGPbM+51e17y+iMldt34eQ==)
-                password: ENC(FZcHuy+40+UzU3k6M+FnT87FLCzZKG9S)
+                password: ENC(8OQ6a5+k6raPKero5sLVdpw9jIUtJRjS)
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

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

@@ -9,14 +9,14 @@ ruoyi:
   # 实例演示开关
   demoEnabled: true
   # 文件路径 示例（ Windows配置D:/portals/uploadPath，Linux配置 /home/hyp/uploadPath）
-  profile: /home/czt/uploadPath
+  profile: /home/cztCall/uploadPath
   # 获取ip地址开关
   addressEnabled: false
 
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 8087
+  port: 9001
   servlet:
     # 应用的访问路径
     context-path: /

ruoyi-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/hyp/logs" />
+	<property name="log.path" value="/home/cztCall/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

ruoyi-admin/src/main/resources/templates/system/calls/calls.html

@@ -0,0 +1,151 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+	<th:block th:include="include :: header('通话列表')" />
+</head>
+<body class="gray-bg">
+    <div class="container-div">
+		<div class="row">
+			<div class="col-sm-12 search-collapse">
+				<p class="select-title">通话列表</p>
+				<form id="notice-form">
+					<div class="select-list">
+						<ul>
+							<li>
+								客户号码：<input type="text" name="outside"/>
+							</li>
+							<li>
+								号码区号：<input type="text" name="areacode"/>
+							</li>
+							<li class="select-time">
+								<label>呼叫时间： </label>
+								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+								<span>-</span>
+								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+							</li>
+							<li>
+								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+								<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+							</li>
+						</ul>
+					</div>
+				</form>
+			</div>
+
+	        <div class="col-sm-12 select-table table-striped">
+	            <table id="bootstrap-table"></table>
+	        </div>
+    	</div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "totalCalls";
+        $(function() {
+            var options = {
+				uniqueId: "id",
+                url: prefix + "/list",
+                modalName: "通话",
+                columns: [
+				{
+					field : 'routePhone',
+					title : '中继号码'
+				},
+				{
+					field : 'outside',
+					title : '客户号码'
+				},
+				{
+					field : 'areacode',
+					title : '号码区号'
+				},
+				{
+					field : 'cityGsd',
+					title : '归属地'
+				},
+				{
+					field : 'inside',
+					title : '坐席号码'
+				},
+				{
+					field : 'seatName',
+					title : '坐席账号'
+				},
+				{
+					field : 'department',
+					title : '所属部门'
+				},
+				{
+					field : 'other',
+					title : '第三方号码'
+				},
+				{
+					field : 'aj',
+					title : '按键'
+				},
+				{
+					field : 'start',
+					title : '呼叫时间'
+				},
+				{
+					field : 'talk',
+					title : '通话时间'
+				},
+				{
+					field : 'end',
+					title : '呼叫结束时间'
+				},
+				{
+					field : 'listTime',
+					title : '排队时长'
+				},
+				{
+					field : 'ringTime',
+					title : '振铃时长'
+				},
+				{
+					field : 'calltime',
+					title : '通话时长'
+				},
+				{
+					field : 'endType',
+					title : '结束类型',
+					formatter: function(value, item, index) {
+						if (item.endType == '1') {
+							return '排队放弃';
+						} else if (item.endType == '2') {
+							return '呼入漏接';
+						}else if (item.endType == '3') {
+							return '呼入接听后挂断';
+						}else if (item.endType == '4') {
+							return '外呼无人接听挂断';
+						}else if (item.endType == '5') {
+							return '外呼接听后挂断';
+						}else if (item.endType == '0') {
+							return '呼入放弃';
+						}else{
+							return '呼入放弃';
+						}
+
+					}
+				},
+				{
+					field : 'terminalType',
+					title : '终端类型',
+					formatter: function(value, item, index) {
+						if (item.terminalType == '1') {
+							return 'WEB';
+						}
+						else if (item.terminalType == '2') {
+							return '话机';
+						}else{
+							return '未知';
+						}
+
+					}
+				}]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/incoming/incoming.html

@@ -7,6 +7,7 @@
     <div class="container-div">
 		<div class="row">
 			<div class="col-sm-12 search-collapse">
+				<p class="select-title">呼入通话列表</p>
 				<form id="notice-form">
 					<div class="select-list">
 						<ul>
@@ -16,6 +17,12 @@
 							<li>
 								号码区号：<input type="text" name="areacode"/>
 							</li>
+							<li class="select-time">
+								<label>呼入时间： </label>
+								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+								<span>-</span>
+								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+							</li>
 							<li>
 								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 								<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -64,7 +71,7 @@
 					title : '坐席账号'
 				},
 				{
-					field : 'code',
+					field : 'department',
 					title : '所属部门'
 				},
 				{

ruoyi-admin/src/main/resources/templates/system/outbound/outbound.html

@@ -7,6 +7,7 @@
     <div class="container-div">
 		<div class="row">
 			<div class="col-sm-12 search-collapse">
+				<p class="select-title">呼出通话列表</p>
 				<form id="notice-form">
 					<div class="select-list">
 						<ul>
@@ -16,6 +17,12 @@
 							<li>
 								号码区号：<input type="text" name="areacode"/>
 							</li>
+							<li class="select-time">
+								<label>呼出时间： </label>
+								<input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginTime]"/>
+								<span>-</span>
+								<input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endTime]"/>
+							</li>
 							<li>
 								<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
 								<a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
@@ -64,7 +71,7 @@
 					title : '坐席账号'
 				},
 				{
-					field : 'code',
+					field : 'department',
 					title : '所属部门'
 				},
 				{

ruoyi-admin/src/test/java/com/ruoyi/EncFactory.java

@@ -16,7 +16,7 @@ public class EncFactory {
 
     public static void main(String[] args) {
         String securityKey = "NBPLUS"; // 加密秘钥
-        String data = "fq3gG@Ep"; // 需要加密的字符串
+        String data = "heheda.0"; // 需要加密的字符串
 
         PooledPBEStringEncryptor encryptor = new PooledPBEStringEncryptor();
         SimpleStringPBEConfig config = new SimpleStringPBEConfig();

ruoyi-framework/src/main/java/com/ruoyi/framework/config/ShiroConfig.java

@@ -301,6 +301,7 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/getTree", "anon");
         filterChainDefinitionMap.put("/incoming/**", "anon");
         filterChainDefinitionMap.put("/outbound/**", "anon");
+        filterChainDefinitionMap.put("/totalCalls/**", "anon");
 
         // 注册相关
         filterChainDefinitionMap.put("/register", "anon,captchaValidate");

ruoyi-system/src/main/java/com/ruoyi/system/domain/FsChannelRecord.java

@@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Map;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -221,4 +224,9 @@ public class FsChannelRecord implements Serializable {
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+
+    /** 请求参数 */
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    @TableField(exist=false)
+    private Map<String, Object> params;
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/FsChannelRecordVo.java

@@ -258,10 +258,6 @@ public class FsChannelRecordVo implements Serializable {
      */
     private String shopaddress;
 
-    /**
-     * 附件
-     */
-    private String enclosure;
 
     /**
      * 处理提交时间
@@ -269,21 +265,11 @@ public class FsChannelRecordVo implements Serializable {
     private Date dealtime;
 
     /**
-     * 联动1
+     * 所属部门
-     */
-    private String linkage11;
-
-
-    /**
-     * 联动2
      */
-    private String linkage12;
+    private String department;
 
 
-    /**
-     * 复选框
-     */
-    private String checkbox1;
 
 
 

ruoyi-system/src/main/resources/mapper/system/FsChannelRecordMapper.xml

@@ -81,6 +81,7 @@
         a.aj AS aj,
         a.is_lost AS is_lost,
         a.code AS code,
+        (SELECT t.department FROM department_manage t where t.code=a.code) as department,
         a.pid AS pid,
         a.ring_time AS ring_time,
         a.list_in AS list_in,
@@ -107,11 +108,7 @@
         b.office AS office,
         b.shopname AS shopname,
         b.shopaddress AS shopaddress,
-        b.enclosure AS enclosure,
+        b.dealtime AS dealtime from fs_channel_record a
-        b.dealtime AS dealtime,
-        b.linkage11 AS linkage11,
-        b.linkage12 AS linkage12,
-        b.checkbox1 AS checkbox1 from fs_channel_record a
         LEFT JOIN fs_remark_record b ON a.uuid = b.uuid
         <where>
             <if test="channelType != null">
@@ -123,6 +120,12 @@
             <if test="areacode != null and areacode != ''">
                 AND a.areacode = #{areacode}
             </if>
+            <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+                and date_format(a.start,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
+            </if>
+            <if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+                and date_format(a.start,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+            </if>
         </where>
         order by end desc
     </select>