更新！

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/iotCenter/DeviceSyncController.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/devices/DeviceSyncController.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.controller.iotCenter;
+package com.zhongshu.card.server.core.controller.devices;
 
 import com.github.microservice.models.device.DeviceSyncListParam;
 import com.github.microservice.models.device.GateWaySyncParam;

FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/iotCenter/package-info.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/devices/package-info.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.controller.iotCenter;
+package com.zhongshu.card.server.core.controller.devices;
 /**
  * 物联网发过来的请求
  * 如：设备同步、权限验证登接口

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/DeviceBindDao.java

@@ -2,11 +2,7 @@ package com.zhongshu.card.server.core.dao.school;
 
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
 import com.zhongshu.card.server.core.dao.school.extend.DeviceBindDaoExtend;
-import com.zhongshu.card.server.core.dao.school.extend.DeviceInfoDaoExtend;
-import com.zhongshu.card.server.core.domain.org.DeviceInfo;
-import com.zhongshu.card.server.core.domain.school.DeviceBind;
-
-import java.util.List;
+import com.zhongshu.card.server.core.domain.devices.DeviceBind;
 
 /**
  * 设备Dao

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/DeviceInfoDao.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.dao.school;
 
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
 import com.zhongshu.card.server.core.dao.school.extend.DeviceInfoDaoExtend;
-import com.zhongshu.card.server.core.domain.org.DeviceInfo;
+import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 
 import java.util.List;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/GateWayInfoDao.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.dao.school;
 
 import com.github.microservice.components.data.mongo.mongo.dao.MongoDao;
 import com.zhongshu.card.server.core.dao.school.extend.GateWayInfoDaoExtend;
-import com.zhongshu.card.server.core.domain.org.GateWayInfo;
+import com.zhongshu.card.server.core.domain.devices.GateWayInfo;
 
 import java.util.List;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/extend/DeviceBindDaoExtend.java

@@ -1,9 +1,7 @@
 package com.zhongshu.card.server.core.dao.school.extend;
 
 import com.zhongshu.card.client.model.school.DeviceBindSearch;
-import com.zhongshu.card.client.model.school.DeviceInfoSearch;
-import com.zhongshu.card.server.core.domain.org.DeviceInfo;
-import com.zhongshu.card.server.core.domain.school.DeviceBind;
+import com.zhongshu.card.server.core.domain.devices.DeviceBind;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/extend/DeviceInfoDaoExtend.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.server.core.dao.school.extend;
 
 import com.zhongshu.card.client.model.school.DeviceInfoSearch;
-import com.zhongshu.card.server.core.domain.org.DeviceInfo;
+import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/extend/GateWayInfoDaoExtend.java

@@ -1,7 +1,7 @@
 package com.zhongshu.card.server.core.dao.school.extend;
 
 import com.zhongshu.card.client.model.school.GateWayInfoSearch;
-import com.zhongshu.card.server.core.domain.org.GateWayInfo;
+import com.zhongshu.card.server.core.domain.devices.GateWayInfo;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/impl/DeviceBindDaoImpl.java

@@ -5,8 +5,7 @@ import com.zhongshu.card.client.model.school.DeviceBindSearch;
 import com.zhongshu.card.server.core.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.school.extend.DeviceBindDaoExtend;
 import com.zhongshu.card.server.core.domain.school.Area;
-import com.zhongshu.card.server.core.domain.school.DeviceBind;
-import com.zhongshu.card.server.core.util.CommonUtil;
+import com.zhongshu.card.server.core.domain.devices.DeviceBind;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/impl/DeviceInfoDaoImpl.java

@@ -5,7 +5,7 @@ import com.zhongshu.card.client.model.school.DeviceInfoSearch;
 import com.zhongshu.card.server.core.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.school.extend.DeviceInfoDaoExtend;
 import com.zhongshu.card.server.core.domain.school.Area;
-import com.zhongshu.card.server.core.domain.org.DeviceInfo;
+import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

FullCardServer/src/main/java/com/zhongshu/card/server/core/dao/school/impl/GateWayInfoDaoImpl.java

@@ -5,7 +5,7 @@ import com.zhongshu.card.client.model.school.GateWayInfoSearch;
 import com.zhongshu.card.server.core.dao.BaseImpl;
 import com.zhongshu.card.server.core.dao.school.extend.GateWayInfoDaoExtend;
 import com.zhongshu.card.server.core.domain.school.Area;
-import com.zhongshu.card.server.core.domain.org.GateWayInfo;
+import com.zhongshu.card.server.core.domain.devices.GateWayInfo;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/school/DeviceBind.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceBind.java

@@ -1,12 +1,12 @@
-package com.zhongshu.card.server.core.domain.school;
+package com.zhongshu.card.server.core.domain.devices;
 
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.client.type.PaymentModeType;
 import com.zhongshu.card.server.core.domain.base.SuperMain;
-import com.zhongshu.card.server.core.domain.org.DeviceInfo;
 import com.zhongshu.card.server.core.domain.org.Organization;
+import com.zhongshu.card.server.core.domain.school.Area;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/org/DeviceInfo.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/DeviceInfo.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.domain.org;
+package com.zhongshu.card.server.core.domain.devices;
 
 import com.github.microservice.models.type.DeviceType;
 import com.zhongshu.card.client.type.DataState;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/org/GateWay2Device.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/GateWay2Device.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.domain.org;
+package com.zhongshu.card.server.core.domain.devices;
 
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.server.core.domain.base.SuperMain;

FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/org/GateWayInfo.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/domain/devices/GateWayInfo.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.domain.org;
+package com.zhongshu.card.server.core.domain.devices;
 
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.server.core.domain.base.SuperMain;

FullCardServer/src/main/java/com/zhongshu/card/server/core/model/payment/ExpendParam.java

@@ -2,7 +2,7 @@ package com.zhongshu.card.server.core.model.payment;
 
 import com.github.microservice.types.payment.PaymentType;
 import com.zhongshu.card.server.core.domain.school.CardInfo;
-import com.zhongshu.card.server.core.domain.org.DeviceInfo;
+import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/hxz/HxzService.java

@@ -10,7 +10,7 @@ import com.zhongshu.card.server.core.dao.org.UserCountDao;
 import com.zhongshu.card.server.core.dao.payment.ExpenseFlowDao;
 import com.zhongshu.card.server.core.dao.school.DeviceInfoDao;
 import com.zhongshu.card.server.core.domain.payment.ExpenseFlow;
-import com.zhongshu.card.server.core.domain.org.DeviceInfo;
+import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import com.zhongshu.card.server.core.httpRequest.ApiRequestService;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.payment.ExpenseFlowServiceImpl;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/DeviceInfoServiceImpl.java

@@ -9,7 +9,7 @@ import com.zhongshu.card.client.service.school.DeviceInfoService;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.school.AreaDao;
 import com.zhongshu.card.server.core.dao.school.DeviceInfoDao;
-import com.zhongshu.card.server.core.domain.org.DeviceInfo;
+import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.school.AreaServiceImpl;
 import com.zhongshu.card.server.core.util.BeanUtils;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/GateWayInfoServiceImpl.java

@@ -9,7 +9,7 @@ import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.school.AreaDao;
 import com.zhongshu.card.server.core.dao.school.GateWayInfoDao;
 import com.zhongshu.card.server.core.domain.school.Area;
-import com.zhongshu.card.server.core.domain.org.GateWayInfo;
+import com.zhongshu.card.server.core.domain.devices.GateWayInfo;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.school.AreaServiceImpl;
 import com.zhongshu.card.server.core.util.BeanUtils;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/ExpenseFlowServiceImpl.java

@@ -35,14 +35,14 @@ import com.zhongshu.card.server.core.dao.payment.WalletRechargeDao;
 import com.zhongshu.card.server.core.dao.school.CardInfoDao;
 import com.zhongshu.card.server.core.dao.school.DeviceBindDao;
 import com.zhongshu.card.server.core.dao.school.DeviceInfoDao;
-import com.zhongshu.card.server.core.domain.org.DeviceInfo;
+import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.org.OrganizationRelation;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
 import com.zhongshu.card.server.core.domain.payment.ExpenseFlow;
 import com.zhongshu.card.server.core.domain.projectAbout.ProjectPaySetting;
 import com.zhongshu.card.server.core.domain.school.CardInfo;
-import com.zhongshu.card.server.core.domain.school.DeviceBind;
+import com.zhongshu.card.server.core.domain.devices.DeviceBind;
 import com.zhongshu.card.server.core.httpRequest.ApiRequestService;
 import com.zhongshu.card.server.core.httpRequest.apiConf.APIResponseModel;
 import com.zhongshu.card.server.core.service.base.SuperService;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/school/DeviceBindServiceImpl.java

@@ -10,19 +10,17 @@ import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.school.AreaDao;
 import com.zhongshu.card.server.core.dao.school.DeviceBindDao;
 import com.zhongshu.card.server.core.dao.school.DeviceInfoDao;
-import com.zhongshu.card.server.core.domain.org.DeviceInfo;
+import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import com.zhongshu.card.server.core.domain.org.Organization;
 import com.zhongshu.card.server.core.domain.school.Area;
-import com.zhongshu.card.server.core.domain.school.DeviceBind;
+import com.zhongshu.card.server.core.domain.devices.DeviceBind;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.org.DeviceInfoServiceImpl;
 import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
 import com.zhongshu.card.server.core.util.BeanUtils;
-import com.zhongshu.card.server.core.util.CommonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -31,7 +29,6 @@ import org.springframework.util.Assert;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * @author TRX

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/sync/DeviceSyncFromIotService.java

@@ -10,8 +10,8 @@ import com.zhongshu.card.client.type.DataState;
 import com.zhongshu.card.client.type.OnLineState;
 import com.zhongshu.card.server.core.dao.org.OrganizationDao;
 import com.zhongshu.card.server.core.dao.org.OrganizationRelationDao;
-import com.zhongshu.card.server.core.domain.org.DeviceInfo;
-import com.zhongshu.card.server.core.domain.school.DeviceBind;
+import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
+import com.zhongshu.card.server.core.domain.devices.DeviceBind;
 import com.zhongshu.card.server.core.service.base.CommonService;
 import com.zhongshu.card.server.core.service.org.GateWayInfoServiceImpl;
 import com.zhongshu.card.server.core.service.user.OperationLogsService;