[功能修复]优化上报

readme.txt

@@ -8,4 +8,12 @@
 4. docker rmi device-link-ykc删除镜像
 5. 更换路径\wgd\docker-compose\ykc-jar路径下的jar包
 6. \wgd\docker-compose路径下重新构建启动项目docker-compose up -d --build device-link-ykc
-7. 启动完成查看日志docker logs -f -n100 device-link-ykc或在\wgd\docker-compose\logs目录中查看日志tail -f -n100 YKC-info.log
+7. 启动完成查看日志docker logs -f -n100 device-link-ykc或在\wgd\docker-compose\logs目录中查看日志tail -f -n100 YKC-info.log
+
+
+
+docker stop device-link-ykc
+docker rm device-link-ykc
+docker rmi device-link-ykc
+
+docker-compose up -d --build device-link-ykc

src/main/java/com/tmzn/devicelinkykc/frameMsg/TransMoney.java

@@ -83,7 +83,8 @@ public class TransMoney {
         map.put("endTime",(endTime+5*1000)/1000);
         JSONObject jsonObject = new JSONObject(map);
         String s = jsonObject.toString();
-        log.info("后台计费请求参数>>>>"+s);
+        String billUrl = "http://wetiandi.com/app/index.php?i=1&j=1&c=auth&a=calculate_cost_new&do=compute_elec_all";
+        log.info("后台计费请求参数>>>>{}"+s,billUrl);
         //String url = "http://your-api-url.com/post";
 //        og.info("后台计费请求参数>>>>"+json);
         //final String url = "http://your-api-url.com/post"; // 替换成您的API URL
@@ -101,7 +102,7 @@ public class TransMoney {
 
         // 创建请求
         Request request = new Request.Builder()
-                .url(url)
+                .url(billUrl)
                 .post(formBuilder.build())
                 .build();
 
@@ -140,13 +141,17 @@ public class TransMoney {
                     transData.put("elec2",parseObjectJSONObject.getBigDecimal("elec2").divide(precise,4,BigDecimal.ROUND_DOWN));
                     transData.put("elec3",parseObjectJSONObject.getBigDecimal("elec3").divide(precise,4,BigDecimal.ROUND_DOWN));
                     transData.put("elec4",parseObjectJSONObject.getBigDecimal("elec4").divide(precise,4,BigDecimal.ROUND_DOWN));
-                    transData.put("elec5",parseObjectJSONObject.getBigDecimal("elec5").divide(precise,4,BigDecimal.ROUND_DOWN));
                     transData.put("money",parseObjectJSONObject.getBigDecimal("money").divide(precise,4,BigDecimal.ROUND_DOWN));
                     transData.put("money1",parseObjectJSONObject.getBigDecimal("money1").divide(precise,4,BigDecimal.ROUND_DOWN));
                     transData.put("money2",parseObjectJSONObject.getBigDecimal("money2").divide(precise,4,BigDecimal.ROUND_DOWN));
                     transData.put("money3",parseObjectJSONObject.getBigDecimal("money3").divide(precise,4,BigDecimal.ROUND_DOWN));
                     transData.put("money4",parseObjectJSONObject.getBigDecimal("money4").divide(precise,4,BigDecimal.ROUND_DOWN));
-                    transData.put("money5",parseObjectJSONObject.getBigDecimal("money5").divide(precise,4,BigDecimal.ROUND_DOWN));
+                    if(parseObjectJSONObject.containsKey("elec5")){
+                        transData.put("elec5",parseObjectJSONObject.getBigDecimal("elec5").divide(precise,4,BigDecimal.ROUND_DOWN));
+                    }
+                    if(parseObjectJSONObject.containsKey("money5")){
+                        transData.put("money5",parseObjectJSONObject.getBigDecimal("money5").divide(precise,4,BigDecimal.ROUND_DOWN));
+                    }
                     return transData;
                 }
             }catch (Exception e){

src/main/java/com/tmzn/devicelinkykc/taskQueue/runner/MsgCharngingRunner.java

@@ -255,7 +255,7 @@ public class MsgCharngingRunner {
         if (elec.equals(new BigDecimal("0.0000"))) {
             elec = elec.add(new BigDecimal("0.0001").setScale(4, BigDecimal.ROUND_DOWN));
         }
-        log.info("{}-{}充电中=>实时elec>>>" + elec,orderStatus.getPileCode(),orderStatus.getGunsCode());
+        log.info("{}-{}充电中=>实时elec>>>实时金额>>>{}" + elec,orderStatus.getPileCode(),orderStatus.getGunsCode(),money);
 
         //????????????????????????????
         if (money.compareTo(orderStatus.getStartMoney()) > 0) {