From a817bda05258028b5621b8818abb5fe4d73a7b5e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 28 一月 2020 19:14:03 +0800
Subject: [PATCH] 将apache 的 对象属性拷贝改为 cglib的 因为Apache的性能不行
---
HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachineChangeMachine.java | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 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 6c701ab..dfb2165 100644
--- a/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachineChangeMachine.java
+++ b/HardwareAdapationService/src/main/java/com/java110/hardwareAdapation/thread/TranslateOwnerToMachineChangeMachine.java
@@ -6,7 +6,7 @@
import com.java110.core.smo.order.IOrderInnerServiceSMO;
import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
import com.java110.core.smo.room.IRoomInnerServiceSMO;
-import com.java110.dto.OwnerDto;
+import com.java110.dto.owner.OwnerDto;
import com.java110.dto.RoomDto;
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.dto.order.OrderDto;
@@ -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 = 5000 * 6; // 榛樿30绉掓墽琛屼竴娆�
+ public static final long DEFAULT_WAIT_SECOND = 1000 * 60; // 榛樿30绉掓墽琛屼竴娆�
public static boolean TRANSLATE_STATE = false;
private IOrderInnerServiceSMO orderInnerServiceSMOImpl;
@@ -74,6 +75,7 @@
OrderDto orderDto = new OrderDto();
List<OrderDto> orderDtos = orderInnerServiceSMOImpl.queryMachineOrders(orderDto);
for (OrderDto tmpOrderDto : orderDtos) {
+ logger.debug("寮�濮嬪鐞嗚鍗�" + JSONObject.toJSONString(tmpOrderDto));
try {
//鏍规嵁bId 鏌ヨ纭欢淇℃伅
machineDto = new MachineDto();
@@ -85,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) {
@@ -117,7 +122,11 @@
//鍏堟牴鎹崟鍏冮棬ID 鏌ヨ 鎴垮眿
RoomDto roomDto = new RoomDto();
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 鎴垮眿闂�
@@ -129,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 {
@@ -182,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);
+
}
@@ -193,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