今日报警总数

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

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

@@ -6,7 +6,9 @@ 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.DeviceBJQBizService;
 import com.fuyuanshen.web.service.device.DeviceXinghanBizService;
 import lombok.RequiredArgsConstructor;
@@ -33,6 +35,15 @@ public class AppDeviceXinghanController extends BaseController {
         return toAjax(appDeviceService.registerPersonInfo(bo));
     }
 
+    /**
+     * 发送紧急通知
+     */
+    @PostMapping(value = "/sendAlarmMessage")
+    @FunctionAccessBatcAnnotation(value = "sendAlarmMessage", timeOut = 5, batchMaxTimeOut = 10)
+    public R<Void> sendAlarmMessage(@RequestBody AppDeviceSendMsgBo bo) {
+        return toAjax(appDeviceService.sendAlarmMessage(bo));
+    }
+
     /**
      * 上传设备logo图片
      */
@@ -72,7 +83,7 @@ public class AppDeviceXinghanController extends BaseController {
     }
 
     /**
-     * SOS档位
+     * SOS档位s
      * SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
      */
     @PostMapping("/SOSGradeSettings")

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/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/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/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

@@ -114,13 +114,24 @@ public class XinghanBootLogoRule implements MqttMessageRule {
 
     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));
@@ -128,6 +139,7 @@ public class XinghanBootLogoRule implements MqttMessageRule {
         return list;
     }
 
+
     /* ---------- DTO ---------- */
 
     @Data

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 + 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 + 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

@@ -57,7 +57,7 @@ public class XinghanSendMsgRule implements MqttMessageRule {
 
             // 1. genius! —— 成功标记
             if ("genius!".equalsIgnoreCase(respText)) {
-                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(20));
+                RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.OK.getCode(), Duration.ofSeconds(20));
                 log.info("设备 {} 发送消息完成", ctx.getDeviceImei());
                 return;
             }
@@ -79,6 +79,7 @@ public class XinghanSendMsgRule implements MqttMessageRule {
             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 的整数

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

@@ -1,6 +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 = "mqtt:message:queue";
-    public static final String MQTT_MESSAGE_DEDUP_KEY = "mqtt:message:dedup";
+    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/DeviceChargeDischargeController.java

@@ -39,7 +39,7 @@ public class DeviceChargeDischargeController extends BaseController {
     /**
      * 查询设备充放电记录列表
      */
-    @SaCheckPermission("equipment:chargeDischarge:list")
+    // @SaCheckPermission("equipment:chargeDischarge:list")
     @GetMapping("/list")
     public TableDataInfo<DeviceChargeDischargeVo> list(DeviceChargeDischargeBo bo, PageQuery pageQuery) {
         return deviceChargeDischargeService.queryPageList(bo, pageQuery);
@@ -48,7 +48,7 @@ public class DeviceChargeDischargeController extends BaseController {
     /**
      * 设备充放电记录列表
      */
-    @SaCheckPermission("equipment:chargeDischarge:export")
+    // @SaCheckPermission("equipment:chargeDischarge:export")
     @Log(title = "设备充放电记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(DeviceChargeDischargeBo bo, HttpServletResponse response) {
@@ -61,7 +61,7 @@ public class DeviceChargeDischargeController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("equipment:chargeDischarge:query")
+    // @SaCheckPermission("equipment:chargeDischarge:query")
     @GetMapping("/{id}")
     public R<DeviceChargeDischargeVo> getInfo(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {
@@ -71,7 +71,7 @@ public class DeviceChargeDischargeController extends BaseController {
     /**
      * 新增设备充放电记录
      */
-    @SaCheckPermission("equipment:chargeDischarge:add")
+    // @SaCheckPermission("equipment:chargeDischarge:add")
     @Log(title = "设备充放电记录", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
@@ -82,7 +82,7 @@ public class DeviceChargeDischargeController extends BaseController {
     /**
      * 修改设备充放电记录
      */
-    @SaCheckPermission("equipment:chargeDischarge:edit")
+    // @SaCheckPermission("equipment:chargeDischarge:edit")
     @Log(title = "设备充放电记录", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
@@ -95,11 +95,13 @@ public class DeviceChargeDischargeController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("equipment:chargeDischarge:remove")
+    // @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/DeviceShareController.java

@@ -1,18 +1,32 @@
 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.equipment.domain.bo.DeviceAlarmBo;
-import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
 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.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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;
 
 /**
  * 设备分享管理
@@ -26,18 +40,66 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("api/equipment/share")
 public class DeviceShareController extends BaseController {
 
-    private final DeviceShareService appDeviceShareService;
+    private final DeviceShareService deviceShareService;
 
 
     /**
-     *查询设备分享列表(web)
+     * 分享管理列表
      */
-    // @SaCheckPermission("equipment:alarm:list")
-    @GetMapping("/list")
+    @GetMapping("/deviceShareList")
     public TableDataInfo<AppDeviceShareVo> list(AppDeviceShareBo bo, PageQuery pageQuery) {
-        return appDeviceShareService.queryWebList(bo, 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.deviceShare(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/HomePageController.java

@@ -61,13 +61,15 @@ public class HomePageController {
     /**
      * 获取设备使用数据
      *
-     * @param deviceId 设备ID
+     * @param deviceTypeId 设备ID (可选)
      * @param range    时间范围 1:半年 2:一年
      * @return 每月使用数据列表
      */
-    @GetMapping("/getEquipmentUsageData/{deviceId}/{range}")
-    public R<List<Map<String, Object>>> getEquipmentUsageData(@PathVariable Long deviceId, @PathVariable Integer range) {
-        return R.ok(deviceService.getEquipmentUsageData(deviceId, range));
+    @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

@@ -3,6 +3,8 @@ package com.fuyuanshen.web.controller.device;
 
 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.DeviceLog;
 import com.fuyuanshen.equipment.domain.vo.DeviceAlarmVo;
@@ -65,7 +67,7 @@ public class WEBDeviceController extends BaseController {
      * @param deviceId
      * @return
      */
-    @Operation(summary = "设备详情")
+    @Operation(summary = "设备用户详情")
     @GetMapping(value = "/getDeviceUser/{deviceId}")
     public R<List<AppPersonnelInfoRecords>> getDeviceUser(@PathVariable Long deviceId) {
         List<AppPersonnelInfoRecords> device = deviceService.getDeviceUser(deviceId);
@@ -77,13 +79,18 @@ public class WEBDeviceController extends BaseController {
      * 设备操作记录
      *
      * @param deviceId
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @return
      */
     @Operation(summary = "设备操作记录")
     @GetMapping(value = "/getOperationRecord/{deviceId}")
-    public R<List<DeviceLog>> getOperationRecord(@PathVariable Long deviceId) {
-        List<DeviceLog> device = deviceService.getOperationRecord(deviceId);
-        return R.ok(device);
+    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;
     }
 
 
@@ -91,13 +98,17 @@ public class WEBDeviceController extends BaseController {
      * 设备告警记录
      *
      * @param deviceId
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @return
      */
     @Operation(summary = "设备告警记录")
     @GetMapping(value = "/getAlarmRecord/{deviceId}")
-    public R<List<DeviceAlarmVo>> getAlarmRecord(@PathVariable Long deviceId) {
-        List<DeviceAlarmVo> device = deviceService.getAlarmRecord(deviceId);
-        return R.ok(device);
+    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/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;
@@ -50,6 +53,8 @@ public class DeviceShareService {
 
     private final AppPersonnelInfoMapper appPersonnelInfoMapper;
 
+    private final AppDeviceBindRecordMapper appDeviceBindRecordMapper;
+
     public TableDataInfo<AppDeviceShareVo> queryPageList(AppDeviceShareBo bo, PageQuery pageQuery) {
         Long userId = AppLoginHelper.getUserId();
         bo.setCreateBy(userId);
@@ -60,6 +65,16 @@ 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);
@@ -175,7 +190,7 @@ public class DeviceShareService {
     /**
      * 校验短信验证码
      */
-    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("验证码失效");
@@ -184,16 +199,21 @@ public class DeviceShareService {
     }
 
     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();
+
+        boolean flag = validateSmsCode( bo.getPhonenumber(), bo.getSmsCode());
+        if (!flag) {
+            throw new ServiceException("验证码错误");
+        }
+
+        LambdaQueryWrapper<AppDeviceBindRecord> qw = new LambdaQueryWrapper<>();
+        qw.eq(AppDeviceBindRecord::getDeviceId, bo.getDeviceId());
+        AppDeviceBindRecord bindRecord = appDeviceBindRecordMapper.selectOne(qw);
+        Long userId = bindRecord.getBindingUserId();
+
         LambdaQueryWrapper<AppDeviceShare> lqw = new LambdaQueryWrapper<>();
         lqw.eq(AppDeviceShare::getDeviceId, bo.getDeviceId());
         lqw.eq(AppDeviceShare::getPhonenumber, bo.getPhonenumber());

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

@@ -53,16 +53,21 @@ public interface WEBDeviceService extends IService<Device> {
      * 设备操作记录
      *
      * @param deviceId
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @return
      */
-    List<DeviceLog> getOperationRecord(Long deviceId);
+    TableDataInfo<DeviceLog> getOperationRecord(Long deviceId, String startTime, String endTime, PageQuery pageQuery);
 
 
     /**
      * 设备告警记录
      *
      * @param deviceId
+     * @param startTime 开始时间
+     * @param endTime 结束时间
      * @return
      */
-    List<DeviceAlarmVo> getAlarmRecord(Long deviceId);
+    TableDataInfo<DeviceAlarmVo> getAlarmRecord(Long deviceId, String startTime, String endTime, PageQuery pageQuery);
+
 }

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

@@ -100,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);
 
@@ -538,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/DeviceXinghanBizService.java

@@ -39,8 +39,7 @@ import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_K
 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.DEVICE_BOOT_LOGO_KEY_PREFIX;
-import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
 
 @Slf4j
 @Service
@@ -62,7 +61,7 @@ public class DeviceXinghanBizService {
             "ins_DetectGrade", Map.of(1, "低档", 2, "中档", 3, "高档"),
             "ins_LightGrade",  Map.of(1, "强光", 2, "弱光"),
             "ins_SOSGrade",  Map.of(1, "爆闪模式", 2, "红蓝模式"),
-            "ins_ShakeBit",  Map.of(0, "未静止报警", 1, "正在静止报警")
+            "ins_ShakeBit",  Map.of(1, "开启报警")
             // 再加 4、5、6…… 档，直接往 Map 里塞即可
     );
 
@@ -161,11 +160,12 @@ public class DeviceXinghanBizService {
         List<AppPersonnelInfoVo> appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw);
 
         List<String> list = new ArrayList<>();
-        list.add(bo.getUnitName());
         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));
@@ -195,47 +195,145 @@ public class DeviceXinghanBizService {
         }
     }
 
+    /**
+     * 发送报警信息
+     * @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 sendCommand(DeviceInstructDto dto,
-                             String payloadKey,String deviceAction) {
-        long deviceId = dto.getDeviceId();
-        Device device = deviceMapper.selectById(deviceId);
-        if (device == null) {
-            throw new ServiceException("设备不存在");
-        }
-        if (isDeviceOffline(device.getDeviceImei())) {
-            throw new ServiceException("设备已断开连接：" + device.getDeviceName());
-        }
+    /**
+     * 封装单个设备发送告警信息的逻辑
+     */
+    private void sendSingleAlarmMessage(Device device, String message) {
+        String deviceImei = device.getDeviceImei();
 
-        Integer value = Integer.parseInt(dto.getInstructValue());
+        // 缓存告警消息到Redis
+        RedisUtils.setCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + deviceImei + DEVICE_ALARM_MESSAGE_KEY_PREFIX, message, Duration.ofSeconds(5 * 60L));
 
-        Map<String, Object> payload = Map.of(payloadKey,
-                Collections.singletonList(value));
-
-        String topic = MqttConstants.GLOBAL_PUB_KEY + device.getDeviceImei();
+        // 构建并发送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());
         }
 
-        log.info("发送指令成功 => topic:{}, payload:{}", topic, json);
+        // 5. 将日志记录和描述解析放在try-catch块之外，确保无论是否成功发送指令都能执行
         String content = resolveGradeDesc("ins_DetectGrade", value);
         recordDeviceLog(device.getId(),
-                device.getDeviceName(),
+                deviceName,
                 deviceAction,
                 content,
                 AppLoginHelper.getUserId());
     }
 
-    private boolean isDeviceOffline(String imei) {
-        // 原方法名语义相反，这里取反，使含义更清晰
-        return getDeviceStatus(imei);
-    }
+//    private boolean isDeviceOffline(String imei) {
+//        // 原方法名语义相反，这里取反，使含义更清晰
+//        return getDeviceStatus(imei);
+//    }
 
     /**
      * 记录设备操作日志
@@ -261,9 +359,9 @@ public class DeviceXinghanBizService {
         }
     }
 
-    private boolean getDeviceStatus(String deviceImei) {
+    private boolean isDeviceOffline(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/impl/WEBDeviceServiceImpl.java

@@ -1,16 +1,20 @@
 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.domain.vo.AppDeviceShareVo;
 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;
@@ -23,7 +27,6 @@ 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;
@@ -129,11 +132,19 @@ public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impl
      * @return
      */
     @Override
-    public List<DeviceLog> getOperationRecord(Long deviceId) {
-        List<DeviceLog> logList = deviceLogMapper.selectList(
-                new QueryWrapper<DeviceLog>().eq("device_id", deviceId)
-                        .orderByDesc("create_time"));
-        return logList;
+    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);
     }
 
 
@@ -144,13 +155,23 @@ public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impl
      * @return
      */
     @Override
-    public List<DeviceAlarmVo> getAlarmRecord(Long deviceId) {
-        List<DeviceAlarm> alarmList = deviceAlarmMapper.selectList(
-                new QueryWrapper<DeviceAlarm>().eq("device_id", deviceId)
-                        .orderByDesc("create_time"));
-        List<DeviceAlarmVo> deviceAlarmVoList = BeanUtil.copyToList(alarmList, DeviceAlarmVo.class);
-        return deviceAlarmVoList;
+    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-modules/fys-app/src/main/resources/mapper/app/AppDeviceShareMapper.xml

@@ -50,18 +50,32 @@
 
     <!-- 查询设备分享列表(web) -->
     <select id="selectWebDeviceShareList" resultType="com.fuyuanshen.app.domain.vo.AppDeviceShareVo">
-        select *
+        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.share_user = #{bo.shareUser}
+                and u.user_name = #{bo.shareUser}
             </if>
-            <if test="criteria.shareStartTime != null and criteria.hareEndTime != null">
-                and d.create_time between #{bo.shareStartTime} and #{bo.shareEndTime}
+            <if test="bo.shareStartTime != null and bo.hareEndTime != null">
+                and ad.create_time between #{bo.shareStartTime} and #{bo.shareEndTime}
             </if>
         </where>
 

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/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/DeviceAlarm.java

@@ -4,7 +4,9 @@ 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;
@@ -63,7 +65,6 @@ public class DeviceAlarm extends TenantEntity {
 
     /**
      * 经度
-
      */
     private Long longitude;
 
@@ -90,7 +91,7 @@ public class DeviceAlarm extends TenantEntity {
     /**
      * 报警持续时间
      */
-    private Long durationTime;
+    private String durationTime;
 
     /**
      * 0已处理，1未处理

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/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/form/DeviceTypeForm.java

@@ -35,4 +35,18 @@ public class DeviceTypeForm {
     @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

@@ -114,4 +114,10 @@ public class DeviceQueryCriteria extends BaseEntity {
 
     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/vo/AlarmInformationVo.java

@@ -21,6 +21,18 @@ public class AlarmInformationVo {
      */
     private Integer processingAlarm = 0;
 
+
+    /**
+     * 今日报警总数
+     */
+    private Integer alarmsTotalToday = 0;
+
+    /**
+     * 今日总处理报警
+     */
+    private Integer processingAlarmToday = 0;
+
+
     /**
      * 强制报警
      */

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

@@ -0,0 +1,48 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import com.fuyuanshen.equipment.domain.DeviceRepairImages;
+import com.fuyuanshen.equipment.domain.DeviceRepairRecords;
+import com.fuyuanshen.equipment.enums.RepairImageType;
+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;
+
+/**
+ * 设备维修图片视图对象 device_repair_records
+ *
+ * @author Lion Li
+ * @date 2025-09-01
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = DeviceRepairImages.class)
+public class DeviceRepairImagesVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 维修图片ID
+     */
+    @Schema(title = "维修图片ID")
+    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/vo/DeviceRepairRecordsVo.java

@@ -2,6 +2,7 @@ package com.fuyuanshen.equipment.domain.vo;
 
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fuyuanshen.common.tenant.core.TenantEntity;
 import com.fuyuanshen.equipment.domain.DeviceRepairRecords;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -13,7 +14,7 @@ import lombok.Data;
 import java.io.Serial;
 import java.io.Serializable;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -25,7 +26,7 @@ import java.util.Date;
 @Data
 @ExcelIgnoreUnannotated
 @AutoMapper(target = DeviceRepairRecords.class)
-public class DeviceRepairRecordsVo implements Serializable {
+public class DeviceRepairRecordsVo extends TenantEntity implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
@@ -65,6 +66,12 @@ public class DeviceRepairRecordsVo implements Serializable {
      */
     @ExcelProperty(value = "维修人员")
     private String repairPerson;
+    /**
+     * 维修人员
+     */
+    @ExcelProperty(value = "设备名称")
+    private String deviceName;
 
+    private List<DeviceRepairImagesVo> images;
 
 }

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

@@ -26,4 +26,24 @@ public class EquipmentClassificationVo {
      */
     private Integer devices4GAndBluetooth = 0;
 
+    /**
+     * 设备总数
+     */
+    private Integer total;
+
+
+    /**
+     * 计算设备总数
+     *
+     * @return 设备总数
+     */
+    public Integer getTotal() {
+        if (total == null) {
+            total = (equipment4G == null ? 0 : equipment4G) +
+                    (deviceBluetooth == null ? 0 : deviceBluetooth) +
+                    (devices4GAndBluetooth == null ? 0 : devices4GAndBluetooth);
+        }
+        return total;
+    }
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/enums/RepairImageType.java

@@ -0,0 +1,23 @@
+package com.fuyuanshen.equipment.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+import java.util.Arrays;
+
+@Getter
+@AllArgsConstructor
+public enum RepairImageType {
+    BEFORE(1, "维修前"),
+    AFTER(2, "维修后");
+
+    private final int code;
+    private final String desc;
+
+    public static RepairImageType of(Integer code) {
+        return Arrays.stream(values())
+                .filter(e -> e.getCode() == code)
+                .findFirst()
+                .orElse(null);
+    }
+}

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

@@ -99,11 +99,11 @@ public interface DeviceMapper extends BaseMapper<Device> {
     /**
      * 获取设备使用数据
      *
-     * @param deviceId 设备ID
+     * @param deviceTypeId 设备ID
      * @param range    时间范围 1:半年 2:一年
      * @return 每月使用数据列表
      */
-    List<Map<String, Object>> getEquipmentUsageData(Long deviceId, Integer range);
+    List<Map<String, Object>> getEquipmentUsageData(@Param("deviceTypeId") Long deviceTypeId, @Param("range") Integer range);
 
     // 在DeviceMapper.java中添加方法
     int getUsageDataForMonth(@Param("deviceId") Long deviceId,

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

@@ -0,0 +1,8 @@
+package com.fuyuanshen.equipment.mapper;
+
+import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+import com.fuyuanshen.equipment.domain.DeviceRepairImages;
+import com.fuyuanshen.equipment.domain.vo.DeviceRepairImagesVo;
+
+public interface DeviceRepairImagesMapper extends BaseMapperPlus<DeviceRepairImages, DeviceRepairImagesVo> {
+}

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

@@ -1,8 +1,16 @@
 package com.fuyuanshen.equipment.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+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 com.fuyuanshen.equipment.domain.query.DeviceTypeQueryCriteria;
 import com.fuyuanshen.equipment.domain.vo.DeviceRepairRecordsVo;
 import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 设备维修记录Mapper接口
@@ -11,5 +19,19 @@ import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
  * @date 2025-08-08
  */
 public interface DeviceRepairRecordsMapper extends BaseMapperPlus<DeviceRepairRecords, DeviceRepairRecordsVo> {
-
+    /**
+     * 分页查询维修记录
+     *
+     * @param criteria
+     * @param page
+     * @return
+     */
+    IPage<DeviceRepairRecordsVo> findAll(@Param("criteria") DeviceRepairRecordsQueryCriteria criteria, Page<DeviceRepairRecords> page);
+    /**
+     * 查询所有维修记录
+     *
+     * @param criteria
+     * @return
+     */
+    List<DeviceRepairRecordsVo> findAll(@Param("criteria") DeviceRepairRecordsQueryCriteria criteria);
 }

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

@@ -139,9 +139,9 @@ public interface DeviceService extends IService<Device> {
     /**
      * 获取设备使用数据
      *
-     * @param deviceId
+     * @param deviceTypeId
      * @param range
      * @return
      */
-    List<Map<String, Object>> getEquipmentUsageData(Long deviceId, Integer range);
+    List<Map<String, Object>> getEquipmentUsageData(Long deviceTypeId, Integer range);
 }

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

@@ -1,5 +1,10 @@
 package com.fuyuanshen.equipment.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceRepairRecords;
+import com.fuyuanshen.equipment.domain.query.DeviceRepairRecordsQueryCriteria;
 import com.fuyuanshen.equipment.domain.vo.DeviceRepairRecordsVo;
 import com.fuyuanshen.equipment.domain.bo.DeviceRepairRecordsBo;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
@@ -14,7 +19,7 @@ import java.util.List;
  * @author Lion Li
  * @date 2025-08-08
  */
-public interface IDeviceRepairRecordsService {
+public interface IDeviceRepairRecordsService extends IService<DeviceRepairRecords> {
 
     /**
      * 查询设备维修记录
@@ -31,7 +36,7 @@ public interface IDeviceRepairRecordsService {
      * @param pageQuery 分页参数
      * @return 设备维修记录分页列表
      */
-    TableDataInfo<DeviceRepairRecordsVo> queryPageList(DeviceRepairRecordsBo bo, PageQuery pageQuery);
+    TableDataInfo<DeviceRepairRecordsVo> queryPageList(DeviceRepairRecordsQueryCriteria criteria, Page<DeviceRepairRecords> page);
 
     /**
      * 查询符合条件的设备维修记录列表
@@ -39,7 +44,7 @@ public interface IDeviceRepairRecordsService {
      * @param bo 查询条件
      * @return 设备维修记录列表
      */
-    List<DeviceRepairRecordsVo> queryList(DeviceRepairRecordsBo bo);
+    List<DeviceRepairRecordsVo> queryList(DeviceRepairRecordsQueryCriteria criteria);
 
     /**
      * 新增设备维修记录

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

@@ -53,6 +53,7 @@ public class DeviceLogServiceImpl implements IDeviceLogService {
         return baseMapper.selectVoById(id);
     }
 
+
     /**
      * 分页查询设备日志列表
      *
@@ -62,13 +63,12 @@ public class DeviceLogServiceImpl implements IDeviceLogService {
      */
     @Override
     public TableDataInfo<DeviceLogVo> queryPageList(DeviceLogBo bo, PageQuery pageQuery) {
-
-
         LambdaQueryWrapper<DeviceLog> lqw = buildQueryWrapper(bo);
         Page<DeviceLogVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
+
     /**
      * 查询符合条件的设备日志列表
      *
@@ -83,13 +83,17 @@ public class DeviceLogServiceImpl implements IDeviceLogService {
 
     private LambdaQueryWrapper<DeviceLog> buildQueryWrapper(DeviceLogBo bo) {
 
-        Long userId = LoginHelper.getUserId();
-        List<DeviceAssignments> assignments = deviceAssignmentsMapper.selectList(new QueryWrapper<DeviceAssignments>().eq("assignee_id", userId));
-        List<Long> deviceIds = assignments.stream().map(DeviceAssignments::getDeviceId).collect(Collectors.toList());
-        if (deviceIds.isEmpty()) {
-            deviceIds.add(-1L);
+        // 管理员
+        String username = LoginHelper.getUsername();
+        if (!username.equals("admin")) {
+            Long userId = LoginHelper.getUserId();
+            List<DeviceAssignments> assignments = deviceAssignmentsMapper.selectList(new QueryWrapper<DeviceAssignments>().eq("assignee_id", userId));
+            List<Long> deviceIds = assignments.stream().map(DeviceAssignments::getDeviceId).collect(Collectors.toList());
+            if (deviceIds.isEmpty()) {
+                deviceIds.add(-1L);
+            }
+            bo.setDeviceIds(deviceIds);
         }
-        bo.setDeviceIds(deviceIds);
 
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<DeviceLog> lqw = Wrappers.lambdaQuery();
@@ -99,6 +103,7 @@ public class DeviceLogServiceImpl implements IDeviceLogService {
         lqw.eq(StringUtils.isNotBlank(bo.getDataSource()), DeviceLog::getDataSource, bo.getDataSource());
         lqw.like(StringUtils.isNotBlank(bo.getContent()), DeviceLog::getContent, bo.getContent());
         lqw.in(CollectionUtil.isNotEmpty(bo.getDeviceIds()), DeviceLog::getDeviceId, bo.getDeviceIds());
+        lqw.orderByDesc(DeviceLog::getCreateTime);
         return lqw;
     }
 

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

@@ -1,11 +1,25 @@
 package com.fuyuanshen.equipment.service.impl;
 
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fuyuanshen.common.core.utils.MapstructUtils;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fuyuanshen.common.satoken.utils.LoginHelper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.DeviceRepairImages;
+import com.fuyuanshen.equipment.domain.DeviceType;
+import com.fuyuanshen.equipment.domain.query.DeviceRepairRecordsQueryCriteria;
+import com.fuyuanshen.equipment.domain.vo.DeviceRepairImagesVo;
+import com.fuyuanshen.equipment.enums.RepairImageType;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.mapper.DeviceRepairImagesMapper;
+import com.fuyuanshen.system.domain.vo.SysOssVo;
+import com.fuyuanshen.system.service.ISysOssService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -15,10 +29,10 @@ import com.fuyuanshen.equipment.domain.vo.DeviceRepairRecordsVo;
 import com.fuyuanshen.equipment.domain.DeviceRepairRecords;
 import com.fuyuanshen.equipment.mapper.DeviceRepairRecordsMapper;
 import com.fuyuanshen.equipment.service.IDeviceRepairRecordsService;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
 
 /**
  * 设备维修记录Service业务层处理
@@ -29,9 +43,11 @@ import java.util.Collection;
 @Slf4j
 @RequiredArgsConstructor
 @Service
-public class DeviceRepairRecordsServiceImpl implements IDeviceRepairRecordsService {
+public class DeviceRepairRecordsServiceImpl extends ServiceImpl<DeviceRepairRecordsMapper, DeviceRepairRecords> implements IDeviceRepairRecordsService {
 
     private final DeviceRepairRecordsMapper baseMapper;
+    private final DeviceRepairImagesMapper imagesMapper;
+    private final ISysOssService ossService;
 
     /**
      * 查询设备维修记录
@@ -41,33 +57,53 @@ public class DeviceRepairRecordsServiceImpl implements IDeviceRepairRecordsServi
      */
     @Override
     public DeviceRepairRecordsVo queryById(Long recordId){
-        return baseMapper.selectVoById(recordId);
+        // 1. 主表
+        DeviceRepairRecordsVo vo = baseMapper.selectVoById(recordId);
+        if (vo == null) {
+            throw new RuntimeException("维修记录不存在");
+        }
+
+        // 2. 子表图片
+        List<DeviceRepairImagesVo> images = imagesMapper.selectVoList(
+                new LambdaQueryWrapper<DeviceRepairImages>()
+                        .eq(DeviceRepairImages::getRecordId, recordId)
+                        .orderByAsc(DeviceRepairImages::getImageType)); // 如有排序需求
+        // 3. 组装到 VO
+        vo.setImages(images);   // 需要在 DeviceRepairRecordsVo 里加该字段
+        return vo;
     }
 
     /**
      * 分页查询设备维修记录列表
      *
-     * @param bo        查询条件
-     * @param pageQuery 分页参数
+     * @param criteria        查询条件
+     * @param page 分页参数
      * @return 设备维修记录分页列表
      */
     @Override
-    public TableDataInfo<DeviceRepairRecordsVo> queryPageList(DeviceRepairRecordsBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<DeviceRepairRecords> lqw = buildQueryWrapper(bo);
-        Page<DeviceRepairRecordsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
+    public TableDataInfo<DeviceRepairRecordsVo> queryPageList(DeviceRepairRecordsQueryCriteria criteria, Page<DeviceRepairRecords> page) {
+        // 管理员
+        String username = LoginHelper.getUsername();
+        if (!username.equals("admin")) {
+            criteria.setCustomerId(LoginHelper.getUserId());
+        }
+
+        if(criteria.getRepairEndTime() !=null ){
+            criteria.setRepairEndTime(DateUtil.endOfDay(criteria.getRepairEndTime()));
+        }
+        IPage<DeviceRepairRecordsVo> deviceRepairRecordsIPage = baseMapper.findAll(criteria, page);
+        return new TableDataInfo<DeviceRepairRecordsVo>(deviceRepairRecordsIPage.getRecords(), deviceRepairRecordsIPage.getTotal());
     }
 
     /**
      * 查询符合条件的设备维修记录列表
      *
-     * @param bo 查询条件
+     * @param criteria 查询条件
      * @return 设备维修记录列表
      */
     @Override
-    public List<DeviceRepairRecordsVo> queryList(DeviceRepairRecordsBo bo) {
-        LambdaQueryWrapper<DeviceRepairRecords> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
+    public List<DeviceRepairRecordsVo> queryList(DeviceRepairRecordsQueryCriteria criteria) {
+        return baseMapper.findAll(criteria);
     }
 
     private LambdaQueryWrapper<DeviceRepairRecords> buildQueryWrapper(DeviceRepairRecordsBo bo) {
@@ -89,14 +125,30 @@ public class DeviceRepairRecordsServiceImpl implements IDeviceRepairRecordsServi
      * @return 是否新增成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(DeviceRepairRecordsBo bo) {
-        DeviceRepairRecords add = MapstructUtils.convert(bo, DeviceRepairRecords.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setRecordId(add.getRecordId());
+        // 1. 保存主表
+        DeviceRepairRecords entity = MapstructUtils.convert(bo, DeviceRepairRecords.class);
+        validEntityBeforeSave(entity);
+        boolean ok = baseMapper.insert(entity) > 0;
+        if (!ok) {
+            return false;
         }
-        return flag;
+
+        // 2. 回填主键
+        Long recordId = entity.getRecordId();
+        bo.setRecordId(recordId);
+
+        // 3. 组装图片实体
+        List<DeviceRepairImages> images = new ArrayList<>(2);
+        addImageIfPresent(images, recordId, bo.getBeforeFile(), RepairImageType.BEFORE);
+        addImageIfPresent(images, recordId, bo.getAfterFile(),  RepairImageType.AFTER);
+
+        // 4. 批量插入
+        if (!images.isEmpty()) {
+            imagesMapper.insertBatch(images);
+        }
+        return true;
     }
 
     /**
@@ -106,10 +158,56 @@ public class DeviceRepairRecordsServiceImpl implements IDeviceRepairRecordsServi
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(DeviceRepairRecordsBo bo) {
-        DeviceRepairRecords update = MapstructUtils.convert(bo, DeviceRepairRecords.class);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
+        Long recordId = bo.getRecordId();
+
+        // 1. 校验记录是否存在
+        DeviceRepairRecords dbRecord = baseMapper.selectById(recordId);
+        if (dbRecord == null) {
+            throw new RuntimeException("维修记录不存在");
+        }
+
+        // 2. 更新主表
+        DeviceRepairRecords entity = MapstructUtils.convert(bo, DeviceRepairRecords.class);
+        validEntityBeforeSave(entity);
+        if (!StringUtils.isNotEmpty(entity.getDeviceId())){
+            throw new RuntimeException("维修记录不能为空！！！");
+        }
+        boolean updated = baseMapper.updateById(entity) > 0;
+        if (!updated) {
+            return false;
+        }
+
+        // 3. 收集需要保存的图片
+        List<DeviceRepairImages> images = new ArrayList<>(2);
+        addImageIfPresent(images, recordId, bo.getBeforeFile(), RepairImageType.BEFORE);
+        addImageIfPresent(images, recordId, bo.getAfterFile(), RepairImageType.AFTER);
+
+        // 4. 批量插入
+        if (!images.isEmpty()) {
+            imagesMapper.insertBatch(images);
+        }
+        return true;
+    }
+
+    /* ---------- 工具方法 ---------- */
+
+    private void addImageIfPresent(List<DeviceRepairImages> list,
+                                   Long recordId,
+                                   MultipartFile file,
+                                   RepairImageType imageType) {
+        if (file == null || file.isEmpty()) {
+            return;
+        }
+        SysOssVo ossVo = ossService.upload(file);
+
+        DeviceRepairImages image = new DeviceRepairImages();
+        image.setRecordId(recordId);
+        image.setImageType(imageType);
+        image.setImageUrl(ossVo.getUrl());
+
+        list.add(image);
     }
 
     /**
@@ -117,6 +215,9 @@ public class DeviceRepairRecordsServiceImpl implements IDeviceRepairRecordsServi
      */
     private void validEntityBeforeSave(DeviceRepairRecords entity){
         //TODO 做一些数据校验,如唯一约束
+        if (!StringUtils.isNotEmpty(entity.getDeviceId())){
+            throw new RuntimeException("维修设备不能为空！！！");
+        }
     }
 
     /**

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

@@ -630,6 +630,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
     @Override
     public EquipmentClassificationVo getEquipmentClassification() {
         EquipmentClassificationVo equipmentClassification = deviceMapper.getEquipmentClassification();
+        equipmentClassification.getTotal();
         return equipmentClassification;
     }
 
@@ -648,13 +649,13 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
     /**
      * 获取设备使用数据
      *
-     * @param deviceId 设备ID
+     * @param deviceTypeId 设备ID
      * @param range    时间范围 1:半年 2:一年
      * @return 每月使用数据列表
      */
     @Override
-    public List<Map<String, Object>> getEquipmentUsageData(Long deviceId, Integer range) {
-        List<Map<String, Object>> equipmentUsageData = deviceMapper.getEquipmentUsageData(deviceId, range);
+    public List<Map<String, Object>> getEquipmentUsageData(Long deviceTypeId, Integer range) {
+        List<Map<String, Object>> equipmentUsageData = deviceMapper.getEquipmentUsageData(deviceTypeId, range);
         return equipmentUsageData;
 
     }

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

@@ -281,6 +281,10 @@
         <if test="criteria.groupId != null">
             and d.group_id = #{criteria.groupId}
         </if>
+        <if test="criteria.onlineStatus != null">
+            and d.online_status = #{criteria.onlineStatus}
+        </if>
+        ORDER BY d.create_time DESC
     </select>
     <select id="getLocationHistory" resultType="com.fuyuanshen.equipment.domain.vo.LocationHistoryVo">
         select a.id,a.device_name,a.device_type,b.type_name deviceTypeName,a.device_imei,a.device_mac from device a
@@ -317,11 +321,11 @@
     <!-- 获取数据总览 -->
     <select id="getDataOverview" resultType="com.fuyuanshen.equipment.domain.vo.DataOverviewVo">
         SELECT (SELECT COUNT(1) FROM device)                         AS devicesNumber,
-               (SELECT COUNT(1) FROM device WHERE device_status = 1) AS equipmentOnline,
-               (SELECT COUNT(1) FROM device WHERE DATE (create_time) = CURDATE()) AS bindingNew, (
+               (SELECT COUNT(1) FROM device WHERE online_status = 1) AS equipmentOnline,
+               (SELECT COUNT(1) FROM device WHERE DATE (create_time) = CURDATE() AND binding_status = 1 ) AS bindingNew, (
         SELECT COUNT (1)
         FROM device
-        WHERE device_status = 2) AS equipmentAbnormal
+        WHERE online_status = 2) AS equipmentAbnormal
     </select>
 
     <!-- 获取设备分类 -->
@@ -343,55 +347,67 @@
 
     <!-- 获取告警信息 -->
     <select id="getAlarmInformation" resultType="com.fuyuanshen.equipment.domain.vo.AlarmInformationVo">
-        SELECT (SELECT COUNT(1) FROM device_alarm WHERE treatment_state = 0 AND DATE (create_time) = CURDATE()) AS alarmsTotal, (
+        SELECT (SELECT COUNT(1) FROM device_alarm WHERE treatment_state = 0) AS alarmsTotal
+             , (SELECT COUNT(1)
+                FROM device_alarm
+                WHERE treatment_state = 0)                                   AS processingAlarm
+             , (SELECT COUNT(1)
+                FROM device_alarm
+                WHERE treatment_state = 0 AND
+            DATE (create_time) = CURDATE()) AS alarmsTotalToday
+             , (
         SELECT COUNT (1)
         FROM device_alarm
         WHERE treatment_state = 0
-          AND DATE (create_time) = CURDATE()) AS processingAlarm
+          AND DATE (create_time) = CURDATE()) AS processingAlarmToday
             , (
         SELECT COUNT (1)
         FROM device_alarm
         WHERE device_action = 0
-          AND DATE (create_time) = CURDATE()) AS alarmForced
+            ) AS alarmForced
             , (
         SELECT COUNT (1)
         FROM device_alarm
         WHERE device_action = 1
-          AND DATE (create_time) = CURDATE()) AS intrusionImpact
+            ) AS intrusionImpact
             , (
         SELECT COUNT (1)
         FROM device_alarm
         WHERE device_action = 2
-          AND DATE (create_time) = CURDATE()) AS alarmManual
+            ) AS alarmManual
             , (
         SELECT COUNT (1)
         FROM device_alarm
-        WHERE device_action = 3 AND DATE (create_time) = CURDATE()) AS fenceElectronic
+        WHERE device_action = 3) AS fenceElectronic
 
     </select>
 
     <!-- 获取设备使用数据 -->
     <select id="getEquipmentUsageData" resultType="map">
-        SELECT COUNT(CASE WHEN MONTH (dl.create_time) = 1 THEN 1 END)  AS m1,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 2 THEN 1 END)  AS m2,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 3 THEN 1 END)  AS m3,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 4 THEN 1 END)  AS m4,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 5 THEN 1 END)  AS m5,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 6 THEN 1 END)  AS m6,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 7 THEN 1 END)  AS m7,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 8 THEN 1 END)  AS m8,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 9 THEN 1 END)  AS m9,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 10 THEN 1 END) AS m10,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 11 THEN 1 END) AS m11,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 12 THEN 1 END) AS m12
+        SELECT COUNT(CASE WHEN MONTH (dl.create_time) = 1 THEN 1 END) AS m1,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 2 THEN 1 END) AS m2,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 3 THEN 1 END) AS m3,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 4 THEN 1 END) AS m4,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 5 THEN 1 END) AS m5,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 6 THEN 1 END) AS m6,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 7 THEN 1 END) AS m7,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 8 THEN 1 END) AS m8,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 9 THEN 1 END) AS m9,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 10 THEN 1 END) AS m10,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 11 THEN 1 END) AS m11,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 12 THEN 1 END) AS m12
         FROM device_log dl
-                 LEFT JOIN device d ON dl.device_id = d.id
-                 LEFT JOIN device_type dt ON d.device_type = dt.id
-        WHERE dt.id = #{deviceId}
-          AND (
+        LEFT JOIN device d ON dl.device_id = d.id
+        LEFT JOIN device_type dt ON d.device_type = dt.id
+        <where>
+            <if test="deviceTypeId != null">
+                dt.id = #{deviceTypeId}
+            </if>
+            AND (
             (#{range} = 1 AND dl.create_time >= DATE_SUB(NOW(), INTERVAL 6 MONTH)) OR
             (#{range} = 2 AND dl.create_time >= DATE_SUB(NOW(), INTERVAL 12 MONTH))
             )
+        </where>
     </select>
 
     <select id="getUsageDataForMonth" resultType="java.lang.Integer">

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

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

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

@@ -3,5 +3,41 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuyuanshen.equipment.mapper.DeviceRepairRecordsMapper">
+    <resultMap id="BaseResultMap" type="com.fuyuanshen.equipment.domain.vo.DeviceRepairRecordsVo">
+        <id column="record_id" property="recordId"/>
+        <result column="device_id" property="deviceId"/>
+        <result column="deviceName" property="deviceName"/>
+        <result column="repair_time" property="repairTime"/>
+        <result column="repair_part" property="repairPart"/>
+        <result column="repair_reason" property="repairReason"/>
+        <result column="repair_person" property="repairPerson"/>
+        <result column="create_by" property="createBy"/>
+        <result column="update_by" property="updateBy"/>
+        <result column="create_time" property="createTime"/>
+        <result column="update_time" property="updateTime"/>
+    </resultMap>
 
+    <!-- 查询所有设备类型 -->
+    <select id="findAll" resultMap="BaseResultMap">
+        SELECT DISTINCT dr.*,d.device_name as deviceName
+        FROM device_repair_records dr
+        JOIN device d ON dr.device_id = d.id
+        <where>
+            <if test="criteria.deviceId != null">
+                and dr.device_id = #{criteria.deviceId}
+            </if>
+            <if test="criteria.repairPart != null">
+                and dr.repairPart like concat('%', TRIM(#{criteria.repairPart}), '%')
+            </if>
+            <!-- 时间段条件 -->
+            <if test="criteria.repairBeginTime != null">
+                AND dr.repair_time <![CDATA[ >= ]]> #{criteria.repairBeginTime}
+            </if>
+            <if test="criteria.repairEndTime != null">
+                <!-- 如果想默认包含当天 23:59:59，可在 Java 代码里把结束时间设为 endOfDay -->
+                AND dr.repair_time <![CDATA[ <= ]]> #{criteria.repairEndTime}
+            </if>
+        </where>
+        ORDER BY dr.create_time DESC
+    </select>
 </mapper>

fys-modules/fys-generator/src/main/resources/vm/java/controller.java.vm

@@ -56,7 +56,7 @@ public class ${ClassName}Controller extends BaseController {
 #end
 
     /**
-     * 导出${functionName}列表
+     * ${functionName}列表
      */
     @SaCheckPermission("${permissionPrefix}:export")
     @Log(title = "${functionName}", businessType = BusinessType.EXPORT)