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

bug修复

Browse Source
This commit is contained in:
guo 2023-08-08 16:22:13 +08:00
parent eab1e05e2d
commit 8c6e852c4c
9 changed files with 112 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorCurrentDataController.java
View File

@ -2,9 +2,9 @@ package com.zhgd.xmgl.modules.concrete.controller;
import com.gexin.fastjson.JSON;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData;
import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition;
import com.zhgd.xmgl.modules.concrete.service.IConcreteMonitorCurrentDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@ -39,6 +39,7 @@ public class ConcreteMonitorCurrentDataController {
/**
* 添加
*
* @param
* @return
*/
@ -53,7 +54,7 @@ public class ConcreteMonitorCurrentDataController {
@ApiOperation(value = "查询混凝土监测设备各点位最新一条实时数据", notes = "查询凝土监测设备各点位最新一条实时数据", httpMethod = "POST")
@ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "query", required = true, dataType = "Integer")
@PostMapping(value = "/getNewestConcreteMonitorCurrentData")
public Result<List<EntityMap>> getNewestConcreteMonitorCurrentData(@RequestBody Map<String,Object> map) {
public Result<List<ConcreteMonitorDevPointPosition>> getNewestConcreteMonitorCurrentData(@RequestBody Map<String, Object> map) {
return Result.success(concreteMonitorCurrentDataService.getNewestConcreteMonitorCurrentData(map));
}

40
src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDevPointPosition.java
View File

@ -1,16 +1,17 @@
package com.zhgd.xmgl.modules.concrete.entity;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.util.List;
/**
* @Description: 混凝土监测设备-监测点位置
* @author： pds
@ -23,28 +24,43 @@ import io.swagger.annotations.ApiModelProperty;
public class ConcreteMonitorDevPointPosition implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
/**
* id
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.Long id;
/**设备编号*/
/**
* 设备编号
*/
@Excel(name = "设备编号", width = 15)
@ApiModelProperty(value = "设备编号")
private java.lang.String devSn;
/**项目sn*/
/**
* 项目sn
*/
@Excel(name = "项目sn", width = 15)
@ApiModelProperty(value = "项目sn")
private java.lang.String projectSn;
/**监测点点位名称*/
/**
* 监测点点位名称
*/
@Excel(name = "监测点点位名称", width = 15)
@ApiModelProperty(value = "监测点点位名称")
private java.lang.String pointName;
/**监测点点位号*/
/**
* 监测点点位号
*/
@Excel(name = "监测点点位号", width = 15)
@ApiModelProperty(value = "监测点点位号")
private java.lang.Integer pointNo;
/**温度报警阀值*/
/**
* 温度报警阀值
*/
@Excel(name = "温度报警阀值", width = 15)
@ApiModelProperty(value = "温度报警阀值")
private java.lang.Double temperatureThreshold;
@TableField(exist = false)
@ApiModelProperty(value = "混凝土监测-实时数据")
private List<ConcreteMonitorCurrentData> list;
}

2
src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorCurrentDataMapper.java
View File

@ -20,5 +20,5 @@ public interface ConcreteMonitorCurrentDataMapper extends BaseMapper<ConcreteMon
List<ConcreteMonitorCurrentData> getTodayConcreteMonitorCurrentDataList(Map<String, Object> map);
List<EntityMap> getNewestConcreteMonitorCurrentData(@Param("devSn") String devSn, @Param("pointNo")String pointNo);
List<ConcreteMonitorCurrentData> getNewestConcreteMonitorCurrentData(@Param("devSn") String devSn, @Param("pointNo") String pointNo);
}

2
src/main/java/com/zhgd/xmgl/modules/concrete/mapper/ConcreteMonitorDevPointPositionMapper.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import java.util.Map;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData;
import org.apache.ibatis.annotations.Mapper;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@ -17,5 +18,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@Mapper
public interface ConcreteMonitorDevPointPositionMapper extends BaseMapper<ConcreteMonitorDevPointPosition> {
List<EntityMap> selectConcreteMonitorDevPointPositionList(Map<String, Object> map);
}

4
src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorCurrentDataMapper.xml
View File

@ -17,12 +17,12 @@
</select>
<select id="getNewestConcreteMonitorCurrentData" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
<select id="getNewestConcreteMonitorCurrentData"
resultType="com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData">
SELECT a.*
from concrete_monitor_current_data a
WHERE dev_sn=#{devSn} and point_no=#{pointNo}
ORDER BY receive_time DESC
LIMIT 1
</select>
</mapper>

7
src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevPointPositionMapper.xml
View File

@ -2,11 +2,4 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevPointPositionMapper">
<select id="selectConcreteMonitorDevPointPositionList"
resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
select *
from concrete_monitor_dev_point_position
where dev_sn=#{devSn}
</select>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/concrete/service/IConcreteMonitorCurrentDataService.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData;
import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevPointPosition;
import java.util.List;
import java.util.Map;
@ -20,5 +21,5 @@ public interface IConcreteMonitorCurrentDataService extends IService<ConcreteMon
List<ConcreteMonitorCurrentData> getTodayConcreteMonitorCurrentDataList(Map<String, Object> map);
List<EntityMap> getNewestConcreteMonitorCurrentData(Map<String, Object> map);
List<ConcreteMonitorDevPointPosition> getNewestConcreteMonitorCurrentData(Map<String, Object> map);
}

13
src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorCurrentDataServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.zhgd.xmgl.modules.concrete.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.entity.vo.ConcreteMonitorCurrentDataVo;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorAlarm;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData;
@ -91,12 +91,13 @@ public class ConcreteMonitorCurrentDataServiceImpl extends ServiceImpl<ConcreteM
}
@Override
public List<EntityMap> getNewestConcreteMonitorCurrentData(Map<String, Object> map) {
List<EntityMap> pointList = concreteMonitorDevPointPositionMapper.selectConcreteMonitorDevPointPositionList(map);
public List<ConcreteMonitorDevPointPosition> getNewestConcreteMonitorCurrentData(Map<String, Object> map) {
String devSn = MapUtils.getString(map, "devSn");
List<ConcreteMonitorDevPointPosition> pointList = concreteMonitorDevPointPositionMapper.selectList(new LambdaQueryWrapper<ConcreteMonitorDevPointPosition>().eq(ConcreteMonitorDevPointPosition::getDevSn, devSn));
if (pointList != null && pointList.size() > 0) {
for (EntityMap data : pointList) {
List<EntityMap> list = concreteMonitorCurrentDataMapper.getNewestConcreteMonitorCurrentData(MapUtils.getString(data, "devSn"), MapUtils.getString(data, "pointNo"));
data.put("list", list);
for (ConcreteMonitorDevPointPosition data : pointList) {
List<ConcreteMonitorCurrentData> list = concreteMonitorCurrentDataMapper.getNewestConcreteMonitorCurrentData(devSn, String.valueOf(data.getPointNo()));
data.setList(list);
}
}
return pointList;