From 08c5f5c5462adc994cde17039fab6795d25fa749 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 26 Apr 2023 16:21:45 +0800
Subject: [PATCH] 呼叫详情列表接口完善

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java |   39 +++++++++++++++++++++++++++++++++++++--
 1 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
index 9dc5187..939b7b0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallServiceImpl.java
@@ -3,8 +3,8 @@
 import cn.gistack.sm.intelligentCall.constant.CallConstant;
 import cn.gistack.sm.intelligentCall.mapper.CallTaskMapper;
 import cn.gistack.sm.intelligentCall.service.CallService;
+import cn.gistack.sm.intelligentCall.vo.CallTaskResultVO;
 import cn.gistack.sm.intelligentCall.vo.CallTaskStatistic;
-import cn.gistack.sm.intelligentCall.vo.CallTaskVO;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
@@ -27,7 +27,6 @@
 
 @Slf4j
 @Service
-@DS("ztznwh")
 public class CallServiceImpl implements CallService {
 
 	@Autowired
@@ -199,4 +198,40 @@
 	public IPage<CallTaskStatistic> getCallListPage(IPage<CallTaskStatistic> page, CallTaskStatistic callTask) {
 		return page.setRecords(callTaskMapper.getCallListPage(page,callTask));
 	}
+
+	/**
+	 * 查询呼叫详情列表信息
+	 * @param callTaskResult
+	 * @param page
+	 * @return
+	 */
+	@Override
+	public IPage<CallTaskResultVO> getCallTaskResultListPage(IPage<CallTaskResultVO> page, CallTaskResultVO callTaskResult) {
+		List<CallTaskResultVO> resultListPage = callTaskMapper.getCallTaskResultListPage(page, callTaskResult);
+		//遍历
+		if (resultListPage.size()>0) {
+			for (CallTaskResultVO resultVO : resultListPage) {
+				// 取出 jsonData 数据
+				System.out.println("resultVO = " + resultVO);
+				String callTaskCalleeContent = resultVO.getCallTaskCalleeContent();
+				JSONObject jsonObject = JSONObject.parseObject(callTaskCalleeContent);
+				String userName = jsonObject.getString("$用户名$");
+				String adName = jsonObject.getString("$水库名称$");
+				resultVO.setAdName(adName);
+				resultVO.setAreaName(getAreaNameByAdCode(jsonObject.getString("$水库编码$")));
+				resultVO.setUserName(userName);
+			}
+		}
+		return page.setRecords(resultListPage);
+	}
+
+	/**
+	 * 通过水库编码获取行政区名称
+	 * @param adCode
+	 * @return
+	 */
+	private String getAreaNameByAdCode(String adCode) {
+		// 通过adCode查询区域名称
+		return callTaskMapper.getAreaNameByAdCode(adCode);
+	}
 }

--
Gitblit v1.9.3