firsh

leutu

2024-05-20 a4e99a6a39284643fdf2b04dbe55212e5954973c

 src/main/java/com/skyline/electricity/controller/RemoteController.java

@@ -585,7 +585,7 @@
            final ResponseEntity<String> responseEntity1 = (ResponseEntity<String>)restTemplate.getForEntity(this.configInfo.getUWB_Historylocation()  + "?apikey=" +  this.configInfo.getApikey()  + "&userId={userId}&shopId={shopId}&startTime={startTime}&endTime={endTime}", (Class)String.class, (Map)params1);
            final String body1 = (String)responseEntity1.getBody();
            final JSONObject jsonObjectResult1 = JSONObject.parseObject(body1);
            System.out.println(jsonObjectResult1.get((Object)"data"));
            //System.out.println(jsonObjectResult1.get((Object)"data"));
            if (jsonObjectResult1 != null) {
                final JSONArray jsonArray1 = (JSONArray)jsonObjectResult1.get((Object)"data");
                final List<UWBHistoryInfo> list1 = (List<UWBHistoryInfo>)jsonArray1.toJavaList((Class)UWBHistoryInfo.class);
@@ -717,7 +717,7 @@
        final ResponseEntity<String> responseEntity2 = (ResponseEntity<String>)restTemplate.postForEntity(this.configInfo.getGPS_Historylocation()+   "?apikey=" +  this.configInfo.getApikey(), (Object)httpEntity, (Class)String.class, new Object[0]);
        final String body2 = (String)responseEntity2.getBody();
        final JSONObject jsonObjectResult2 = JSONObject.parseObject(body2);
        System.out.println(jsonObjectResult2.get((Object)"data"));
        //System.out.println(jsonObjectResult2.get((Object)"data"));
        final JSONObject object = (JSONObject)jsonObjectResult2.get((Object)"data");
        if (object != null) {
            final JSONArray jsonArray2 = (JSONArray)object.get((Object)"statisticList");