From b09e1a8b036553d1e161d127aa738a504593490a Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期三, 19 二月 2020 12:14:55 +0800
Subject: [PATCH] 优化巡检路线查询sql
---
HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachineChangeMachine.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachineChangeMachine.java b/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachineChangeMachine.java
index 0044dd7..dfb2165 100644
--- a/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachineChangeMachine.java
+++ b/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachineChangeMachine.java
@@ -20,6 +20,7 @@
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -30,7 +31,7 @@
*/
public class TranslateOwnerToMachineChangeMachine implements Runnable {
Logger logger = LoggerFactory.getLogger(TranslateOwnerToMachineChangeMachine.class);
- public static final long DEFAULT_WAIT_SECOND = 1000 * 60 ; // 榛樿30绉掓墽琛屼竴娆�
+ public static final long DEFAULT_WAIT_SECOND = 1000 * 60; // 榛樿30绉掓墽琛屼竴娆�
public static boolean TRANSLATE_STATE = false;
private IOrderInnerServiceSMO orderInnerServiceSMOImpl;
@@ -86,7 +87,10 @@
logger.debug("娌℃湁鏁版嵁鏁版嵁鐩存帴鍒蜂负C1" + JSONObject.toJSONString(tmpOrderDto));
continue;
}
- dealData(tmpOrderDto, machineDtos.get(0));
+ if (!"9996".equals(machineDtos.get(0).getMachineTypeCd())) {
+ dealData(tmpOrderDto, machineDtos.get(0));
+ }
+
//鍒锋柊 鐘舵�佷负C1
orderInnerServiceSMOImpl.updateBusinessStatusCd(tmpOrderDto);
} catch (Exception e) {
@@ -120,6 +124,9 @@
roomDto.setUnitId(machineDto.getLocationObjId());
roomDto.setCommunityId(machineDto.getCommunityId());
List<RoomDto> roomDtos = roomInnerServiceSMOImpl.queryRooms(roomDto);
+ if (roomDtos == null || roomDtos.size() == 0) { // 鍗曞厓涓嬫病鏈夋埧灞�
+ return;
+ }
ownerDto.setRoomIds(getRoomIds(roomDtos));
ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
} else if ("3000".equals(locationTypeCd)) {// 3000 鎴垮眿闂�
@@ -131,10 +138,11 @@
return;
}
for (OwnerDto tmpOwnerDto : ownerDtos) {
- if (BusinessTypeConstant.BUSINESS_TYPE_SAVE_MACHINE.equals(tmpOrderDto.getBusinessTypeCd())) {
+ if (BusinessTypeConstant.BUSINESS_TYPE_SAVE_MACHINE.equals(tmpOrderDto.getBusinessTypeCd())
+ || BusinessTypeConstant.BUSINESS_TYPE_UPDATE_MACHINE.equals(tmpOrderDto.getBusinessTypeCd())) {
saveMachineTranslate(machineDto, tmpOwnerDto);
- } else if (BusinessTypeConstant.BUSINESS_TYPE_UPDATE_MACHINE.equals(tmpOrderDto.getBusinessTypeCd())) {
- updateMachineTranslate(machineDto, tmpOwnerDto);
+// } else if (BusinessTypeConstant.BUSINESS_TYPE_UPDATE_MACHINE.equals(tmpOrderDto.getBusinessTypeCd())) {
+// updateMachineTranslate(machineDto, tmpOwnerDto);
} else if (BusinessTypeConstant.BUSINESS_TYPE_DELETE_MACHINE.equals(tmpOrderDto.getBusinessTypeCd())) {
deleteMachineTranslate(machineDto, tmpOwnerDto);
} else {
@@ -184,7 +192,9 @@
info.put("objId", ownerDto.getMemberId());
info.put("state", "10000");
info.put("communityId", ownerDto.getCommunityId());
+ info.put("updateTime", new Date());
machineTranslateServiceDaoImpl.updateMachineTranslate(info);
+
}
@@ -195,6 +205,8 @@
info.put("objId", ownerDto.getMemberId());
info.put("statusCd", StatusConstant.STATUS_CD_INVALID);
info.put("communityId", ownerDto.getCommunityId());
+ info.put("updateTime", new Date());
+
machineTranslateServiceDaoImpl.updateMachineTranslate(info);
}
--
Gitblit v1.8.0