From dde4b73111b4fe6c711bf86733e2f7bc2bc5ebd7 Mon Sep 17 00:00:00 2001 From: guo Date: Tue, 26 Dec 2023 18:50:19 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rt/controller/RtToolController.java | 11 +++++ .../rt/entity/RtDesignChangeContactSheet.java | 36 ++++++++-------- .../modules/rt/entity/vo/CountRtToolVo.java | 6 ++- .../xmgl/modules/rt/mapper/RtToolMapper.java | 3 ++ ...tRiskSecurityLibraryTypeConcreteMapper.xml | 1 - .../modules/rt/mapper/xml/RtToolMapper.xml | 43 ++++++++++++++++++- .../modules/rt/service/IRtToolService.java | 3 ++ .../impl/RtRiskInventoryTypeServiceImpl.java | 1 - .../rt/service/impl/RtToolServiceImpl.java | 27 ++++++++++-- .../zhgd/xmgl/security/WebSecurityConfig.java | 4 ++ 10 files changed, 108 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java index 239b26134..e2419166c 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtToolController.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.rt.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.gexin.fastjson.JSON; import com.zhgd.jeecg.common.api.vo.Result; +import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo; import com.zhgd.xmgl.modules.rt.entity.RtTool; import com.zhgd.xmgl.modules.rt.entity.vo.CountRtToolVo; import com.zhgd.xmgl.modules.rt.service.IRtToolService; @@ -152,5 +153,15 @@ public class RtToolController { return Result.success(rtToolService.countRtTool(paramMap)); } + @ApiOperation(value = "统计榕图-工器具信息动态", notes = "统计榕图-工器具信息动态", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1过期7天", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countRtToolTrend") + public Result countRtToolTrend(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(rtToolService.countRtToolTrend(paramMap)); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtDesignChangeContactSheet.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtDesignChangeContactSheet.java index f333c3e55..753eea285 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtDesignChangeContactSheet.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/RtDesignChangeContactSheet.java @@ -56,23 +56,25 @@ public class RtDesignChangeContactSheet implements Serializable { @ApiModelProperty(value = "负责人") private java.lang.String principal; /** - * 提出单位 - */ - @Excel(name = "提出单位", width = 15) - @ApiModelProperty(value = "提出单位") - private java.lang.String proposingUnit; - /** - * 提出变更日期 - */ - @Excel(name = "提出变更日期", width = 15) - @ApiModelProperty(value = "提出变更日期") - private java.lang.String proposedChangeDate; - /** - * 业主项目部审核意见 - */ - @Excel(name = "业主项目部审核意见", width = 15) - @ApiModelProperty(value = "业主项目部审核意见") - private java.lang.String reviewOpinion; + * 提出单位 + */ + @Excel(name = "提出单位", width = 15) + @ApiModelProperty(value = "提出单位") + private java.lang.String proposingUnit; + /** + * 提出变更日期 + */ + @Excel(name = "提出变更日期", width = 15) + @ApiModelProperty(value = "提出变更日期") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date proposedChangeDate; + /** + * 业主项目部审核意见 + */ + @Excel(name = "业主项目部审核意见", width = 15) + @ApiModelProperty(value = "业主项目部审核意见") + private java.lang.String reviewOpinion; /** * 项目经理 */ diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtToolVo.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtToolVo.java index 953c9aea4..05e4a1a52 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtToolVo.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtToolVo.java @@ -7,8 +7,10 @@ import lombok.Data; public class CountRtToolVo { @ApiModelProperty("工器具总数") private Integer count; + @ApiModelProperty("今日在场总数（当日所有状态为在场的工器具）") + private Integer presentCountToday; @ApiModelProperty("当日入库量") - private Integer entryCount; + private Integer entryCountToday; @ApiModelProperty("当日出库量") - private Integer exitCount; + private Integer exitCountToday; } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtToolMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtToolMapper.java index cd41b6fbd..126c0255e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtToolMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtToolMapper.java @@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.HashMap; +import java.util.List; /** * @Description: 榕图-工器具 @@ -17,4 +18,6 @@ import java.util.HashMap; public interface RtToolMapper extends BaseMapper { CountRtToolVo countRtTool(HashMap paramMap); + + List> countRtToolTrend(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtRiskSecurityLibraryTypeConcreteMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtRiskSecurityLibraryTypeConcreteMapper.xml index d4969c63d..87cf2190f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtRiskSecurityLibraryTypeConcreteMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtRiskSecurityLibraryTypeConcreteMapper.xml @@ -17,7 +17,6 @@ SELECT a.* from rt_risk_security_library_type_concrete a WHERE a.rt_risk_security_library_type_id=#{rtRiskSecurityLibraryTypeId} - ORDER BY a.order_sort select count(*) count, - ifnull(sum(if(tool_status=1 and entry_time>=current_date,1,0)),0) entryCount, - ifnull(sum(if(tool_status=2 and exit_time>=current_date,1,0)),0) exitCount + ifnull(sum(if(tool_status=1,1,0)),0) presentCountToday, + ifnull(sum(if( entry_time>=current_date,1,0)),0) entryCountToday, + ifnull(sum(if( exit_time>=current_date,1,0)),0) exitCountToday from rt_tool where project_sn=#{projectSn} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java index bacebcfd1..25ac50c3d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtToolService.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.rt.service; +import com.zhgd.xmgl.base.entity.vo.FlexibleBigScreenVo; import com.zhgd.xmgl.modules.rt.entity.RtTool; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -27,4 +28,6 @@ public interface IRtToolService extends IService { void updateRtToolStatus(RtTool rtTool); CountRtToolVo countRtTool(HashMap paramMap); + + FlexibleBigScreenVo countRtToolTrend(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtRiskInventoryTypeServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtRiskInventoryTypeServiceImpl.java index 623713e37..84d57e77d 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtRiskInventoryTypeServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtRiskInventoryTypeServiceImpl.java @@ -58,7 +58,6 @@ public class RtRiskInventoryTypeServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { String alias = ""; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(RtRiskInventoryType.class, paramMap, alias); - queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RtRiskInventoryType::getId)); return queryWrapper; } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java index 5ed4cb83b..426fe1655 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtToolServiceImpl.java @@ -8,20 +8,20 @@ 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.FlexibleBigScreenVo; import com.zhgd.xmgl.modules.rt.entity.RtTool; import com.zhgd.xmgl.modules.rt.entity.vo.CountRtToolVo; import com.zhgd.xmgl.modules.rt.mapper.RtToolMapper; import com.zhgd.xmgl.modules.rt.service.IRtToolService; +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.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; +import java.util.*; /** * @Description: 榕图-工器具 @@ -108,6 +108,25 @@ public class RtToolServiceImpl extends ServiceImpl impleme return baseMapper.countRtTool(paramMap); } + @Override + public FlexibleBigScreenVo countRtToolTrend(HashMap paramMap) { + Integer type = MapUtils.getInteger(paramMap, "type"); + if (Objects.equals(1, type)) { + FlexibleBigScreenVo flexibleBigScreenVo = new FlexibleBigScreenVo(); + List> source = baseMapper.countRtToolTrend(paramMap); + List dimensions = new ArrayList<>(); + dimensions.add("day"); + dimensions.add("当日入库量"); + dimensions.add("当日出库量"); + flexibleBigScreenVo.setDimensions(dimensions); + flexibleBigScreenVo.setSource(source); + List strList = DateUtils.getDateStrList(60, "yyyy-MM-dd"); + FlexibleBigScreenVo.fillTrendVos(flexibleBigScreenVo, strList, "MM-dd"); + return flexibleBigScreenVo; + } + return null; + } + private void setExitTimeIf(RtTool rtTool) { if (Objects.equals(rtTool.getToolStatus(), 2)) { rtTool.setExitTime(new Date()); diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index ac9c15d42..295bbb510 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -278,6 +278,10 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/rtWorkTicket/countRtWorkTicket").permitAll() .antMatchers("/xmgl/rtWorkTicket/page").permitAll() .antMatchers("/xmgl/rtWorkTicket/queryPlayUrlFromHikvision").permitAll() + .antMatchers("/xmgl/rtTool/countRtTool").permitAll() + .antMatchers("/xmgl/rtTool/page").permitAll() + .antMatchers("/xmgl/rtTool/countRtToolTrend").permitAll() + .antMatchers("/xmgl/workerInfo/getWorkerStatisticsCount").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证 .and()