feat:update xiaozhi ota

Author: ruanrongman

docs/README.md

@@ -88,7 +88,7 @@ mysql,redis,emqx和influxdb环境。
 欢迎加入群聊一起交流讨论有关Aiot相关的话题，免费获取智控台的前端源码，链接过期了可以issue或email提醒一下作者。
 
 <div style="width: 250px;margin: 0 auto;">
-    <img src="./images/bb570f3da747f8c91314697b969271c0.jpg" width="250px"/>
+    <img src="./images/c2cfd1c5bbbe84e9d5892823f7dc6789.jpg" width="250px"/>
 </div>
 
 

docs/_sidebar.md

@@ -3,9 +3,9 @@
   - [:bookmark: 快速开始](get_started/quick_start.md#快速开始)
   - [:bookmark_tabs: 创建物模型和设备接入](get_started/create_thingsmodel.md#创建物模型和设备接入)
 - 接入小智
-  - [:bookmark_tabs: 小智接入和OTA升级](xiaozhi/xiaozhi.md#小智接入和OTA升级)
+  - [:bookmark_tabs: 小智接入](xiaozhi/xiaozhi.md#小智接入)
 - Ota 
-  - [:bookmark_tabs: 常规OTA升级](ota/common.md#普通OTA升级)
+  - [:bookmark_tabs: OTA升级](ota/common.md#OTA升级)
 - Mcp protocol
   - [:bookmark_tabs: 连接mcp服务器](mcp/connect_mcpServer.md#连接mcp服务器)
 

docs/images/bb570f3da747f8c91314697b969271c0.jpg

@@ -49,11 +49,12 @@ curl --location 'http://localhost:8080/api/v2/otaPassive' \
 --data '{
   "deviceName": "{deviceName}",
   "name": "{name}",
+  "description": "{description}",
   "versionName": "{versionName}"
 }'
 ```
 
-替换{deviceName}为设备名称，{your token}为token,{name}为升级包名称，{versionName}为升级包指定的版本名称。
+替换{deviceName}为设备名称，{your token}为token,{name}为升级包名称，{versionName}为升级包指定的版本名称，{description}为升级包描述。
 
 * 3.设备端通过通过网络连接，通过以下接口获取待升级的固件信息:
 
@@ -76,4 +77,22 @@ curl -X GET "http://localhost:8080/api/v2/otaPassiveEnable?deviceName={deviceNam
 }
 ```
 * 4.设备端通过网络连接，下载升级包，并进行升级。
-  【下载升级包地址】：http://localhost:8080/api/v2/micro/{fileName}
+  【下载升级包地址】：http://localhost:8080/api/v2/micro/{fileName}
+## 小智OTA升级
+> 小智OTA升级，支持小智直接通过平台的小智OTA接口进行升级。适用于平台的小智升级场景。
+* 1.上传软件升级包到服务器，使用上述方法步骤进行上传。
+* 2.指定待升级的固件，请使用以下命令进行设置：
+
+```bash
+curl -X POST "http://localhost:8080/api/v2/xiaozhi/otaPassive" 
+-H "accept: */*" 
+-H "Content-Type: application/json" 
+--header 'Authorization: {your token}'
+-d "{\"otaId\":{otaId},\"productId\":{productId},\"versionName\":{versionName}}"
+```
+
+替换{otaId}为固件id，{productId}为产品id，{your token}为token，{versionName}为升级包指定的版本名称。
+
+* 3.设备端通过通过网络连接，通过以下接口获取待升级的固件信息:
+* http://localhost:8080/xiaozhi/ota/
+返回信息详情请见[小智ota介绍] (https://ccnphfhqs21z.feishu.cn/wiki/FjW6wZmisimNBBkov6OcmfvknVd)

docs/images/c2cfd1c5bbbe84e9d5892823f7dc6789.jpg

@@ -14,8 +14,10 @@ AI小智是由虾哥研发的一款以情感交互为核心的开源AI语音对
 ota:
   bin:
     path: D://temp-rainy//
+    url: http://127.0.0.1:8080/api/v2/micro/(固件升级URL)
   xiaozhi:
     url: ws://127.0.0.1:8080(改成你部署的域名)
+    version: 1.9.2 (改成你的版本号)
 ```
 
 3. 通过下面接口进行绑定

docs/ota/common.md

@@ -116,7 +116,7 @@ mysql,redis,emqx和influxdb环境，安装详情请看官方文档。
 欢迎加入群聊一起交流讨论有关Aiot相关的话题，免费获取智控台的前端源码，链接过期了可以issue或email提醒一下作者。
 
 <div style="width: 250px;margin: 0 auto;">
-    <img src="./docs/images/bb570f3da747f8c91314697b969271c0.jpg" width="250px"/>
+    <img src="./docs/images/c2cfd1c5bbbe84e9d5892823f7dc6789.jpg" width="250px"/>
 </div>
 
 ## 致谢

docs/xiaozhi/xiaozhi.md

@@ -30,6 +30,7 @@
 import top.rslly.iot.services.*;
 import top.rslly.iot.services.agent.AiServiceImpl;
 import top.rslly.iot.services.agent.KnowledgeChatServiceImpl;
+import top.rslly.iot.services.agent.OtaXiaozhiPassiveServiceImpl;
 import top.rslly.iot.services.agent.OtaXiaozhiServiceImpl;
 import top.rslly.iot.services.iot.AlarmEventServiceImpl;
 import top.rslly.iot.services.iot.HardWareServiceImpl;
@@ -79,6 +80,8 @@ public class Tool {
   private OtaXiaozhiServiceImpl otaXiaozhiService;
   @Autowired
   private KnowledgeChatServiceImpl knowledgeChatService;
+  @Autowired
+  private OtaXiaozhiPassiveServiceImpl otaXiaozhiPassiveService;
 
   @Operation(summary = "用于获取平台运行环境信息", description = "单位为百分比")
   @RequestMapping(value = "/machineMessage", method = RequestMethod.GET)
@@ -399,4 +402,37 @@ public JsonResult<?> getMcpPointTools(@RequestParam("productId") int productId,
     return aiService.getMcpPointTools(productId);
   }
 
+  @Operation(summary = "ota小智升级", description = "获取ota小智升级包详情")
+  @RequestMapping(value = "/xiaozhi/otaPassive", method = RequestMethod.GET)
+  public JsonResult<?> getXiaoZhiOtaPassive(@RequestHeader("Authorization") String header) {
+    return otaXiaozhiPassiveService.otaXiaozhiPassiveList(header);
+  }
+
+  @Operation(summary = "ota小智升级", description = "选择ota小智升级包")
+  @RequestMapping(value = "/xiaozhi/otaPassive", method = RequestMethod.POST)
+  public JsonResult<?> postXiaoZhiOtaPassive(
+      @Valid @RequestBody OtaXiaozhiPassive otaXiaozhiPassive,
+      @RequestHeader("Authorization") String header) {
+    try {
+      if (!safetyService.controlAuthorizeProduct(header, otaXiaozhiPassive.getProductId()))
+        return ResultTool.fail(ResultCode.NO_PERMISSION);
+    } catch (NullPointerException e) {
+      return ResultTool.fail(ResultCode.PARAM_NOT_VALID);
+    }
+    return otaXiaozhiPassiveService.otaXiaozhiPassivePost(otaXiaozhiPassive);
+  }
+
+  @Operation(summary = "ota小智升级", description = "删除ota小智升级包")
+  @RequestMapping(value = "/xiaozhi/otaPassive", method = RequestMethod.DELETE)
+  public JsonResult<?> deleteXiaoZhiOtaPassive(@RequestParam("id") int id,
+      @RequestHeader("Authorization") String header) {
+    try {
+      if (!safetyService.controlAuthorizeXiaoZhiOtaPassive(header, id))
+        return ResultTool.fail(ResultCode.NO_PERMISSION);
+    } catch (NullPointerException e) {
+      return ResultTool.fail(ResultCode.PARAM_NOT_VALID);
+    }
+    return otaXiaozhiPassiveService.otaXiaozhiPassiveDelete(id);
+  }
+
 }

readme.md

@@ -0,0 +1,36 @@
+/**
+ * Copyright © 2023-2030 The ruanrongman Authors
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package top.rslly.iot.dao;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.transaction.annotation.Transactional;
+import top.rslly.iot.models.OtaXiaozhiPassiveEntity;
+
+import java.util.List;
+
+public interface OtaXiaozhiPassiveRepository
+    extends JpaRepository<OtaXiaozhiPassiveEntity, Integer> {
+  List<OtaXiaozhiPassiveEntity> findAllById(int id);
+
+  List<OtaXiaozhiPassiveEntity> findAllByProductId(int productId);
+
+  @Transactional
+  List<OtaXiaozhiPassiveEntity> deleteAllById(int id);
+}

src/main/java/top/rslly/iot/controllers/Tool.java

@@ -0,0 +1,90 @@
+/**
+ * Copyright © 2023-2030 The ruanrongman Authors
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package top.rslly.iot.models;
+
+import javax.persistence.*;
+import java.util.Objects;
+
+@Entity
+@Table(name = "ota_xiaozhi_passive", schema = "cwliot1.8", catalog = "")
+public class OtaXiaozhiPassiveEntity {
+  private int id;
+  private int otaId;
+  private int productId;
+  private String versionName;
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "id")
+  public int getId() {
+    return id;
+  }
+
+  public void setId(int id) {
+    this.id = id;
+  }
+
+  @Basic
+  @Column(name = "ota_id")
+  public int getOtaId() {
+    return otaId;
+  }
+
+  public void setOtaId(int otaId) {
+    this.otaId = otaId;
+  }
+
+  @Basic
+  @Column(name = "product_id")
+  public int getProductId() {
+    return productId;
+  }
+
+  public void setProductId(int productId) {
+    this.productId = productId;
+  }
+
+  @Basic
+  @Column(name = "version_name")
+  public String getVersionName() {
+    return versionName;
+  }
+
+  public void setVersionName(String versionName) {
+    this.versionName = versionName;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o)
+      return true;
+    if (o == null || getClass() != o.getClass())
+      return false;
+    OtaXiaozhiPassiveEntity that = (OtaXiaozhiPassiveEntity) o;
+    return id == that.id && otaId == that.otaId && productId == that.productId
+        && Objects.equals(versionName, that.versionName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, otaId, productId, versionName);
+  }
+}