From 822122c754d4247e685542cf0df373484e3a398f Mon Sep 17 00:00:00 2001 From: guo Date: Fri, 26 Jan 2024 09:36:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=87=E8=83=BD=E8=AF=95=E9=AA=8C=E6=9C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UniversalTestDevController.java | 8 ++ .../UniversalTestManageController.java | 75 +++++++++++----- .../entity/UniversalTestDev.java | 25 +++--- .../entity/UniversalTestManage.java | 36 ++++---- .../mapper/UniversalTestDevMapper.java | 4 + .../mapper/UniversalTestManageMapper.java | 10 +++ .../mapper/xml/UniversalTestDevMapper.xml | 10 +++ .../mapper/xml/UniversalTestManageMapper.xml | 88 +++++++++++++++++++ .../service/IUniversalTestDevService.java | 2 + .../service/IUniversalTestManageService.java | 11 +++ .../impl/UniversalTestDevServiceImpl.java | 5 ++ .../impl/UniversalTestManageServiceImpl.java | 56 ++++++++++++ 12 files changed, 279 insertions(+), 51 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestDevController.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestDevController.java index 7f1a62679..b6ff5755a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestDevController.java @@ -182,4 +182,12 @@ public class UniversalTestDevController { return mv; } + @ApiOperation(value = "万能机设备统计", notes = "万能机设备统计", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countUniversalTestDev") + public Result> countUniversalTestDev(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(universalTestDevService.countUniversalTestDev(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestManageController.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestManageController.java index 3d43b8f6a..793e721a9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestManageController.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/controller/UniversalTestManageController.java @@ -1,39 +1,37 @@ package com.zhgd.xmgl.modules.universaltest.controller; -import com.zhgd.xmgl.modules.universaltest.service.IUniversalTestManageService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import io.swagger.annotations.ApiImplicitParams; - -import java.util.HashMap; - -import springfox.documentation.annotations.ApiIgnore; - -import java.util.List; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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 org.apache.commons.collections.MapUtils; +import com.zhgd.xmgl.base.entity.vo.SectorVo; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.base.entity.vo.TrendVo; +import com.zhgd.xmgl.modules.antipressurefold.entity.vo.CountAntiPressureFoldManageVo; import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestManage; - -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.xmgl.modules.universaltest.service.IUniversalTestManageService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; - +import org.apache.commons.collections.MapUtils; import org.jeecgframework.poi.excel.def.NormalExcelConstants; import org.jeecgframework.poi.excel.entity.ExportParams; import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; -import com.alibaba.fastjson.JSON; +import springfox.documentation.annotations.ApiIgnore; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.UnsupportedEncodingException; +import java.net.URLDecoder; +import java.util.HashMap; +import java.util.List; /** @@ -100,7 +98,7 @@ public class UniversalTestManageController { @ApiOperation(value = "编辑万能试验机管理信息", notes = "编辑万能试验机管理信息", httpMethod = "POST") @PostMapping(value = "/edit") public Result edit(@RequestBody UniversalTestManage universalTestManage) { - universalTestManageService.updateById(universalTestManage); + universalTestManageService.edit(universalTestManage); return Result.ok(); } @@ -182,4 +180,33 @@ public class UniversalTestManageController { return mv; } + @ApiOperation(value = "统计万能试验机管理(实时监测)", notes = "统计万能试验机管理(实时监测)", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countUniversalTestManage") + public Result countUniversalTestManage(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(universalTestManageService.countUniversalTestManage(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(universalTestManageService.countTestType(paramMap)); + } + + @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"), + }) + @PostMapping(value = "/countTestNum") + public Result> countTestNum(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(universalTestManageService.countTestNum(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestDev.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestDev.java index 751d9652c..9e568eb5f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestDev.java @@ -4,6 +4,7 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -91,14 +92,18 @@ public class UniversalTestDev implements Serializable { @Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "创建时间") - private java.util.Date createTime; - /** - * 更新时间 - */ - @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") - @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间") - private java.util.Date updateTime; + @ApiModelProperty(value = "创建时间") + private java.util.Date createTime; + /** + * 更新时间 + */ + @Excel(name = "更新时间", width = 20, format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间") + private java.util.Date updateTime; + + @TableField(exist = false) + @ApiModelProperty(value = "试验总次数") + private Integer testTotalNum; } diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestManage.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestManage.java index 2cdec1e4d..a78da80da 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestManage.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/entity/UniversalTestManage.java @@ -121,21 +121,23 @@ public class UniversalTestManage implements Serializable { */ @Excel(name = "更新时间 yyyy-MM-dd HH:mm:ss", width = 20, format = "yyyy-MM-dd HH:mm:ss") @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") - private java.util.Date updateDate; - /** - * 项目sn - */ - @Excel(name = "项目sn", width = 15) - @ApiModelProperty(value = "项目sn") - private java.lang.String projectSn; - @ApiModelProperty(value = "上传附件") - private java.lang.String uploadAttachment; - @TableField(exist = false) - @ApiModelProperty(value = "设备名称") - private java.lang.String deviceName; - @TableField(exist = false) - @ApiModelProperty(value = "所属试验室") - private java.lang.String affiliatedLaboratory; + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty(value = "更新时间 yyyy-MM-dd HH:mm:ss") + private java.util.Date updateDate; + /** + * 项目sn + */ + @Excel(name = "项目sn", width = 15) + @ApiModelProperty(value = "项目sn") + private java.lang.String projectSn; + @ApiModelProperty(value = "上传附件") + private java.lang.String uploadAttachment; + @ApiModelProperty(value = "报告上传次数") + private java.lang.Integer reportUploadNum; + @TableField(exist = false) + @ApiModelProperty(value = "设备名称") + private java.lang.String deviceName; + @TableField(exist = false) + @ApiModelProperty(value = "所属试验室") + private java.lang.String affiliatedLaboratory; } diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/UniversalTestDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/UniversalTestDevMapper.java index b65c6df01..1163c9ff4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/UniversalTestDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/UniversalTestDevMapper.java @@ -4,6 +4,9 @@ import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestDev; 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 UniversalTestDevMapper extends BaseMapper { + List countUniversalTestDev(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/UniversalTestManageMapper.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/UniversalTestManageMapper.java index 4d2af2fbf..ce3704386 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/UniversalTestManageMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/UniversalTestManageMapper.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.universaltest.entity.UniversalTestManage; 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 UniversalTestManageMapper extends BaseMapper queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + CountAntiPressureFoldManageVo countUniversalTestManage(HashMap paramMap); + + List countTestType(HashMap paramMap); + + List countTestNum(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/xml/UniversalTestDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/xml/UniversalTestDevMapper.xml index dafa261df..1f9974fbe 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/xml/UniversalTestDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/xml/UniversalTestDevMapper.xml @@ -1,4 +1,14 @@ + diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/xml/UniversalTestManageMapper.xml b/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/xml/UniversalTestManageMapper.xml index 79709796e..9fca94291 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/xml/UniversalTestManageMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/mapper/xml/UniversalTestManageMapper.xml @@ -7,4 +7,92 @@ join universal_test_dev utd on utd.dev_sn=utm.dev_sn ${ew.customSqlSegment} + + + + + + diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestDevService.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestDevService.java index c81ff36f8..26786169d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestDevService.java @@ -18,4 +18,6 @@ public interface IUniversalTestDevService extends IService { IPage queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + List countUniversalTestDev(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestManageService.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestManageService.java index 723037778..e2b2d46c4 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestManageService.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/service/IUniversalTestManageService.java @@ -1,5 +1,8 @@ package com.zhgd.xmgl.modules.universaltest.service; +import com.zhgd.xmgl.base.entity.vo.SectorVo; +import com.zhgd.xmgl.base.entity.vo.TrendVo; +import com.zhgd.xmgl.modules.antipressurefold.entity.vo.CountAntiPressureFoldManageVo; import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestManage; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -18,4 +21,12 @@ public interface IUniversalTestManageService extends IService queryPageList(HashMap paramMap); List queryList(HashMap paramMap); + + CountAntiPressureFoldManageVo countUniversalTestManage(HashMap paramMap); + + SectorVo countTestType(HashMap paramMap); + + void edit(UniversalTestManage universalTestManage); + + List countTestNum(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestDevServiceImpl.java index c3a64d57c..734b37cd8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestDevServiceImpl.java @@ -39,6 +39,11 @@ public class UniversalTestDevServiceImpl extends ServiceImpl countUniversalTestDev(HashMap paramMap) { + return baseMapper.countUniversalTestDev(paramMap); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(UniversalTestDev.class, paramMap); queryWrapper.orderByDesc(RefUtil.fieldNameUlc(UniversalTestDev::getId)); diff --git a/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestManageServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestManageServiceImpl.java index 4ca8e0128..217794192 100644 --- a/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestManageServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/universaltest/service/impl/UniversalTestManageServiceImpl.java @@ -4,16 +4,26 @@ 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.vo.SectorVo; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.base.entity.vo.TrendVo; +import com.zhgd.xmgl.enums.ParamEnum; +import com.zhgd.xmgl.modules.antipressurefold.entity.vo.CountAntiPressureFoldManageVo; import com.zhgd.xmgl.modules.universaltest.entity.UniversalTestManage; import com.zhgd.xmgl.modules.universaltest.mapper.UniversalTestManageMapper; import com.zhgd.xmgl.modules.universaltest.service.IUniversalTestManageService; +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 java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Objects; /** * @Description: 万能试验机管理 @@ -38,6 +48,52 @@ public class UniversalTestManageServiceImpl extends ServiceImpl paramMap) { + return baseMapper.countUniversalTestManage(paramMap); + } + + @Override + public SectorVo countTestType(HashMap paramMap) { + return SectorVo.getSectorVoByEnum(baseMapper.countTestType(paramMap), ParamEnum.UniversalTestManageTestTypeEnum.values()); + } + + @Override + public void edit(UniversalTestManage universalTestManage) { + UniversalTestManage manage = baseMapper.selectById(universalTestManage.getId()); + if (manage == null) { + throw new OpenAlertException("实体类不存在"); + } + if (!Objects.equals(manage.getUploadAttachment(), universalTestManage.getUploadAttachment())) { + universalTestManage.setReportUploadNum(manage.getReportUploadNum() + 1); + } + baseMapper.updateById(universalTestManage); + } + + @Override + public List countTestNum(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.countTestNum(paramMap); + List sns = new ArrayList<>(); + sns.add(new TrendVo("试验次数", "1")); + sns.add(new TrendVo("报告上传次数", "2")); + return TrendVo.getTrendVos(sns, list, dateTimeStrList, format); + } + private QueryWrapper getQueryWrapper(HashMap paramMap) { String alias = "utm."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(UniversalTestManage.class, paramMap, alias);