From b26526f7be82d3079704f2505237a61628cefa97 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Sat, 18 Nov 2023 10:13:35 +0800
Subject: [PATCH] fix：五分钟数据过滤
---
screen-api/src/main/java/com/moral/api/controller/AppUserController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AppUserController.java b/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
index b3091dc..c6157c1 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AppUserController.java
@@ -18,10 +18,15 @@
import java.util.HashMap;
import java.util.Map;
+import javax.validation.Valid;
+
import com.alibaba.fastjson.JSON;
+import com.moral.api.entity.Allocation;
+import com.moral.api.pojo.query.app.AppAllocationPushUserCond;
import com.moral.api.service.UserService;
-import com.moral.api.utils.HttpClientUtil;
+
+import com.moral.api.utils.WechatUtils;
import com.moral.api.vo.WxMssVo;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
@@ -66,11 +71,12 @@
return ResultMessage.ok();
}
- @GetMapping("pushOneUser")
+ @PostMapping("pushOneUser")
@ApiOperation(value = "���������������������")
- public ResultMessage pushOneUser(){
- String body = push("oOCWi6-_hnzSvrMT8HX5D7Dz7tEA");
- return ResultMessage.ok(body);
+ public ResultMessage pushOneUser(@Valid @RequestBody Allocation appAllocationPushUserCond){
+ userService.pushOneUser(appAllocationPushUserCond);
+// String body = push("oOCWi6-_hnzSvrMT8HX5D7Dz7tEA");
+ return ResultMessage.ok();
}
@@ -78,7 +84,7 @@
RestTemplate restTemplate = new RestTemplate();
//������������������������������������������������access_token������������������������������access_token������������������������������
//���������������
- String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + HttpClientUtil.getAccessToken();
+ String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + WechatUtils.getAccessToken();
// String url = "https://api.weixin.qq.com/cgi-bin/message/wxopen/template/send?access_token=" + HttpClientUtil.getAccessToken();
// String url = "https://api.weixin.qq.com/cgi-bin/message/wxopen/template/uniform_send?access_token=" + HttpClientUtil.getAccessToken();
// String url = "https://api.weixin.qq.com/cgi-bin/message/template/send?access_token=" + HttpClientUtil.getAccessToken();
@@ -108,7 +114,6 @@
m.put("thing2", map3);
m.put("date4", map4);
wxMssVo.setData(JSON.toJSON(m));
-
ResponseEntity<String> responseEntity =
restTemplate.postForEntity(url, wxMssVo, String.class);
--
Gitblit v1.8.0