changes

liuhaonan

2022-11-04 e55c8b0a92eb9715edd90c31dfd4de51a47b588b

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

@@ -26,10 +26,10 @@
    /**
     * 水质数据查询
     *
     * @return
     * @returnlistWaterQualityData
     */
    @GetMapping("/listWaterQualityData")
    public ResponseVO<Object> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
    public ResponseVO<Object> listWaterQualityDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.WATER_DATA_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
@@ -39,8 +39,15 @@

    @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("水质设备号不正确或水质数据解析出错");
        }
    }

}