|
|
@@ -1,16 +1,30 @@
|
|
|
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.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.utils.cache.UrlCache;
|
|
|
+import com.java110.utils.util.Assert;
|
|
|
import com.java110.vo.ResultVo;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.http.HttpMethod;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -25,9 +39,26 @@ public class ZhongkongDianBiaoFactoryAdaptImpl implements ISmartMeterFactoryAdap
|
|
|
|
|
|
private static final String READ_URL = "http://watergateway.dev.mj.ink:9900/mjkj-water/mjkj/open/wy/get/amount";
|
|
|
|
|
|
+ private static final String READS_URL = "http://watergateway.dev.mj.ink:9900/mjkj-water/mjkj/open/wy/get/lastNum";
|
|
|
+
|
|
|
+ private static final String NOTIFY_URL = "/app/smartMeter/notify/ZhongkongDianBiaoFactoryAdaptImpl/992020051967020024";
|
|
|
+
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IMeterMachineSpecV1InnerServiceSMO meterMachineSpecV1InnerServiceSMOImpl;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private IMeterMachineDetailV1InnerServiceSMO meterMachineDetailV1InnerServiceSMOImpl;
|
|
|
+
|
|
|
@Autowired
|
|
|
private IPayFeeConfigV1InnerServiceSMO feeConfigV1InnerServiceSMOImpl;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private IMeterMachineV1InnerServiceSMO meterMachineV1InnerServiceSMOImpl;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ISmartMeterCoreRead smartMeterCoreReadImpl;
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public ResultVo requestRecharge(MeterMachineDto meterMachineDto, double degree, double money) {
|
|
|
@@ -75,11 +106,77 @@ public class ZhongkongDianBiaoFactoryAdaptImpl implements ISmartMeterFactoryAdap
|
|
|
|
|
|
@Override
|
|
|
public ResultVo requestReads(List<MeterMachineDto> meterMachineDtos) {
|
|
|
- return null;
|
|
|
+
|
|
|
+ List<Map<String, Object>> req = new ArrayList<>();
|
|
|
+ List<MeterMachineDetailPo> meterMachineDetailPos = new ArrayList<>();
|
|
|
+ String detailId = "";
|
|
|
+ List<String> bhLists = new ArrayList<>();
|
|
|
+ for (MeterMachineDto meterMachineDto : meterMachineDtos) {
|
|
|
+ bhLists.add(meterMachineDto.getAddress());
|
|
|
+ MeterMachineDetailPo meterMachineDetailPo = new MeterMachineDetailPo();
|
|
|
+ meterMachineDetailPo.setCommunityId(meterMachineDto.getCommunityId());
|
|
|
+ meterMachineDetailPo.setDetailId(detailId);
|
|
|
+ meterMachineDetailPo.setMachineId(meterMachineDto.getMachineId());
|
|
|
+ meterMachineDetailPo.setDetailType(meterMachineDto.getMachineModel()); // 抄表
|
|
|
+ meterMachineDetailPo.setCurDegrees(meterMachineDto.getCurDegrees());
|
|
|
+ meterMachineDetailPo.setCurReadingTime(meterMachineDto.getCurReadingTime());
|
|
|
+ meterMachineDetailPo.setPrestoreDegrees(meterMachineDto.getPrestoreDegrees());
|
|
|
+ meterMachineDetailPo.setState(MeterMachineDetailDto.STATE_W);
|
|
|
+ meterMachineDetailPos.add(meterMachineDetailPo);
|
|
|
+ }
|
|
|
+
|
|
|
+ Map reqParams = new HashMap();
|
|
|
+ reqParams.put("callbackUrl",UrlCache.getOwnerUrl() + NOTIFY_URL);
|
|
|
+ reqParams.put("bhList",bhLists);
|
|
|
+ String request_content = JSON.toJSONString(req);
|
|
|
+
|
|
|
+ String response = WyRequestUtils.execute(READS_URL, reqParams, HttpMethod.GET);
|
|
|
+
|
|
|
+ JSONObject paramOut = JSONObject.parseObject(response);
|
|
|
+
|
|
|
+ if (paramOut.getIntValue("code") != 200) {
|
|
|
+ return new ResultVo(ResultVo.CODE_ERROR, paramOut.getString("msg"));
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+ if (meterMachineDetailPos.size() > 0) {
|
|
|
+ meterMachineDetailV1InnerServiceSMOImpl.saveMeterMachineDetails(meterMachineDetailPos);
|
|
|
+ }
|
|
|
+
|
|
|
+ return new ResultVo(ResultVo.CODE_OK, "请求已发送,等待电表反馈数据");
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public ResultVo notifyReadData(String readData) {
|
|
|
- return null;
|
|
|
+
|
|
|
+ JSONObject data = JSONObject.parseObject(readData);
|
|
|
+
|
|
|
+ MeterMachineDto meterMachineDto = new MeterMachineDto();
|
|
|
+ meterMachineDto.setAddress(data.getString("bh"));
|
|
|
+ List<MeterMachineDto> meterMachineDtos = meterMachineV1InnerServiceSMOImpl.queryMeterMachines(meterMachineDto);
|
|
|
+ Assert.listOnlyOne(meterMachineDtos,"表不存在");
|
|
|
+
|
|
|
+ MeterMachineDetailDto meterMachineDetailDto = new MeterMachineDetailDto();
|
|
|
+ meterMachineDetailDto.setCommunityId(meterMachineDtos.get(0).getCommunityId());
|
|
|
+ meterMachineDetailDto.setMachineId(meterMachineDtos.get(0).getMachineId());
|
|
|
+ meterMachineDetailDto.setState(MeterMachineDetailDto.STATE_W);
|
|
|
+ List<MeterMachineDetailDto> meterMachineDetailDtos = meterMachineDetailV1InnerServiceSMOImpl.queryMeterMachineDetails(meterMachineDetailDto);
|
|
|
+ if (meterMachineDetailDtos == null || meterMachineDetailDtos.size() < 1) {
|
|
|
+ return new ResultVo(ResultVo.CODE_ERROR, "没有数据");
|
|
|
+ }
|
|
|
+
|
|
|
+ String batchId = smartMeterCoreReadImpl.generatorBatch(meterMachineDetailDtos.get(0).getCommunityId());
|
|
|
+ doBusiness(data, batchId,meterMachineDetailDtos);
|
|
|
+
|
|
|
+ return new ResultVo(ResultVo.CODE_OK, "成功");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
+ private void doBusiness(JSONObject contentObject, String batchId, List<MeterMachineDetailDto> meterMachineDetailDtos) {
|
|
|
+
|
|
|
+ double degree = contentObject.getDoubleValue("bqds");
|
|
|
+
|
|
|
+ smartMeterCoreReadImpl.saveMeterAndCreateFee(meterMachineDetailDtos.get(0), degree + "", batchId);
|
|
|
}
|
|
|
}
|