From 27783fe3964357c853e82b00303cfa327d63a41d Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Thu, 26 Oct 2023 10:03:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../csdevice/pojo/dto/CsEquipmentDeliveryDTO.java    |  8 ++++----
 .../equipment/EquipmentDeliveryController.java       |  4 ++++
 .../csdevice/mapper/CsDevModelRelationMapper.java    |  1 +
 .../mapper/mapping/CsDevModelRelationMapper.xml      | 12 ++++++++++++
 .../csdevice/service/CsDevModelRelationService.java  |  3 +++
 .../service/impl/CsDevModelRelationServiceImpl.java  |  5 +++++
 6 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java
index f160cbb..31490f6 100644
--- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java
+++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/dto/CsEquipmentDeliveryDTO.java
@@ -66,10 +66,10 @@ public class CsEquipmentDeliveryDTO  {
      */
     private String devAccessMethod;
 
-//    /**
-//     * 装置程序版本
-//     */
-//    private String programVersion;
+    /**
+     * 装置程序版本
+     */
+    private String programVersionName;
 
     /**
      * 调试人员
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 c154b55..1002347 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
@@ -16,6 +16,7 @@ import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
 import com.njcn.csdevice.pojo.vo.DeviceManagerVO;
 import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO;
+import com.njcn.csdevice.service.CsDevModelRelationService;
 import com.njcn.csdevice.service.CsEquipmentDeliveryService;
 import com.njcn.csdevice.service.IMqttUserService;
 import com.njcn.csdevice.utils.ExcelStyleUtil;
@@ -57,6 +58,7 @@ public class EquipmentDeliveryController extends BaseController {
     private final CsEquipmentDeliveryService csEquipmentDeliveryService;
 
     private final IMqttUserService mqttUserService;
+    private final CsDevModelRelationService csDevModelRelationService;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/addEquipmentDelivery")
@@ -141,6 +143,8 @@ public class EquipmentDeliveryController extends BaseController {
         List<CsEquipmentDeliveryDTO> collect = csEquipmentDeliveryPOS.stream().map(temp -> {
             CsEquipmentDeliveryDTO csEquipmentDeliveryDTO = new CsEquipmentDeliveryDTO();
             BeanUtils.copyProperties(temp, csEquipmentDeliveryDTO);
+            String versionByDevId = csDevModelRelationService.getVersionByDevId(temp.getId());
+            csEquipmentDeliveryDTO.setProgramVersionName(versionByDevId);
             return csEquipmentDeliveryDTO;
         }).collect(Collectors.toList());
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, collect, methodDescribe);
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDevModelRelationMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDevModelRelationMapper.java
index 87f2b9c..6743acd 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDevModelRelationMapper.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/CsDevModelRelationMapper.java
@@ -17,4 +17,5 @@ public interface CsDevModelRelationMapper extends BaseMapper<CsDevModelRelationP
 
     String getModelByType(@Param("devId") String devId, @Param("type") Integer type);
 
+    String getVersionByDevId(@Param("devId")String devId);
 }
\ No newline at end of file
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelRelationMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelRelationMapper.xml
index d250462..94256fe 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelRelationMapper.xml
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelRelationMapper.xml
@@ -30,4 +30,16 @@
     t0.status="1" and
         t0.dev_id = #{devId} and t1.`type` = #{type}
   </select>
+  <select id="getVersionByDevId" resultType="string">
+    select
+    t1.version_no
+    from
+    cs_dev_model_relation t0
+    left join cs_dev_model t1 on
+    t0.model_id = t1.id
+    where
+    t0.status="1" and
+    t0.dev_id = #{devId}
+    order by t1.version_date desc limit 1
+  </select>
 </mapper>
\ No newline at end of file
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDevModelRelationService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDevModelRelationService.java
index 19d822b..8d6737b 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDevModelRelationService.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsDevModelRelationService.java
@@ -53,4 +53,7 @@ public interface CsDevModelRelationService extends IService<CsDevModelRelationPO
          */
         String getModelByType(String devId, Integer type);
 
+        String getVersionByDevId(String devId);
+
+
 }
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelRelationServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelRelationServiceImpl.java
index f5b3a28..ff529ea 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelRelationServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelRelationServiceImpl.java
@@ -96,4 +96,9 @@ public class CsDevModelRelationServiceImpl extends ServiceImpl<CsDevModelRelatio
     public String getModelByType(String devId, Integer type) {
         return this.baseMapper.getModelByType(devId,type);
     }
+
+    @Override
+    public String getVersionByDevId(String devId) {
+        return this.baseMapper.getVersionByDevId(devId);
+    }
 }