From 92134db50318ac7965b93ac4c8af0c6f9e6d0b39 Mon Sep 17 00:00:00 2001 From: luolm <470431449@qq.com> Date: Sun, 9 Feb 2025 11:09:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97-=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nflg-mobilebroken-admin/pom.xml | 8 ++++ .../admin/config/JacksonMapper.java | 45 +++++++++++++++++++ .../controller/RequestLogController.java | 6 +-- .../admin/controller/TicketController.java | 3 +- .../mapper/TBaseRequestLogMapper.java | 2 + .../service/ITBaseRequestLogService.java | 3 ++ .../impl/TBaseRequestLogServiceImpl.java | 4 ++ .../mapper/TBaseRequestLogMapper.xml | 6 ++- 8 files changed, 72 insertions(+), 5 deletions(-) create mode 100644 nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/config/JacksonMapper.java diff --git a/nflg-mobilebroken-admin/pom.xml b/nflg-mobilebroken-admin/pom.xml index 6e0305b2..d345206c 100644 --- a/nflg-mobilebroken-admin/pom.xml +++ b/nflg-mobilebroken-admin/pom.xml @@ -102,6 +102,14 @@ org.apache.maven.plugins maven-surefire-plugin + + org.apache.maven.plugins + maven-compiler-plugin + + 10 + 10 + + diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/config/JacksonMapper.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/config/JacksonMapper.java new file mode 100644 index 00000000..ac6bd65e --- /dev/null +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/config/JacksonMapper.java @@ -0,0 +1,45 @@ +package com.nflg.mobilebroken.admin.config; + +import cn.hutool.core.date.DatePattern; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.converter.json.Jackson2ObjectMapperBuilder; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; + +/** + * @decription + * @Author 大米 + * @Date 2022/7/20 17:57 + **/ +@Configuration +public class JacksonMapper { + + + @Bean + public ObjectMapper serializingObjectMapper() { + JavaTimeModule module = new JavaTimeModule(); + module.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN))); +// module.addDeserializer(LocalDateTime.class, MyLocalDateTimeDeserializer.INSTANCE); + + SimpleModule simpleModule = new SimpleModule(); + simpleModule.addSerializer(Long.class, ToStringSerializer.instance); + simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance); +// simpleModule.addSerializer(BigDecimal.class, new BigDecimalSerializer()); + return Jackson2ObjectMapperBuilder.json() + .modules(module, simpleModule) + .featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) + .build(); + } + + + + +} diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/RequestLogController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/RequestLogController.java index 3ff8acfc..8ad98d84 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/RequestLogController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/RequestLogController.java @@ -59,14 +59,14 @@ public class RequestLogController extends ControllerBase { /** * 清除日志 - * @param rowIds + * @param query * @return */ @PostMapping("del") @Transactional(rollbackFor = Exception.class) - public ApiResult del(@RequestBody List rowIds){ + public ApiResult del(@RequestBody RequestLogQuery query){ - VUtils.trueThrow(CollUtil.isEmpty(rowIds)).throwMessage(STATE.ParamErr,"请选择要删除的行"); + List rowIds = logService.selectRowIds(query); logService.getBaseMapper().deleteByIds(rowIds); logDetailService.getBaseMapper().deleteByIds(rowIds); diff --git a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java index 232ea363..ec363628 100644 --- a/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java +++ b/nflg-mobilebroken-admin/src/main/java/com/nflg/mobilebroken/admin/controller/TicketController.java @@ -181,7 +181,8 @@ public class TicketController extends ControllerBase { String html = templateEngine.process("ticketpdf", context); response.setContentType(MediaType.APPLICATION_PDF_VALUE); - response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode(ticket.getTitle() + ".pdf", StandardCharsets.UTF_8)); + String encode = URLEncoder.encode(ticket.getTitle() + ".pdf", StandardCharsets.UTF_8); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" +encode ); // 生成PDF try { ConverterProperties converterProperties = new ConverterProperties(); diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseRequestLogMapper.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseRequestLogMapper.java index c19b4c60..b6ac6f86 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseRequestLogMapper.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/mapper/TBaseRequestLogMapper.java @@ -22,4 +22,6 @@ public interface TBaseRequestLogMapper extends BaseMapper { Page getList(@Param("page")Page page, @Param("query") PageBaseQuery query); void delByIds(@Param("ids")List ids); + + List selectRowIds(@Param("query") PageBaseQuery query); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseRequestLogService.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseRequestLogService.java index 321e2e63..af8f4ec1 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseRequestLogService.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/ITBaseRequestLogService.java @@ -22,4 +22,7 @@ public interface ITBaseRequestLogService extends IService { Page getList(@Param("page")Page page, @Param("query") PageBaseQuery query); void delByIds(@Param("ids") List ids); + + + List selectRowIds(@Param("query") PageBaseQuery query); } diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseRequestLogServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseRequestLogServiceImpl.java index bb6ba471..6d04a2a6 100644 --- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseRequestLogServiceImpl.java +++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/TBaseRequestLogServiceImpl.java @@ -30,4 +30,8 @@ public class TBaseRequestLogServiceImpl extends ServiceImpl ids){ this.getBaseMapper().delByIds(ids); } + + public List selectRowIds(@Param("query") PageBaseQuery query){ + return this.getBaseMapper().selectRowIds(query); + } } diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseRequestLogMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseRequestLogMapper.xml index ba537e5d..70047c8b 100644 --- a/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseRequestLogMapper.xml +++ b/nflg-mobilebroken-repository/src/main/resources/mapper/TBaseRequestLogMapper.xml @@ -15,7 +15,7 @@ and data_create_user_no=#{query.dataCreateUserNo} - and data_create_time>= #{query.createStartTime} and data_create_time <= #{query.createEndTime} + and data_create_time>= #{query.createStartTime} and data_create_time <= date_add(#{query.createEndTime}, INTERVAL 1 DAY ) @@ -25,6 +25,10 @@ + + delete from t_base_request_log where row_id in