admin/wisdomisitezw-city_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

高支模

Browse Source
This commit is contained in:
guo 2023-09-22 10:08:53 +08:00
parent 6bd4dbda69
commit 33890e25f6
13 changed files with 233 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/zhgd/xmgl/modules/city/highformwork/controller/HighFormworkMeasureCurrentAndAlarmDataController.java
View File

@ -7,7 +7,10 @@ import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.PageUtil;
import com.zhgd.xmgl.base.entity.vo.TrendVo;
import com.zhgd.xmgl.modules.city.deepexcavation.entity.vo.DeepExcavationAlarmRankVo;
import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasureCurrentAndAlarmData;
import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkAlarmRankVo;
import com.zhgd.xmgl.modules.city.highformwork.service.IHighFormworkMeasureCurrentAndAlarmDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@ -21,6 +24,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;
@ -102,5 +106,26 @@ public class HighFormworkMeasureCurrentAndAlarmDataController {
return result;
}
@OperLog(operModul = "高支模-测量点实时数据和报警数据管理", operType = "统计", operDesc = "高支模各区预警情况")
@ApiOperation(value = "高支模各区预警情况", notes = "高支模各区预警情况", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "type", value = "1一个月2三个月3半年", paramType = "body", required = false, dataType = "Integer"),
})
@PostMapping(value = "/countHighFormworkAlarmDistrict")
public Result<List<TrendVo>> countHighFormworkAlarmDistrict(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
return Result.success(highFormworkMeasureCurrentAndAlarmDataService.countHighFormworkAlarmDistrict(paramMap));
}
@OperLog(operModul = "高支模-测量点实时数据和报警数据管理", operType = "统计", operDesc = "预警工程排名")
@ApiOperation(value = "预警工程排名", notes = "预警工程排名", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "engineeringSn", value = "工程SN", paramType = "body", dataType = "String"),
@ApiImplicitParam(name = "engineeringName", value = "工程名称", paramType = "body", dataType = "String"),
})
@PostMapping(value = "/getDeepExcavationAlarmRank")
public Result<IPage<HighFormworkAlarmRankVo>> getHighFormworkAlarmRank(@ApiIgnore @RequestBody HashMap<String, Object> paramMap) {
return Result.success(highFormworkMeasureCurrentAndAlarmDataService.getHighFormworkAlarmRank(paramMap));
}
}

31
src/main/java/com/zhgd/xmgl/modules/city/highformwork/controller/HighFormworkMeasurePointController.java
View File

@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.jeecg.common.util.PageUtil;
import com.zhgd.xmgl.base.entity.vo.CityAndDistrictDeviceCountVo;
import com.zhgd.xmgl.base.entity.vo.MultiTrendVo;
import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.modules.city.engineering.entity.Engineering;
import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasurePoint;
import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkMeasurePointVo;
import com.zhgd.xmgl.modules.city.highformwork.service.IHighFormworkMeasurePointService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@ -107,4 +109,31 @@ public class HighFormworkMeasurePointController {
return Result.success(pageList);
}
@OperLog(operModul = "高支模测点管理", operType = "统计", operDesc = "高支模总体概况")
@ApiOperation(value = "高支模总体概况", notes = "高支模总体概况", httpMethod = "POST")
@ApiImplicitParams({
})
@PostMapping(value = "/countHighFormworkMeasurePoint")
public Result<HighFormworkMeasurePointVo> countHighFormworkMeasurePoint() {
return Result.success(highFormworkMeasurePointService.countHighFormworkMeasurePoint());
}
@OperLog(operModul = "高支模测点管理", operType = "统计", operDesc = "高支模监测情况")
@ApiOperation(value = "高支模监测情况", notes = "高支模监测情况", httpMethod = "POST")
@ApiImplicitParams({
})
@PostMapping(value = "/countHighFormworkMeasurePointMonitor")
public Result<SectorVo> countHighFormworkMeasurePointMonitor() {
return Result.success(highFormworkMeasurePointService.countHighFormworkMeasurePointMonitor());
}
@OperLog(operModul = "高支模测点管理", operType = "统计", operDesc = "高支模各区工程情况")
@ApiOperation(value = "高支模各区工程情况", notes = "高支模各区工程情况", httpMethod = "POST")
@ApiImplicitParams({
})
@PostMapping(value = "/countHighFormworkMeasurePointDistrict")
public Result<MultiTrendVo> countHighFormworkMeasurePointDistrict() {
return Result.success(highFormworkMeasurePointService.countHighFormworkMeasurePointDistrict());
}
}

10
src/main/java/com/zhgd/xmgl/modules/city/highformwork/entity/vo/HighFormworkAlarmRankVo.java Normal file
View File

@ -0,0 +1,10 @@
package com.zhgd.xmgl.modules.city.highformwork.entity.vo;
import lombok.Data;
@Data
public class HighFormworkAlarmRankVo {
private String engineeringName;
private String engineeringSn;
private String count;
}

14
src/main/java/com/zhgd/xmgl/modules/city/highformwork/entity/vo/HighFormworkMeasurePointVo.java Normal file
View File

@ -0,0 +1,14 @@
package com.zhgd.xmgl.modules.city.highformwork.entity.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@Data
public class HighFormworkMeasurePointVo {
@ApiModelProperty("高支模数量")
private Integer count;
@ApiModelProperty("监测高支模数量")
private Integer monitorCount;
@ApiModelProperty("高支模预警数量")
private Integer warningCount;
}

9
src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/HighFormworkMeasureCurrentAndAlarmDataMapper.java
View File

@ -1,16 +1,21 @@
package com.zhgd.xmgl.modules.city.highformwork.mapper;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope;
import com.zhgd.xmgl.base.entity.bo.CountExt;
import com.zhgd.xmgl.base.entity.vo.TrendVo;
import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasureCurrentAndAlarmData;
import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasureDevice;
import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkAlarmRankVo;
import org.apache.ibatis.annotations.Mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
/**
* @Description: 高支模-测量点实时数据和报警数据
@ -27,4 +32,8 @@ public interface HighFormworkMeasureCurrentAndAlarmDataMapper extends BaseMapper
List<TrendVo> queryLastDayTrend(HighFormworkMeasureDevice device);
Integer getCount(Map<String, Object> map);
List<TrendVo> countHighFormworkAlarmDistrict(HashMap<String, Object> paramMap);
IPage<HighFormworkAlarmRankVo> getHighFormworkAlarmRank(Page<HighFormworkAlarmRankVo> page, @Param("param") HashMap<String, Object> paramMap);
}

8
src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/HighFormworkMeasurePointMapper.java
View File

@ -4,11 +4,14 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.annotation.DataScope;
import com.zhgd.xmgl.base.entity.vo.CityAndDistrictDeviceCountVo;
import com.zhgd.xmgl.base.entity.vo.TrendVo;
import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasurePoint;
import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkMeasurePointVo;
import com.zhgd.xmgl.modules.city.monitor.entity.bo.OnlineGroupByProjectBo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -28,5 +31,8 @@ public interface HighFormworkMeasurePointMapper extends BaseMapper<HighFormworkM
List<OnlineGroupByProjectBo> countCompleteGroupByProject();
Integer getCount();
Integer getCount(Map<String, Object> map);
List<TrendVo> countHighFormworkMeasurePointDistrict(HashMap<String, Object> map);
}

28
src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/xml/HighFormworkMeasureCurrentAndAlarmDataMapper.xml
View File

@ -20,10 +20,36 @@
</select>
<select id="getCount" resultType="java.lang.Integer">
select count(*) from high_formwork_measure_current_and_alarm_data
select count(*)
from high_formwork_measure_current_and_alarm_data
where 1 = 1
<if test="alarmState != null">
and alarm_state = #{alarmState}
</if>
</select>
<select id="countHighFormworkAlarmDistrict" resultType="com.zhgd.xmgl.base.entity.vo.TrendVo">
select count(*) y, g.government_name x from high_formwork_measure_current_and_alarm_data d
join project p on d.project_sn = p.project_sn
join government g on p.government_sn = g.government_sn
<if test="alarmState != null">
and alarm_state = #{alarmState}
</if>
group by g.government_sn
</select>
<select id="getHighFormworkAlarmRank" resultType="com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkAlarmRankVo">
select e.engineering_name, e.engineering_sn, count(d.id) count
from engineering e
left join high_formwork_measure_current_and_alarm_data d on d.engineering_sn = e.engineering_sn
where 1 = 1
<if test="param.engineeringSn != null and param.engineeringSn != ''">
and e.engineering_sn like concat('%', #{param.engineeringSn}, '%')
</if>
<if test="param.engineeringName != null and param.engineeringName != ''">
and e.engineering_name like concat('%', #{param.engineeringName}, '%')
</if>
group by e.engineering_sn
order by count desc
</select>
</mapper>

20
src/main/java/com/zhgd/xmgl/modules/city/highformwork/mapper/xml/HighFormworkMeasurePointMapper.xml
View File

@ -9,7 +9,8 @@
columnPrefix="hfmd_" autoMapping="true">
</collection>
</resultMap>
<select id="selectHighFormworkMeasurePointPage" resultType="com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasurePoint">
<select id="selectHighFormworkMeasurePointPage"
resultType="com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasurePoint">
SELECT a.*
from high_formwork_measure_point a
WHERE 1 = 1
@ -67,6 +68,21 @@
</select>
<select id="getCount" resultType="java.lang.Integer">
select count(*) from high_formwork_measure_point
select count(*)
from high_formwork_measure_point
where 1 = 1
<if test="completeStatus != null">
and complete_status = #{completeStatus}
</if>
</select>
<select id="countHighFormworkMeasurePointDistrict" resultType="com.zhgd.xmgl.base.entity.vo.TrendVo">
select count(p.id) y, g.government_name x from high_formwork_measure_point p
join project p2 on p.project_sn = p2.project_sn
join government g on p2.government_sn = g.government_sn
<if test="completeStatus != null">
and complete_status = #{completeStatus}
</if>
group by g.government_sn
</select>
</mapper>

8
src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/IHighFormworkMeasureCurrentAndAlarmDataService.java
View File

@ -1,9 +1,13 @@
package com.zhgd.xmgl.modules.city.highformwork.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.base.entity.vo.TrendVo;
import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasureCurrentAndAlarmData;
import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkAlarmRankVo;
import java.util.HashMap;
import java.util.List;
/**
@ -17,4 +21,8 @@ public interface IHighFormworkMeasureCurrentAndAlarmDataService extends IService
List<HighFormworkMeasureCurrentAndAlarmData> queryAlarms();
List<HighFormworkMeasureCurrentAndAlarmData> queryDeviceDataAndTrend(HighFormworkMeasureCurrentAndAlarmData highFormworkMeasureCurrentAndAlarmData);
List<TrendVo> countHighFormworkAlarmDistrict(HashMap<String, Object> paramMap);
IPage<HighFormworkAlarmRankVo> getHighFormworkAlarmRank(HashMap<String, Object> paramMap);
}

15
src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/IHighFormworkMeasurePointService.java
View File

@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.base.entity.vo.CityAndDistrictDeviceCountVo;
import com.zhgd.xmgl.base.entity.vo.MultiTrendVo;
import com.zhgd.xmgl.base.entity.vo.SectorVo;
import com.zhgd.xmgl.modules.city.engineering.entity.Engineering;
import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasurePoint;
import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkMeasurePointVo;
import java.util.List;
import java.util.Map;
@ -22,12 +25,6 @@ public interface IHighFormworkMeasurePointService extends IService<HighFormworkM
IPage<HighFormworkMeasurePoint> selectHighFormworkMeasurePointPage(Map<String, Object> map);
void saveHighFormworkMeasurePoint(HighFormworkMeasurePoint highFormworkMeasurePoint);
void editHighFormworkMeasurePoint(HighFormworkMeasurePoint highFormworkMeasurePoint);
void deleteHighFormworkMeasurePoint(Map<String, Object> map);
HighFormworkMeasurePoint selectMeasurePointInfo(Map<String, Object> map);
List<HighFormworkMeasurePoint> selectPointList(HighFormworkMeasurePoint point);
@ -35,4 +32,10 @@ public interface IHighFormworkMeasurePointService extends IService<HighFormworkM
List<CityAndDistrictDeviceCountVo> countCityAndDistrictHighFormworkMeasurePoint();
IPage<CityAndDistrictDeviceCountVo> queryEngineeringAndStatusPage(Page<Engineering> page, QueryWrapper<Engineering> wrapper);
HighFormworkMeasurePointVo countHighFormworkMeasurePoint();
SectorVo countHighFormworkMeasurePointMonitor();
MultiTrendVo countHighFormworkMeasurePointDistrict();
}

20
src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/impl/HighFormworkMeasureCurrentAndAlarmDataServiceImpl.java
View File

@ -2,11 +2,16 @@ package com.zhgd.xmgl.modules.city.highformwork.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.util.PageUtil;
import com.zhgd.xmgl.base.entity.vo.TrendVo;
import com.zhgd.xmgl.modules.city.government.mapper.GovernmentMapper;
import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasureCurrentAndAlarmData;
import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasureDevice;
import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasurePoint;
import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkAlarmRankVo;
import com.zhgd.xmgl.modules.city.highformwork.mapper.HighFormworkMeasureCurrentAndAlarmDataMapper;
import com.zhgd.xmgl.modules.city.highformwork.mapper.HighFormworkMeasureDeviceMapper;
import com.zhgd.xmgl.modules.city.highformwork.mapper.HighFormworkMeasurePointMapper;
@ -16,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
@ -33,6 +39,8 @@ public class HighFormworkMeasureCurrentAndAlarmDataServiceImpl extends ServiceIm
private HighFormworkMeasureDeviceMapper highFormworkMeasureDeviceMapper;
@Autowired
private HighFormworkMeasurePointMapper highFormworkMeasurePointMapper;
@Autowired
private GovernmentMapper governmentMapper;
@Override
@ -78,6 +86,18 @@ public class HighFormworkMeasureCurrentAndAlarmDataServiceImpl extends ServiceIm
return rtList;
}
@Override
public List<TrendVo> countHighFormworkAlarmDistrict(HashMap<String, Object> paramMap) {
List<TrendVo> list = baseMapper.countHighFormworkAlarmDistrict(paramMap);
return TrendVo.getTrendVosForGovernment(list, governmentMapper);
}
@Override
public IPage<HighFormworkAlarmRankVo> getHighFormworkAlarmRank(HashMap<String, Object> paramMap) {
Page<HighFormworkAlarmRankVo> page = PageUtil.getPage(paramMap);
return baseMapper.getHighFormworkAlarmRank(page,paramMap);
}
private List<TrendVo> fill(List<TrendVo> trendList) {
List<String> list = DateUtils.getHoursListLastDay();
Map<String, TrendVo> map = trendList.stream().collect(Collectors.toMap(TrendVo::getX, Function.identity()));

109
src/main/java/com/zhgd/xmgl/modules/city/highformwork/service/impl/HighFormworkMeasurePointServiceImpl.java
View File

@ -1,21 +1,23 @@
package com.zhgd.xmgl.modules.city.highformwork.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.NumberUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.system.query.QueryGenerator;
import com.zhgd.xmgl.base.entity.bo.CountExt;
import com.zhgd.xmgl.base.entity.vo.CityAndDistrictDeviceCountVo;
import com.zhgd.xmgl.base.entity.vo.*;
import com.zhgd.xmgl.modules.city.engineering.entity.Engineering;
import com.zhgd.xmgl.modules.city.engineering.service.IEngineeringService;
import com.zhgd.xmgl.modules.city.government.entity.Government;
import com.zhgd.xmgl.modules.city.government.mapper.GovernmentMapper;
import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasurePoint;
import com.zhgd.xmgl.modules.city.highformwork.entity.HighFormworkMeasurePointThreshold;
import com.zhgd.xmgl.modules.city.highformwork.entity.vo.HighFormworkMeasurePointVo;
import com.zhgd.xmgl.modules.city.highformwork.mapper.HighFormworkMeasureCurrentAndAlarmDataMapper;
import com.zhgd.xmgl.modules.city.highformwork.mapper.HighFormworkMeasurePointMapper;
import com.zhgd.xmgl.modules.city.highformwork.mapper.HighFormworkMeasurePointThresholdMapper;
@ -24,14 +26,13 @@ import com.zhgd.xmgl.modules.city.highformwork.service.IHighFormworkMeasurePoint
import com.zhgd.xmgl.modules.city.monitor.entity.bo.OnlineGroupByProjectBo;
import com.zhgd.xmgl.security.SecurityUser;
import com.zhgd.xmgl.security.SecurityUtil;
import com.zhgd.xmgl.util.MessageUtil;
import org.apache.commons.collections.MapUtils;
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.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Function;
@ -68,56 +69,6 @@ public class HighFormworkMeasurePointServiceImpl extends ServiceImpl<HighFormwor
return page.setRecords(list);
}
@Override
public void saveHighFormworkMeasurePoint(HighFormworkMeasurePoint highFormworkMeasurePoint) {
QueryWrapper<HighFormworkMeasurePoint> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(HighFormworkMeasurePoint::getMeasurePointNumber, highFormworkMeasurePoint.getMeasurePointNumber());
int count = highFormworkMeasurePointMapper.selectCount(queryWrapper);
if (count > 0) {
throw new OpenAlertException(MessageUtil.get("pointNoExistErr"));
}
highFormworkMeasurePoint.setRealTime(new Date());
highFormworkMeasurePointMapper.insert(highFormworkMeasurePoint);
if (highFormworkMeasurePoint.getThresholdList() != null && highFormworkMeasurePoint.getThresholdList().size() > 0) {
for (HighFormworkMeasurePointThreshold threshold : highFormworkMeasurePoint.getThresholdList()) {
threshold.setMeasurePointId(highFormworkMeasurePoint.getId());
highFormworkMeasurePointThresholdMapper.insert(threshold);
}
}
}
@Override
public void editHighFormworkMeasurePoint(HighFormworkMeasurePoint highFormworkMeasurePoint) {
QueryWrapper<HighFormworkMeasurePoint> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(HighFormworkMeasurePoint::getMeasurePointNumber, highFormworkMeasurePoint.getMeasurePointNumber())
.ne(HighFormworkMeasurePoint::getId, highFormworkMeasurePoint.getId());
int count = highFormworkMeasurePointMapper.selectCount(queryWrapper);
if (count > 0) {
throw new OpenAlertException(MessageUtil.get("pointNoExistErr"));
}
highFormworkMeasurePoint.setRealTime(null);
highFormworkMeasurePointMapper.updateById(highFormworkMeasurePoint);
if (highFormworkMeasurePoint.getThresholdList() != null && highFormworkMeasurePoint.getThresholdList().size() > 0) {
for (HighFormworkMeasurePointThreshold threshold : highFormworkMeasurePoint.getThresholdList()) {
if (threshold.getId() != null) {
threshold.setMeasurePointId(highFormworkMeasurePoint.getId());
highFormworkMeasurePointThresholdMapper.updateById(threshold);
} else {
threshold.setMeasurePointId(highFormworkMeasurePoint.getId());
highFormworkMeasurePointThresholdMapper.insert(threshold);
}
}
}
}
@Override
public void deleteHighFormworkMeasurePoint(Map<String, Object> map) {
highFormworkMeasurePointMapper.deleteById(MapUtils.getString(map, "id"));
QueryWrapper<HighFormworkMeasurePointThreshold> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(HighFormworkMeasurePointThreshold::getMeasurePointId, MapUtils.getString(map, "id"));
highFormworkMeasurePointThresholdMapper.delete(queryWrapper);
}
@Override
public HighFormworkMeasurePoint selectMeasurePointInfo(Map<String, Object> map) {
HighFormworkMeasurePoint measurePoint = highFormworkMeasurePointMapper.selectById(MapUtils.getString(map, "id"));
@ -174,4 +125,54 @@ public class HighFormworkMeasurePointServiceImpl extends ServiceImpl<HighFormwor
});
return rtPage;
}
@Override
public HighFormworkMeasurePointVo countHighFormworkMeasurePoint() {
Map<String, Object> map = new HashMap<>();
HighFormworkMeasurePointVo vo = new HighFormworkMeasurePointVo();
vo.setCount(baseMapper.getCount(map));
map.put("completeStatus", 2);
vo.setMonitorCount(baseMapper.getCount(map));
map.put("completeStatus", 2);
vo.setWarningCount(highFormworkMeasureCurrentAndAlarmDataMapper.getCount(map));
return vo;
}
@Override
public SectorVo countHighFormworkMeasurePointMonitor() {
HashMap<String, Object> map = new HashMap<>();
List<SectorOneVo> data = new ArrayList<>();
Integer count = baseMapper.getCount(map);
SectorVo vo = new SectorVo();
map.put("completeStatus", 1);
Integer count1 = baseMapper.getCount(map);
data.add(new SectorOneVo("待监测", String.valueOf(count1), NumberUtil.roundStr((double) count1 / count * 100, 2)));
map.put("completeStatus", 2);
Integer count2 = baseMapper.getCount(map);
data.add(new SectorOneVo("在监测", String.valueOf(count2), NumberUtil.roundStr((double) count2 / count * 100, 2)));
map.put("completeStatus", 3);
Integer count3 = baseMapper.getCount(map);
data.add(new SectorOneVo("已监测", String.valueOf(count3), NumberUtil.roundStr((double) count3 / count * 100, 2)));
vo.setData(data);
vo.setCount(String.valueOf(data.stream().map(o -> Integer.parseInt(o.getCount())).mapToInt(value -> value).sum()));
return vo;
}
@Override
public MultiTrendVo countHighFormworkMeasurePointDistrict() {
HashMap<String, Object> map = new HashMap<>();
List<Government> myGovernments = governmentMapper.getMyGovernments(SecurityUtil.getUser().getSn());
if (CollUtil.isEmpty(myGovernments)) {
return null;
}
List<String> names = myGovernments.stream().map(Government::getGovernmentName).collect(Collectors.toList());
MultiTrendVo vo = new MultiTrendVo();
vo.setX(names);
List<MultiTrendOne> data = new ArrayList<>();
data.add(new MultiTrendOne("工程数", MultiTrendVo.fillData(baseMapper.countHighFormworkMeasurePointDistrict(map), names)));
map.put("completeStatus", 2);
data.add(new MultiTrendOne("在监数", MultiTrendVo.fillData(baseMapper.countHighFormworkMeasurePointDistrict(map), names)));
vo.setData(data);
return vo;
}
}

2
src/main/java/com/zhgd/xmgl/modules/city/inspect/service/impl/InspectRecordServiceImpl.java
View File

@ -307,7 +307,7 @@ public class InspectRecordServiceImpl extends ServiceImpl<InspectRecordMapper, I
map.put("type", 2);
vo.setQualitySupervisionAndInspectionCount(baseMapper.getCount(map));
vo.setTowerCount(towerCraneMapper.getCount(map));
vo.setHighFormworkCount(highFormworkMeasurePointMapper.getCount());
vo.setHighFormworkCount(highFormworkMeasurePointMapper.getCount(map));
vo.setDeepFoundationCount(deepExcavationEngineeringMapper.getCount(map));
vo.setDangerousEngineeringCount(dangerousEngineeringMapper.getCount());
return vo;