Merge remote-tracking branch 'origin/master'

luoyisheng

2025-03-25 b03d89e792a34c486f0afeab69e837f85d8cbe16

 medicalWaste-admin/src/main/java/com/sinata/web/controller/screen/ScreenController.java

@@ -2,6 +2,11 @@

import com.sinata.common.core.domain.R;
import com.sinata.system.domain.MedicalWasteStaticsVO;
import com.sinata.system.domain.vo.CarDistributionVO;
import com.sinata.system.domain.vo.DepartmentTagInfoVO;
import com.sinata.system.domain.vo.MedicalInstitutionCollectListVO;
import com.sinata.system.domain.vo.MwWarningRecordStaticsVO;
import com.sinata.system.domain.vo.MwWarningRecordVO;
import com.sinata.system.domain.vo.ScreenDepartmentVO;
import com.sinata.system.domain.vo.TodayMedicalWastePieVO;
import com.sinata.system.domain.vo.TotalCollectWeightByTypeVO;
@@ -26,9 +31,11 @@
@Api(tags = {"数据大屏相关接口"})
@RestController
@RequiredArgsConstructor
@RequestMapping("/screen")
@RequestMapping("/backend/screen")
public class ScreenController {

    private final ScreenService screenService;


    /**
     * 获取单位列表
@@ -39,6 +46,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 +93,59 @@
    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>> medicalInstitutionCollectList() {
        return R.ok(screenService.medicalInstitutionCollectList());
    }

    /**
     * 预警记录统计
     *
     * @return
     */
    @ApiOperation("预警记录统计")
    @GetMapping("/warningRecordStaticsList")
    public R<List<MwWarningRecordStaticsVO>> warningRecordStaticsList() {
        return R.ok(screenService.warningRecordStaticsList());
    }

    /**
     * 根据预警类型查询预警详情
     *
     * @param type
     * @return
     */
    @ApiOperation("根据预警类型查询预警详情")
    @GetMapping("/warningRecordDetailByType/{type}")
    public R<List<MwWarningRecordVO>> queryWarningRecordDetailByType(@ApiParam(name = "type", value = "预警类型", required = true) @PathVariable("type") Integer type) {
        return R.ok(screenService.queryWarningRecordDetailByType(type));
    }

    /**
     * 车辆分布
     *
     * @return
     */
    @ApiOperation("车辆分布")
    @GetMapping("/carDistribution")
    public R<List<CarDistributionVO>> queryCarDistribution() {
        return R.ok(screenService.queryCarDistribution());
    }

    /**
     * 车辆分布详情
     *
     * @param id
     * @return
     */
    @ApiOperation("车辆分布详情")
    @GetMapping("/carDistributionDetail/{id}")
    public R<CarDistributionVO> queryCarDistributionDetail(@ApiParam(name = "id", value = "车辆id", required = true) @PathVariable("id") Long id) {
        return R.ok(screenService.queryCarDistributionDetail(id));
    }
}