导出围栏进出记录列表

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/bo/DeviceFenceAccessRecordBo.java

@@ -55,13 +55,13 @@ public class DeviceFenceAccessRecordBo extends BaseEntity {
      * 纬度
      */
     @NotNull(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long latitude;
+    private Double latitude;
 
     /**
      * 经度
      */
     @NotNull(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
-    private Long longitude;
+    private Double longitude;
 
     /**
      * 定位精度

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/vo/DeviceFenceAccessRecordVo.java

@@ -33,13 +33,13 @@ public class DeviceFenceAccessRecordVo implements Serializable {
     /**
      * 记录ID
      */
-    @ExcelProperty(value = "记录ID")
+    // @ExcelProperty(value = "记录ID")
     private Long id;
 
     /**
      * 围栏ID
      */
-    @ExcelProperty(value = "围栏ID")
+    // @ExcelProperty(value = "围栏ID")
     private Long fenceId;
 
     /**
@@ -51,7 +51,7 @@ public class DeviceFenceAccessRecordVo implements Serializable {
     /**
      * 设备标识
      */
-    @ExcelProperty(value = "设备标识")
+    // @ExcelProperty(value = "设备标识")
     private Long deviceId;
 
     /**
@@ -63,13 +63,14 @@ public class DeviceFenceAccessRecordVo implements Serializable {
     /**
      * 用户ID
      */
-    @ExcelProperty(value = "用户ID")
+    // @ExcelProperty(value = "用户ID")
     private Long userId;
 
     /**
      * 事件类型
      */
-    @ExcelProperty(value = "事件类型")
+    @ExcelProperty(value = "事件类型", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=进入围栏,2=离开围栏")
     private Long eventType;
 
     /**

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceFenceAccessRecordMapper.java

@@ -8,6 +8,8 @@ import com.fuyuanshen.equipment.domain.DeviceFenceAccessRecord;
 import com.fuyuanshen.equipment.domain.vo.DeviceFenceAccessRecordVo;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * 围栏进出记录Mapper接口
  *
@@ -24,4 +26,8 @@ public interface DeviceFenceAccessRecordMapper extends BaseMapperPlus<DeviceFenc
      * @return 围栏进出记录分页列表
      */
     Page<DeviceFenceAccessRecordVo> selectVoPageWithFenceAndDeviceName(Page<DeviceFenceAccessRecord> page, @Param(Constants.WRAPPER) Wrapper<DeviceFenceAccessRecord> wrapper);
+
+    List<DeviceFenceAccessRecordVo> selectVoPageWithFenceAndDeviceName(@Param(Constants.WRAPPER) Wrapper<DeviceFenceAccessRecord> wrapper);
+
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceFenceAccessRecordServiceImpl.java

@@ -40,7 +40,7 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec
      * @return 围栏进出记录
      */
     @Override
-    public DeviceFenceAccessRecordVo queryById(Long id){
+    public DeviceFenceAccessRecordVo queryById(Long id) {
         return baseMapper.selectVoById(id);
     }
 
@@ -67,7 +67,7 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec
     @Override
     public List<DeviceFenceAccessRecordVo> queryList(DeviceFenceAccessRecordBo bo) {
         LambdaQueryWrapper<DeviceFenceAccessRecord> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+        return baseMapper.selectVoPageWithFenceAndDeviceName(lqw);
     }
 
     private LambdaQueryWrapper<DeviceFenceAccessRecord> buildQueryWrapper(DeviceFenceAccessRecordBo bo) {
@@ -119,8 +119,8 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec
     /**
      * 保存前的数据校验
      */
-    private void validEntityBeforeSave(DeviceFenceAccessRecord entity){
+    private void validEntityBeforeSave(DeviceFenceAccessRecord entity) {
-        //TODO 做一些数据校验,如唯一约束
+        // TODO 做一些数据校验,如唯一约束
     }
 
     /**
@@ -132,8 +132,8 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec
      */
     @Override
     public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
+        if (isValid) {
-            //TODO 做一些业务上的校验,判断是否需要校验
+            // TODO 做一些业务上的校验,判断是否需要校验
         }
         return baseMapper.deleteByIds(ids) > 0;
     }

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

@@ -22,7 +22,7 @@
         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.device_id
+        LEFT JOIN device d ON r.device_id = d.id
         <where>
             ${ew.customSqlSegment}
         </where>