diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/bigmodel/controller/BigModelResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/bigmodel/controller/BigModelResultController.java new file mode 100644 index 0000000..0c2668b --- /dev/null +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/bigmodel/controller/BigModelResultController.java @@ -0,0 +1,23 @@ +package com.inspect.bigmodel.controller; + +import com.alibaba.fastjson.JSONObject; +import com.inspect.base.core.web.controller.BaseController; +import com.inspect.base.core.web.domain.AjaxResult; +import com.inspect.bigmodel.service.IBigModelResultService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +@RestController +@CrossOrigin +@RequestMapping({"/bigmodel"}) +public class BigModelResultController extends BaseController { + + @Autowired + private IBigModelResultService bigModelResultService; + + @PostMapping({"/record/latest"}) + public AjaxResult getBigModelResult() { + JSONObject jsonObject = this.bigModelResultService.getBigModelResult(); + return AjaxResult.success(jsonObject); + } +} diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/bigmodel/service/IBigModelResultService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/bigmodel/service/IBigModelResultService.java new file mode 100644 index 0000000..144e838 --- /dev/null +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/bigmodel/service/IBigModelResultService.java @@ -0,0 +1,7 @@ +package com.inspect.bigmodel.service; + +import com.alibaba.fastjson.JSONObject; + +public interface IBigModelResultService { + JSONObject getBigModelResult(); +} diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/bigmodel/service/impl/BigModelResultServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/bigmodel/service/impl/BigModelResultServiceImpl.java new file mode 100644 index 0000000..20e6dfe --- /dev/null +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/bigmodel/service/impl/BigModelResultServiceImpl.java @@ -0,0 +1,36 @@ +package com.inspect.bigmodel.service.impl; + +import com.alibaba.fastjson.JSONObject; +import com.inspect.base.core.utils.HttpClientUtils; +import com.inspect.bigmodel.service.IBigModelResultService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +@Service +public class BigModelResultServiceImpl implements IBigModelResultService { + private final Logger log = LoggerFactory.getLogger(BigModelResultServiceImpl.class); + @Value("${bigModel.record.url:http://192.168.110.119:8007}") + private String bigModelRecordUrl; + + @Override + public JSONObject getBigModelResult() { + log.info("-----调用大模型结果接口地址,url:{}", bigModelRecordUrl + "/bigModel/record/latest"); + String resultStr; + try { + resultStr = HttpClientUtils.get(bigModelRecordUrl + "/bigModel/record/latest", ""); + } catch (Exception e) { + log.error("调用大模型结果接口,返回数据异常,exception:{}", e.getMessage()); + throw new RuntimeException(e); + } + log.error("调用大模型结果接口,返回数据,resultStr:{}", resultStr); + JSONObject result = JSONObject.parseObject(resultStr); + if (result != null && "200".equals(result.getString("code"))) { + return result.getJSONObject("data"); + } else { + log.error("调用大模型结果接口,返回数据,resultStr:{}", resultStr); + return result; + } + } +} diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml index d7cff19..7b65755 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml @@ -42,10 +42,10 @@ - - - - + + + + @@ -551,7 +551,7 @@ AND a.filter = '1' AND a.point_status = '0' AND a.task_patrol_id = #{taskPatrolledId} - ) count1, + ) csQxNum, ( SELECT COUNT( 1 ) count @@ -562,7 +562,7 @@ AND a.filter = '0' AND a.point_status = '0' AND a.task_patrol_id = #{taskPatrolledId} - ) count2, + ) aiQxNum, ( SELECT COUNT( 1 ) count @@ -572,7 +572,7 @@ a.res_code != '2000' AND a.filter = '1' AND a.task_patrol_id = #{taskPatrolledId} - ) count3, + ) csYcNum, ( SELECT COUNT( 1 ) count @@ -582,7 +582,7 @@ a.res_code != '2000' AND a.filter = '0' AND a.task_patrol_id = #{taskPatrolledId} - ) count4 + ) aiYcNum