From 33e9e869b30c6805f10f943ad3f2678653dae1af Mon Sep 17 00:00:00 2001
From: zzc <1278921369@qq.com>
Date: Sun, 3 Nov 2024 00:48:46 +0800
Subject: [PATCH] =?UTF-8?q?unipush=20=E5=AF=B9=E6=8E=A5=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/app/EqDeviceController.java    | 37 +++++++++++++++++++
 .../src/main/resources/application-dev.yml    |  2 +-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
index fcf2946c4..387f91049 100644
--- a/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
+++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
@@ -3,6 +3,9 @@ package org.dromara.web.controller.app;
 import cn.dev33.satoken.annotation.SaIgnore;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSONObject;
 import jakarta.servlet.http.HttpServletRequest;
 
 import lombok.RequiredArgsConstructor;
@@ -23,6 +26,7 @@ import org.dromara.web.device.iot.DeviceDto;
 import org.dromara.web.domain.bo.*;
 import org.dromara.web.domain.vo.*;
 import org.dromara.web.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -148,6 +152,39 @@ public class EqDeviceController extends BaseController {
         return R.ok(eqEquipmentService.getDeviceMsg(bo));
     }
 
+    @Autowired
+    private IEqClientIdService eqClientIdService;
+    /**
+     * app通知
+     */
+    @GetMapping("/appAdvice")
+    public R<Void> appAdvice(@RequestBody EqEquipmentLogBo param){
+        JSONObject pushInfo = new JSONObject();
+        //设备查询
+        EqEquipmentBo eqEquipmentBo = new EqEquipmentBo();
+        eqEquipmentBo.setEquipmentCode(param.getEquipmentCode());
+        List<EqEquipmentVo> eqEquipmentVos = eqEquipmentService.queryList(eqEquipmentBo);
+        if (CollectionUtils.isEmpty(eqEquipmentVos)) return R.ok("设备未绑定用户");
+        EqEquipmentVo eqEquipmentVo = eqEquipmentVos.get(0);
+
+        //cid查询
+        EqClientIdBo bo = new EqClientIdBo();
+        bo.setUserId(eqEquipmentVo.getUserId());
+        List<EqClientIdVo> eqClientIdVos = eqClientIdService.queryList(bo);
+        if (CollectionUtils.isEmpty(eqClientIdVos)) return R.ok("为查询到设备cid");
+        EqClientIdVo eqClientId = eqClientIdVos.get(0);
+
+
+        pushInfo.put("cids", Collections.singletonList(eqClientId.getCid()));
+//pushInfo.put("getui_alias","unipush2_"+ pay0rder.getStoreId());
+        pushInfo.put("title","莫克通知");
+        pushInfo.put("content",param.getStatus());//todo
+        pushInfo.put("data",new JSONObject());
+        HttpResponse response = HttpUtil.createPost("appPushconfig.getuniPushcloudurl()").body(pushInfo.toJSONString()).execute();
+        return R.ok("消息发送成功");
+    }
+
+
 
     /**
      * 获取日志
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 0b9906b2c..261affb58 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -97,7 +97,7 @@ spring.data:
     # 数据库索引
     database: 2
     # redis 密码必须配置
-#    password: ruoyi123
+    password: ruoyi123
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl