diff --git a/src/main/java/iet/ustb/sf/controller/TargetController.java b/src/main/java/iet/ustb/sf/controller/TargetController.java index 7de0fde..523c4cd 100644 --- a/src/main/java/iet/ustb/sf/controller/TargetController.java +++ b/src/main/java/iet/ustb/sf/controller/TargetController.java @@ -143,4 +143,11 @@ public class TargetController { JSONObject result = targetService.getTogethDetail(params); return R.ok(result); } + + @Operation(summary = "列表查询") + @PostMapping("/getListResult") + public R getListResult(@RequestBody JSONObject params) { + String result = targetService.getListResult(params); + return R.ok(result); + } } diff --git a/src/main/java/iet/ustb/sf/service/TargetService.java b/src/main/java/iet/ustb/sf/service/TargetService.java index 9bd181b..eea2522 100644 --- a/src/main/java/iet/ustb/sf/service/TargetService.java +++ b/src/main/java/iet/ustb/sf/service/TargetService.java @@ -38,4 +38,6 @@ public interface TargetService extends IService { void saveTogetherTarget(JSONObject params); JSONObject getTogethDetail(JSONObject params); + + String getListResult(JSONObject params); } diff --git a/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java b/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java index 361ebf6..c874f14 100644 --- a/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java +++ b/src/main/java/iet/ustb/sf/service/impl/TargetServiceImpl.java @@ -634,6 +634,24 @@ public class TargetServiceImpl extends ServiceImpl return jsonObject; } + @Override + public String getListResult(JSONObject params) { + String id = params.getString("id"); + CheckUtils.checkEmpty(id, "指标ID"); + Target target = targetMapper.selectById(id); + ThrowUtils.throwIf(target == null, ErrorCode.PARAMS_ERROR, "指标不存在!"); + String[] strArr = utilService.getCurrentCycleDataByCycle(new Date(), target.getCycle()); + String xShow = strArr[0]; + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("target_id", target.getId()); + queryWrapper.eq("x_show", xShow); + TargetData mbgkTargetData = targetDataMapper.selectOne(queryWrapper); + if (mbgkTargetData == null) { + mbgkTargetData = targetDataService.updateHistory(target, strArr, null); + } + return String.valueOf(mbgkTargetData.getVal()); + } + /** * 指标变更后,修改对应的监控数据 *