From 0c9a93f6007bee2f9ef30955fd7e92ebe4004f9f Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Thu, 5 Dec 2024 12:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/carrycapacity/excel/CarryCapcityDataEexcel.java      | 4 +++-
 .../carrycapacity/impl/CarryCapacityDevicePOServiceImpl.java  | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/excel/CarryCapcityDataEexcel.java b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/excel/CarryCapcityDataEexcel.java
index e36fde828..f38846d15 100644
--- a/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/excel/CarryCapcityDataEexcel.java
+++ b/pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/carrycapacity/excel/CarryCapcityDataEexcel.java
@@ -3,6 +3,7 @@ package com.njcn.advance.pojo.carrycapacity.excel;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.converters.localdatetime.LocalDateTimeStringConverter;
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -19,7 +20,8 @@ import java.util.List;
 @Data
 public class CarryCapcityDataEexcel {
 
-    @ExcelProperty(index = 0,value = "时间",converter = LocalDateTimeStringConverter.class)
+    @ExcelProperty(index = 0,value = "时间(格式为yyyy-MM-dd hh:mm:ss)",converter = LocalDateTimeStringConverter.class)
+    @JSONField(format  = "yyyy-MM-dd hh:mm:ss")
     private LocalDateTime time;
 
     @ExcelProperty(index =1,value = {"电压","A"})
diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityDevicePOServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityDevicePOServiceImpl.java
index f00738106..f0194931d 100644
--- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityDevicePOServiceImpl.java
+++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/carrycapacity/impl/CarryCapacityDevicePOServiceImpl.java
@@ -2,14 +2,10 @@ package com.njcn.advance.service.carrycapacity.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.advance.enums.AdvanceResponseEnum;
 import com.njcn.advance.mapper.carrycapacity.CarryCapacityDevicePOMapper;
 import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityDeviceParam;
-import com.njcn.advance.pojo.carrycapacity.param.CarryCapacityUserParam;
 import com.njcn.advance.pojo.carrycapacity.po.CarryCapacityDevicePO;
-import com.njcn.advance.pojo.carrycapacity.po.CarryCapacityUserPO;
 import com.njcn.advance.service.carrycapacity.CarryCapacityDevicePOService;
-import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;