diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/DataMaskingRuleServiceImpl.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/DataMaskingRuleServiceImpl.java index 94eb80f..321d2cf 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/DataMaskingRuleServiceImpl.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/DataMaskingRuleServiceImpl.java @@ -20,7 +20,6 @@ public class DataMaskingRuleServiceImpl extends ServiceImpl getDataMaskingRuleListByApplicationChannel(String applicationChannel) { log.info("getDataMaskingRuleListByApplicationChannel {}", applicationChannel); //根据适用渠道applicationChannel获取数据脱敏规则List - log.info("getDataMaskingRuleListByApplicationChannel applicationChannel:{}", applicationChannel); List dataMaskingRuleList = this.lambdaQuery() // .eq(DataMaskingRule::getApplicationChannel, applicationChannel) .eq(DataMaskingRule::getRuleStatus, YesOrNoConstants.YES) diff --git a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/MqMessageRecordServiceImpl.java b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/MqMessageRecordServiceImpl.java index 05f92a8..6f5aef7 100644 --- a/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/MqMessageRecordServiceImpl.java +++ b/ai-analytic-center-biz/src/main/java/com/volvo/ai/analytic/center/service/impl/MqMessageRecordServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.text.ParseException; @@ -69,6 +70,7 @@ public class MqMessageRecordServiceImpl extends ServiceImpl "'"+code+"'").collect(Collectors.joining(",")); - int asrCount = clickhouseJdbcTemplate.queryForObject("select count(1) from asr_speechdetail where source_id in ("+ sourceId+") and file_status='InProgress'",Integer.class); - if (asrCount > 0) { - log.info("存在未完成解析的通话信息"); - output.setHandleStatus(HandleStatusEnum.ANALYSIS_CALLING.getCode()); - output.setResultStr(HandleStatusEnum.ANALYSIS_CALLING.getMessage()); - return new DiffDefeatAnalyseOutputResult(output, contentStr.toString()); - } +// int asrCount = clickhouseJdbcTemplate.queryForObject("select count(1) from asr_speechdetail where source_id in ("+ sourceId+") and file_status='InProgress'",Integer.class); +// if (asrCount > 0) { +// log.info("存在未完成解析的通话信息"); +// output.setHandleStatus(HandleStatusEnum.ANALYSIS_CALLING.getCode()); +// output.setResultStr(HandleStatusEnum.ANALYSIS_CALLING.getMessage()); +// return new DiffDefeatAnalyseOutputResult(output, contentStr.toString()); +// } //查询到的通话数据 - List> historyList = clickhouseJdbcTemplate.queryForList("select id,msg_json,source_id from asr_hishistory where dialect_text=0 and source_id in ("+ sourceId+") order by id"); + String sql = "select display,sourceId from ods_asrdetail_d where sourceId in ("+ sourceId+") order by transcribeTime"; + log.info("查询通话数据sql {}",sql); + List> historyList = clickhouseJdbcTemplate.queryForList(sql); for (CallItem item : input.getCallList()) { Optional result = CollectionUtils.isEmpty(historyList) ? Optional.empty(): - historyList.stream().filter(entity -> entity.get("source_id").equals(item.getSourceId())) - .findFirst().map(entity -> entity.get("msg_json") == null ? "" : entity.get("msg_json").toString()); + historyList.stream().filter(entity -> entity.get("sourceId").equals(item.getSourceId())) + .findFirst().map(entity -> entity.get("display") == null ? "" : entity.get("display").toString()); DiffDefeatCorpuItem curDiffDefeatCorpItem = new DiffDefeatCorpuItem(); curDiffDefeatCorpItem.setSourceId(item.getSourceId()); curDiffDefeatCorpItem.setCategory(CategoryEnum.PHONE_VOICE.getCode()); @@ -207,8 +211,9 @@ public class MqMessageRecordServiceImpl extends ServiceImpl> userList = clickhouseJdbcTemplate.queryForList(userIdSql); if (!CollectionUtils.isEmpty(userList) && userList.size() == 2) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -219,17 +224,18 @@ public class MqMessageRecordServiceImpl extends ServiceImpl= '" + startTime + "' and msgtime < '" + endTime + "' " + "and chattype = '0' and msgtype='text')" + "select id,fromuserid,acceptuserid,msgtime,content,seq,actiontype,msgid,msgtype," + "(case when tab2.userid is null or tab2.userid='' then 0 else 1 end) as fromuserrole " + - "from tab LEFT JOIN (select distinct userid from ods_vdqw.ods_vdqw_workuserinfo_d) tab2 " + + "from tab LEFT JOIN (select distinct userid from ods_workuserinfo_d) tab2 " + "on tab.fromuserid = tab2.userid " + "where rn = 1 and ((" + "fromuserid ='" + user1 + "' and acceptuserid ='" + user2 + "') or (" + "fromuserid ='" + user2 + "' and acceptuserid ='" + user1 + "'))" + "order by seq;"; + log.info("企微数据查询sql {}",sql); List userInfoList = clickhouseJdbcTemplate.queryForList(sql, SessionItem.class); for (int i=0;i