2021与蓝度共同重构项目,服务端
liuhaonan
2022-08-25 7f1e17a5f6dde1af93f3c03037c4da7bb4afaaa5
changes
已修改2个文件
43 ■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
@@ -384,4 +384,25 @@
        }
    }
    /**
     * 充电桩故障情况下,结果故障前正在进行中的订单
     *
     * @param dataPackage
     */
    public void stopCharingOrder(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
        //获取正在进行中的订单
        C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
                .eq(C3mOrder::getC3Mac, dataPackage.getC3Mac()).eq(C3mOrder::getChargingStates, 0)
                .eq(C3mOrder::getOrderStatus, OrderStatus.PAYED.getStatus()).last("limit 1"));
        if ("1".equals(dataPackage.getStatusBit()) && c3mOrder != null) {
            //订单未结束,但是充电桩为空闲状态(即充电桩断电/故障情况)  结束该订单
            //设置订单为已完成
            c3mOrder.setOrderStatus(OrderStatus.COMPLETE.getStatus());
            //设置充电状态为已结束
            c3mOrder.setChargingStates(1);
            updateById(c3mOrder);
        }
    }
}
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java
@@ -41,28 +41,6 @@
        return result;
    }
//    public static String GetWithHeader (String url, String params, CommonHeader header) {
//        CloseableHttpClient client = HttpClients.createDefault();
//        HttpGet get = new HttpGet(url);
//        for(String key: header.keySet()) {
//            get.setHeader(key, header.get(key));
//        }
//        String result = null;
//        try {
//            StringEntity s = new StringEntity(params, UTF8);
//            s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,
//                    "application/json"));
//            HttpResponse httpResponse = client.execute(get);
//            InputStream inStream = httpResponse.getEntity().getContent();
//
//            result = streamToString(inStream, UTF8);
//
//            inStream.close();
//        } catch (Exception e) {
//            return null;
//        }
//        return result;
//    }
public static String GetWithHeader (String url, List<NameValuePair> urlParameters, Map<String, String> header) throws URISyntaxException {