修改bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/EquProperty.java

@@ -58,4 +58,8 @@ public class EquProperty extends BaseEntity {
 	@TableField(exist = false)
 	private String equipmentIndexName;
 
+	@ApiModelProperty(value = "ID")
+	@TableField(exist = false)
+	private String equipmentId;
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/EquipmentIndexMapper.java

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.equipmanage.common.entity.EquProperty;
 import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
 import org.apache.ibatis.annotations.Param;
@@ -66,4 +67,6 @@ public interface EquipmentIndexMapper extends BaseMapper<EquipmentIndex> {
     List<EquipmentIndex> getPerfQutoaIotList(Long id);
 
     List<String> getGruopName(Long equipmentId);
+
+    List<EquProperty> getEquPropertyList();
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IEquipmentIndexService.java

@@ -2,6 +2,7 @@ package com.yeejoin.equipmanage.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yeejoin.equipmanage.common.entity.EquProperty;
 import com.yeejoin.equipmanage.common.entity.EquipmentIndex;
 import com.yeejoin.equipmanage.common.entity.vo.EquipmentIndexVO;
 
@@ -71,4 +72,7 @@ public interface IEquipmentIndexService extends IService<EquipmentIndex> {
      */
     List<EquipmentIndex> getPerfQutoaIotList(Long id);
 
+
+    List<EquProperty> getEquPropertyList();
+
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentIndexImpl.java

@@ -82,6 +82,11 @@ public class EquipmentIndexImpl extends ServiceImpl<EquipmentIndexMapper, Equipm
     }
 
     @Override
+    public List<EquProperty> getEquPropertyList() {
+        return this.baseMapper.getEquPropertyList();
+    }
+
+    @Override
     public EquipmentIndexVO getOnePrefQuota(Long id) {
         return this.baseMapper.getOnePrefQuota(id);
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.entity.vo.*;
@@ -303,21 +304,26 @@ public class EquipmentServiceImpl extends ServiceImpl<EquipmentMapper, Equipment
         }else {
             list = this.list(new QueryWrapper<Equipment>().eq("category_id", categoryId));
         }
+
+        List<EquProperty> quotaList =iEquipmentIndexService.getEquPropertyList();
+
         for (Equipment equipment : list) {
-            List<EquipmentIndex> quotaList = iEquipmentIndexService
-                    .list(new QueryWrapper<EquipmentIndex>().eq("equipment_id", equipment.getId()));
-            List<EquProperty> properList = new ArrayList<EquProperty>();
-            for (EquipmentIndex equipmentIndex : quotaList) {
-                EquProperty equProperty = new EquProperty();
-                equProperty.setEquipmentIndexId(equipmentIndex.getId());
-                equProperty.setPerfQuotaName(equipmentIndex.getPerfQuotaName());
-                equProperty.setEquipmentIndexName(equipmentIndex.getPerfQuotaName());
-                equProperty.setGroupName(equipmentIndex.getGroupName());
-                equProperty.setValue(equipmentIndex.getPerfValue());
-                equProperty.setUnitName(equipmentIndex.getUnitName());
-                equProperty.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId());
-                properList.add(equProperty);
-            }
+//            List<EquipmentIndex> quotaList = iEquipmentIndexService
+//                    .list(new QueryWrapper<EquipmentIndex>().eq("equipment_id", equipment.getId()));
+//            List<EquProperty> properList = new ArrayList<EquProperty>();
+//            for (EquipmentIndex equipmentIndex : quotaList) {
+//                EquProperty equProperty = new EquProperty();
+//                equProperty.setEquipmentIndexId(equipmentIndex.getId());
+//                equProperty.setPerfQuotaName(     equipmentIndex.getPerfQuotaName());
+//                equProperty.setEquipmentIndexName(equipmentIndex.getPerfQuotaName());
+//                equProperty.setGroupName(equipmentIndex.getGroupName());
+//                equProperty.setValue(equipmentIndex.getPerfValue());
+//                equProperty.setUnitName(equipmentIndex.getUnitName());
+//                equProperty.setEquipmentIndexKey(equipmentIndex.getPerfQuotaDefinitionId());
+//                properList.add(equProperty);
+//            }
+            List<EquProperty> properList = quotaList.stream().filter(e -> e.getEquipmentId().equals(equipment.getId().toString())).collect(Collectors.toList());
+
             equipment.setEquPropertyList(properList);
             Unit unit = iUnitService.getById(equipment.getUnitId());
             equipment.setUnit(unit);

amos-boot-system-equip/src/main/resources/mapper/EquipmentIndexMapper.xml

@@ -229,4 +229,17 @@
 				select equipment_detail_id from wl_equipment_specific where id = #{id})
 		)
 	</select>
+
+	<select id="getEquPropertyList" resultType="com.yeejoin.equipmanage.common.entity.EquProperty">
+		select
+		wl_equipment_index.id  equipmentDetailId,
+		wl_equipment_index.name  perfQuotaName,
+		wl_equipment_index.name  equipmentIndexName,
+		wl_equipment_index.group_name  groupName,
+		wl_equipment_index.perf_value  value,
+		wl_equipment_index.unit  unitName,
+		wl_equipment_index.name_key  equipmentIndexKey,
+		wl_equipment_index.equipment_id equipmentId
+		from wl_equipment_index
+	</select>
 </mapper>