merge

puzhibing

2024-10-28 d5508a6129800efcee1207bfd7aa134ca943b773

merge

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/factory/UploadRealTimeMonitoringDataFallbackFactory.java

@@ -47,6 +47,11 @@
            public R<UploadRealTimeMonitoringPageData> getAll(MongoChargingOrderQuery mongoChargingOrderQuery) {
                return null;
            }

            @Override
            public R delete(String id) {
                return null;
            }
        };
    }
}

 ruoyi-api/ruoyi-api-integration/src/main/java/com/ruoyi/integration/api/feignClient/UploadRealTimeMonitoringDataClient.java

@@ -46,4 +46,7 @@

    @PostMapping("/uploadRealTimeMonitoringData/getAll")
    R<UploadRealTimeMonitoringPageData> getAll(@RequestBody MongoChargingOrderQuery mongoChargingOrderQuery);

    @PostMapping("/uploadRealTimeMonitoringData/delete")
    R delete(@RequestParam String id);
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/controller/UploadRealTimeMonitoringDataController.java

@@ -79,6 +79,12 @@
        return R.ok(list);
    }

    @PostMapping(value = "/delete")
    public R delete(@RequestParam String id) throws ParseException {
        uploadRealTimeMonitoringDataService.delete(id);
        return R.ok();
    }

    
}


 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/UploadRealTimeMonitoringDataService.java

@@ -25,4 +25,5 @@
     */
    UploadRealTimeMonitoringData getLastDataById(String transaction_serial_number);

    void delete(String id);
}

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/mongodb/service/impl/UploadRealTimeMonitoringDataServiceImpl.java

@@ -138,4 +138,10 @@
        return mongoTemplate.findOne(query, UploadRealTimeMonitoringData.class);
    }

    @Override
    public void delete(String id) {
        UploadRealTimeMonitoringData byId = findById(id.toString());
        mongoTemplate.remove(byId);
    }

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java

@@ -838,9 +838,16 @@

        return R.ok(page);
    }
    
    
    



    @ResponseBody
    @PostMapping(value = "/watch/delete")
    @ApiOperation(value = "监控订单-删除", tags = {"管理后台-订单管理"})
    public R watchChargingOrder(@RequestParam String id) {
        uploadRealTimeMonitoringDataClient.delete(id);
        return R.ok();
    }
    
    /**
     * 处理充电订单实时监控数据相关的业务逻辑