From 5cc235fd05a8be2460f1fdb2a76fe31b8f19fdcc Mon Sep 17 00:00:00 2001 From: 10710 <1071020418@qq.com> Date: Tue, 12 Mar 2024 16:52:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=20=20=20=20=201?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9sonar=E6=A3=80=E6=B5=8B=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/nlt/feign/RemoteBaiduNLPService.java | 4 ++- .../nlt/controller/DmIntentController.java | 2 +- .../nlt/service/impl/DmIntentServiceImpl.java | 2 +- .../impl/DmWordProcessServiceImpl.java | 33 +++++++++---------- 4 files changed, 20 insertions(+), 21 deletions(-) diff --git a/xueyi-api/xueyi-api-nlt/src/main/java/com/xueyi/nlt/api/nlt/feign/RemoteBaiduNLPService.java b/xueyi-api/xueyi-api-nlt/src/main/java/com/xueyi/nlt/api/nlt/feign/RemoteBaiduNLPService.java index 71937949..27b539b3 100644 --- a/xueyi-api/xueyi-api-nlt/src/main/java/com/xueyi/nlt/api/nlt/feign/RemoteBaiduNLPService.java +++ b/xueyi-api/xueyi-api-nlt/src/main/java/com/xueyi/nlt/api/nlt/feign/RemoteBaiduNLPService.java @@ -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, diff --git a/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/controller/DmIntentController.java b/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/controller/DmIntentController.java index 127f6dcc..b2e0334b 100644 --- a/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/controller/DmIntentController.java +++ b/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/controller/DmIntentController.java @@ -395,7 +395,7 @@ public class DmIntentController extends BaseController manDeviceDtoR = manDeviceService.manDeviceInfoInner(intent.getDevId()); Long enterpriseId = manDeviceDtoR.getData().getTId(); String enterpriseName = ""; - R enterpriseDtoR = remoteEnterpriseService.getInfo(Long.valueOf(enterpriseId)); + R enterpriseDtoR = remoteEnterpriseService.getInfo(enterpriseId); if (enterpriseDtoR.isOk()) { enterpriseName = enterpriseDtoR.getData().getName(); } diff --git a/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/impl/DmWordProcessServiceImpl.java b/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/impl/DmWordProcessServiceImpl.java index 701192f3..d6b17bb0 100644 --- a/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/impl/DmWordProcessServiceImpl.java +++ b/xueyi-modules/xueyi-nlt/src/main/java/com/xueyi/nlt/nlt/service/impl/DmWordProcessServiceImpl.java @@ -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; }