From b85664900ed6e3ba4acf9df2fc7638e9d0cd2ea8 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Wed, 10 Dec 2025 09:39:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=9B=B4=E6=A0=8F=E8=BF=9B=E5=87=BA=E8=AE=B0=E5=BD=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fuyuanshen/web/controller/CaptchaController.java | 2 +- .../com/fuyuanshen/equipment/controller/DeviceController.java | 1 - .../mapper/equipment/DeviceFenceAccessRecordMapper.xml | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fys-admin/src/main/java/com/fuyuanshen/web/controller/CaptchaController.java b/fys-admin/src/main/java/com/fuyuanshen/web/controller/CaptchaController.java index c0d9c39b..aba22ab1 100644 --- a/fys-admin/src/main/java/com/fuyuanshen/web/controller/CaptchaController.java +++ b/fys-admin/src/main/java/com/fuyuanshen/web/controller/CaptchaController.java @@ -157,4 +157,4 @@ public class CaptchaController { return captchaVo; } -} +} \ No newline at end of file diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java index d3bbce2e..56c605b8 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fuyuanshen.common.core.domain.R; import com.fuyuanshen.common.core.domain.model.LoginUser; import com.fuyuanshen.common.core.utils.file.FileUtil; -import com.fuyuanshen.common.mybatis.core.page.PageQuery; import com.fuyuanshen.common.mybatis.core.page.TableDataInfo; import com.fuyuanshen.common.satoken.utils.LoginHelper; import com.fuyuanshen.common.web.core.BaseController; diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceFenceAccessRecordMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceFenceAccessRecordMapper.xml index 375bec60..6777530c 100644 --- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceFenceAccessRecordMapper.xml +++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceFenceAccessRecordMapper.xml @@ -48,8 +48,8 @@ r.event_time, r.event_address, r.create_time FROM device_fence_access_record r - LEFT JOIN device_geo_fence f ON r.fence_id = f.id - LEFT JOIN device d ON r.device_id = d.id + INNER JOIN device_geo_fence f ON r.fence_id = f.id + INNER JOIN device d ON r.device_id = d.id AND r.fence_id = #{bo.fenceId} From 0c474ae1f39309234c9e9c1aa2598466091888ac Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Thu, 11 Dec 2025 15:24:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/domain/vo/DeviceRepairRecordsVo.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java index 0e970313..f2867afc 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java @@ -1,6 +1,8 @@ package com.fuyuanshen.equipment.domain.vo; import java.util.Date; + +import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.fasterxml.jackson.annotation.JsonFormat; import com.fuyuanshen.common.tenant.core.TenantEntity; import com.fuyuanshen.equipment.domain.DeviceRepairRecords; @@ -47,6 +49,8 @@ public class DeviceRepairRecordsVo extends TenantEntity implements Serializable * 维修时间 */ @ExcelProperty(value = "维修时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ColumnWidth(20) private Date repairTime; /** @@ -74,4 +78,4 @@ public class DeviceRepairRecordsVo extends TenantEntity implements Serializable private List images; -} +} \ No newline at end of file From 8c636d0484ab9f0e89764a3429dc6edb68922324 Mon Sep 17 00:00:00 2001 From: daiyongfei <974332738@qq.com> Date: Fri, 12 Dec 2025 14:55:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/vo/DeviceRepairRecordsVo.java | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java index f2867afc..3a92f93c 100644 --- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java +++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java @@ -36,33 +36,39 @@ public class DeviceRepairRecordsVo extends TenantEntity implements Serializable /** * 维修记录ID */ - @ExcelProperty(value = "维修记录ID") + // @ExcelProperty(value = "维修记录ID") private Long recordId; /** * 设备ID */ - @ExcelProperty(value = "设备ID") + // @ExcelProperty(value = "设备ID") private String deviceId; + /** + * 设备名称 + */ + @ExcelProperty(value = "设备名称") + private String deviceName; + /** * 维修时间 */ @ExcelProperty(value = "维修时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ColumnWidth(20) - private Date repairTime; + private String repairTime; /** - * 维修部位 + * 损坏部位 */ - @ExcelProperty(value = "维修部位") + @ExcelProperty(value = "损坏部位") private String repairPart; /** - * 维修原因 + * 损坏原因 */ - @ExcelProperty(value = "维修原因") + @ExcelProperty(value = "损坏原因") private String repairReason; /** @@ -70,11 +76,7 @@ public class DeviceRepairRecordsVo extends TenantEntity implements Serializable */ @ExcelProperty(value = "维修人员") private String repairPerson; - /** - * 维修人员 - */ - @ExcelProperty(value = "设备名称") - private String deviceName; + private List images;