From 49d7ce5a988596d7540083be0e1948bcb66af544 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 30 Oct 2023 17:12:03 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java | 11 +++++
screen-api/src/main/java/com/moral/api/controller/AppUserController.java | 33 ++++++++++++++++
screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java | 2 +
screen-api/src/main/java/com/moral/api/controller/AppDevicController.java | 5 --
screen-api/src/main/java/com/moral/api/utils/HttpClientUtil.java | 21 ++++++++++
screen-api/src/main/java/com/moral/api/vo/WxMssVo.java | 13 ++++++
6 files changed, 81 insertions(+), 4 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java b/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java
index c92f3cf..d230674 100644
--- a/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/AppDevicController.java
@@ -50,10 +50,7 @@
@ApiOperation(value = "���������������������")
public ResultMessage selectDevice(@RequestParam @ApiParam(value = "organizationId",name = "������ID") Integer organizationId){
List<Device> organizationDevice = deviceService.getOrganizationDevice(organizationId);
- if (ObjectUtils.isEmpty(organizationDevice)){
- return ResultMessage.fail(ResponseCodeEnum.TARGET_IS_NULL.getCode(), ResponseCodeEnum.TARGET_IS_NULL.getMsg());
- }
- return ResultMessage.ok(organizationDevice);
+ return ResultMessage.ok(ObjectUtils.isEmpty(organizationDevice)?null:organizationDevice);
}
@GetMapping("fuzzySearch")
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 0b70e52..114da94 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
@@ -7,17 +7,22 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.client.RestTemplate;
+import java.util.HashMap;
import java.util.Map;
import com.moral.api.service.UserService;
+import com.moral.api.utils.HttpClientUtil;
+import com.moral.api.vo.WxMssVo;
import com.moral.constant.ResponseCodeEnum;
import com.moral.constant.ResultMessage;
@@ -61,4 +66,32 @@
return ResultMessage.ok();
}
+ @GetMapping("pushOneUser")
+ @ApiOperation(value = "���������������������")
+ public ResultMessage pushOneUser(String openid){
+ String body = push("oOCWi6yfVapaK25Jnkk7jKSbMLyw");
+ return ResultMessage.ok(body);
+ }
+
+
+ public String push(String openid) {
+ RestTemplate restTemplate = new RestTemplate();
+ //������������������������������������������������access_token������������������������������access_token������������������������������
+ String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + HttpClientUtil.getAccessToken();
+ //���������������������
+ WxMssVo wxMssVo = new WxMssVo();
+ wxMssVo.setTouser(openid);//���������openid���������������������������������������������������������������������
+ wxMssVo.setTemplate_id("CFeSWarQLMPyPjwmiy6AV4eB-IZcipu48V8bFLkBzTU");//������������������id
+ wxMssVo.setPage("pages/index/index");
+
+ Map<String, String> m = new HashMap<>(3);
+ m.put("thing1", "���������������������");
+ m.put("thing6", "������������������");
+ m.put("thing7", "������������������");
+ wxMssVo.setData(m);
+ ResponseEntity<String> responseEntity =
+ restTemplate.postForEntity(url, wxMssVo, String.class);
+ return responseEntity.getBody();
+ }
+
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java b/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java
index 4b91bf2..c615402 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/enums/SysDictTypeEnum.java
@@ -38,6 +38,8 @@
*WIND
*/
WIND_FARM_SCOPE("WIND","������������"),
+
+ SYS_DEVICE("DEVICE","������������������")
;
@EnumValue
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
index 6458feb..b009485 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/OrganizationServiceImpl.java
@@ -5,6 +5,7 @@
import com.moral.api.entity.Organization;
import com.moral.api.mapper.OrganizationMapper;
import com.moral.api.pojo.vo.user.QxUser;
+import com.moral.api.service.DeviceService;
import com.moral.api.service.OrganizationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.moral.constant.Constants;
@@ -28,6 +29,9 @@
@Autowired
OrganizationMapper organizationMapper;
+
+ @Autowired
+ private DeviceService deviceService;
@Override
@@ -58,6 +62,13 @@
}
wrapper.eq("is_delete",Constants.NOT_DELETE);
List<Organization> organizations = organizationMapper.selectList(wrapper);
+ for (int i=0; i<organizations.size(); i++) {
+ List<String> macs = deviceService.getMacsByOrganizationId(organizations.get(i).getId());
+ if (ObjectUtils.isEmpty(macs)){
+ organizations.remove(i);
+ i--;
+ }
+ }
return organizations;
}
diff --git a/screen-api/src/main/java/com/moral/api/utils/HttpClientUtil.java b/screen-api/src/main/java/com/moral/api/utils/HttpClientUtil.java
index 39afb30..198c652 100644
--- a/screen-api/src/main/java/com/moral/api/utils/HttpClientUtil.java
+++ b/screen-api/src/main/java/com/moral/api/utils/HttpClientUtil.java
@@ -12,13 +12,19 @@
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.client.RestTemplate;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
public class HttpClientUtil {
@@ -133,4 +139,19 @@
return resultString;
}
+
+ public static String getAccessToken() {
+ RestTemplate restTemplate = new RestTemplate();
+ Map<String, String> params = new HashMap<>();
+ params.put("APPID", "wx7c54942dfc87f4d8"); //
+ params.put("APPSECRET", "5873a729c365b65ab42bb5fc82d2ed49"); //
+ ResponseEntity<String> responseEntity = restTemplate.getForEntity(
+ "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid={APPID}&secret={APPSECRET}", String.class, params);
+ String body = responseEntity.getBody();
+ JSONObject object = JSON.parseObject(body);
+ String Access_Token = object.getString("access_token");
+ String expires_in = object.getString("expires_in");
+ System.out.println("������������expires_in���" + expires_in);
+ return Access_Token;
+ }
}
diff --git a/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java b/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java
new file mode 100644
index 0000000..706aa87
--- /dev/null
+++ b/screen-api/src/main/java/com/moral/api/vo/WxMssVo.java
@@ -0,0 +1,13 @@
+package com.moral.api.vo;
+
+import lombok.Data;
+
+import java.util.Map;
+
+@Data
+public class WxMssVo {
+ private String touser;//������openid
+ private String template_id;//������������������id
+ private String page = "pages/index/index";//���������������������������
+ private Map<String, String> data;//������������
+}
--
Gitblit v1.8.0