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

bug修复

Browse Source
This commit is contained in:
guo 2024-01-29 09:23:26 +08:00
parent 4264a566ca
commit e2824b32fa
10 changed files with 92 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/DictionaryItem.java
View File

@ -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;
}
}

34
src/main/java/com/zhgd/xmgl/modules/hangbasket/entity/HangBasketDetectData.java
View File

@ -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报警
*/

12
src/main/java/com/zhgd/xmgl/modules/highslope/controller/HighSlopeMonitorTypeController.java
View File

@ -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<List<Map<String, Object>>> selectMonitorTypeAlarmCountList(@ApiIgnore @RequestBody Map<String, Object> 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<SectorVo> countMonitorType(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
return Result.success(highSlopeMonitorTypeService.countMonitorType(paramMap));
}
}

5
src/main/java/com/zhgd/xmgl/modules/highslope/mapper/HighSlopeEngineeringToMonitorTypeMapper.java
View File

@ -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<HighSlopeEngineeringToMonitorType> {
ArrayList<SectorOneVo> countMonitorType(HashMap<String, Object> paramMap);
}

6
src/main/java/com/zhgd/xmgl/modules/highslope/mapper/HighSlopeMonitorTypeMapper.java
View File

@ -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<HighSlopeMonitorT
List<EntityMap> selectMonitorTypeList(Map<String, Object> map);
List<Map<String, Object>> selectMonitorTypeAlarmCountList(Map<String, Object> map);
ArrayList<SectorOneVo> countMonitorType(HashMap<String, Object> paramMap);
}

10
src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeEngineeringToMonitorTypeMapper.xml
View File

@ -1,4 +1,14 @@
<?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.highslope.mapper.HighSlopeEngineeringToMonitorTypeMapper">
<select id="countMonitorType" resultType="com.zhgd.xmgl.base.entity.vo.SectorOneVo">
select hsetmt.high_slope_monitor_type_id x,count(*) y
from high_slope_engineering_to_monitor_type hsetmt
where 1=1
<if test="highSlopeEngineeringId != null and highSlopeEngineeringId != ''">
and hsetmt.high_slope_engineering_id = #{highSlopeEngineeringId}
</if>
group by x
order by y desc
</select>
</mapper>

11
src/main/java/com/zhgd/xmgl/modules/highslope/mapper/xml/HighSlopeMonitorTypeMapper.xml
View File

@ -110,4 +110,15 @@
conutTable.high_slope_engineering_to_monitor_type_id = demtr.id
WHERE demtr.high_slope_engineering_id = #{highSlopeEngineeringId}
</select>
<select id="countMonitorType" resultType="com.zhgd.xmgl.base.entity.vo.SectorOneVo">
select hsetmt.high_slope_monitor_type_id x,count(*) y
from high_slope_engineering_to_monitor_type hsetmt
where 1=1
<if test="highSlopeEngineeringId != null and highSlopeEngineeringId != ''">
and hsetmt.high_slope_engineering_id = #{highSlopeEngineeringId}
</if>
group by x
order by y desc
</select>
</mapper>

4
src/main/java/com/zhgd/xmgl/modules/highslope/service/IHighSlopeMonitorTypeService.java
View File

@ -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<HighSlopeMonitorT
List<EntityMap> selectMonitorTypeList(Map<String, Object> map);
List<Map<String, Object>> selectMonitorTypeAlarmCountList(Map<String, Object> map);
SectorVo countMonitorType(HashMap<String, Object> paramMap);
}

17
src/main/java/com/zhgd/xmgl/modules/highslope/service/impl/HighSlopeMonitorTypeServiceImpl.java
View File

@ -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<HighSlopeMonitorTypeMapper, HighSlopeMonitorType> implements IHighSlopeMonitorTypeService {
@Autowired
private HighSlopeMonitorTypeMapper highSlopeMonitorTypeMapper;
@Autowired
private HighSlopeEngineeringToMonitorTypeMapper highSlopeEngineeringToMonitorTypeMapper;
@Override
public IPage<EntityMap> selectHighSlopeMonitorPage(Map<String, Object> map) {
@ -69,4 +77,13 @@ public class HighSlopeMonitorTypeServiceImpl extends ServiceImpl<HighSlopeMonito
public List<Map<String, Object>> selectMonitorTypeAlarmCountList(Map<String, Object> map) {
return highSlopeMonitorTypeMapper.selectMonitorTypeAlarmCountList(map);
}
@Override
public SectorVo countMonitorType(HashMap<String, Object> paramMap) {
ArrayList<SectorOneVo> list = highSlopeEngineeringToMonitorTypeMapper.countMonitorType(paramMap);
List<DictionaryItem> dictionaryItems = highSlopeMonitorTypeMapper.selectList(null).stream().map(h -> {
return new DictionaryItem(h.getMonitorTypeName(), h.getMonitorTypeCode());
}).collect(Collectors.toList());
return SectorVo.getSectorVoByDict(list, dictionaryItems, true);
}
}

2
src/main/java/com/zhgd/xmgl/modules/pressuretest/service/impl/PressureTestMachineManageServiceImpl.java
View File

@ -139,7 +139,7 @@ public class PressureTestMachineManageServiceImpl extends ServiceImpl<PressureTe
private QueryWrapper<PressureTestMachineManage> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = "ptmm.";
QueryWrapper<PressureTestMachineManage> queryWrapper = QueryGenerator.initPageQueryWrapper(PressureTestMachineManage.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(PressureTestMachineManage::getId));
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(PressureTestMachineManage::getTestTime));
return queryWrapper;
}