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

查询楼层质量回弹测量结果

Browse Source
This commit is contained in:
guo 2024-03-16 11:08:18 +08:00
parent 80dd32b079
commit 3d6b80dab8
7 changed files with 409 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/zhgd/xmgl/modules/massrebound/controller/MassReboundSurveyAreaController.java
View File

@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
@ -242,4 +243,14 @@ public class MassReboundSurveyAreaController {
public Result<List<EntityMap>> selectProjectWarnList(@RequestBody Map<String, Object> map) {
return Result.success(massReboundSurveyAreaService.selectProjectWarnList(map));
}
@ApiOperation(value = "查询楼层质量回弹测量结果", notes = "查询楼层质量回弹测量结果", httpMethod = "GET")
@ApiImplicitParams({
@ApiImplicitParam(name = "floorId", value = "楼层ID", paramType = "query", required = false, dataType = "Integer"),
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = false, dataType = "String")
})
@GetMapping(value = "/getMassReboundSurveyArea")
public Result<List<MassReboundSurveyArea>> getMassReboundSurveyArea(String floorId, String projectSn) {
return Result.success(massReboundSurveyAreaService.getMassReboundSurveyArea(floorId, projectSn));
}
}

161
src/main/java/com/zhgd/xmgl/modules/massrebound/entity/MassReboundSurveyArea.java
View File

@ -1,17 +1,16 @@
package com.zhgd.xmgl.modules.massrebound.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;
/**
* @Description: 质量回弹-测区强度
* @author： pds
@ -24,32 +23,46 @@ import io.swagger.annotations.ApiModelProperty;
public class MassReboundSurveyArea implements Serializable {
private static final long serialVersionUID = 1L;
/**id*/
/**
* id
*/
@TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "id")
private java.lang.Long id;
/**坐标X*/
/**
* 坐标X
*/
@Excel(name = "坐标X", width = 15)
@ApiModelProperty(value = "坐标X")
private java.lang.String coordinateX;
/**坐标Y*/
/**
* 坐标Y
*/
@Excel(name = "坐标Y", width = 15)
@ApiModelProperty(value = "坐标Y")
private java.lang.String coordinateY;
/**楼层ID*/
/**
* 楼层ID
*/
@Excel(name = "楼层ID", width = 15)
@ApiModelProperty(value = "楼层ID")
private java.lang.Long floorId;
/**创建时间*/
/**
* 创建时间
*/
@Excel(name = "创建时间", width = 15)
@ApiModelProperty(value = "创建时间")
private java.lang.String createTime;
/**项目SN*/
/**
* 项目SN
*/
@Excel(name = "项目SN", width = 15)
@ApiModelProperty(value = "项目SN")
private java.lang.String projectSn;
/**项目sn*/
/**
* 项目sn
*/
@Excel(name = "设计强度", width = 15)
@ApiModelProperty(value = "设计强度")
private java.lang.String designStrength;
@ -58,103 +71,153 @@ public class MassReboundSurveyArea implements Serializable {
@ApiModelProperty(value = "测量设备类型，1普通设备，2高强设备")
private java.lang.Integer measureDevType;
/**项目SN*/
/**
* 项目SN
*/
@Excel(name = "1 测区混凝土强度换算，2泵送混凝土测区强度，3动能4.5J回弹仪测区强度换算", width = 15)
@ApiModelProperty(value = "1 测区混凝土强度换算，2泵送混凝土测区强度，3动能4.5J回弹仪测区强度换算")
private java.lang.Integer surveyType;
/**测区回弹值1*/
/**
* 测区回弹值1
*/
@Excel(name = "测区回弹值1", width = 15)
@ApiModelProperty(value = "测区回弹值1")
private java.lang.Double reboundValue1;
/**测区回弹值2*/
/**
* 测区回弹值2
*/
@Excel(name = "测区回弹值2", width = 15)
@ApiModelProperty(value = "测区回弹值2")
private java.lang.Double reboundValue2;
/**测区回弹值3*/
/**
* 测区回弹值3
*/
@Excel(name = "测区回弹值3", width = 15)
@ApiModelProperty(value = "测区回弹值3")
private java.lang.Double reboundValue3;
/**测区回弹值4*/
/**
* 测区回弹值4
*/
@Excel(name = "测区回弹值4", width = 15)
@ApiModelProperty(value = "测区回弹值4")
private java.lang.Double reboundValue4;
/**测区回弹值5*/
/**
* 测区回弹值5
*/
@Excel(name = "测区回弹值5", width = 15)
@ApiModelProperty(value = "测区回弹值5")
private java.lang.Double reboundValue5;
/**测区回弹值6*/
/**
* 测区回弹值6
*/
@Excel(name = "测区回弹值6", width = 15)
@ApiModelProperty(value = "测区回弹值6")
private java.lang.Double reboundValue6;
/**测区回弹值7*/
/**
* 测区回弹值7
*/
@Excel(name = "测区回弹值7", width = 15)
@ApiModelProperty(value = "测区回弹值7")
private java.lang.Double reboundValue7;
/**测区回弹值8*/
/**
* 测区回弹值8
*/
@Excel(name = "测区回弹值8", width = 15)
@ApiModelProperty(value = "测区回弹值8")
private java.lang.Double reboundValue8;
/**测区回弹值9*/
/**
* 测区回弹值9
*/
@Excel(name = "测区回弹值9", width = 15)
@ApiModelProperty(value = "测区回弹值9")
private java.lang.Double reboundValue9;
/**测区回弹值10*/
/**
* 测区回弹值10
*/
@Excel(name = "测区回弹值10", width = 15)
@ApiModelProperty(value = "测区回弹值10")
private java.lang.Double reboundValue10;
/**测区回弹值11*/
/**
* 测区回弹值11
*/
@Excel(name = "测区回弹值11", width = 15)
@ApiModelProperty(value = "测区回弹值11")
private java.lang.Double reboundValue11;
/**测区回弹值12*/
/**
* 测区回弹值12
*/
@Excel(name = "测区回弹值12", width = 15)
@ApiModelProperty(value = "测区回弹值12")
private java.lang.Double reboundValue12;
/**测区回弹值13*/
/**
* 测区回弹值13
*/
@Excel(name = "测区回弹值13", width = 15)
@ApiModelProperty(value = "测区回弹值13")
private java.lang.Double reboundValue13;
/**测区回弹值14*/
/**
* 测区回弹值14
*/
@Excel(name = "测区回弹值14", width = 15)
@ApiModelProperty(value = "测区回弹值14")
private java.lang.Double reboundValue14;
/**测区回弹值15*/
/**
* 测区回弹值15
*/
@Excel(name = "测区回弹值15", width = 15)
@ApiModelProperty(value = "测区回弹值15")
private java.lang.Double reboundValue15;
/**测区回弹值16*/
/**
* 测区回弹值16
*/
@Excel(name = "测区回弹值16", width = 15)
@ApiModelProperty(value = "测区回弹值16")
private java.lang.Double reboundValue16;
/**测区回弹值平均值*/
/**
* 测区回弹值平均值
*/
@Excel(name = "测区回弹值平均值", width = 15)
@ApiModelProperty(value = "测区回弹值平均值")
private java.lang.Double reboundAvgValue;
/**碳化深度值1*/
/**
* 碳化深度值1
*/
@Excel(name = "碳化深度值1", width = 15)
@ApiModelProperty(value = "碳化深度值1")
private java.lang.Double carbonationDepth1;
/**碳化深度值2*/
/**
* 碳化深度值2
*/
@Excel(name = "碳化深度值2", width = 15)
@ApiModelProperty(value = "碳化深度值2")
private java.lang.Double carbonationDepth2;
/**碳化深度值3*/
/**
* 碳化深度值3
*/
@Excel(name = "碳化深度值3", width = 15)
@ApiModelProperty(value = "碳化深度值3")
private java.lang.Double carbonationDepth3;
/**碳化深度平均值*/
/**
* 碳化深度平均值
*/
@Excel(name = "碳化深度平均值", width = 15)
@ApiModelProperty(value = "碳化深度平均值")
private java.lang.Double carbonationDepthAvg;
/**角度*/
/**
* 角度
*/
@Excel(name = "角度", width = 15)
@ApiModelProperty(value = "角度")
private java.lang.Integer angle;
/**测区强度*/
/**
* 测区强度
*/
@Excel(name = "测区强度", width = 15)
@ApiModelProperty(value = "测区强度")
private java.lang.String surveyStrength;
/**测量结果是否正常，1正常，2异常*/
/**
* 测量结果是否正常，1正常，2异常
*/
@Excel(name = "测量结果是否正常，1正常，2异常", width = 15)
@ApiModelProperty(value = "测量结果是否正常，1正常，2异常")
private java.lang.Integer resultType;
@ -166,7 +229,9 @@ public class MassReboundSurveyArea implements Serializable {
@ApiModelProperty(value = "操作类型，0保存，1不保存，默认保存")
private java.lang.Integer opType;
/**浇筑令ID*/
/**
* 浇筑令ID
*/
@TableField(exist = false)
@ApiModelProperty(value = "浇筑令ID")
@ -180,13 +245,27 @@ public class MassReboundSurveyArea implements Serializable {
@ApiModelProperty(value = "轴线X")
private String axisX;
/**轴线Y*/
/**
* 轴线Y
*/
@TableField(exist = false)
@ApiModelProperty(value = "轴线Y")
private String axisY;
@TableField(exist = false)
@ApiModelProperty(value = "创建人")
private java.lang.Long createUser;
@TableField(exist = false)
@ApiModelProperty(value = "楼栋名称")
private String buildName;
@TableField(exist = false)
@ApiModelProperty(value = "实测实量楼层")
private String floorName;
@TableField(exist = false)
private String areaname;
@TableField(exist = false)
private String surveyTypeName;
@TableField(exist = false)
private String resultTypeName;
}

2
src/main/java/com/zhgd/xmgl/modules/massrebound/mapper/MassReboundSurveyAreaMapper.java
View File

@ -30,7 +30,7 @@ public interface MassReboundSurveyAreaMapper extends BaseMapper<MassReboundSurve
List<EntityMap> selectProjectWarnList(Map<String, Object> map);
List<EntityMap> selectMassReboundSurveyAreaList(@Param("floorId") String floorId);
List<MassReboundSurveyArea> selectMassReboundSurveyAreaList(@Param("floorId") String floorId, @Param("projectSn") String projectSn);
Integer selectMaxSurveyNo(@Param("floorId")Long floorId, @Param("projectSn")String projectSn);
}

11
src/main/java/com/zhgd/xmgl/modules/massrebound/mapper/xml/MassReboundSurveyAreaMapper.xml
View File

@ -194,7 +194,8 @@
</if>
order by sy.pour_time
</select>
<select id="selectMassReboundSurveyAreaList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
<select id="selectMassReboundSurveyAreaList"
resultType="com.zhgd.xmgl.modules.massrebound.entity.MassReboundSurveyArea">
select a.*,
c.build_name,b.floor_name,CONCAT(c.build_name,'-',b.floor_name,'层') areaname,
(case when a.survey_type=1 then '非泵送混凝土'
@ -203,7 +204,13 @@
when a.result_type=2 then '不合格' else '' end ) result_type_name
from mass_rebound_survey_area a LEFT JOIN mass_rebound_floor b ON a.floor_id=b.floor_id
LEFT JOIN mass_rebound_build c ON b.build_id=c.id
where a.floor_id=#{floorId}
where 1=1
<if test="floorId != null">
and a.floor_id=#{floorId}
</if>
<if test="projectSn != null and projectSn != ''">
and a.project_sn = #{projectSn}
</if>
</select>
<select id="selectMaxSurveyNo" resultType="java.lang.Integer">
SELECT MAX(survey_no)

2
src/main/java/com/zhgd/xmgl/modules/massrebound/service/IMassReboundSurveyAreaService.java
View File

@ -31,4 +31,6 @@ public interface IMassReboundSurveyAreaService extends IService<MassReboundSurve
MassReboundSurveyArea saveAnewSurvey(MassReboundSurveyArea massReboundSurveyArea);
void exporExcelMassReboundSurveyArea(HttpServletResponse response, String floorId);
List<MassReboundSurveyArea> getMassReboundSurveyArea(String floorId, String projectSn);
}

15
src/main/java/com/zhgd/xmgl/modules/massrebound/service/impl/MassReboundSurveyAreaServiceImpl.java
View File

@ -1,22 +1,21 @@
package com.zhgd.xmgl.modules.massrebound.service.impl;
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.basicdata.service.ICompanyService;
import com.zhgd.xmgl.modules.massrebound.entity.MassReboundAngleCorrect;
import com.zhgd.xmgl.modules.massrebound.entity.MassReboundConcreteStrengthConversion;
import com.zhgd.xmgl.modules.massrebound.entity.MassReboundSurveyArea;
import com.zhgd.xmgl.modules.massrebound.mapper.MassReboundAngleCorrectMapper;
import com.zhgd.xmgl.modules.massrebound.mapper.MassReboundConcreteStrengthConversionMapper;
import com.zhgd.xmgl.modules.massrebound.mapper.MassReboundSurveyAreaMapper;
import com.zhgd.xmgl.modules.basicdata.service.ICompanyService;
import com.zhgd.xmgl.modules.massrebound.service.IMassReboundSurveyAreaService;
import com.zhgd.xmgl.util.JxlExcelUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
@ -209,6 +208,7 @@ public class MassReboundSurveyAreaServiceImpl extends ServiceImpl<MassReboundSur
}
return massReboundSurveyArea;
}
private String getSurveyDifference(double reboundAvgValue, Integer surveyType, double carbonationDepthAvg) {
//查询回弹平均值大于的离的最近一行数据
MassReboundConcreteStrengthConversion greaterThan = massReboundConcreteStrengthConversionMapper.getGreaterThanValue(reboundAvgValue, surveyType);
@ -270,6 +270,7 @@ public class MassReboundSurveyAreaServiceImpl extends ServiceImpl<MassReboundSur
}
return getDifference(lessThan.getReboundAvgValue(), starty, greaterThan.getReboundAvgValue(), endy, reboundAvgValue) + "";
}
private double getDifference(double startx, double starty, double endx, double endy, double median) {
if (startx == endx) {
return starty;
@ -283,6 +284,7 @@ public class MassReboundSurveyAreaServiceImpl extends ServiceImpl<MassReboundSur
return mediany;
}
}
private double getHighStrengthReboundValue(double reboundAvgValue) {
BigDecimal tempValue = new BigDecimal(reboundAvgValue + "");
//计算公式 0.0079*R*R+0.75*R-7.83 公式中R为平均回弹值
@ -352,7 +354,7 @@ public class MassReboundSurveyAreaServiceImpl extends ServiceImpl<MassReboundSur
@Override
public void exporExcelMassReboundSurveyArea(HttpServletResponse response, String floorId) {
try {
List<EntityMap> list=massReboundSurveyAreaMapper.selectMassReboundSurveyAreaList(floorId);
List<MassReboundSurveyArea> list = massReboundSurveyAreaMapper.selectMassReboundSurveyAreaList(floorId, null);
String[] heads = {"编号", "测区", "测量时间", "测量角度(°)", "测区混凝土类型", "设计强度", "碳化深度平均值", "回弹平均值", "测区强度", "测区结果", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16"};
String[] headsStr = {"surveyNo", "areaname", "createTime", "angle", "surveyTypeName", "designStrength", "carbonationDepthAvg", "reboundAvgValue", "surveyStrength", "resultTypeName", "reboundValue1", "reboundValue2",
@ -365,5 +367,10 @@ public class MassReboundSurveyAreaServiceImpl extends ServiceImpl<MassReboundSur
}
}
@Override
public List<MassReboundSurveyArea> getMassReboundSurveyArea(String floorId, String projectSn) {
return massReboundSurveyAreaMapper.selectMassReboundSurveyAreaList(floorId, projectSn);
}
}

1
src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java
View File

@ -328,6 +328,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
.antMatchers("/xmgl/carPassRecord/addCarPassRecord").permitAll()
.antMatchers("/xmgl/notice/add").permitAll()
.antMatchers("/xmgl/upload/uploadBase64").permitAll()
.antMatchers("/xmgl/massReboundSurveyArea/getMassReboundSurveyArea").permitAll()
.antMatchers(HttpMethod.OPTIONS, "/**").anonymous()
.anyRequest().authenticated() // 剩下所有的验证都需要验证.
.and()