dengsixing 2 years ago
parent
commit
b72434df83

+ 1 - 1
src/main/java/com/fdkankan/scene/aop/CheckCurrenUserAspect.java

@@ -9,8 +9,8 @@ import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.service.ICameraService;
 import com.fdkankan.scene.service.ICameraService;
 import com.fdkankan.scene.service.ISceneCooperationService;
 import com.fdkankan.scene.service.ISceneCooperationService;
 import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.service.ISceneProService;
-import com.fdkankan.web.model.SSOUser;
 import com.fdkankan.web.user.SSOLoginHelper;
 import com.fdkankan.web.user.SSOLoginHelper;
+import com.fdkankan.web.user.SSOUser;
 import java.io.IOException;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Method;
 import java.util.Objects;
 import java.util.Objects;

+ 1 - 1
src/main/java/com/fdkankan/scene/aop/SystemLogAspect.java

@@ -5,8 +5,8 @@ import com.fdkankan.scene.annotation.SystemControllerLog;
 import com.fdkankan.scene.annotation.SystemServiceLog;
 import com.fdkankan.scene.annotation.SystemServiceLog;
 import com.fdkankan.scene.entity.Log;
 import com.fdkankan.scene.entity.Log;
 import com.fdkankan.scene.service.ILogService;
 import com.fdkankan.scene.service.ILogService;
-import com.fdkankan.web.model.SSOUser;
 import com.fdkankan.web.user.SSOLoginHelper;
 import com.fdkankan.web.user.SSOLoginHelper;
+import com.fdkankan.web.user.SSOUser;
 import java.io.IOException;
 import java.io.IOException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Method;
 import java.util.Date;
 import java.util.Date;

+ 1 - 1
src/main/java/com/fdkankan/scene/service/ISceneService.java

@@ -4,7 +4,7 @@ import com.fdkankan.web.response.ResultData;
 import com.fdkankan.scene.bean.RequestRebuildVedioScene;
 import com.fdkankan.scene.bean.RequestRebuildVedioScene;
 import com.fdkankan.scene.bean.RequestSceneCooperation;
 import com.fdkankan.scene.bean.RequestSceneCooperation;
 import com.fdkankan.scene.entity.Scene;
 import com.fdkankan.scene.entity.Scene;
-import com.fdkankan.web.model.SSOUser;
+import com.fdkankan.web.user.SSOUser;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestBody;
 
 
 /**
 /**

+ 2 - 2
src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -47,7 +47,7 @@ import com.fdkankan.scene.service.ISceneService;
 import com.fdkankan.scene.service.IUserIncrementService;
 import com.fdkankan.scene.service.IUserIncrementService;
 import com.fdkankan.scene.service.IUserService;
 import com.fdkankan.scene.service.IUserService;
 import com.fdkankan.scene.service.IVideoSceneProgressService;
 import com.fdkankan.scene.service.IVideoSceneProgressService;
-import com.fdkankan.web.model.SSOUser;
+import com.fdkankan.web.user.SSOUser;
 import java.io.File;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.Date;
@@ -115,7 +115,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
     private String expectedTime;
     private String expectedTime;
 
 
     @Override
     @Override
-    public ResultData isLogin(String num, com.fdkankan.web.user.SSOUser ssoUser) throws Exception {
+    public ResultData isLogin(String num, SSOUser ssoUser) throws Exception {
 
 
         // 解密获得username,用于和数据库进行对比
         // 解密获得username,用于和数据库进行对比
         String username = ssoUser.getUserName();
         String username = ssoUser.getUserName();