From 129961336cd5877765979117bc1e2270361ebb3b Mon Sep 17 00:00:00 2001
From: sxu <1539530615@qq.com>
Date: Mon, 4 Dec 2023 15:53:48 +0800
Subject: [PATCH] fix

---
 .../com/bonus/zlpt/equip/ZlptEquipApplication.java |  2 ++
 .../com/bonus/zlpt/order/ZlptOrderApplication.java |  2 ++
 .../order/controller/OrderDetailsController.java   | 12 +++++++++++-
 .../com/bonus/zlpt/order/feign/EquipClient.java    | 14 ++++++++++++++
 4 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/feign/EquipClient.java

diff --git a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/ZlptEquipApplication.java b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/ZlptEquipApplication.java
index 3d0705e..11b68f8 100644
--- a/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/ZlptEquipApplication.java
+++ b/zlpt-modules/zlpt-equip/src/main/java/com/bonus/zlpt/equip/ZlptEquipApplication.java
@@ -5,6 +5,7 @@ import com.bonus.zlpt.common.security.annotation.EnableRyFeignClients;
 import com.bonus.zlpt.common.swagger.annotation.EnableCustomSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 /**
  * 设备模块
@@ -14,6 +15,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  */
 @EnableCustomConfig
 @EnableCustomSwagger2
+@EnableDiscoveryClient
 @EnableRyFeignClients
 @SpringBootApplication
 public class ZlptEquipApplication {
diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/ZlptOrderApplication.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/ZlptOrderApplication.java
index 5842570..014874a 100644
--- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/ZlptOrderApplication.java
+++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/ZlptOrderApplication.java
@@ -5,6 +5,7 @@ import com.bonus.zlpt.common.security.annotation.EnableRyFeignClients;
 import com.bonus.zlpt.common.swagger.annotation.EnableCustomSwagger2;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 
 /**
  * 设备模块
@@ -14,6 +15,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
  */
 @EnableCustomConfig
 @EnableCustomSwagger2
+@EnableDiscoveryClient
 @EnableRyFeignClients
 @SpringBootApplication
 public class ZlptOrderApplication {
diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java
index a9f943b..2d8b5b9 100644
--- a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java
+++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/controller/OrderDetailsController.java
@@ -1,7 +1,9 @@
 package com.bonus.zlpt.order.controller;
 
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
+import com.bonus.zlpt.common.core.domain.equip.vo.DevInfoVo;
 import com.bonus.zlpt.common.core.utils.poi.ExcelUtil;
 import com.bonus.zlpt.common.core.web.controller.BaseController;
 import com.bonus.zlpt.common.core.web.domain.AjaxResult;
@@ -9,6 +11,7 @@ import com.bonus.zlpt.common.core.web.page.TableDataInfo;
 import com.bonus.zlpt.common.log.annotation.Log;
 import com.bonus.zlpt.common.log.enums.BusinessType;
 import com.bonus.zlpt.common.security.annotation.RequiresPermissions;
+import com.bonus.zlpt.order.feign.EquipClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.bonus.zlpt.common.core.domain.order.OrderDetails;
 import com.bonus.zlpt.order.service.IOrderDetailsService;
+import static com.bonus.zlpt.common.core.web.domain.AjaxResult.DATA_TAG;
 
 /**
  * 订单详细Controller
@@ -33,6 +37,8 @@ public class OrderDetailsController extends BaseController
 {
     @Autowired
     private IOrderDetailsService orderDetailsService;
+    @Autowired
+    EquipClient equipClient;
 
     /**
      * 查询订单详细列表
@@ -66,7 +72,11 @@ public class OrderDetailsController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return success(orderDetailsService.selectOrderDetailsById(id));
+        OrderDetails orderDetails = orderDetailsService.selectOrderDetailsById(id);
+        AjaxResult o = equipClient.getInfo(orderDetails.getMaId());
+        Map map = (Map) o.get(DATA_TAG);
+        String modelName = (String) map.get("modelName");
+        return success(orderDetails);
     }
 
     /**
diff --git a/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/feign/EquipClient.java b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/feign/EquipClient.java
new file mode 100644
index 0000000..72debad
--- /dev/null
+++ b/zlpt-modules/zlpt-order/src/main/java/com/bonus/zlpt/order/feign/EquipClient.java
@@ -0,0 +1,14 @@
+package com.bonus.zlpt.order.feign;
+
+import com.bonus.zlpt.common.core.web.domain.AjaxResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+@FeignClient(name = "zlpt-equip", contextId = "zlpt-equip")
+public interface EquipClient {
+
+	@GetMapping(value = "/dev/{maId}")
+	public AjaxResult getInfo(@PathVariable("maId") Long maId);
+
+}