Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

Your Name

2023-05-08 3fe2aea7827eafc7513159db9a337fdf567584c8

 service-common/src/main/java/com/java110/common/smartMeter/factory/zhongkong/ZhongkongDianBiaoFactoryAdaptImpl.java

@@ -35,13 +35,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 +113,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 +131,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);