Merge branch 'dyf-device' into 6170

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

@@ -2,6 +2,8 @@ package com.fuyuanshen.equipment.domain;
 
 import com.fuyuanshen.common.tenant.core.TenantEntity;
 import com.baomidou.mybatisplus.annotation.*;
+import io.github.linpeilie.annotations.AutoMapping;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -100,4 +102,12 @@ public class DeviceAlarm extends TenantEntity {
     private Long treatmentState;
 
 
+    /**
+     * 设备IMEI
+     * device_imei
+     */
+    @Schema(title = "设备IMEI")
+    @AutoMapping(target = "deviceImei")
+    private String deviceImei;
+
 }

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

@@ -52,12 +52,12 @@ public class DeviceFenceAccessRecord extends BaseEntity {
     /**
      * 纬度
      */
-    private Long latitude;
+    private Double latitude;
 
     /**
      * 经度
      */
-    private Long longitude;
+    private Double longitude;
 
     /**
      * 定位精度

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

@@ -59,8 +59,8 @@ public class DeviceType extends TenantEntity {
     @Schema(title = "联网方式", example = "0:无;1:4G;2:WIFI")
     private String networkWay;
 
-    @Schema(title = "通讯方式", example = "0:4G;1:蓝牙,2 4G&蓝牙")
-    private String communicationMode;
+    @Schema(title = "通讯方式", example = "通讯方式 0:4G;1:蓝牙,2 4G&蓝牙")
+    private Integer communicationMode;
 
     /**
      * 创建人名称

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

@@ -2,6 +2,7 @@ package com.fuyuanshen.equipment.domain.bo;
 
 import com.fuyuanshen.common.core.validate.EditGroup;
 import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import com.fuyuanshen.common.tenant.core.TenantEntity;
 import com.fuyuanshen.equipment.domain.DeviceAlarm;
 import io.github.linpeilie.annotations.AutoMapper;
 import jakarta.validation.constraints.NotNull;
@@ -19,7 +20,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper = true)
 @AutoMapper(target = DeviceAlarm.class, reverseConvertGenerate = false)
-public class DeviceAlarmBo extends BaseEntity {
+public class DeviceAlarmBo extends TenantEntity {
 
     /**
      * ID
@@ -35,6 +36,7 @@ public class DeviceAlarmBo extends BaseEntity {
     /**
      * 报警事项
      * device_action
+     *  0-强制报警，1-撞击闯入，2-自动报警，3-电子围栏告警
      */
     private Integer deviceAction;
 
@@ -99,7 +101,7 @@ public class DeviceAlarmBo extends BaseEntity {
     /**
      * 报警持续时间
      */
-    private Long durationTime;
+    private String durationTime;
 
     /**
      * 报警查询时间

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

@@ -74,6 +74,16 @@ public class DeviceFenceAccessRecordBo extends BaseEntity {
     @NotNull(message = "事件时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date eventTime;
 
+    /**
+     * 开始时间
+     */
+    private String beginTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
     /**
      * 记录创建时间
      */

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/dto/AppDeviceBo.java

@@ -23,7 +23,7 @@ public class AppDeviceBo {
     private String deviceMac;
 
     /**
-     * 通讯方式 0:4G;  1:蓝牙
+     * 通讯方式 0:4G;1:蓝牙,2 4G&蓝牙
      */
     @NotNull(message = "通讯方式不能为空", groups = { EditGroup.class })
     private Integer communicationMode;

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/form/DeviceTypeForm.java

@@ -21,13 +21,13 @@ public class DeviceTypeForm {
     private Boolean isSupportBle;
 
     @Schema(title = "定位方式", example = "0:无;1:GPS;2:基站;3:wifi;4:北斗")
-    private String locateMode;
+    private Integer locateMode;
 
     @Schema(title = "联网方式", example = "0:无;1:4G;2:WIFI")
-    private String networkWay;
+    private Integer networkWay;
 
-    @Schema(title = "通讯方式", example = "0:4G;1:蓝牙")
-    private String communicationMode;
+    @Schema(title = "通讯方式", example = "通讯方式 0:4G;1:蓝牙,2 4G&蓝牙")
+    private Integer communicationMode;
 
     /**
      * 型号字典用于APP页面跳转

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/APPDeviceQueryCriteria1.java

@@ -59,7 +59,7 @@ public class APPDeviceQueryCriteria1 {
     @Schema(name = "租户ID")
     private Long tenantId;
 
-    @Schema(name = "通讯方式", example = "0:4G;1:蓝牙")
+    @Schema(name = "通讯方式", example = "通讯方式 0:4G;1:蓝牙,2 4G&蓝牙")
     private Integer communicationMode;
 
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java

@@ -82,9 +82,10 @@ public class DeviceQueryCriteria extends BaseEntity {
     private String tenantId;
 
     /**
-     * 通讯方式 0:4G;1:蓝牙
+     * 通讯方式 0:4G;1:蓝牙,2 4G&蓝牙
      * communication_mode
      */
+    @Schema(title = "通讯方式", example = "0:4G;1:蓝牙,2 4G&蓝牙")
     private Integer communicationMode;
 
     /* app绑定用户id */

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

@@ -26,7 +26,7 @@ public class AppDeviceVo implements Serializable {
     private String deviceMac;
 
     /**
-     * 通讯方式 0:4G;1:蓝牙
+     * 通讯方式 0:4G;1:蓝牙,2 4G&蓝牙
      */
     private Integer communicationMode;
 

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

@@ -10,6 +10,7 @@ import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
 import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
 import io.github.linpeilie.annotations.AutoMapper;
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
 import lombok.Data;
 
 import java.io.Serial;
@@ -134,4 +135,5 @@ public class DeviceAlarmVo implements Serializable {
     @Schema(name = "设备图片")
     private String devicePic;
 
+
 }

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

@@ -27,7 +27,7 @@ public class WebDeviceVo implements Serializable {
     private String deviceMac;
 
     /**
-     * 通讯方式 0:4G;1:蓝牙
+     * 通讯方式 0:4G;1:蓝牙,2 4G&蓝牙
      */
     private Integer communicationMode;
 

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

@@ -25,4 +25,13 @@ public interface DeviceAlarmMapper extends BaseMapperPlus<DeviceAlarm, DeviceAla
      */
     Page<DeviceAlarmVo> selectVoPage( Page pageQuery,@Param("bo") DeviceAlarmBo bo);
 
+    /**
+     * 根据设备IMEI查询最新的一条告警数据
+     *
+     * @param deviceImei 设备IMEI
+     * @return 设备告警
+     */
+    DeviceAlarmVo selectLatestByDeviceImei(@Param("deviceImei") String deviceImei);
+
+
 }

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

@@ -109,4 +109,12 @@ public interface DeviceMapper extends BaseMapper<Device> {
     int getUsageDataForMonth(@Param("deviceId") Long deviceId,
                              @Param("year") int year,
                              @Param("month") int month);
-}
+                             
+    /**
+     * 根据设备IMEI查询设备
+     *
+     * @param deviceImei 设备IMEI
+     * @return 设备信息
+     */
+    Device selectDeviceByImei(@Param("deviceImei") String deviceImei);
+}

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

@@ -144,4 +144,12 @@ public interface DeviceService extends IService<Device> {
      * @return
      */
     List<Map<String, Object>> getEquipmentUsageData(Long deviceTypeId, Integer range);
-}
+    
+    /**
+     * 根据设备IMEI查询设备
+     *
+     * @param deviceImei 设备IMEI
+     * @return 设备信息
+     */
+    Device selectDeviceByImei(String deviceImei);
+}

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

@@ -65,4 +65,14 @@ public interface IDeviceAlarmService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据设备IMEI查询最新的一条告警数据
+     *
+     * @param deviceImei 设备IMEI
+     * @return 设备告警
+     */
+    DeviceAlarmVo queryLatestByDeviceImei(String deviceImei);
+
+
 }

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

@@ -1,5 +1,6 @@
 package com.fuyuanshen.equipment.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.fuyuanshen.common.core.utils.MapstructUtils;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
@@ -102,11 +103,13 @@ public class DeviceAlarmServiceImpl implements IDeviceAlarmService {
      */
     @Override
     public Boolean insertByBo(DeviceAlarmBo bo) {
-        DeviceAlarm add = MapstructUtils.convert(bo, DeviceAlarm.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
+        DeviceAlarm deviceAlarm = new DeviceAlarm();
+        // DeviceAlarm add = MapstructUtils.convert(bo, DeviceAlarm.class);
+        BeanUtil.copyProperties(bo, deviceAlarm);
+        validEntityBeforeSave(deviceAlarm);
+        boolean flag = baseMapper.insert(deviceAlarm) > 0;
         if (flag) {
-            bo.setId(add.getId());
+            bo.setId(deviceAlarm.getId());
         }
         return flag;
     }
@@ -145,4 +148,17 @@ public class DeviceAlarmServiceImpl implements IDeviceAlarmService {
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+
+    /**
+     * 根据设备IMEI查询最新的一条告警数据
+     *
+     * @param deviceImei 设备IMEI
+     * @return 设备告警
+     */
+    @Override
+    public DeviceAlarmVo queryLatestByDeviceImei(String deviceImei) {
+        return baseMapper.selectLatestByDeviceImei(deviceImei);
+    }
+
 }

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

@@ -58,6 +58,7 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec
         return TableDataInfo.build(result);
     }
 
+
     /**
      * 查询符合条件的围栏进出记录列表
      *
@@ -70,6 +71,7 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec
         return baseMapper.selectVoPageWithFenceAndDeviceName(lqw);
     }
 
+
     private LambdaQueryWrapper<DeviceFenceAccessRecord> buildQueryWrapper(DeviceFenceAccessRecordBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<DeviceFenceAccessRecord> lqw = Wrappers.lambdaQuery();
@@ -86,6 +88,7 @@ public class DeviceFenceAccessRecordServiceImpl implements IDeviceFenceAccessRec
         return lqw;
     }
 
+
     /**
      * 新增围栏进出记录
      *

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

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fuyuanshen.equipment.domain.DeviceGeoFence;
+import com.fuyuanshen.equipment.domain.bo.DeviceFenceAccessRecordBo;
 import com.fuyuanshen.equipment.domain.bo.DeviceFenceStatusBo;
 import com.fuyuanshen.equipment.domain.bo.DeviceGeoFenceBo;
 import com.fuyuanshen.equipment.domain.dto.FenceCheckResponse;
@@ -16,6 +17,7 @@ import com.fuyuanshen.equipment.domain.query.FenceCheckRequest;
 import com.fuyuanshen.equipment.domain.vo.DeviceFenceStatusVo;
 import com.fuyuanshen.equipment.domain.vo.DeviceGeoFenceVo;
 import com.fuyuanshen.equipment.mapper.DeviceGeoFenceMapper;
+import com.fuyuanshen.equipment.service.IDeviceFenceAccessRecordService;
 import com.fuyuanshen.equipment.service.IDeviceFenceStatusService;
 import com.fuyuanshen.equipment.service.IDeviceGeoFenceService;
 import com.fuyuanshen.equipment.utils.map.GeoFenceChecker;
@@ -40,6 +42,8 @@ public class DeviceGeoFenceServiceImpl implements IDeviceGeoFenceService {
     private final DeviceGeoFenceMapper baseMapper;
 
     private final IDeviceFenceStatusService fenceStatusService; // 添加此行
+    
+    private final IDeviceFenceAccessRecordService fenceAccessRecordService; // 添加此行
 
 
 
@@ -96,6 +100,7 @@ public class DeviceGeoFenceServiceImpl implements IDeviceGeoFenceService {
         return lqw;
     }
 
+
     /**
      * 新增电子围栏
      *
@@ -213,9 +218,9 @@ public class DeviceGeoFenceServiceImpl implements IDeviceGeoFenceService {
             DeviceFenceStatusVo latestStatus = fenceStatusService.getLatestStatusByDeviceAndFence(
                     request.getDeviceId(), fence.getId());
 
-            // 判断设备与围栏的关系变化
-            Long previousStatus = latestStatus != null ? latestStatus.getStatus() : 0L; // 默认在围栏外
-            Long currentStatus = pointInFence ? 1L : 0L; // 当前状态：1-在围栏内，0-在围栏外
+            // 判断设备与围栏的关系变化 1=进入围栏,2=离开围栏
+            Long previousStatus = latestStatus != null ? latestStatus.getStatus() : 2L; // 默认在围栏外
+            Long currentStatus = pointInFence ? 1L : 2L; // 当前状态：1-在围栏内，2-在围栏外
 
             // 如果状态发生变化，则记录
             if (!previousStatus.equals(currentStatus)) {
@@ -229,6 +234,17 @@ public class DeviceGeoFenceServiceImpl implements IDeviceGeoFenceService {
                 // 保存状态记录
                 fenceStatusService.insertByBo(newStatus);
 
+                // 添加围栏进出记录
+                DeviceFenceAccessRecordBo recordBo = new DeviceFenceAccessRecordBo();
+                recordBo.setDeviceId(request.getDeviceId());
+                recordBo.setFenceId(fence.getId());
+                recordBo.setLatitude(request.getLatitude());
+                recordBo.setLongitude(request.getLongitude());
+                recordBo.setEventTime(new Date());
+                // 1表示进入围栏，2表示离开围栏
+                recordBo.setEventType(currentStatus);
+                fenceAccessRecordService.insertByBo(recordBo);
+
                 // 根据状态变化更新响应
                 if (currentStatus == 1L) {
                     // 设备进入围栏
@@ -247,4 +263,4 @@ public class DeviceGeoFenceServiceImpl implements IDeviceGeoFenceService {
     }
 
 
-}
+}

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

@@ -661,4 +661,9 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
 
     }
 
+    @Override
+    public Device selectDeviceByImei(String deviceImei) {
+        return baseMapper.selectDeviceByImei(deviceImei);
+    }
+
 }

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

@@ -6,7 +6,7 @@
 
     <!-- 查询设备告警列表 -->
     <select id="selectVoPage" resultType="com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo">
-        select *, d.device_mac as deviceMac, d.device_imei as deviceImei,
+        select *, d.device_mac as deviceMac, d.device_imei as deviceImei,d.device_name as deviceName,
         d.type_name as deviceTypeName, d.device_pic as devicePic
         from device_alarm da
         left join device d on da.device_id = d.id
@@ -30,4 +30,20 @@
         </where>
     </select>
 
+
+    <!-- 根据设备IMEI查询最新的一条告警数据 -->
+    <select id="selectLatestByDeviceImei" resultType="com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo">
+        select *, d.device_mac as deviceMac, d.device_imei as deviceImei,
+        d.type_name as deviceTypeName, d.device_pic as devicePic
+        from device_alarm da
+        left join device d on da.device_id = d.id
+        left join device_type dt on dt.id = da.device_type
+        <where>
+            da.device_imei = #{deviceImei}
+        </where>
+        order by da.create_time desc
+        limit 1
+    </select>
+
+
 </mapper>

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

@@ -4,29 +4,26 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuyuanshen.equipment.mapper.DeviceFenceAccessRecordMapper">
 
-    <!-- 分页查询围栏进出记录列表 -->
+    <!-- 修改后的分页查询围栏进出记录列表 -->
     <select id="selectVoPageWithFenceAndDeviceName"
             resultType="com.fuyuanshen.equipment.domain.vo.DeviceFenceAccessRecordVo">
-        SELECT
-        r.id,
-        r.fence_id,
-        f.name AS fence_name,
-        r.device_id,
-        d.device_name,
-        r.user_id,
-        r.event_type,
-        r.latitude,
-        r.longitude,
-        r.accuracy,
-        r.event_time,
-        r.create_time
+        SELECT r.id,
+               r.fence_id,
+               f.name AS fence_name,
+               r.device_id,
+               d.device_name,
+               r.user_id,
+               r.event_type,
+               r.latitude,
+               r.longitude,
+               r.accuracy,
+               r.event_time,
+               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
-        <where>
+                 LEFT JOIN device_geo_fence f ON r.fence_id = f.id
+                 LEFT JOIN device d ON r.device_id = d.id
             ${ew.customSqlSegment}
-        </where>
         ORDER BY r.id ASC
     </select>
 
-</mapper>
+</mapper>

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

@@ -423,4 +423,9 @@
           AND MONTH (dl.create_time) = #{month}
     </select>
 
+    <!-- 根据设备IMEI查询设备 -->
+    <select id="selectDeviceByImei" resultType="com.fuyuanshen.equipment.domain.Device">
+        SELECT * FROM device WHERE device_imei = #{deviceImei}
+    </select>
+
 </mapper>