From 38365ee0424879f654ef3b87031c537d7b27b8e3 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 08 Nov 2023 14:41:24 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
index 4d6e8d9..86fd061 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/UserServiceImpl.java
@@ -8,6 +8,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.moral.api.config.Interceptor.UserHelper;
import com.moral.api.entity.*;
import com.moral.api.mapper.*;
import com.moral.api.pojo.bo.UserBO;
@@ -15,8 +16,9 @@
import com.moral.api.pojo.enums.FileTableEnum;
import com.moral.api.pojo.enums.StateEnum;
import com.moral.api.pojo.enums.SysDictTypeEnum;
-import com.moral.api.pojo.query.app.AppAllocationPushUserCond;
+
import com.moral.api.pojo.vo.file.FileVo;
+import com.moral.api.pojo.vo.user.QxUser;
import com.moral.api.service.FileTableService;
import com.moral.api.service.ResponsibilityUnitService;
import com.moral.api.service.UserService;
@@ -247,7 +249,7 @@
@Override
@Async
public void pushOneUser(Allocation appAllocationPushUserCond) {
-
+ QxUser currentUser = UserHelper.getCurrentUser();
ResponsibilityUnit responsibilityUnit = responsibilityUnitMapper.selectById(appAllocationPushUserCond.getUnitId());
Integer areaCode = responsibilityUnit.getAreaCode();
@@ -273,6 +275,9 @@
String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + WechatUtils.getAccessToken();
//������������
for (User user : users) {
+ if (user.getId().equals(currentUser.getUserId())){
+ continue;
+ }
RestTemplate restTemplate = new RestTemplate();
//���������������������
WxMssVo wxMssVo = new WxMssVo();
@@ -280,7 +285,7 @@
wxMssVo.setTemplate_id("YNqUZ1MgMvwY3G-NENVbcmIBR5dUotSdnwcz96CWrho");//������������������id
wxMssVo.setLang("zh_CN");
wxMssVo.setMiniprogramState("formal");
-// wxMssVo.setPage("pages/index/index");
+ wxMssVo.setPage("pages/index/index");
Map<String, Object> m = new HashMap<>();
HashMap<String, Object> map1 = new HashMap<>();
HashMap<String, Object> map2 = new HashMap<>();
@@ -298,7 +303,7 @@
ResponseEntity<String> responseEntity =
restTemplate.postForEntity(url, wxMssVo, String.class);
String body = responseEntity.getBody();
- log.info("������:"+body+"������:"+user.getUserName());
+ log.info("������:"+body+"������:"+user.getAccount());
}
}
--
Gitblit v1.8.0