From 5a6677ce3de734118fd83e061b5ca06d16b533d8 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Sat, 14 Sep 2024 11:43:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=95=E6=B3=A2=E6=96=87=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/csdevice/api/EquipmentFeignClient.java | 8 ++++++++
 .../fallback/EquipmentFeignClientFallbackFactory.java    | 6 ++++++
 .../equipment/EquipmentDeliveryController.java           | 9 +++++++++
 .../csdevice/service/CsEquipmentDeliveryService.java     | 7 +++++++
 .../service/impl/CsEquipmentDeliveryServiceImpl.java     | 5 +++++
 5 files changed, 35 insertions(+)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EquipmentFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EquipmentFeignClient.java
index dc29dce..1b574f2 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EquipmentFeignClient.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EquipmentFeignClient.java
@@ -1,11 +1,16 @@
 package com.njcn.csdevice.api;
 
+import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.csdevice.api.fallback.EquipmentFeignClientFallbackFactory;
 import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -50,4 +55,7 @@ public interface EquipmentFeignClient {
      */
     @PostMapping("/updateModuleNumber")
     HttpResult<String> updateModuleNumber(@RequestParam("nDid") String nDid,@RequestParam("number") Integer number);
+
+    @PostMapping("/getAll")
+    HttpResult<List<CsEquipmentDeliveryPO>> getAll();
 }
diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java
index 2649b58..56736e3 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/EquipmentFeignClientFallbackFactory.java
@@ -71,6 +71,12 @@ public class EquipmentFeignClientFallbackFactory implements FallbackFactory<Equi
                 log.error("{}异常，降级处理，异常为：{}","更新设备模块个数",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<CsEquipmentDeliveryPO>> getAll() {
+                log.error("{}异常，降级处理，异常为：{}","获取所有装置",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
index ea47f61..b5cd00f 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java
@@ -297,4 +297,13 @@ public class EquipmentDeliveryController extends BaseController {
         }
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getAll")
+    @ApiOperation("获取所有装置")
+    public HttpResult<List<CsEquipmentDeliveryPO>> getAll(){
+        String methodDescribe = getMethodDescribe("getAll");
+        List<CsEquipmentDeliveryPO> result = csEquipmentDeliveryService.getAll();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
 }
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java
index 351a9a6..671a57f 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java
@@ -14,6 +14,7 @@ import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 
@@ -116,4 +117,10 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
     void updateModuleNumber(String nDid, Integer number);
 
     boolean rebootDevice(String nDid);
+
+    /**
+     * 获取所有装置信息
+     * @return
+     */
+    List<CsEquipmentDeliveryPO> getAll();
 }
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
index 640cd08..43fbf5e 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java
@@ -619,6 +619,11 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         return result;
     }
 
+    @Override
+    public List<CsEquipmentDeliveryPO> getAll() {
+        return this.lambdaQuery().ne(CsEquipmentDeliveryPO::getRunStatus,0).list();
+    }
+
     /**
      * 根据ndid生成二维码
      * @param ndid