导出围栏进出记录列表

Reviewed-on: #10

fys-admin/src/main/java/com/fuyuanshen/app/controller/AppDeviceShareController.java

@@ -5,6 +5,7 @@ import cn.hutool.core.util.RandomUtil;
 import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
 import com.fuyuanshen.app.domain.vo.AppDeviceShareDetailVo;
 import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
+import com.fuyuanshen.app.service.AppDeviceShareService;
 import com.fuyuanshen.app.service.IAppDeviceShareService;
 import com.fuyuanshen.common.core.constant.Constants;
 import com.fuyuanshen.common.core.domain.R;
@@ -45,7 +46,7 @@ public class AppDeviceShareController extends BaseController {
 
     private final IAppDeviceShareService deviceShareService;
 
-    private final DeviceShareService appDeviceShareService;
+    private final AppDeviceShareService appDeviceShareService;
 
     /**
      * 分享管理列表

fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceHBYController.java

@@ -0,0 +1,119 @@
+package com.fuyuanshen.app.controller.device;
+
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.web.service.device.DeviceBJQBizService;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * HBY210设备控制类
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/hby/device")
+public class AppDeviceHBYController extends BaseController {
+
+    private final DeviceBJQBizService appDeviceService;
+
+    /**
+     * 获取设备详细信息
+     *
+     * @param id 主键
+     */
+    @GetMapping("/{id}")
+    public R<AppDeviceDetailVo> getInfo(@NotNull(message = "主键不能为空")
+                                             @PathVariable Long id) {
+        return R.ok(appDeviceService.getInfo(id));
+    }
+
+    /**
+     * 人员信息登记
+     */
+    @PostMapping(value = "/registerPersonInfo")
+//    @FunctionAccessAnnotation("registerPersonInfo")
+    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
+        return toAjax(appDeviceService.registerPersonInfo(bo));
+    }
+
+    /**
+     * 发送信息
+     */
+    @PostMapping(value = "/sendMessage")
+    @FunctionAccessBatcAnnotation(value = "sendMessage", timeOut = 30, batchMaxTimeOut = 40)
+    public R<Void> sendMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendMessage(bo));
+    }
+
+    /**
+     * 发送报警信息
+     */
+    @PostMapping(value = "/sendAlarmMessage")
+    @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
+    public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendAlarmMessage(bo));
+    }
+
+    /**
+     * 上传设备logo图片
+     */
+    @PostMapping("/uploadLogo")
+    @FunctionAccessAnnotation("uploadLogo")
+    public R<Void> upload(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
+
+        MultipartFile file = bo.getFile();
+        if(file.getSize()>1024*1024*2){
+            return R.warn("图片不能大于2M");
+        }
+        appDeviceService.uploadDeviceLogo(bo);
+
+        return R.ok();
+    }
+
+    /**
+     * 灯光模式
+     * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）
+     */
+//    @FunctionAccessAnnotation("lightModeSettings")
+    @PostMapping("/lightModeSettings")
+    public R<Void> lightModeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.lightModeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 灯光亮度设置
+     *
+     */
+//    @FunctionAccessAnnotation("lightBrightnessSettings")
+    @PostMapping("/lightBrightnessSettings")
+    public R<Void> lightBrightnessSettings(@RequestBody DeviceInstructDto params) {
+        appDeviceService.lightBrightnessSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 激光模式设置
+     *
+     */
+    @PostMapping("/laserModeSettings")
+//    @FunctionAccessAnnotation("laserModeSettings")
+    public R<Void> laserModeSettings(@RequestBody DeviceInstructDto params) {
+        appDeviceService.laserModeSettings(params);
+        return R.ok();
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/app/controller/device/AppDeviceXinghanController.java

@@ -0,0 +1,115 @@
+package com.fuyuanshen.app.controller.device;
+
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.web.service.device.DeviceBJQBizService;
+import com.fuyuanshen.web.service.device.DeviceXinghanBizService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * HBY670设备控制类
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/xinghan/device")
+public class AppDeviceXinghanController extends BaseController {
+
+    private final DeviceXinghanBizService appDeviceService;
+    /**
+     * 人员信息登记
+     */
+    @Log(title = "xinghan指令-人员信息登记")
+    @PostMapping(value = "/registerPersonInfo")
+//    @FunctionAccessAnnotation("registerPersonInfo")
+    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
+        return toAjax(appDeviceService.registerPersonInfo(bo));
+    }
+
+    /**
+     * 发送紧急通知
+     */
+    @Log(title = "xinghan指令-发送紧急通知")
+    @PostMapping(value = "/sendAlarmMessage")
+    @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
+    public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendAlarmMessage(bo));
+    }
+
+    /**
+     * 上传设备logo图片
+     */
+    @Log(title = "xinghan指令-上传设备logo图片")
+    @PostMapping("/uploadLogo")
+    @FunctionAccessAnnotation("uploadLogo")
+    public R<Void> upload(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
+
+        MultipartFile file = bo.getFile();
+        if(file.getSize()>1024*1024*2){
+            return R.warn("图片不能大于2M");
+        }
+        appDeviceService.uploadDeviceLogo(bo);
+
+        return R.ok();
+    }
+
+    /**
+     * 静电预警档位
+     * 3,2,1,0,分别表示高档/中档/低挡/关闭
+     */
+    @Log(title = "xinghan指令-静电预警档位")
+    @PostMapping("/DetectGradeSettings")
+    public R<Void> DetectGradeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upDetectGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 照明档位
+     * 照明档位，2,1,0,分别表示弱光/强光/关闭
+     */
+    @Log(title = "xinghan指令-照明档位")
+    @PostMapping("/LightGradeSettings")
+    public R<Void> LightGradeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upLightGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * SOS档位s
+     * SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
+     */
+    @Log(title = "xinghan指令-SOS档位s")
+    @PostMapping("/SOSGradeSettings")
+    public R<Void> SOSGradeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upSOSGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 静止报警状态
+     * 静止报警状态，0-未静止报警，1-正在静止报警。
+     */
+    @Log(title = "xinghan指令-静止报警状态")
+    @PostMapping("/ShakeBitSettings")
+    public R<Void> ShakeBitSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upShakeBitSettings(params);
+        return R.ok();
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/app/controller/device/TestController.java

@@ -0,0 +1,47 @@
+package com.fuyuanshen.app.controller.device;
+
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.web.service.device.DeviceBJQBizService;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * BJQ6170设备控制类
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/test")
+public class TestController extends BaseController {
+
+    private final DeviceBJQBizService appDeviceService;
+
+    /**
+     * 上传设备logo图片
+     */
+    @PostMapping("/uploadLogo")
+    @FunctionAccessAnnotation("uploadLogo")
+    public R<Void> upload(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
+
+        MultipartFile file = bo.getFile();
+        if(file.getSize()>1024*1024*2){
+            return R.warn("图片不能大于2M");
+        }
+        appDeviceService.uploadDeviceLogo2(bo);
+
+        return R.ok();
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppDeviceLogoUploadDto.java

@@ -14,4 +14,5 @@ public class AppDeviceLogoUploadDto {
      */
     private MultipartFile file;
 
+    private Integer chunkSize;
 }

fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppFileDto.java

@@ -18,4 +18,9 @@ public class AppFileDto {
      */
     private MultipartFile[] files;
 
+    /**
+     * 多设备id
+     */
+    private Long[] deviceIds;
+
 }

fys-admin/src/main/java/com/fuyuanshen/app/domain/dto/AppRealTimeStatusDto.java

@@ -14,7 +14,7 @@ public class AppRealTimeStatusDto {
     private String deviceImei;
 
     /**
-     * 设备类型
+     * 获取实时状态类型：FunctionAccessBatchStatusRule 批量 ，FunctionAccessStatusRule 单个
      */
     private String typeName;
 

fys-admin/src/main/java/com/fuyuanshen/app/service/AppDeviceShareService.java

@@ -0,0 +1,262 @@
+package com.fuyuanshen.app.service;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.app.domain.AppDeviceShare;
+import com.fuyuanshen.app.domain.AppPersonnelInfo;
+import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
+import com.fuyuanshen.app.domain.vo.AppDeviceShareDetailVo;
+import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
+import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.exception.ServiceException;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceType;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+
+@RequiredArgsConstructor
+@Slf4j
+@Service
+public class AppDeviceShareService {
+
+    private final AppDeviceShareMapper appDeviceShareMapper;
+
+    private final DeviceMapper deviceMapper;
+
+    private final DeviceTypeMapper deviceTypeMapper;
+
+    private final AppPersonnelInfoMapper appPersonnelInfoMapper;
+
+    public TableDataInfo<AppDeviceShareVo> queryPageList(AppDeviceShareBo bo, PageQuery pageQuery) {
+        Long userId = AppLoginHelper.getUserId();
+        bo.setCreateBy(userId);
+        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<AppDeviceShareVo> result = appDeviceShareMapper.selectAppDeviceShareList(bo, page);
+        List<AppDeviceShareVo> records = result.getRecords();
+        records.forEach(AppDeviceShareService::buildDeviceStatus);
+        return TableDataInfo.build(result);
+    }
+
+    public TableDataInfo<AppDeviceShareVo> queryWebPageList(AppDeviceShareBo bo, PageQuery pageQuery) {
+//        Long userId = AppLoginHelper.getUserId();
+//        bo.setCreateBy(userId);
+        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<AppDeviceShareVo> result = appDeviceShareMapper.selectWebDeviceShareList(bo, page);
+        List<AppDeviceShareVo> records = result.getRecords();
+        records.forEach(AppDeviceShareService::buildDeviceStatus);
+        return TableDataInfo.build(result);
+    }
+
+    private static void buildDeviceStatus(AppDeviceShareVo item) {
+        // 设备在线状态
+        String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+        if (StringUtils.isNotBlank(onlineStatus)) {
+
+            item.setOnlineStatus(1);
+        } else {
+            item.setOnlineStatus(0);
+        }
+        String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX);
+        // 获取电量
+        if (StringUtils.isNotBlank(deviceStatus)) {
+            JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+            item.setBattery(jsonObject.getString("batteryPercentage"));
+        } else {
+            item.setBattery("0");
+        }
+
+        String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_LOCATION_KEY_PREFIX);
+        if (StringUtils.isNotBlank(location)) {
+            JSONObject jsonObject = JSONObject.parseObject(location);
+            item.setLatitude(jsonObject.getString("latitude"));
+            item.setLongitude(jsonObject.getString("longitude"));
+        }
+
+        String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX);
+        if (StringUtils.isNotBlank(alarmStatus)) {
+            item.setAlarmStatus(alarmStatus);
+        }
+    }
+
+    public AppDeviceShareDetailVo getInfo(Long id) {
+
+        LambdaQueryWrapper<AppDeviceShare> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AppDeviceShare::getId, id);
+        List<AppDeviceShareVo> appDeviceShareVos = appDeviceShareMapper.selectVoList(queryWrapper);
+        if (appDeviceShareVos == null || appDeviceShareVos.isEmpty()) {
+            return null;
+        }
+
+        AppDeviceShareVo shareVo = appDeviceShareVos.get(0);
+        AppDeviceShareDetailVo shareDetailVo = new AppDeviceShareDetailVo();
+        shareDetailVo.setId(shareVo.getId());
+        shareDetailVo.setDeviceId(shareVo.getDeviceId());
+        shareDetailVo.setPhonenumber(shareVo.getPhonenumber());
+        shareDetailVo.setPermission(shareVo.getPermission());
+
+        Device device = deviceMapper.selectById(shareVo.getDeviceId());
+        shareDetailVo.setDeviceName(device.getDeviceName());
+        shareDetailVo.setDeviceImei(device.getDeviceImei());
+        shareDetailVo.setDeviceMac(device.getDeviceMac());
+
+        DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
+        if (deviceType != null) {
+            shareDetailVo.setCommunicationMode(Integer.valueOf(deviceType.getCommunicationMode()));
+        }
+        shareDetailVo.setDevicePic(device.getDevicePic());
+        shareDetailVo.setTypeName(deviceType.getTypeName());
+        shareDetailVo.setBluetoothName(device.getBluetoothName());
+        shareDetailVo.setDeviceStatus(device.getDeviceStatus());
+        shareDetailVo.setSendMsg(device.getSendMsg());
+
+        LambdaQueryWrapper<AppPersonnelInfo> qw = new LambdaQueryWrapper<>();
+        qw.eq(AppPersonnelInfo::getDeviceId, device.getId());
+        List<AppPersonnelInfoVo> appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw);
+        if (appPersonnelInfoVos != null && !appPersonnelInfoVos.isEmpty()) {
+            shareDetailVo.setPersonnelInfo(appPersonnelInfoVos.get(0));
+        }
+        // 设备在线状态
+        String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+        if (StringUtils.isNotBlank(onlineStatus)) {
+            shareDetailVo.setOnlineStatus(1);
+        } else {
+            shareDetailVo.setOnlineStatus(0);
+        }
+        String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX);
+        // 获取电量
+        if (StringUtils.isNotBlank(deviceStatus)) {
+            JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+            shareDetailVo.setMainLightMode(jsonObject.getString("mainLightMode"));
+            shareDetailVo.setLaserLightMode(jsonObject.getString("laserLightMode"));
+            shareDetailVo.setBatteryPercentage(jsonObject.getString("batteryPercentage"));
+            shareDetailVo.setChargeState(jsonObject.getString("chargeState"));
+            shareDetailVo.setBatteryRemainingTime(jsonObject.getString("batteryRemainingTime"));
+        } else {
+            shareDetailVo.setBatteryPercentage("0");
+        }
+
+        // 获取经度纬度
+        String locationKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX;
+        String locationInfo = RedisUtils.getCacheObject(locationKey);
+        if (StringUtils.isNotBlank(locationInfo)) {
+            JSONObject jsonObject = JSONObject.parseObject(locationInfo);
+            shareDetailVo.setLongitude(jsonObject.get("longitude").toString());
+            shareDetailVo.setLatitude(jsonObject.get("latitude").toString());
+            shareDetailVo.setAddress((String) jsonObject.get("address"));
+        }
+
+
+        String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX);
+        if (StringUtils.isNotBlank(alarmStatus)) {
+            shareDetailVo.setAlarmStatus(alarmStatus);
+        }
+
+        String lightBrightness = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX);
+        if (StringUtils.isNotBlank(lightBrightness)) {
+            shareDetailVo.setLightBrightness(lightBrightness);
+        }
+
+        return shareDetailVo;
+    }
+
+    /**
+     * 校验短信验证码
+     */
+    private boolean validateSmsCode(String tenantId, String phonenumber, String smsCode) {
+        String code = RedisUtils.getCacheObject(GlobalConstants.DEVICE_SHARE_CODES_KEY + phonenumber);
+        if (StringUtils.isBlank(code)) {
+            throw new ServiceException("验证码失效");
+        }
+        return code.equals(smsCode);
+    }
+
+    public int deviceShare(AppDeviceShareBo bo) {
+        boolean flag = validateSmsCode(AppLoginHelper.getTenantId(), bo.getPhonenumber(), bo.getSmsCode());
+        if (!flag) {
+            throw new ServiceException("验证码错误");
+        }
+
+        Device device = deviceMapper.selectById(bo.getDeviceId());
+        if (device == null) {
+            throw new ServiceException("设备不存在");
+        }
+        Long userId = AppLoginHelper.getUserId();
+        LambdaQueryWrapper<AppDeviceShare> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AppDeviceShare::getDeviceId, bo.getDeviceId());
+        lqw.eq(AppDeviceShare::getPhonenumber, bo.getPhonenumber());
+        Long count = appDeviceShareMapper.selectCount(lqw);
+        if (count > 0) {
+
+            UpdateWrapper<AppDeviceShare> uw = new UpdateWrapper<>();
+            uw.eq("device_id", bo.getDeviceId());
+            uw.eq("phonenumber", bo.getPhonenumber());
+            uw.set("permission", bo.getPermission());
+            uw.set("update_by", userId);
+            uw.set("update_time", new Date());
+
+            return appDeviceShareMapper.update(uw);
+        } else {
+            AppDeviceShare appDeviceShare = new AppDeviceShare();
+            appDeviceShare.setDeviceId(bo.getDeviceId());
+            appDeviceShare.setPhonenumber(bo.getPhonenumber());
+            appDeviceShare.setPermission(bo.getPermission());
+            appDeviceShare.setCreateBy(userId);
+            return appDeviceShareMapper.insert(appDeviceShare);
+        }
+    }
+
+    public int remove(Long[] ids) {
+        return appDeviceShareMapper.deleteByIds(Arrays.asList(ids));
+    }
+
+    public TableDataInfo<AppDeviceShareVo> otherDeviceShareList(AppDeviceShareBo bo, PageQuery pageQuery) {
+        String username = AppLoginHelper.getUsername();
+        bo.setPhonenumber(username);
+        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        IPage<AppDeviceShareVo> result = appDeviceShareMapper.otherDeviceShareList(bo, page);
+        List<AppDeviceShareVo> records = result.getRecords();
+
+        records.forEach(AppDeviceShareService::buildDeviceStatus);
+        return TableDataInfo.build(result);
+    }
+
+
+    /**
+     * 查询设备分享列表(web)
+     *
+     * @param bo
+     * @param pageQuery
+     * @return
+     */
+    public TableDataInfo<AppDeviceShareVo> queryWebList(AppDeviceShareBo bo, PageQuery pageQuery) {
+        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<AppDeviceShareVo> result = appDeviceShareMapper.selectWebDeviceShareList(bo, page);
+        List<AppDeviceShareVo> records = result.getRecords();
+        records.forEach(AppDeviceShareService::buildDeviceStatus);
+        return TableDataInfo.build(result);
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/base/MqttXinghanCommandType.java

@@ -13,8 +13,17 @@ public final class MqttXinghanCommandType {
     private MqttXinghanCommandType() {}
 
     public enum XinghanCommandTypeEnum {
+        /**
+         * 星汉设备主动上报数据
+         */
         GRADE_INFO(101),
+        /**
+         * 星汉开机LOGO
+         */
         PIC_TRANS(102),
+        /**
+         * 星汉设备发送消息 (XingHan send msg)
+         */
         TEX_TRANS(103),
         BREAK_NEWS(104),
         UNKNOWN(0);

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/base/MqttXinghanJson.java

@@ -20,37 +20,37 @@ public class MqttXinghanJson {
      * 第三键值对，SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
      */
     @JsonProperty("sta_SOSGrade")
-    public int staSOSGrade;
+    public Integer staSOSGrade;
     /**
      * 第四键值对，剩余照明时间，0-5999，单位分钟。
      */
     @JsonProperty("sta_PowerTime")
-    public int staPowerTime;
+    public Integer staPowerTime;
     /**
      * 第五键值对，剩余电量百分比，0-100
      */
     @JsonProperty("sta_PowerPercent")
-    public int staPowerPercent;
+    public Integer staPowerPercent;
     /**
      * 第六键值对, 近电预警级别, 0-无预警，1-弱预警，2-中预警，3-强预警，4-非常强预警。
      */
     @JsonProperty("sta_DetectResult")
-    public int staDetectResult;
+    public Integer staDetectResult;
     /**
      * 第七键值对, 静止报警状态，0-未静止报警，1-正在静止报警。
      */
     @JsonProperty("staShakeBit")
-    public int sta_ShakeBit;
+    public Integer sta_ShakeBit;
     /**
      * 第八键值对, 4G信号强度，0-32，数值越大，信号越强。
      */
     @JsonProperty("sta_4gSinal")
-    public int sta4gSinal;
+    public Integer sta4gSinal;
     /**
      * 第九键值对，IMIE卡号
      */
     @JsonProperty("sta_imei")
-    public int staimei;
+    public String staimei;
     /**
      * 第十键值对，经度
      */

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/DeviceRedisKeyConstants.java

@@ -47,4 +47,9 @@ public class DeviceRedisKeyConstants {
      * 告警
      */
     public static final String DEVICE_ALARM_KEY_PREFIX = ":alarm";
+
+    /**
+     * 告警信息
+     */
+    public static final String DEVICE_ALARM_MESSAGE_KEY_PREFIX = ":alarmMessage";
 }

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/constants/XingHanCommandTypeConstants.java

@@ -13,4 +13,8 @@ public class XingHanCommandTypeConstants {
      * 星汉设备发送消息 (XingHan send msg)
      */
     public static final String XingHan_ESEND_MSG = "Light_103";
+    /**
+     * 星汉设备发送紧急通知 (XingHan break news)
+     */
+    public static final String XingHan_BREAK_NEWS = "Light_104";
 }

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/listener/RedisKeyExpirationListener.java

@@ -1,23 +1,44 @@
 package com.fuyuanshen.global.mqtt.listener;
 
+import cn.hutool.core.thread.ThreadUtil;
+import com.baomidou.lock.LockInfo;
+import com.baomidou.lock.LockTemplate;
+import com.baomidou.lock.executor.RedissonLockExecutor;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.connection.Message;
 import org.springframework.data.redis.connection.MessageListener;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Component;
 
 import java.time.Duration;
-import java.util.HashMap;
-import java.util.Map;
 
 import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
 import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_TIMEOUT_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX;
 
 @Component
 @Slf4j
 public class RedisKeyExpirationListener implements MessageListener {
 
+    @Autowired
+    @Qualifier("threadPoolTaskExecutor")
+    private ThreadPoolTaskExecutor threadPoolTaskExecutor;
+
+    @Autowired
+    private DeviceMapper deviceMapper;
+
+    @Autowired
+    private LockTemplate lockTemplate;
+
     @Override
     public void onMessage(Message message, byte[] pattern) {
         String expiredKey = new String(message.getBody());
@@ -26,8 +47,44 @@ public class RedisKeyExpirationListener implements MessageListener {
             String element = expiredKey.substring(FUNCTION_ACCESS_KEY.length());
             handleFunctionAccessExpired(element);
         }
-    }
+        if(expiredKey.endsWith(DEVICE_ONLINE_STATUS_KEY_PREFIX)) {
+//            threadPoolTaskExecutor.execute(() -> {
+//                log.info("设备离线：{}", expiredKey);
+//                String element = expiredKey.substring(GlobalConstants.GLOBAL_REDIS_KEY.length() + DEVICE_KEY_PREFIX.length(), expiredKey.length() - DEVICE_ONLINE_STATUS_KEY_PREFIX.length());
+//                UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
+//                deviceUpdateWrapper.eq("device_imei", element);
+//                deviceUpdateWrapper.set("online_status", 0);
+//                deviceMapper.update(deviceUpdateWrapper);
+//            });
 
+            threadPoolTaskExecutor.execute(() -> {
+                log.info("设备离线：{}", expiredKey);
+                String element = expiredKey.substring(GlobalConstants.GLOBAL_REDIS_KEY.length() + DEVICE_KEY_PREFIX.length(), expiredKey.length() - DEVICE_ONLINE_STATUS_KEY_PREFIX.length());
+
+                // 构造设备锁键
+                String deviceLockKey = GlobalConstants.GLOBAL_REDIS_KEY + ":device_lock:" + element;
+
+                // 尝试获取Redis锁
+                LockInfo lockInfo = lockTemplate.lock(deviceLockKey, 30000L, 5000L, RedissonLockExecutor.class); // 30秒过期
+
+                if (lockInfo != null) {
+                    try {
+                        UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
+                        deviceUpdateWrapper.eq("device_imei", element);
+                        deviceUpdateWrapper.set("online_status", 0);
+                        deviceMapper.update(deviceUpdateWrapper);
+                    } finally {
+                        //释放锁
+                        lockTemplate.releaseLock(lockInfo);
+                    }
+                } else {
+                    log.warn("无法获取设备锁，跳过设备离线处理: {}", element);
+                }
+            });
+        }
+
+
+    }
     /**
      * 访问key过期事件
      * @param element 批次ID

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/receiver/ReceiverMessageHandler.java

@@ -10,6 +10,7 @@ import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
 import com.fuyuanshen.global.mqtt.base.MqttRuleEngine;
 import com.fuyuanshen.global.mqtt.base.MqttXinghanCommandType;
 import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.queue.MqttMessageQueueConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.Message;
@@ -51,6 +52,9 @@ public class ReceiverMessageHandler implements MessageHandler {
             //在线状态
             String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
             RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(62));
+//            String queueKey = MqttMessageQueueConstants.MQTT_MESSAGE_QUEUE_KEY;
+//            String dedupKey = MqttMessageQueueConstants.MQTT_MESSAGE_DEDUP_KEY;
+//            RedisUtils.offerDeduplicated(queueKey,dedupKey,deviceImei, Duration.ofHours(24));
         }
 
         String state = payloadDict.getStr("state");

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLaserModeSettingsRule.java

@@ -15,8 +15,7 @@ import org.springframework.stereotype.Component;
 import java.time.Duration;
 
 import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_LIGHT_MODE_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
 
 /**
  * 灯光模式订阅设备回传消息
@@ -37,14 +36,10 @@ public class BjqLaserModeSettingsRule implements MqttMessageRule {
         try {
             Object[] convertArr = context.getConvertArr();
 
-            String mainLightMode = convertArr[1].toString();
-            if(StringUtils.isNotBlank(mainLightMode)){
-                if("0".equals(mainLightMode)){
-                    String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ context.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
-                    RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "0", Duration.ofSeconds(60*15));
-                }
+            String mode = convertArr[1].toString();
+            if(StringUtils.isNotBlank(mode)){
                 // 发送设备状态和位置信息到Redis
-                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),mainLightMode);
+                syncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),mode);
             }
 
             RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(30));
@@ -65,7 +60,7 @@ public class BjqLaserModeSettingsRule implements MqttMessageRule {
 //        });
         try {
             // 将设备状态信息存储到Redis中
-            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_LIGHT_MODE_KEY_PREFIX;
+            String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_LASER_MODE_KEY_PREFIX;
 
             // 存储到Redis
             RedisUtils.setCacheObject(deviceRedisKey, convertValue.toString());

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/bjq/BjqLocationDataRule.java

@@ -117,28 +117,28 @@ public class BjqLocationDataRule implements MqttMessageRule {
                 if(StringUtils.isBlank(latitude) || StringUtils.isBlank(longitude)){
                     return;
                 }
-                String[] latArr = latitude.split("\\.");
-                String[] lonArr = longitude.split("\\.");
-                // 将位置信息存储到Redis中
+//                String[] latArr = latitude.split("\\.");
+//                String[] lonArr = longitude.split("\\.");
+//                // 将位置信息存储到Redis中
                 String redisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+  deviceImei + DEVICE_LOCATION_KEY_PREFIX;
-                String redisObj = RedisUtils.getCacheObject(redisKey);
-                JSONObject jsonOBj = JSONObject.parseObject(redisObj);
-                if(jsonOBj != null){
-                    String str1 = latArr[0] +"."+ latArr[1].substring(0,4);
-                    String str2 = lonArr[0] +"."+ lonArr[1].substring(0,4);
-
-                    String cacheLatitude = jsonOBj.getString("wgs84_latitude");
-                    String cacheLongitude = jsonOBj.getString("wgs84_longitude");
-                    String[] latArr1 = cacheLatitude.split("\\.");
-                    String[] lonArr1 = cacheLongitude.split("\\.");
-
-                    String cacheStr1 = latArr1[0] +"."+ latArr1[1].substring(0,4);
-                    String cacheStr2 = lonArr1[0] +"."+ lonArr1[1].substring(0,4);
-                    if(str1.equals(cacheStr1) && str2.equals(cacheStr2)){
-                        log.info("位置信息未发生变化: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
-                        return;
-                    }
-                }
+//                String redisObj = RedisUtils.getCacheObject(redisKey);
+//                JSONObject jsonOBj = JSONObject.parseObject(redisObj);
+//                if(jsonOBj != null){
+//                    String str1 = latArr[0] +"."+ latArr[1].substring(0,4);
+//                    String str2 = lonArr[0] +"."+ lonArr[1].substring(0,4);
+//
+//                    String cacheLatitude = jsonOBj.getString("wgs84_latitude");
+//                    String cacheLongitude = jsonOBj.getString("wgs84_longitude");
+//                    String[] latArr1 = cacheLatitude.split("\\.");
+//                    String[] lonArr1 = cacheLongitude.split("\\.");
+//
+//                    String cacheStr1 = latArr1[0] +"."+ latArr1[1].substring(0,4);
+//                    String cacheStr2 = lonArr1[0] +"."+ lonArr1[1].substring(0,4);
+//                    if(str1.equals(cacheStr1) && str2.equals(cacheStr2)){
+//                        log.info("位置信息未发生变化: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
+//                        return;
+//                    }
+//                }
 
                 // 构造位置信息对象
                 Map<String, Object> locationInfo = new LinkedHashMap<>();

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanBootLogoRule.java

@@ -0,0 +1,155 @@
+package com.fuyuanshen.global.mqtt.rule.xinghan;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.constants.MqttConstants;
+import com.fuyuanshen.global.mqtt.constants.XingHanCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.zip.CRC32;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_BOOT_LOGO_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 星汉设备开机 LOGO 下发规则：
+ * <p>
+ * 1. 设备上行 sta_PicTarns=great!  => 仅标记成功<br>
+ * 2. 设备上行 sta_PicTarns=数字   => 下发第 N 块数据（256B/块，带 CRC32）
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class XinghanBootLogoRule implements MqttMessageRule {
+
+    private final MqttGateway mqttGateway;
+    private final ObjectMapper objectMapper;
+
+    @Override
+    public String getCommandType() {
+        return XingHanCommandTypeConstants.XingHan_BOOT_LOGO;
+    }
+
+    @Override
+    public void execute(MqttRuleContext ctx) {
+        final String functionAccessKey = FUNCTION_ACCESS_KEY + "LOGO:" + ctx.getDeviceImei();
+        try {
+            MqttXinghanLogoJson payload = objectMapper.convertValue(
+                    ctx.getPayloadDict(), MqttXinghanLogoJson.class);
+
+            String respText = payload.getStaPicTrans();
+            log.warn("设备上报LOGO：{}", respText);
+
+            // 1. great! —— 成功标记
+            if ("great!".equalsIgnoreCase(respText)) {
+                RedisUtils.setCacheObject(functionAccessKey,
+                        FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+                log.info("设备 {} 开机 LOGO 写入成功", ctx.getDeviceImei());
+                return;
+            }
+
+            // 2. 数字 —— 下发数据块
+            int blockIndex;
+            try {
+                blockIndex = Integer.parseInt(respText);
+            } catch (NumberFormatException ex) {
+                log.warn("设备 {} LOGO 上报非法块号：{}", ctx.getDeviceImei(), respText);
+                return;
+            }
+            String hexImage = RedisUtils.getCacheObject(
+                    GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + ctx.getDeviceImei() + DEVICE_BOOT_LOGO_KEY_PREFIX);
+            if (StringUtils.isEmpty(hexImage)) {
+                return;
+            }
+
+            byte[] fullBin = ImageToCArrayConverter.convertStringToByteArray(hexImage);
+            byte[] chunk = ImageToCArrayConverter.getChunk(fullBin, blockIndex - 1, CHUNK_SIZE);
+            log.info("设备 {} 第 {} 块数据长度: {} bytes", ctx.getDeviceImei(), blockIndex, chunk.length);
+
+            // 组装下发数据
+            ArrayList<Integer> dataFrame = new ArrayList<>();
+            dataFrame.add(blockIndex);                                // 块号
+            ImageToCArrayConverter.buildArr(convertHexToDecimal(chunk), dataFrame);
+            dataFrame.addAll(crc32AsList(chunk));                     // CRC32
+
+            Map<String, Object> pub = new HashMap<>();
+            pub.put("ins_PicTrans", dataFrame);
+
+            String topic = MqttConstants.GLOBAL_PUB_KEY + ctx.getDeviceImei();
+            String json = JsonUtils.toJsonString(pub);
+            mqttGateway.sendMsgToMqtt(topic, 1, json);
+
+            log.info("下发开机 LOGO 数据 => topic:{}, payload:{}", topic, json);
+
+        } catch (Exception e) {
+            log.error("处理设备 {} 开机 LOGO 失败", ctx.getDeviceImei(), e);
+            RedisUtils.setCacheObject(functionAccessKey,
+                    FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+
+    /* ---------- 内部工具 ---------- */
+
+    private static final int CHUNK_SIZE = 256;
+
+    /**
+     * 计算数据的CRC32校验值，并将结果转换为整数列表
+     *
+     * @param data 需要计算CRC32校验值的字节数组
+     * @return 包含CRC32校验值的整数列表，每个字节对应一个无符号整数
+     */
+    private static ArrayList<Integer> crc32AsList(byte[] data) {
+        // 计算CRC32校验值
+        CRC32 crc = new CRC32();
+        crc.update(data);
+
+        // 将CRC32值转换为字节数组
+        byte[] crcBytes = ByteBuffer.allocate(4)
+                .order(ByteOrder.BIG_ENDIAN)
+                .putInt((int) crc.getValue())
+                .array();
+
+        // 将字节数组转换为无符号整数列表
+        ArrayList<Integer> list = new ArrayList<>(4);
+        for (byte b : crcBytes) {
+            list.add(Byte.toUnsignedInt(b));
+        }
+        return list;
+    }
+
+
+    /* ---------- DTO ---------- */
+
+    @Data
+    private static class MqttXinghanLogoJson {
+        /**
+         * 设备上行：
+         * 数字  -> 请求对应块号
+         * great! -> 写入成功
+         */
+        @JsonProperty("sta_PicTrans")
+        private String staPicTrans;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanDeviceDataRule.java

@@ -14,11 +14,13 @@ import com.fuyuanshen.global.mqtt.base.MqttXinghanJson;
 import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
 import com.fuyuanshen.global.mqtt.constants.XingHanCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -58,6 +60,7 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
 
     @Override
     public void execute(MqttRuleContext context) {
+        String functionAccess = FUNCTION_ACCESS_KEY + "DATA:" + context.getDeviceImei();
         try {
             // Latitude, longitude
             //主灯档位,激光灯档位,电量百分比,充电状态,电池剩余续航时间
@@ -65,8 +68,10 @@ public class XinghanDeviceDataRule implements MqttMessageRule {
 
             // 发送设备状态和位置信息到Redis
             asyncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),deviceStatus);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
         } catch (Exception e) {
             log.error("处理上报数据命令时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
         }
     }
 

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendAlarmMessageRule.java

@@ -0,0 +1,118 @@
+package com.fuyuanshen.global.mqtt.rule.xinghan;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.MqttConstants;
+import com.fuyuanshen.global.mqtt.constants.XingHanCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.Charset;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_ALARM_MESSAGE_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 星汉设备发送紧急通知 下发规则：
+ * <p>
+ * 1. 设备上行 sta_BreakNews=cover!  => 仅标记成功<br>
+ * 2. 设备上行 sta_BreakNews=数字   => GBK编码，每行文字为一包，一共4包，第一字节为包序号
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class XinghanSendAlarmMessageRule implements MqttMessageRule {
+
+    private final MqttGateway mqttGateway;
+    private final ObjectMapper objectMapper;
+
+    @Override
+    public String getCommandType() {
+        return XingHanCommandTypeConstants.XingHan_BREAK_NEWS;
+    }
+
+    @Override
+    public void execute(MqttRuleContext ctx) {
+        String functionAccess = FUNCTION_ACCESS_KEY + "ALARM:" + ctx.getDeviceImei();
+        try {
+            XinghanSendAlarmMessageRule.MqttXinghanAlarmMsgJson payload = objectMapper.convertValue(
+                    ctx.getPayloadDict(), XinghanSendAlarmMessageRule.MqttXinghanAlarmMsgJson.class);
+
+            String respText = payload.getStaBreakNews();
+            log.info("设备上报紧急通知握手： {} ", respText);
+
+            // 1. cover! —— 成功标记
+            if ("cover!".equalsIgnoreCase(respText)) {
+                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+                log.info("设备 {} 发送紧急通知完成", ctx.getDeviceImei());
+                return;
+            }
+            // 2. 数字 —— 下发数据块
+            int blockIndex;
+            try {
+                blockIndex = Integer.parseInt(respText);
+            } catch (NumberFormatException ex) {
+                log.warn("设备 {} 紧急通知上报非法块号：{}", ctx.getDeviceImei(), respText);
+                return;
+            }
+            // 将发送的信息原文本以List<String>形式存储在Redis中
+            String data = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + ctx.getDeviceImei() + DEVICE_ALARM_MESSAGE_KEY_PREFIX);
+            if (data == null || data.isEmpty()) {
+                return;
+            }
+            //
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(blockIndex);
+            // 获取块原内容 转成GBK  再转成无符号十进制整数
+            String blockTxt = data.split("\\|")[blockIndex-1];
+            // 再按 GBK 编码把字符串转成字节数组，并逐个转为无符号十进制整数
+            for (byte b : blockTxt.getBytes(GBK)) {
+                intData.add(b & 0xFF);   // b & 0xFF 得到 0~255 的整数
+            }
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("ins_BreakNews", intData);
+
+            String topic = MqttConstants.GLOBAL_PUB_KEY + ctx.getDeviceImei();
+            String json = JsonUtils.toJsonString(map);
+            mqttGateway.sendMsgToMqtt(topic, 1, json);
+            log.info("发送设备紧急通知=>topic:{},payload:{}",
+                    MqttConstants.GLOBAL_PUB_KEY + ctx.getDeviceImei(),
+                    JsonUtils.toJsonString(map));
+
+        } catch (Exception e) {
+            log.error("处理发送设备紧急通知时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+
+    private static final Charset GBK = Charset.forName("GBK");
+
+    /* ---------- DTO ---------- */
+
+    @Data
+    private static class MqttXinghanAlarmMsgJson {
+        /**
+         * 设备上行：
+         * 数字  -> 请求对应块号
+         * cover! -> 写入成功
+         */
+        @JsonProperty("sta_BreakNews")
+        private String staBreakNews;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/rule/xinghan/XinghanSendMsgRule.java

@@ -0,0 +1,118 @@
+package com.fuyuanshen.global.mqtt.rule.xinghan;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.MqttConstants;
+import com.fuyuanshen.global.mqtt.constants.XingHanCommandTypeConstants;
+import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
+import lombok.Data;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.Charset;
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 星汉设备发送消息 下发规则：
+ * <p>
+ * 1. 设备上行 sta_TexTarns=genius!  => 仅标记成功<br>
+ * 2. 设备上行 sta_TexTarns=数字   => GBK编码，每行文字为一包，一共4包，第一字节为包序号
+ */
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class XinghanSendMsgRule implements MqttMessageRule {
+
+    private final MqttGateway mqttGateway;
+    private final ObjectMapper objectMapper;
+
+    @Override
+    public String getCommandType() {
+        return XingHanCommandTypeConstants.XingHan_ESEND_MSG;
+    }
+
+    @Override
+    public void execute(MqttRuleContext ctx) {
+        String functionAccess = FUNCTION_ACCESS_KEY + "MSG:" + ctx.getDeviceImei();
+        try {
+            XinghanSendMsgRule.MqttXinghanMsgJson payload = objectMapper.convertValue(
+                    ctx.getPayloadDict(), XinghanSendMsgRule.MqttXinghanMsgJson.class);
+
+            String respText = payload.getStaTexTrans();
+            log.info("设备上报人员信息： {} ", respText);
+
+            // 1. genius! —— 成功标记
+            if ("genius!".equalsIgnoreCase(respText)) {
+                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
+                log.info("设备 {} 发送消息完成", ctx.getDeviceImei());
+                return;
+            }
+            // 2. 数字 —— 下发数据块
+            int blockIndex;
+            try {
+                blockIndex = Integer.parseInt(respText);
+            } catch (NumberFormatException ex) {
+                log.warn("设备 {} 消息上报非法块号：{}", ctx.getDeviceImei(), respText);
+                return;
+            }
+            // 将发送的信息原文本以List<String>形式存储在Redis中
+            List<String> data = RedisUtils.getCacheList(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + ctx.getDeviceImei() + ":app_send_message_data");
+            if (data.isEmpty()) {
+                return;
+            }
+            //
+            ArrayList<Integer> intData = new ArrayList<>();
+            intData.add(blockIndex);
+            // 获取块原内容 转成GBK  再转成无符号十进制整数
+            String blockTxt = data.get(blockIndex-1);
+            log.warn("设备上报人员登记信息：{}", blockTxt);
+            // 再按 GBK 编码把字符串转成字节数组，并逐个转为无符号十进制整数
+            for (byte b : blockTxt.getBytes(GBK)) {
+                intData.add(b & 0xFF);   // b & 0xFF 得到 0~255 的整数
+            }
+
+            Map<String, Object> map = new HashMap<>();
+            map.put("ins_TexTrans", intData);
+
+            String topic = MqttConstants.GLOBAL_PUB_KEY + ctx.getDeviceImei();
+            String json = JsonUtils.toJsonString(map);
+            mqttGateway.sendMsgToMqtt(topic, 1, json);
+            log.info("发送设备信息数据到设备消息=>topic:{},payload:{}",
+                    MqttConstants.GLOBAL_PUB_KEY + ctx.getDeviceImei(),
+                    JsonUtils.toJsonString(map));
+
+        } catch (Exception e) {
+            log.error("处理发送设备信息时出错", e);
+            RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+        }
+    }
+
+    private static final Charset GBK = Charset.forName("GBK");
+
+    /* ---------- DTO ---------- */
+
+    @Data
+    private static class MqttXinghanMsgJson {
+        /**
+         * 设备上行：
+         * 数字  -> 请求对应块号
+         * genius! -> 写入成功
+         */
+        @JsonProperty("sta_TexTrans")
+        private String staTexTrans;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/queue/MqttMessageConsumer.java

@@ -0,0 +1,110 @@
+package com.fuyuanshen.global.queue;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+@Service
+@Slf4j
+public class MqttMessageConsumer {
+
+    @Autowired
+    private DeviceMapper deviceMapper;
+    
+    // 创建两个线程池：一个用于消息获取，一个用于业务处理
+    private ExecutorService messageConsumerPool = Executors.newFixedThreadPool(3);
+    private ExecutorService messageProcessorPool = Executors.newFixedThreadPool(10);
+
+    // 初始化方法，启动消息监听
+//    @PostConstruct
+    public void start() {
+        log.info("启动MQTT消息消费者...");
+        // 启动消息获取线程
+        for (int i = 0; i < 3; i++) {
+            messageConsumerPool.submit(this::consumeMessages);
+        }
+    }
+
+    // 销毁方法，关闭线程池
+    @PreDestroy
+    public void stop() {
+        log.info("关闭MQTT消息消费者...");
+        shutdownExecutorService(messageConsumerPool);
+        shutdownExecutorService(messageProcessorPool);
+    }
+
+    private void shutdownExecutorService(ExecutorService executorService) {
+        if (executorService != null && !executorService.isShutdown()) {
+            executorService.shutdown();
+            try {
+                if (!executorService.awaitTermination(60, TimeUnit.SECONDS)) {
+                    executorService.shutdownNow();
+                }
+            } catch (InterruptedException e) {
+                executorService.shutdownNow();
+                Thread.currentThread().interrupt();
+            }
+        }
+    }
+
+    // 消费者方法 - 专门负责从队列获取消息
+    public void consumeMessages() {
+        String queueKey = MqttMessageQueueConstants.MQTT_MESSAGE_QUEUE_KEY;
+        String threadName = Thread.currentThread().getName();
+        log.info("消息消费者线程 {} 开始监听队列: {}", threadName, queueKey);
+        
+        try {
+            while (!Thread.currentThread().isInterrupted() && !messageConsumerPool.isShutdown()) {
+                // 阻塞式获取队列中的消息
+                String message = RedisUtils.pollDeduplicated(
+                    queueKey, 
+                    MqttMessageQueueConstants.MQTT_MESSAGE_DEDUP_KEY, 
+                    1, 
+                    TimeUnit.SECONDS
+                );
+                
+                if (message != null) {
+                    log.info("线程 {} 从队列中获取到消息，提交到处理线程池: {}", threadName, message);
+                    // 将消息处理任务提交到处理线程池
+                    messageProcessorPool.submit(() -> processMessage(message));
+                }
+            }
+        } catch (Exception e) {
+            log.error("线程 {} 消费消息时发生错误", threadName, e);
+        }
+        
+        log.info("消息消费者线程 {} 停止监听队列", threadName);
+    }
+
+    // 处理具体业务逻辑的方法
+    private void processMessage(String message) {
+        String threadName = Thread.currentThread().getName();
+        try {
+            log.info("业务处理线程 {} 开始处理消息: {}", threadName, message);
+            
+            // 实现具体的业务逻辑
+            // 例如更新数据库、发送通知等
+            UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("device_imei", message)
+                    .set("online_status", 1);
+            deviceMapper.update(updateWrapper);
+            // 模拟业务处理耗时
+            Thread.sleep(200);
+            
+            log.info("业务处理线程 {} 完成消息处理: {}", threadName, message);
+        } catch (Exception e) {
+            log.error("业务处理线程 {} 处理消息时发生错误: {}", threadName, message, e);
+        }
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/global/queue/MqttMessageQueueConstants.java

@@ -0,0 +1,8 @@
+package com.fuyuanshen.global.queue;
+
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+
+public class MqttMessageQueueConstants {
+    public static final String MQTT_MESSAGE_QUEUE_KEY = GlobalConstants.GLOBAL_REDIS_KEY + "mqtt:message:queue";
+    public static final String MQTT_MESSAGE_DEDUP_KEY = GlobalConstants.GLOBAL_REDIS_KEY + "mqtt:message:dedup";
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceAlarmController.java

@@ -0,0 +1,107 @@
+package com.fuyuanshen.web.controller.device;
+
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.excel.utils.ExcelUtil;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.bo.DeviceAlarmBo;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.service.IDeviceAlarmService;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 设备告警
+ *
+ * @author Lion Li
+ * @date 2025-08-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("api/equipment/alarm")
+public class DeviceAlarmController extends BaseController {
+
+    private final IDeviceAlarmService deviceAlarmService;
+
+
+    /**
+     * 查询设备告警列表
+     */
+    // @SaCheckPermission("equipment:alarm:list")
+    @GetMapping("/list")
+    public TableDataInfo<DeviceAlarmVo> list(DeviceAlarmBo bo, PageQuery pageQuery) {
+        return deviceAlarmService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出设备告警列表
+     */
+    // @SaCheckPermission("equipment:alarm:export")
+    @Log(title = "导出设备告警列表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DeviceAlarmBo bo, HttpServletResponse response) {
+        List<DeviceAlarmVo> list = deviceAlarmService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备告警", DeviceAlarmVo.class, response);
+    }
+
+    /**
+     * 获取设备告警详细信息
+     *
+     * @param id 主键
+     */
+    // @SaCheckPermission("equipment:alarm:query")
+    @GetMapping("/{id}")
+    public R<DeviceAlarmVo> getInfo(@NotNull(message = "主键不能为空")
+                                    @PathVariable Long id) {
+        return R.ok(deviceAlarmService.queryById(id));
+    }
+
+    /**
+     * 新增设备告警
+     */
+    // @SaCheckPermission("equipment:alarm:add")
+    @Log(title = "设备告警", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceAlarmBo bo) {
+        return toAjax(deviceAlarmService.insertByBo(bo));
+    }
+
+    /**
+     * 修改设备告警
+     */
+    // @SaCheckPermission("equipment:alarm:edit")
+    @Log(title = "设备告警", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceAlarmBo bo) {
+        return toAjax(deviceAlarmService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备告警
+     *
+     * @param ids 主键串
+     */
+    // @SaCheckPermission("equipment:alarm:remove")
+    @Log(title = "设备告警", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(deviceAlarmService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceBJQController.java

@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
- * BJQ6170设备控制类
+ * web后台:设备控制类
  */
 @Validated
 @RequiredArgsConstructor

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceChargeDischargeController.java

@@ -0,0 +1,107 @@
+package com.fuyuanshen.web.controller.device;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.excel.utils.ExcelUtil;
+import com.fuyuanshen.equipment.domain.vo.DeviceChargeDischargeVo;
+import com.fuyuanshen.equipment.domain.bo.DeviceChargeDischargeBo;
+import com.fuyuanshen.equipment.service.IDeviceChargeDischargeService;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 设备充放电记录
+ *
+ * @author Lion Li
+ * @date 2025-08-30
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/equipment/chargeDischarge")
+public class DeviceChargeDischargeController extends BaseController {
+
+    private final IDeviceChargeDischargeService deviceChargeDischargeService;
+
+    /**
+     * 查询设备充放电记录列表
+     */
+    // @SaCheckPermission("equipment:chargeDischarge:list")
+    @GetMapping("/list")
+    public TableDataInfo<DeviceChargeDischargeVo> list(DeviceChargeDischargeBo bo, PageQuery pageQuery) {
+        return deviceChargeDischargeService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 设备充放电记录列表
+     */
+    // @SaCheckPermission("equipment:chargeDischarge:export")
+    @Log(title = "设备充放电记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DeviceChargeDischargeBo bo, HttpServletResponse response) {
+        List<DeviceChargeDischargeVo> list = deviceChargeDischargeService.queryList(bo);
+        ExcelUtil.exportExcel(list, "设备充放电记录", DeviceChargeDischargeVo.class, response);
+    }
+
+    /**
+     * 获取设备充放电记录详细信息
+     *
+     * @param id 主键
+     */
+    // @SaCheckPermission("equipment:chargeDischarge:query")
+    @GetMapping("/{id}")
+    public R<DeviceChargeDischargeVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(deviceChargeDischargeService.queryById(id));
+    }
+
+    /**
+     * 新增设备充放电记录
+     */
+    // @SaCheckPermission("equipment:chargeDischarge:add")
+    @Log(title = "设备充放电记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceChargeDischargeBo bo) {
+        return toAjax(deviceChargeDischargeService.insertByBo(bo));
+    }
+
+    /**
+     * 修改设备充放电记录
+     */
+    // @SaCheckPermission("equipment:chargeDischarge:edit")
+    @Log(title = "设备充放电记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceChargeDischargeBo bo) {
+        return toAjax(deviceChargeDischargeService.updateByBo(bo));
+    }
+
+    /**
+     * 删除设备充放电记录
+     *
+     * @param ids 主键串
+     */
+    // @SaCheckPermission("equipment:chargeDischarge:remove")
+    @Log(title = "设备充放电记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(deviceChargeDischargeService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceControlCenterController.java

@@ -1,210 +1,150 @@
 package com.fuyuanshen.web.controller.device;
 
-import io.swagger.v3.oas.annotations.tags.Tag;
+import com.fuyuanshen.app.domain.dto.APPReNameDTO;
+import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
+import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.excel.utils.ExcelUtil;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
+import com.fuyuanshen.equipment.domain.dto.InstructionRecordDto;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.*;
+import com.fuyuanshen.web.service.device.DeviceBizService;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 /**
- * @author: 默苍璃
- * @date: 2025-08-0810:40
+ * web后台:设备控制中心
  */
 @Slf4j
-@Tag(name = "web后台:设备控制中心", description = "web后台:设备控制中心")
 @RestController
 @RequiredArgsConstructor
-@RequestMapping("/api/device/controlCenter")
-public class DeviceControlCenterController {
+@RequestMapping("/api/device")
+public class DeviceControlCenterController  extends BaseController {
+
+    private final DeviceBizService appDeviceService;
+
 
     /**
-     * 获取设备基本信息
-     * @param deviceId 设备ID
-     * @return 设备基本信息
+     * 查询设备列表
      */
-    @GetMapping("/info/{deviceId}")
-    public ResponseEntity<Map<String, Object>> getDeviceInfo(@PathVariable String deviceId) {
-        // 实际应用中这里会从数据库查询设备信息
-        Map<String, Object> deviceInfo = new HashMap<>();
-        deviceInfo.put("deviceName", "6170零零一");
-        deviceInfo.put("deviceModel", "BJQ6170");
-        deviceInfo.put("deviceId", deviceId);
-        deviceInfo.put("status", "在线");
-        deviceInfo.put("batteryLevel", 85);
-
-        return ResponseEntity.ok(deviceInfo);
+    @GetMapping("/list")
+    public TableDataInfo<WebDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {
+        return appDeviceService.queryWebDeviceList(bo, pageQuery);
     }
 
     /**
-     * 设置灯光模式
-     * @param lightModeRequest 灯光模式请求
-     * @return 操作结果
+     * 绑定设备
      */
-    @PostMapping("/light-mode")
-    public ResponseEntity<Map<String, Object>> setLightMode(@RequestBody LightModeRequest lightModeRequest) {
-        // 实际应用中这里会控制设备灯光
-        Map<String, Object> response = new HashMap<>();
-        response.put("code", 200);
-        // response.put("message", "灯光模式已设置为: " + lightModeRequest.getMode());
-        // response.put("deviceId", lightModeRequest.getDeviceId());
-        // response.put("mode", lightModeRequest.getMode());
+    @PostMapping("/bind")
+    public R<Void> bind(@RequestBody AppDeviceBo bo) {
+        return toAjax(appDeviceService.bindDevice(bo));
+    }
 
-        return ResponseEntity.ok(response);
+
+    /**
+     * 解绑设备
+     */
+    @DeleteMapping("/unBind")
+    public R<Void> unBind(Long id) {
+        return toAjax(appDeviceService.unBindDevice(id));
     }
 
     /**
-     * 更新人员信息
-     * @param personInfo 人员信息
-     * @return 操作结果
+     * 查询设备类型列表
      */
-    @PostMapping("/person-info")
-    public ResponseEntity<Map<String, Object>> updatePersonInfo(@RequestBody PersonInfo personInfo) {
-        // 实际应用中这里会更新数据库
-        Map<String, Object> response = new HashMap<>();
-        response.put("code", 200);
-        response.put("message", "人员信息已更新");
-        // response.put("unit", personInfo.getUnit());
-        // response.put("position", personInfo.getPosition());
-
-        return ResponseEntity.ok(response);
+    @GetMapping(value = "/typeList")
+    public R<List<APPDeviceTypeVo>> getTypeList() {
+        List<APPDeviceTypeVo> typeList = appDeviceService.getTypeList();
+        return R.ok(typeList);
     }
 
     /**
-     * 管理开机画面内容
-     * @param bootScreenRequest 开机画面请求
-     * @return 操作结果
+     * 重命名设备
+     *
+     * @param reNameDTO
+     * @return
      */
-    @PostMapping("/boot-screen")
-    public ResponseEntity<Map<String, Object>> manageBootScreen(@RequestBody BootScreenRequest bootScreenRequest) {
-        // 实际应用中这里会更新设备开机画面
-        Map<String, Object> response = new HashMap<>();
-        response.put("code", 200);
-        response.put("message", "开机画面内容已更新");
-        // response.put("deviceId", bootScreenRequest.getDeviceId());
-        // response.put("screens", bootScreenRequest.getScreens());
+    @PostMapping(value = "/reName")
+    public R<String> reName(@Validated @RequestBody APPReNameDTO reNameDTO) {
+        appDeviceService.reName(reNameDTO);
+        return R.ok("重命名成功！！！");
+    }
 
-        return ResponseEntity.ok(response);
+
+    @GetMapping("/realTimeStatus")
+    public R<Map<String, Object>> getRealTimeStatus(AppRealTimeStatusDto statusDto) {
+        Map<String, Object> status = appDeviceService.getRealTimeStatus(statusDto);
+        return R.ok(status);
     }
 
     /**
-     * 设置灯光亮度
-     * @param brightnessRequest 亮度请求
-     * @return 操作结果
+     * 根据mac查询设备信息
      */
-    @PostMapping("/brightness")
-    public ResponseEntity<Map<String, Object>> setBrightness(@RequestBody BrightnessRequest brightnessRequest) {
-        // 实际应用中这里会控制设备亮度
-        Map<String, Object> response = new HashMap<>();
-        response.put("code", 200);
-        // response.put("message", "灯光亮度已设置为: " + brightnessRequest.getBrightness() + "%");
-        // response.put("deviceId", brightnessRequest.getDeviceId());
-        // response.put("brightness", brightnessRequest.getBrightness());
-        // response.put("forceAlarm", brightnessRequest.isForceAlarm());
-
-        return ResponseEntity.ok(response);
+    @GetMapping("/getDeviceInfoByDeviceMac")
+    public R<AppDeviceVo> getDeviceInfo(String deviceMac) {
+        return R.ok(appDeviceService.getDeviceInfo(deviceMac));
     }
 
     /**
-     * 获取设备位置信息
-     * @param deviceId 设备ID
-     * @return 位置信息
+     * 指令下发记录
      */
-    @GetMapping("/location/{deviceId}")
-    public ResponseEntity<Map<String, Object>> getLocation(@PathVariable String deviceId) {
-        // 实际应用中这里会从设备获取实时位置
-        Map<String, Object> locationInfo = new HashMap<>();
-        locationInfo.put("deviceId", deviceId);
-        locationInfo.put("longitude", "114°7'E");
-        locationInfo.put("latitude", "30'28'N");
-        locationInfo.put("address", "湖北省武汉市洪山区光谷大道国际企业中心");
-        locationInfo.put("timestamp", new Date());
-
-        return ResponseEntity.ok(locationInfo);
+    @GetMapping("/instructionRecord")
+    public TableDataInfo<InstructionRecordVo> getInstructionRecord(InstructionRecordDto dto, PageQuery pageQuery) {
+        return appDeviceService.getInstructionRecord(dto,pageQuery);
     }
 
     /**
-     * 发送紧急消息
-     * @param messageRequest 消息请求
-     * @return 操作结果
+     * 导出
      */
-    @PostMapping("/send-message")
-    public ResponseEntity<Map<String, Object>> sendMessage(@RequestBody MessageRequest messageRequest) {
-        // 实际应用中这里会向设备发送消息
-        Map<String, Object> response = new HashMap<>();
-        response.put("code", 200);
-        response.put("message", "消息已发送");
-        // response.put("deviceId", messageRequest.getDeviceId());
-        // response.put("content", messageRequest.getContent());
-        response.put("timestamp", new Date());
+    @GetMapping("/export")
+    public void export(InstructionRecordDto dto, PageQuery pageQuery, HttpServletResponse response) {
+        pageQuery.setPageNum(1);
+        pageQuery.setPageSize(2000);
+        TableDataInfo<InstructionRecordVo> instructionRecord = appDeviceService.getInstructionRecord(dto, pageQuery);
+        if(instructionRecord.getRows() == null){
+            return;
+        }
+        ExcelUtil.exportExcel(instructionRecord.getRows(), "设备操作日志", InstructionRecordVo.class, response);
+    }
 
-        return ResponseEntity.ok(response);
+
+    /**
+     * 历史轨迹查询
+     */
+    @GetMapping("/locationHistory")
+    public TableDataInfo<LocationHistoryVo> getLocationHistory(InstructionRecordDto dto, PageQuery pageQuery) {
+        return appDeviceService.getLocationHistory(dto,pageQuery);
     }
 
     /**
-     * 管理操作视频
-     * @param videoRequest 视频请求
-     * @return 操作结果
+     * 历史轨迹导出
      */
-    @PostMapping("/operation-video")
-    public ResponseEntity<Map<String, Object>> manageOperationVideo(@RequestBody VideoRequest videoRequest) {
-        // 实际应用中这里会更新设备操作视频
-        Map<String, Object> response = new HashMap<>();
-        response.put("code", 200);
-        response.put("message", "操作视频已更新");
-        // response.put("deviceId", videoRequest.getDeviceId());
-        // response.put("videoUrl", videoRequest.getVideoUrl());
-
-        return ResponseEntity.ok(response);
+    @GetMapping("/locationHistoryExport")
+    public void locationHistoryExport(InstructionRecordDto dto, PageQuery pageQuery, HttpServletResponse response) {
+        pageQuery.setPageNum(1);
+        pageQuery.setPageSize(2000);
+        TableDataInfo<LocationHistoryVo> result = appDeviceService.getLocationHistory(dto, pageQuery);
+        if(result.getRows() == null){
+            return;
+        }
+        ExcelUtil.exportExcel(result.getRows(), "历史轨迹记录", LocationHistoryVo.class, response);
     }
 
-    // 请求对象类定义
-    public static class LightModeRequest {
-        private String deviceId;
-        private String mode; // 强光、弱光、爆闪、泛光、激光
-
-        // Getters and Setters
+    /**
+     * 历史轨迹播放
+     */
+    @GetMapping("/getLocationHistoryDetail")
+    public R<List<LocationHistoryDetailVo>> getLocationHistoryDetail(Long id) {
+        return R.ok(appDeviceService.getLocationHistoryDetail(id));
     }
-
-    public static class PersonInfo {
-        private String deviceId;
-        private String unit; // 单位
-        private String position; // 职位
-
-        // Getters and Setters
-    }
-
-    public static class BootScreenRequest {
-        private String deviceId;
-        private List<String> screens; // 产品参数、操作说明等
-
-        // Getters and Setters
-    }
-
-    public static class BrightnessRequest {
-        private String deviceId;
-        private int brightness; // 0-100
-        private boolean forceAlarm; // 强制报警
-
-        // Getters and Setters
-    }
-
-    public static class MessageRequest {
-        private String deviceId;
-        private String content; // 消息内容
-
-        // Getters and Setters
-    }
-
-    public static class VideoRequest {
-        private String deviceId;
-        private String videoUrl; // 视频链接
-
-        // Getters and Setters
-    }
-
 }

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceDebugController.java

@@ -0,0 +1,160 @@
+package com.fuyuanshen.web.controller.device;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.AppFileDto;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.exception.ServiceException;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import com.fuyuanshen.equipment.domain.vo.WebDeviceVo;
+import com.fuyuanshen.web.domain.Dto.DeviceDebugEditDto;
+import com.fuyuanshen.web.domain.Dto.DeviceDebugLogoUploadDto;
+import com.fuyuanshen.web.domain.vo.DeviceInfoVo;
+import com.fuyuanshen.web.service.device.DeviceBizService;
+import com.fuyuanshen.web.service.device.DeviceDebugService;
+import com.fuyuanshen.web.service.device.DeviceXinghanBizService;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 联调中心
+ *
+ * @author Lion Li
+ * @date 2025-08-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("api/device/debug")
+public class DeviceDebugController extends BaseController {
+
+    private final DeviceBizService appDeviceService;
+    private final DeviceXinghanBizService deviceXinghanBizService;
+    private final DeviceDebugService deviceDebugService;
+
+    /**
+     * 查询设备列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo<WebDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {
+        return appDeviceService.queryWebDeviceList(bo, pageQuery);
+    }
+
+    /**
+     * 上传文件
+     */
+    @Log(title = "批量上传文件")
+    @PostMapping("/addFile")
+    public R<Void> uploadFile(@Validated @ModelAttribute AppFileDto bo) throws IOException {
+        return toAjax(deviceDebugService.addFileHash(bo));
+    }
+
+    /**
+     * 操作视频添加
+     */
+    @Log(title = "批量添加操作视频")
+    @PostMapping("/addVideo")
+    public R<Void> addOperationVideo(@RequestBody AppOperationVideoBo bo) {
+        return toAjax(deviceDebugService.addVideoList(bo));
+    }
+
+    /**
+     * 上传设备logo图片
+     */
+    @Log(title = "批量上传设备logo图片")
+    @PostMapping("/addLogo")
+    @FunctionAccessAnnotation("uploadLogo")
+    public R<Void> uploadLogo670(@Validated @ModelAttribute DeviceDebugLogoUploadDto bo) {
+
+        MultipartFile file = bo.getFile();
+        if(file.getSize()>1024*1024*2){
+            return R.warn("图片不能大于2M");
+        }
+        deviceXinghanBizService.uploadDeviceLogoBatch(bo);
+        return R.ok();
+    }
+
+    /**
+     * 设备详情
+     */
+    @Operation(summary = "设备详情")
+    @GetMapping(value = "/detail/{id}")
+    public R<DeviceInfoVo> getDeviceInfo(@PathVariable Long id) {
+        return R.ok(deviceDebugService.getDeviceInfo(id));
+    }
+
+    /**
+     * 修改设备联调信息
+     */
+    @Log(title = "修改设备联调信息")
+    @PostMapping("/editDebug")
+    public R<Void> editDeviceDebug(@Validated @ModelAttribute DeviceDebugEditDto bo) throws Exception {
+        // 1. 基础参数必填校验
+        validateDeviceDebugEdit(bo);
+
+        // 修改上传设备说明
+        if (bo.getExplanationFiles() != null) {
+            AppFileDto appFileDto = new AppFileDto();
+            appFileDto.setDeviceIds(new Long[]{ bo.getDeviceId() });
+            appFileDto.setFileType(1L);
+            appFileDto.setFiles(bo.getExplanationFiles());
+            deviceDebugService.addFileHash(appFileDto);
+        }
+        // 修改上传设备参数
+        if (bo.getParameterFiles() != null) {
+            AppFileDto appFileDto = new AppFileDto();
+            appFileDto.setDeviceIds(new Long[]{ bo.getDeviceId() });
+            appFileDto.setFileType(2L);
+            appFileDto.setFiles(bo.getParameterFiles());
+            deviceDebugService.addFileHash(appFileDto);
+        }
+        // 修改操作视频
+        if (bo.getVideoUrl().isEmpty()) {
+            AppOperationVideoBo appOperationVideoBo = new AppOperationVideoBo();
+            appOperationVideoBo.setDeviceIds(new Long[]{ bo.getDeviceId() });
+            appOperationVideoBo.setVideoUrl(bo.getVideoUrl());
+            deviceDebugService.addVideoList(appOperationVideoBo);
+        }
+        // 修改设备logo  每个型号设备走不同协议无法共用同一个上传
+//        if(bo.getLogoFile() != null){
+//            MultipartFile file = bo.getLogoFile();
+//            if(file.getSize()>1024*1024*2){
+//                return R.warn("图片不能大于2M");
+//            }
+//            AppDeviceLogoUploadDto bo1 = new AppDeviceLogoUploadDto();
+//            bo1.setDeviceId(bo.getDeviceId());
+//            bo1.setDeviceImei(bo.getDeviceImei());
+//            bo1.setFile(file);
+//            deviceXinghanBizService.uploadDeviceLogo(bo1);
+//        }
+
+        return R.ok();
+    }
+
+    /* ------------------ 私有复用 ------------------ */
+
+    private void validateDeviceDebugEdit(DeviceDebugEditDto bo) {
+        if (bo.getDeviceId() == null || bo.getDeviceId() == 0L) {
+            throw new ServiceException("请选择设备");
+        }
+//        if (bo.getDeviceImei().isEmpty()) {
+//            throw new ServiceException("设备 IMEI 不能为空");
+//        }
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceGroupController.java

@@ -1,25 +1,27 @@
 package com.fuyuanshen.web.controller.device;
 
-import java.util.List;
-
-import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
-import com.fuyuanshen.common.log.annotation.Log;
-import com.fuyuanshen.common.web.core.BaseController;
 import com.fuyuanshen.common.core.domain.R;
 import com.fuyuanshen.common.core.validate.AddGroup;
 import com.fuyuanshen.common.core.validate.EditGroup;
-import com.fuyuanshen.common.log.enums.BusinessType;
 import com.fuyuanshen.common.excel.utils.ExcelUtil;
-import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.web.core.BaseController;
 import com.fuyuanshen.equipment.domain.bo.DeviceGroupBo;
+import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo;
 import com.fuyuanshen.equipment.service.IDeviceGroupService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 设备分组
@@ -27,6 +29,7 @@ import com.fuyuanshen.equipment.service.IDeviceGroupService;
  * @author Lion Li
  * @date 2025-08-08
  */
+@Tag(name = "web:设备分组", description = "web:设备分组")
 @Validated
 @RequiredArgsConstructor
 @RestController
@@ -39,6 +42,7 @@ public class DeviceGroupController extends BaseController {
     /**
      * 查询设备分组列表
      */
+    @Operation(summary = "查询设备分组列表")
     @SaCheckPermission("fys-equipment:group:list")
     @GetMapping("/list")
     public R<List<DeviceGroupVo>> list(DeviceGroupBo bo) {
@@ -47,6 +51,24 @@ public class DeviceGroupController extends BaseController {
     }
 
 
+    /**
+     * 查询设备分组列表(分页)
+     */
+    @Operation(summary = "查询设备分组列表(分页)")
+    @SaCheckPermission("fys-equipment:group:list")
+    @GetMapping("/listPage")
+    public TableDataInfo<DeviceGroupVo> listPage(DeviceGroupBo bo) {
+        List<DeviceGroupVo> list = deviceGroupService.queryList(bo);
+        // return R.ok(list);
+        return null;
+    }
+
+    // @GetMapping("/list")
+    // public TableDataInfo<DeviceAlarmVo> list(DeviceAlarmBo bo, PageQuery pageQuery) {
+    //     return deviceAlarmService.queryPageList(bo, pageQuery);
+    // }
+
+
     /**
      * 导出设备分组列表
      */
@@ -64,6 +86,7 @@ public class DeviceGroupController extends BaseController {
      *
      * @param id 主键
      */
+    @Operation(summary = "获取设备分组详细信息")
     @SaCheckPermission("fys-equipment:group:query")
     @GetMapping("/{id}")
     public R<DeviceGroupVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
@@ -74,6 +97,7 @@ public class DeviceGroupController extends BaseController {
     /**
      * 新增设备分组
      */
+    @Operation(summary = "新增设备分组")
     @SaCheckPermission("fys-equipment:group:add")
     @Log(title = "设备分组", businessType = BusinessType.INSERT)
     @RepeatSubmit()
@@ -86,6 +110,7 @@ public class DeviceGroupController extends BaseController {
     /**
      * 修改设备分组
      */
+    @Operation(summary = "修改设备分组")
     @SaCheckPermission("fys-equipment:group:edit")
     @Log(title = "设备分组", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
@@ -99,11 +124,43 @@ public class DeviceGroupController extends BaseController {
      *
      * @param ids 主键串
      */
+    @Operation(summary = "删除设备分组")
     @SaCheckPermission("fys-equipment:group:remove")
     @Log(title = "设备分组", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
-    public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
+    public R<Void> remove(@NotNull(message = "主键不能为空") @PathVariable Long[] ids) {
         return toAjax(deviceGroupService.deleteWithValidByIds(List.of(ids), true));
     }
 
+
+    /**
+     * 绑定设备分组
+     *
+     * @param groupId  分组id
+     * @param deviceId 设备id
+     */
+    @Operation(summary = "绑定设备分组")
+    // @SaCheckPermission("fys-equipment:group:remove")
+    @Log(title = "绑定设备分组", businessType = BusinessType.DELETE)
+    @GetMapping("/groupId/{groupId}/{deviceId}")
+    public R<Void> bindingDevice(@NotNull(message = "分组id 不能为空") @PathVariable Long groupId,
+                                 @NotNull(message = "设备id 不能为空") @PathVariable Long[] deviceId) {
+        return toAjax(deviceGroupService.bindingDevice(groupId, deviceId));
+    }
+
+
+    /**
+     * 解绑设备分组
+     *
+     * @param deviceId 设备id
+     */
+    @Operation(summary = "解绑设备分组")
+    // @SaCheckPermission("fys-equipment:group:remove")
+    @Log(title = "解绑设备分组", businessType = BusinessType.DELETE)
+    @GetMapping("/groupUnbind/{deviceId}")
+    public R<Void> groupUnbind(@NotNull(message = "设备id 不能为空") @PathVariable Long[] deviceId) {
+        return toAjax(deviceGroupService.groupUnbind(deviceId));
+    }
+
+
 }

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceShareController.java

@@ -0,0 +1,105 @@
+package com.fuyuanshen.web.controller.device;
+
+import cn.dev33.satoken.annotation.SaIgnore;
+import cn.hutool.core.util.RandomUtil;
+import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
+import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
+import com.fuyuanshen.common.core.constant.Constants;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.ratelimiter.annotation.RateLimiter;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.web.service.DeviceShareService;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotEmpty;
+import lombok.RequiredArgsConstructor;
+import org.dromara.sms4j.api.SmsBlend;
+import org.dromara.sms4j.api.entity.SmsResponse;
+import org.dromara.sms4j.core.factory.SmsFactory;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.Duration;
+import java.util.LinkedHashMap;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.DEVICE_SHARE_CODES_KEY;
+
+/**
+ * 设备分享管理
+ *
+ * @author Lion Li
+ * @date 2025-08-28
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("api/equipment/share")
+public class DeviceShareController extends BaseController {
+
+    private final DeviceShareService deviceShareService;
+
+
+    /**
+     * 分享管理列表
+     */
+    @GetMapping("/deviceShareList")
+    public TableDataInfo<AppDeviceShareVo> list(AppDeviceShareBo bo, PageQuery pageQuery) {
+        return deviceShareService.queryWebPageList(bo, pageQuery);
+    }
+
+
+    /**
+     * 新增设备分享
+     */
+    @RepeatSubmit()
+    @PostMapping("/deviceShare")
+    public R<Void> deviceShare(@Validated(AddGroup.class) @RequestBody AppDeviceShareBo bo) {
+        return toAjax(deviceShareService.deviceShare(bo));
+    }
+
+    /**
+     * 权限管理
+     */
+    @RepeatSubmit()
+    @PostMapping("/permission")
+    public R<Void> permission(@Validated(AddGroup.class) @RequestBody AppDeviceShareBo bo) {
+        return toAjax(deviceShareService.permission(bo));
+    }
+
+    /**
+     * 移除分享用户
+     *
+     * @param ids 主键串
+     */
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(deviceShareService.remove(ids));
+    }
+
+    /**
+     * 短信验证码
+     *
+     * @param phonenumber 用户手机号
+     */
+    @SaIgnore
+    @RateLimiter(key = "#phonenumber", time = 60, count = 1)
+    @GetMapping("/sms/code")
+    public R<Void> smsCode(@NotBlank(message = "{user.phonenumber.not.blank}") String phonenumber) {
+        String key = DEVICE_SHARE_CODES_KEY + phonenumber;
+        String code = RandomUtil.randomNumbers(4);
+        RedisUtils.setCacheObject(key, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
+        LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
+        map.put("code", code);
+        SmsBlend smsBlend = SmsFactory.getSmsBlend("config1");
+        SmsResponse smsResponse = smsBlend.sendMessage(phonenumber, map);
+        if (!smsResponse.isSuccess()) {
+            return R.fail(smsResponse.getData().toString());
+        }
+        return R.ok();
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/DeviceXinghanController.java

@@ -0,0 +1,106 @@
+package com.fuyuanshen.web.controller.device;
+
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.web.service.device.DeviceXinghanBizService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 设备控制类  HBY670
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/xinghan/device")
+public class DeviceXinghanController extends BaseController {
+
+    private final DeviceXinghanBizService deviceXinghanBizService;
+
+    /**
+     * 人员信息登记
+     */
+    @PostMapping(value = "/registerPersonInfo")
+//    @FunctionAccessAnnotation("registerPersonInfo")
+    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
+        return toAjax(deviceXinghanBizService.registerPersonInfo(bo));
+    }
+
+    /**
+     * 发送紧急通知
+     */
+    @PostMapping(value = "/sendAlarmMessage")
+    @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
+    public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(deviceXinghanBizService.sendAlarmMessage(bo));
+    }
+
+    /**
+     * 上传设备logo图片
+     */
+    @PostMapping("/uploadLogo")
+    @FunctionAccessAnnotation("uploadLogo")
+    public R<Void> upload(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
+
+        MultipartFile file = bo.getFile();
+        if(file.getSize()>1024*1024*2){
+            return R.warn("图片不能大于2M");
+        }
+        deviceXinghanBizService.uploadDeviceLogo(bo);
+
+        return R.ok();
+    }
+
+    /**
+     * 静电预警档位
+     * 3,2,1,0,分别表示高档/中档/低挡/关闭
+     */
+    @PostMapping("/DetectGradeSettings")
+    public R<Void> DetectGradeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        deviceXinghanBizService.upDetectGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 照明档位
+     * 照明档位，2,1,0,分别表示弱光/强光/关闭
+     */
+    @PostMapping("/LightGradeSettings")
+    public R<Void> LightGradeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        deviceXinghanBizService.upLightGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * SOS档位
+     * SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
+     */
+    @PostMapping("/SOSGradeSettings")
+    public R<Void> SOSGradeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        deviceXinghanBizService.upSOSGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 静止报警状态
+     * 静止报警状态，0-未静止报警，1-正在静止报警。
+     */
+    @PostMapping("/ShakeBitSettings")
+    public R<Void> ShakeBitSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        deviceXinghanBizService.upShakeBitSettings(params);
+        return R.ok();
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/HomePageController.java

@@ -0,0 +1,75 @@
+package com.fuyuanshen.web.controller.device;
+
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.equipment.domain.vo.AlarmInformationVo;
+import com.fuyuanshen.equipment.domain.vo.DataOverviewVo;
+import com.fuyuanshen.equipment.domain.vo.EquipmentClassificationVo;
+import com.fuyuanshen.equipment.service.DeviceService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+/**
+ * 首页数据
+ *
+ * @author: 默苍璃
+ * @date: 2025-09-0113:46
+ */
+@Tag(name = "首页数据", description = "首页数据")
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/device/homepage")
+public class HomePageController {
+
+    private final DeviceService deviceService;
+
+
+    /**
+     * 获取 数据总览
+     * DataOverview
+     */
+    @GetMapping("/getDataOverview")
+    public R<DataOverviewVo> getDataOverview() {
+        return R.ok(deviceService.getDataOverview());
+    }
+
+
+    /**
+     * 获取 设备分类
+     * DataOverview
+     */
+    @GetMapping("/getEquipmentClassification")
+    public R<EquipmentClassificationVo> getEquipmentClassification() {
+        return R.ok(deviceService.getEquipmentClassification());
+    }
+
+
+    /**
+     * 获取 报警信息
+     * DataOverview
+     */
+    @GetMapping("/getAlarmInformation")
+    public R<AlarmInformationVo> getAlarmInformation() {
+        return R.ok(deviceService.getAlarmInformation());
+    }
+
+
+    /**
+     * 获取设备使用数据
+     *
+     * @param deviceTypeId 设备ID (可选)
+     * @param range    时间范围 1:半年 2:一年
+     * @return 每月使用数据列表
+     */
+    @GetMapping("/getEquipmentUsageData/{range}")
+    public R<List<Map<String, Object>>> getEquipmentUsageData(@PathVariable Integer range,
+                                                              @RequestParam(required = false) Long deviceTypeId) {
+        return R.ok(deviceService.getEquipmentUsageData(deviceTypeId, range));
+    }
+
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/WEBDeviceController.java

@@ -1,27 +1,22 @@
 package com.fuyuanshen.web.controller.device;
 
 
-import com.fuyuanshen.app.domain.dto.APPReNameDTO;
-import com.fuyuanshen.app.domain.dto.AppRealTimeStatusDto;
-import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
 import com.fuyuanshen.common.core.domain.R;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.web.core.BaseController;
-import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
-import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
-import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import com.fuyuanshen.equipment.domain.DeviceLog;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.domain.vo.WebDeviceVo;
 import com.fuyuanshen.web.service.WEBDeviceService;
-import com.fuyuanshen.web.service.device.DeviceBizService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description:
@@ -36,7 +31,6 @@ import java.util.Map;
 public class WEBDeviceController extends BaseController {
 
     private final WEBDeviceService deviceService;
-    private final DeviceBizService appDeviceService;
 
 
     /**
@@ -54,65 +48,70 @@ public class WEBDeviceController extends BaseController {
 
 
     /**
-     * 查询设备列表
-     */
-    @GetMapping("/list")
-    public TableDataInfo<AppDeviceVo> list(DeviceQueryCriteria bo, PageQuery pageQuery) {
-        return appDeviceService.queryAppDeviceList(bo, pageQuery);
-    }
-
-    /**
-     * 绑定设备
-     */
-    @PostMapping("/bind")
-    public R<Void> bind(@RequestBody AppDeviceBo bo) {
-        return toAjax(appDeviceService.bindDevice(bo));
-    }
-
-
-    /**
-     * 解绑设备
-     */
-    @DeleteMapping("/unBind")
-    public R<Void> unBind(Long id) {
-        return toAjax(appDeviceService.unBindDevice(id));
-    }
-
-    /**
-     * 查询设备类型列表
-     */
-    @GetMapping(value = "/typeList")
-    public R<List<APPDeviceTypeVo>> getTypeList() {
-        List<APPDeviceTypeVo> typeList = appDeviceService.getTypeList();
-        return R.ok(typeList);
-    }
-
-    /**
-     * 重命名设备
+     * 设备详情
      *
-     * @param reNameDTO
+     * @param id
      * @return
      */
-    @PostMapping(value = "/reName")
-    public R<String> reName(@Validated @RequestBody APPReNameDTO reNameDTO) {
-        appDeviceService.reName(reNameDTO);
-        return R.ok("重命名成功！！！");
+    @Operation(summary = "设备详情")
+    @GetMapping(value = "/pc/detail/{id}")
+    public R<WebDeviceVo> getDeviceDetail(@PathVariable Long id) {
+        WebDeviceVo device = deviceService.getDevice(id);
+        return R.ok(device);
     }
 
 
-    @GetMapping("/realTimeStatus")
-    public R<Map<String, Object>> getRealTimeStatus(AppRealTimeStatusDto statusDto) {
-        Map<String, Object> status = appDeviceService.getRealTimeStatus(statusDto);
-        return R.ok(status);
-    }
-
     /**
-     * 根据mac查询设备信息
+     * 设备用户详情
+     *
+     * @param deviceId
+     * @return
      */
-    @GetMapping("/getDeviceInfoByDeviceMac")
-    public R<AppDeviceVo> getDeviceInfo(String deviceMac) {
-        return R.ok(appDeviceService.getDeviceInfo(deviceMac));
+    @Operation(summary = "设备用户详情")
+    @GetMapping(value = "/getDeviceUser/{deviceId}")
+    public R<List<AppPersonnelInfoRecords>> getDeviceUser(@PathVariable Long deviceId) {
+        List<AppPersonnelInfoRecords> device = deviceService.getDeviceUser(deviceId);
+        return R.ok(device);
     }
+
+
+    /**
+     * 设备操作记录
+     *
+     * @param deviceId
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    @Operation(summary = "设备操作记录")
+    @GetMapping(value = "/getOperationRecord/{deviceId}")
+    public TableDataInfo<DeviceLog> getOperationRecord(@PathVariable Long deviceId,
+                                                 @RequestParam(required = false) String startTime,
+                                                 @RequestParam(required = false) String endTime,
+                                                       PageQuery pageQuery) {
+        TableDataInfo<DeviceLog> device = deviceService.getOperationRecord(deviceId, startTime, endTime,pageQuery);
+        return device;
+    }
+
+
+    /**
+     * 设备告警记录
+     *
+     * @param deviceId
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    @Operation(summary = "设备告警记录")
+    @GetMapping(value = "/getAlarmRecord/{deviceId}")
+    public TableDataInfo<DeviceAlarmVo> getAlarmRecord(@PathVariable Long deviceId,
+                                                       @RequestParam(required = false) String startTime,
+                                                       @RequestParam(required = false) String endTime,
+                                                       PageQuery pageQuery) {
+        return deviceService.getAlarmRecord(deviceId, startTime, endTime, pageQuery);
+    }
+
+
 }
 
 

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceFenceAccessRecordController.java

@@ -0,0 +1,109 @@
+package com.fuyuanshen.web.controller.device.fence;
+
+import java.util.List;
+
+import com.fuyuanshen.equipment.domain.bo.DeviceFenceAccessRecordBo;
+import com.fuyuanshen.equipment.domain.vo.DeviceFenceAccessRecordVo;
+import com.fuyuanshen.equipment.service.IDeviceFenceAccessRecordService;
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.excel.utils.ExcelUtil;
+
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 围栏进出记录
+ *
+ * @author Lion Li
+ * @date 2025-09-11
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/equipment/fenceAccessRecord")
+public class DeviceFenceAccessRecordController extends BaseController {
+
+    private final IDeviceFenceAccessRecordService deviceFenceAccessRecordService;
+
+
+    /**
+     * 查询围栏进出记录列表
+     */
+    @SaCheckPermission("fys-equipment:fenceAccessRecord:list")
+    @GetMapping("/list")
+    public TableDataInfo<DeviceFenceAccessRecordVo> list(DeviceFenceAccessRecordBo bo, PageQuery pageQuery) {
+        return deviceFenceAccessRecordService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出围栏进出记录列表
+     */
+    @SaCheckPermission("fys-equipment:fenceAccessRecord:export")
+    @Log(title = "导出围栏进出记录列表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DeviceFenceAccessRecordBo bo, HttpServletResponse response) {
+        List<DeviceFenceAccessRecordVo> list = deviceFenceAccessRecordService.queryList(bo);
+        ExcelUtil.exportExcel(list, "围栏进出记录", DeviceFenceAccessRecordVo.class, response);
+    }
+
+    /**
+     * 获取围栏进出记录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("fys-equipment:fenceAccessRecord:query")
+    @GetMapping("/{id}")
+    public R<DeviceFenceAccessRecordVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(deviceFenceAccessRecordService.queryById(id));
+    }
+
+    /**
+     * 新增围栏进出记录
+     */
+    @SaCheckPermission("fys-equipment:fenceAccessRecord:add")
+    @Log(title = "围栏进出记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceFenceAccessRecordBo bo) {
+        return toAjax(deviceFenceAccessRecordService.insertByBo(bo));
+    }
+
+    /**
+     * 修改围栏进出记录
+     */
+    @SaCheckPermission("fys-equipment:fenceAccessRecord:edit")
+    @Log(title = "围栏进出记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceFenceAccessRecordBo bo) {
+        return toAjax(deviceFenceAccessRecordService.updateByBo(bo));
+    }
+
+    /**
+     * 删除围栏进出记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("fys-equipment:fenceAccessRecord:remove")
+    @Log(title = "围栏进出记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(deviceFenceAccessRecordService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/fence/DeviceGeoFenceController.java

@@ -0,0 +1,125 @@
+package com.fuyuanshen.web.controller.device.fence;
+
+import java.util.List;
+
+import com.fuyuanshen.equipment.domain.bo.DeviceGeoFenceBo;
+import com.fuyuanshen.equipment.domain.dto.FenceCheckResponse;
+import com.fuyuanshen.equipment.domain.query.FenceCheckRequest;
+import com.fuyuanshen.equipment.domain.vo.DeviceGeoFenceVo;
+import com.fuyuanshen.equipment.service.IDeviceGeoFenceService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.excel.utils.ExcelUtil;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 电子围栏
+ *
+ * @author Lion Li
+ * @date 2025-09-11
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/api/equipment/geoFence")
+public class DeviceGeoFenceController extends BaseController {
+
+    private final IDeviceGeoFenceService deviceGeoFenceService;
+
+
+    /**
+     * 查询电子围栏列表
+     */
+    @SaCheckPermission("fys-equipment:geoFence:list")
+    @GetMapping("/list")
+    public TableDataInfo<DeviceGeoFenceVo> list(DeviceGeoFenceBo bo, PageQuery pageQuery) {
+        return deviceGeoFenceService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出电子围栏列表
+     */
+    @SaCheckPermission("fys-equipment:geoFence:export")
+    @Log(title = "导出电子围栏列表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(DeviceGeoFenceBo bo, HttpServletResponse response) {
+        List<DeviceGeoFenceVo> list = deviceGeoFenceService.queryList(bo);
+        ExcelUtil.exportExcel(list, "电子围栏", DeviceGeoFenceVo.class, response);
+    }
+
+    /**
+     * 获取电子围栏详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("fys-equipment:geoFence:query")
+    @GetMapping("/{id}")
+    public R<DeviceGeoFenceVo> getInfo(@NotNull(message = "主键不能为空")
+                                       @PathVariable Long id) {
+        return R.ok(deviceGeoFenceService.queryById(id));
+    }
+
+    /**
+     * 新增电子围栏
+     */
+    @SaCheckPermission("fys-equipment:geoFence:add")
+    @Log(title = "电子围栏", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceGeoFenceBo bo) {
+        return toAjax(deviceGeoFenceService.insertByBo(bo));
+    }
+
+    /**
+     * 修改电子围栏
+     */
+    @SaCheckPermission("fys-equipment:geoFence:edit")
+    @Log(title = "电子围栏", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceGeoFenceBo bo) {
+        return toAjax(deviceGeoFenceService.updateByBo(bo));
+    }
+
+    /**
+     * 删除电子围栏
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("fys-equipment:geoFence:remove")
+    @Log(title = "电子围栏", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(deviceGeoFenceService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+
+    /**
+     * 电子围栏-位置检查
+     *
+     * @param request
+     * @return
+     */
+    @PostMapping("/check")
+    public ResponseEntity<FenceCheckResponse> checkPosition(
+            @Valid @RequestBody FenceCheckRequest request) {
+        FenceCheckResponse response = deviceGeoFenceService.checkPosition(request);
+        return ResponseEntity.ok(response);
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/domain/Dto/DeviceDebugEditDto.java

@@ -0,0 +1,34 @@
+package com.fuyuanshen.web.domain.Dto;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@Data
+public class DeviceDebugEditDto {
+    /**
+     * 设备主键列表
+     */
+    private Long deviceId;
+    /**
+     * 设备 IMEI
+     */
+    //private String deviceImei;
+    /**
+     * 上传 logo 图片
+     */
+    //private MultipartFile LogoFile;        // 同一张图
+    /**
+     *  参数文件
+     */
+    private MultipartFile[] parameterFiles;
+    /**
+     *  说明文件
+     */
+    private MultipartFile[] explanationFiles;
+    /**
+     * 视频链接
+     */
+    private String videoUrl;
+}

fys-admin/src/main/java/com/fuyuanshen/web/domain/Dto/DeviceDebugLogoUploadDto.java

@@ -0,0 +1,18 @@
+package com.fuyuanshen.web.domain.Dto;
+
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+@Data
+public class DeviceDebugLogoUploadDto {
+    /**
+     * 设备主键列表
+     */
+    private List<Long> deviceIds;      // 设备主键列表
+    /**
+     * 上传 图片
+     */
+    private MultipartFile file;        // 同一张图
+}

fys-admin/src/main/java/com/fuyuanshen/web/domain/vo/DeviceInfoVo.java

@@ -0,0 +1,27 @@
+package com.fuyuanshen.web.domain.vo;
+
+import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
+import com.fuyuanshen.app.domain.vo.AppFileVo;
+import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 设备信息 视图对象
+ *
+ * @author Michelle.Chung
+ */
+@Data
+public class DeviceInfoVo {
+    /**
+     * 设备业务文件
+     */
+    private List<AppFileVo> appBusinessFileVoList;
+    /**
+     * 设备操作视频
+     */
+    private List<AppOperationVideoVo> appOperationVideoVoList;
+}

fys-admin/src/main/java/com/fuyuanshen/web/service/DeviceShareService.java

@@ -2,15 +2,18 @@ package com.fuyuanshen.web.service;
 
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.app.domain.AppDeviceBindRecord;
 import com.fuyuanshen.app.domain.AppDeviceShare;
 import com.fuyuanshen.app.domain.AppPersonnelInfo;
 import com.fuyuanshen.app.domain.bo.AppDeviceShareBo;
 import com.fuyuanshen.app.domain.vo.AppDeviceShareDetailVo;
 import com.fuyuanshen.app.domain.vo.AppDeviceShareVo;
 import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
+import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper;
 import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
 import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
 import com.fuyuanshen.common.core.constant.GlobalConstants;
@@ -43,13 +46,15 @@ import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
 public class DeviceShareService {
 
     private final AppDeviceShareMapper appDeviceShareMapper;
-    
+
     private final DeviceMapper deviceMapper;
 
     private final DeviceTypeMapper deviceTypeMapper;
 
     private final AppPersonnelInfoMapper appPersonnelInfoMapper;
 
+    private final AppDeviceBindRecordMapper appDeviceBindRecordMapper;
+
     public TableDataInfo<AppDeviceShareVo> queryPageList(AppDeviceShareBo bo, PageQuery pageQuery) {
         Long userId = AppLoginHelper.getUserId();
         bo.setCreateBy(userId);
@@ -60,33 +65,43 @@ public class DeviceShareService {
         return TableDataInfo.build(result);
     }
 
+    public TableDataInfo<AppDeviceShareVo> queryWebPageList(AppDeviceShareBo bo, PageQuery pageQuery) {
+//        Long userId = AppLoginHelper.getUserId();
+//        bo.setCreateBy(userId);
+        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<AppDeviceShareVo> result = appDeviceShareMapper.selectWebDeviceShareList(bo, page);
+        List<AppDeviceShareVo> records = result.getRecords();
+        records.forEach(DeviceShareService::buildDeviceStatus);
+        return TableDataInfo.build(result);
+    }
+
     private static void buildDeviceStatus(AppDeviceShareVo item) {
-        //设备在线状态
-        String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
-        if(StringUtils.isNotBlank(onlineStatus)){
+        // 设备在线状态
+        String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+        if (StringUtils.isNotBlank(onlineStatus)) {
 
             item.setOnlineStatus(1);
-        }else{
+        } else {
             item.setOnlineStatus(0);
         }
-        String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX+ item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX);
+        String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX);
         // 获取电量
-        if(StringUtils.isNotBlank(deviceStatus)){
+        if (StringUtils.isNotBlank(deviceStatus)) {
             JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
             item.setBattery(jsonObject.getString("batteryPercentage"));
-        }else{
+        } else {
             item.setBattery("0");
         }
 
-        String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_LOCATION_KEY_PREFIX);
-        if(StringUtils.isNotBlank(location)){
+        String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_LOCATION_KEY_PREFIX);
+        if (StringUtils.isNotBlank(location)) {
             JSONObject jsonObject = JSONObject.parseObject(location);
             item.setLatitude(jsonObject.getString("latitude"));
             item.setLongitude(jsonObject.getString("longitude"));
         }
 
-        String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX);
-        if(StringUtils.isNotBlank(alarmStatus)){
+        String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + item.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX);
+        if (StringUtils.isNotBlank(alarmStatus)) {
             item.setAlarmStatus(alarmStatus);
         }
     }
@@ -96,7 +111,7 @@ public class DeviceShareService {
         LambdaQueryWrapper<AppDeviceShare> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AppDeviceShare::getId, id);
         List<AppDeviceShareVo> appDeviceShareVos = appDeviceShareMapper.selectVoList(queryWrapper);
-        if(appDeviceShareVos==null || appDeviceShareVos.isEmpty()){
+        if (appDeviceShareVos == null || appDeviceShareVos.isEmpty()) {
             return null;
         }
 
@@ -113,7 +128,7 @@ public class DeviceShareService {
         shareDetailVo.setDeviceMac(device.getDeviceMac());
 
         DeviceType deviceType = deviceTypeMapper.selectById(device.getDeviceType());
-        if(deviceType!=null){
+        if (deviceType != null) {
             shareDetailVo.setCommunicationMode(Integer.valueOf(deviceType.getCommunicationMode()));
         }
         shareDetailVo.setDevicePic(device.getDevicePic());
@@ -125,78 +140,88 @@ public class DeviceShareService {
         LambdaQueryWrapper<AppPersonnelInfo> qw = new LambdaQueryWrapper<>();
         qw.eq(AppPersonnelInfo::getDeviceId, device.getId());
         List<AppPersonnelInfoVo> appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw);
-        if(appPersonnelInfoVos!=null && !appPersonnelInfoVos.isEmpty()){
+        if (appPersonnelInfoVos != null && !appPersonnelInfoVos.isEmpty()) {
             shareDetailVo.setPersonnelInfo(appPersonnelInfoVos.get(0));
         }
-      //设备在线状态
-        String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei()+ DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
-        if(StringUtils.isNotBlank(onlineStatus)){
+        // 设备在线状态
+        String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+        if (StringUtils.isNotBlank(onlineStatus)) {
             shareDetailVo.setOnlineStatus(1);
-        }else{
+        } else {
             shareDetailVo.setOnlineStatus(0);
         }
-        String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX);
+        String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX);
         // 获取电量
-        if(StringUtils.isNotBlank(deviceStatus)){
+        if (StringUtils.isNotBlank(deviceStatus)) {
             JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
             shareDetailVo.setMainLightMode(jsonObject.getString("mainLightMode"));
             shareDetailVo.setLaserLightMode(jsonObject.getString("laserLightMode"));
             shareDetailVo.setBatteryPercentage(jsonObject.getString("batteryPercentage"));
             shareDetailVo.setChargeState(jsonObject.getString("chargeState"));
             shareDetailVo.setBatteryRemainingTime(jsonObject.getString("batteryRemainingTime"));
-        }else{
+        } else {
             shareDetailVo.setBatteryPercentage("0");
         }
 
         // 获取经度纬度
-        String locationKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX;
+        String locationKey = GlobalConstants.GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX;
         String locationInfo = RedisUtils.getCacheObject(locationKey);
-        if(StringUtils.isNotBlank(locationInfo)){
+        if (StringUtils.isNotBlank(locationInfo)) {
             JSONObject jsonObject = JSONObject.parseObject(locationInfo);
             shareDetailVo.setLongitude(jsonObject.get("longitude").toString());
             shareDetailVo.setLatitude(jsonObject.get("latitude").toString());
-            shareDetailVo.setAddress((String)jsonObject.get("address"));
+            shareDetailVo.setAddress((String) jsonObject.get("address"));
         }
 
 
-        String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ device.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX);
-        if(StringUtils.isNotBlank(alarmStatus)){
+        String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX);
+        if (StringUtils.isNotBlank(alarmStatus)) {
             shareDetailVo.setAlarmStatus(alarmStatus);
         }
 
-        String lightBrightness = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ device.getDeviceImei()+ DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX);
-        if(StringUtils.isNotBlank(lightBrightness)){
+        String lightBrightness = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + device.getDeviceImei() + DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX);
+        if (StringUtils.isNotBlank(lightBrightness)) {
             shareDetailVo.setLightBrightness(lightBrightness);
         }
 
         return shareDetailVo;
     }
+
     /**
      * 校验短信验证码
      */
-    private boolean validateSmsCode(String tenantId, String phonenumber, String smsCode) {
+    private boolean validateSmsCode(String phonenumber, String smsCode) {
         String code = RedisUtils.getCacheObject(GlobalConstants.DEVICE_SHARE_CODES_KEY + phonenumber);
         if (StringUtils.isBlank(code)) {
             throw new ServiceException("验证码失效");
         }
         return code.equals(smsCode);
     }
+
     public int deviceShare(AppDeviceShareBo bo) {
-        boolean flag = validateSmsCode(AppLoginHelper.getTenantId(), bo.getPhonenumber(), bo.getSmsCode());
-        if(!flag){
+        Device device = deviceMapper.selectById(bo.getDeviceId());
+        if (device == null) {
+            throw new ServiceException("设备不存在");
+        }
+
+        boolean flag = validateSmsCode( bo.getPhonenumber(), bo.getSmsCode());
+        if (!flag) {
             throw new ServiceException("验证码错误");
         }
 
-        Device device = deviceMapper.selectById(bo.getDeviceId());
-        if(device==null){
-            throw new ServiceException("设备不存在");
+        LambdaQueryWrapper<AppDeviceBindRecord> qw = new LambdaQueryWrapper<>();
+        qw.eq(AppDeviceBindRecord::getDeviceId, bo.getDeviceId());
+        AppDeviceBindRecord bindRecord = appDeviceBindRecordMapper.selectOne(qw);
+        if (bindRecord == null) {
+            throw new ServiceException("设备未绑定");
         }
-        Long userId = AppLoginHelper.getUserId();
+        Long userId = bindRecord.getBindingUserId();
+
         LambdaQueryWrapper<AppDeviceShare> lqw = new LambdaQueryWrapper<>();
         lqw.eq(AppDeviceShare::getDeviceId, bo.getDeviceId());
         lqw.eq(AppDeviceShare::getPhonenumber, bo.getPhonenumber());
         Long count = appDeviceShareMapper.selectCount(lqw);
-        if(count>0){
+        if (count > 0) {
 
             UpdateWrapper<AppDeviceShare> uw = new UpdateWrapper<>();
             uw.eq("device_id", bo.getDeviceId());
@@ -206,7 +231,44 @@ public class DeviceShareService {
             uw.set("update_time", new Date());
 
             return appDeviceShareMapper.update(uw);
-        }else {
+        } else {
+            AppDeviceShare appDeviceShare = new AppDeviceShare();
+            appDeviceShare.setDeviceId(bo.getDeviceId());
+            appDeviceShare.setPhonenumber(bo.getPhonenumber());
+            appDeviceShare.setPermission(bo.getPermission());
+            appDeviceShare.setCreateBy(userId);
+            return appDeviceShareMapper.insert(appDeviceShare);
+        }
+    }
+
+    public int permission(AppDeviceShareBo bo) {
+        Device device = deviceMapper.selectById(bo.getDeviceId());
+        if (device == null) {
+            throw new ServiceException("设备不存在");
+        }
+        LambdaQueryWrapper<AppDeviceBindRecord> qw = new LambdaQueryWrapper<>();
+        qw.eq(AppDeviceBindRecord::getDeviceId, bo.getDeviceId());
+        AppDeviceBindRecord bindRecord = appDeviceBindRecordMapper.selectOne(qw);
+        if (bindRecord == null) {
+            throw new ServiceException("设备未绑定");
+        }
+        Long userId = bindRecord.getBindingUserId();
+
+        LambdaQueryWrapper<AppDeviceShare> lqw = new LambdaQueryWrapper<>();
+        lqw.eq(AppDeviceShare::getDeviceId, bo.getDeviceId());
+        lqw.eq(AppDeviceShare::getPhonenumber, bo.getPhonenumber());
+        Long count = appDeviceShareMapper.selectCount(lqw);
+        if (count > 0) {
+
+            UpdateWrapper<AppDeviceShare> uw = new UpdateWrapper<>();
+            uw.eq("device_id", bo.getDeviceId());
+            uw.eq("phonenumber", bo.getPhonenumber());
+            uw.set("permission", bo.getPermission());
+            uw.set("update_by", userId);
+            uw.set("update_time", new Date());
+
+            return appDeviceShareMapper.update(uw);
+        } else {
             AppDeviceShare appDeviceShare = new AppDeviceShare();
             appDeviceShare.setDeviceId(bo.getDeviceId());
             appDeviceShare.setPhonenumber(bo.getPhonenumber());
@@ -232,4 +294,19 @@ public class DeviceShareService {
     }
 
 
+    /**
+     * 查询设备分享列表(web)
+     *
+     * @param bo
+     * @param pageQuery
+     * @return
+     */
+    public TableDataInfo<AppDeviceShareVo> queryWebList(AppDeviceShareBo bo, PageQuery pageQuery) {
+        Page<AppDeviceShareVo> page = new Page<>(pageQuery.getPageNum(), pageQuery.getPageSize());
+        Page<AppDeviceShareVo> result = appDeviceShareMapper.selectWebDeviceShareList(bo, page);
+        List<AppDeviceShareVo> records = result.getRecords();
+        records.forEach(DeviceShareService::buildDeviceStatus);
+        return TableDataInfo.build(result);
+    }
+
 }

fys-admin/src/main/java/com/fuyuanshen/web/service/WEBDeviceService.java

@@ -2,14 +2,18 @@ package com.fuyuanshen.web.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceLog;
 import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
 import com.fuyuanshen.equipment.domain.form.DeviceForm;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
 import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
 import com.fuyuanshen.equipment.domain.vo.CustomerVo;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.domain.vo.WebDeviceVo;
 
 import java.io.IOException;
 import java.util.List;
@@ -29,4 +33,41 @@ public interface WEBDeviceService extends IService<Device> {
      */
     int webUnBindDevice(Long id, Long userId);
 
+    /**
+     * WEB端设备详情
+     *
+     * @param id
+     * @return
+     */
+    WebDeviceVo getDevice(Long id);
+
+    /**
+     * 设备用户详情
+     *
+     * @param id
+     * @return
+     */
+    List<AppPersonnelInfoRecords> getDeviceUser(Long id);
+
+    /**
+     * 设备操作记录
+     *
+     * @param deviceId
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    TableDataInfo<DeviceLog> getOperationRecord(Long deviceId, String startTime, String endTime, PageQuery pageQuery);
+
+
+    /**
+     * 设备告警记录
+     *
+     * @param deviceId
+     * @param startTime 开始时间
+     * @param endTime 结束时间
+     * @return
+     */
+    TableDataInfo<DeviceAlarmVo> getAlarmRecord(Long deviceId, String startTime, String endTime, PageQuery pageQuery);
+
 }

fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBJQBizService.java

@@ -1,16 +1,19 @@
 package com.fuyuanshen.web.service.device;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.fuyuanshen.app.domain.AppPersonnelInfo;
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
 import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
 import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
 import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
 import com.fuyuanshen.app.domain.vo.AppDeviceDetailVo;
 import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
 import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoRecordsMapper;
 import com.fuyuanshen.common.core.constant.GlobalConstants;
 import com.fuyuanshen.common.core.exception.ServiceException;
 import com.fuyuanshen.common.core.utils.*;
@@ -50,6 +53,7 @@ public class DeviceBJQBizService {
 
     private final DeviceMapper deviceMapper;
     private final AppPersonnelInfoMapper appPersonnelInfoMapper;
+    private final AppPersonnelInfoRecordsMapper appPersonnelInfoRecordsMapper;
     private final DeviceTypeMapper deviceTypeMapper;
     private final MqttGateway mqttGateway;
     private final DeviceLogMapper deviceLogMapper;
@@ -96,7 +100,6 @@ public class DeviceBJQBizService {
 
                 UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
                 updateWrapper.eq("id", deviceId)
-                        .eq("binding_user_id", AppLoginHelper.getUserId())
                         .set("send_msg", bo.getSendMsg());
                 deviceMapper.update(updateWrapper);
 
@@ -186,6 +189,22 @@ public class DeviceBJQBizService {
             vo.setBatteryPercentage("0");
         }
 
+        String lightModeStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LIGHT_MODE_KEY_PREFIX);
+        // 获取电量
+        if(StringUtils.isNotBlank(deviceStatus)){
+            vo.setMainLightMode(lightModeStatus);
+        }
+
+        String lightBrightnessStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LIGHT_BRIGHTNESS_KEY_PREFIX);
+        if(StringUtils.isNotBlank(lightBrightnessStatus)){
+            vo.setLightBrightness(lightBrightnessStatus);
+        }
+
+        String laserLightMode = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LASER_MODE_KEY_PREFIX);
+        if(StringUtils.isNotBlank(laserLightMode)){
+            vo.setLaserLightMode(laserLightMode);
+        }
+
         // 获取经度纬度
         String locationKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_LOCATION_KEY_PREFIX;
         String locationInfo = RedisUtils.getCacheObject(locationKey);
@@ -242,11 +261,18 @@ public class DeviceBJQBizService {
         map.put("instruct", intData);
         mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei(), 1, JSON.toJSONString(map));
         log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei(), bo);
-
-        recordDeviceLog(deviceId, deviceObj.getDeviceName(), "人员信息登记", JSON.toJSONString(bo), AppLoginHelper.getUserId());
+        String logContent = "单位："+bo.getUnitName()+",职位："+bo.getPosition()+",姓名："+bo.getName()+",ID："+bo.getCode();
+        recordDeviceLog(deviceId, deviceObj.getDeviceName(), "人员信息登记", logContent, AppLoginHelper.getUserId());
         if (ObjectUtils.length(appPersonnelInfoVos) == 0) {
             AppPersonnelInfo appPersonnelInfo = MapstructUtils.convert(bo, AppPersonnelInfo.class);
-            return appPersonnelInfoMapper.insertOrUpdate(appPersonnelInfo);
+            appPersonnelInfoMapper.insertOrUpdate(appPersonnelInfo);
+
+            AppPersonnelInfoRecords appPersonnelInfoRecords = new AppPersonnelInfoRecords();
+            BeanUtil.copyProperties(appPersonnelInfo, appPersonnelInfoRecords);
+            appPersonnelInfoRecords.setId(null);
+            appPersonnelInfoRecords.setPersonnelId(appPersonnelInfo.getId());
+
+            appPersonnelInfoRecordsMapper.insert(appPersonnelInfoRecords);
         } else {
             UpdateWrapper<AppPersonnelInfo> uw = new UpdateWrapper<>();
             uw.eq("device_id", deviceId)
@@ -254,10 +280,52 @@ public class DeviceBJQBizService {
                     .set("position", bo.getPosition())
                     .set("unit_name", bo.getUnitName())
                     .set("code", bo.getCode());
-            return appPersonnelInfoMapper.update(null, uw) > 0;
+            appPersonnelInfoMapper.update(null, uw);
+
+            AppPersonnelInfoVo personnelInfoVo = appPersonnelInfoVos.get(0);
+            AppPersonnelInfo appPersonnelInfo = MapstructUtils.convert(bo, AppPersonnelInfo.class);
+            AppPersonnelInfoRecords appPersonnelInfoRecords = new AppPersonnelInfoRecords();
+            BeanUtil.copyProperties(appPersonnelInfo, appPersonnelInfoRecords);
+            appPersonnelInfoRecords.setId(null);
+            appPersonnelInfoRecords.setPersonnelId(personnelInfoVo.getId());
+            appPersonnelInfoRecordsMapper.insert(appPersonnelInfoRecords);
+        }
+        return true;
+    }
+    public void uploadDeviceLogo2(AppDeviceLogoUploadDto bo) {
+        try {
+            Device device = deviceMapper.selectById(bo.getDeviceId());
+            if (device == null) {
+                throw new ServiceException("设备不存在");
+            }
+            MultipartFile file = bo.getFile();
+
+            byte[] largeData = ImageToCArrayConverter.convertImageToCArray(file.getInputStream(), 160, 80, 25600);
+
+            log.info("长度：" + largeData.length);
+            // 在获取 largeData 后，将其与前缀合并
+            byte[] prefix = new byte[]{0x50, 0x49, 0x43, 0x54, 0x55, 0x52, 0x45}; // "PICTURE"
+            byte[] combinedData = new byte[prefix.length + largeData.length];
+            System.arraycopy(prefix, 0, combinedData, 0, prefix.length);
+            System.arraycopy(largeData, 0, combinedData, prefix.length, largeData.length);
+
+            // 将 combinedData 转换为十六进制表示
+            String[] hexArray = new String[combinedData.length];
+            for (int i = 0; i < combinedData.length; i++) {
+                hexArray[i] = String.format("0x%02X", combinedData[i]);
+            }
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("instruct", combinedData);
+            String[] specificChunk = ImageToCArrayConverter.getChunk2(hexArray, 0, bo.getChunkSize());
+            mqttGateway.sendMsgToMqtt(MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(), 1 , Arrays.toString(specificChunk));
+            log.info("发送点阵数据到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),Arrays.toString(specificChunk));
+
+            recordDeviceLog(device.getId(), device.getDeviceName(), "上传开机画面", "上传开机画面", AppLoginHelper.getUserId());
+        } catch (Exception e){
+            e.printStackTrace();
+            throw new ServiceException("发送指令失败");
         }
     }
-
     public void uploadDeviceLogo(AppDeviceLogoUploadDto bo) {
         try {
             Device device = deviceMapper.selectById(bo.getDeviceId());
@@ -469,6 +537,6 @@ public class DeviceBJQBizService {
 
     private boolean getDeviceStatus(String deviceImei) {
         String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
-        return StringUtils.isBlank(deviceOnlineStatusRedisKey);
+        return RedisUtils.getCacheObject(deviceOnlineStatusRedisKey) == null;
     }
 }

fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceBizService.java

@@ -1,6 +1,7 @@
 package com.fuyuanshen.web.service.device;
 
 import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -14,7 +15,6 @@ import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
 import com.fuyuanshen.app.domain.vo.AppUserVo;
 import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper;
 import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
-import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
 import com.fuyuanshen.app.mapper.AppUserMapper;
 import com.fuyuanshen.app.mapper.equipment.APPDeviceMapper;
 import com.fuyuanshen.common.core.exception.ServiceException;
@@ -26,14 +26,13 @@ import com.fuyuanshen.common.redis.utils.RedisUtils;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
 import com.fuyuanshen.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
+import com.fuyuanshen.equipment.domain.dto.InstructionRecordDto;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
-import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import com.fuyuanshen.equipment.domain.vo.*;
 import com.fuyuanshen.equipment.enums.BindingStatusEnum;
 import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
 import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
-import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
-import com.fuyuanshen.global.mqtt.config.MqttGateway;
 import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import com.fuyuanshen.web.service.device.status.base.DeviceStatusRule;
 import com.fuyuanshen.web.service.device.status.base.RealTimeStatusEngine;
@@ -41,9 +40,8 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.time.*;
+import java.util.*;
 
 import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
 import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
@@ -123,6 +121,47 @@ public class DeviceBizService {
         return TableDataInfo.build(result);
     }
 
+    public TableDataInfo<WebDeviceVo> queryWebDeviceList(DeviceQueryCriteria bo, PageQuery pageQuery) {
+        Page<WebDeviceVo> result = deviceMapper.queryWebDeviceList(pageQuery.build(), bo);
+        List<WebDeviceVo> records = result.getRecords();
+        if(records != null && !records.isEmpty()){
+            records.forEach(item -> {
+                if(item.getCommunicationMode()!=null && item.getCommunicationMode() == 0){
+
+                    //设备在线状态
+                    String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(onlineStatus)){
+
+                        item.setOnlineStatus(1);
+                    }else{
+                        item.setOnlineStatus(0);
+                    }
+                    String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX+ item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX);
+                    // 获取电量
+                    if(StringUtils.isNotBlank(deviceStatus)){
+                        JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+                        item.setBattery(jsonObject.getString("batteryPercentage"));
+                    }else{
+                        item.setBattery("0");
+                    }
+
+                    String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_LOCATION_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(location)){
+                        JSONObject jsonObject = JSONObject.parseObject(location);
+                        item.setLatitude(jsonObject.getString("latitude"));
+                        item.setLongitude(jsonObject.getString("longitude"));
+                    }
+
+                    String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(alarmStatus)){
+                        item.setAlarmStatus(alarmStatus);
+                    }
+                }
+            });
+        }
+        return TableDataInfo.build(result);
+    }
+
     public int bindDevice(AppDeviceBo bo) {
         Integer mode = bo.getCommunicationMode();
         Long userId = AppLoginHelper.getUserId();
@@ -142,12 +181,14 @@ public class DeviceBizService {
 
             QueryWrapper<AppDeviceBindRecord> bindRecordQueryWrapper = new QueryWrapper<>();
             bindRecordQueryWrapper.eq("device_id", device.getId());
+            bindRecordQueryWrapper.eq("communication_mode", 0);
             AppDeviceBindRecord appDeviceBindRecord = appDeviceBindRecordMapper.selectOne(bindRecordQueryWrapper);
             if (appDeviceBindRecord != null) {
                 UpdateWrapper<AppDeviceBindRecord> deviceUpdateWrapper = new UpdateWrapper<>();
                 deviceUpdateWrapper.eq("device_id", device.getId())
                         .set("binding_status", BindingStatusEnum.BOUND.getCode())
                         .set("binding_user_id", userId)
+                        .set("communication_mode", 0)
                         .set("update_time", new Date())
                         .set("binding_time", new Date());
                 return appDeviceBindRecordMapper.update(null, deviceUpdateWrapper);
@@ -156,6 +197,7 @@ public class DeviceBizService {
                 bindRecord.setDeviceId(device.getId());
                 bindRecord.setBindingUserId(userId);
                 bindRecord.setBindingTime(new Date());
+                bindRecord.setCommunicationMode(0);
                 bindRecord.setCreateBy(userId);
                 appDeviceBindRecordMapper.insert(bindRecord);
             }
@@ -185,6 +227,7 @@ public class DeviceBizService {
                 deviceUpdateWrapper.eq("device_id", device.getId())
                         .eq("binding_user_id", userId)
                         .set("binding_user_id", userId)
+                        .set("communication_mode", 1)
                         .set("binding_time", new Date());
                 return appDeviceBindRecordMapper.update(null, deviceUpdateWrapper);
             } else {
@@ -192,6 +235,7 @@ public class DeviceBizService {
                 bindRecord.setDeviceId(device.getId());
                 bindRecord.setBindingUserId(userId);
                 bindRecord.setBindingTime(new Date());
+                bindRecord.setCommunicationMode(1);
                 bindRecord.setCreateBy(userId);
                 appDeviceBindRecordMapper.insert(bindRecord);
             }
@@ -272,8 +316,8 @@ public class DeviceBizService {
 
     public Map<String, Object> getRealTimeStatus(AppRealTimeStatusDto statusDto) {
         try {
-            String commandType = statusDto.getTypeName()+"_" + statusDto.getFunctionMode();
-            DeviceStatusRule rule  = realTimeStatusEngine.getDeviceStatusRule(commandType);
+//            String commandType = statusDto.getTypeName()+"_" + statusDto.getFunctionMode();"FunctionAccessBatchStatusRule"
+            DeviceStatusRule rule  = realTimeStatusEngine.getDeviceStatusRule(statusDto.getTypeName());
             if(rule == null){
                 throw new ServiceException("未匹配到处理命令");
             }
@@ -290,4 +334,68 @@ public class DeviceBizService {
 //        List<Device> devices = deviceMapper.selectList(queryWrapper);
         return deviceMapper.getDeviceInfo(deviceMac);
     }
+
+    public TableDataInfo<InstructionRecordVo> getInstructionRecord(InstructionRecordDto bo, PageQuery pageQuery) {
+        Page<InstructionRecordVo> result = deviceLogMapper.getInstructionRecord(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
+    public TableDataInfo<LocationHistoryVo> getLocationHistory(InstructionRecordDto bo, PageQuery pageQuery) {
+        Page<LocationHistoryVo> result = deviceMapper.getLocationHistory(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
+
+    public List<LocationHistoryDetailVo> getLocationHistoryDetail(Long id) {
+        Device device = deviceMapper.selectById(id);
+        if (device == null) {
+            throw new ServiceException("设备不存在");
+        }
+
+        // 计算七天前的凌晨时间戳
+        LocalDateTime sevenDaysAgo = LocalDateTime.of(LocalDate.now().minusDays(7), LocalTime.MIDNIGHT);
+        long startTime = sevenDaysAgo.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+        // 计算今天的凌晨时间戳
+        LocalDateTime today = LocalDateTime.of(LocalDate.now(), LocalTime.MAX);
+        long endTime = today.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+
+        String deviceImei = device.getDeviceImei();
+        String a = GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DEVICE_LOCATION_KEY_PREFIX + ":history";
+        Collection<String> list = RedisUtils.zRangeByScore(a, startTime, endTime);
+        if (CollectionUtil.isEmpty(list)) {
+            return null;
+        }
+
+
+        Map<String, List<JSONObject>> map = new LinkedHashMap<>();
+        for (String obj : list){
+            JSONObject jsonObject = JSONObject.parseObject(obj);
+            Long timestamp = jsonObject.getLong("timestamp");
+            LocalDate date = LocalDateTime.ofInstant(Instant.ofEpochMilli(timestamp), ZoneId.systemDefault()).toLocalDate();
+            if (map.containsKey(date.toString())) {
+                map.get(date.toString()).add(jsonObject);
+            } else {
+                ArrayList<JSONObject> jsonList = new ArrayList<>();
+                jsonList.add(jsonObject);
+                map.put(date.toString(), jsonList);
+            }
+        }
+
+        List<LocationHistoryDetailVo> result = new ArrayList<>();
+        for (Map.Entry<String, List<JSONObject>> entry : map.entrySet()) {
+            LocationHistoryDetailVo detailVo = new LocationHistoryDetailVo();
+            detailVo.setDate(entry.getKey());
+            detailVo.setDeviceName(device.getDeviceName());
+            detailVo.setStartLocation(entry.getValue().get(0).getString("address"));
+            detailVo.setEndLocation(entry.getValue().get(entry.getValue().size()-1).getString("address"));
+            String jsonString = JSONArray.toJSONString(entry.getValue());
+            List<Object> strings = JSONArray.parseArray(jsonString);
+            detailVo.setDetailList(strings);
+            result.add(detailVo);
+        }
+
+
+        return result;
+    }
+
 }

fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceDebugService.java

@@ -0,0 +1,150 @@
+package com.fuyuanshen.web.service.device;
+
+import cn.hutool.core.collection.CollUtil;
+import com.fuyuanshen.app.domain.AppBusinessFile;
+import com.fuyuanshen.app.domain.AppOperationVideo;
+import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
+import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
+import com.fuyuanshen.app.domain.dto.AppFileDto;
+import com.fuyuanshen.app.service.IAppBusinessFileService;
+import com.fuyuanshen.app.service.IAppOperationVideoService;
+import com.fuyuanshen.common.core.exception.ServiceException;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.service.DeviceService;
+import com.fuyuanshen.system.domain.vo.SysOssVo;
+import com.fuyuanshen.system.service.ISysOssService;
+import com.fuyuanshen.web.domain.vo.DeviceInfoVo;
+import com.fuyuanshen.web.util.FileHashUtil;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 设备调试服务
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DeviceDebugService {
+    private final ISysOssService sysOssService;
+
+    private final IAppBusinessFileService appBusinessFileService;
+    private final IAppOperationVideoService appOperationVideoService;
+    private final DeviceService deviceService;
+
+    /**
+     * 文件上传并添加文件信息哈希去重
+     * @param bo
+     * @return
+     * @throws IOException
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean addFileHash(AppFileDto bo) throws IOException {
+        MultipartFile[] files = bo.getFiles();
+        if (files == null || files.length == 0) {
+            throw new ServiceException("请选择要上传的文件");
+        }
+        if (files.length > 5) {
+            throw new ServiceException("最多只能上传5个文件");
+        }
+        if (bo.getDeviceIds() == null || bo.getDeviceIds().length == 0) {
+            throw new ServiceException("请选择你要上传的设备");
+        }
+
+        Map<String, Long> hash2OssId = new LinkedHashMap<>(files.length);
+        for (MultipartFile file : files) {
+            // 1. 计算文件哈希
+            String hash = FileHashUtil.hash(file);
+
+            // 2. 先根据 hash 查库（秒传）
+            SysOssVo exist = sysOssService.selectByHash(hash);
+            Long ossId;
+            if (exist != null) {
+                // 2.1 已存在，直接复用
+                ossId = exist.getOssId();
+                hash2OssId.putIfAbsent(hash, ossId);
+            } else {
+                // 2.2 不存在，真正上传
+                SysOssVo upload = sysOssService.upload(file);
+                if (upload == null) {
+                    return false;
+                }
+                ossId = upload.getOssId();
+                hash2OssId.putIfAbsent(hash, ossId);
+                // 2.3 把 hash 写回记录（供下次去重）
+                sysOssService.updateHashById(ossId, hash);
+            }
+        }
+        // 4. 组装业务中间表
+        List<AppBusinessFile> bizList = new ArrayList<>(bo.getDeviceIds().length * hash2OssId.size());
+        Long userId = AppLoginHelper.getUserId();
+        for (Long deviceId : bo.getDeviceIds()) {
+            for (Long ossId : hash2OssId.values()) {
+                // 3. 关联业务表
+                AppBusinessFile appFile = new AppBusinessFile();
+                appFile.setFileId(ossId);
+                appFile.setBusinessId(deviceId);
+                appFile.setFileType(bo.getFileType());
+                appFile.setCreateBy(userId);
+                bizList.add(appFile);
+            }
+        }
+        if (CollUtil.isEmpty(bizList)) {          // 空集合直接返回
+            throw new ServiceException("请选择要上传的文件");
+        }
+        return appBusinessFileService.insertBatch(bizList);
+    }
+
+    public Boolean addVideoList(AppOperationVideoBo bo){
+        if (bo.getVideoUrl().isEmpty()) {
+            throw new ServiceException("请输入视频地址");
+        }
+        if (bo.getDeviceIds() == null || bo.getDeviceIds().length == 0) {
+            throw new ServiceException("请选择你要上传的设备");
+        }
+        List<AppOperationVideo> bizList = new ArrayList<>(bo.getDeviceIds().length);
+        for (Long deviceId : bo.getDeviceIds()) {
+
+            AppOperationVideo appVideo = new AppOperationVideo();
+            appVideo.setVideoName(bo.getVideoName());
+            appVideo.setDeviceId(deviceId);
+            appVideo.setVideoUrl(bo.getVideoUrl());
+            bizList.add(appVideo);
+        }
+        if (CollUtil.isEmpty(bizList)) {          // 空集合直接返回
+            throw new ServiceException("请选择要上传的视频");
+        }
+        return appOperationVideoService.insertBatch(bizList);
+    }
+
+    /**
+     * 设备详情
+     * @param deviceId
+     * @return
+     */
+    public DeviceInfoVo getDeviceInfo(Long deviceId) {
+        if(deviceId == null || deviceId <= 0L) {
+            throw new ServiceException("请选择设备");
+        }
+        DeviceInfoVo vo = new DeviceInfoVo();
+        var device = deviceService.getById(deviceId);
+        AppBusinessFileBo fileBo = new AppBusinessFileBo();
+        fileBo.setBusinessId(deviceId);
+        AppOperationVideoBo videoBo = new AppOperationVideoBo();
+        videoBo.setDeviceId(deviceId);
+        vo.setAppBusinessFileVoList(appBusinessFileService.queryAppFileList(fileBo));
+        vo.setAppOperationVideoVoList(appOperationVideoService.queryList(videoBo));
+        return vo;
+    }
+}

fys-admin/src/main/java/com/fuyuanshen/web/service/device/DeviceXinghanBizService.java

@@ -0,0 +1,433 @@
+package com.fuyuanshen.web.service.device;
+
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.fuyuanshen.app.domain.AppPersonnelInfo;
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.exception.ServiceException;
+import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
+import com.fuyuanshen.common.core.utils.MapstructUtils;
+import com.fuyuanshen.common.core.utils.ObjectUtils;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.equipment.enums.LightModeEnum;
+import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.MqttConstants;
+import com.fuyuanshen.web.domain.Dto.DeviceDebugLogoUploadDto;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.buildArr;
+import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.generateFixedBitmapData;
+import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DeviceXinghanBizService {
+
+    private final DeviceMapper deviceMapper;
+    private final AppPersonnelInfoMapper appPersonnelInfoMapper;
+    private final DeviceTypeMapper deviceTypeMapper;
+    private final MqttGateway mqttGateway;
+    private final DeviceLogMapper deviceLogMapper;
+
+    /**
+     * 所有档位的描述表
+     * key   : 指令类型，如 "ins_DetectGrade"、"ins_LightGrade" ……
+     * value : Map<Integer,String>  值 -> 描述
+     */
+    private static final Map<String, Map<Integer, String>> GRADE_DESC = Map.of(
+            "ins_DetectGrade", Map.of(1, "低档", 2, "中档", 3, "高档"),
+            "ins_LightGrade",  Map.of(1, "强光", 2, "弱光"),
+            "ins_SOSGrade",  Map.of(1, "爆闪模式", 2, "红蓝模式"),
+            "ins_ShakeBit",  Map.of(1, "开启报警")
+            // 再加 4、5、6…… 档，直接往 Map 里塞即可
+    );
+
+    /**
+     * 根据指令类型和值，返回中文描述
+     */
+    private static String resolveGradeDesc(String type, int value) {
+        return GRADE_DESC.getOrDefault(type, Map.of())
+                .getOrDefault(value, "关闭");
+    }
+
+    /**
+     * 设置静电预警档位
+     */
+    public void upDetectGradeSettings(DeviceInstructDto dto) {
+        sendCommand(dto, "ins_DetectGrade","静电预警档位");
+    }
+
+    /**
+     * 设置照明档位
+     */
+    public void upLightGradeSettings(DeviceInstructDto dto) {
+        sendCommand(dto, "ins_LightGrade","照明档位");
+    }
+
+    /**
+     * 设置SOS档位
+     */
+    public void upSOSGradeSettings(DeviceInstructDto dto) {
+        sendCommand(dto, "ins_SOSGrade","SOS档位");
+    }
+
+    /**
+     * 设置强制报警
+     */
+    public void upShakeBitSettings(DeviceInstructDto dto) {
+        sendCommand(dto, "ins_ShakeBit","强制报警");
+    }
+
+    /**
+     * 上传设备logo
+     */
+    public void uploadDeviceLogo(AppDeviceLogoUploadDto bo) {
+        try {
+            Device device = deviceMapper.selectById(bo.getDeviceId());
+            if (device == null) {
+                throw new ServiceException("设备不存在");
+            }
+            if (isDeviceOffline(device.getDeviceImei())) {
+                throw new ServiceException("设备已断开连接：" + device.getDeviceName());
+            }
+            MultipartFile file = bo.getFile();
+
+            byte[] largeData = ImageToCArrayConverter.convertImageToCArray(file.getInputStream(), 160, 80, 25600);
+            log.info("长度：" + largeData.length);
+
+            log.info("原始数据大小: {} 字节", largeData.length);
+
+            int[] ints = convertHexToDecimal(largeData);
+            RedisUtils.setCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() +DEVICE_BOOT_LOGO_KEY_PREFIX, Arrays.toString(ints), Duration.ofSeconds(5 * 60L));
+
+            Map<String, Object> payload = Map.of("ins_PicTrans",
+                    Collections.singletonList(0));
+            String topic = MqttConstants.GLOBAL_PUB_KEY + device.getDeviceImei();
+            String json = JsonUtils.toJsonString(payload);
+
+            try {
+                mqttGateway.sendMsgToMqtt(topic, 1, json);
+            } catch (Exception e) {
+                log.error("上传开机画面失败, topic={}, payload={}", topic, json, e);
+                throw new ServiceException("上传LOGO失败：" + e.getMessage());
+            }
+            log.info("发送上传开机画面到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),json);
+
+            recordDeviceLog(device.getId(), device.getDeviceName(), "上传开机画面", "上传开机画面", AppLoginHelper.getUserId());
+        } catch (Exception e){
+            throw new ServiceException("发送指令失败");
+        }
+    }
+
+    /**
+     * 批量上传设备logo
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void uploadDeviceLogoBatch(DeviceDebugLogoUploadDto batchDto) {
+        if (CollectionUtils.isEmpty(batchDto.getDeviceIds())) {
+            throw new ServiceException("设备列表为空");
+        }
+
+        // 1. 一次性把设备查出来（N -> 1）
+        QueryWrapper<Device> query = new QueryWrapper<>();
+        query.in("id", batchDto.getDeviceIds());
+        List<Device> devices = deviceMapper.selectList(query);
+        if (devices.size() != batchDto.getDeviceIds().size()) {
+            throw new ServiceException("部分设备不存在");
+        }
+
+        // 2. 图片只转换一次（160*80 固定尺寸）
+        byte[] largeData;
+        try {
+            largeData = ImageToCArrayConverter.convertImageToCArray(
+                    batchDto.getFile().getInputStream(), 160, 80, 25600);
+        } catch (IOException e) {
+            throw new ServiceException("图片解析失败");
+        }
+        int[] picArray = convertHexToDecimal(largeData);
+
+        // 3. 过滤离线设备 & 组装指令
+        List<Device> onlineDevices = devices.stream()
+                .filter(d -> !isDeviceOffline(d.getDeviceImei()))
+                .toList();
+        onlineDevices.forEach(d -> {
+            String redisKey = GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + d.getDeviceImei() + DEVICE_BOOT_LOGO_KEY_PREFIX;
+
+            // 如果 Redis 里已存在，直接跳过
+            if (RedisUtils.getCacheObject(redisKey) != null) {
+                return;   // 跳过本次循环
+            }
+
+            RedisUtils.setCacheObject(
+                    redisKey,
+                    Arrays.toString(picArray),
+                    Duration.ofSeconds(5 * 60L));
+            // 3.2 MQTT 下发
+            Map<String, Object> payload =
+                    Collections.singletonMap("ins_PicTrans", Collections.singletonList(0));
+            String topic = MqttConstants.GLOBAL_PUB_KEY + d.getDeviceImei();
+            String json = JsonUtils.toJsonString(payload);
+
+            try {
+                mqttGateway.sendMsgToMqtt(topic, 1, json);
+            } catch (Exception e) {
+                log.error("上传开机画面失败, topic={}, payload={}", topic, json, e);
+                throw new ServiceException("上传LOGO失败：" + e.getMessage());
+            }
+
+            recordDeviceLog(d.getId(), d.getDeviceName(), "上传开机画面", "上传开机画面", AppLoginHelper.getUserId());
+
+        });
+    }
+
+    /**
+     * 人员登记
+     * @param bo
+     */
+    public boolean registerPersonInfo(AppPersonnelInfoBo bo) {
+        Long deviceId = bo.getDeviceId();
+        Device deviceObj = deviceMapper.selectById(deviceId);
+        if (deviceObj == null) {
+            throw new RuntimeException("请先将设备入库！！！");
+        }
+        if (isDeviceOffline(deviceObj.getDeviceImei())) {
+            throw new ServiceException("设备已断开连接：" + deviceObj.getDeviceName());
+        }
+        QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>()
+                .eq("device_id", deviceId);
+        List<AppPersonnelInfoVo> appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw);
+
+        List<String> list = new ArrayList<>();
+        list.add(bo.getName());
+        list.add(bo.getPosition());
+        list.add(bo.getUnitName());
+        list.add(bo.getCode());
+        RedisUtils.setCacheList(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + deviceObj.getDeviceImei() + ":app_send_message_data", list);
+        RedisUtils.expire(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + deviceObj.getDeviceImei() + ":app_send_message_data", Duration.ofSeconds(5 * 60L));
+
+        Map<String, Object> payload = Map.of("ins_TexTrans",
+                Collections.singletonList(0));
+        String topic = MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei();
+        String json = JsonUtils.toJsonString(payload);
+
+        try {
+            mqttGateway.sendMsgToMqtt(topic, 1, json);
+        } catch (Exception e) {
+            log.error("人员信息登记失败, topic={}, payload={}", topic, json, e);
+            throw new ServiceException("人员信息登记失败：" + e.getMessage());
+        }
+        log.info("发送人员信息登记到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei(), bo);
+
+        recordDeviceLog(deviceId, deviceObj.getDeviceName(), "人员信息登记", JSON.toJSONString(bo), AppLoginHelper.getUserId());
+        if (ObjectUtils.length(appPersonnelInfoVos) == 0) {
+            AppPersonnelInfo appPersonnelInfo = MapstructUtils.convert(bo, AppPersonnelInfo.class);
+            return appPersonnelInfoMapper.insertOrUpdate(appPersonnelInfo);
+        } else {
+            UpdateWrapper<AppPersonnelInfo> uw = new UpdateWrapper<>();
+            uw.eq("device_id", deviceId)
+                    .set("name", bo.getName())
+                    .set("position", bo.getPosition())
+                    .set("unit_name", bo.getUnitName())
+                    .set("code", bo.getCode());
+            return appPersonnelInfoMapper.update(null, uw) > 0;
+        }
+    }
+
+    /**
+     * 发送报警信息
+     * @param bo
+     * @return
+     */
+    public int sendAlarmMessage(AppDeviceSendMsgBo bo) {
+        List<Long> deviceIds = bo.getDeviceIds();
+
+        // 1. 简化非空检查和抛出异常
+        if (deviceIds == null || deviceIds.isEmpty()) {
+            throw new ServiceException("请选择设备");
+        }
+        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+        // 使用 in 语句根据id集合查询
+        queryWrapper.in("id", deviceIds);
+        // 2. 将批量查询设备，减少数据库交互次数
+        List<Device> devices = deviceMapper.selectList(queryWrapper);
+        if (devices.size() != deviceIds.size()) {
+            // 如果查询回来的设备数量不一致，说明有设备不存在，此处可以优化为更详细的提示
+            throw new ServiceException("部分设备不存在");
+        }
+
+        try {
+            for (Device device : devices) {
+                String deviceImei = device.getDeviceImei();
+                String deviceName = device.getDeviceName();
+
+                // 3. 在循环中进行设备状态检查，快速失败
+                if (isDeviceOffline(deviceImei)) {
+                    // 如果设备离线，可以选择继续处理下一个设备，或者抛出异常。这里选择抛出异常。
+                    throw new ServiceException(deviceName + ", 设备已断开连接");
+                }
+
+                // 4. 将Redis和MQTT操作封装在一个方法中，提高可读性
+                sendSingleAlarmMessage(device, bo.getSendMsg());
+
+                // 5. 批量更新设备状态，提高效率
+                UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+                updateWrapper.eq("id", device.getId())
+                        .eq("binding_user_id", AppLoginHelper.getUserId())
+                        .set("send_msg", bo.getSendMsg());
+                deviceMapper.update(updateWrapper);
+
+                // 6. 记录操作日志
+                recordDeviceLog(device.getId(), deviceName, "发送紧急通知", bo.getSendMsg(), AppLoginHelper.getUserId());
+            }
+        } catch (ServiceException e) {
+            // 捕获并重新抛出自定义异常，避免内层异常被外层泛化捕获
+            log.error("发送告警信息指令失败: {}", e.getMessage(), e);
+            throw e;
+        } catch (Exception e) {
+            log.error("发送告警信息指令发生未知错误", e);
+            throw new ServiceException("发送告警信息指令失败");
+        }
+
+        return 1;
+    }
+    /* ---------------------------------- 私有通用方法 ---------------------------------- */
+
+    /**
+     * 封装单个设备发送告警信息的逻辑
+     */
+    private void sendSingleAlarmMessage(Device device, String message) {
+        String deviceImei = device.getDeviceImei();
+
+        // 缓存告警消息到Redis
+        RedisUtils.setCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + deviceImei + DEVICE_ALARM_MESSAGE_KEY_PREFIX, message, Duration.ofSeconds(5 * 60L));
+
+        // 构建并发送MQTT消息
+        Map<String, Object> payload = Map.of("ins_BreakNews", Collections.singletonList(0));
+        String topic = MqttConstants.GLOBAL_PUB_KEY + deviceImei;
+        String json = JsonUtils.toJsonString(payload);
+
+        try {
+            mqttGateway.sendMsgToMqtt(topic, 1, json);
+            log.info("发送紧急通知成功 => topic:{}, payload:{}", topic, json);
+        } catch (Exception e) {
+            log.error("发送紧急通知失败, topic={}, payload={}", topic, json, e);
+            throw new ServiceException("发送紧急通知失败：" + e.getMessage());
+        }
+    }
+
+    /**
+     * 发送设备控制指令
+     *
+     * @param dto 设备指令数据传输对象，包含设备ID和指令值等信息
+     * @param payloadKey 指令负载数据的键名
+     * @param deviceAction 设备操作类型描述
+     */
+    private void sendCommand(DeviceInstructDto dto, String payloadKey, String deviceAction) {
+        long deviceId = dto.getDeviceId();
+
+        // 1. 使用Optional简化空值检查，使代码更简洁
+        Device device = Optional.ofNullable(deviceMapper.selectById(deviceId))
+                .orElseThrow(() -> new ServiceException("设备不存在"));
+
+        String deviceImei = device.getDeviceImei();
+        String deviceName = device.getDeviceName();
+
+        // 2. 提前进行设备状态检查，逻辑更清晰
+        if (isDeviceOffline(deviceImei)) {
+            throw new ServiceException("设备已断开连接：" + deviceName);
+        }
+
+        // 3. 统一处理类型转换异常，避免在业务逻辑中混杂try-catch
+        int value;
+        try {
+            value = Integer.parseInt(dto.getInstructValue());
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("指令值格式不正确，必须为整数。", e);
+        }
+
+        // 4. 使用Map.of()或Map.ofEntries()创建不可变Map，更简洁且线程安全
+        Map<String, List<Integer>> payload = Map.of(payloadKey, List.of(value));
+
+        String topic = MqttConstants.GLOBAL_PUB_KEY + deviceImei;
+        String json = JsonUtils.toJsonString(payload);
+
+        try {
+            mqttGateway.sendMsgToMqtt(topic, 1, json);
+            log.info("发送指令成功 => topic:{}, payload:{}", topic, json);
+        } catch (Exception e) {
+            log.error("发送指令失败, topic={}, payload={}", topic, json, e);
+            throw new ServiceException("发送指令失败：" + e.getMessage());
+        }
+
+        // 5. 将日志记录和描述解析放在try-catch块之外，确保无论是否成功发送指令都能执行
+        String content = resolveGradeDesc("ins_DetectGrade", value);
+        recordDeviceLog(device.getId(),
+                deviceName,
+                deviceAction,
+                content,
+                AppLoginHelper.getUserId());
+    }
+
+//    private boolean isDeviceOffline(String imei) {
+//        // 原方法名语义相反，这里取反，使含义更清晰
+//        return getDeviceStatus(imei);
+//    }
+
+    /**
+     * 记录设备操作日志
+     * @param deviceId 设备ID
+     * @param content 日志内容
+     * @param operator 操作人
+     */
+    private void recordDeviceLog(Long deviceId,String deviceName, String deviceAction, String content, Long operator) {
+        try {
+            // 创建设备日志实体
+            com.fuyuanshen.equipment.domain.DeviceLog deviceLog = new com.fuyuanshen.equipment.domain.DeviceLog();
+            deviceLog.setDeviceId(deviceId);
+            deviceLog.setDeviceAction(deviceAction);
+            deviceLog.setContent(content);
+            deviceLog.setCreateBy(operator);
+            deviceLog.setDeviceName(deviceName);
+            deviceLog.setCreateTime(new Date());
+
+            // 插入日志记录
+            deviceLogMapper.insert(deviceLog);
+        } catch (Exception e) {
+            log.error("记录设备操作日志失败: {}", e.getMessage(), e);
+        }
+    }
+
+    private boolean isDeviceOffline(String deviceImei) {
+        String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+        return RedisUtils.getCacheObject(deviceOnlineStatusRedisKey)==null;
+    }
+
+}

fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/FunctionAccessBatchStatusRule.java

@@ -22,7 +22,7 @@ import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCES
 public class FunctionAccessBatchStatusRule implements DeviceStatusRule {
     @Override
     public String getCommandType() {
-        return DeviceTypeConstants.TYPE_BJQ6170+"_2";
+        return "FunctionAccessBatchStatusRule";
     }
 
     @Override

fys-admin/src/main/java/com/fuyuanshen/web/service/device/status/FunctionAccessStatusRule.java

@@ -21,7 +21,7 @@ import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCES
 public class FunctionAccessStatusRule implements DeviceStatusRule {
     @Override
     public String getCommandType() {
-        return DeviceTypeConstants.TYPE_BJQ6170+"_1";
+        return "FunctionAccessStatusRule";
     }
 
     @Override

fys-admin/src/main/java/com/fuyuanshen/web/service/impl/WEBDeviceServiceImpl.java

@@ -1,22 +1,39 @@
 package com.fuyuanshen.web.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuyuanshen.app.domain.AppDeviceBindRecord;
+import com.fuyuanshen.app.domain.AppDeviceShare;
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
 import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper;
+import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoRecordsMapper;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceAlarm;
 import com.fuyuanshen.equipment.domain.DeviceAssignments;
+import com.fuyuanshen.equipment.domain.DeviceLog;
+import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
+import com.fuyuanshen.equipment.domain.vo.WebDeviceVo;
 import com.fuyuanshen.equipment.enums.BindingStatusEnum;
+import com.fuyuanshen.equipment.mapper.DeviceAlarmMapper;
 import com.fuyuanshen.equipment.mapper.DeviceAssignmentsMapper;
+import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.web.service.WEBDeviceService;
-import com.fuyuanshen.web.service.device.DeviceBizService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author: WY
@@ -27,13 +44,15 @@ import org.springframework.transaction.annotation.Transactional;
 @RequiredArgsConstructor
 public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements WEBDeviceService {
 
-    private final DeviceBizService appDeviceService;
-
     private final DeviceAssignmentsMapper deviceAssignmentsMapper;
 
     private final AppDeviceBindRecordMapper appDeviceBindRecordMapper;
+    private final AppPersonnelInfoRecordsMapper infoRecordsMapper;
+    private final DeviceLogMapper deviceLogMapper;
+    private final DeviceAlarmMapper deviceAlarmMapper;
 
     private final DeviceMapper deviceMapper;
+    private final AppDeviceShareMapper appDeviceShareMapper;
 
 
     /**
@@ -70,4 +89,89 @@ public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impl
     }
 
 
+    /**
+     * WEB端设备详情
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public WebDeviceVo getDevice(Long id) {
+        Device device = deviceMapper.selectById(id);
+        if (device != null) {
+            WebDeviceVo webDeviceVo = new WebDeviceVo();
+            BeanUtil.copyProperties(device, webDeviceVo);
+            // 查询分享用户数
+            Long count = appDeviceShareMapper.selectCount(new QueryWrapper<AppDeviceShare>().eq("device_id", id));
+            webDeviceVo.setShareUsersNumber(Math.toIntExact(count));
+            return webDeviceVo;
+        }
+        return null;
+    }
+
+
+    /**
+     * 设备用户详情
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public List<AppPersonnelInfoRecords> getDeviceUser(Long id) {
+        List<AppPersonnelInfoRecords> appPersonnelInfoRecords = infoRecordsMapper.selectList(
+                new QueryWrapper<AppPersonnelInfoRecords>().eq("device_id", id)
+                        .orderByDesc("create_time"));
+        return appPersonnelInfoRecords;
+    }
+
+
+    /**
+     * 设备操作记录
+     *
+     * @param deviceId
+     * @return
+     */
+    @Override
+    public TableDataInfo<DeviceLog> getOperationRecord(Long deviceId, String startTime, String endTime, PageQuery pageQuery) {
+        Page<DeviceLog> page = pageQuery.build();
+        QueryWrapper<DeviceLog> queryWrapper = new QueryWrapper<DeviceLog>().eq("device_id", deviceId);
+
+        if (StrUtil.isNotEmpty(startTime)) {
+            queryWrapper.ge("create_time", startTime);
+        }
+        if (StrUtil.isNotEmpty(endTime)) {
+            queryWrapper.le("create_time", endTime);
+        }
+        queryWrapper.orderByDesc("create_time");
+        IPage<DeviceLog> logList = deviceLogMapper.selectPage(page, queryWrapper);
+        return TableDataInfo.build(logList);
+    }
+
+
+    /**
+     * 设备告警记录
+     *
+     * @param deviceId
+     * @return
+     */
+    @Override
+    public TableDataInfo getAlarmRecord(Long deviceId, String startTime, String endTime, PageQuery pageQuery) {
+        Page<DeviceAlarm> page = pageQuery.build();
+        QueryWrapper<DeviceAlarm> queryWrapper = new QueryWrapper<DeviceAlarm>().eq("device_id", deviceId);
+
+        if (StrUtil.isNotEmpty(startTime)) {
+            queryWrapper.ge("start_time", startTime);
+        }
+        if (StrUtil.isNotEmpty(endTime)) {
+            queryWrapper.le("start_time", endTime);
+        }
+        queryWrapper.orderByDesc("start_time");
+        IPage<DeviceAlarm> alarmPage = deviceAlarmMapper.selectPage(page, queryWrapper);
+
+        // List<DeviceAlarmVo> deviceAlarmVoList = BeanUtil.copyToList(alarmPage.getRecords(), DeviceAlarmVo.class);
+        return TableDataInfo.build(alarmPage);
+    }
+
 }
+
+

fys-admin/src/main/java/com/fuyuanshen/web/util/FileHashUtil.java

@@ -0,0 +1,28 @@
+package com.fuyuanshen.web.util;
+
+import org.apache.commons.codec.digest.DigestUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.MessageDigest;
+import java.util.HexFormat;
+
+/**
+ * 文件哈希工具类
+ */
+public class FileHashUtil {
+    private static final String ALGORITHM = "SHA-256";
+
+    public static String hash(MultipartFile file) throws IOException {
+        MessageDigest digest = DigestUtils.getDigest(ALGORITHM);
+        try (InputStream in = file.getInputStream()) {
+            byte[] buf = new byte[8192];
+            int len;
+            while ((len = in.read(buf)) != -1) {
+                digest.update(buf, 0, len);
+            }
+        }
+        return HexFormat.of().formatHex(digest.digest());
+    }
+}

fys-admin/src/main/resources/application.yml

@@ -219,6 +219,8 @@ springdoc:
       packages-to-scan: com.fuyuanshen.customer
     - group: APP模块
       packages-to-scan: com.fuyuanshen.app
+    - group: 设备分组
+      packages-to-scan: com.fuyuanshen.web.controller.device
 
 # 防止XSS攻击
 xss:

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/utils/ImageToCArrayConverter.java

@@ -88,6 +88,24 @@ public class ImageToCArrayConverter {
         return chunk;
     }
 
+    public static String[] getChunk2(String[] data, int chunkIndex, int chunkSize) {
+        if (data == null || chunkSize <= 0 || chunkIndex < 0) {
+            return new String[0];
+        }
+
+        int start = chunkIndex * chunkSize;
+        if (start >= data.length) {
+            return new String[0]; // 索引超出范围
+        }
+
+        int end = Math.min(start + chunkSize, data.length);
+        int length = end - start;
+
+        String[] chunk = new String[length];
+        System.arraycopy(data, start, chunk, 0, length);
+        return chunk;
+    }
+
     public static void  buildArr(int[]  data,List<Integer> intData){
         for (int datum : data) {
             intData.add(datum);

fys-common/fys-common-encrypt/src/main/java/com/fuyuanshen/common/encrypt/utils/EncryptUtilsTest.java

@@ -39,8 +39,8 @@ public class EncryptUtilsTest {
         loginBody.setClientId("e5cd7e4891bf95d1d19206ce24a7b32e");
         loginBody.setGrantType("password");
         loginBody.setTenantId("894078");
-        loginBody.setCode("9");
-        loginBody.setUuid("d5be31eac1244cee851a9903f358bc6a");
+        loginBody.setCode("0");
+        loginBody.setUuid("1d6615668c7f410da77c4e002c601073");
         // loginBody.setUsername("admin");
         // loginBody.setPassword("admin123");
         loginBody.setUsername("dyf");

fys-common/fys-common-redis/src/main/java/com/fuyuanshen/common/redis/utils/RedisUtils.java

@@ -11,6 +11,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -373,6 +374,28 @@ public class RedisUtils {
             return 0;
         }
     }
+
+    /**
+     * 根据时间范围查询Sorted Set中的元素(重载方法，适用于时间戳查询)
+     *
+     * @param key       键
+     * @param startTime 开始时间戳
+     * @param endTime   结束时间戳
+     * @return 指定时间范围内的元素集合
+     */
+    public static Collection<String> zRangeByScore(String key, Long startTime, Long endTime) {
+        try {
+            RScoredSortedSet<String> sortedSet = CLIENT.getScoredSortedSet(key);
+            return sortedSet.valueRange(startTime, true, endTime, true);
+        } catch (Exception e) {
+            // 记录错误日志（如果项目中有日志工具的话）
+            // log.error("根据时间范围查询Sorted Set中的元素失败: key={}, startTime={}, endTime={}, error={}",
+            //           key, startTime, endTime, e.getMessage(), e);
+            return null;
+        }
+    }
+
+
     /**
      * 追加缓存Set数据
      *
@@ -614,4 +637,73 @@ public class RedisUtils {
         RKeys rKeys = CLIENT.getKeys();
         return rKeys.countExists(key) > 0;
     }
+
+
+    /**
+     * 向去重阻塞队列中添加元素
+     *
+     * @param queueKey 队列键
+     * @param dedupKey 去重集合键
+     * @param value 消息值
+     * @param timeout 过期时间
+     * @return 是否添加成功
+     */
+    public static boolean offerDeduplicated(String queueKey, String dedupKey, String value, Duration timeout) {
+//        String jsonValue = value instanceof String ? (String) value : JsonUtils.toJsonString(value);
+
+        RLock lock = CLIENT.getLock("lock:" + queueKey);
+        try {
+            lock.lock();
+
+            RSet<String> dedupSet = CLIENT.getSet(dedupKey);
+            if (dedupSet.contains(value)) {
+                return false; // 元素已存在，不重复添加
+            }
+
+            // 添加到去重集合
+            dedupSet.add(value);
+
+            // 添加到阻塞队列
+            RBlockingQueue<String> queue = CLIENT.getBlockingQueue(queueKey);
+            boolean offered = queue.offer(value);
+
+            // 设置过期时间
+            if (timeout != null) {
+                queue.expire(timeout);
+                dedupSet.expire(timeout);
+            }
+
+            return offered;
+        } finally {
+            lock.unlock();
+        }
+    }
+
+    /**
+     * 从去重阻塞队列中消费元素
+     *
+     * @param queueKey 队列键
+     * @param dedupKey 去重集合键
+     * @param timeout 超时时间
+     * @param timeUnit 时间单位
+     * @return 消息值
+     */
+    public static String pollDeduplicated(String queueKey, String dedupKey, long timeout, TimeUnit timeUnit) {
+        try {
+            RBlockingQueue<String> queue = CLIENT.getBlockingQueue(queueKey);
+            String value = queue.poll(timeout, timeUnit);
+
+            // 从去重集合中移除
+            if (value != null) {
+                RSet<String> dedupSet = CLIENT.getSet(dedupKey);
+                dedupSet.remove(value);
+            }
+
+            return value;
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            return null;
+        }
+    }
+
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/controller/AppPersonnelInfoRecordsController.java

@@ -0,0 +1,105 @@
+package com.fuyuanshen.app.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import com.fuyuanshen.common.idempotent.annotation.RepeatSubmit;
+import com.fuyuanshen.common.log.annotation.Log;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.log.enums.BusinessType;
+import com.fuyuanshen.common.excel.utils.ExcelUtil;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoRecordsVo;
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoRecordsBo;
+import com.fuyuanshen.app.service.IAppPersonnelInfoRecordsService;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 人员信息登记记录
+ *
+ * @author CYT
+ * @date 2025-08-22
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/personnelInfoRecords")
+public class AppPersonnelInfoRecordsController extends BaseController {
+
+    private final IAppPersonnelInfoRecordsService appPersonnelInfoRecordsService;
+
+    /**
+     * 查询人员信息登记记录列表
+     */
+    @SaCheckPermission("app:personnelInfoRecords:list")
+    @GetMapping("/list")
+    public TableDataInfo<AppPersonnelInfoRecordsVo> list(AppPersonnelInfoRecordsBo bo, PageQuery pageQuery) {
+        return appPersonnelInfoRecordsService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出人员信息登记记录列表
+     */
+    @SaCheckPermission("app:personnelInfoRecords:export")
+    @Log(title = "人员信息登记记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(AppPersonnelInfoRecordsBo bo, HttpServletResponse response) {
+        List<AppPersonnelInfoRecordsVo> list = appPersonnelInfoRecordsService.queryList(bo);
+        ExcelUtil.exportExcel(list, "人员信息登记记录", AppPersonnelInfoRecordsVo.class, response);
+    }
+
+    /**
+     * 获取人员信息登记记录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("app:personnelInfoRecords:query")
+    @GetMapping("/{id}")
+    public R<AppPersonnelInfoRecordsVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(appPersonnelInfoRecordsService.queryById(id));
+    }
+
+    /**
+     * 新增人员信息登记记录
+     */
+    @SaCheckPermission("app:personnelInfoRecords:add")
+    @Log(title = "人员信息登记记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoRecordsBo bo) {
+        return toAjax(appPersonnelInfoRecordsService.insertByBo(bo));
+    }
+
+    /**
+     * 修改人员信息登记记录
+     */
+    @SaCheckPermission("app:personnelInfoRecords:edit")
+    @Log(title = "人员信息登记记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody AppPersonnelInfoRecordsBo bo) {
+        return toAjax(appPersonnelInfoRecordsService.updateByBo(bo));
+    }
+
+    /**
+     * 删除人员信息登记记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("app:personnelInfoRecords:remove")
+    @Log(title = "人员信息登记记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(appPersonnelInfoRecordsService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

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

@@ -50,5 +50,6 @@ public class AppDeviceBindRecord extends TenantEntity {
      */
     private Date bindingTime;
 
+    private Integer communicationMode;
 
 }

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

@@ -0,0 +1,66 @@
+package com.fuyuanshen.app.domain;
+
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 人员信息登记记录对象 app_personnel_info_records
+ *
+ * @author CYT
+ * @date 2025-08-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("app_personnel_info_records")
+public class AppPersonnelInfoRecords extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    private Long deviceId;
+
+    /**
+     * 主键
+     */
+    private Long personnelId;
+
+    /**
+     * 人员姓名
+     */
+    private String name;
+
+    /**
+     * 职位
+     */
+    private String position;
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+
+    /**
+     * ID号
+     */
+    private String code;
+
+    /**
+     * 发送信息
+     */
+    private String sendMsg;
+
+
+}

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 String shareStartTime;
+    private String shareEndTime;
+
 }

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

@@ -45,5 +45,10 @@ public class AppOperationVideoBo extends BaseEntity {
      */
     private String remark;
 
+    /**
+     * 多设备id
+     */
+    private Long[] deviceIds;
+
 
 }

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

@@ -0,0 +1,67 @@
+package com.fuyuanshen.app.domain.bo;
+
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 人员信息登记记录业务对象 app_personnel_info_records
+ *
+ * @author CYT
+ * @date 2025-08-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = AppPersonnelInfoRecords.class, reverseConvertGenerate = false)
+public class AppPersonnelInfoRecordsBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long deviceId;
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long personnelId;
+
+    /**
+     * 人员姓名
+     */
+    private String name;
+
+    /**
+     * 职位
+     */
+    private String position;
+
+    /**
+     * 单位名称
+     */
+    private String unitName;
+
+    /**
+     * ID号
+     */
+    private String code;
+
+    /**
+     * 发送信息
+     */
+    private String sendMsg;
+
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppDeviceShareVo.java

@@ -109,4 +109,9 @@ public class AppDeviceShareVo implements Serializable {
      * 告警状态(0解除告警，1告警)
      */
     private String alarmStatus;
+
+    /**
+     * 创建时间
+     */
+    private String createTime;
 }

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppFileVo.java

@@ -19,6 +19,10 @@ public class AppFileVo {
      * 文件名称
      */
     private String fileName;
+    /**
+     * 文件类型(1:操作说明，2:产品参数)
+     */
+    private Long fileType;
     /**
      * 文件url
      */

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/domain/vo/AppPersonnelInfoRecordsVo.java

@@ -0,0 +1,80 @@
+package com.fuyuanshen.app.domain.vo;
+
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
+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;
+
+
+
+/**
+ * 人员信息登记记录视图对象 app_personnel_info_records
+ *
+ * @author CYT
+ * @date 2025-08-22
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppPersonnelInfoRecords.class)
+public class AppPersonnelInfoRecordsVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ExcelProperty(value = "设备id")
+    private Long deviceId;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long personnelId;
+
+    /**
+     * 人员姓名
+     */
+    @ExcelProperty(value = "人员姓名")
+    private String name;
+
+    /**
+     * 职位
+     */
+    @ExcelProperty(value = "职位")
+    private String position;
+
+    /**
+     * 单位名称
+     */
+    @ExcelProperty(value = "单位名称")
+    private String unitName;
+
+    /**
+     * ID号
+     */
+    @ExcelProperty(value = "ID号")
+    private String code;
+
+    /**
+     * 发送信息
+     */
+    @ExcelProperty(value = "发送信息")
+    private String sendMsg;
+
+
+}

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/java/com/fuyuanshen/app/mapper/AppPersonnelInfoRecordsMapper.java

@@ -0,0 +1,15 @@
+package com.fuyuanshen.app.mapper;
+
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoRecordsVo;
+import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 人员信息登记记录Mapper接口
+ *
+ * @author CYT
+ * @date 2025-08-22
+ */
+public interface AppPersonnelInfoRecordsMapper extends BaseMapperPlus<AppPersonnelInfoRecords, AppPersonnelInfoRecordsVo> {
+
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppBusinessFileService.java

@@ -1,5 +1,6 @@
 package com.fuyuanshen.app.service;
 
+import com.fuyuanshen.app.domain.AppBusinessFile;
 import com.fuyuanshen.app.domain.vo.AppBusinessFileVo;
 import com.fuyuanshen.app.domain.bo.AppBusinessFileBo;
 import com.fuyuanshen.app.domain.vo.AppFileVo;
@@ -50,6 +51,14 @@ public interface IAppBusinessFileService {
      */
     Boolean insertByBo(AppBusinessFileBo bo);
 
+    /**
+     * 批量新增app业务文件
+     *
+     * @param bo 批量新增app业务文件
+     * @return 是否新增成功
+     */
+    Boolean insertBatch(Collection<AppBusinessFile> bo);
+
     /**
      * 修改app业务文件
      *

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppOperationVideoService.java

@@ -1,5 +1,7 @@
 package com.fuyuanshen.app.service;
 
+import com.fuyuanshen.app.domain.AppBusinessFile;
+import com.fuyuanshen.app.domain.AppOperationVideo;
 import com.fuyuanshen.app.domain.vo.AppOperationVideoVo;
 import com.fuyuanshen.app.domain.bo.AppOperationVideoBo;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
@@ -49,6 +51,14 @@ public interface IAppOperationVideoService {
      */
     Boolean insertByBo(AppOperationVideoBo bo);
 
+    /**
+     * 批量新增操作视频
+     *
+     * @param bo 批量新增操作视频
+     * @return 是否新增成功
+     */
+    Boolean insertBatch(Collection<AppOperationVideo> bo);
+
     /**
      * 修改操作视频
      *

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/IAppPersonnelInfoRecordsService.java

@@ -0,0 +1,68 @@
+package com.fuyuanshen.app.service;
+
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoRecordsVo;
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoRecordsBo;
+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 CYT
+ * @date 2025-08-22
+ */
+public interface IAppPersonnelInfoRecordsService {
+
+    /**
+     * 查询人员信息登记记录
+     *
+     * @param id 主键
+     * @return 人员信息登记记录
+     */
+    AppPersonnelInfoRecordsVo queryById(Long id);
+
+    /**
+     * 分页查询人员信息登记记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 人员信息登记记录分页列表
+     */
+    TableDataInfo<AppPersonnelInfoRecordsVo> queryPageList(AppPersonnelInfoRecordsBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的人员信息登记记录列表
+     *
+     * @param bo 查询条件
+     * @return 人员信息登记记录列表
+     */
+    List<AppPersonnelInfoRecordsVo> queryList(AppPersonnelInfoRecordsBo bo);
+
+    /**
+     * 新增人员信息登记记录
+     *
+     * @param bo 人员信息登记记录
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(AppPersonnelInfoRecordsBo bo);
+
+    /**
+     * 修改人员信息登记记录
+     *
+     * @param bo 人员信息登记记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(AppPersonnelInfoRecordsBo bo);
+
+    /**
+     * 校验并批量删除人员信息登记记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppBusinessFileServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fuyuanshen.app.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fuyuanshen.app.domain.vo.AppFileVo;
 import com.fuyuanshen.common.core.utils.MapstructUtils;
 import com.fuyuanshen.common.core.utils.StringUtils;
@@ -100,6 +101,20 @@ public class AppBusinessFileServiceImpl implements IAppBusinessFileService {
         return flag;
     }
 
+    @Override
+    public Boolean insertBatch(Collection<AppBusinessFile> bo) {
+        // 1. 去重后的 businessId 集合
+        List<Long> businessIds = bo.stream()
+                .map(AppBusinessFile::getBusinessId)
+                .distinct()
+                .toList();
+        QueryWrapper<AppBusinessFile> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("business_id", businessIds);
+        queryWrapper.eq("file_type", bo.stream().findFirst().orElseThrow().getFileType());
+        baseMapper.delete(queryWrapper);
+        return baseMapper.insertBatch(bo);
+    }
+
     /**
      * 修改app业务文件
      *

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppOperationVideoServiceImpl.java

@@ -1,5 +1,7 @@
 package com.fuyuanshen.app.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.fuyuanshen.app.domain.AppBusinessFile;
 import com.fuyuanshen.common.core.utils.MapstructUtils;
 import com.fuyuanshen.common.core.utils.StringUtils;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
@@ -97,6 +99,19 @@ public class AppOperationVideoServiceImpl implements IAppOperationVideoService {
         return flag;
     }
 
+    @Override
+    public Boolean insertBatch(Collection<AppOperationVideo> bo) {
+        // 1. 去重后的 businessId 集合
+        List<Long> deviceIds = bo.stream()
+                .map(AppOperationVideo::getDeviceId)
+                .distinct()
+                .toList();
+        QueryWrapper<AppOperationVideo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.in("device_id", deviceIds);
+        baseMapper.delete(queryWrapper);
+        return baseMapper.insertBatch(bo);
+    }
+
     /**
      * 修改操作视频
      *

fys-modules/fys-app/src/main/java/com/fuyuanshen/app/service/impl/AppPersonnelInfoRecordsServiceImpl.java

@@ -0,0 +1,138 @@
+package com.fuyuanshen.app.service.impl;
+
+import com.fuyuanshen.common.core.utils.MapstructUtils;
+import com.fuyuanshen.common.core.utils.StringUtils;
+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.springframework.stereotype.Service;
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoRecordsBo;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoRecordsVo;
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoRecordsMapper;
+import com.fuyuanshen.app.service.IAppPersonnelInfoRecordsService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 人员信息登记记录Service业务层处理
+ *
+ * @author CYT
+ * @date 2025-08-22
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AppPersonnelInfoRecordsServiceImpl implements IAppPersonnelInfoRecordsService {
+
+    private final AppPersonnelInfoRecordsMapper baseMapper;
+
+    /**
+     * 查询人员信息登记记录
+     *
+     * @param id 主键
+     * @return 人员信息登记记录
+     */
+    @Override
+    public AppPersonnelInfoRecordsVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询人员信息登记记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 人员信息登记记录分页列表
+     */
+    @Override
+    public TableDataInfo<AppPersonnelInfoRecordsVo> queryPageList(AppPersonnelInfoRecordsBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppPersonnelInfoRecords> lqw = buildQueryWrapper(bo);
+        Page<AppPersonnelInfoRecordsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的人员信息登记记录列表
+     *
+     * @param bo 查询条件
+     * @return 人员信息登记记录列表
+     */
+    @Override
+    public List<AppPersonnelInfoRecordsVo> queryList(AppPersonnelInfoRecordsBo bo) {
+        LambdaQueryWrapper<AppPersonnelInfoRecords> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppPersonnelInfoRecords> buildQueryWrapper(AppPersonnelInfoRecordsBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<AppPersonnelInfoRecords> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(AppPersonnelInfoRecords::getId);
+        lqw.eq(bo.getDeviceId() != null, AppPersonnelInfoRecords::getDeviceId, bo.getDeviceId());
+        lqw.eq(bo.getPersonnelId() != null, AppPersonnelInfoRecords::getPersonnelId, bo.getPersonnelId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), AppPersonnelInfoRecords::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getPosition()), AppPersonnelInfoRecords::getPosition, bo.getPosition());
+        lqw.like(StringUtils.isNotBlank(bo.getUnitName()), AppPersonnelInfoRecords::getUnitName, bo.getUnitName());
+        lqw.eq(StringUtils.isNotBlank(bo.getCode()), AppPersonnelInfoRecords::getCode, bo.getCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getSendMsg()), AppPersonnelInfoRecords::getSendMsg, bo.getSendMsg());
+        return lqw;
+    }
+
+    /**
+     * 新增人员信息登记记录
+     *
+     * @param bo 人员信息登记记录
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(AppPersonnelInfoRecordsBo bo) {
+        AppPersonnelInfoRecords add = MapstructUtils.convert(bo, AppPersonnelInfoRecords.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改人员信息登记记录
+     *
+     * @param bo 人员信息登记记录
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(AppPersonnelInfoRecordsBo bo) {
+        AppPersonnelInfoRecords update = MapstructUtils.convert(bo, AppPersonnelInfoRecords.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppPersonnelInfoRecords 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-app/src/main/resources/mapper/app/AppBusinessFileMapper.xml

@@ -5,7 +5,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.fuyuanshen.app.mapper.AppBusinessFileMapper">
 
     <select id="queryAppFileList" resultType="com.fuyuanshen.app.domain.vo.AppFileVo">
-        select a.id,a.business_id,a.file_id,b.file_name,b.url fileUrl from app_business_file a left join sys_oss b on a.file_id = b.oss_id
+        select a.id,a.business_id,a.file_id,a.file_type,b.file_name,b.url fileUrl from app_business_file a left join sys_oss b on a.file_id = b.oss_id
         where 1=1
         <if test="businessId != null">
             and a.business_id = #{businessId}

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.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">
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         dt.type_name,
         dt.communication_mode,
         d.bluetooth_name,
-        dt.model_dictionary detailPageUrl,
+        dt.app_model_dictionary detailPageUrl,
         c.binding_time,
         ad.*,u.user_name otherPhonenumber
         from
@@ -47,4 +47,40 @@ 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 d.device_name,
+        d.device_mac,
+        d.device_sn,
+        d.device_imei,
+        d.device_pic,
+        dt.type_name,
+        dt.communication_mode,
+        d.bluetooth_name,
+        dt.app_model_dictionary detailPageUrl,
+        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>
+            <if test="bo.deviceId != null">
+                and ad.device_id = #{bo.deviceId}
+            </if>
+            <if test="bo.shareUser != null">
+                and ad.phonenumber like concat('%',#{bo.shareUser},'%')
+            </if>
+            <if test="bo.phonenumber != null">
+                and ad.phonenumber like concat('%',#{bo.phonenumber},'%')
+            </if>
+            <if test="bo.shareStartTime != null and bo.shareEndTime != null">
+                and ad.create_time between #{bo.shareStartTime} and #{bo.shareEndTime}
+            </if>
+        </where>
+
+    </select>
 </mapper>

fys-modules/fys-app/src/main/resources/mapper/app/AppPersonnelInfoRecordsMapper.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.app.mapper.AppPersonnelInfoRecordsMapper">
+
+</mapper>

fys-modules/fys-demo/src/main/java/com/fuyuanshen/demo/controller/VideoUploadController.java

@@ -36,7 +36,6 @@ public class VideoUploadController {
     private static final char[] HEX_ARRAY = "0123456789ABCDEF".toCharArray();
 
     @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
-    @SaIgnore
     public R<List<String>> upload(@RequestParam("file") MultipartFile file) {
         if (file == null || file.isEmpty()) {
             return R.fail("上传文件不能为空");

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

@@ -126,26 +126,26 @@ public class DeviceController extends BaseController {
 
 
     // @Log("分配客户")
-    @Operation(summary = "分配客户")
-    @PutMapping(value = "/assignCustomer")
-    public R<Void> assignCustomer(@Validated @RequestBody CustomerVo customerVo) {
-        deviceService.assignCustomer(customerVo);
-        return R.ok();
-    }
+    // @Operation(summary = "分配客户")
+    // @PutMapping(value = "/assignCustomer")
+    // public R<Void> assignCustomer(@Validated @RequestBody CustomerVo customerVo) {
+    //     deviceService.assignCustomer(customerVo);
+    //     return R.ok();
+    // }
 
 
     // @Log("撤回设备")
-    @Operation(summary = "撤回分配设备")
-    @PostMapping(value = "/withdraw")
-    public R<Void> withdrawDevice(@RequestBody List<Long> ids) {
-        try {
-            deviceService.withdrawDevice(ids);
-        } catch (Exception e) {
-            log.error("updateDevice error: " + e.getMessage());
-            return R.fail(e.getMessage());
-        }
-        return R.ok();
-    }
+    // @Operation(summary = "撤回分配设备")
+    // @PostMapping(value = "/withdraw")
+    // public R<Void> withdrawDevice(@RequestBody List<Long> ids) {
+    //     try {
+    //         deviceService.withdrawDevice(ids);
+    //     } catch (Exception e) {
+    //         log.error("updateDevice error: " + e.getMessage());
+    //         return R.fail(e.getMessage());
+    //     }
+    //     return R.ok();
+    // }
 
     //
     // /**

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/controller/DeviceRepairRecordsController.java

@@ -2,6 +2,11 @@ package com.fuyuanshen.equipment.controller;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fuyuanshen.equipment.domain.DeviceRepairRecords;
+import com.fuyuanshen.equipment.domain.DeviceType;
+import com.fuyuanshen.equipment.domain.query.DeviceRepairRecordsQueryCriteria;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
@@ -41,8 +46,10 @@ public class DeviceRepairRecordsController extends BaseController {
      */
     @SaCheckPermission("equipment:repairRecords:list")
     @GetMapping("/list")
-    public TableDataInfo<DeviceRepairRecordsVo> list(DeviceRepairRecordsBo bo, PageQuery pageQuery) {
-        return deviceRepairRecordsService.queryPageList(bo, pageQuery);
+    @Operation(summary = "分页查询维修记录列表")
+    public TableDataInfo<DeviceRepairRecordsVo> list(DeviceRepairRecordsQueryCriteria criteria) {
+        Page<DeviceRepairRecords> page = new Page<>(criteria.getPageNum(), criteria.getPageSize());
+        return deviceRepairRecordsService.queryPageList(criteria, page);
     }
 
     /**
@@ -51,7 +58,7 @@ public class DeviceRepairRecordsController extends BaseController {
     @SaCheckPermission("equipment:repairRecords:export")
     @Log(title = "设备维修记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(DeviceRepairRecordsBo bo, HttpServletResponse response) {
+    public void export(DeviceRepairRecordsQueryCriteria bo, HttpServletResponse response) {
         List<DeviceRepairRecordsVo> list = deviceRepairRecordsService.queryList(bo);
         ExcelUtil.exportExcel(list, "设备维修记录", DeviceRepairRecordsVo.class, response);
     }
@@ -74,8 +81,8 @@ public class DeviceRepairRecordsController extends BaseController {
     @SaCheckPermission("equipment:repairRecords:add")
     @Log(title = "设备维修记录", businessType = BusinessType.INSERT)
     @RepeatSubmit()
-    @PostMapping()
-    public R<Void> add(@Validated(AddGroup.class) @RequestBody DeviceRepairRecordsBo bo) {
+    @PostMapping(consumes = "multipart/form-data")
+    public R<Void> add(@Validated(AddGroup.class) DeviceRepairRecordsBo bo) {
         return toAjax(deviceRepairRecordsService.insertByBo(bo));
     }
 
@@ -85,8 +92,8 @@ public class DeviceRepairRecordsController extends BaseController {
     @SaCheckPermission("equipment:repairRecords:edit")
     @Log(title = "设备维修记录", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @PutMapping()
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody DeviceRepairRecordsBo bo) {
+    @PutMapping(consumes = "multipart/form-data")
+    public R<Void> edit(@Validated(EditGroup.class) DeviceRepairRecordsBo bo) {
         return toAjax(deviceRepairRecordsService.updateByBo(bo));
     }
 

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

@@ -1,9 +1,6 @@
 package com.fuyuanshen.equipment.domain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fuyuanshen.common.tenant.core.TenantEntity;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -25,80 +22,94 @@ public class Device extends TenantEntity {
      * id
      */
     @TableId(value = "id", type = IdType.AUTO)
-    @Schema(name = "ID")
+    @Schema(title = "ID")
     private Long id;
 
-    @Schema(name = "设备记录ID")
+    /**
+     * 设备ID
+     */
+    @TableField(exist = false)
+    @Schema(title = "设备ID")
+    private Long deviceId;
+
+    @Schema(title = "设备记录ID")
     @TableField(exist = false)
     private Long assignId;
 
+    /**
+     * 设备分组
+     * group_id
+     */
+    @Schema(title = "设备分组")
+    private Long groupId;
+
     /**
      * device_type
      */
-    @Schema(name = "设备类型")
+    @Schema(title = "设备类型")
     private Long deviceType;
 
-    @Schema(name = "设备类型名称")
+    @Schema(title = "设备类型名称")
     private String typeName;
 
-    @Schema(name = "客户号")
+    @Schema(title = "客户号")
     private Long customerId;
 
-    @Schema(name = "所属客户")
+    @Schema(title = "所属客户")
     private String customerName;
 
     /**
      * 当前所有者
      * current_owner_id
      */
-    @Schema(name = "当前所有者")
+    @Schema(title = "当前所有者")
     private Long currentOwnerId;
 
     /**
      * 原始所有者（创建者）
      * original_owner_id
      */
-    @Schema(name = "原始所有者（创建者）")
+    @Schema(title = "原始所有者（创建者）")
     private Long originalOwnerId;
 
     /**
      * 原始设备
      */
-    @Schema(name = "原始设备")
+    @Schema(title = "原始设备")
     private Long originalDeviceId;
 
-    @Schema(name = "设备编号")
+    @Schema(title = "设备编号")
     private String deviceNo;
 
-    @Schema(name = "设备名称")
+    @Schema(title = "设备名称")
     private String deviceName;
 
-    @Schema(name = "设备图片")
+    @Schema(title = "设备图片")
     private String devicePic;
 
-    @Schema(name = "设备MAC")
+    @Schema(title = "设备MAC")
     private String deviceMac;
 
-    @Schema(name = "蓝牙名称")
+    @Schema(title = "蓝牙名称")
     private String bluetoothName;
 
     /**
      * 设备IMEI
      * device_imei
      */
-    @Schema(name = "设备IMEI")
+    @Schema(title = "设备IMEI")
     private String deviceImei;
 
-    @Schema(name = "设备SN")
+    @Schema(title = "设备SN")
     private String deviceSn;
 
-    @Schema(name = "经度")
+    @Schema(title = "经度")
     private String longitude;
 
-    @Schema(name = "纬度")
+    @Schema(title = "纬度")
     private String latitude;
 
-    @Schema(name = "备注")
+    @Schema(title = "备注")
     private String remark;
 
     /**
@@ -106,7 +117,7 @@ public class Device extends TenantEntity {
      * 0 失效
      * 1 正常
      */
-    @Schema(name = "设备状态")
+    @Schema(title = "设备状态")
     private Integer deviceStatus;
 
     /**
@@ -114,7 +125,7 @@ public class Device extends TenantEntity {
      * 0 未绑定
      * 1 已绑定
      */
-    @Schema(name = "绑定状态")
+    @Schema(title = "绑定状态")
     private Integer bindingStatus;
 
     /**
@@ -143,4 +154,15 @@ public class Device extends TenantEntity {
      */
     private String subTopic;
 
+    /**
+     * 出厂日期
+     * production_date
+     */
+    @Schema(title = "出厂日期")
+    private Date productionDate;
+
+    /**
+     * 在线状态(0离线，1在线,2异常)
+     */
+    private Integer onlineStatus;
 }

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

@@ -0,0 +1,103 @@
+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;
+
+    /**
+     * 报警事项
+     * 0-强制报警，1-撞击闯入，2-手动报警，3-电子围栏告警，4-强制告警
+     * device_action
+     */
+    private Integer 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 String durationTime;
+
+    /**
+     * 0已处理，1未处理
+     * treatment_state
+     */
+    private Long treatmentState;
+
+
+}

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

@@ -0,0 +1,108 @@
+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_charge_discharge
+ *
+ * @author Lion Li
+ * @date 2025-08-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("device_charge_discharge")
+public class DeviceChargeDischarge extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录唯一标识
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 设备唯一标识
+     */
+    private String deviceId;
+
+    /**
+     * 操作类型: 0 charge-充电, 1 discharge-放电
+     */
+    private Long operationType;
+
+    /**
+     * 开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 结束时间
+     */
+    private Date endTime;
+
+    /**
+     * 起始电量百分比(0-100)
+     */
+    private Long initialSoc;
+
+    /**
+     * 结束电量百分比(0-100)
+     */
+    private Long finalSoc;
+
+    /**
+     * 充放电量(kWh)
+     */
+    private Long energyKwh;
+
+    /**
+     * 设备额定功率(kW)
+     */
+    private Long powerRating;
+
+    /**
+     * 电压(V)
+     */
+    private Long voltage;
+
+    /**
+     * 电流(A)
+     */
+    private Long current;
+
+    /**
+     * 温度(℃)
+     */
+    private Long temperature;
+
+    /**
+     * 当前状态
+     */
+    private Long status;
+
+    /**
+     * 错误代码
+     */
+    private String errorCode;
+
+    /**
+     * 记录创建时间
+     */
+    private Date createdAt;
+
+    /**
+     * 记录更新时间
+     */
+    private Date updatedAt;
+
+
+}

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

@@ -0,0 +1,72 @@
+package com.fuyuanshen.equipment.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 围栏进出记录对象 device_fence_access_record
+ *
+ * @author Lion Li
+ * @date 2025-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("device_fence_access_record")
+public class DeviceFenceAccessRecord extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 记录ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 围栏ID
+     */
+    private Long fenceId;
+
+    /**
+     * 设备标识
+     */
+    private String deviceId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 事件类型
+     */
+    private Long eventType;
+
+    /**
+     * 纬度
+     */
+    private Long latitude;
+
+    /**
+     * 经度
+     */
+    private Long longitude;
+
+    /**
+     * 定位精度
+     */
+    private Long accuracy;
+
+    /**
+     * 事件时间
+     */
+    private Date eventTime;
+
+}

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

@@ -0,0 +1,63 @@
+package com.fuyuanshen.equipment.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.io.Serial;
+
+/**
+ * 电子围栏对象 device_geo_fence
+ *
+ * @author Lion Li
+ * @date 2025-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("device_geo_fence")
+public class DeviceGeoFence extends BaseEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 围栏唯一标识
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 围栏名称
+     */
+    private String name;
+
+    /**
+     * 围栏描述
+     */
+    private String description;
+
+    /**
+     * 围栏区域类型,  0 POLYGON, 1 CIRCLE
+     */
+    private Long areaType;
+
+    /**
+     * 围栏坐标数据
+     */
+    private String coordinates;
+
+    /**
+     * 圆形围栏半径(米)
+     */
+    private Long radius;
+
+    /**
+     * 是否激活
+     */
+    private Long isActive;
+
+
+}

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

@@ -0,0 +1,41 @@
+package com.fuyuanshen.equipment.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fuyuanshen.common.tenant.core.TenantEntity;
+import com.fuyuanshen.equipment.enums.RepairImageType;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 设备维修图片对象 device_repair_images
+ *
+ *
+ * @date 2025-09-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("device_repair_images")
+public class DeviceRepairImages extends TenantEntity {
+    /**
+     * 维修图片ID
+     */
+    @TableId(value = "image_id", type = IdType.AUTO)
+    @TableField(insertStrategy = FieldStrategy.NEVER)
+    private Long imageId;
+    /**
+     * 维修记录ID
+     */
+    @Schema(title = "维修记录ID")
+    private Long recordId;
+    /**
+     * 图片类型(维修前/维修后)
+     */
+    @Schema(title = "图片类型(维修前/维修后)")
+    private RepairImageType imageType;
+    /**
+     * 图片存储路径
+     */
+    @Schema(title = "图片存储路径")
+    private String imageUrl;
+}

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

@@ -26,7 +26,8 @@ public class DeviceRepairRecords extends TenantEntity {
     /**
      * 维修记录ID
      */
-    @TableId(value = "record_id")
+    @TableId(value = "record_id", type = IdType.AUTO)
+    @TableField(insertStrategy = FieldStrategy.NEVER)
     private Long recordId;
 
     /**

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

@@ -18,42 +18,48 @@ import lombok.Data;
 public class DeviceType extends TenantEntity {
 
     @TableId(value = "id", type = IdType.AUTO)
-    @Schema(name = "ID", hidden = true)
+    @Schema(title = "ID", hidden = true)
     private Long id;
 
-    @Schema(name = "客户号")
+    /**
+     * 设备类型ID
+     */
+    @TableField(exist = false)
+    private Long deviceTypeId;
+
+    @Schema(title = "客户号")
     private Long customerId;
 
-    @Schema(name = "创建该类型的客户")
+    @Schema(title = "创建该类型的客户")
     private Long ownerCustomerId;
 
     /**
      * 原始所有者（创建者）
      * original_owner_id
      */
-    @Schema(name = "原始所有者（创建者）")
+    @Schema(title = "原始所有者（创建者）")
     private Long originalOwnerId;
 
     /**
      * 原始设备
      */
-    @Schema(name = "原始设备类型")
+    @Schema(title = "原始设备类型")
     private Long originalDeviceId;
 
     @NotBlank(message = "设备类型名称不能为空")
-    @Schema(name = "类型名称", required = true)
+    @Schema(title = "类型名称", required = true)
     private String typeName;
 
-    @Schema(name = "是否支持蓝牙")
+    @Schema(title = "是否支持蓝牙")
     private Boolean isSupportBle;
 
-    @Schema(name = "定位方式", example = "0:无;1:GPS;2:基站;3:wifi;4:北斗")
+    @Schema(title = "定位方式", example = "0:无;1:GPS;2:基站;3:wifi;4:北斗")
     private String locateMode;
 
-    @Schema(name = "联网方式", example = "0:无;1:4G;2:WIFI")
+    @Schema(title = "联网方式", example = "0:无;1:4G;2:WIFI")
     private String networkWay;
 
-    @Schema(name = "通讯方式", example = "0:4G;1:蓝牙")
+    @Schema(title = "通讯方式", example = "0:4G;1:蓝牙,2 4G&蓝牙")
     private String communicationMode;
 
     /**
@@ -67,9 +73,17 @@ public class DeviceType extends TenantEntity {
 
     /**
      * 型号字典用于APP页面跳转
+     * app_model_dictionary
      */
-    @Schema(name = "型号字典用于APP页面跳转")
-    private String modelDictionary;
+    @Schema(title = "型号字典用于APP页面跳转")
+    private String appModelDictionary;
+
+    /**
+     * 型号字典用于PC页面跳转
+     * pc_model_dictionary
+     */
+    @Schema(title = "型号字典用于PC页面跳转")
+    private String pcModelDictionary;
 
 
 }

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

@@ -0,0 +1,116 @@
+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;
+
+    /**
+     * 报警事项
+     * device_action
+     */
+    private Integer deviceAction;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备MAC
+     * device_mac
+     */
+    private String deviceMac;
+
+    /**
+     * 设备IMEI
+     * device_imei
+     */
+    private String deviceImei;
+
+    /**
+     * 数据来源
+     */
+    private String dataSource;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 设备类型
+     * device_type
+     */
+    private Long deviceType;
+
+    /**
+     * 经度
+     */
+    private Long longitude;
+
+    /**
+     * 纬度
+     */
+    private Long latitude;
+
+    /**
+     * 报警位置
+     */
+    private String location;
+
+    /**
+     * 报警开始时间
+     */
+    private Date startTime;
+
+    /**
+     * 报警结束时间
+     */
+    private Date finishTime;
+
+    /**
+     * 报警持续时间
+     */
+    private Long durationTime;
+
+    /**
+     * 报警查询时间
+     */
+    private String queryTime1;
+    private String queryTime2;
+
+    /**
+     * 0已处理，1未处理
+     */
+    private Integer treatmentState;
+
+
+}

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

@@ -0,0 +1,123 @@
+package com.fuyuanshen.equipment.domain.bo;
+
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.equipment.domain.DeviceChargeDischarge;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import cn.hutool.core.date.DateUtil;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 设备充放电记录业务对象 device_charge_discharge
+ *
+ * @author Lion Li
+ * @date 2025-08-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DeviceChargeDischarge.class, reverseConvertGenerate = false)
+public class DeviceChargeDischargeBo extends BaseEntity {
+
+    /**
+     * 记录唯一标识
+     */
+    @NotNull(message = "记录唯一标识不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 设备唯一标识
+     */
+    @NotBlank(message = "设备唯一标识不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String deviceId;
+
+    /**
+     * 操作类型: 0 charge-充电, 1 discharge-放电
+     */
+    @NotNull(message = "操作类型: 0 charge-充电, 1 discharge-放电不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long operationType;
+
+    /**
+     * 开始时间
+     */
+    @NotNull(message = "开始时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startTime;
+
+    // 添加字符串类型的setter方法来处理前端传递的字符串日期
+    public void setStartTime(String startTime) {
+        this.startTime = DateUtil.parseDate(startTime);
+    }
+
+    /**
+     * 结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endTime;
+
+    // 添加字符串类型的setter方法来处理前端传递的字符串日期
+    public void setEndTime(String endTime) {
+        this.endTime = DateUtil.parseDate(endTime);
+    }
+
+    /**
+     * 起始电量百分比(0-100)
+     */
+    private Long initialSoc;
+
+    /**
+     * 结束电量百分比(0-100)
+     */
+    private Long finalSoc;
+
+    /**
+     * 充放电量(kWh)
+     */
+    private Long energyKwh;
+
+    /**
+     * 设备额定功率(kW)
+     */
+    private Long powerRating;
+
+    /**
+     * 电压(V)
+     */
+    private Long voltage;
+
+    /**
+     * 电流(A)
+     */
+    private Long current;
+
+    /**
+     * 温度(℃)
+     */
+    private Long temperature;
+
+    /**
+     * 当前状态
+     */
+    private Long status;
+
+    /**
+     * 错误代码
+     */
+    private String errorCode;
+
+    /**
+     * 记录创建时间
+     */
+    private Date createdAt;
+
+    /**
+     * 记录更新时间
+     */
+    private Date updatedAt;
+
+
+}

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

@@ -0,0 +1,83 @@
+package com.fuyuanshen.equipment.domain.bo;
+
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import com.fuyuanshen.equipment.domain.DeviceFenceAccessRecord;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 围栏进出记录业务对象 device_fence_access_record
+ *
+ * @author Lion Li
+ * @date 2025-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DeviceFenceAccessRecord.class, reverseConvertGenerate = false)
+public class DeviceFenceAccessRecordBo extends BaseEntity {
+
+    /**
+     * 记录ID
+     */
+    @NotNull(message = "记录ID不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 围栏ID
+     */
+    @NotNull(message = "围栏ID不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long fenceId;
+
+    /**
+     * 设备标识
+     */
+    @NotBlank(message = "设备标识不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String deviceId;
+
+    /**
+     * 用户ID
+     */
+    private Long userId;
+
+    /**
+     * 事件类型
+     */
+    @NotNull(message = "事件类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long eventType;
+
+    /**
+     * 纬度
+     */
+    @NotNull(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Double latitude;
+
+    /**
+     * 经度
+     */
+    @NotNull(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Double longitude;
+
+    /**
+     * 定位精度
+     */
+    private Long accuracy;
+
+    /**
+     * 事件时间
+     */
+    @NotNull(message = "事件时间不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Date eventTime;
+
+    /**
+     * 记录创建时间
+     */
+    private Date createTime;
+
+
+}

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

@@ -0,0 +1,75 @@
+package com.fuyuanshen.equipment.domain.bo;
+
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import com.fuyuanshen.equipment.domain.DeviceGeoFence;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * 电子围栏业务对象 device_geo_fence
+ *
+ * @author Lion Li
+ * @date 2025-09-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = DeviceGeoFence.class, reverseConvertGenerate = false)
+public class DeviceGeoFenceBo extends BaseEntity {
+
+    /**
+     * 围栏唯一标识
+     */
+    @NotNull(message = "围栏唯一标识不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 围栏名称
+     */
+    @NotBlank(message = "围栏名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 围栏描述
+     */
+    private String description;
+
+    /**
+     * 围栏区域类型,  0 POLYGON, 1 CIRCLE
+     */
+    @NotNull(message = "围栏区域类型,  0 POLYGON, 1 CIRCLE不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long areaType;
+
+    /**
+     * 围栏坐标数据
+     */
+    @NotBlank(message = "围栏坐标数据不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String coordinates;
+
+    /**
+     * 圆形围栏半径(米)
+     */
+    private Long radius;
+
+    /**
+     * 是否激活
+     */
+    private Long isActive;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+
+}

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

@@ -30,18 +30,21 @@ public class DeviceGroupBo extends BaseEntity {
     /**
      * 分组名称
      */
+    @Schema(title = "分组名称")
     @NotBlank(message = "分组名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String groupName;
 
     /**
      * 状态：0-禁用，1-正常
      */
+    @Schema(title = "状态：0-禁用，1-正常")
     // @NotNull(message = "状态：0-禁用，1-正常不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long status;
 
     /**
      * 父分组ID
      */
+    @Schema(title = "父分组ID")
     private Long parentId;
 
     /**
@@ -56,10 +59,10 @@ public class DeviceGroupBo extends BaseEntity {
     private Long isDeleted;
 
 
-    @Schema(name = "页码", example = "1")
+    @Schema(title = "页码", example = "1")
     private Integer pageNum = 1;
 
-    @Schema(name = "每页数据量", example = "10")
+    @Schema(title = "每页数据量", example = "10")
     private Integer pageSize = 10;
 
 }

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

@@ -1,15 +1,19 @@
 package com.fuyuanshen.equipment.domain.bo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fuyuanshen.common.core.validate.AddGroup;
 import com.fuyuanshen.common.core.validate.EditGroup;
 import com.fuyuanshen.equipment.domain.DeviceRepairRecords;
 import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
 import io.github.linpeilie.annotations.AutoMapper;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 设备维修记录业务对象 device_repair_records
@@ -37,6 +41,7 @@ public class DeviceRepairRecordsBo extends BaseEntity {
     /**
      * 维修时间
      */
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @NotNull(message = "维修时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date repairTime;
 
@@ -58,5 +63,11 @@ public class DeviceRepairRecordsBo extends BaseEntity {
     @NotBlank(message = "维修人员不能为空", groups = { AddGroup.class, EditGroup.class })
     private String repairPerson;
 
+    @Schema(title = "维修前图片")
+    @JsonIgnore
+    private MultipartFile beforeFile;
 
+    @Schema(title = "维修后图片")
+    @JsonIgnore
+    private MultipartFile afterFile;
 }

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

@@ -0,0 +1,63 @@
+package com.fuyuanshen.equipment.domain.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+
+/**
+ * 围栏位置检查响应结果
+ *
+ * @author: 默苍璃
+ * @date: 2025-09-1110:11
+ */
+
+@Data
+public class FenceCheckResponse {
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 检查时间
+     */
+    private Long checkTime;
+
+    /**
+     * 进入围栏列表
+     */
+    private List<FenceInfo> enteredFences;
+
+    /**
+     * 离开围栏列表
+     */
+    private List<FenceInfo> exitedFences;
+
+    /**
+     * 当前所在围栏列表
+     */
+    private List<FenceInfo> currentFences;
+
+    /**
+     * 围栏信息
+     */
+    @Data
+    public static class FenceInfo {
+        /**
+         * 围栏ID
+         */
+        private Long fenceId;
+
+        /**
+         * 围栏名称
+         */
+        private String fenceName;
+
+        /**
+         * 围栏类型
+         */
+        private Integer fenceType;
+    }
+}

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

@@ -0,0 +1,43 @@
+package com.fuyuanshen.equipment.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class InstructionRecordDto {
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+    /**
+     * 设备MAC
+     */
+    private String deviceMac;
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+
+    /**
+     * content
+     */
+    private String content;
+
+    /**
+     * 操作时间-开始时间
+     */
+    private String startTime;
+
+    /**
+     * 操作时间-结束时间
+     */
+    private String endTime;
+
+    /**
+     * 分组id
+     */
+    private Long groupId;
+}

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

@@ -40,7 +40,7 @@ public class DeviceForm {
     @Schema(title = "设备MAC")
     private String deviceMac;
 
-    @Schema(name = "蓝牙名称")
+    @Schema(title = "蓝牙名称")
     private String bluetoothName;
 
 

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

@@ -11,28 +11,42 @@ import lombok.Data;
 @Data
 public class DeviceTypeForm {
 
-    @Schema(name = "ID", hidden = true)
+    @Schema(title = "ID", hidden = true)
     private Long id;
 
-    @Schema(name = "类型名称", required = true)
+    @Schema(title = "类型名称", required = true)
     private String typeName;
 
-    @Schema(name = "是否支持蓝牙")
+    @Schema(title = "是否支持蓝牙")
     private Boolean isSupportBle;
 
-    @Schema(name = "定位方式", example = "0:无;1:GPS;2:基站;3:wifi;4:北斗")
+    @Schema(title = "定位方式", example = "0:无;1:GPS;2:基站;3:wifi;4:北斗")
     private String locateMode;
 
-    @Schema(name = "联网方式", example = "0:无;1:4G;2:WIFI")
+    @Schema(title = "联网方式", example = "0:无;1:4G;2:WIFI")
     private String networkWay;
 
-    @Schema(name = "通讯方式", example = "0:4G;1:蓝牙")
+    @Schema(title = "通讯方式", example = "0:4G;1:蓝牙")
     private String communicationMode;
 
     /**
      * 型号字典用于APP页面跳转
      */
-    @Schema(name = "型号字典用于APP页面跳转")
+    @Schema(title = "型号字典用于APP页面跳转")
     private String modelDictionary;
 
+    /**
+     * 型号字典用于APP页面跳转
+     * app_model_dictionary
+     */
+    @Schema(title = "型号字典用于APP页面跳转")
+    private String appModelDictionary;
+
+    /**
+     * 型号字典用于PC页面跳转
+     * pc_model_dictionary
+     */
+    @Schema(title = "型号字典用于PC页面跳转")
+    private String pcModelDictionary;
+
 }

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

@@ -18,22 +18,34 @@ import java.util.Set;
 @Data
 public class DeviceQueryCriteria extends BaseEntity {
 
-    @Schema(name = "设备id")
+    /**
+     * 设备id
+     */
     private Long deviceId;
 
-    @Schema(name = "设备名称")
+    /**
+     * 设备名称
+     */
     private String deviceName;
 
-    @Schema(name = "设备类型")
+    /**
+     * 设备类型
+     */
     private Long deviceType;
 
-    @Schema(name = "设备MAC")
+    /**
+     * 设备MAC
+     */
     private String deviceMac;
 
-    @Schema(name = "设备IMEI")
+    /**
+     * 设备IMEI
+     */
     private String deviceImei;
 
-    @Schema(name = "设备SN")
+    /**
+     * 设备SN
+     */
     private String deviceSn;
 
     /**
@@ -41,33 +53,71 @@ public class DeviceQueryCriteria extends BaseEntity {
      * 0 失效
      * 1 正常
      */
-    @Schema(name = "设备状态  0 失效 1 正常  ")
     private Integer deviceStatus;
 
-    @Schema(name = "页码", example = "1")
+    /**
+     * 页码
+     */
     private Integer pageNum = 1;
 
-    @Schema(name = "每页数据量", example = "10")
+    /**
+     * 每页数据量
+     */
     private Integer pageSize = 10;
 
-    @Schema(name = "客户id")
+    /**
+     * 客户id
+     */
     private Long customerId;
     private Set<Long> customerIds;
 
-    @Schema(name = "当前所有者")
+    /**
+     * 当前所有者
+     */
     private Long currentOwnerId;
 
-    @Schema(name = "租户ID")
+    /**
+     * 租户ID
+     */
     private String tenantId;
 
-    @Schema(name = "通讯方式", example = "0:4G;1:蓝牙")
+    /**
+     * 通讯方式 0:4G;1:蓝牙
+     * communication_mode
+     */
     private Integer communicationMode;
 
     /* app绑定用户id */
     private Long bindingUserId;
 
 
-    /* 是否为管理员 */
+    /**
+     * 使用人员
+     */
+    private String personnelBy;
+
+
+    /**
+     * 是否为管理员
+     */
     private Boolean isAdmin = false;
 
+    /**
+     * 设备所属分组
+     */
+    private Long groupId;
+
+    /**
+     * 设备地区
+     */
+    private String area;
+
+    private String content;
+
+    /**
+     * 设备在线状态
+     * 0:离线;1:在线
+     */
+    private Integer onlineStatus;
+
 }

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

@@ -0,0 +1,72 @@
+package com.fuyuanshen.equipment.domain.query;
+
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.core.validate.EditGroup;
+import com.fuyuanshen.common.mybatis.core.domain.BaseEntity;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.Date;
+
+/**
+ * 设备维修记录查询
+ *
+ * @Description:
+ * @Author: WY
+ * @Date: 2025/5/16
+ **/
+@Data
+public class DeviceRepairRecordsQueryCriteria extends BaseEntity {
+    /**
+     * 维修记录ID
+     */
+    private Long recordId;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 维修时间
+     */
+    private Date repairTime;
+
+    /**
+     * 维修部位
+     */
+    private String repairPart;
+
+    /**
+     * 维修原因
+     */
+    private String repairReason;
+
+    /**
+     * 维修人员
+     */
+    private String repairPerson;
+
+    @Schema(title = "维修开始时间")
+    private Date repairBeginTime;
+    @Schema(title = "维修结束时间")
+    private Date repairEndTime;
+
+    @Schema(title = "所属客户")
+    private Long customerId;
+
+    @Schema(title = "com.fuyuanshen")
+    private Long tenantId;
+    /**
+     * 页码
+     */
+    private Integer pageNum = 1;
+
+    /**
+     * 每页数据量
+     */
+    private Integer pageSize = 10;
+}

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

@@ -15,25 +15,25 @@ import java.util.Set;
 @Data
 public class DeviceTypeQueryCriteria extends BaseEntity implements Serializable {
 
-    @Schema(name = "设备类型id")
+    @Schema(title = "设备类型id")
     private Long deviceTypeId;
 
-    @Schema(name = "型号名称")
+    @Schema(title = "型号名称")
     private String typeName;
 
-    @Schema(name = "所属客户")
+    @Schema(title = "所属客户")
     private Set<Long> customerIds;
 
-    @Schema(name = "所属客户")
+    @Schema(title = "所属客户")
     private Long customerId;
 
-    @Schema(name = "com.fuyuanshen")
+    @Schema(title = "com.fuyuanshen")
     private Long tenantId;
 
-    @Schema(name = "页码", example = "1")
+    @Schema(title = "页码", example = "1")
     private Integer pageNum = 1;
 
-    @Schema(name = "每页数据量", example = "10")
+    @Schema(title = "每页数据量", example = "10")
     private Integer pageSize = 10;
 
 

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

@@ -0,0 +1,40 @@
+package com.fuyuanshen.equipment.domain.query;
+
+/**
+ * @author: 默苍璃
+ * @date: 2025-09-1110:10
+ */
+
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+/**
+ * 围栏位置检查请求参数
+ */
+@Data
+public class FenceCheckRequest {
+
+    /**
+     * 设备ID
+     */
+    @NotNull(message = "设备ID不能为空")
+    private String deviceId;
+
+    /**
+     * 纬度
+     */
+    @NotNull(message = "纬度不能为空")
+    private Double latitude;
+
+    /**
+     * 经度
+     */
+    @NotNull(message = "经度不能为空")
+    private Double longitude;
+
+    /**
+     * 定位精度(米)
+     */
+    private Long accuracy;
+
+}

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

@@ -0,0 +1,56 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 报警信息
+ *
+ * @author: 默苍璃
+ * @date: 2025-09-0114:24
+ */
+@Data
+public class AlarmInformationVo {
+
+    /**
+     * 报警总数
+     */
+    private Integer alarmsTotal = 0;
+
+    /**
+     * 总处理报警
+     */
+    private Integer processingAlarm = 0;
+
+
+    /**
+     * 今日报警总数
+     */
+    private Integer alarmsTotalToday = 0;
+
+    /**
+     * 今日总处理报警
+     */
+    private Integer processingAlarmToday = 0;
+
+
+    /**
+     * 强制报警
+     */
+    private Integer alarmForced = 0;
+
+    /**
+     * 撞击闯入
+     */
+    private Integer intrusionImpact = 0;
+
+    /**
+     * 手动报警
+     */
+    private Integer alarmManual = 0;
+
+    /**
+     *
+     */
+    private Integer fenceElectronic = 0;
+
+}

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

@@ -16,11 +16,11 @@ import java.util.List;
 @Validated
 public class CustomerVo {
 
-    @Schema(name = "客户ID")
+    @Schema(title = "客户ID")
     @NotNull(message = "客户ID不能为空")
     private Long customerId;
 
-    @Schema(name = "设备ID")
+    @Schema(title = "设备ID")
     @NotNull(message = "设备ID不能为空")
     private List<Long> deviceIds;
 

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

@@ -0,0 +1,39 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import lombok.Data;
+
+/**
+ * 数据总览
+ *
+ * @author: 默苍璃
+ * @date: 2025-09-0114:24
+ */
+@Data
+public class DataOverviewVo {
+
+    /**
+     * 设备数据量
+     */
+    private Integer devicesNumber = 0;
+
+    /**
+     * 在线设备
+     */
+    private Integer equipmentOnline = 0;
+
+    /**
+     * 新增绑定设备
+     */
+    private Integer bindingNew = 0;
+
+    /**
+     * 已绑定设备
+     */
+    private Integer binding = 0;
+
+    /**
+     * 异常设备
+     */
+    private Integer equipmentAbnormal = 0;
+
+}

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

@@ -0,0 +1,137 @@
+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 io.swagger.v3.oas.annotations.media.Schema;
+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;
+
+    /**
+     * 报警事项
+     * 0-强制报警，1-撞击闯入，2-手动报警，3-电子围栏告警，4-强制告警
+     */
+    @ExcelProperty(value = "报警事项")
+    private Integer deviceAction;
+
+    /**
+     * 设备名称
+     */
+    @ExcelProperty(value = "设备名称")
+    private String deviceName;
+
+    /**
+     * 设备MAC
+     */
+    private String deviceMac;
+
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+
+    /**
+     * 数据来源
+     */
+    @ExcelProperty(value = "数据来源")
+    private String dataSource;
+
+    /**
+     * 内容
+     */
+    @ExcelProperty(value = "内容")
+    private String content;
+
+    /**
+     * 设备类型
+     */
+    @ExcelProperty(value = "设备类型")
+    private Long deviceType;
+    private String deviceTypeName;
+
+    /**
+     * 经度
+     */
+    @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 String durationTime;
+
+    /**
+     * 0已处理，1未处理
+     */
+    @ExcelProperty(value = "0已处理，1未处理")
+    private Integer treatmentState;
+
+    /**
+     * 设备图片
+     * device_pic
+     */
+    @Schema(name = "设备图片")
+    private String devicePic;
+
+}