From 8fc11a9ab46718d19ebb9d3fdca9ea2776e5d9fb Mon Sep 17 00:00:00 2001 From: guo Date: Tue, 30 Jan 2024 10:14:28 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/HighFormworkSupportService.java | 61 +++++++++- ...ghFormworkDeviceCurrentDataController.java | 111 ------------------ ...hFormworkMeasureCurrentDataController.java | 2 + .../HighFormworkMeasurePointController.java | 19 +++ .../entity/HighFormworkAlarmData.java | 6 +- .../HighFormworkMeasureCurrentData.java | 41 +++++-- .../entity/HighFormworkMeasurePoint.java | 12 +- .../HighFormworkMeasurePointThreshold.java | 45 ++++--- .../vo/CountHighFormworkMeasurePointVo.java | 14 +++ .../entity/vo/DataPerHourForTheLastDayVo.java | 8 ++ .../HighFormworkMeasurePointMapper.java | 6 + .../xml/HighFormworkMeasurePointMapper.xml | 19 +++ .../IHighFormworkMeasurePointService.java | 6 + .../HighFormworkMeasurePointServiceImpl.java | 19 ++- .../controller/MaterialDetailsController.java | 11 +- .../mapper/MaterialDetailsMapper.java | 4 +- .../mapper/xml/MaterialDetailsMapper.xml | 11 +- .../service/MaterialDetailsService.java | 3 +- .../impl/MaterialDetailsServiceImpl.java | 7 +- 19 files changed, 241 insertions(+), 164 deletions(-) delete mode 100644 src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkDeviceCurrentDataController.java create mode 100644 src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/CountHighFormworkMeasurePointVo.java diff --git a/src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java b/src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java index 58507fc66..1682182b3 100644 --- a/src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java +++ b/src/main/java/com/zhgd/netty/tcp/service/HighFormworkSupportService.java @@ -267,14 +267,20 @@ public class HighFormworkSupportService { //测点1类型 String noType = no.substring(no.length() - 1); - if (noType.equals("L")) { - currentData.setAngleYAxis(dataMap.get(HighFormworkSupport.GZ_DS1)); - } if (noType.equals("F")) { - currentData.setPressure(String.valueOf(Double.parseDouble(dataMap.get(HighFormworkSupport.GZ_DS1)) / 1000)); + currentData.setPoleAxialForce(String.valueOf(Double.parseDouble(dataMap.get(HighFormworkSupport.GZ_DS1)) / 1000)); + } + if (noType.equals("H")) { + currentData.setHorizontalDisplacement(dataMap.get(HighFormworkSupport.GZ_DS1)); } if (noType.equals("V")) { - currentData.setSubside(dataMap.get(HighFormworkSupport.GZ_DS1)); + currentData.setFormworkSettlement(dataMap.get(HighFormworkSupport.GZ_DS1)); + } + if (noType.equals("L")) { + currentData.setPoleTilt(dataMap.get(HighFormworkSupport.GZ_DS1)); + } + if (noType.equals("D")) { + currentData.setFoundationSettlement(dataMap.get(HighFormworkSupport.GZ_DS1)); } //测点2类型 @@ -392,6 +398,51 @@ public class HighFormworkSupportService { //预警 insertHighFormworkAlarmData(point, subside, 5, 2); } + } else if (type == 7) { + Double subside = StringUtils.isNotBlank(currentData.getPoleAxialForce()) ? Double.valueOf(currentData.getPoleAxialForce()) : null; + if (subside != null && alarmValue != null && alarmValue < subside) { + //报警 + insertHighFormworkAlarmData(point, subside, 7, 1); + } else if (subside != null && warningValue != null && warningValue < subside) { + //预警 + insertHighFormworkAlarmData(point, subside, 7, 2); + } + } else if (type == 8) { + Double subside = StringUtils.isNotBlank(currentData.getHorizontalDisplacement()) ? Double.valueOf(currentData.getHorizontalDisplacement()) : null; + if (subside != null && alarmValue != null && alarmValue < subside) { + //报警 + insertHighFormworkAlarmData(point, subside, 8, 1); + } else if (subside != null && warningValue != null && warningValue < subside) { + //预警 + insertHighFormworkAlarmData(point, subside, 8, 2); + } + } else if (type == 9) { + Double subside = StringUtils.isNotBlank(currentData.getFormworkSettlement()) ? Double.valueOf(currentData.getFormworkSettlement()) : null; + if (subside != null && alarmValue != null && alarmValue < subside) { + //报警 + insertHighFormworkAlarmData(point, subside, 9, 1); + } else if (subside != null && warningValue != null && warningValue < subside) { + //预警 + insertHighFormworkAlarmData(point, subside, 9, 2); + } + } else if (type == 10) { + Double subside = StringUtils.isNotBlank(currentData.getPoleTilt()) ? Double.valueOf(currentData.getPoleTilt()) : null; + if (subside != null && alarmValue != null && alarmValue < subside) { + //报警 + insertHighFormworkAlarmData(point, subside, 10, 1); + } else if (subside != null && warningValue != null && warningValue < subside) { + //预警 + insertHighFormworkAlarmData(point, subside, 10, 2); + } + } else if (type == 11) { + Double subside = StringUtils.isNotBlank(currentData.getFoundationSettlement()) ? Double.valueOf(currentData.getFoundationSettlement()) : null; + if (subside != null && alarmValue != null && alarmValue < subside) { + //报警 + insertHighFormworkAlarmData(point, subside, 11, 1); + } else if (subside != null && warningValue != null && warningValue < subside) { + //预警 + insertHighFormworkAlarmData(point, subside, 11, 2); + } } } } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkDeviceCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkDeviceCurrentDataController.java deleted file mode 100644 index cc14e74b6..000000000 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkDeviceCurrentDataController.java +++ /dev/null @@ -1,111 +0,0 @@ -package com.zhgd.xmgl.modules.highformwork.controller; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.zhgd.jeecg.common.api.vo.Result; -import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkDeviceCurrentData; -import com.zhgd.xmgl.modules.highformwork.service.IHighFormworkDeviceCurrentDataService; -import com.zhgd.xmgl.modules.taskprogress.entity.TaskProgressMaterialRel; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections.MapUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; - -import javax.servlet.http.HttpServletRequest; -import java.util.HashMap; - - -/** - * @Title: Controller - * @Description: 高支模-测量点设备实时数据 - * @author： pds - * @date： 2021-06-18 - * @version： V1.0 - */ -@RestController -@RequestMapping("/xmgl/highFormworkDeviceCurrentData") -@Slf4j -@Api(tags = "高支模-测量点设备实时数据") -public class HighFormworkDeviceCurrentDataController { - @Autowired - private IHighFormworkDeviceCurrentDataService highFormworkDeviceCurrentDataService; - - /** - * 分页列表查询 - * @param highFormworkDeviceCurrentData - * @param pageNo - * @param pageSize - * @param req - * @return - */ - @ApiOperation(value = "分页列表查询高支模-测量点设备实时数据信息", notes = "分页列表查询高支模-测量点设备实时数据信息", httpMethod = "GET") - @GetMapping(value = "/list") - public Result> queryPageList(HighFormworkDeviceCurrentData highFormworkDeviceCurrentData, - @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, - @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, - HttpServletRequest req) { - Result> result = new Result>(); - QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(highFormworkDeviceCurrentData, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); - IPage pageList = highFormworkDeviceCurrentDataService.page(page, queryWrapper); - result.setSuccess(true); - result.setResult(pageList); - return result; - } - - /** - * 添加 - * @param highFormworkDeviceCurrentData - * @return - */ - @ApiOperation(value = "添加高支模-测量点设备实时数据信息", notes = "添加高支模-测量点设备实时数据信息", httpMethod = "POST") - @PostMapping(value = "/add") - public Result add(@RequestBody HighFormworkDeviceCurrentData highFormworkDeviceCurrentData) { - highFormworkDeviceCurrentDataService.saveDeviceCurrentData(highFormworkDeviceCurrentData); - return Result.ok(); - } - - /** - * 编辑 - * - * @param taskProgressMaterialRel - * @return - */ - @ApiOperation(value = "编辑高支模-测量点设备实时数据", notes = "编辑高支模-测量点设备实时数据", httpMethod = "POST") - @PostMapping(value = "/edit") - public Result edit(@RequestBody HighFormworkDeviceCurrentData taskProgressMaterialRel) { - highFormworkDeviceCurrentDataService.updateById(taskProgressMaterialRel); - return Result.ok(); - } - - /** - * 通过id删除 - * - * @return - */ - @ApiOperation(value = "删除高支模-测量点设备实时数据", notes = "删除高支模-测量点设备实时数据", httpMethod = "POST") - @ApiImplicitParam(name = "id", value = "高支模-测量点设备实时数据id", paramType = "body", required = true, dataType = "String", example = "{\"id\":\"1\"}") - @PostMapping(value = "/delete") - public Result delete(@ApiIgnore @RequestBody HashMap map) { - String id = MapUtils.getString(map, "id"); - Result result = new Result<>(); - HighFormworkDeviceCurrentData taskProgressMaterialRel = highFormworkDeviceCurrentDataService.getById(id); - if (taskProgressMaterialRel == null) { - result.error500("未找到对应实体"); - } else { - boolean ok = highFormworkDeviceCurrentDataService.removeById(id); - if (ok) { - result.success("删除成功!"); - } - } - - return result; - } - -} diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasureCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasureCurrentDataController.java index 0fc997ef9..29a4d3bd4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasureCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasureCurrentDataController.java @@ -139,4 +139,6 @@ public class HighFormworkMeasureCurrentDataController { public Result> getDataPerHourForTheLastDay(@RequestParam Map map) { return Result.success(highFormworkMeasureCurrentDataService.getDataPerHourForTheLastDay(map)); } + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasurePointController.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasurePointController.java index df48bcd34..ce21dd162 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasurePointController.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasurePointController.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasurePoint; +import com.zhgd.xmgl.modules.highformwork.entity.vo.CountHighFormworkMeasurePointVo; import com.zhgd.xmgl.modules.highformwork.service.IHighFormworkMeasurePointService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -15,7 +16,9 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import springfox.documentation.annotations.ApiIgnore; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -115,5 +118,21 @@ public class HighFormworkMeasurePointController { return Result.success(highFormworkMeasurePointService.selectMeasurePointInfo(map)); } + @ApiOperation(value = "统计烟感报警数据", notes = "统计烟感报警数据", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countHighFormworkMeasurePoint") + public Result countHighFormworkMeasurePoint(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(highFormworkMeasurePointService.countHighFormworkMeasurePoint(paramMap)); + } + @ApiOperation(value = "高支模监测动态", notes = "高支模监测动态", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countMonitorDynamic") + public Result> countMonitorDynamic(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(highFormworkMeasurePointService.countMonitorDynamic(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java index 3876f4422..d425d558e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkAlarmData.java @@ -32,10 +32,10 @@ public class HighFormworkAlarmData implements Serializable { @ApiModelProperty(value = "id") private java.lang.Long id; /** - * 类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm） + * 类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,7.立杆轴力8.水平位移9.模板沉降10.立杆倾斜11.地基沉降 */ - @Excel(name = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）", width = 15) - @ApiModelProperty(value = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）") + @Excel(name = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,7.立杆轴力8.水平位移9.模板沉降10.立杆倾斜11.地基沉降", width = 15) + @ApiModelProperty(value = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,7.立杆轴力8.水平位移9.模板沉降10.立杆倾斜11.地基沉降") private java.lang.Integer type; /** * 监测点ID diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java index 06e9b7e33..f3914c1e4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java @@ -24,7 +24,7 @@ import java.util.Date; @ApiModel(value="HighFormworkMeasureCurrentData实体类",description="HighFormworkMeasureCurrentData") public class HighFormworkMeasureCurrentData implements Serializable { private static final long serialVersionUID = 1L; - + /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="id") @@ -53,18 +53,35 @@ public class HighFormworkMeasureCurrentData implements Serializable { private java.lang.String angleXAxis ; /**Y轴倾角（°）*/ @Excel(name = "Y轴倾角（°）", width = 15) - @ApiModelProperty(value="Y轴倾角（°）") - private java.lang.String angleYAxis ; - /**压力（kN）*/ + @ApiModelProperty(value = "Y轴倾角（°）") + private java.lang.String angleYAxis; + /** + * 压力（kN） + */ @Excel(name = "压力（kN）", width = 15) - @ApiModelProperty(value="压力（kN）") - private java.lang.String pressure ; - /**沉降（mm）*/ + @ApiModelProperty(value = "压力（kN）") + private java.lang.String pressure; + /** + * 沉降（mm） + */ @Excel(name = "沉降（mm）", width = 15) - @ApiModelProperty(value="沉降（mm）") - private java.lang.String subside ; - /**报警状态，1正常，2预警，3报警*/ + @ApiModelProperty(value = "沉降（mm）") + private java.lang.String subside; + @ApiModelProperty(value = "立杆轴力") + private java.lang.String poleAxialForce; + @ApiModelProperty(value = "水平位移") + private java.lang.String horizontalDisplacement; + @ApiModelProperty(value = "模板沉降") + private java.lang.String formworkSettlement; + @ApiModelProperty(value = "立杆倾斜") + private java.lang.String poleTilt; + @ApiModelProperty(value = "地基沉降") + private java.lang.String foundationSettlement; + /** + * 报警状态，1正常，2预警，3报警 + */ @Excel(name = "报警状态，1正常，2预警，3报警", width = 15) - @ApiModelProperty(value="报警状态，1正常，2预警，3报警，4离线") - private java.lang.Integer alarmState ; + @ApiModelProperty(value = "报警状态，1正常，2预警，3报警，4离线") + private java.lang.Integer alarmState; + } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePoint.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePoint.java index ba2ff6ab9..574cf5c49 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePoint.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePoint.java @@ -24,7 +24,7 @@ import java.util.List; @ApiModel(value="HighFormworkMeasurePoint实体类",description="HighFormworkMeasurePoint") public class HighFormworkMeasurePoint implements Serializable { private static final long serialVersionUID = 1L; - + /**id*/ @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty(value="id") @@ -70,4 +70,14 @@ public class HighFormworkMeasurePoint implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "高支模-测量设备") private List deviceList; + + @TableField(exist = false) + @ApiModelProperty(value = "监测时长(秒）") + private Integer monitorDurationTime; + + @TableField(exist = false) + @ApiModelProperty(value = "监测时长") + private String monitorDuration; + } + diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePointThreshold.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePointThreshold.java index f73cdda8a..e45dc04c3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePointThreshold.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasurePointThreshold.java @@ -22,26 +22,33 @@ import io.swagger.annotations.ApiModelProperty; @ApiModel(value="HighFormworkMeasurePointThreshold实体类",description="HighFormworkMeasurePointThreshold") public class HighFormworkMeasurePointThreshold implements Serializable { private static final long serialVersionUID = 1L; - - /**id*/ - @TableId(type = IdType.ASSIGN_ID) - @ApiModelProperty(value="id") - private java.lang.Long id ; - /**监测点ID*/ + + /** + * id + */ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private java.lang.Long id; + /** + * 监测点ID + */ @Excel(name = "监测点ID", width = 15) - @ApiModelProperty(value="监测点ID") - - private java.lang.Long measurePointId ; - /**类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）*/ - @Excel(name = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）", width = 15) - @ApiModelProperty(value="类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）") - private java.lang.Integer type ; - /**预警值*/ + @ApiModelProperty(value = "监测点ID") + + private java.lang.Long measurePointId; + @Excel(name = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,7.立杆轴力8.水平位移9.模板沉降10.立杆倾斜11.地基沉降", width = 15) + @ApiModelProperty(value = "类型 ，1电量（%），2 X轴（°），3 Y轴（°），4压力（kN），5沉降（mm）,7.立杆轴力8.水平位移9.模板沉降10.立杆倾斜11.地基沉降") + private java.lang.Integer type; + /** + * 预警值 + */ @Excel(name = "预警值", width = 15) - @ApiModelProperty(value="预警值") - private java.lang.String warningValue ; - /**报警值*/ + @ApiModelProperty(value = "预警值") + private java.lang.String warningValue; + /** + * 报警值 + */ @Excel(name = "报警值", width = 15) - @ApiModelProperty(value="报警值") - private java.lang.String alarmValue ; + @ApiModelProperty(value = "报警值") + private java.lang.String alarmValue; } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/CountHighFormworkMeasurePointVo.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/CountHighFormworkMeasurePointVo.java new file mode 100644 index 000000000..56eef523c --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/CountHighFormworkMeasurePointVo.java @@ -0,0 +1,14 @@ +package com.zhgd.xmgl.modules.highformwork.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountHighFormworkMeasurePointVo { + @ApiModelProperty(value = "总监测点位数") + private String totalPointNum; + @ApiModelProperty(value = "报警点位数") + private String alarmPointNum; + @ApiModelProperty(value = "监测中点位数") + private String monitoringPointNum; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/DataPerHourForTheLastDayVo.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/DataPerHourForTheLastDayVo.java index 04708e629..8643fbb20 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/DataPerHourForTheLastDayVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/DataPerHourForTheLastDayVo.java @@ -15,4 +15,12 @@ public class DataPerHourForTheLastDayVo { private String pressure; @ApiModelProperty(value = "沉降（mm）值") private String subside; + + /* +立杆轴力 +水平位移 +模板沉降 +立杆倾斜 +地基沉降 + */ } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasurePointMapper.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasurePointMapper.java index ea7a25dc8..412bd3f17 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasurePointMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasurePointMapper.java @@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasurePoint; import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasurePointQo; +import com.zhgd.xmgl.modules.highformwork.entity.vo.CountHighFormworkMeasurePointVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -31,4 +33,8 @@ public interface HighFormworkMeasurePointMapper extends BaseMapper queryHighFormworkMeasureDeviceByDeviceSn(HighFormworkMeasurePointQo qo); HighFormworkMeasurePoint queryhighFormworkMeasurePointWithDevice(HighFormworkMeasurePointQo qo); + + CountHighFormworkMeasurePointVo countHighFormworkMeasurePoint(HashMap paramMap); + + List countMonitorDynamic(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml index 868430b43..f0bef5f1e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml @@ -55,4 +55,23 @@ WHERE hfmp.measure_point_number =#{measurePointNumber} and hfmp.acquisition_instrument_number = #{acquisitionInstrumentNumber} + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/IHighFormworkMeasurePointService.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/IHighFormworkMeasurePointService.java index 30de44a80..5862a2173 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/IHighFormworkMeasurePointService.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/IHighFormworkMeasurePointService.java @@ -4,7 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasurePoint; import com.baomidou.mybatisplus.extension.service.IService; +import com.zhgd.xmgl.modules.highformwork.entity.vo.CountHighFormworkMeasurePointVo; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -27,4 +29,8 @@ public interface IHighFormworkMeasurePointService extends IService map); List selectPointList(Map map); + + CountHighFormworkMeasurePointVo countHighFormworkMeasurePoint(HashMap paramMap); + + List countMonitorDynamic(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java index 1110ce154..935644822 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java @@ -7,10 +7,12 @@ import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.mybatis.EntityMap; import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasurePoint; import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasurePointThreshold; +import com.zhgd.xmgl.modules.highformwork.entity.vo.CountHighFormworkMeasurePointVo; import com.zhgd.xmgl.modules.highformwork.mapper.HighFormworkMeasurePointMapper; import com.zhgd.xmgl.modules.highformwork.mapper.HighFormworkMeasurePointThresholdMapper; import com.zhgd.xmgl.modules.highformwork.service.IHighFormworkMeasurePointService; import com.zhgd.xmgl.util.MessageUtil; +import com.zhgd.xmgl.util.TimeUtil; import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -19,6 +21,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.transaction.annotation.Transactional; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -101,7 +104,7 @@ public class HighFormworkMeasurePointServiceImpl extends ServiceImpl queryWrapper=new QueryWrapper<>(); queryWrapper.lambda().eq(HighFormworkMeasurePointThreshold::getMeasurePointId,MapUtils.getString(map,"id")); - List list=highFormworkMeasurePointThresholdMapper.selectList(queryWrapper); + List list = highFormworkMeasurePointThresholdMapper.selectList(queryWrapper); measurePoint.setThresholdList(list); } return measurePoint; @@ -111,4 +114,18 @@ public class HighFormworkMeasurePointServiceImpl extends ServiceImpl selectPointList(Map map) { return highFormworkMeasurePointMapper.selectPointList(map); } + + @Override + public CountHighFormworkMeasurePointVo countHighFormworkMeasurePoint(HashMap paramMap) { + return baseMapper.countHighFormworkMeasurePoint(paramMap); + } + + @Override + public List countMonitorDynamic(HashMap paramMap) { + List list = baseMapper.countMonitorDynamic(paramMap); + for (HighFormworkMeasurePoint point : list) { + point.setMonitorDuration(TimeUtil.toHourMinSecond(point.getMonitorDurationTime())); + } + return list; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialDetailsController.java b/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialDetailsController.java index 66146e16d..41552b3ef 100644 --- a/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialDetailsController.java +++ b/src/main/java/com/zhgd/xmgl/modules/material/controller/MaterialDetailsController.java @@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; +import java.util.HashMap; import java.util.List; /** @@ -114,14 +115,16 @@ public class MaterialDetailsController { /** * 每个类别所有消耗量列表 * - * @param projectSn 项目sn * @return 每个类别所有消耗量列表 */ @GetMapping(value = "/sumConsumeList") @ApiOperation(value = "每个类别所有消耗量列表") - @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String") - public Result> sumConsumeList(String projectSn) { - return Result.success(materialDetailsService.sumConsumeList(projectSn)); + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1创建时间正序", paramType = "query", required = false, dataType = "Integer"), + }) + public Result> sumConsumeList(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(materialDetailsService.sumConsumeList(paramMap)); } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/material/mapper/MaterialDetailsMapper.java b/src/main/java/com/zhgd/xmgl/modules/material/mapper/MaterialDetailsMapper.java index 87443b590..ddf61241b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/material/mapper/MaterialDetailsMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/material/mapper/MaterialDetailsMapper.java @@ -6,6 +6,7 @@ import com.zhgd.xmgl.modules.material.entity.dto.MaterialDetailsMonthDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; /** @@ -56,10 +57,9 @@ public interface MaterialDetailsMapper extends BaseMapper { /** * 每个类别所有消耗量列表 * - * @param projectSn 项目sn * @return 每个类别所有消耗量列表 */ - List sumConsumeList(@Param("projectSn") String projectSn); + List sumConsumeList(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/material/mapper/xml/MaterialDetailsMapper.xml b/src/main/java/com/zhgd/xmgl/modules/material/mapper/xml/MaterialDetailsMapper.xml index 05fd54be0..66f0ebda0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/material/mapper/xml/MaterialDetailsMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/material/mapper/xml/MaterialDetailsMapper.xml @@ -60,8 +60,15 @@ left join zjsj_material_details zmd on zmt.id = zmd.type_id where zmt.project_sn = #{projectSn} group by zmt.id - ORDER BY - consume_value DESC + + + ORDER BY zmt.create_time + + + ORDER BY + consume_value DESC + +