item：消防水池/info/detail液位返回拼接单位

YeeAmosFireAutoSysService/src/main/java/com/yeejoin/amos/fas/business/service/impl/FireEquipServiceImpl.java

@@ -6,7 +6,6 @@ import com.yeejoin.amos.fas.business.dao.mapper.ImpEquipMapper;
 import com.yeejoin.amos.fas.business.dao.repository.IFireEquipmentDao;
 import com.yeejoin.amos.fas.business.dao.repository.IFireStationDao;
 import com.yeejoin.amos.fas.business.dao.repository.IWaterResourceDao;
-import com.yeejoin.amos.fas.business.entity.mybatis.FireEquipmentEntity;
 import com.yeejoin.amos.fas.business.param.CommonPageInfoParam;
 import com.yeejoin.amos.fas.business.service.intfc.IFireEquipService;
 import com.yeejoin.amos.fas.business.util.FireEquipmentType;
@@ -16,8 +15,6 @@ import com.yeejoin.amos.fas.core.common.request.CommonPageable;
 import com.yeejoin.amos.fas.core.common.response.CommonPage;
 import com.yeejoin.amos.fas.dao.entity.FireEquipment;
 import com.yeejoin.amos.fas.dao.entity.FireStation;
-import com.yeejoin.amos.fas.dao.entity.WaterResource;
-import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -163,7 +160,7 @@ public class FireEquipServiceImpl implements IFireEquipService {
                     equipDetails.stream().forEach(map -> equipDetailIdList.add(map.get("id")));
                     List<EquipmentSpecificIndexVo> specificIndexVos = equipmentSpecificIndexMapper.findByDetailIdInAndNameKey(equipDetailIdList, NAME_KEY);
                     if (specificIndexVos != null && !specificIndexVos.isEmpty()) {
-                        fireStation.setLevel(specificIndexVos.get(0).getValue());
+                        fireStation.setLevel(specificIndexVos.get(0).getValue().concat(" ").concat(specificIndexVos.get(0).getEquipmentIndexUnitName()));
                     }
                 }
                 returnEntity = fireStation;

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific_index.xml

@@ -7,7 +7,8 @@
     <select id="findByDetailIdInAndNameKey"
             resultType="com.yeejoin.amos.fas.business.vo.EquipmentSpecificIndexVo">
         SELECT
-            wsi.`value`
+            wsi.`value`,
+            wei.unit AS equipmentIndexUnitName
         FROM
             `wl_equipment_index` wei
             RIGHT JOIN wl_equipment_specific_index wsi ON wei.id = wsi.equipment_index_id