功能完善

liuhaonan

2022-03-04 f4a6289110e6aa67e635bfb5ed6b695b697c432c

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityDataController.java

@@ -1,10 +1,11 @@
package com.sandu.ximon.admin.controller;

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.WaterQualityDataDto;
import com.sandu.ximon.admin.service.WaterQualityDataService;
import com.sandu.ximon.dao.domain.WaterQualityData;
import com.sandu.ximon.dao.bo.WaterQualityDataBo;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -19,20 +20,14 @@
public class WaterQualityDataController {
    private final WaterQualityDataService waterQualityDataService;

    @GetMapping
    public ResponseVO<Object> listWaterQualityData() {
        List<WaterQualityData> list = waterQualityDataService.listWaterQualityData();
        return ResponseUtil.successPage(list);
    }

    /**
     * 模糊查询
     * 水质数据查询
     *
     * @return
     */
    @GetMapping("/listWaterQualityDataByKeyword/{keyword}")
    public ResponseVO<Object> listWaterQualityDataByKeyword(@PathVariable String keyword) {
        List<WaterQualityData> list = waterQualityDataService.listWaterQualityDataByKeyword(keyword);
    @GetMapping("/listWaterQualityData")
    public ResponseVO<Object> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
        List<WaterQualityDataBo> list = waterQualityDataService.listWaterQualityDataByKeyword(baseConditionVO, keyword);
        return ResponseUtil.successPage(list);
    }