From 9fee975a2ac84cba64163ac0874271755b80bd3f Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 1 Feb 2023 13:48:07 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/data/outside/OutSideDataServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4e3e3149..329619aa 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 @@ -164,7 +164,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { String token = TokenProxy.getToken(request); String type="application/json"; String[] headers=new String[] {"token",token,"Content-Type",type}; - String url= getBaseUrl("/org/listOrgIds"); + String url= getBaseUrl("/org/manageOrgIds"); ObjectMapper mapper=new ObjectMapper(); String responseStr=null; try{ From 99ec0f36cedaf442ecaf90bf99409e7b77d78eff Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 1 Feb 2023 17:25:52 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E6=96=87=E7=AB=A0=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ArticleServiceImpl.java | 20 ++++++---- .../xboe/system/user/api/SysManagerApi.java | 2 - .../com/xboe/system/user/vo/BatchMessage.java | 39 +++++++++++++++++++ 3 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 servers/boe-server-all/src/main/java/com/xboe/system/user/vo/BatchMessage.java diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java index 48ea9b69..283b96c7 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java @@ -68,18 +68,22 @@ public class ArticleServiceImpl implements IArticleService{ @Override public List
articelList(Integer type) { + OrderCondition oc=OrderCondition.desc("sysCreateTime"); + if(type==2){ + oc=OrderCondition.desc("views"); + } //先查出带有图片的 List
articles = new ArrayList<>(); - Article article = dao.findOne(FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true), +// Article article = dao.findOne(FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true), +// FieldFilters.isNotNull("coverurl"), FieldFilters.ge("coverurl", "")); +// articles.add(article); + List
tops =dao.findList(1, oc, null,FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true), FieldFilters.isNotNull("coverurl"), FieldFilters.ge("coverurl", "")); - articles.add(article); - + articles.add(tops.get(0)); + QueryBuilder builder = QueryBuilder.from(Article.class); - if(type==2){ - builder.addOrder(OrderCondition.desc("views")); - }else{ - builder.addOrder(OrderCondition.desc("sysCreateTime")); - } + + builder.addOrder(oc); builder.addFilter(FieldFilters.eq("status", Article.STATUS_PUBLISH)); builder.addFilter(FieldFilters.eq("enabled",true)); builder.addFilter(FieldFilters.eq("deleted",false)); diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/SysManagerApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/SysManagerApi.java index 517676d1..48b43343 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/SysManagerApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/SysManagerApi.java @@ -31,7 +31,6 @@ public class SysManagerApi extends ApiBaseController { /** * 分页查询 - * * @return */ @PostMapping("/page") @@ -47,7 +46,6 @@ public class SysManagerApi extends ApiBaseController { /** * 保存 - * * @param sysManager * @return */ diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/vo/BatchMessage.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/vo/BatchMessage.java new file mode 100644 index 00000000..5d5ee1f7 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/vo/BatchMessage.java @@ -0,0 +1,39 @@ +package com.xboe.system.user.vo; + +import java.util.List; + +import lombok.Data; + +/** + * 批量消息 + * + */ +@Data +public class BatchMessage { + + /** + * 提交人id + */ + private List acceptIds; + + private List acceptNames; + + private String refId; + + private String refType; + + private Integer pageType; + + /** + * 页面参数 默认是id + */ + private String pageParams; + + private String sendName; + + private String sendAid; + + private Integer sendType; + + private String title; +} From 116702f94be81393511d33ab69635be73d95b8c2 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 1 Feb 2023 18:56:53 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E9=94=99=E8=AF=AF=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/article/service/impl/ArticleServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java index 283b96c7..39232d65 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java @@ -75,12 +75,14 @@ public class ArticleServiceImpl implements IArticleService{ //先查出带有图片的 List
articles = new ArrayList<>(); // Article article = dao.findOne(FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true), -// FieldFilters.isNotNull("coverurl"), FieldFilters.ge("coverurl", "")); +// FieldFilters.isNotNull("coverurl"), FieldFilters.ne("coverurl", "")); // articles.add(article); + List
tops =dao.findList(1, oc, null,FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true), - FieldFilters.isNotNull("coverurl"), FieldFilters.ge("coverurl", "")); + FieldFilters.isNotNull("coverurl"), FieldFilters.ne("coverurl", "")); articles.add(tops.get(0)); + QueryBuilder builder = QueryBuilder.from(Article.class); builder.addOrder(oc); From c94f2ad4e580bddd3716cfa9fa7e36bb81c59fa9 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 1 Feb 2023 22:28:49 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=8E=BB=E4=B8=80=E4=B8=AA=E7=A9=BA?= =?UTF-8?q?=E6=A0=BC=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xboe/module/article/service/impl/ArticleServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java index 39232d65..6e441ac9 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java @@ -77,12 +77,10 @@ public class ArticleServiceImpl implements IArticleService{ // Article article = dao.findOne(FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true), // FieldFilters.isNotNull("coverurl"), FieldFilters.ne("coverurl", "")); // articles.add(article); - List
tops =dao.findList(1, oc, null,FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true), FieldFilters.isNotNull("coverurl"), FieldFilters.ne("coverurl", "")); articles.add(tops.get(0)); - QueryBuilder builder = QueryBuilder.from(Article.class); builder.addOrder(oc); From 76d96a7a7253d7525300251f80ab15dbcb5ee566 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 2 Feb 2023 10:18:47 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ArticleServiceImpl.java | 4 ++-- .../com/xboe/system/user/api/MessageApi.java | 22 +++++++++++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java index 6e441ac9..f5649fb9 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java @@ -77,8 +77,8 @@ public class ArticleServiceImpl implements IArticleService{ // Article article = dao.findOne(FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true), // FieldFilters.isNotNull("coverurl"), FieldFilters.ne("coverurl", "")); // articles.add(article); - List
tops =dao.findList(1, oc, null,FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true), - FieldFilters.isNotNull("coverurl"), FieldFilters.ne("coverurl", "")); + List
tops =dao.findList(1, oc,FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true), + FieldFilters.isNotNull("coverurl"),FieldFilters.ne("coverurl", "")); articles.add(tops.get(0)); QueryBuilder builder = QueryBuilder.from(Article.class); diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java index 4d7ff5d7..0488e181 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java @@ -105,6 +105,28 @@ public class MessageApi extends ApiBaseController { return error("发布消息失败",e.getMessage()); } } + + @PostMapping("/batch-send") + @AutoLog(module = "消息",action = "批量发送消息") + public JsonResponse batchSave(@RequestBody Message message){ + if(StringUtil.isBlank(message.getTitle())){ + return badRequest("标题不能为空"); + } + if(StringUtil.isBlank(message.getContent())){ + return badRequest("内容不能为空"); + } + try { + message.setIsRead(false); + message.setMsgType(1); + message.setMsgTime(LocalDateTime.now()); + MessageSender.send(message); + return success(true); + } catch (Exception e) { + log.error("发布消息失败",e); + return error("发布消息失败",e.getMessage()); + } + } + /** * 当前登陆人未读消息条数 * */ From 515f5b24e78a62c60e0f3d7934265bd9cd40281d Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 2 Feb 2023 10:44:05 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ArticleServiceImpl.java | 5 ++- .../com/xboe/system/user/api/MessageApi.java | 28 ++++++++++--- .../system/user/service/IMessageService.java | 7 ++++ .../system/user/service/MessageSender.java | 40 +++++++++++++++++++ .../user/service/impl/MessageServiceImpl.java | 18 ++++++++- .../com/xboe/system/user/vo/BatchMessage.java | 4 ++ 6 files changed, 95 insertions(+), 7 deletions(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java index f5649fb9..c705440b 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/article/service/impl/ArticleServiceImpl.java @@ -79,7 +79,9 @@ public class ArticleServiceImpl implements IArticleService{ // articles.add(article); List
tops =dao.findList(1, oc,FieldFilters.eq("status", Article.STATUS_PUBLISH), FieldFilters.eq("deleted", false), FieldFilters.eq("enabled", true), FieldFilters.isNotNull("coverurl"),FieldFilters.ne("coverurl", "")); - articles.add(tops.get(0)); + + Article first=tops.get(0); + articles.add(first); QueryBuilder builder = QueryBuilder.from(Article.class); @@ -87,6 +89,7 @@ public class ArticleServiceImpl implements IArticleService{ builder.addFilter(FieldFilters.eq("status", Article.STATUS_PUBLISH)); builder.addFilter(FieldFilters.eq("enabled",true)); builder.addFilter(FieldFilters.eq("deleted",false)); + builder.addFilter(FieldFilters.ne("id", first.getId()));//去除第一个 builder.setPageSize(3); List
list = dao.findList(builder.builder()); articles.addAll(list); diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java index 0488e181..fd0116d2 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/api/MessageApi.java @@ -22,6 +22,7 @@ import com.xboe.core.log.AutoLog; import com.xboe.system.user.entity.Message; import com.xboe.system.user.service.IMessageService; import com.xboe.system.user.service.MessageSender; +import com.xboe.system.user.vo.BatchMessage; import lombok.extern.slf4j.Slf4j; @@ -108,7 +109,24 @@ public class MessageApi extends ApiBaseController { @PostMapping("/batch-send") @AutoLog(module = "消息",action = "批量发送消息") - public JsonResponse batchSave(@RequestBody Message message){ + public JsonResponse batchSave(@RequestBody BatchMessage message){ + + if(message.getAcceptIds()==null || message.getAcceptIds().isEmpty()) { + return badRequest("无发送人信息"); + } + + if(message.getAcceptNames()==null || message.getAcceptNames().isEmpty()) { + return badRequest("无发送人姓名信息"); + } + + if(message.getAcceptIds().size()!=message.getAcceptNames().size()) { + return badRequest("发送人姓名信息不相符"); + } + + if(StringUtil.isBlank(message.getTitle())){ + return badRequest("标题不能为空"); + } + if(StringUtil.isBlank(message.getTitle())){ return badRequest("标题不能为空"); } @@ -116,10 +134,10 @@ public class MessageApi extends ApiBaseController { return badRequest("内容不能为空"); } try { - message.setIsRead(false); - message.setMsgType(1); - message.setMsgTime(LocalDateTime.now()); - MessageSender.send(message); + //message.setIsRead(false); +// message.setMsgType(1); +// message.setMsgTime(LocalDateTime.now()); + //MessageSender.send(message); return success(true); } catch (Exception e) { log.error("发布消息失败",e); diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/IMessageService.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/IMessageService.java index 3b52343b..8e7692fe 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/IMessageService.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/IMessageService.java @@ -5,6 +5,7 @@ import java.util.Map; import com.xboe.common.PageList; import com.xboe.system.user.entity.Message; +import com.xboe.system.user.vo.BatchMessage; /** * 消息接口 @@ -20,6 +21,12 @@ public interface IMessageService { * 查看消息 * */ PageList queryMobile(int pageIndex,int pageSize,String aid,Boolean isRead); + + /** + * 批量保存 + * @param batch + */ + void batchSave(List list); /** * 删除消息 diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/MessageSender.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/MessageSender.java index bccd86a8..35f24431 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/service/MessageSender.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/service/MessageSender.java @@ -1,7 +1,12 @@ package com.xboe.system.user.service; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + import org.springframework.stereotype.Component; +import com.xboe.common.utils.IDGenerator; import com.xboe.system.user.entity.Message; /** @@ -16,9 +21,44 @@ public class MessageSender { public MessageSender(IMessageService service) { MessageSender.messageService=service; } + public static void send(Message msg) { if(messageService!=null){ messageService.save(msg); } } + + public static void batchSend(List acceptIds,List acceptNames, Message data) { + if(messageService!=null){ + List msgList=new ArrayList(); + int n=acceptIds.size(); + LocalDateTime now=LocalDateTime.now(); + for(int i=0;i ids) { dao.deleteByFilter(FieldFilters.in("id",ids)); } @Override + @Transactional public Message detail(String id) { Message message = dao.get(id); if(!message.getIsRead()){ @@ -75,6 +77,7 @@ public class MessageServiceImpl implements IMessageService { } @Override + @Transactional public void save(Message message) { dao.save(message); } @@ -89,6 +92,7 @@ public class MessageServiceImpl implements IMessageService { } @Override + @Transactional public void updateIsRead(List ids) { dao.update(UpdateBuilder.from(Message.class) .addUpdateField("isRead",true) @@ -113,6 +117,7 @@ public class MessageServiceImpl implements IMessageService { } @Override + @Transactional public void remove(String aid) { dao.deleteByFilter(FieldFilters.eq("acceptId",aid)); } @@ -128,6 +133,7 @@ public class MessageServiceImpl implements IMessageService { } @Override + @Transactional public void setReadByAcceptId(String aid) { dao.update("Update "+Message.class.getSimpleName()+" set isRead=?1 where acceptId=?2 and isRead=?3", true,aid,false); } @@ -137,4 +143,14 @@ public class MessageServiceImpl implements IMessageService { dao.deleteByField("acceptId", aid); } + + @Override + @Transactional + public void batchSave(List list) { + +// for(Message msg : list) { +// +// } + dao.saveList(list); + } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/system/user/vo/BatchMessage.java b/servers/boe-server-all/src/main/java/com/xboe/system/user/vo/BatchMessage.java index 5d5ee1f7..f56b04d1 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/system/user/vo/BatchMessage.java +++ b/servers/boe-server-all/src/main/java/com/xboe/system/user/vo/BatchMessage.java @@ -36,4 +36,8 @@ public class BatchMessage { private Integer sendType; private String title; + + private String content; + + private Integer source; } From 22c4719cbc6b02cf770c71076b9400c1c7346b54 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 2 Feb 2023 11:35:10 +0800 Subject: [PATCH 7/9] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E8=B0=83=E8=AF=95=E7=9A=84=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/xboe/module/course/api/CourseManageApi.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java index e0f0ef48..6e59a893 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java @@ -1,4 +1,4 @@ -package com.xboe.module.course.api; + package com.xboe.module.course.api; import java.io.OutputStream; import java.util.ArrayList; @@ -115,6 +115,7 @@ public class CourseManageApi extends ApiBaseController{ try { List orgIds = outSideDataService.getOrgIds(); String ids= StringUtils.join(orgIds,","); + log.info("获取到的用户的组织机构权限ids",ids); String aid=getCurrent().getAccountId(); //如果前端查询当前人的，这里去掉 if(StringUtils.isNotBlank( dto.getAid())) { From 12de3fd4515e32e9c18bec17183a9f3bf1d1e83b Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 2 Feb 2023 11:43:24 +0800 Subject: [PATCH 8/9] =?UTF-8?q?=E8=A7=A3=E6=9E=90=E7=9A=84=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/outside/OutSideDataServiceImpl.java | 37 ++++++++++++++++++- .../module/course/api/CourseManageApi.java | 2 +- 2 files changed, 37 insertions(+), 2 deletions(-) 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 329619aa..dba14883 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 @@ -176,7 +176,7 @@ public class OutSideDataServiceImpl implements IOutSideDataService { return null; } - if(rootNode.get("result")!=null & rootNode.get("result").isObject()) { + if(rootNode.get("result")!=null & rootNode.get("result").isArray()) { JsonNode result = rootNode.get("result"); Iterator elements = result.elements(); while (elements.hasNext()){ @@ -189,6 +189,41 @@ public class OutSideDataServiceImpl implements IOutSideDataService { return orgIds; } + +// public static void main(String[] args) { +// List orgIds = new ArrayList<>(); +// String token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzUzMDkxMDcsImV4cCI6MTY3NTMxNjMwNywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjdFMDY1NzQxLTkzRUItRTc1Ni02Mzk5LUIwQTA1QUY2NEE3OSIsInVJZCI6Ijk2NTM2OTU4MjM5Mjk3MTI2NCIsInBlcm1pc3Npb24iOiIifQ==.6780daf88206d3f4f2cfc184268f4c1b80f25a916105219a5a6f2e904762b1e8"; +// String type="application/json"; +// String[] headers=new String[] {"token",token,"Content-Type",type}; +// String url= ("https://u.boe.com/userbasic/org/manageOrgIds"); +// ObjectMapper mapper=new ObjectMapper(); +// String responseStr=null; +// try{ +// OkHttpUtil http=new OkHttpUtil(); +// responseStr = http.doPostJson(url,"{}", headers); +// System.out.println(responseStr); +// JsonNode rootNode= mapper.readTree(responseStr); +// int code = rootNode.get("status").asInt(); +// System.out.println("code="+code); +// if(code!=200) { +// log.error("获取当前用户拥有权限机构id错误："+responseStr); +// } +// +// if(rootNode.get("result")!=null & rootNode.get("result").isArray()) { +// JsonNode result = rootNode.get("result"); +// Iterator elements = result.elements(); +// while (elements.hasNext()){ +// orgIds.add(elements.next().toString()); +// } +// } +// for(String str : orgIds) { +// System.out.println(str); +// } +// }catch (Exception e){ +// log.error("获取当前用户有权限的机构id错误",e); +// } +// +// } private String getBaseUrl(String url) { String baseUrl=SysConstant.getConfigValue("xboe.server.userbasic.url"); diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java index 6e59a893..d8670126 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/course/api/CourseManageApi.java @@ -115,7 +115,7 @@ public class CourseManageApi extends ApiBaseController{ try { List orgIds = outSideDataService.getOrgIds(); String ids= StringUtils.join(orgIds,","); - log.info("获取到的用户的组织机构权限ids",ids); + //log.info("获取到的用户的组织机构权限ids",ids); String aid=getCurrent().getAccountId(); //如果前端查询当前人的，这里去掉 if(StringUtils.isNotBlank( dto.getAid())) { From dfe85895e386a691e6defa43abc4f5074b0e059d Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 2 Feb 2023 13:50:38 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/outside/OutSideDataServiceImpl.java | 97 ++++++++++++------- 1 file changed, 64 insertions(+), 33 deletions(-) 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 dba14883..ec97feed 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 @@ -56,8 +56,8 @@ public class OutSideDataServiceImpl implements IOutSideDataService { String responseStr = okHttpUtil.doPostJson(url, json, headers); JsonNode rootNode= mapper.readTree(responseStr); - JsonNode result = rootNode.get("result")!=null ?( rootNode.get("result").get("data") !=null ? rootNode.get("result").get("data"):null):null; - if(rootNode.get("result")!=null & rootNode.get("result").isArray()) { + JsonNode result = rootNode.get("result")!=null ? ( rootNode.get("result").get("data") !=null ? rootNode.get("result").get("data"):null):null; + if(result!=null && result.isArray()) { //这里应该是单独的线程去处理 for(JsonNode JsonNode :result) { AudienceUser au=new AudienceUser(); @@ -191,37 +191,68 @@ public class OutSideDataServiceImpl implements IOutSideDataService { } // public static void main(String[] args) { -// List orgIds = new ArrayList<>(); -// String token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzUzMDkxMDcsImV4cCI6MTY3NTMxNjMwNywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjdFMDY1NzQxLTkzRUItRTc1Ni02Mzk5LUIwQTA1QUY2NEE3OSIsInVJZCI6Ijk2NTM2OTU4MjM5Mjk3MTI2NCIsInBlcm1pc3Npb24iOiIifQ==.6780daf88206d3f4f2cfc184268f4c1b80f25a916105219a5a6f2e904762b1e8"; -// String type="application/json"; -// String[] headers=new String[] {"token",token,"Content-Type",type}; -// String url= ("https://u.boe.com/userbasic/org/manageOrgIds"); -// ObjectMapper mapper=new ObjectMapper(); -// String responseStr=null; -// try{ -// OkHttpUtil http=new OkHttpUtil(); -// responseStr = http.doPostJson(url,"{}", headers); -// System.out.println(responseStr); -// JsonNode rootNode= mapper.readTree(responseStr); -// int code = rootNode.get("status").asInt(); -// System.out.println("code="+code); -// if(code!=200) { -// log.error("获取当前用户拥有权限机构id错误："+responseStr); -// } -// -// if(rootNode.get("result")!=null & rootNode.get("result").isArray()) { -// JsonNode result = rootNode.get("result"); -// Iterator elements = result.elements(); -// while (elements.hasNext()){ -// orgIds.add(elements.next().toString()); -// } -// } -// for(String str : orgIds) { -// System.out.println(str); -// } -// }catch (Exception e){ -// log.error("获取当前用户有权限的机构id错误",e); -// } +//// List orgIds = new ArrayList<>(); +//// String token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzUzMDkxMDcsImV4cCI6MTY3NTMxNjMwNywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjdFMDY1NzQxLTkzRUItRTc1Ni02Mzk5LUIwQTA1QUY2NEE3OSIsInVJZCI6Ijk2NTM2OTU4MjM5Mjk3MTI2NCIsInBlcm1pc3Npb24iOiIifQ==.6780daf88206d3f4f2cfc184268f4c1b80f25a916105219a5a6f2e904762b1e8"; +//// String type="application/json"; +//// String[] headers=new String[] {"token",token,"Content-Type",type}; +//// String url= ("https://u.boe.com/userbasic/org/manageOrgIds"); +//// ObjectMapper mapper=new ObjectMapper(); +//// String responseStr=null; +//// try{ +//// OkHttpUtil http=new OkHttpUtil(); +//// responseStr = http.doPostJson(url,"{}", headers); +//// System.out.println(responseStr); +//// JsonNode rootNode= mapper.readTree(responseStr); +//// int code = rootNode.get("status").asInt(); +//// System.out.println("code="+code); +//// if(code!=200) { +//// log.error("获取当前用户拥有权限机构id错误："+responseStr); +//// } +//// +//// if(rootNode.get("result")!=null & rootNode.get("result").isArray()) { +//// JsonNode result = rootNode.get("result"); +//// Iterator elements = result.elements(); +//// while (elements.hasNext()){ +//// orgIds.add(elements.next().toString()); +//// } +//// } +//// for(String str : orgIds) { +//// System.out.println(str); +//// } +//// }catch (Exception e){ +//// log.error("获取当前用户有权限的机构id错误",e); +//// } +// String token="eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzUzMTY3OTMsImV4cCI6MTY3NTMyMzk5MywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjdFMDY1NzQxLTkzRUItRTc1Ni02Mzk5LUIwQTA1QUY2NEE3OSIsInVJZCI6Ijk2NTM2OTU4MjM5Mjk3MTI2NCIsInBlcm1pc3Npb24iOiIifQ==.75814a454f8a022cbe24f29eb956b5350f1212fc105b951df8bc2a82975a05a4"; +// String url= "https://u.boe.com/userbasic/audience/memberList"; +// Map params = new HashMap<>(); +// params.put("audienceId", "70061506155860912129"); +// String json = null; +// List list=new ArrayList(); +// ObjectMapper mapper=new ObjectMapper(); +// try { +// +// json = mapper.writeValueAsString(params); +// OkHttpUtil http=new OkHttpUtil(); +// String[] headers=new String[] {"token",token,"Content-Type","application/json"}; +// String responseStr = http.doPostJson(url, json, headers); +// System.out.println(responseStr); +// JsonNode rootNode= mapper.readTree(responseStr); +// +// JsonNode result = rootNode.get("result")!=null ? ( rootNode.get("result").get("data") !=null ? rootNode.get("result").get("data"):null):null; +// if(result!=null && result.isArray()) { +// //这里应该是单独的线程去处理 +// for(JsonNode JsonNode :result) { +// AudienceUser au=new AudienceUser(); +// au.setId(JsonNode.get("id").asText()); +// au.setName(JsonNode.get("userName").asText()); +// au.setCode(JsonNode.get("userNo").asText()); +// list.add(au); +// System.out.println(au.getName()); +// } +// } +// } catch (Exception e) { +// log.error("获取受众用户列表错误",e); +// } // // }