diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/DictionaryItem.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/DictionaryItem.java index e54bc1db0..7edc833a7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/DictionaryItem.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/DictionaryItem.java @@ -76,4 +76,13 @@ public class DictionaryItem implements Serializable { private java.lang.String dictionaryEncoding; @TableField(exist = false) private java.lang.String projectSn; + + + public DictionaryItem() { + } + + public DictionaryItem(String name, String data) { + this.name = name; + this.data = data; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDetectData.java b/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDetectData.java index d0098d9b4..ea5aa0594 100644 --- a/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDetectData.java +++ b/src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDetectData.java @@ -74,23 +74,23 @@ public class HangBasketDetectData implements Serializable { @ApiModelProperty(value = "底膜高度差(mm)") private java.lang.Double bottomFilmHeightDifference; /** - * 左后梁锚杆(kN) - */ - @Excel(name = "左后梁锚杆(kN)", width = 15) - @ApiModelProperty(value = "左后梁锚杆(kN)") - private java.lang.Double leftRearBeamAnchor; - /** - * 左后梁锚杆(kN) - */ - @Excel(name = "左后梁锚杆(kN)", width = 15) - @ApiModelProperty(value = "左后梁锚杆(kN)") - private java.lang.Double rightRearBeamAnchor; - /** - * 后梁固定锚杆1#，状态：1正常2未连接3未使用4报警 - */ - @Excel(name = "后梁固定锚杆1#，状态：1正常2未连接3未使用4报警", width = 15) - @ApiModelProperty(value = "后梁固定锚杆1#，状态：1正常2未连接3未使用4报警") - private java.lang.Integer rearBeamFixedAnchor1; + * 左后梁锚杆(kN) + */ + @Excel(name = "左后梁锚杆(kN)", width = 15) + @ApiModelProperty(value = "左后梁锚杆(kN)") + private java.lang.Double leftRearBeamAnchor; + /** + * 右后梁锚杆(kN) + */ + @Excel(name = "右后梁锚杆(kN)", width = 15) + @ApiModelProperty(value = "右后梁锚杆(kN)") + private java.lang.Double rightRearBeamAnchor; + /** + * 后梁固定锚杆1#，状态：1正常2未连接3未使用4报警 + */ + @Excel(name = "后梁固定锚杆1#，状态：1正常2未连接3未使用4报警", width = 15) + @ApiModelProperty(value = "后梁固定锚杆1#，状态：1正常2未连接3未使用4报警") + private java.lang.Integer rearBeamFixedAnchor1; /** * 后梁固定锚杆2#，状态：1正常2未连接3未使用4报警 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeMonitorTypeController.java b/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeMonitorTypeController.java index 587a5ee29..57ad171ba 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeMonitorTypeController.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeMonitorTypeController.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.highslope.controller; 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.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.highslope.entity.HighSlopeMonitorType; import com.zhgd.xmgl.modules.highslope.service.IHighSlopeMonitorTypeService; import com.zhgd.xmgl.util.MessageUtil; @@ -19,6 +20,7 @@ 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; @@ -129,4 +131,14 @@ public class HighSlopeMonitorTypeController { public Result>> selectMonitorTypeAlarmCountList(@ApiIgnore @RequestBody Map map) { return Result.success(highSlopeMonitorTypeService.selectMonitorTypeAlarmCountList(map)); } + + @ApiOperation(value = "统计检测内容（设备类型统计）", notes = "统计检测内容（设备类型统计）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "highSlopeEngineeringId", value = "高边坡-工程id", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countMonitorType") + public Result countMonitorType(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(highSlopeMonitorTypeService.countMonitorType(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/HighSlopeEngineeringToMonitorTypeMapper.java b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/HighSlopeEngineeringToMonitorTypeMapper.java index 2d211abdc..65e40abe9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/HighSlopeEngineeringToMonitorTypeMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/HighSlopeEngineeringToMonitorTypeMapper.java @@ -1,9 +1,13 @@ package com.zhgd.xmgl.modules.highslope.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; import com.zhgd.xmgl.modules.highslope.entity.HighSlopeEngineeringToMonitorType; import org.apache.ibatis.annotations.Mapper; +import java.util.ArrayList; +import java.util.HashMap; + /** * @author 邱平毅 * @ClassName HighSlopeEngineeringToMonitorTypeMapper @@ -12,4 +16,5 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface HighSlopeEngineeringToMonitorTypeMapper extends BaseMapper { + ArrayList countMonitorType(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/HighSlopeMonitorTypeMapper.java b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/HighSlopeMonitorTypeMapper.java index 639294323..5f6ae60ee 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/HighSlopeMonitorTypeMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/HighSlopeMonitorTypeMapper.java @@ -3,10 +3,13 @@ package com.zhgd.xmgl.modules.highslope.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; import com.zhgd.xmgl.modules.highslope.entity.HighSlopeMonitorType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -28,4 +31,7 @@ public interface HighSlopeMonitorTypeMapper extends BaseMapper selectMonitorTypeList(Map map); List> selectMonitorTypeAlarmCountList(Map map); + + ArrayList countMonitorType(HashMap paramMap); + } diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeEngineeringToMonitorTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeEngineeringToMonitorTypeMapper.xml index d318fa07e..56fe54adc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeEngineeringToMonitorTypeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeEngineeringToMonitorTypeMapper.xml @@ -1,4 +1,14 @@ + diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml index 4cfa636bb..3491657c4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml @@ -110,4 +110,15 @@ conutTable.high_slope_engineering_to_monitor_type_id = demtr.id WHERE demtr.high_slope_engineering_id = #{highSlopeEngineeringId} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/service/IHighSlopeMonitorTypeService.java b/src/main/java/com/zhgd/xmgl/modules/highslope/service/IHighSlopeMonitorTypeService.java index bc69bc2c6..9444fd1a0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/service/IHighSlopeMonitorTypeService.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/service/IHighSlopeMonitorTypeService.java @@ -3,8 +3,10 @@ package com.zhgd.xmgl.modules.highslope.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.base.entity.vo.SectorVo; import com.zhgd.xmgl.modules.highslope.entity.HighSlopeMonitorType; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -25,4 +27,6 @@ public interface IHighSlopeMonitorTypeService extends IService selectMonitorTypeList(Map map); List> selectMonitorTypeAlarmCountList(Map map); + + SectorVo countMonitorType(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/highslope/service/impl/HighSlopeMonitorTypeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/highslope/service/impl/HighSlopeMonitorTypeServiceImpl.java index 062d57451..388306ec1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highslope/service/impl/HighSlopeMonitorTypeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/highslope/service/impl/HighSlopeMonitorTypeServiceImpl.java @@ -6,7 +6,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.mybatis.EntityMap; +import com.zhgd.xmgl.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.SectorVo; +import com.zhgd.xmgl.modules.basicdata.entity.DictionaryItem; import com.zhgd.xmgl.modules.highslope.entity.HighSlopeMonitorType; +import com.zhgd.xmgl.modules.highslope.mapper.HighSlopeEngineeringToMonitorTypeMapper; import com.zhgd.xmgl.modules.highslope.mapper.HighSlopeMonitorTypeMapper; import com.zhgd.xmgl.modules.highslope.service.IHighSlopeMonitorTypeService; import org.apache.commons.collections.MapUtils; @@ -14,9 +18,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * @Description: 高边坡-监测类型 @@ -29,6 +35,8 @@ import java.util.Map; public class HighSlopeMonitorTypeServiceImpl extends ServiceImpl implements IHighSlopeMonitorTypeService { @Autowired private HighSlopeMonitorTypeMapper highSlopeMonitorTypeMapper; + @Autowired + private HighSlopeEngineeringToMonitorTypeMapper highSlopeEngineeringToMonitorTypeMapper; @Override public IPage selectHighSlopeMonitorPage(Map map) { @@ -69,4 +77,13 @@ public class HighSlopeMonitorTypeServiceImpl extends ServiceImpl> selectMonitorTypeAlarmCountList(Map map) { return highSlopeMonitorTypeMapper.selectMonitorTypeAlarmCountList(map); } + + @Override + public SectorVo countMonitorType(HashMap paramMap) { + ArrayList list = highSlopeEngineeringToMonitorTypeMapper.countMonitorType(paramMap); + List dictionaryItems = highSlopeMonitorTypeMapper.selectList(null).stream().map(h -> { + return new DictionaryItem(h.getMonitorTypeName(), h.getMonitorTypeCode()); + }).collect(Collectors.toList()); + return SectorVo.getSectorVoByDict(list, dictionaryItems, true); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/impl/PressureTestMachineManageServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/impl/PressureTestMachineManageServiceImpl.java index c7ec075e8..13ee484b0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/impl/PressureTestMachineManageServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/impl/PressureTestMachineManageServiceImpl.java @@ -139,7 +139,7 @@ public class PressureTestMachineManageServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = "ptmm."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PressureTestMachineManage.class, paramMap, alias); - queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(PressureTestMachineManage::getId)); + queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(PressureTestMachineManage::getTestTime)); return queryWrapper; }