diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java index 4ec562c..ff5ebc6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java @@ -436,8 +436,7 @@ public class AppController extends BaseController String result; Date start; Date end; - try - { + try { start = new Date(); if (aiPostReq.getUsr() != null) { aiPostReq.getUsr().setTs_submit_ai(start.getTime()); @@ -445,36 +444,24 @@ public class AppController extends BaseController logger.info("ai param is {}", aiPostReq); result = HttpUtils.sendPost(URL, mapper.writeValueAsString(delNullData(aiPostReq))); end = new Date(); + } catch (Exception e) { + logger.error("AI interface return exception, message is {}", e.getMessage()); + throw new ServiceException("AI interface return exception, message is " + e.getMessage()); } - catch (Exception e) - { - throw new ServiceException(e.getMessage()); + if (StringUtils.isEmpty(result)) { + return AjaxResult.error("AI interface return null, please contact administrator"); } - if (!StringUtils.isEmpty(result)) - { - JSONObject data = JSONObject.parseObject(result); - Integer code = data.getInteger("code"); - if(code != 200 && code != 204){ - TRecord tRecord1 = new TRecord(); - tRecord1.setId(recordId); - tRecord1.setStatus("0"); - tRecordService.updateTRecord(tRecord1); - throw new ServiceException(data.getString("msg")); - } - if (code == 204) { - TRecord tRecord1 = new TRecord(); - tRecord1.setId(recordId); - tRecord1.setStatus("0"); - tRecordService.updateTRecord(tRecord1); - return AjaxResult.error(code, data.getString("msg")); - } - jsonObject = removeBase64Image(data,recordId); - tRecord.setUploadTime(start); - tRecord.setAiResultReturnTime(end); - tRecord.setAiResult(JSONObject.toJSONString(jsonObject, SerializerFeature.WriteMapNullValue)); - tRecord.setAiResult2(JSONObject.toJSONString(jsonObject, SerializerFeature.WriteMapNullValue)); - tRecordService.updateTRecord(tRecord); + JSONObject returnData = JSONObject.parseObject(result); + Integer code = returnData.getInteger("code"); + if (code != 200) { + return AjaxResult.error(code, returnData.getString("msg")); } + jsonObject = removeBase64Image(returnData, recordId); + tRecord.setUploadTime(start); + tRecord.setAiResultReturnTime(end); + tRecord.setAiResult(JSONObject.toJSONString(jsonObject, SerializerFeature.WriteMapNullValue)); + tRecord.setAiResult2(JSONObject.toJSONString(jsonObject, SerializerFeature.WriteMapNullValue)); + tRecordService.updateTRecord(tRecord); Map data = new HashMap<>(); data.put("result",jsonObject); TImage tImage = new TImage(); diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java index 7512c96..9cfb385 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/SysLoginService.java @@ -127,6 +127,7 @@ public class SysLoginService // 验证密码 if (!SecurityUtils.matchesPassword(password, sysUser.getPassword())) { log.info("登录用户:{} 密码不正确.", username); + AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"))); throw new ServiceException("登录失败!"); } LoginUser loginUser = new LoginUser();