接口联调

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/DevVersion.java

@@ -67,5 +67,8 @@ public class DevVersion extends BaseEntity {
      */
     private LocalDateTime updateTime;
 
+    private String devType;
+    private String devTypeName;
+
 
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/TerminalVersionMapper.java

@@ -1,6 +1,7 @@
 package com.njcn.device.pq.mapper;
 
 import com.njcn.device.pq.pojo.param.TerminalMainQueryParam;
+import com.njcn.device.pq.pojo.po.DevVersion;
 import com.njcn.device.pq.pojo.vo.TerminalMaintainVO;
 import com.njcn.device.pq.pojo.vo.TerminalVersionVO;
 import org.apache.ibatis.annotations.Param;
@@ -51,8 +52,5 @@ public interface TerminalVersionMapper {
     List<TerminalVersionVO> getPqLineGdAndSubList(@Param("ids") List<String> ids);
 
 
-
+    List<DevVersion> selectListById(String id);
-
-
-
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/TerminalVersionMapper.xml

@@ -69,5 +69,15 @@
         </foreach>
         order by a.sort
     </select>
+    <select id="selectListById" resultType="com.njcn.device.pq.pojo.po.DevVersion">
+        SELECT
+        cdv.*,
+        pd.Dev_Type AS devType,
+        sdd.Name AS devTypeName
+        FROM cld_dev_version cdv
+        LEFT JOIN pq_device pd ON cdv.Line_Id = pd.Id
+        LEFT JOIN sys_dict_data sdd ON pd.Dev_Type = sdd.Id
+        WHERE cdv.Line_Id = #{id}
+    </select>
 
 </mapper>

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/TerminalVersionService.java

@@ -26,6 +26,7 @@ public interface TerminalVersionService {
      * 查询装置升级日志
      * @author cdf
      * @date 2022/5/17
+     * @return
      */
     List<DevVersion> getTerminalUpLog(String id);
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalVersionServiceImpl.java

@@ -64,9 +64,7 @@ public class TerminalVersionServiceImpl implements TerminalVersionService {
 
     @Override
     public List<DevVersion> getTerminalUpLog(String id) {
-        LambdaQueryWrapper<DevVersion> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        return terminalVersionMapper.selectListById(id);
-        lambdaQueryWrapper.eq(DevVersion::getLineId,id);
-        return devVersionMapper.selectList(lambdaQueryWrapper);
     }