admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/prod' into prod

Browse Source
This commit is contained in:
pengjie 2025-08-25 15:32:43 +08:00
commit 98858b3b48
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/zhgd/xmgl/modules/environment/mapper/xml/DustNoiseDataMapper.xml
View File

@ -82,9 +82,8 @@
limit 1 limit 1
</select> </select>
<select id="selectDustNoisePageList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap"> <select id="selectDustNoisePageList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
SELECT a.*, c.device_name SELECT a.*
FROM dust_noise_data a FROM dust_noise_data a
LEFT JOIN environment_dev c ON (a.device_id = c.device_id and a.project_sn = c.project_sn)
where a.project_sn = #{param.projectSn} where a.project_sn = #{param.projectSn}
<if test="param.deviceId != null and param.deviceId != ''"> <if test="param.deviceId != null and param.deviceId != ''">
and a.device_id = #{param.deviceId} and a.device_id = #{param.deviceId}

12
src/main/java/com/zhgd/xmgl/modules/environment/service/impl/DustNoiseDataServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.environment.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -17,6 +18,7 @@ import com.zhgd.xmgl.modules.environment.mapper.EnvironmentDevMapper;
import com.zhgd.xmgl.modules.environment.mapper.EnvironmentWarningMapper; import com.zhgd.xmgl.modules.environment.mapper.EnvironmentWarningMapper;
import com.zhgd.xmgl.modules.environment.service.IDustNoiseDataService; import com.zhgd.xmgl.modules.environment.service.IDustNoiseDataService;
import com.zhgd.xmgl.modules.environment.service.IEnvironmentAlarmService; import com.zhgd.xmgl.modules.environment.service.IEnvironmentAlarmService;
import com.zhgd.xmgl.modules.environment.service.IEnvironmentDevService;
import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.DateUtils;
import com.zhgd.xmgl.util.MessageUtil; import com.zhgd.xmgl.util.MessageUtil;
import com.zhgd.xmgl.util.WindDirectionUtils; import com.zhgd.xmgl.util.WindDirectionUtils;
@ -27,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner; import org.springframework.boot.CommandLineRunner;
import org.springframework.context.annotation.Lazy;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import rk.netDevice.sdk.p2.*; import rk.netDevice.sdk.p2.*;
@ -62,6 +65,9 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
private ThreadPoolTaskExecutor threadPoolTaskExecutor; private ThreadPoolTaskExecutor threadPoolTaskExecutor;
@Value("${rengzhicekong.hj212.port:}") @Value("${rengzhicekong.hj212.port:}")
private int rengzhicekongHj212Port; private int rengzhicekongHj212Port;
@Lazy
@Autowired
private IEnvironmentDevService environmentDevService;
private static String getWinddirection(float hum) { private static String getWinddirection(float hum) {
int v = (int) (hum * 10); int v = (int) (hum * 10);
@ -210,6 +216,12 @@ public class DustNoiseDataServiceImpl extends ServiceImpl<DustNoiseDataMapper, D
int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString());
Page<EntityMap> page = new Page<>(pageNo, pageSize); Page<EntityMap> page = new Page<>(pageNo, pageSize);
List<EntityMap> list = dustNoiseDataMapper.selectDustNoisePageList(page, map); List<EntityMap> list = dustNoiseDataMapper.selectDustNoisePageList(page, map);
String projectSn = MapUtils.getString(map, "projectSn");
Map<String, EnvironmentDev> devMap = environmentDevService.list(new LambdaQueryWrapper<EnvironmentDev>()
.eq(EnvironmentDev::getProjectSn, projectSn)).stream().collect(Collectors.toMap(EnvironmentDev::getDeviceId, Function.identity(), (o1, o2) -> o1));
for (EntityMap entityMap : list) {
entityMap.put("device_name", Optional.ofNullable(devMap.get(entityMap.get("deviceId"))).map(EnvironmentDev::getDeviceName).orElse(null));
}
return page.setRecords(list); return page.setRecords(list);
} }