From 28e7d3937f819a3486b22bfa1c84aee172aaccb4 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 17 一月 2022 17:46:42 +0800
Subject: [PATCH] 优化代码
---
service-job/src/main/java/com/java110/job/adapt/hcIot/machine/DeleteMachineToIotAdapt.java | 34 ++++++++++++++--------------------
1 files changed, 14 insertions(+), 20 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/machine/DeleteMachineToIotAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/machine/DeleteMachineToIotAdapt.java
old mode 100644
new mode 100755
index cd4f782..f98b976
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/machine/DeleteMachineToIotAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/machine/DeleteMachineToIotAdapt.java
@@ -23,11 +23,11 @@
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
import com.java110.po.machine.MachinePo;
+import com.java110.utils.constant.StatusConstant;
+import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
import java.util.List;
@@ -48,13 +48,9 @@
IMachineInnerServiceSMO machineInnerServiceSMOImpl;
/**
- * accessToken={access_token}
- * &extCommunityUuid=01000
- * &extCommunityId=1
- * &devSn=111111111
- * &name=璁惧鍚嶇О
- * &positionType=0
- * &positionUuid=1
+ * {
+ * "extMachineId": "702020042194860037"
+ * }
*
* @param business 褰撳墠澶勭悊涓氬姟
* @param businesses 鎵�鏈変笟鍔′俊鎭�
@@ -82,19 +78,17 @@
}
private void doSendMachine(Business business, JSONObject businessMachine) {
-
MachinePo machinePo = BeanConvertUtil.covertBean(businessMachine, MachinePo.class);
MachineDto machineDto = new MachineDto();
machineDto.setMachineId(machinePo.getMachineId());
-// List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
-//
-// Assert.listOnlyOne(machineDtos, "鏈壘鍒拌澶�");
-
- MultiValueMap<String, Object> postParameters = new LinkedMultiValueMap<>();
-
- postParameters.add("extCommunityUuid", machinePo.getCommunityId());
- postParameters.add("devSns", machinePo.getMachineCode());
- //postParameters.add("uuids", machinePo.getMachineId());
- hcMachineAsynImpl.deleteSend(postParameters);
+ machineDto.setStatusCd(StatusConstant.STATUS_CD_INVALID);
+ List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
+ Assert.listOnlyOne(machineDtos, "鏈壘鍒拌澶�");
+ JSONObject postParameters = new JSONObject();
+ postParameters.put("extMachineId", machinePo.getMachineId());
+ postParameters.put("machineCode", machineDtos.get(0).getMachineCode());
+ postParameters.put("machineName", machineDtos.get(0).getMachineName());
+ postParameters.put("extCommunityId", machineDtos.get(0).getCommunityId());
+ hcMachineAsynImpl.deleteMachine(postParameters);
}
}
--
Gitblit v1.8.0