fix

zhanzhiqin

2021-12-29 35a52749b6d1657910386ce28fe8d9af2811bed7

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

@@ -2,13 +2,11 @@

import com.sandu.common.domain.ResponseVO;
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 lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.List;

@@ -24,7 +22,7 @@
    @GetMapping
    public ResponseVO<Object> listWaterQualityData() {
        List<WaterQualityData> list = waterQualityDataService.listWaterQualityData();
        return ResponseUtil.successPage(list);
        return ResponseUtil.success(list);
    }

    /**
@@ -35,7 +33,13 @@
    @GetMapping("/listWaterQualityDataByKeyword/{keyword}")
    public ResponseVO<Object> listWaterQualityDataByKeyword(@PathVariable String keyword) {
        List<WaterQualityData> list = waterQualityDataService.listWaterQualityDataByKeyword(keyword);
        return ResponseUtil.successPage(list);
        return ResponseUtil.success(list);
    }

    @PostMapping("/getWaterQualityDataInfo/{waterQualityEquipmentCode}")
    public ResponseVO<Object> getWaterQualityDataInfo(@PathVariable String waterQualityEquipmentCode) {
        WaterQualityDataDto waterQualityDataDto = waterQualityDataService.getWaterQualityDataInfo(waterQualityEquipmentCode);
        return ResponseUtil.success(waterQualityDataDto);
    }

}