From 9943c60aca4c93600e54479d919d377e08a12ef4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 10 十二月 2020 21:58:26 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-job/src/main/java/com/java110/job/adapt/ximoIot/XimoDeleteMachineTransactionIotAdapt.java | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/ximoIot/XimoDeleteMachineTransactionIotAdapt.java b/service-job/src/main/java/com/java110/job/adapt/ximoIot/XimoDeleteMachineTransactionIotAdapt.java
index c4b7dd6..60bbfa5 100644
--- a/service-job/src/main/java/com/java110/job/adapt/ximoIot/XimoDeleteMachineTransactionIotAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/ximoIot/XimoDeleteMachineTransactionIotAdapt.java
@@ -21,10 +21,8 @@
import com.java110.entity.order.Business;
import com.java110.intf.common.IMachineInnerServiceSMO;
import com.java110.job.adapt.DatabusAdaptImpl;
-import com.java110.job.adapt.IDatabusAdapt;
import com.java110.job.adapt.ximoIot.asyn.IXimoMachineAsyn;
import com.java110.po.machine.MachinePo;
-import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -39,7 +37,7 @@
* @desc add by 鍚村鏂� 18:58
*/
@Component(value = "ximoDeleteMachineTransactionIotAdapt")
-public class XimoDeleteMachineTransactionIotAdapt extends DatabusAdaptImpl {
+public class XimoDeleteMachineTransactionIotAdapt extends DatabusAdaptImpl {
@Autowired
private IXimoMachineAsyn ximoMachineAsynImpl;
@@ -68,7 +66,7 @@
if (bObj instanceof JSONObject) {
businessMachines = new JSONArray();
businessMachines.add(bObj);
- } else if (bObj instanceof List) {
+ } else if (bObj instanceof List) {
businessMachines = JSONArray.parseArray(JSONObject.toJSONString(bObj));
} else {
businessMachines = (JSONArray) bObj;
@@ -86,15 +84,15 @@
MachinePo machinePo = BeanConvertUtil.covertBean(businessMachine, MachinePo.class);
MachineDto machineDto = new MachineDto();
machineDto.setMachineId(machinePo.getMachineId());
- List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
-
- Assert.listOnlyOne(machineDtos, "鏈壘鍒拌澶�");
+// List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
+//
+// Assert.listOnlyOne(machineDtos, "鏈壘鍒拌澶�");
MultiValueMap<String, Object> postParameters = new LinkedMultiValueMap<>();
- postParameters.add("extCommunityUuid", machineDtos.get(0));
- //postParameters.add("devSn", machinePo.getMachineCode());
- postParameters.add("uuids", machinePo.getMachineId());
+ postParameters.add("extCommunityUuid", machinePo.getCommunityId());
+ postParameters.add("devSns", machinePo.getMachineCode());
+ //postParameters.add("uuids", machinePo.getMachineId());
ximoMachineAsynImpl.deleteSend(postParameters);
}
}
--
Gitblit v1.8.0