From 268809bb4d1ace0bbe8ec20262ebb7d7822c8630 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期四, 02 一月 2025 11:25:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/screen/ScreenController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/screen/ScreenController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/screen/ScreenController.java
index 306537f..b1e9e45 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/screen/ScreenController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/screen/ScreenController.java
@@ -2,6 +2,7 @@
import com.sinata.common.core.domain.R;
import com.sinata.system.domain.MedicalWasteStaticsVO;
+import com.sinata.system.domain.vo.DepartmentTagInfoVO;
import com.sinata.system.domain.vo.ScreenDepartmentVO;
import com.sinata.system.domain.vo.TodayMedicalWastePieVO;
import com.sinata.system.domain.vo.TotalCollectWeightByTypeVO;
@@ -26,7 +27,7 @@
@Api(tags = {"数据大屏相关接口"})
@RestController
@RequiredArgsConstructor
-@RequestMapping("/screen")
+@RequestMapping("/backend/screen")
public class ScreenController {
private final ScreenService screenService;
@@ -39,6 +40,18 @@
@GetMapping(value = "/departmentList")
public R<List<ScreenDepartmentVO>> departmentList() {
return R.ok(screenService.departmentList());
+ }
+
+ /**
+ * 获取单位标签信息
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation("获取单位标签信息")
+ @GetMapping("/getTagInfo/{id}")
+ public R<DepartmentTagInfoVO> getTagInfo(@ApiParam(name = "id", value = "单位id", required = true) @PathVariable("id") Long id) {
+ return R.ok(screenService.getTagInfo(id));
}
/**
@@ -74,4 +87,10 @@
public R<TotalCollectWeightByTypeVO> totalCollectWeightByType(@ApiParam(name = "type", value = "统计类型 1：按周统计 2：按月统计") @PathVariable("type") Integer type) {
return R.ok(screenService.totalCollectWeightByType(type));
}
+ /**
+ * 医疗机构收集情况
+ */
+ @ApiOperation("医疗机构收集情况")
+ @GetMapping("/medicalInstitutionCollectList")
+ public R<List<MedicalInstitutionCollectListVO>>
}
--
Gitblit v1.7.1