From 6b63ad594bcc124f6ebc02f6a099b6507625fd67 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Mon, 28 Aug 2023 19:47:43 +0800 Subject: [PATCH] =?UTF-8?q?#=20=E4=B8=A4=E7=A5=A8=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/common/logs/aop/SysLogAspect.java | 4 +-- .../ticket/allTicket/dto/TicketStatisticDTO.java | 35 ++++++++++++++++++++++ .../allTicket/fegin/ITicketInfoAllClient.java | 7 +++++ .../fegin/TicketInfoAllClientFallback.java | 7 +++++ .../allTicket/fegin/TicketInfoAllClient.java | 7 +++++ .../allTicket/service/ITicketInfoAlService.java | 4 +++ .../mapper/StandardTicketInfoMapper.java | 3 ++ .../mapper/xml/StandardTicketInfoMapper.xml | 5 ++++ .../workTicket/mapper/WorkTicketInfoMapper.java | 3 ++ .../workTicket/mapper/xml/WorkTicketInfoMapper.xml | 7 +++++ .../workTicket/service/IWorkTicketInfoService.java | 2 ++ .../ticket/src/main/resources/application.yml | 13 -------- .../ticket/src/main/resources/db/2.0.0.sql | 2 ++ 13 files changed, 84 insertions(+), 15 deletions(-) create mode 100644 hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/dto/TicketStatisticDTO.java create mode 100644 hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/ITicketInfoAlService.java diff --git a/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java b/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java index 7fae2b4..b258d29 100644 --- a/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java +++ b/hzims-biz-common/src/main/java/com/hnac/hzims/common/logs/aop/SysLogAspect.java @@ -37,8 +37,8 @@ import java.util.Map; * @date 2023/3/29 * @description: 操作日志切面处理类 */ -@Aspect -@Component +//@Aspect +//@Component @Slf4j public class SysLogAspect { diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/dto/TicketStatisticDTO.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/dto/TicketStatisticDTO.java new file mode 100644 index 0000000..4378262 --- /dev/null +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/dto/TicketStatisticDTO.java @@ -0,0 +1,35 @@ +package com.hnac.hzims.ticket.allTicket.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.tool.utils.DateUtil; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.time.LocalDateTime; + +/** + * @ClassName TicketStatisticDTO + * @description: 两票统计请求 + * @author: hx + * @create: 2023-08-17 11:26 + * @Version 4.0 + **/ +@Data +@Builder +@EqualsAndHashCode +public class TicketStatisticDTO implements Serializable { + + private String deptIds; + + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + private LocalDateTime startTime; + + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + private LocalDateTime endTime; + +} diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/ITicketInfoAllClient.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/ITicketInfoAllClient.java index a2a4335..bb2971c 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/ITicketInfoAllClient.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/ITicketInfoAllClient.java @@ -1,11 +1,14 @@ package com.hnac.hzims.ticket.allTicket.fegin; +import com.hnac.hzims.ticket.allTicket.dto.TicketStatisticDTO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassVO; import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO; import com.hnac.hzims.ticket.constants.TicketConstants; +import org.springblade.core.tool.api.R; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import java.time.LocalDateTime; @@ -25,6 +28,7 @@ public interface ITicketInfoAllClient { String DOUBLE_PASS_RATE = "/getDoublePassRate"; String DOUBLE_PASS_QUANTITY = "/getDoublePassQuantity"; String GET_TICKET_REPORT_STATISTIC = API_PREFIX+"/getTicketReportStatistic"; + String GET_TICKET_PASS_RATE = API_PREFIX + "/getTicketPassRate"; /** * 统计站点统计月报-两票 @@ -61,4 +65,7 @@ public interface ITicketInfoAllClient { List getDoublePassQuantity(@RequestParam(value = "stationMap") Map stationMap, @RequestParam(value = "firstDateTime") LocalDateTime firstDateTime, @RequestParam(value = "now") LocalDateTime now); + + @GetMapping(GET_TICKET_PASS_RATE) + R getTicketPassRate(TicketStatisticDTO ticketStatisticDTO); } diff --git a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClientFallback.java b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClientFallback.java index b14d13b..76506d0 100644 --- a/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClientFallback.java +++ b/hzims-service-api/ticket-api/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClientFallback.java @@ -1,8 +1,10 @@ package com.hnac.hzims.ticket.allTicket.fegin; +import com.hnac.hzims.ticket.allTicket.dto.TicketStatisticDTO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassVO; import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO; +import org.springblade.core.tool.api.R; import org.springframework.stereotype.Component; import java.time.LocalDateTime; @@ -34,4 +36,9 @@ public class TicketInfoAllClientFallback implements ITicketInfoAllClient { public List getDoublePassQuantity(Map stationMap, LocalDateTime firstDateTime, LocalDateTime now) { return null; } + + @Override + public R getTicketPassRate(TicketStatisticDTO ticketStatisticDTO) { + return null; + } } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClient.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClient.java index e8a2dd7..5b93bba 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClient.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/fegin/TicketInfoAllClient.java @@ -1,6 +1,7 @@ package com.hnac.hzims.ticket.allTicket.fegin; import com.google.common.collect.Lists; +import com.hnac.hzims.ticket.allTicket.dto.TicketStatisticDTO; import com.hnac.hzims.ticket.allTicket.service.TicketInfoStatisticService; import com.hnac.hzims.ticket.allTicket.vo.DoublePassRateVO; import com.hnac.hzims.ticket.allTicket.vo.DoublePassVO; @@ -10,6 +11,7 @@ import com.hnac.hzims.ticket.twoTicket.service.IFirstWorkTicketService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.log.exception.ServiceException; +import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringUtil; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; @@ -70,4 +72,9 @@ public class TicketInfoAllClient implements ITicketInfoAllClient { public List getDoublePassQuantity(Map stationMap, LocalDateTime firstDateTime, LocalDateTime now) { return standardTicketInfoService.getDoublePassQuantity(stationMap,firstDateTime,now); } + + @Override + public R getTicketPassRate(TicketStatisticDTO ticketStatisticDTO) { + return null; + } } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/ITicketInfoAlService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/ITicketInfoAlService.java new file mode 100644 index 0000000..274fb7c --- /dev/null +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/allTicket/service/ITicketInfoAlService.java @@ -0,0 +1,4 @@ +package com.hnac.hzims.ticket.allTicket.service; + +public interface ITicketInfoAlService { +} diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/StandardTicketInfoMapper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/StandardTicketInfoMapper.java index 704ce9f..cf61c9f 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/StandardTicketInfoMapper.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/StandardTicketInfoMapper.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity; import com.hnac.hzims.ticket.standardTicket.vo.OperateTicketStatisticVO; +import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import com.hnac.hzims.vo.SafeCheckStatisticVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -55,4 +56,6 @@ public interface StandardTicketInfoMapper extends UserDataScopeBaseMapper selectPages(Page searchPage, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List selectTicketList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/xml/StandardTicketInfoMapper.xml b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/xml/StandardTicketInfoMapper.xml index 6996bd2..8b7359a 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/xml/StandardTicketInfoMapper.xml +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/mapper/xml/StandardTicketInfoMapper.xml @@ -82,4 +82,9 @@ hzims_ticket_info_evaluate tie on sti.id = tie.ticket_id ${ew.customSqlSegment} + diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java index 8f931f5..1133d28 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/WorkTicketInfoMapper.java @@ -67,4 +67,7 @@ public interface WorkTicketInfoMapper extends UserDataScopeBaseMapper queryWrapper); List getWorkTicketBill(@Param("path") String path, @Param("startTime") String startTime, @Param("endTime") String endTime); + + @UserDataAuth + List selectTicketList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml index 2d8173d..0261275 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/mapper/xml/WorkTicketInfoMapper.xml @@ -106,4 +106,11 @@ GROUP BY info.EM_CODE,info.`type` + + + diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java index 67950c1..d8c63a5 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java @@ -178,4 +178,6 @@ public interface IWorkTicketInfoService extends BaseService listByTicketWithKeyword(Page entityPage, TicketCountQueryVo ticketCountQueryVo); + + } diff --git a/hzims-service/ticket/src/main/resources/application.yml b/hzims-service/ticket/src/main/resources/application.yml index 2af9d8e..a69f0f3 100644 --- a/hzims-service/ticket/src/main/resources/application.yml +++ b/hzims-service/ticket/src/main/resources/application.yml @@ -56,16 +56,3 @@ swagger: # flowId: sid-6358A80D-F592-4875-B281-A5B14A0EA39E # segment: 工作票延期 - -xxl: - job: - accessToken: '' - admin: - addresses: http://192.168.1.20:7009/xxl-job-admin - executor: - appname: hzims-ticket - ip: 192.168.1.3 - logpath: /data/applogs/xxl-job/jobhandler - logretentiondays: -1 - port: 28601 - diff --git a/hzims-service/ticket/src/main/resources/db/2.0.0.sql b/hzims-service/ticket/src/main/resources/db/2.0.0.sql index ecd99b4..841a758 100644 --- a/hzims-service/ticket/src/main/resources/db/2.0.0.sql +++ b/hzims-service/ticket/src/main/resources/db/2.0.0.sql @@ -157,3 +157,5 @@ update hzims_standard_ticket_info set flow_task_name = '终止' where status = alter table hzims_ticket_count add wrong_ticket_num int null comment '错票数量'; alter table hzims_ticket_count add percent_pass_ticket varchar(50) null comment '合格率'; + +--