1

src/main/java/com/yunhai/bschclassmanage/controller/api/UserController.java

@@ -5,6 +5,7 @@ import com.yunhai.bschclassmanage.utils.UserContext;
 import com.yunhai.bschclassmanage.config.Config;
 import com.yunhai.platform.openapi.client.YschBaseOpenApi;
 import com.yunhai.platform.utils.model.BoaModule;
+import com.yunhai.platform.utils.model.BoaUser;
 import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,8 +28,8 @@ public class UserController {
     }
 
     @GetMapping("getUserInfo")
-    public UserContext.UserInfo getUserInfo() {
-        return UserContext.getCurrentUser();
+    public BoaUser getUserInfo(BoaUser authUserWithDept) {
+        return authUserWithDept;
     }
 
 

src/main/java/com/yunhai/bschclassmanage/controller/oapi/sync/SyncGroupController.java

@@ -2,6 +2,7 @@ package com.yunhai.bschclassmanage.controller.oapi.sync;
 
 import com.yunhai.bschclassmanage.config.Config;
 import com.yunhai.bschclassmanage.model.tool.BaseGroup;
+import com.yunhai.bschclassmanage.model.tool.SyncGroupDTO;
 import com.yunhai.bschclassmanage.service.ISyncGroupService;
 import com.yunhai.bschclassmanage.utils.OtherUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -23,14 +24,14 @@ public class SyncGroupController {
     public void AddGroup(@RequestBody String jsonString) {
         log.info("jsonString="+jsonString);
         //判断  2,"学校组"  4, "班级组"
-        BaseGroup group = OtherUtil.jsonParseObject(jsonString, BaseGroup.class);
+        SyncGroupDTO group = OtherUtil.jsonParseObject(jsonString, SyncGroupDTO.class);
         syncGroupService.syncAddOrUpdate(group);
     }
 
     @PostMapping("UpdateGroup")
     public void UpdateGroup(@RequestBody String jsonString) {
         log.info("jsonString="+jsonString);
-        BaseGroup group = OtherUtil.jsonParseObject(jsonString, BaseGroup.class);
+        SyncGroupDTO group = OtherUtil.jsonParseObject(jsonString, SyncGroupDTO.class);
         syncGroupService.syncAddOrUpdate(group);
     }
 
@@ -38,6 +39,7 @@ public class SyncGroupController {
     public void DeleteGroup(@RequestBody String jsonString) {
         log.info("jsonString="+jsonString);
     }
+
     @PostMapping("SyncGroup")
     public void SyncGroup(@RequestBody String jsonString) {
         log.info("jsonString="+jsonString);

src/main/java/com/yunhai/bschclassmanage/controller/oapi/sync/SyncUserController.java

@@ -1,12 +1,9 @@
 package com.yunhai.bschclassmanage.controller.oapi.sync;
 
 import com.yunhai.bschclassmanage.config.Config;
-import com.yunhai.bschclassmanage.model.tool.BaseGroup;
-import com.yunhai.bschclassmanage.model.tool.BaseUser;
 import com.yunhai.bschclassmanage.model.tool.DeleteUser;
+import com.yunhai.bschclassmanage.model.tool.SyncUserDTO;
 import com.yunhai.bschclassmanage.service.ISyncUserService;
-import com.yunhai.bschclassmanage.service.impl.sync.SyncGroupService;
-import com.yunhai.bschclassmanage.service.impl.sync.SyncUserService;
 import com.yunhai.bschclassmanage.utils.OtherUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,14 +22,14 @@ public class SyncUserController {
     @PostMapping("AddUser")
     public void AddUser(@RequestBody String jsonString) {
         log.info("jsonString="+jsonString);
-        List<BaseUser> userlist = OtherUtil.jsonParseList(jsonString, BaseUser.class);
+        List<SyncUserDTO> userlist = OtherUtil.jsonParseList(jsonString, SyncUserDTO.class);
         syncUserService.syncAddOrUpdate(userlist);
     }
 
     @PostMapping("UpdateUser")
     public void UpdateUser(@RequestBody String jsonString) {
         log.info("jsonString="+jsonString);
-        List<BaseUser> userList = OtherUtil.jsonParseList(jsonString, BaseUser.class);
+        List<SyncUserDTO> userList = OtherUtil.jsonParseList(jsonString, SyncUserDTO.class);
         syncUserService.syncAddOrUpdate(userList);
     }
 
@@ -46,7 +43,5 @@ public class SyncUserController {
     @PostMapping("SyncUser")
     public void SyncUser(@RequestBody String jsonString) {
         log.info("jsonString="+jsonString);
-        List<DeleteUser> deleteUserList= OtherUtil.jsonParseList(jsonString, DeleteUser.class);
-        syncUserService.deleteUser(deleteUserList);
     }
 }