|
@@ -27,10 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
import org.springframework.beans.factory.annotation.Qualifier;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
-import java.util.ArrayList;
|
|
|
|
|
-import java.util.List;
|
|
|
|
|
-import java.util.Map;
|
|
|
|
|
-import java.util.Objects;
|
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
|
|
|
|
|
|
|
@Service
|
|
@Service
|
|
@@ -102,7 +99,7 @@ public class OpenDeviceServiceImpl implements OpenDeviceService {
|
|
|
device.setSecret(secret.toString());
|
|
device.setSecret(secret.toString());
|
|
|
device.setTenantId(product.getTenantId());
|
|
device.setTenantId(product.getTenantId());
|
|
|
device.setCreateDept(deptId);
|
|
device.setCreateDept(deptId);
|
|
|
- device.setState(new DeviceInfo.State(false, null, null));
|
|
|
|
|
|
|
+ device.setState(new DeviceInfo.State(true, new Date().getTime(), null));
|
|
|
// device.setLocate(new DeviceInfo.Locate(deviceInfo.getLongitude(),deviceInfo.getLatitude()));
|
|
// device.setLocate(new DeviceInfo.Locate(deviceInfo.getLongitude(),deviceInfo.getLatitude()));
|
|
|
device.setCreateAt(System.currentTimeMillis());
|
|
device.setCreateAt(System.currentTimeMillis());
|
|
|
if (StringUtils.isNotBlank(parentId)) {
|
|
if (StringUtils.isNotBlank(parentId)) {
|