From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/smartMeter/factory/zhongkong/ZhongkongDianBiaoFactoryAdaptImpl.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/smartMeter/factory/zhongkong/ZhongkongDianBiaoFactoryAdaptImpl.java b/service-common/src/main/java/com/java110/common/smartMeter/factory/zhongkong/ZhongkongDianBiaoFactoryAdaptImpl.java
index 04105e6..d9b9644 100644
--- a/service-common/src/main/java/com/java110/common/smartMeter/factory/zhongkong/ZhongkongDianBiaoFactoryAdaptImpl.java
+++ b/service-common/src/main/java/com/java110/common/smartMeter/factory/zhongkong/ZhongkongDianBiaoFactoryAdaptImpl.java
@@ -1,21 +1,17 @@
package com.java110.common.smartMeter.factory.zhongkong;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.common.smartMeter.ISmartMeterCoreRead;
import com.java110.common.smartMeter.ISmartMeterFactoryAdapt;
-import com.java110.common.smartMeter.factory.tqdianbiao.TdDianBiaoUtil;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.fee.FeeConfigDto;
-import com.java110.dto.meterMachine.MeterMachineDetailDto;
-import com.java110.dto.meterMachine.MeterMachineDto;
-import com.java110.dto.meterMachine.MeterMachineSpecDto;
+import com.java110.dto.meter.MeterMachineDetailDto;
+import com.java110.dto.meter.MeterMachineDto;
import com.java110.intf.common.IMeterMachineDetailV1InnerServiceSMO;
import com.java110.intf.common.IMeterMachineSpecV1InnerServiceSMO;
import com.java110.intf.common.IMeterMachineV1InnerServiceSMO;
import com.java110.intf.fee.IPayFeeConfigV1InnerServiceSMO;
-import com.java110.po.meterMachineDetail.MeterMachineDetailPo;
+import com.java110.po.meter.MeterMachineDetailPo;
import com.java110.utils.cache.UrlCache;
import com.java110.utils.util.Assert;
import com.java110.vo.ResultVo;
@@ -35,13 +31,14 @@
@Service("zhongkongDianBiaoFactoryAdaptImpl")
public class ZhongkongDianBiaoFactoryAdaptImpl implements ISmartMeterFactoryAdapt {
- private static final String RECHARGE_URL = "http://watergateway.dev.mj.ink:9900/mjkj-water/mjkj/open/wy/recharge";
- private static final String READ_URL = "http://watergateway.dev.mj.ink:9900/mjkj-water/mjkj/open/wy/get/amount";
+ private static final String RECHARGE_URL = "http://www.zhckxt.com/api/mjkj-water/mjkj/open/wy/recharge";
- private static final String READS_URL = "http://watergateway.dev.mj.ink:9900/mjkj-water/mjkj/open/wy/get/lastNum";
+ private static final String READ_URL = "http://www.zhckxt.com/api/mjkj-water/mjkj/open/wy/get/amount";
- private static final String NOTIFY_URL = "/app/smartMeter/notify/ZhongkongDianBiaoFactoryAdaptImpl/992020051967020024";
+ private static final String READS_URL = "http://www.zhckxt.com/api/mjkj-water/mjkj/open/wy/get/lastNum";
+
+ private static final String NOTIFY_URL = "/app/smartMeter/notify/zhongkongDianBiaoFactoryAdaptImpl/992020051967020024";
@Autowired
@@ -112,6 +109,7 @@
String detailId = "";
List<String> bhLists = new ArrayList<>();
for (MeterMachineDto meterMachineDto : meterMachineDtos) {
+ detailId = GenerateCodeFactory.getGeneratorId("11");
bhLists.add(meterMachineDto.getAddress());
MeterMachineDetailPo meterMachineDetailPo = new MeterMachineDetailPo();
meterMachineDetailPo.setCommunityId(meterMachineDto.getCommunityId());
@@ -129,7 +127,7 @@
reqParams.put("callbackUrl",UrlCache.getOwnerUrl() + NOTIFY_URL);
reqParams.put("bhList",bhLists);
- String response = WyRequestUtils.executeReads(READS_URL, reqParams, HttpMethod.GET);
+ String response = WyRequestUtils.executeReads(READS_URL, reqParams, HttpMethod.POST);
JSONObject paramOut = JSONObject.parseObject(response);
--
Gitblit v1.8.0