Browse Source

修改:

1、修改sonar检测出的错误
tags/B.2.8.3_20240316_release
10710 1 year ago
parent
commit
5cc235fd05
4 changed files with 20 additions and 21 deletions
  1. +3
    -1
      xueyi-api/xueyi-api-nlt/src/main/java/com/xueyi/nlt/api/nlt/feign/RemoteBaiduNLPService.java
  2. +1
    -1
      xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/controller/DmIntentController.java
  3. +1
    -1
      xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/impl/DmIntentServiceImpl.java
  4. +15
    -18
      xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/impl/DmWordProcessServiceImpl.java

+ 3
- 1
xueyi-api/xueyi-api-nlt/src/main/java/com/xueyi/nlt/api/nlt/feign/RemoteBaiduNLPService.java View File

@@ -12,7 +12,9 @@ import org.springframework.web.bind.annotation.RequestParam;
public interface RemoteBaiduNLPService {

@PostMapping(path = "/oauth/2.0/token", consumes = "application/x-www-form-urlencoded")
JSONObject getAccessToken(@RequestBody String body);
JSONObject getAccessToken(@RequestParam("client_id") String client_id,
@RequestParam("client_secret") String client_secret,
@RequestParam("grant_type") String grant_type);

@PostMapping(path = "/rpc/2.0/nlp/v2/dnnlm_cn", consumes = "application/json")
JSONObject detected(@RequestParam(value = "charset", defaultValue = "UTF-8") String charset,


+ 1
- 1
xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/controller/DmIntentController.java View File

@@ -395,7 +395,7 @@ public class DmIntentController extends BaseController<DmIntentQuery, DmIntentDt
if (enterpriseDtoR.isOk()) {
enterpriseName = enterpriseDtoR.getData().getName();
}
recordVo.setTenantId(Long.valueOf(manDeviceDtoR.getData().getTId()));
recordVo.setTenantId(manDeviceDtoR.getData().getTId());
DmIntentResponse response = new DmIntentResponse();
//先调用意图
//根据技能调用知识库或大模型


+ 1
- 1
xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/impl/DmIntentServiceImpl.java View File

@@ -183,7 +183,7 @@ public class DmIntentServiceImpl extends BaseServiceImpl<DmIntentQuery, DmIntent
R<DmManDeviceDto> manDeviceDtoR = manDeviceService.manDeviceInfoInner(intent.getDevId());
Long enterpriseId = manDeviceDtoR.getData().getTId();
String enterpriseName = "";
R<SysEnterpriseDto> enterpriseDtoR = remoteEnterpriseService.getInfo(Long.valueOf(enterpriseId));
R<SysEnterpriseDto> enterpriseDtoR = remoteEnterpriseService.getInfo(enterpriseId);
if (enterpriseDtoR.isOk()) {
enterpriseName = enterpriseDtoR.getData().getName();
}


+ 15
- 18
xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/impl/DmWordProcessServiceImpl.java View File

@@ -23,28 +23,25 @@ public class DmWordProcessServiceImpl implements IDmWordProcessService {

public WordProcessVo semanticIntegrityDetection (WordProcessVo wordProcessVo){
log.info("元数据:" + wordProcessVo.getMetadata());
String body = "grant_type=client_credentials&client_id=" + baiduConfig.getApiKey() + "&client_secret=" + baiduConfig.getSecretKey();
JSONObject accessJson = remoteBaiduNLPService.getAccessToken(body);
JSONObject accessJson = remoteBaiduNLPService.getAccessToken(baiduConfig.getApiKey(), baiduConfig.getSecretKey(), "client_credentials");
JSONObject result = remoteBaiduNLPService.detected("UTF-8", accessJson.getString("access_token"), "{\"text\":\"" + wordProcessVo.getMetadata() + "\"}");
if(result.containsKey("ppl")){
if(result != null){
if(result.containsKey("error_code")){
String errorMsg = String.format("语义完整性检测失败,错误码:%d,错误信息:%s", result.getInteger("error_code"),result.getString("error_msg"));
log.error(errorMsg);
if(result != null){
if(result.containsKey("error_code")){
String errorMsg = String.format("语义完整性检测失败,错误码:%d,错误信息:%s", result.getInteger("error_code"),result.getString("error_msg"));
log.error(errorMsg);
}else{
Double ppl = result.getDouble("ppl");
if(ppl < 300) {
wordProcessVo.setProcessedResult("2");
}else if(ppl > 1000){
wordProcessVo.setProcessedResult("0");
}else{
Double ppl = result.getDouble("ppl");
if(ppl < 300) {
wordProcessVo.setProcessedResult("2");
}else if(ppl > 1000){
wordProcessVo.setProcessedResult("0");
}else{
wordProcessVo.setProcessedResult("1");
}
log.info("语义完整性检测结果:" + wordProcessVo.getProcessedResult());
wordProcessVo.setProcessedResult("1");
}
}else{
log.error("语义完整性检测失败,未获取到返回结果");
log.info("语义完整性检测结果:" + wordProcessVo.getProcessedResult());
}
}else{
log.error("语义完整性检测失败,未获取到返回结果");
}
return wordProcessVo;
}


Loading…
Cancel
Save