dyf/fys-Multi-tenant
1
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '6170' into prod

Browse Source
This commit is contained in:
daiyongfei
2025-12-12 14:59:50 +08:00
parent b8cb663bbf 8c636d0484
commit ccadcb8d4e
4 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceController.java
View File

@ -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.R;
import com.fuyuanshen.common.core.domain.model.LoginUser; import com.fuyuanshen.common.core.domain.model.LoginUser;
import com.fuyuanshen.common.core.utils.file.FileUtil; 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.mybatis.core.page.TableDataInfo;
import com.fuyuanshen.common.satoken.utils.LoginHelper; import com.fuyuanshen.common.satoken.utils.LoginHelper;
import com.fuyuanshen.common.web.core.BaseController; import com.fuyuanshen.common.web.core.BaseController;

30
fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceRepairRecordsVo.java
View File

@ -1,6 +1,8 @@
package com.fuyuanshen.equipment.domain.vo; package com.fuyuanshen.equipment.domain.vo;
import java.util.Date; import java.util.Date;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fuyuanshen.common.tenant.core.TenantEntity; import com.fuyuanshen.common.tenant.core.TenantEntity;
import com.fuyuanshen.equipment.domain.DeviceRepairRecords; import com.fuyuanshen.equipment.domain.DeviceRepairRecords;
@ -34,31 +36,39 @@ public class DeviceRepairRecordsVo extends TenantEntity implements Serializable
/** /**
* 维修记录ID * 维修记录ID
*/ */
@ExcelProperty(value = "维修记录ID") // @ExcelProperty(value = "维修记录ID")
private Long recordId; private Long recordId;
/** /**
* 设备ID * 设备ID
*/ */
@ExcelProperty(value = "设备ID") // @ExcelProperty(value = "设备ID")
private String deviceId; private String deviceId;
/**
* 设备名称
*/
@ExcelProperty(value = "设备名称")
private String deviceName;
/** /**
* 维修时间 * 维修时间
*/ */
@ExcelProperty(value = "维修时间") @ExcelProperty(value = "维修时间")
private Date repairTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ColumnWidth(20)
private String repairTime;
/** /**
* 维修部位 * 损坏部位
*/ */
@ExcelProperty(value = "维修部位") @ExcelProperty(value = "损坏部位")
private String repairPart; private String repairPart;
/** /**
* 维修原因 * 损坏原因
*/ */
@ExcelProperty(value = "维修原因") @ExcelProperty(value = "损坏原因")
private String repairReason; private String repairReason;
/** /**
@ -66,11 +76,7 @@ public class DeviceRepairRecordsVo extends TenantEntity implements Serializable
*/ */
@ExcelProperty(value = "维修人员") @ExcelProperty(value = "维修人员")
private String repairPerson; private String repairPerson;
/**
* 维修人员
*/
@ExcelProperty(value = "设备名称")
private String deviceName;
private List<DeviceRepairImagesVo> images; private List<DeviceRepairImagesVo> images;

4
fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceFenceAccessRecordMapper.xml
View File

@ -48,8 +48,8 @@
r.event_time, r.event_address, r.event_time, r.event_address,
r.create_time r.create_time
FROM device_fence_access_record r FROM device_fence_access_record r
LEFT JOIN device_geo_fence f ON r.fence_id = f.id INNER JOIN device_geo_fence f ON r.fence_id = f.id
LEFT JOIN device d ON r.device_id = d.id INNER JOIN device d ON r.device_id = d.id
<where> <where>
<if test="bo.fenceId != null"> <if test="bo.fenceId != null">
AND r.fence_id = #{bo.fenceId} AND r.fence_id = #{bo.fenceId}