diff --git a/src/main/java/com/zhgd/xmgl/modules/smartgrout/controller/SmartGroutSteelBeamDataController.java b/src/main/java/com/zhgd/xmgl/modules/smartgrout/controller/SmartGroutSteelBeamDataController.java index 7197eb3aa..fe64a4898 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartgrout/controller/SmartGroutSteelBeamDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartgrout/controller/SmartGroutSteelBeamDataController.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.smartgrout.controller; +import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo; import com.zhgd.xmgl.modules.smartgrout.service.ISmartGroutSteelBeamDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -181,4 +182,14 @@ public class SmartGroutSteelBeamDataController { mv.addObject(NormalExcelConstants.DATA_LIST, pageList); return mv; } + + @ApiOperation(value = "统计压浆孔合格情况", notes = "统计压浆孔合格情况", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "type", value = "类型:1每月", paramType = "query", required = true, dataType = "String"), + }) + @PostMapping(value = "/countStatus") + public Result countStatus(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(smartGroutSteelBeamDataService.countStatus(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/smartgrout/mapper/SmartGroutSteelBeamDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/smartgrout/mapper/SmartGroutSteelBeamDataMapper.java index a0310db6d..075434966 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartgrout/mapper/SmartGroutSteelBeamDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartgrout/mapper/SmartGroutSteelBeamDataMapper.java @@ -4,6 +4,9 @@ import com.zhgd.xmgl.modules.smartgrout.entity.SmartGroutSteelBeamData; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.HashMap; +import java.util.List; + /** * @Description: 智能压浆-钢束数据 * @author: pds @@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; @Mapper public interface SmartGroutSteelBeamDataMapper extends BaseMapper { + List> countStatus(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/smartgrout/mapper/xml/SmartGroutSteelBeamDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/smartgrout/mapper/xml/SmartGroutSteelBeamDataMapper.xml index f26adfdde..47ad3768b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartgrout/mapper/xml/SmartGroutSteelBeamDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/smartgrout/mapper/xml/SmartGroutSteelBeamDataMapper.xml @@ -1,4 +1,12 @@ + + diff --git a/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/ISmartGroutSteelBeamDataService.java b/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/ISmartGroutSteelBeamDataService.java index fb2882364..a28117539 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/ISmartGroutSteelBeamDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/ISmartGroutSteelBeamDataService.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.smartgrout.service; +import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo; import com.zhgd.xmgl.modules.smartgrout.entity.SmartGroutSteelBeamData; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -18,4 +19,6 @@ public interface ISmartGroutSteelBeamDataService extends IService queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + FlexibleBigScreenVo countStatus(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutSteelBeamDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutSteelBeamDataServiceImpl.java index df7dd3e34..a6157549b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutSteelBeamDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/smartgrout/service/impl/SmartGroutSteelBeamDataServiceImpl.java @@ -2,11 +2,14 @@ package com.zhgd.xmgl.modules.smartgrout.service.impl; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.TypeReference; +import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo; import com.zhgd.xmgl.modules.smartgrout.entity.SmartGroutData; import com.zhgd.xmgl.modules.smartgrout.entity.SmartGroutSteelBeamData; import com.zhgd.xmgl.modules.smartgrout.mapper.SmartGroutSteelBeamDataMapper; import com.zhgd.xmgl.modules.smartgrout.service.ISmartGroutSteelBeamDataService; import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionSteelBeamData; +import com.zhgd.xmgl.util.DateUtils; +import org.apache.commons.collections.MapUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -15,8 +18,10 @@ import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.util.PageUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Objects; import com.zhgd.xmgl.util.RefUtil; import org.springframework.transaction.annotation.Transactional; @@ -45,6 +50,25 @@ public class SmartGroutSteelBeamDataServiceImpl extends ServiceImpl paramMap) { + Integer type = MapUtils.getInteger(paramMap, "type"); + if (Objects.equals(1, type)) { + FlexibleBigScreenVo flexibleBigScreenVo = new FlexibleBigScreenVo(); + List> source = baseMapper.countStatus(paramMap); + List dimensions = new ArrayList<>(); + dimensions.add("月份"); + dimensions.add("合格"); + dimensions.add("不合格"); + flexibleBigScreenVo.setDimensions(dimensions); + flexibleBigScreenVo.setSource(source); + List strList = DateUtils.getDateStrList(500, "yyyy-MM"); + FlexibleBigScreenVo.fillTrendVos(flexibleBigScreenVo, strList, "月份M"); + return flexibleBigScreenVo; + } + return null; + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(SmartGroutSteelBeamData.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(SmartGroutSteelBeamData::getId));