diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java index 4706565..453b4a6 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java @@ -29,9 +29,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import io.swagger.annotations.Api; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import java.util.*; +import java.util.stream.Collectors; /** @@ -94,6 +93,8 @@ public class SurvStationInfoController { private ZhAdminFeignClient zhAdminFeignClient; + + /** * 分页列表查询 * @@ -441,8 +442,14 @@ public class SurvStationInfoController { List deploys = survDeviceDeployService.getDeviceListByStation(stationCode,deployTypes,stationFilter); List adds = new ArrayList<>(); if(!deploys.isEmpty()){ + List codeList = deploys.stream().map(SurvDeviceDeploy::getDeviceCode).collect(Collectors.toList()); + codeList = codeList.stream().distinct().collect(Collectors.toList()); + List deviceDetails = survDeviceDeployService.getDeviceInfo(codeList); + Map deviceDetailMap = new HashMap<>(); + deviceDetails.forEach(item->deviceDetailMap.put(item.getId(),item)); for (SurvDeviceDeploy deploy : deploys) { deploy.setStationName("长期定位监测点位"); + deploy.setDeviceInfo(deviceDetailMap.get(deploy.getDeviceCode())); } adds = iotutils.addOnlineStatus(deploys); } diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/SurvDeviceDeployMapper.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/SurvDeviceDeployMapper.java index 1dafc44..39923c0 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/SurvDeviceDeployMapper.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/SurvDeviceDeployMapper.java @@ -3,6 +3,7 @@ package org.jeecg.system.applet.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.common.entity.SurvDeviceDeploy; +import org.jeecg.common.entity.SurvDictDeviceDetail; import org.jeecg.common.entity.SurvStationInfo; import java.util.List; @@ -26,4 +27,6 @@ public interface SurvDeviceDeployMapper extends BaseMapper { List getDeviceListByStations(@Param("stationCode")String stationCode,@Param("deployTypeList") List deployTypeList,@Param("stationFilter")String stationFilter); SurvDeviceDeploy getDeployZhibiao(@Param("deployId") String deployId); + + List getDeviceInfoList(@Param("codeList") List codeList); } diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml index e1359b9..3e3d9f0 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml @@ -124,4 +124,11 @@ + + \ No newline at end of file diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/ISurvDeviceDeployService.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/ISurvDeviceDeployService.java index c36e93b..8e0d713 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/ISurvDeviceDeployService.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/ISurvDeviceDeployService.java @@ -2,6 +2,7 @@ package org.jeecg.system.applet.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.entity.SurvDeviceDeploy; +import org.jeecg.common.entity.SurvDictDeviceDetail; import org.jeecg.common.entity.SurvStationInfo; import java.util.List; @@ -25,4 +26,6 @@ public interface ISurvDeviceDeployService extends IService { List getDeviceListByStation(String stationCode, List deployTypes,String stationFilter); SurvDeviceDeploy getDeployZhibiao(String deployId); + + List getDeviceInfo(List codeList); } diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/impl/SurvDeviceDeployServiceImpl.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/impl/SurvDeviceDeployServiceImpl.java index 0a566fb..939592b 100644 --- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/impl/SurvDeviceDeployServiceImpl.java +++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/impl/SurvDeviceDeployServiceImpl.java @@ -1,6 +1,7 @@ package org.jeecg.system.applet.service.impl; import org.jeecg.common.entity.SurvDeviceDeploy; +import org.jeecg.common.entity.SurvDictDeviceDetail; import org.jeecg.common.entity.SurvStationInfo; import org.jeecg.system.applet.mapper.SurvDeviceDeployMapper; import org.jeecg.system.applet.service.ISurvDeviceDeployService; @@ -50,4 +51,9 @@ public class SurvDeviceDeployServiceImpl extends ServiceImpl getDeviceInfo(List codeList) { + return baseMapper.getDeviceInfoList(codeList); + } + }