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

bug修复

Browse Source
This commit is contained in:
guo 2024-02-03 09:35:33 +08:00
parent b30d722d85
commit db55e7e010
13 changed files with 108 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,7 +95,10 @@ public class ConcreteMonitorCurrentDataController {
@ApiOperation(value = "查询混凝土监测设备各点位最新一条实时数据", notes = "查询凝土监测设备各点位最新一条实时数据", httpMethod = "POST")
@ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "body", required = true, dataType = "Integer")
@ApiImplicitParams({
@ApiImplicitParam(name = "devSn", value = "塔机设备编号", paramType = "body", required = true, dataType = "Integer")
})
@PostMapping(value = "/getNewestConcreteMonitorCurrentData")
public Result<List<ConcreteMonitorDevPointPosition>> getNewestConcreteMonitorCurrentData(@RequestBody Map<String, Object> map) {
return Result.success(concreteMonitorCurrentDataService.getNewestConcreteMonitorCurrentData(map));
@ -113,7 +116,6 @@ public class ConcreteMonitorCurrentDataController {
return Result.success(concreteMonitorCurrentDataService.getTodayConcreteMonitorCurrentDataList(map));
}
@ApiOperation(value = "统计数据曲线趋势", notes = "统计数据曲线趋势", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),

9
src/main/java/com/zhgd/xmgl/modules/concrete/controller/ConcreteMonitorDevToPlaneFigureController.java
View File

@ -108,4 +108,13 @@ public class ConcreteMonitorDevToPlaneFigureController {
}
return result;
}
@ApiOperation(value = "列表查询混凝土监测已配置测点的平面图设备坐标信息", notes = "列表查询混凝土监测已配置测点的平面图设备坐标信息", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "concreteMonitorPlaneFigureId", value = "平面图ID", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/selectList")
public Result<List<ConcreteMonitorDevToPlaneFigure>> selectList(@RequestBody Map<String, Object> map) {
return Result.success(concreteMonitorPlaneFigureCoordinateService.selectPlaneFigureCoordinateList(map));
}
}

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

@ -63,5 +63,7 @@ public class ConcreteMonitorDevPointPosition implements Serializable {
@TableField(exist = false)
@ApiModelProperty(value = "混凝土监测-实时数据（最新一条）")
private List<ConcreteMonitorCurrentData> list;
@TableField(exist = false)
@ApiModelProperty(value = "混凝土监测-监测点位置和平面图配置中间表")
private List<ConcreteMonitorDevToPlaneFigure> planeFigureList;
}

32
src/main/java/com/zhgd/xmgl/modules/concrete/entity/ConcreteMonitorDevToPlaneFigure.java
View File

@ -1,6 +1,7 @@
package com.zhgd.xmgl.modules.concrete.entity;
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.annotation.JsonFormat;
@ -70,4 +71,35 @@ public class ConcreteMonitorDevToPlaneFigure implements Serializable {
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss")
private java.util.Date updateTime;
/**
* 设备编号
*/
@TableField(exist = false)
@ApiModelProperty(value = "设备编号")
private String devSn;
/**
* 项目sn
*/
@TableField(exist = false)
@ApiModelProperty(value = "项目sn")
private String projectSn;
/**
* 监测点点位名称
*/
@TableField(exist = false)
@ApiModelProperty(value = "监测点点位名称")
private String pointName;
/**
* 监测点点位号
*/
@TableField(exist = false)
@ApiModelProperty(value = "监测点点位号")
private Integer pointNo;
@TableField(exist = false)
@ApiModelProperty(value = "混凝土监测-实时数据")
private ConcreteMonitorCurrentData currentData;
}

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

@ -26,4 +26,6 @@ public interface ConcreteMonitorCurrentDataMapper extends BaseMapper<ConcreteMon
List<ConcreteMonitorCurrentData> getNewestConcreteMonitorCurrentData(@Param("devSn") String devSn, @Param("pointNo") String pointNo);
ArrayList<TrendOneVo> countTrend(HashMap<String, Object> paramMap);
ConcreteMonitorCurrentData newestCurrentData(Map<String, Object> map);
}

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

@ -1,6 +1,8 @@
package com.zhgd.xmgl.modules.concrete.mapper;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;

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

@ -6,7 +6,9 @@ import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevToPlaneFigure;
import com.zhgd.xmgl.modules.highslope.entity.HighSlopeMeasurePointToPlaneFigure;
import org.apache.ibatis.annotations.Mapper;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Description: 混凝土监测-监测点位置和平面图配置中间表
@ -17,5 +19,5 @@ import java.util.List;
@Mapper
public interface ConcreteMonitorDevToPlaneFigureMapper extends BaseMapper<ConcreteMonitorDevToPlaneFigure> {
List<EntityMap> selectPlaneFigureCoordinateList(Long highSlopePlaneFigureId);
List<ConcreteMonitorDevToPlaneFigure> selectPlaneFigureCoordinateList(Map<String, Object> map);
}

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

@ -46,4 +46,21 @@
</choose>
group by x
</select>
<select id="newestCurrentData" resultType="com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData">
select *
from concrete_monitor_current_data
where 1=1
<if test="projectSn != null and projectSn != ''">
and project_sn = #{projectSn}
</if>
<if test="devSn != null and devSn != ''">
and dev_sn = #{devSn}
</if>
<if test="pointNo != null and pointNo != ''">
and point_no = #{pointNo}
</if>
order by receive_time desc
LIMIT 1
</select>
</mapper>

13
src/main/java/com/zhgd/xmgl/modules/concrete/mapper/xml/ConcreteMonitorDevToPlaneFigureMapper.xml
View File

@ -1,18 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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.ConcreteMonitorDevToPlaneFigureMapper">
<select id="selectPlaneFigureCoordinateList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
SELECT a.*,
b.measure_point_name,
b.measure_point_addr,
b.measure_point_number,
b.alarm_state,
demt.monitor_type_name
<select id="selectPlaneFigureCoordinateList"
resultType="com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevToPlaneFigure">
SELECT a.*,b.*
from concrete_monitor_dev_to_plane_figure a
INNER JOIN concrete_monitor_dev_point_position b ON a.concrete_monitor_dev_point_position_id = b.id
inner join high_slope_engineering_to_monitor_type demtr on demtr.id =
b.high_slope_engineering_to_monitor_type_id
inner join high_slope_monitor_type demt on demtr.high_slope_monitor_type_id = demt.id
WHERE a.concrete_monitor_plane_figure_id = #{concreteMonitorPlaneFigureId}
</select>
</mapper>

2
src/main/java/com/zhgd/xmgl/modules/concrete/service/ConcreteMonitorDevToPlaneFigureService.java
View File

@ -22,4 +22,6 @@ public interface ConcreteMonitorDevToPlaneFigureService extends IService<Concret
void deleteConcreteMonitorPlaneFigureCoordinate(Map<String, Object> map);
void updateFigureCoordinate(List<ConcreteMonitorDevToPlaneFigure> list);
List<ConcreteMonitorDevToPlaneFigure> selectPlaneFigureCoordinateList(Map<String, Object> map);
}

16
src/main/java/com/zhgd/xmgl/modules/concrete/service/impl/ConcreteMonitorDevToPlaneFigureServiceImpl.java
View File

@ -1,13 +1,16 @@
package com.zhgd.xmgl.modules.concrete.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.map.MapUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorCurrentData;
import com.zhgd.xmgl.modules.concrete.entity.ConcreteMonitorDevToPlaneFigure;
import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorCurrentDataMapper;
import com.zhgd.xmgl.modules.concrete.mapper.ConcreteMonitorDevToPlaneFigureMapper;
import com.zhgd.xmgl.modules.concrete.service.ConcreteMonitorDevToPlaneFigureService;
import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasureCurrentData;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -61,4 +64,17 @@ public class ConcreteMonitorDevToPlaneFigureServiceImpl extends ServiceImpl<Conc
}
}
}
@Override
public List<ConcreteMonitorDevToPlaneFigure> selectPlaneFigureCoordinateList(Map<String, Object> map) {
List<ConcreteMonitorDevToPlaneFigure> list = concreteMonitorDevToPlaneFigureMapper.selectPlaneFigureCoordinateList(map);
if (list.size() > 0) {
for (ConcreteMonitorDevToPlaneFigure data : list) {
Map<String, Object> pm = BeanUtil.beanToMap(data, map, false, true);
ConcreteMonitorCurrentData currentData = concreteMonitorCurrentDataMapper.newestCurrentData(pm);
data.setCurrentData(currentData);
}
}
return list;
}
}

3
src/main/java/com/zhgd/xmgl/modules/foundation/controller/DeepExcavationMeasurePointController.java
View File

@ -66,8 +66,9 @@ public class DeepExcavationMeasurePointController {
@ApiOperation(value = "列表查询深基坑所有测点信息", notes = "列表查询深基坑所有测点信息", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "monitorTypeId", value = "深基坑监测内容ID", paramType = "body", required = true, dataType = "String"),
@ApiImplicitParam(name = "monitorTypeId", value = "深基坑监测内容ID", paramType = "body", required = false, dataType = "String"),
@ApiImplicitParam(name = "deepExcavationId", value = "深基坑ID", paramType = "body", required = false, dataType = "String"),
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"),
})
@PostMapping(value = "/selectDeepExcavationAllMeasurePointList")
public Result<List<DeepExcavationMeasurePoint>> selectDeepExcavationAllMeasurePointList(@RequestBody Map<String, Object> map) {

16
src/main/java/com/zhgd/xmgl/modules/foundation/mapper/xml/DeepExcavationMeasurePointMapper.xml
View File

@ -3,13 +3,23 @@
<mapper namespace="com.zhgd.xmgl.modules.foundation.mapper.DeepExcavationMeasurePointMapper">
<select id="selectDeepExcavationAllMeasurePointList"
resultType="com.zhgd.xmgl.modules.foundation.entity.DeepExcavationMeasurePoint">
select a.*
select distinct a.*
from deep_excavation_measure_point a
INNER JOIN deep_excavation_monitor_type_rela b ON a.rela_id = b.id
where b.deep_excavation_id = #{deepExcavationId}
join deep_excavation_engineering dee on dee.id=a.deep_excavation_id
where 1=1
<if test="deepExcavationId != null and deepExcavationId != ''">
and b.deep_excavation_id = #{deepExcavationId}
</if>
<if test="relaId != null and relaId != ''">
and a.rela_id = #{relaId}
</if>
<if test="monitorTypeId != null and monitorTypeId != ''">
and b.monitor_type_id = #{monitorTypeId}
</if>
<if test="projectSn != null and projectSn != ''">
and dee.project_sn = #{projectSn}
</if>
</select>
<resultMap autoMapping="true" id="measurePointAndSensor"
@ -45,4 +55,4 @@
left join deep_excavation_sensor des on demp.measure_point_number = des.measure_point_number
where demp.measure_point_number = #{measurePointNumber}
</select>
</mapper>
</mapper>