塔吊设备页面接口优化

bonus-modules/bonus-base/src/main/java/com/bonus/base/basic/domain/ConstInfoVo.java

@@ -1,5 +1,6 @@
 package com.bonus.base.basic.domain;
 
+import com.bonus.base.screen.domain.TowerCraneInfoVo;
 import lombok.Data;
 
 /**
@@ -70,7 +71,10 @@ public class ConstInfoVo {
     private int num;
 
 
-
+    /**
+     * 塔吊设备信息
+     */
+    private TowerCraneInfoVo towerCraneInfo;
 
 
 

bonus-modules/bonus-base/src/main/java/com/bonus/base/screen/service/impl/TowerCraneDetectionServiceImpl.java

@@ -37,6 +37,12 @@ public class TowerCraneDetectionServiceImpl implements TowerCraneDetectionServic
         //设置查询类型
         constInfoVo.setTypeCode(TypeCodeUtils.TC_CODE);
         List<ConstInfoVo> collectDevVoList = mapper.getConstDeviceList(constInfoVo);
+        collectDevVoList.forEach(item -> {
+            if(item != null && item.getConfigData() != null){
+                JSONObject jsonObject = JsonHelper.jsonStrToJsonObj(item.getConfigData());
+                item.setTowerCraneInfo(JsonHelper.jsonObjToBean(jsonObject.getJSONObject("deviceDetail"), TowerCraneInfoVo.class));
+            }
+        });
         return collectDevVoList;
     }
 
@@ -47,8 +53,7 @@ public class TowerCraneDetectionServiceImpl implements TowerCraneDetectionServic
      */
     @Override
     public List<DeviceAlarmVo> getTowerCraneAlarmList(ConstInfoVo constInfoVo) {
-        List<DeviceAlarmVo> deviceAlarmVoList = mapper.getTowerCraneAlarmList(constInfoVo);
-        return deviceAlarmVoList;
+        return mapper.getTowerCraneAlarmList(constInfoVo);
     }
 
     /**

bonus-modules/bonus-base/src/main/resources/mapper/screen.basic/TowerCraneDetectionMapper.xml

@@ -11,7 +11,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             tci.`name`,
             tci.`code`,
             tcd.is_online,
-            tcd.dev_location
+            tcd.dev_location,
+            tci.config_data
         FROM
             tb_const_info tci
                 LEFT JOIN tb_collect_device tcd ON tci.id = tcd.const_id