Merge remote-tracking branch 'origin/master'

aijinhui

2024-02-23 0abccf5e570dce53a802bca4ce25118dd900692c

 ard-work/src/main/java/com/ruoyi/alarmpoints/well/controller/ArdAlarmpointsWellController.java

@@ -248,4 +248,20 @@
        return AjaxResult.success(result);
    }

    @GetMapping("/getWellDataByPatrolplanIdAndPosition")
    @ApiOperation("查询最近巡检设备动静态属性")
    public AjaxResult getWellDataByPatrolplanIdAndPosition(@RequestBody Map<String,Object> para){
        SysConfig config = new SysConfig();
        config.setConfigKey("3coracle");
        List<SysConfig> sysConfigResult = sysConfigService.selectConfigList(config);
        Map<String,Object> result = ardAlarmpointsWellService.getWellDataByPatrolplanIdAndPosition(para,sysConfigResult);
        return AjaxResult.success(result);
    }

    @GetMapping("/getWellById")
    @ApiOperation("根据查询兴趣点基本属性")
    public AjaxResult getWellById(@RequestBody Map<String,String> para){
        ArdAlarmpointsWell result = ardAlarmpointsWellService.getWellById(para.get("id"));
        return AjaxResult.success(result);
    }
}