From b4ac183029a4841ff53250d5054373e79ae3ee8c Mon Sep 17 00:00:00 2001 From: guo Date: Mon, 25 Dec 2023 17:33:31 +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/RtWorkTicketController.java | 32 +++++++++++-------- .../rt/entity/vo/CountRtWorkTicketVo.java | 12 +++++++ .../modules/rt/mapper/RtWorkTicketMapper.java | 4 +++ .../rt/mapper/xml/RtWorkTicketMapper.xml | 8 +++++ .../rt/service/IRtWorkTicketService.java | 3 ++ .../service/impl/RtWorkTicketServiceImpl.java | 20 +++++++++--- .../zhgd/xmgl/security/WebSecurityConfig.java | 2 ++ 7 files changed, 62 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtWorkTicketVo.java diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtWorkTicketController.java b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtWorkTicketController.java index 5058a0dda..04f5f4b28 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtWorkTicketController.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/controller/RtWorkTicketController.java @@ -1,27 +1,22 @@ package com.zhgd.xmgl.modules.rt.controller; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.xmgl.modules.rt.entity.RtWorkTicket; +import com.zhgd.xmgl.modules.rt.entity.vo.CountRtWorkTicketVo; import com.zhgd.xmgl.modules.rt.service.IRtWorkTicketService; 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 com.zhgd.jeecg.common.api.vo.Result; -import org.apache.commons.collections.MapUtils; - -import org.simpleframework.xml.core.Validate; -import com.baomidou.mybatisplus.core.metadata.IPage; +import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; - +import org.simpleframework.xml.core.Validate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import springfox.documentation.annotations.ApiIgnore; + +import java.util.HashMap; +import java.util.List; /** @@ -48,6 +43,7 @@ public class RtWorkTicketController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"), @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"), + @ApiImplicitParam(name = "type", value = "1：当日工作票2:历史工作票", paramType = "query", required = false, dataType = "Integer"), }) @GetMapping(value = "/page") public Result> queryPageList(@ApiIgnore @RequestParam HashMap paramMap) { @@ -125,4 +121,12 @@ public class RtWorkTicketController { return result; } + @ApiOperation(value = "统计榕图-工作票信息", notes = "统计榕图-工作票信息", httpMethod = "GET") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"), + }) + @GetMapping(value = "/countRtWorkTicket") + public Result countRtWorkTicket(@ApiIgnore @RequestParam HashMap paramMap) { + return Result.success(rtWorkTicketService.countRtWorkTicket(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtWorkTicketVo.java b/src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtWorkTicketVo.java new file mode 100644 index 000000000..14faf9fe5 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/rt/entity/vo/CountRtWorkTicketVo.java @@ -0,0 +1,12 @@ +package com.zhgd.xmgl.modules.rt.entity.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class CountRtWorkTicketVo { + @ApiModelProperty("历史工作票数") + private Integer historyCount; + @ApiModelProperty("今日工作票数") + private Integer todayCount; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtWorkTicketMapper.java b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtWorkTicketMapper.java index 2dab4ad8e..9a3f5f5ed 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtWorkTicketMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/RtWorkTicketMapper.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.rt.entity.RtWorkTicket; +import com.zhgd.xmgl.modules.rt.entity.vo.CountRtWorkTicketVo; 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,6 @@ public interface RtWorkTicketMapper extends BaseMapper { IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); List queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + CountRtWorkTicketVo countRtWorkTicket(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml index 577bb400d..e71095eb2 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/rt/mapper/xml/RtWorkTicketMapper.xml @@ -27,4 +27,12 @@ ${ew.customSqlSegment} + diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtWorkTicketService.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtWorkTicketService.java index 48d47b89b..7794efafb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtWorkTicketService.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/IRtWorkTicketService.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.rt.service; import com.zhgd.xmgl.modules.rt.entity.RtWorkTicket; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.xmgl.modules.rt.entity.vo.CountRtWorkTicketVo; import java.util.HashMap; import java.util.List; @@ -24,4 +25,6 @@ public interface IRtWorkTicketService extends IService { void edit(RtWorkTicket rtWorkTicket); void delete(HashMap map); + + CountRtWorkTicketVo countRtWorkTicket(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java index c5e93e4d0..913eda51a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/rt/service/impl/RtWorkTicketServiceImpl.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.rt.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -11,7 +12,11 @@ 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.modules.project.mapper.ProjectVideoConfigMapper; -import com.zhgd.xmgl.modules.rt.entity.*; +import com.zhgd.xmgl.modules.rt.entity.RtRiskSecurityLibraryType; +import com.zhgd.xmgl.modules.rt.entity.RtWorkTicket; +import com.zhgd.xmgl.modules.rt.entity.RtWorkTicketToRiskSecurityLibraryType; +import com.zhgd.xmgl.modules.rt.entity.RtWorkTicketToVideoItem; +import com.zhgd.xmgl.modules.rt.entity.vo.CountRtWorkTicketVo; import com.zhgd.xmgl.modules.rt.mapper.*; import com.zhgd.xmgl.modules.rt.service.IRtWorkTicketService; import com.zhgd.xmgl.modules.video.entity.VideoItem; @@ -24,10 +29,7 @@ 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.Map; -import java.util.Optional; +import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -72,9 +74,12 @@ public class RtWorkTicketServiceImpl extends ServiceImpl getQueryWrapper(HashMap paramMap) { + Integer type = MapUtils.getInteger(paramMap, "type"); String alias = "rwt."; QueryWrapper queryWrapper = QueryGenerator.initPageQueryWrapper(RtWorkTicket.class, paramMap, alias); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(RtWorkTicket::getId)); + queryWrapper.ge(Objects.equals(type, 1), RefUtil.fieldNameUlc(RtWorkTicket::getCreateTime), DateUtil.today()); + queryWrapper.le(Objects.equals(type, 2), RefUtil.fieldNameUlc(RtWorkTicket::getCreateTime), DateUtil.formatDateTime(DateUtil.endOfDay(DateUtil.offsetDay(DateUtil.date(), -1)))); return queryWrapper; } @@ -173,4 +178,9 @@ public class RtWorkTicketServiceImpl extends ServiceImpl paramMap) { + return baseMapper.countRtWorkTicket(paramMap); + } } diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index 32a1020b2..c3e7fe36d 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -275,6 +275,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/service-address/photo").permitAll() .antMatchers("/xmgl/sewageData/add").permitAll() .antMatchers("/xmgl/rtTool/updateRtToolStatus").permitAll() + .antMatchers("/xmgl/rtWorkTicket/countRtWorkTicket").permitAll() + .antMatchers("/xmgl/rtWorkTicket/page").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证 .and()