From c386374de5ff4a65904124ef839e6862518d27fa Mon Sep 17 00:00:00 2001 From: fei.wang <wf18701153496@163.com> Date: 星期三, 16 四月 2025 09:12:30 +0800 Subject: [PATCH] v2.0.2,更新时间4.16 --- src/main/java/com/hxzkmonitor/controller/TbEvrydayweiyi2024Controller.java | 44 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 34 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/hxzkmonitor/controller/TbEvrydayweiyi2024Controller.java b/src/main/java/com/hxzkmonitor/controller/TbEvrydayweiyi2024Controller.java index dbd10bb..2902fcf 100644 --- a/src/main/java/com/hxzkmonitor/controller/TbEvrydayweiyi2024Controller.java +++ b/src/main/java/com/hxzkmonitor/controller/TbEvrydayweiyi2024Controller.java @@ -1,6 +1,7 @@ package com.hxzkmonitor.controller; +import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hxzkmonitor.pojo.TbEvrydayweiyi2024; @@ -111,18 +112,18 @@ String[] ed = new String[size]; String[] nd = new String[size]; String[] x = new String[size]; + List<JSONObject> list = new ArrayList<>(); for (int i = 0; i < size; i++) { - hd[i] = data.get(i).getTdmm(); - ed[i] = data.get(i).getEdmm(); - nd[i] = data.get(i).getNdmm(); - x[i] = data.get(i).getFilename(); + LinkedHashMap<String, Object> json = new LinkedHashMap<>(); + json.put("缂栧彿", data.get(i).getTagid()); + json.put("璁惧鍚嶇О", data.get(i).getAnchorname()); + json.put("涓滀綅绉�", data.get(i).getEdmm()); + json.put("鍖椾綅绉�", data.get(i).getNdmm()); + json.put("澶╀綅绉�", data.get(i).getTdmm()); + json.put("娣诲姞鏃堕棿", data.get(i).getAddtime()); + list.add(new JSONObject(json)); } - Map<String, Object> result = new HashMap<>(); - result.put("ed", ed); - result.put("nd", nd); - result.put("hd", hd); - result.put("x", x); - return R.ok(result); + return R.ok(list); } @PostMapping("/api/handlechartupdate3") @@ -155,5 +156,28 @@ return R.ok(result); } + + @GetMapping("/api/getweiyi") + public R getweiyi(String tagid) { + TbEvrydayweiyi2024 data = new TbEvrydayweiyi2024(); + data = tbEvrydayweiyi2024Service.getweiyi( tagid); + JSONObject json = new JSONObject(); + if (data!=null){ + json.put("涓滀綅绉�", data.getEdmm()); + json.put("鍖椾綅绉�", data.getNdmm()); + json.put("澶╀綅绉�", data.getTdmm()); + json.put("缂栧彿", tagid); + json.put("鏄惁鍦ㄧ嚎", data.getOnlie()); + } + + return R.ok(json); + } + + + @GetMapping("/api/gettagidweiyi") + public R gettagidweiyi(String tagid) { + Map<String, Object> data = tbEvrydayweiyi2024Service.gettagidweiyi( tagid); + return R.ok(data); + } } -- Gitblit v1.9.3