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

整合数据统计、最新数据查询接口

This commit is contained in:
zy 2025-11-28 18:13:33 +08:00
parent 390231ea2f
commit 7e8f611308
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -641,10 +641,10 @@ public class WxAppletController {
List<String> waterList =new ArrayList<>(); List<String> waterList =new ArrayList<>();
for (SurvDeviceDeploy survDeviceDeploy : survStationInfo.getDeviceList()) { for (SurvDeviceDeploy survDeviceDeploy : survStationInfo.getDeviceList()) {
if (PollutionConstants.SOIL_SURV.equals(survDeviceDeploy.getDeployType())) {//土壤设备 if (PollutionConstants.SOIL_SURV.equals(survDeviceDeploy.getDeployType())) {//土壤设备
soilList.add(survDeviceDeploy.getDeployCode()); soilList.add(survDeviceDeploy.getId());
} else if (PollutionConstants.AIR_SURV.equals(survDeviceDeploy.getDeployType())) {//气象设备 } else if (PollutionConstants.AIR_SURV.equals(survDeviceDeploy.getDeployType())) {//气象设备
airList.add(survDeviceDeploy.getDeployCode()); airList.add(survDeviceDeploy.getId());
} else if (PollutionConstants.WATER_QULITY.equals(survDeviceDeploy.getDeployType())) {//气象设备 } else if (PollutionConstants.WATER_QULITY.equals(survDeviceDeploy.getDeployType())) {//水质设备
waterList.add(survDeviceDeploy.getId()); waterList.add(survDeviceDeploy.getId());
}else if (PollutionConstants.WATER_ORIENT.equals(survDeviceDeploy.getDeployType())) {//面源 }else if (PollutionConstants.WATER_ORIENT.equals(survDeviceDeploy.getDeployType())) {//面源
orientList.add(survDeviceDeploy.getDeployCode()); orientList.add(survDeviceDeploy.getDeployCode());

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

@ -64,7 +64,7 @@
</select> </select>
<select id="getPageResentData" resultMap="baseResultVoMap"> <select id="getPageResentData" resultMap="baseResultVoMap">
select * from surv_hisdata_air where DEPLOY_CODE IN select * from surv_hisdata_air where DEPLOY_ID IN
<foreach collection="airList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="airList" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>

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

@ -119,7 +119,7 @@
</select> </select>
<select id="getPageResentData" resultMap="baseResultVoMap"> <select id="getPageResentData" resultMap="baseResultVoMap">
select <include refid="baseSql"/> from surv_hisdata_soil where DEPLOY_CODE IN select <include refid="baseSql"/> from surv_hisdata_soil where DEPLOY_ID IN
<foreach collection="soilList" index="index" item="id" open="(" separator="," close=")"> <foreach collection="soilList" index="index" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> </foreach>