Merge remote-tracking branch 'origin/6170' into 6170

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/bo/AppDeviceShareBo.java

@@ -1,5 +1,7 @@
 package com.fuyuanshen.app.domain.bo;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fuyuanshen.app.domain.AppDeviceShare;
 import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
 import io.github.linpeilie.annotations.AutoMapper;
@@ -7,6 +9,8 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
+import java.util.Date;
+
 /**
  * 设备分享业务对象 app_device_share
  *
@@ -35,10 +39,16 @@ public class AppDeviceShareBo extends BaseEntity {
 
     /**
      * 功能权限（1：灯光模式；2：激光模式；3：开机画面；4：人员信息登记；5：发送信息；6：产品信息）
-以逗号分隔
+     * 以逗号分隔
      */
     private String permission;
 
+    /**
+     * 分享用户
+     * share_user
+     */
+    private String shareUser;
+
     /**
      * 备注
      */
@@ -46,4 +56,11 @@ public class AppDeviceShareBo extends BaseEntity {
 
 
     private String smsCode;
+
+    /**
+     * 分享时间
+     */
+    private Date shareStartTime;
+    private Date shareEndTime;
+
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/mapper/AppDeviceShareMapper.java

@@ -18,5 +18,13 @@ import org.apache.ibatis.annotations.Param;
 public interface AppDeviceShareMapper extends BaseMapperPlus<AppDeviceShare, AppDeviceShareVo> {
     IPage<AppDeviceShareVo> otherDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page<AppDeviceShareVo> page);
 
-    Page<AppDeviceShareVo> selectAppDeviceShareList(@Param("bo") AppDeviceShareBo bo,Page<AppDeviceShareVo> page);
+    Page<AppDeviceShareVo> selectAppDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page<AppDeviceShareVo> page);
+
+    /**
+     * 查询设备分享列表(web)
+     *
+     * @param bo 设备分享
+     * @return 设备分享
+     */
+    Page<AppDeviceShareVo> selectWebDeviceShareList(@Param("bo") AppDeviceShareBo bo, Page<AppDeviceShareVo> page);
 }

fys-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml

@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuyuanshen.app.mapper.AppDeviceShareMapper">
 
     <select id="otherDeviceShareList" resultType="com.fuyuanshen.app.domain.vo.AppDeviceShareVo">
         select d.device_name,
-        d.device_mac,
-        d.device_sn,
-        d.device_imei,
-        d.device_pic,
-        dt.type_name,
-        dt.communication_mode,
-        dt.app_model_dictionary detailPageUrl,
-        d.bluetooth_name,
-        c.binding_time,
-        ad.*,u.user_name otherPhonenumber
-        from
-        app_device_share ad
-        left join device d on ad.device_id = d.id
-        left join app_user u on ad.create_by = u.user_id
-        inner join device_type dt on d.device_type = dt.id
-        inner join app_device_bind_record c on d.id = c.device_id
+               d.device_mac,
+               d.device_sn,
+               d.device_imei,
+               d.device_pic,
+               dt.type_name,
+               dt.communication_mode,
+               dt.app_model_dictionary detailPageUrl,
+               d.bluetooth_name,
+               c.binding_time,
+               ad.*,
+               u.user_name             otherPhonenumber
+        from app_device_share ad
+                 left join device d on ad.device_id = d.id
+                 left join app_user u on ad.create_by = u.user_id
+                 inner join device_type dt on d.device_type = dt.id
+                 inner join app_device_bind_record c on d.id = c.device_id
         where ad.phonenumber = #{bo.phonenumber}
     </select>
     <select id="selectAppDeviceShareList" resultType="com.fuyuanshen.app.domain.vo.AppDeviceShareVo">
@@ -47,4 +47,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and ad.device_id = #{bo.deviceId}
         </if>
     </select>
+
+    <!-- 查询设备分享列表(web) -->
+    <select id="selectWebDeviceShareList" resultType="com.fuyuanshen.app.domain.vo.AppDeviceShareVo">
+        select *
+        from
+        app_device_share ad
+        <where>
+            <if test="bo.deviceId != null">
+                and ad.device_id = #{bo.deviceId}
+            </if>
+            <if test="bo.shareUser != null">
+                and ad.share_user = #{bo.shareUser}
+            </if>
+            <if test="criteria.shareStartTime != null and criteria.hareEndTime != null">
+                and d.create_time between #{bo.shareStartTime} and #{bo.shareEndTime}
+            </if>
+        </where>
+
+    </select>
 </mapper>

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

@@ -0,0 +1,99 @@
+package com.fuyuanshen.equipment.domain;
+
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 设备告警对象 device_alarm
+ *
+ * @author Lion Li
+ * @date 2025-08-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("device_alarm")
+public class DeviceAlarm extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    private Long deviceId;
+
+    /**
+     * 报警事项
+     */
+    private String deviceAction;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 数据来源
+     */
+    private String dataSource;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 设备类型
+     */
+    private Long deviceType;
+
+    /**
+     * 经度
+
+     */
+    private Long longitude;
+
+    /**
+     * 纬度
+     */
+    private Long latitude;
+
+    /**
+     * 报警位置
+     */
+    private String location;
+
+    /**
+     * 报警开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 报警结束时间
+     */
+    private Date finishTime;
+
+    /**
+     * 报警持续时间
+     */
+    private Date durationTime;
+
+    /**
+     * 0已处理，1未处理
+     */
+    private Long treatmentState;
+
+
+}

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

@@ -0,0 +1,97 @@
+package com.fuyuanshen.equipment.domain.bo;
+
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import com.fuyuanshen.equipment.domain.DeviceAlarm;
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 设备告警业务对象 device_alarm
+ *
+ * @author Lion Li
+ * @date 2025-08-28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DeviceAlarm.class, reverseConvertGenerate = false)
+public class DeviceAlarmBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    @NotNull(message = "ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    private Long deviceId;
+
+    /**
+     * 报警事项
+     */
+    private String deviceAction;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 数据来源
+     */
+    private String dataSource;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 设备类型
+     */
+    private Long deviceType;
+
+    /**
+     * 经度
+
+     */
+    private Long longitude;
+
+    /**
+     * 纬度
+     */
+    private Long latitude;
+
+    /**
+     * 报警位置
+     */
+    private String location;
+
+    /**
+     * 报警开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 报警结束时间
+     */
+    private Date finishTime;
+
+    /**
+     * 报警持续时间
+     */
+    private Date durationTime;
+
+    /**
+     * 0已处理，1未处理
+     */
+    private Long treatmentState;
+
+
+}

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

@@ -0,0 +1,118 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fuyuanshen.equipment.domain.DeviceAlarm;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
+import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 设备告警视图对象 device_alarm
+ *
+ * @author Lion Li
+ * @date 2025-08-28
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = DeviceAlarm.class)
+public class DeviceAlarmVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ExcelProperty(value = "ID")
+    private Long id;
+
+    /**
+     * 设备ID
+     */
+    @ExcelProperty(value = "设备ID")
+    private Long deviceId;
+
+    /**
+     * 报警事项
+     */
+    @ExcelProperty(value = "报警事项")
+    private String deviceAction;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty(value = "设备名称")
+    private String deviceName;
+
+    /**
+     * 数据来源
+     */
+    @ExcelProperty(value = "数据来源")
+    private String dataSource;
+
+    /**
+     * 内容
+     */
+    @ExcelProperty(value = "内容")
+    private String content;
+
+    /**
+     * 设备类型
+     */
+    @ExcelProperty(value = "设备类型")
+    private Long deviceType;
+
+    /**
+     * 经度
+     */
+    @ExcelProperty(value = "经度")
+    private Long longitude;
+
+    /**
+     * 纬度
+     */
+    @ExcelProperty(value = "纬度")
+    private Long latitude;
+
+    /**
+     * 报警位置
+     */
+    @ExcelProperty(value = "报警位置")
+    private String location;
+
+    /**
+     * 报警开始时间
+     */
+    @ExcelProperty(value = "报警开始时间")
+    private Date startTime;
+
+    /**
+     * 报警结束时间
+     */
+    @ExcelProperty(value = "报警结束时间")
+    private Date finishTime;
+
+    /**
+     * 报警持续时间
+     */
+    @ExcelProperty(value = "报警持续时间")
+    private Date durationTime;
+
+    /**
+     * 0已处理，1未处理
+     */
+    @ExcelProperty(value = "0已处理，1未处理")
+    private Long treatmentState;
+
+
+}

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

@@ -0,0 +1,15 @@
+package com.fuyuanshen.equipment.mapper;
+
+import com.fuyuanshen.equipment.domain.DeviceAlarm;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 设备告警Mapper接口
+ *
+ * @author Lion Li
+ * @date 2025-08-28
+ */
+public interface DeviceAlarmMapper extends BaseMapperPlus<DeviceAlarm, DeviceAlarmVo> {
+
+}

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

@@ -0,0 +1,68 @@
+package com.fuyuanshen.equipment.service;
+
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 设备告警Service接口
+ *
+ * @author Lion Li
+ * @date 2025-08-28
+ */
+public interface IDeviceAlarmService {
+
+    /**
+     * 查询设备告警
+     *
+     * @param id 主键
+     * @return 设备告警
+     */
+    DeviceAlarmVo queryById(Long id);
+
+    /**
+     * 分页查询设备告警列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备告警分页列表
+     */
+    TableDataInfo<DeviceAlarmVo> queryPageList(DeviceAlarmBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的设备告警列表
+     *
+     * @param bo 查询条件
+     * @return 设备告警列表
+     */
+    List<DeviceAlarmVo> queryList(DeviceAlarmBo bo);
+
+    /**
+     * 新增设备告警
+     *
+     * @param bo 设备告警
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(DeviceAlarmBo bo);
+
+    /**
+     * 修改设备告警
+     *
+     * @param bo 设备告警
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(DeviceAlarmBo bo);
+
+    /**
+     * 校验并批量删除设备告警信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -0,0 +1,144 @@
+package com.fuyuanshen.equipment.service.impl;
+
+import com.fuyuanshen.common.core.utils.MapstructUtils;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.domain.DeviceAlarm;
+import com.fuyuanshen.equipment.mapper.DeviceAlarmMapper;
+import com.fuyuanshen.equipment.service.IDeviceAlarmService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 设备告警Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2025-08-28
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class DeviceAlarmServiceImpl implements IDeviceAlarmService {
+
+    private final DeviceAlarmMapper baseMapper;
+
+    /**
+     * 查询设备告警
+     *
+     * @param id 主键
+     * @return 设备告警
+     */
+    @Override
+    public DeviceAlarmVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询设备告警列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 设备告警分页列表
+     */
+    @Override
+    public TableDataInfo<DeviceAlarmVo> queryPageList(DeviceAlarmBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<DeviceAlarm> lqw = buildQueryWrapper(bo);
+        Page<DeviceAlarmVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的设备告警列表
+     *
+     * @param bo 查询条件
+     * @return 设备告警列表
+     */
+    @Override
+    public List<DeviceAlarmVo> queryList(DeviceAlarmBo bo) {
+        LambdaQueryWrapper<DeviceAlarm> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<DeviceAlarm> buildQueryWrapper(DeviceAlarmBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<DeviceAlarm> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(DeviceAlarm::getId);
+        lqw.eq(bo.getDeviceId() != null, DeviceAlarm::getDeviceId, bo.getDeviceId());
+        lqw.eq(StringUtils.isNotBlank(bo.getDeviceAction()), DeviceAlarm::getDeviceAction, bo.getDeviceAction());
+        lqw.like(StringUtils.isNotBlank(bo.getDeviceName()), DeviceAlarm::getDeviceName, bo.getDeviceName());
+        lqw.eq(StringUtils.isNotBlank(bo.getDataSource()), DeviceAlarm::getDataSource, bo.getDataSource());
+        lqw.eq(StringUtils.isNotBlank(bo.getContent()), DeviceAlarm::getContent, bo.getContent());
+        lqw.eq(bo.getDeviceType() != null, DeviceAlarm::getDeviceType, bo.getDeviceType());
+        lqw.eq(bo.getLongitude() != null, DeviceAlarm::getLongitude, bo.getLongitude());
+        lqw.eq(bo.getLatitude() != null, DeviceAlarm::getLatitude, bo.getLatitude());
+        lqw.eq(StringUtils.isNotBlank(bo.getLocation()), DeviceAlarm::getLocation, bo.getLocation());
+        lqw.eq(bo.getStartTime() != null, DeviceAlarm::getStartTime, bo.getStartTime());
+        lqw.eq(bo.getFinishTime() != null, DeviceAlarm::getFinishTime, bo.getFinishTime());
+        lqw.eq(bo.getDurationTime() != null, DeviceAlarm::getDurationTime, bo.getDurationTime());
+        lqw.eq(bo.getTreatmentState() != null, DeviceAlarm::getTreatmentState, bo.getTreatmentState());
+        return lqw;
+    }
+
+    /**
+     * 新增设备告警
+     *
+     * @param bo 设备告警
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(DeviceAlarmBo bo) {
+        DeviceAlarm add = MapstructUtils.convert(bo, DeviceAlarm.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改设备告警
+     *
+     * @param bo 设备告警
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(DeviceAlarmBo bo) {
+        DeviceAlarm update = MapstructUtils.convert(bo, DeviceAlarm.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(DeviceAlarm entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除设备告警信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fuyuanshen.equipment.mapper.DeviceAlarmMapper">
+
+</mapper>