清淤

aijinhui

2023-11-02 d4c8d478007e72916a92516c42338ed0d9a84f58

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

@@ -152,9 +152,9 @@
    @ApiOperation("导入井")
    public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception {
        ExcelUtil<ArdAlarmpointsWell> util = new ExcelUtil<ArdAlarmpointsWell>(ArdAlarmpointsWell.class);
        List<ArdAlarmpointsWell> userList = util.importExcel(file.getInputStream());
        List<ArdAlarmpointsWell> wellList = util.importExcel(file.getInputStream());
        String operName = getUsername();
        String message = ardAlarmpointsWellService.importUser(userList, updateSupport, operName);
        String message = ardAlarmpointsWellService.importWell(wellList, updateSupport, operName);
        return success(message);
    }

@@ -217,11 +217,11 @@

    @PostMapping("/getNearbyWells")
    @ApiOperation("查询附近的所有井")
    public AjaxResult getNearbyWells(Double[] position, Long deptId, Integer pageNum, Integer pageSize) {
    public AjaxResult getNearbyWells(Double longitude,Double latitude, Long deptId, Integer pageNum, Integer pageSize) {
        JpaPageInfo jpaPageInfo = new JpaPageInfo();
        jpaPageInfo.setPageNum(pageNum);
        jpaPageInfo.setPageSize(pageSize);
        List<ArdAlarmpointsWell> nearbyWellList = ardAlarmpointsWellService.getNearbyWellList(position, deptId, 1000);
        List<ArdAlarmpointsWell> nearbyWellList = ardAlarmpointsWellService.getNearbyWellList(longitude,latitude, deptId, 1000);
        jpaPageInfo.doPage(nearbyWellList);
        return AjaxResult.success(jpaPageInfo);
    }