TRX 1 жил өмнө
parent
commit
9358b3925f

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/DeviceInfoServiceImpl.java

@@ -26,7 +26,7 @@ import com.zhongshu.card.server.core.service.base.CommonService;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.devices.deviceProduct.DeviceProductBindDeviceService;
 import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissEventService;
-import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissVerifyService;
+import com.zhongshu.card.server.core.service.permissVerify.DevicePermissVerifyService;
 import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
 import com.zhongshu.card.server.core.service.orgManager.OrganizationManagerServiceImpl;
 import com.zhongshu.card.server.core.service.paySetting.OrgPaySettingJudgmentService;

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/permiss/Device2UseUsableService.java

@@ -9,7 +9,7 @@ import com.zhongshu.card.server.core.dao.visitor.VisitorSettingDeviceDao;
 import com.zhongshu.card.server.core.domain.devices.permiss.Device2UseUsable;
 import com.zhongshu.card.server.core.domain.visitor.VisitorMain;
 import com.zhongshu.card.server.core.domain.visitor.VisitorSettingDevice;
-import com.zhongshu.card.server.core.service.base.SuperPermissService;
+import com.zhongshu.card.server.core.service.permissVerify.SuperPermissService;
 import com.zhongshu.card.server.core.service.visitor.VisitorMainService;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import lombok.extern.slf4j.Slf4j;

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/gateDoor/GateDoorService.java

@@ -15,7 +15,7 @@ import com.zhongshu.card.client.type.payment.RequestType;
 import com.zhongshu.card.server.core.domain.devices.DeviceUseRecords;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.devices.DeviceUseRecordService;
-import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissVerifyService;
+import com.zhongshu.card.server.core.service.permissVerify.DevicePermissVerifyService;
 import com.zhongshu.card.server.core.service.payment.RequestInfoService;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import lombok.extern.slf4j.Slf4j;

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

@@ -54,7 +54,7 @@ import com.zhongshu.card.server.core.httpRequest.ApiRequestService;
 import com.zhongshu.card.server.core.service.base.CommonService;
 import com.zhongshu.card.server.core.service.base.SuperService;
 import com.zhongshu.card.server.core.service.devices.DeviceInfoServiceImpl;
-import com.zhongshu.card.server.core.service.devices.permiss.DevicePermissVerifyService;
+import com.zhongshu.card.server.core.service.permissVerify.DevicePermissVerifyService;
 import com.zhongshu.card.server.core.service.mqtt.MqttServiceImpl;
 import com.zhongshu.card.server.core.service.org.OrganizationServiceImpl;
 import com.zhongshu.card.server.core.service.pay.WechatPayService;

+ 3 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/devices/permiss/DevicePermissVerifyService.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/service/permissVerify/DevicePermissVerifyService.java

@@ -1,4 +1,4 @@
-package com.zhongshu.card.server.core.service.devices.permiss;
+package com.zhongshu.card.server.core.service.permissVerify;
 
 import com.github.microservice.models.gateDoor.use.GateDoorUseParam;
 import com.github.microservice.models.type.DeviceState;
@@ -21,6 +21,8 @@ import com.zhongshu.card.server.core.domain.devices.DeviceInfo;
 import com.zhongshu.card.server.core.domain.devices.permiss.DevicePermiss;
 import com.zhongshu.card.server.core.domain.devices.permiss.PermissTimeSlot;
 import com.zhongshu.card.server.core.domain.org.UserAccount;
+import com.zhongshu.card.server.core.service.devices.permiss.Device2UseUsableService;
+import com.zhongshu.card.server.core.service.devices.permiss.UserPermissDataCacheService;
 import com.zhongshu.card.server.core.util.TempUserUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ObjectUtils;

+ 2 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/base/SuperPermissService.java → FullCardServer/src/main/java/com/zhongshu/card/server/core/service/permissVerify/SuperPermissService.java

@@ -1,7 +1,8 @@
-package com.zhongshu.card.server.core.service.base;
+package com.zhongshu.card.server.core.service.permissVerify;
 
 import com.github.microservice.models.gateDoor.use.GateDoorUseParam;
 import com.github.microservice.net.ResultContent;
+import com.zhongshu.card.server.core.service.base.SuperService;
 import lombok.extern.slf4j.Slf4j;
 
 /**

+ 1 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/visitor/VisitorMainService.java

@@ -26,7 +26,7 @@ import com.zhongshu.card.server.core.domain.scene.SceneComponent;
 import com.zhongshu.card.server.core.domain.visitor.VisitorMain;
 import com.zhongshu.card.server.core.domain.visitor.VisitorSetting;
 import com.zhongshu.card.server.core.service.base.CommonService;
-import com.zhongshu.card.server.core.service.base.SuperPermissService;
+import com.zhongshu.card.server.core.service.permissVerify.SuperPermissService;
 import com.zhongshu.card.server.core.service.devices.DeviceInfoServiceImpl;
 import com.zhongshu.card.server.core.service.devices.permiss.Device2UseUsableService;
 import com.zhongshu.card.server.core.service.org.OrganizationUserServiceImpl;