From a68423703d026f6710f337921b5e93b6cf05aa29 Mon Sep 17 00:00:00 2001 From: guo Date: Fri, 26 Jan 2024 09:51:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=8B=E5=8A=9B=E8=AF=95=E9=AA=8C=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PressureTestMachineManageController.java | 34 +++++++++++ .../PressureTestMachineManageMapper.java | 10 +++ .../xml/PressureTestMachineManageMapper.xml | 61 +++++++++++++++++++ .../IPressureTestMachineManageService.java | 9 +++ .../PressureTestMachineManageServiceImpl.java | 38 ++++++++++++ 5 files changed, 152 insertions(+) diff --git a/src/main/java/com/zhgd/xmgl/modules/pressuretest/controller/PressureTestMachineManageController.java b/src/main/java/com/zhgd/xmgl/modules/pressuretest/controller/PressureTestMachineManageController.java index f5d8244f1..6325e8472 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pressuretest/controller/PressureTestMachineManageController.java +++ b/src/main/java/com/zhgd/xmgl/modules/pressuretest/controller/PressureTestMachineManageController.java @@ -1,5 +1,8 @@ package com.zhgd.xmgl.modules.pressuretest.controller; +import com.zhgd.xmgl.base.entity.vo.SectorVo; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.modules.antipressurefold.entity.vo.CountAntiPressureFoldManageVo; import com.zhgd.xmgl.modules.pressuretest.service.IPressureTestMachineManageService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -174,4 +177,35 @@ public class PressureTestMachineManageController { return mv; } + + @ApiOperation(value = "统计合格趋势（试验合格率）", notes = "统计合格趋势（试验合格率）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "status", value = "状态：1合格2不合格3未判定", paramType = "body", required = false, dataType = "Integer"), + }) + @PostMapping(value = "/countStatus") + public Result> countStatus(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(pressureTestMachineManageService.countStatus(paramMap)); + } + + @ApiOperation(value = "统计试验类型（今日试验类型）", notes = "统计试验类型（今日试验类型）", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1今日2、7日3、30日", paramType = "body", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/countTestType") + public Result countTestType(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(pressureTestMachineManageService.countTestType(paramMap)); + } + + @ApiOperation(value = "统计压力试验机-管理(实时监测)", notes = "统计压力试验机-管理(实时监测)", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countPressureTestMachineManage") + public Result countPressureTestMachineManage(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(pressureTestMachineManageService.countPressureTestMachineManage(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/pressuretest/mapper/PressureTestMachineManageMapper.java b/src/main/java/com/zhgd/xmgl/modules/pressuretest/mapper/PressureTestMachineManageMapper.java index fd0cc1b83..1a2984d13 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pressuretest/mapper/PressureTestMachineManageMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/pressuretest/mapper/PressureTestMachineManageMapper.java @@ -4,11 +4,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.base.entity.vo.SectorOneVo; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.modules.antipressurefold.entity.vo.CountAntiPressureFoldManageVo; import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManage; 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 +27,10 @@ public interface PressureTestMachineManageMapper extends BaseMapper queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List countStatus(HashMap paramMap); + + List countTestType(HashMap paramMap); + + CountAntiPressureFoldManageVo countPressureTestMachineManage(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/pressuretest/mapper/xml/PressureTestMachineManageMapper.xml b/src/main/java/com/zhgd/xmgl/modules/pressuretest/mapper/xml/PressureTestMachineManageMapper.xml index 117a74489..a04ea00a6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pressuretest/mapper/xml/PressureTestMachineManageMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/pressuretest/mapper/xml/PressureTestMachineManageMapper.xml @@ -6,4 +6,65 @@ join pressure_test_machine_dev ptmd on ptmd.dev_sn=ptmm.dev_sn ${ew.customSqlSegment} + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineManageService.java b/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineManageService.java index 1f5a9968e..f6f735db1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineManageService.java +++ b/src/main/java/com/zhgd/xmgl/modules/pressuretest/service/IPressureTestMachineManageService.java @@ -1,5 +1,8 @@ package com.zhgd.xmgl.modules.pressuretest.service; +import com.zhgd.xmgl.base.entity.vo.SectorVo; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.modules.antipressurefold.entity.vo.CountAntiPressureFoldManageVo; import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManage; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -20,4 +23,10 @@ public interface IPressureTestMachineManageService extends IService queryList(HashMap paramMap); PressureTestMachineManage queryById(String id); + + List countStatus(HashMap paramMap); + + SectorVo countTestType(HashMap paramMap); + + CountAntiPressureFoldManageVo countPressureTestMachineManage(HashMap paramMap); } 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 d0223632b..a29c83b37 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 @@ -6,6 +6,10 @@ 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.SectorVo; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.enums.ParamEnum; +import com.zhgd.xmgl.modules.antipressurefold.entity.vo.CountAntiPressureFoldManageVo; import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManage; import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManageBlockData; import com.zhgd.xmgl.modules.pressuretest.entity.PressureTestMachineManageBlockNumber; @@ -13,14 +17,17 @@ import com.zhgd.xmgl.modules.pressuretest.mapper.PressureTestMachineManageBlockD import com.zhgd.xmgl.modules.pressuretest.mapper.PressureTestMachineManageBlockNumberMapper; import com.zhgd.xmgl.modules.pressuretest.mapper.PressureTestMachineManageMapper; import com.zhgd.xmgl.modules.pressuretest.service.IPressureTestMachineManageService; +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.HashMap; import java.util.List; +import java.util.Objects; /** * @Description: 试验检测管理 @@ -63,6 +70,37 @@ public class PressureTestMachineManageServiceImpl extends ServiceImpl countStatus(HashMap paramMap) { + Integer type = MapUtils.getInteger(paramMap, "type"); + String format = null; + List dateTimeStrList = null; + if (Objects.equals(type, 1)) { + format = "HH:00"; + dateTimeStrList = DateUtils.getDateTimeStrList(100, "yyyy-MM-dd HH:00"); + } else if (Objects.equals(type, 2)) { + format = "yyyy-MM-dd"; + dateTimeStrList = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); + } else if (Objects.equals(type, 3)) { + format = "yyyy-MM-dd"; + dateTimeStrList = DateUtils.getDateTimeStrList(80, "yyyy-MM-dd"); + } else { + return null; + } + List list = baseMapper.countStatus(paramMap); + return TrendOneVo.fillTrendVos(list, dateTimeStrList, format); + } + + @Override + public SectorVo countTestType(HashMap paramMap) { + return SectorVo.getSectorVoByEnum(baseMapper.countTestType(paramMap), ParamEnum.UniversalTestManageTestTypeEnum.values()); + } + + @Override + public CountAntiPressureFoldManageVo countPressureTestMachineManage(HashMap paramMap) { + return baseMapper.countPressureTestMachineManage(paramMap); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { String alias = "ptmm."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(PressureTestMachineManage.class, paramMap, alias);