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/owner/DeleteOwnerToIotAdapt.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/DeleteOwnerToIotAdapt.java b/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/DeleteOwnerToIotAdapt.java
old mode 100644
new mode 100755
index a760af8..cf47e76
--- a/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/DeleteOwnerToIotAdapt.java
+++ b/service-job/src/main/java/com/java110/job/adapt/hcIot/owner/DeleteOwnerToIotAdapt.java
@@ -25,6 +25,7 @@
import com.java110.job.adapt.DatabusAdaptImpl;
import com.java110.job.adapt.hcIot.asyn.IIotSendAsyn;
import com.java110.po.owner.OwnerPo;
+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;
@@ -47,6 +48,9 @@
private IIotSendAsyn hcMachineAsynImpl;
@Autowired
IMachineInnerServiceSMO machineInnerServiceSMOImpl;
+
+ @Autowired
+ private IOwnerInnerServiceSMO ownerInnerServiceSMOImpl;
/**
@@ -83,7 +87,12 @@
OwnerPo ownerPo = BeanConvertUtil.covertBean(businessOwner, OwnerPo.class);
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setStatusCd(StatusConstant.STATUS_CD_INVALID);
+ ownerDto.setMemberId(ownerPo.getMemberId());
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
+ Assert.listOnlyOne(ownerDtos, "鏈壘鍒板垹闄ょ殑涓氫富淇℃伅");
//鎷垮埌灏忓尯ID
String communityId = ownerPo.getCommunityId();
//鏍规嵁灏忓尯ID鏌ヨ鐜版湁璁惧
@@ -94,7 +103,6 @@
locationObjIds.add(communityId);
machineDto.setLocationObjIds(locationObjIds.toArray(new String[locationObjIds.size()]));
List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
- Assert.listOnlyOne(machineDtos, "鏈壘鍒拌澶�");
for (MachineDto tmpMachineDto : machineDtos) {
if (!"9999".equals(tmpMachineDto.getMachineTypeCd())) {
continue;
@@ -102,7 +110,7 @@
JSONObject postParameters = new JSONObject();
postParameters.put("machineCode", tmpMachineDto.getMachineCode());
postParameters.put("userId", ownerPo.getMemberId());
- postParameters.put("name", ownerPo.getName());
+ postParameters.put("name", ownerDtos.get(0).getName());
postParameters.put("extMachineId", tmpMachineDto.getMachineId());
postParameters.put("extCommunityId", tmpMachineDto.getCommunityId());
hcMachineAsynImpl.sendDeleteOwner(postParameters);
--
Gitblit v1.8.0