From 4fed835684fa0e06edcfc61283ad047d0fe6364e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 25 二月 2020 00:14:22 +0800
Subject: [PATCH] 优化设备问题
---
HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachine.java | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachine.java b/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachine.java
index fdc2ffb..932dace 100644
--- a/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachine.java
+++ b/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachine.java
@@ -22,10 +22,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 浠庤鍗曚腑鍚屾涓氫富淇℃伅鑷宠澶囦腑闂磋〃
@@ -87,15 +84,27 @@
OwnerRoomRelDto ownerRoomRelDto = new OwnerRoomRelDto();
ownerRoomRelDto.setbId(tmpOrderDto.getbId());
List<OwnerRoomRelDto> ownerRoomRelDtos = ownerRoomRelInnerServiceSMOImpl.queryOwnerRoomRels(ownerRoomRelDto);
- Assert.listOnlyOne(ownerRoomRelDtos, "鏁版嵁閿欒 涓氫富鎴垮眿鍏崇郴鏈壘鍒帮紝鎴栨壘鍒板鏉�");
+ Assert.listOnlyOne(ownerRoomRelDtos, "鏁版嵁閿欒 涓氫富鎴垮眿鍏崇郴鏈壘鍒帮紝鎴栨壘鍒板鏉�" + JSONObject.toJSONString(tmpOrderDto));
ownerDto.setOwnerId(ownerRoomRelDtos.get(0).getOwnerId());
} else {
ownerDto.setbId(tmpOrderDto.getbId());
}
+ List<OwnerDto> ownerDtos = null;
//鏍规嵁bId 鏌ヨ涓氫富淇℃伅
+ //杩欑鎯呭喌璇存槑 涓氫富宸茬粡鍒犳帀浜� 闇�瑕佹煡璇㈢姸鎬佷负 1 鐨勬暟鎹�
+ if(BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())){
+ ownerDto.setStatusCd(StatusConstant.STATUS_CD_INVALID);
+ ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
+ MachineDto machineDto = new MachineDto();
+ machineDto.setMachineId("");
+ deleteMachineTranslate(machineDto,ownerDtos.get(0));
+ orderInnerServiceSMOImpl.updateBusinessStatusCd(tmpOrderDto);
+ logger.debug("娌℃湁鏁版嵁鏁版嵁鐩存帴鍒蜂负C1,褰撳墠涓哄垹闄や笟涓绘搷浣�" + JSONObject.toJSONString(tmpOrderDto));
+ continue;
+ }
- List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
+ ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
// 鎴垮眿淇℃伅
if (ownerDtos == null || ownerDtos.size() == 0) {
@@ -145,11 +154,15 @@
for (OwnerDto ownerDto : ownerDtos) {
for (MachineDto tmpMachineDto : machineDtos) {
+ if("9996".equals(tmpMachineDto.getMachineTypeCd())){
+ continue;
+ }
if (BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())
- || BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_ROOM_REL.equals(tmpOrderDto.getBusinessTypeCd())) {
+ || BusinessTypeConstant.BUSINESS_TYPE_SAVE_OWNER_ROOM_REL.equals(tmpOrderDto.getBusinessTypeCd())
+ || BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())) {
saveMachineTranslate(tmpMachineDto, ownerDto);
- } else if (BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())) {
- updateMachineTranslate(tmpMachineDto, ownerDto);
+// } else if (BusinessTypeConstant.BUSINESS_TYPE_UPDATE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())) {
+// updateMachineTranslate(tmpMachineDto, ownerDto);
} else if (BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_INFO.equals(tmpOrderDto.getBusinessTypeCd())
|| BusinessTypeConstant.BUSINESS_TYPE_DELETE_OWNER_ROOM_REL.equals(tmpOrderDto.getBusinessTypeCd())
) {
@@ -167,6 +180,7 @@
Map paramInfo = new HashMap();
paramInfo.put("machineId", tmpMachineDto.getMachineId());
paramInfo.put("objId", ownerDto.getMemberId());
+ paramInfo.put("statusCd", "0");
int count = machineTranslateServiceDaoImpl.queryMachineTranslatesCount(paramInfo);
if (count > 0) {
@@ -195,6 +209,7 @@
info.put("objId", ownerDto.getMemberId());
info.put("state", "10000");
info.put("communityId", ownerDto.getCommunityId());
+ info.put("updateTime", new Date());
machineTranslateServiceDaoImpl.updateMachineTranslate(info);
}
--
Gitblit v1.8.0