From 369a252bfd68f5c02e285cd06d9bf482401e9d0e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 07 八月 2024 11:08:39 +0800
Subject: [PATCH] 点位时间优化
---
ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java | 8 ++++----
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 4 +++-
ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java | 8 ++++++--
ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java | 13 +++++++++++++
ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java | 5 +++--
ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java | 9 ++++++---
ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java | 3 ++-
7 files changed, 37 insertions(+), 13 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
index 1ee3b88..e24e6d6 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/YwPoint.java
@@ -35,13 +35,13 @@
@ApiModelProperty("鐐逛綅寮�濮嬫椂闂�")
@TableField("start_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime startTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date startTime;
@ApiModelProperty("鐐逛綅缁撴潫鏃堕棿")
@TableField("end_time")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime endTime;
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date endTime;
@ApiModelProperty("杩愮淮鍗曚綅")
@TableField(value = "unit_id", updateStrategy = FieldStrategy.IGNORED)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
index b384837..7055348 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/excel/PointExport.java
@@ -1,8 +1,11 @@
package com.ycl.platform.domain.excel;
import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.format.DateTimeFormat;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import lombok.Data;
+
+import java.util.Date;
/**
* 鐐逛綅瀵煎叆瀵煎嚭
@@ -29,4 +32,14 @@
@ExcelProperty("褰撳墠杩愮淮鍗曚綅")
private String unitName;
+ @ColumnWidth(16)
+ @DateTimeFormat("yyyy-MM-dd")
+ @ExcelProperty("杩愮淮寮�濮嬫椂闂�")
+ private Date startTime;
+
+ @ColumnWidth(16)
+ @DateTimeFormat("yyyy-MM-dd")
+ @ExcelProperty("杩愮淮缁撴潫鏃堕棿")
+ private Date endTime;
+
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
index 92b030c..069ed5b 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/vo/YwPointVO.java
@@ -1,9 +1,11 @@
package com.ycl.platform.domain.vo;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.base.AbsVo;
import com.ycl.platform.domain.entity.YwPoint;
import java.time.LocalDateTime;
+import java.util.Date;
import java.util.List;
import enumeration.general.ImportantTagEnum;
@@ -26,10 +28,12 @@
private String pointName;
/** 鐐逛綅寮�濮嬫椂闂� */
- private LocalDateTime startTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date startTime;
/** 鐐逛綅缁撴潫鏃堕棿 */
- private LocalDateTime endTime;
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date endTime;
/** 杩愮淮鍗曚綅 */
private Long unitId;
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
index 0207ee6..6a663cb 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/YwPointController.java
@@ -10,6 +10,7 @@
import lombok.RequiredArgsConstructor;
import java.io.IOException;
+import java.util.Date;
import java.util.List;
import org.springframework.validation.annotation.Validated;
import jakarta.validation.constraints.NotEmpty;
@@ -115,8 +116,8 @@
@PostMapping("/import/{unitId}")
@ApiOperation(value = "瀵煎叆鏁版嵁", notes = "瀵煎叆鏁版嵁")
- public Result importData(MultipartFile file, @PathVariable("unitId") Integer unitId) throws IOException {
- return ywPointService.importData(file, unitId);
+ public Result importData(MultipartFile file, @PathVariable("unitId") Integer unitId, Date startTime, Date endTime) throws IOException {
+ return ywPointService.importData(file, unitId, startTime, endTime);
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
index 447932b..79d6f48 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/YwPointService.java
@@ -10,6 +10,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.util.Date;
import java.util.List;
/**
@@ -120,5 +121,5 @@
* @param unitId 杩愮淮鍗曚綅id
* @return
*/
- Result importData(MultipartFile file, Integer unitId) throws IOException;
+ Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime) throws IOException;
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
index eef5dce..354b073 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/YwPointServiceImpl.java
@@ -36,6 +36,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.function.Consumer;
@@ -233,9 +234,9 @@
}
@Override
- public Result importData(MultipartFile file, Integer unitId) throws IOException {
+ public Result importData(MultipartFile file, Integer unitId, Date startTime, Date endTime) throws IOException {
Consumer<List<PointExport>> consumer = (dataList) -> {
- this.updatePoint(dataList, unitId);
+ this.updatePoint(dataList, unitId, startTime, endTime);
};
EasyExcel.read(file.getInputStream(), PointExport.class , new CurrencyDataListener(consumer)).headRowNumber(1).doReadAll();
return Result.ok();
@@ -247,7 +248,7 @@
* @param dataList
* @param unitId
*/
- private void updatePoint(List<PointExport> dataList, Integer unitId) {
+ private void updatePoint(List<PointExport> dataList, Integer unitId, Date startTime, Date endTime) {
if (CollectionUtils.isEmpty(dataList)) {
throw new RuntimeException("瀵煎叆鏁版嵁涓嶈兘涓虹┖");
}
@@ -255,6 +256,8 @@
new LambdaUpdateChainWrapper<>(baseMapper)
.in(YwPoint::getSerialNumber, pointList)
.set(YwPoint::getUnitId, unitId)
+ .set(YwPoint::getStartTime, startTime)
+ .set(YwPoint::getEndTime, endTime)
.update();
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 031607d..344eb16 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -81,7 +81,9 @@
m.name as pointName,
m.serial_number,
m.ip,
- yu.unit_name
+ yu.unit_name,
+ yp.start_time,
+ yp.end_time
FROM
t_yw_point yp
INNER JOIN t_monitor m ON yp.serial_number = m.serial_number
--
Gitblit v1.8.0