Administrator
/
FenXiNspJavaMain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加长期监测设备接口

This commit is contained in:
zy 2025-11-28 10:33:32 +08:00
parent 2116abd606
commit cc4a12fc63
5 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvStationInfoController.java
View File

@ -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<SurvDeviceDeploy> deploys = survDeviceDeployService.getDeviceListByStation(stationCode,deployTypes,stationFilter);
List<SurvDeviceDeploy> adds = new ArrayList<>();
if(!deploys.isEmpty()){
List<String> codeList = deploys.stream().map(SurvDeviceDeploy::getDeviceCode).collect(Collectors.toList());
codeList = codeList.stream().distinct().collect(Collectors.toList());
List<SurvDictDeviceDetail> deviceDetails = survDeviceDeployService.getDeviceInfo(codeList);
Map<String,SurvDictDeviceDetail> 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);
}

3
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/SurvDeviceDeployMapper.java
View File

@ -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<SurvDeviceDeploy> {
List<SurvDeviceDeploy> getDeviceListByStations(@Param("stationCode")String stationCode,@Param("deployTypeList") List<String> deployTypeList,@Param("stationFilter")String stationFilter);
SurvDeviceDeploy getDeployZhibiao(@Param("deployId") String deployId);
List<SurvDictDeviceDetail> getDeviceInfoList(@Param("codeList") List<String> codeList);
}

7
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvDeviceDeployMapper.xml
View File

@ -124,4 +124,11 @@
<select id="getDeployZhibiao" resultMap="zhibiaoMap">
select <include refid="baseSql"/> from surv_device_deploy where ID = #{deployId}
</select>
<select id="getDeviceInfoList" resultType="org.jeecg.common.entity.SurvDictDeviceDetail">
select * from surv_dict_device_detail where ID IN
<foreach collection="codeList" index="index" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</select>
</mapper>

3
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/ISurvDeviceDeployService.java
View File

@ -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<SurvDeviceDeploy> {
List<SurvDeviceDeploy> getDeviceListByStation(String stationCode, List<String> deployTypes,String stationFilter);
SurvDeviceDeploy getDeployZhibiao(String deployId);
List<SurvDictDeviceDetail> getDeviceInfo(List<String> codeList);
}

6
zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/service/impl/SurvDeviceDeployServiceImpl.java
View File

@ -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<SurvDeviceDeployMap
return baseMapper.getDeployZhibiao(deployId);
}
@Override
public List<SurvDictDeviceDetail> getDeviceInfo(List<String> codeList) {
return baseMapper.getDeviceInfoList(codeList);
}
}