园区载体信息 类型返回

src/main/java/com/lyy/admin/VO/CarrierInfoTypeListVO.java

+package com.lyy.admin.VO;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 
+ * @TableName carrier_info
+ */
+@Data
+@ApiModel(value = "载体类型列表信息", description = "载体类型列表信息")
+public class CarrierInfoTypeListVO implements Serializable {
+
+    @ApiModelProperty(value = "产品类型")
+    private String type;
+
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/lyy/admin/VO/ParkInfoAllVO.java

@@ -22,7 +22,7 @@ public class ParkInfoAllVO implements Serializable {
     private JSONArray parkTrafficInfoVOs =new JSONArray();
     private List<String> parkCarrierInfo = new ArrayList<>();
     private List<SysCarouselInfo> sysCarouselInfos = new ArrayList<>();
-    private List<CarrierInfoListVO> carrierInfoVO = new ArrayList<>();
+    private List<CarrierInfoTypeListVO> carrierInfoVO = new ArrayList<>();
     private List<ParkInvestmentDirectionInfo> parkInvestmentDirectionInfos = new ArrayList<>();
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

src/main/java/com/lyy/admin/service/parkinfo/impl/ParkInfoServiceImpl.java

 package com.lyy.admin.service.parkinfo.impl;
 
+import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.json.JSONArray;
@@ -62,9 +63,6 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
     @Autowired
     ParkCarrierInfoMapper parkCarrierInfoMapper;
 
-    @Autowired
-    CarrierInfoMapper carrierInfoMapper;
-
     @Autowired
     SysMembershipInfoMapper sysMembershipInfoMapper;
 
@@ -325,8 +323,12 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
             parkInfoAllVO.setParkTrafficInfoVOs(parkTrafficInfosJsonArray);
 //            parkInfoAllVO.setParkTrafficInfo(parkTrafficInfos);
             //获取载体信息
-            List<CarrierInfoListVO> carrierInfoVOS = carrierInfoMapper.selectCarrierInfoVOList(id);
-            parkInfoAllVO.setCarrierInfoVO(carrierInfoVOS);
+            LambdaQueryWrapper<CarrierInfo> CIQuery = new LambdaQueryWrapper<>();
+            CIQuery.eq(CarrierInfo::getParkId, id);
+            List<CarrierInfo> list = carrierInfoService.list(CIQuery);
+            List<CarrierInfoTypeListVO> carrierInfoVOS = Convert.toList(CarrierInfoTypeListVO.class, list);
+            List<CarrierInfoTypeListVO> collect = carrierInfoVOS.stream().distinct().collect(Collectors.toList());
+            parkInfoAllVO.setCarrierInfoVO(collect);
             //获取污水处理能力信息
             QueryWrapper<ParkSewageInfo> PSIWrapper = new QueryWrapper<>();
             PSIWrapper.eq("park_id", id);