diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java b/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java index 44e9f28e..afcedd7b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/api/UserDataSyncApi.java @@ -7,6 +7,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import com.xboe.account.entity.Account; import com.xboe.account.service.IAccountService; import com.xboe.core.JsonResponse; import com.xboe.core.api.ApiBaseController; @@ -39,7 +40,7 @@ public class UserDataSyncApi extends ApiBaseController { IDataUserSyncService service; @PostMapping("/user") - public JsonResponse syncUser( @RequestBody UserData user) { + public JsonResponse syncUser(@RequestBody UserData user) { if (StringUtils.isBlank(user.getId())) { return error("无用户的id"); @@ -54,5 +55,24 @@ public class UserDataSyncApi extends ApiBaseController { return error("同步处理用户失败", e.getMessage()); } } + + @PostMapping("/deluser") + public JsonResponse deleteUser(String id) { + + if (StringUtils.isBlank(id)) { + return error("无用户的id"); + } + //清除缓存需要loginName + try { + //先查询是否存在 + Account a=new Account(); + a.setId(id); + accountService.delete(a); + return success(true); + } catch (Exception e) { + log.error("同步删除用户错误", e); + return error("同步删除用户失败", e.getMessage()); + } + } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java index e1915cbd..e91da2e7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/outside/OutSideDataServiceImpl.java @@ -61,7 +61,11 @@ public class OutSideDataServiceImpl implements IOutSideDataService { for(JsonNode node :result) { AudienceUser au=new AudienceUser(); au.setId(node.get("userId").asText()); - au.setName(getNodeText(node.get("name"))); + if(node.get("realName")!=null) { + au.setName(getNodeText(node.get("realName"))); + }else if(node.get("name")!=null){ + au.setName(getNodeText(node.get("name"))); + } au.setCode(getNodeText(node.get("userNo"))); list.add(au); } diff --git a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java index bed7561d..3acc7f6d 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/data/service/impl/DataUserSyncServiceImpl.java @@ -51,12 +51,13 @@ public class DataUserSyncServiceImpl implements IDataUserSyncService{ if(user.getDeleted()!=null) { a.setDeleted(user.getDeleted()); } + + a.setLoginName(user.getCode()); + }else { //新账户 a=new Account(); a.setDeleted(user.getDeleted()); - - a.setSysId(user.getKid()); a.setLoginName(user.getCode()); a.setAvatar(user.getAvatar()); a.setId(user.getId());