diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/controller/SmartTensionDataController.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/controller/SmartTensionDataController.java index 127e1d2b2..c000dd974 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/controller/SmartTensionDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/controller/SmartTensionDataController.java @@ -1,6 +1,9 @@ package com.zhgd.xmgl.modules.smarttension.controller; +import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo; +import com.zhgd.xmgl.modules.smartgrout.entity.vo.CountSmartGroutDataVo; import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionData; +import com.zhgd.xmgl.modules.smarttension.entity.vo.CountSmartTensionDataVo; import com.zhgd.xmgl.modules.smarttension.service.ISmartTensionDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -149,37 +152,25 @@ public class SmartTensionDataController { return result; } - /** - * 导出excel - * - * @param request - * @param response - */ - @ApiOperation(value = "导出excel智能张拉-数据信息", notes = "导出excel智能张拉-数据信息", httpMethod = "POST") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { - // Step.1 组装查询条件 - QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - SmartTensionData smartTensionData = JSON.parseObject(deString, SmartTensionData.class); - queryWrapper = QueryGenerator.initQueryWrapper(smartTensionData, request.getParameterMap()); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - - //Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - List pageList = smartTensionDataService.list(queryWrapper); - //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "智能张拉-数据列表"); - mv.addObject(NormalExcelConstants.CLASS, SmartTensionData.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("智能张拉-数据列表数据", "导出人:Jeecg", "导出信息")); - 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(smartTensionDataService.countStatus(paramMap)); } + @ApiOperation(value = "统计张拉情况", notes = "统计张拉情况", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"), + }) + @PostMapping(value = "/countSmartTensionData") + public Result countSmartTensionData(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(smartTensionDataService.countSmartTensionData(paramMap)); + } + + + } diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/controller/SmartTensionSteelBeamDataController.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/controller/SmartTensionSteelBeamDataController.java index 172dafcf0..47657f512 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/controller/SmartTensionSteelBeamDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/controller/SmartTensionSteelBeamDataController.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.jeecg.common.util.oConvertUtils; +import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo; import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionSteelBeamData; import com.zhgd.xmgl.modules.smarttension.service.ISmartTensionSteelBeamDataService; import io.swagger.annotations.Api; @@ -149,37 +150,14 @@ public class SmartTensionSteelBeamDataController { return result; } - /** - * 导出excel - * - * @param request - * @param response - */ - @ApiOperation(value = "导出excel智能张拉-钢束数据信息", notes = "导出excel智能张拉-钢束数据信息", httpMethod = "POST") - @RequestMapping(value = "/exportXls") - public ModelAndView exportXls(HttpServletRequest request, HttpServletResponse response) { - // Step.1 组装查询条件 - QueryWrapper queryWrapper = null; - try { - String paramsStr = request.getParameter("paramsStr"); - if (oConvertUtils.isNotEmpty(paramsStr)) { - String deString = URLDecoder.decode(paramsStr, "UTF-8"); - SmartTensionSteelBeamData smartTensionSteelBeamData = JSON.parseObject(deString, SmartTensionSteelBeamData.class); - queryWrapper = QueryGenerator.initQueryWrapper(smartTensionSteelBeamData, request.getParameterMap()); - } - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - - //Step.2 AutoPoi 导出Excel - ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); - List pageList = smartTensionSteelBeamDataService.list(queryWrapper); - //导出文件名称 - mv.addObject(NormalExcelConstants.FILE_NAME, "智能张拉-钢束数据列表"); - mv.addObject(NormalExcelConstants.CLASS, SmartTensionSteelBeamData.class); - mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("智能张拉-钢束数据列表数据", "导出人:Jeecg", "导出信息")); - 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(smartTensionSteelBeamDataService.countStatus(paramMap)); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/entity/vo/CountSmartTensionDataVo.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/entity/vo/CountSmartTensionDataVo.java new file mode 100644 index 000000000..124a8e92f --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/entity/vo/CountSmartTensionDataVo.java @@ -0,0 +1,16 @@ +package com.zhgd.xmgl.modules.smarttension.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountSmartTensionDataVo { + @ApiModelProperty("智能张拉梁数") + private Integer count; + @ApiModelProperty("智能张拉孔数") + private Integer beamCount; + @ApiModelProperty("智能张拉合格孔数") + private Integer qualifiedBeamCount; + @ApiModelProperty("智能张拉不合格孔数") + private Integer notQualifiedBeamCount; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/SmartTensionDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/SmartTensionDataMapper.java index 465c40da1..e1dacd363 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/SmartTensionDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/SmartTensionDataMapper.java @@ -5,10 +5,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionData; +import com.zhgd.xmgl.modules.smarttension.entity.vo.CountSmartTensionDataVo; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; /** @@ -23,4 +25,8 @@ public interface SmartTensionDataMapper extends BaseMapper { IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + CountSmartTensionDataVo countSmartTensionData(HashMap paramMap); + + List> countStatus(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/SmartTensionSteelBeamDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/SmartTensionSteelBeamDataMapper.java index 49edae34e..74936f0c4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/SmartTensionSteelBeamDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/SmartTensionSteelBeamDataMapper.java @@ -4,6 +4,9 @@ import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionSteelBeamData; 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 SmartTensionSteelBeamDataMapper extends BaseMapper { + List> countStatus(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/xml/SmartTensionDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/xml/SmartTensionDataMapper.xml index 4e20f0d2e..34295d49a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/xml/SmartTensionDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/xml/SmartTensionDataMapper.xml @@ -6,4 +6,23 @@ join smart_tension_dev s on std.dev_sn = s.dev_sn ${ew.customSqlSegment} + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/xml/SmartTensionSteelBeamDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/xml/SmartTensionSteelBeamDataMapper.xml index 6a655a688..82e25e6c9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/xml/SmartTensionSteelBeamDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/mapper/xml/SmartTensionSteelBeamDataMapper.xml @@ -1,4 +1,12 @@ + + diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionDataService.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionDataService.java index 045063fb5..3863e57e0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionDataService.java @@ -1,8 +1,10 @@ package com.zhgd.xmgl.modules.smarttension.service; +import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo; import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionData; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.xmgl.modules.smarttension.entity.vo.CountSmartTensionDataVo; import java.util.HashMap; import java.util.List; @@ -20,4 +22,8 @@ public interface ISmartTensionDataService extends IService { List queryList(HashMap paramMap); void add(SmartTensionData smartTensionData); + + CountSmartTensionDataVo countSmartTensionData(HashMap paramMap); + + FlexibleBigScreenVo countStatus(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionSteelBeamDataService.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionSteelBeamDataService.java index 987bd773e..3f091a235 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionSteelBeamDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/ISmartTensionSteelBeamDataService.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.smarttension.service; +import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo; import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionSteelBeamData; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -18,4 +19,6 @@ public interface ISmartTensionSteelBeamDataService extends IService queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + FlexibleBigScreenVo countStatus(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java index a1510fe43..a1e656919 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionDataServiceImpl.java @@ -9,21 +9,27 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; +import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo; import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionData; import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionDev; import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionSteelBeamData; +import com.zhgd.xmgl.modules.smarttension.entity.vo.CountSmartTensionDataVo; import com.zhgd.xmgl.modules.smarttension.mapper.SmartTensionDataMapper; import com.zhgd.xmgl.modules.smarttension.mapper.SmartTensionDevMapper; import com.zhgd.xmgl.modules.smarttension.mapper.SmartTensionSteelBeamDataMapper; import com.zhgd.xmgl.modules.smarttension.service.ISmartTensionDataService; +import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +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.HashMap; import java.util.List; +import java.util.Objects; /** * @Description: 智能张拉-数据 @@ -85,6 +91,30 @@ public class SmartTensionDataServiceImpl extends ServiceImpl paramMap) { + return baseMapper.countSmartTensionData(paramMap); + } + + @Override + public FlexibleBigScreenVo countStatus(HashMap 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) { String alias = "std."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(SmartTensionData.class, paramMap, alias); diff --git a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionSteelBeamDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionSteelBeamDataServiceImpl.java index 73ff3d2cf..b3f9030b3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionSteelBeamDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/smarttension/service/impl/SmartTensionSteelBeamDataServiceImpl.java @@ -8,16 +8,21 @@ 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.system.query.QueryGenerator; +import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo; import com.zhgd.xmgl.modules.smarttension.entity.SmartTensionSteelBeamData; import com.zhgd.xmgl.modules.smarttension.mapper.SmartTensionSteelBeamDataMapper; import com.zhgd.xmgl.modules.smarttension.service.ISmartTensionSteelBeamDataService; +import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; 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.Objects; /** * @Description: 智能张拉-钢束数据 @@ -43,6 +48,25 @@ public class SmartTensionSteelBeamDataServiceImpl 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(SmartTensionSteelBeamData.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(SmartTensionSteelBeamData::getId));