From becf30a6c86cd9306c63360785511d93e7bcb15d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Sun, 7 May 2023 20:45:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=B7=E8=A1=A8=E7=9A=AE?=
=?UTF-8?q?=E8=82=A4=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../xhx/daemon/task/SyncSiteDeviceTaskImpl.java | 2 ++
.../device/service/impl/DeviceServiceImpl.java | 13 ++-----------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java b/sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
index daea136..b12af2f 100644
--- a/sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
+++ b/sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
@@ -92,6 +92,8 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
}).collect(Collectors.toList());
List<DeviceEntity> oldDeviceList = deviceService.find(new DeviceQuery().siteId(site.getId()));
+ log.info("siteId:{} oldDeviceList size锛歿}",site.getId(), oldDeviceList.size());
+
Map<String, DeviceEntity> oldDeviceMap = oldDeviceList.stream().collect(Collectors.toMap(x -> x.getDeviceCode(), y -> y, (o, n) -> n));
Map<String, DeviceEntity> newDeviceMap = newDeviceList.stream().collect(Collectors.toMap(x -> x.getDeviceCode(), y -> y, (o, n) -> n));
diff --git a/sample-form-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java b/sample-form-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
index 5ed34ad..0a7905a 100644
--- a/sample-form-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
+++ b/sample-form-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
@@ -1,14 +1,10 @@
package com.mortals.xhx.module.device.service.impl;
-import com.mortals.xhx.module.matter.service.MatterDatumService;
-import com.mortals.xhx.module.matter.service.MatterService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
-import com.mortals.framework.exception.AppException;
-import com.mortals.framework.model.Context;
import com.mortals.xhx.module.device.dao.DeviceDao;
import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.service.DeviceService;
+import org.springframework.stereotype.Service;
/**
* DeviceService
* 璁惧 service瀹炵幇
@@ -19,9 +15,4 @@ import com.mortals.xhx.module.device.service.DeviceService;
@Service("deviceService")
public class DeviceServiceImpl extends AbstractCRUDServiceImpl<DeviceDao, DeviceEntity, Long> implements DeviceService {
- @Autowired
- private MatterService matterService;
- @Autowired
- private MatterDatumService matterDatumService;
-
}
\ No newline at end of file
--
2.24.3