changes

liuhaonan

2022-10-26 c7be2ef037c5aebb0cd8f1f33e5fa934389e6083

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

@@ -1,11 +1,13 @@
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.security.PermissionConfig;
import com.sandu.ximon.admin.service.WaterQualityDataService;
import com.sandu.ximon.dao.bo.WaterQualityDataBo;
import com.sandu.ximon.dao.domain.WaterQualityData;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -19,28 +21,33 @@
@RequestMapping("/v1/admin/waterqualitydata")
public class WaterQualityDataController {
    private final WaterQualityDataService waterQualityDataService;

    @GetMapping
    public ResponseVO<Object> listWaterQualityData() {
        List<WaterQualityDataBo> list = waterQualityDataService.listWaterQualityData();
        return ResponseUtil.success(list);
    }
    private PermissionConfig permissionConfig;

    /**
     * 模糊查询
     * 水质数据查询
     *
     * @return
     * @returnlistWaterQualityData
     */
    @GetMapping("/listWaterQualityDataByKeyword/{keyword}")
    public ResponseVO<Object> listWaterQualityDataByKeyword(@PathVariable String keyword) {
        List<WaterQualityDataBo> list = waterQualityDataService.listWaterQualityDataByKeyword(keyword);
        return ResponseUtil.success(list);
    @GetMapping("/listWaterQualityData")
    public ResponseVO<Object> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.WATER_DATA_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<WaterQualityDataBo> list = waterQualityDataService.listWaterQualityDataByKeyword(baseConditionVO, keyword);
        return ResponseUtil.successPage(list);
    }

    @PostMapping("/getWaterQualityDataInfo/{waterQualityEquipmentCode}")
    public ResponseVO<Object> getWaterQualityDataInfo(@PathVariable String waterQualityEquipmentCode) {
        if (!permissionConfig.check(MenuEnum.WATER_DATA_DETAIL.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        WaterQualityDataDto waterQualityDataDto = waterQualityDataService.getWaterQualityDataInfo(waterQualityEquipmentCode);
        return ResponseUtil.success(waterQualityDataDto);
        if(waterQualityDataDto != null){
            return ResponseUtil.success(waterQualityDataDto);
        }else{
            return ResponseUtil.fail("水质设备号不正确或水质数据解析出错");
        }
    }

}