配置文件提交2

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

fys-admin/pom.xml

@@ -94,10 +94,10 @@
         </dependency>
 
         <!--  demo模块  -->
-        <!--<dependency>
-            <groupId>com.fuyuanshen</groupId>
-            <artifactId>fys-demo</artifactId>
-        </dependency>-->
+        <!-- <dependency> -->
+        <!--     <groupId>com.fuyuanshen</groupId> -->
+        <!--     <artifactId>fys-demo</artifactId> -->
+        <!-- </dependency> -->
 
         <!--  工作流模块  -->
         <dependency>

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

@@ -0,0 +1,96 @@
+package com.fuyuanshen.app.controller.device;
+
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.common.core.domain.R;
+import com.fuyuanshen.common.core.validate.AddGroup;
+import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
+import com.fuyuanshen.common.web.core.BaseController;
+import com.fuyuanshen.web.service.device.DeviceBJQBizService;
+import com.fuyuanshen.web.service.device.DeviceXinghanBizService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * HBY670设备控制类
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/app/xinghan/device")
+public class AppDeviceXinghanController extends BaseController {
+
+    private final DeviceXinghanBizService appDeviceService;
+    /**
+     * 人员信息登记
+     */
+    @PostMapping(value = "/registerPersonInfo")
+//    @FunctionAccessAnnotation("registerPersonInfo")
+    public R<Void> registerPersonInfo(@Validated(AddGroup.class) @RequestBody AppPersonnelInfoBo bo) {
+        return toAjax(appDeviceService.registerPersonInfo(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();
+    }
+
+    /**
+     * 静电预警档位
+     * 3,2,1,0,分别表示高档/中档/低挡/关闭
+     */
+    @PostMapping("/DetectGradeSettings")
+    public R<Void> DetectGradeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upDetectGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 照明档位
+     * 照明档位，2,1,0,分别表示弱光/强光/关闭
+     */
+    @PostMapping("/LightGradeSettings")
+    public R<Void> LightGradeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upLightGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * SOS档位
+     * SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
+     */
+    @PostMapping("/SOSGradeSettings")
+    public R<Void> SOSGradeSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upSOSGradeSettings(params);
+        return R.ok();
+    }
+
+    /**
+     * 静止报警状态
+     * 静止报警状态，0-未静止报警，1-正在静止报警。
+     */
+    @PostMapping("/ShakeBitSettings")
+    public R<Void> ShakeBitSettings(@RequestBody DeviceInstructDto params) {
+        // params 转 JSONObject
+        appDeviceService.upShakeBitSettings(params);
+        return R.ok();
+    }
+
+}

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

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

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

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

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

@@ -0,0 +1,65 @@
+package com.fuyuanshen.global.mqtt.base;
+
+import cn.hutool.core.lang.Dict;
+
+import java.util.Map;
+import java.util.LinkedHashMap;
+import java.util.Collections;
+import org.springframework.stereotype.Component;
+
+
+@Component
+public final class MqttXinghanCommandType {
+    private MqttXinghanCommandType() {}
+
+    public enum XinghanCommandTypeEnum {
+        /**
+         * 星汉设备主动上报数据
+         */
+        GRADE_INFO(101),
+        /**
+         * 星汉开机LOGO
+         */
+        PIC_TRANS(102),
+        /**
+         * 星汉设备发送消息 (XingHan send msg)
+         */
+        TEX_TRANS(103),
+        BREAK_NEWS(104),
+        UNKNOWN(0);
+
+        private final int value;
+        XinghanCommandTypeEnum(int value) { this.value = value; }
+        public int getValue() { return value; }
+    }
+
+    private static final Map<String, XinghanCommandTypeEnum> KEY_TO_TYPE;
+    static {
+        LinkedHashMap<String, XinghanCommandTypeEnum> map = new LinkedHashMap<>();
+        map.put("sta_DetectGrade", XinghanCommandTypeEnum.GRADE_INFO);
+        map.put("sta_PowerTime",   XinghanCommandTypeEnum.GRADE_INFO);
+        map.put("sta_longitude",   XinghanCommandTypeEnum.GRADE_INFO);
+        map.put("sta_latitude",    XinghanCommandTypeEnum.GRADE_INFO);
+        map.put("sta_PicTrans",    XinghanCommandTypeEnum.PIC_TRANS);
+        map.put("sta_TexTrans",    XinghanCommandTypeEnum.TEX_TRANS);
+        map.put("sta_BreakNews",    XinghanCommandTypeEnum.BREAK_NEWS);
+        KEY_TO_TYPE = Collections.unmodifiableMap(map);
+    }
+
+    public static int computeVirtualCommandType(Dict payloadDict) {
+        if (payloadDict == null) {
+            return XinghanCommandTypeEnum.UNKNOWN.getValue();
+        }
+        try {
+            for (String key : KEY_TO_TYPE.keySet()) {
+                if (payloadDict.containsKey(key)) {
+                    return KEY_TO_TYPE.get(key).getValue();
+                }
+            }
+        } catch (Exception ex) {
+            return XinghanCommandTypeEnum.UNKNOWN.getValue();
+        }
+
+        return XinghanCommandTypeEnum.UNKNOWN.getValue();
+    }
+}

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

@@ -0,0 +1,65 @@
+package com.fuyuanshen.global.mqtt.base;
+
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@Data
+public class MqttXinghanJson {
+
+    /**
+     * 第一键值对，静电预警档位：3,2,1,0,分别表示高档/中档/低挡/关闭.
+     */
+    @JsonProperty("sta_DetectGrade")
+    private Integer staDetectGrade;
+    /**
+     * 第二键值对，照明档位，2,1,0,分别表示弱光/强光/关闭
+     */
+    @JsonProperty("sta_LightGrade")
+    private Integer staLightGrade;
+    /**
+     * 第三键值对，SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
+     */
+    @JsonProperty("sta_SOSGrade")
+    public Integer staSOSGrade;
+    /**
+     * 第四键值对，剩余照明时间，0-5999，单位分钟。
+     */
+    @JsonProperty("sta_PowerTime")
+    public Integer staPowerTime;
+    /**
+     * 第五键值对，剩余电量百分比，0-100
+     */
+    @JsonProperty("sta_PowerPercent")
+    public Integer staPowerPercent;
+    /**
+     * 第六键值对, 近电预警级别, 0-无预警，1-弱预警，2-中预警，3-强预警，4-非常强预警。
+     */
+    @JsonProperty("sta_DetectResult")
+    public Integer staDetectResult;
+    /**
+     * 第七键值对, 静止报警状态，0-未静止报警，1-正在静止报警。
+     */
+    @JsonProperty("staShakeBit")
+    public Integer sta_ShakeBit;
+    /**
+     * 第八键值对, 4G信号强度，0-32，数值越大，信号越强。
+     */
+    @JsonProperty("sta_4gSinal")
+    public Integer sta4gSinal;
+    /**
+     * 第九键值对，IMIE卡号
+     */
+    @JsonProperty("sta_imei")
+    public String staimei;
+    /**
+     * 第十键值对，经度
+     */
+    @JsonProperty("sta_longitude")
+    public String stalongitude;
+    /**
+     * 第十一键值对，纬度
+     */
+    @JsonProperty("sta_latitude")
+    public String stalatitude;
+
+}

fys-admin/src/main/java/com/fuyuanshen/global/mqtt/config/MqttPropertiesConfig.java

@@ -16,4 +16,5 @@ public class MqttPropertiesConfig {
     private String subTopic;
     private String pubClientId;
     private String pubTopic;
+    private String enabled;
 }

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

@@ -0,0 +1,20 @@
+package com.fuyuanshen.global.mqtt.constants;
+
+public class XingHanCommandTypeConstants {
+    /**
+     * 星汉设备主动上报数据 (XingHan Device Data)
+     */
+    public static final String XingHan_DEVICE_DATA = "Light_101";
+    /**
+     * 星汉开机LOGO (XingHan Boot Logo)
+     */
+    public static final String XingHan_BOOT_LOGO = "Light_102";
+    /**
+     * 星汉设备发送消息 (XingHan send msg)
+     */
+    public static final String XingHan_ESEND_MSG = "Light_103";
+    /**
+     * 星汉设备发送紧急通知 (XingHan break news)
+     */
+    public static final String XingHan_BREAK_NEWS = "Light_104";
+}

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

@@ -8,6 +8,7 @@ import com.fuyuanshen.common.json.utils.JsonUtils;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
 import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
 import com.fuyuanshen.global.mqtt.base.MqttRuleEngine;
+import com.fuyuanshen.global.mqtt.base.MqttXinghanCommandType;
 import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,5 +70,19 @@ public class ReceiverMessageHandler implements MessageHandler {
                 log.warn("未找到匹配的规则来处理命令类型: {}", val1);
             }
         }
+
+        /* ===== 追加：根据报文内容识别格式并统一解析 ===== */
+        int intType = MqttXinghanCommandType.computeVirtualCommandType(payloadDict);
+        if (intType > 0) {
+            MqttRuleContext newCtx = new MqttRuleContext();
+            newCtx.setCommandType((byte) intType);
+            newCtx.setDeviceImei(deviceImei);
+            newCtx.setPayloadDict(payloadDict);
+
+            boolean ok = ruleEngine.executeRule(newCtx);
+            if (!ok) {
+                log.warn("新规则引擎未命中, imei={}", deviceImei);
+            }
+        }
     }
 }

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

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

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

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

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

@@ -0,0 +1,212 @@
+package com.fuyuanshen.global.mqtt.rule.xinghan;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.equipment.utils.map.GetAddressFromLatUtil;
+import com.fuyuanshen.equipment.utils.map.LngLonUtil;
+import com.fuyuanshen.global.mqtt.base.MqttMessageRule;
+import com.fuyuanshen.global.mqtt.base.MqttRuleContext;
+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 lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.FUNCTION_ACCESS_KEY;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.*;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+/**
+ * 主动上报设备数据命令处理
+ * 第一键值对，静电预警档位：3,2,1,0,分别表示高档/中档/低挡/关闭.
+ * 第二键值对，照明档位，2,1,0,分别表示弱光/强光/关闭
+ * 第三键值对，SOS档位，2,1,0, 分别表示红蓝模式/爆闪模式/关闭
+ * 第四键值对，剩余照明时间，0-5999，单位分钟。
+ * 第五键值对, 剩余电量百分比，0-100。
+ * 第六键值对, 近电预警级别, 0-无预警，1-弱预警，2-中预警，3-强预警，4-非常强预警。
+ * 第七键值对, 静止报警状态，0-未静止报警，1-正在静止报警。
+ * 第八键值对, 4G信号强度，0-32，数值越大，信号越强。
+ * 第九键值对，IMIE卡号
+ * 第十键值对，经度
+ * 第十一键值对，纬度
+ */
+@Component
+@RequiredArgsConstructor
+@Slf4j
+public class XinghanDeviceDataRule implements MqttMessageRule {
+
+    @Override
+    public String getCommandType() {
+        return XingHanCommandTypeConstants.XingHan_DEVICE_DATA;
+    }
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @Override
+    public void execute(MqttRuleContext context) {
+        try {
+            // Latitude, longitude
+            //主灯档位,激光灯档位,电量百分比,充电状态,电池剩余续航时间
+            MqttXinghanJson deviceStatus = objectMapper.convertValue(context.getPayloadDict(), MqttXinghanJson.class);
+
+            // 发送设备状态和位置信息到Redis
+            asyncSendDeviceDataToRedisWithFuture(context.getDeviceImei(),deviceStatus);
+        } catch (Exception e) {
+            log.error("处理上报数据命令时出错", e);
+        }
+    }
+
+    /**
+     * 发送设备状态信息和位置信息到Redis
+     *
+     * @param deviceImei 设备IMEI
+     * @param deviceStatus 机器主动上报的状态信息
+     */
+    public void asyncSendDeviceDataToRedisWithFuture(String deviceImei, MqttXinghanJson deviceStatus) {
+        CompletableFuture.runAsync(() -> {
+            try {
+
+                // 将设备状态信息存储到Redis中
+                String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + deviceImei + DEVICE_STATUS_KEY_PREFIX;
+                String deviceInfoJson = JsonUtils.toJsonString(deviceStatus);
+                // 存储到Redis
+                RedisUtils.setCacheObject(deviceRedisKey, deviceInfoJson);
+
+                log.info("设备状态信息已异步发送到Redis: device={}, deviceInfoJson={}",
+                        deviceImei, deviceInfoJson);
+
+                //设备坐标缓存KEY
+                String functionAccess = FUNCTION_ACCESS_KEY + deviceImei;
+                // 异步发送经纬度到Redis
+                asyncSendLocationToRedisWithFuture(deviceImei, deviceStatus.getStalatitude(), deviceStatus.getStalongitude());
+
+            } catch (Exception e) {
+                log.error("异步发送设备信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+            }
+        });
+    }
+
+    /**
+     * 异步发送位置信息到Redis（使用CompletableFuture）
+     *
+     * @param deviceImei 设备IMEI
+     * @param latitude   纬度
+     * @param longitude  经度
+     */
+    public void asyncSendLocationToRedisWithFuture(String deviceImei, String latitude, String longitude) {
+        CompletableFuture.runAsync(() -> {
+            try {
+                if(StringUtils.isBlank(latitude) || StringUtils.isBlank(longitude)){
+                    return;
+                }
+                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;
+                    }
+                }
+
+                // 构造位置信息对象
+                Map<String, Object> locationInfo = new LinkedHashMap<>();
+                double[] doubles = LngLonUtil.gps84_To_Gcj02(Double.parseDouble(latitude), Double.parseDouble(longitude));
+                locationInfo.put("deviceImei", deviceImei);
+                locationInfo.put("latitude", doubles[0]);
+                locationInfo.put("longitude", doubles[1]);
+                locationInfo.put("wgs84_latitude", latitude);
+                locationInfo.put("wgs84_longitude", longitude);
+                String address = GetAddressFromLatUtil.getAdd(String.valueOf(doubles[1]), String.valueOf(doubles[0]));
+                locationInfo.put("address", address);
+                locationInfo.put("timestamp", System.currentTimeMillis());
+
+
+
+                String locationJson = JsonUtils.toJsonString(locationInfo);
+
+                // 存储到Redis
+                RedisUtils.setCacheObject(redisKey, locationJson);
+
+                // 存储到一个列表中，保留历史位置信息
+//                String locationHistoryKey = GlobalConstants.GLOBAL_REDIS_KEY+DeviceRedisKeyConstants.DEVICE_LOCATION_HISTORY_KEY_PREFIX + deviceImei;
+//                RedisUtils.addCacheList(locationHistoryKey, locationJson);
+//                RedisUtils.expire(locationHistoryKey, Duration.ofDays(90));
+                storeDeviceTrajectoryWithSortedSet(deviceImei, locationJson);
+                log.info("位置信息已异步发送到Redis: device={}, lat={}, lon={}", deviceImei, latitude, longitude);
+            } catch (Exception e) {
+                log.error("异步发送位置信息到Redis时出错: device={}, error={}", deviceImei, e.getMessage(), e);
+            }
+        });
+    }
+
+    /**
+     * 存储设备30天历史轨迹到Redis (使用Sorted Set)
+     */
+    public void storeDeviceTrajectoryWithSortedSet(String deviceImei, String locationJson) {
+        try {
+            String trajectoryKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + deviceImei + DeviceRedisKeyConstants.DEVICE_LOCATION_HISTORY_KEY_PREFIX;
+//            String trajectoryKey = "device:trajectory:zset:" + deviceImei;
+//            String locationJson = JsonUtils.toJsonString(locationInfo);
+            long timestamp = System.currentTimeMillis();
+
+            // 添加到Sorted Set，使用时间戳作为score
+            RedisUtils.zAdd(trajectoryKey, locationJson, timestamp);
+
+//            // 设置30天过期时间
+//            RedisUtils.expire(trajectoryKey, Duration.ofDays(30));
+
+            // 清理30天前的数据（冗余保护）
+            long thirtyDaysAgo = System.currentTimeMillis() - (7L * 24 * 60 * 60 * 1000);
+            RedisUtils.zRemoveRangeByScore(trajectoryKey, 0, thirtyDaysAgo);
+        } catch (Exception e) {
+            log.error("存储设备轨迹到Redis(ZSet)失败: device={}, error={}", deviceImei, e.getMessage(), e);
+        }
+    }
+
+    private Map<String, Object> buildLocationDataMap(String latitude, String longitude) {
+        String[] latArr = latitude.split("\\.");
+        String[] lonArr = longitude.split("\\.");
+
+        ArrayList<Integer> intData = new ArrayList<>();
+        intData.add(11);
+        intData.add(Integer.parseInt(latArr[0]));
+        String str1 = latArr[1];
+        intData.add(Integer.parseInt(str1.substring(0,4)));
+        String str2 = lonArr[1];
+        intData.add(Integer.parseInt(lonArr[0]));
+        intData.add(Integer.parseInt(str2.substring(0,4)));
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("instruct", intData);
+        return map;
+    }
+
+}

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

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

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

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

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

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

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

@@ -3,6 +3,8 @@ package com.fuyuanshen.web.controller.device;
 import java.util.List;
 
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
@@ -27,6 +29,7 @@ import com.fuyuanshen.equipment.service.IDeviceGroupService;
  * @author Lion Li
  * @date 2025-08-08
  */
+@Tag(name = "web:设备分组", description = "web:设备分组")
 @Validated
 @RequiredArgsConstructor
 @RestController
@@ -39,6 +42,7 @@ public class DeviceGroupController extends BaseController {
     /**
      * 查询设备分组列表
      */
+    @Operation(summary = "查询设备分组列表")
     @SaCheckPermission("fys-equipment:group:list")
     @GetMapping("/list")
     public R<List<DeviceGroupVo>> list(DeviceGroupBo bo) {
@@ -64,6 +68,7 @@ public class DeviceGroupController extends BaseController {
      *
      * @param id 主键
      */
+    @Operation(summary = "获取设备分组详细信息")
     @SaCheckPermission("fys-equipment:group:query")
     @GetMapping("/{id}")
     public R<DeviceGroupVo> getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) {
@@ -74,6 +79,7 @@ public class DeviceGroupController extends BaseController {
     /**
      * 新增设备分组
      */
+    @Operation(summary = "新增设备分组")
     @SaCheckPermission("fys-equipment:group:add")
     @Log(title = "设备分组", businessType = BusinessType.INSERT)
     @RepeatSubmit()
@@ -86,6 +92,7 @@ public class DeviceGroupController extends BaseController {
     /**
      * 修改设备分组
      */
+    @Operation(summary = "修改设备分组")
     @SaCheckPermission("fys-equipment:group:edit")
     @Log(title = "设备分组", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
@@ -99,6 +106,7 @@ public class DeviceGroupController extends BaseController {
      *
      * @param ids 主键串
      */
+    @Operation(summary = "删除设备分组")
     @SaCheckPermission("fys-equipment:group:remove")
     @Log(title = "设备分组", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
@@ -106,4 +114,21 @@ public class DeviceGroupController extends BaseController {
         return toAjax(deviceGroupService.deleteWithValidByIds(List.of(ids), true));
     }
 
+
+    /**
+     * 绑定设备分组
+     *
+     * @param groupId  分组id
+     * @param deviceId 设备id
+     */
+    @Operation(summary = "绑定设备分组")
+    // @SaCheckPermission("fys-equipment:group:remove")
+    @Log(title = "绑定设备分组", businessType = BusinessType.DELETE)
+    @GetMapping("/groupId/{deviceId}")
+    public R<Void> bindingDevice(@NotEmpty(message = "分组id 不能为空") @PathVariable Long groupId,
+                                 @NotEmpty(message = "设备id 不能为空") @PathVariable Long[] deviceId) {
+        return toAjax(deviceGroupService.bindingDevice(groupId, deviceId));
+    }
+
+
 }

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

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

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

@@ -79,7 +79,8 @@ public class AppRegisterService {
 
         boolean exist = TenantHelper.dynamic(tenantId, () -> {
             return appUserMapper.exists(new LambdaQueryWrapper<AppUser>()
-                .eq(AppUser::getUserName, appUser.getUserName()));
+                .eq(AppUser::getUserName, appUser.getUserName())
+                    .eq(AppUser::getUserType, UserType.APP_USER.getUserType()));
         });
         if (exist) {
             throw new UserException("user.register.save.error", username);

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

@@ -2,6 +2,7 @@ package com.fuyuanshen.web.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.equipment.domain.Device;
@@ -10,6 +11,7 @@ import com.fuyuanshen.equipment.domain.form.DeviceForm;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
 import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
 import com.fuyuanshen.equipment.domain.vo.CustomerVo;
+import com.fuyuanshen.equipment.domain.vo.WebDeviceVo;
 
 import java.io.IOException;
 import java.util.List;
@@ -29,4 +31,20 @@ public interface WEBDeviceService extends IService<Device> {
      */
     int webUnBindDevice(Long id, Long userId);
 
+    /**
+     * WEB端设备详情
+     *
+     * @param id
+     * @return
+     */
+    WebDeviceVo getDevice(Long id);
+
+    /**
+     * 设备用户详情
+     *
+     * @param id
+     * @return
+     */
+    List<AppPersonnelInfoRecords>  getDeviceUser(Long id);
+
 }

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

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

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

@@ -14,7 +14,6 @@ import com.fuyuanshen.app.domain.vo.APPDeviceTypeVo;
 import com.fuyuanshen.app.domain.vo.AppUserVo;
 import com.fuyuanshen.app.mapper.AppDeviceBindRecordMapper;
 import com.fuyuanshen.app.mapper.AppDeviceShareMapper;
-import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
 import com.fuyuanshen.app.mapper.AppUserMapper;
 import com.fuyuanshen.app.mapper.equipment.APPDeviceMapper;
 import com.fuyuanshen.common.core.exception.ServiceException;
@@ -26,14 +25,15 @@ import com.fuyuanshen.common.redis.utils.RedisUtils;
 import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
 import com.fuyuanshen.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
+import com.fuyuanshen.equipment.domain.dto.InstructionRecordDto;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
 import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import com.fuyuanshen.equipment.domain.vo.InstructionRecordVo;
+import com.fuyuanshen.equipment.domain.vo.WebDeviceVo;
 import com.fuyuanshen.equipment.enums.BindingStatusEnum;
 import com.fuyuanshen.equipment.enums.CommunicationModeEnum;
 import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
-import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
-import com.fuyuanshen.global.mqtt.config.MqttGateway;
 import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import com.fuyuanshen.web.service.device.status.base.DeviceStatusRule;
 import com.fuyuanshen.web.service.device.status.base.RealTimeStatusEngine;
@@ -123,6 +123,47 @@ public class DeviceBizService {
         return TableDataInfo.build(result);
     }
 
+    public TableDataInfo<WebDeviceVo> queryWebDeviceList(DeviceQueryCriteria bo, PageQuery pageQuery) {
+        Page<WebDeviceVo> result = deviceMapper.queryWebDeviceList(pageQuery.build(), bo);
+        List<WebDeviceVo> records = result.getRecords();
+        if(records != null && !records.isEmpty()){
+            records.forEach(item -> {
+                if(item.getCommunicationMode()!=null && item.getCommunicationMode() == 0){
+
+                    //设备在线状态
+                    String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ item.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(onlineStatus)){
+
+                        item.setOnlineStatus(1);
+                    }else{
+                        item.setOnlineStatus(0);
+                    }
+                    String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX+ item.getDeviceImei() + DEVICE_STATUS_KEY_PREFIX);
+                    // 获取电量
+                    if(StringUtils.isNotBlank(deviceStatus)){
+                        JSONObject jsonObject = JSONObject.parseObject(deviceStatus);
+                        item.setBattery(jsonObject.getString("batteryPercentage"));
+                    }else{
+                        item.setBattery("0");
+                    }
+
+                    String location = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_LOCATION_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(location)){
+                        JSONObject jsonObject = JSONObject.parseObject(location);
+                        item.setLatitude(jsonObject.getString("latitude"));
+                        item.setLongitude(jsonObject.getString("longitude"));
+                    }
+
+                    String alarmStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY +DEVICE_KEY_PREFIX+ item.getDeviceImei()+ DEVICE_ALARM_KEY_PREFIX);
+                    if(StringUtils.isNotBlank(alarmStatus)){
+                        item.setAlarmStatus(alarmStatus);
+                    }
+                }
+            });
+        }
+        return TableDataInfo.build(result);
+    }
+
     public int bindDevice(AppDeviceBo bo) {
         Integer mode = bo.getCommunicationMode();
         Long userId = AppLoginHelper.getUserId();
@@ -290,4 +331,9 @@ public class DeviceBizService {
 //        List<Device> devices = deviceMapper.selectList(queryWrapper);
         return deviceMapper.getDeviceInfo(deviceMac);
     }
+
+    public TableDataInfo<InstructionRecordVo> getInstructionRecord(InstructionRecordDto bo, PageQuery pageQuery) {
+        Page<InstructionRecordVo> result = deviceLogMapper.getInstructionRecord(pageQuery.build(), bo);
+        return TableDataInfo.build(result);
+    }
 }

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

@@ -0,0 +1,269 @@
+package com.fuyuanshen.web.service.device;
+
+import com.alibaba.fastjson2.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.fuyuanshen.app.domain.AppPersonnelInfo;
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoBo;
+import com.fuyuanshen.app.domain.dto.AppDeviceLogoUploadDto;
+import com.fuyuanshen.app.domain.dto.DeviceInstructDto;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoVo;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoMapper;
+import com.fuyuanshen.common.core.constant.GlobalConstants;
+import com.fuyuanshen.common.core.exception.ServiceException;
+import com.fuyuanshen.common.core.utils.ImageToCArrayConverter;
+import com.fuyuanshen.common.core.utils.MapstructUtils;
+import com.fuyuanshen.common.core.utils.ObjectUtils;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.json.utils.JsonUtils;
+import com.fuyuanshen.common.redis.utils.RedisUtils;
+import com.fuyuanshen.common.satoken.utils.AppLoginHelper;
+import com.fuyuanshen.equipment.domain.Device;
+import com.fuyuanshen.equipment.domain.dto.AppDeviceSendMsgBo;
+import com.fuyuanshen.equipment.enums.LightModeEnum;
+import com.fuyuanshen.equipment.mapper.DeviceLogMapper;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import com.fuyuanshen.equipment.mapper.DeviceTypeMapper;
+import com.fuyuanshen.global.mqtt.config.MqttGateway;
+import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
+import com.fuyuanshen.global.mqtt.constants.MqttConstants;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.time.Duration;
+import java.util.*;
+
+import static com.fuyuanshen.common.core.constant.GlobalConstants.GLOBAL_REDIS_KEY;
+import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.buildArr;
+import static com.fuyuanshen.common.core.utils.Bitmap80x12Generator.generateFixedBitmapData;
+import static com.fuyuanshen.common.core.utils.ImageToCArrayConverter.convertHexToDecimal;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_BOOT_LOGO_KEY_PREFIX;
+import static com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants.DEVICE_KEY_PREFIX;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class DeviceXinghanBizService {
+
+    private final DeviceMapper deviceMapper;
+    private final AppPersonnelInfoMapper appPersonnelInfoMapper;
+    private final DeviceTypeMapper deviceTypeMapper;
+    private final MqttGateway mqttGateway;
+    private final DeviceLogMapper deviceLogMapper;
+
+    /**
+     * 所有档位的描述表
+     * key   : 指令类型，如 "ins_DetectGrade"、"ins_LightGrade" ……
+     * value : Map<Integer,String>  值 -> 描述
+     */
+    private static final Map<String, Map<Integer, String>> GRADE_DESC = Map.of(
+            "ins_DetectGrade", Map.of(1, "低档", 2, "中档", 3, "高档"),
+            "ins_LightGrade",  Map.of(1, "强光", 2, "弱光"),
+            "ins_SOSGrade",  Map.of(1, "爆闪模式", 2, "红蓝模式"),
+            "ins_ShakeBit",  Map.of(0, "未静止报警", 1, "正在静止报警")
+            // 再加 4、5、6…… 档，直接往 Map 里塞即可
+    );
+
+    /**
+     * 根据指令类型和值，返回中文描述
+     */
+    private static String resolveGradeDesc(String type, int value) {
+        return GRADE_DESC.getOrDefault(type, Map.of())
+                .getOrDefault(value, "关闭");
+    }
+
+    /**
+     * 设置静电预警档位
+     */
+    public void upDetectGradeSettings(DeviceInstructDto dto) {
+        sendCommand(dto, "ins_DetectGrade","静电预警档位");
+    }
+
+    /**
+     * 设置照明档位
+     */
+    public void upLightGradeSettings(DeviceInstructDto dto) {
+        sendCommand(dto, "ins_LightGrade","照明档位");
+    }
+
+    /**
+     * 设置SOS档位
+     */
+    public void upSOSGradeSettings(DeviceInstructDto dto) {
+        sendCommand(dto, "ins_SOSGrade","SOS档位");
+    }
+
+    /**
+     * 设置强制报警
+     */
+    public void upShakeBitSettings(DeviceInstructDto dto) {
+        sendCommand(dto, "ins_ShakeBit","强制报警");
+    }
+
+    /**
+     * 上传设备logo
+     */
+    public void uploadDeviceLogo(AppDeviceLogoUploadDto bo) {
+        try {
+            Device device = deviceMapper.selectById(bo.getDeviceId());
+            if (device == null) {
+                throw new ServiceException("设备不存在");
+            }
+            if (isDeviceOffline(device.getDeviceImei())) {
+                throw new ServiceException("设备已断开连接：" + device.getDeviceName());
+            }
+            MultipartFile file = bo.getFile();
+
+            byte[] largeData = ImageToCArrayConverter.convertImageToCArray(file.getInputStream(), 160, 80, 25600);
+            log.info("长度：" + largeData.length);
+
+            log.info("原始数据大小: {} 字节", largeData.length);
+
+            int[] ints = convertHexToDecimal(largeData);
+            RedisUtils.setCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() +DEVICE_BOOT_LOGO_KEY_PREFIX, Arrays.toString(ints), Duration.ofSeconds(5 * 60L));
+
+            Map<String, Object> payload = Map.of("ins_PicTrans",
+                    Collections.singletonList(0));
+            String topic = MqttConstants.GLOBAL_PUB_KEY + device.getDeviceImei();
+            String json = JsonUtils.toJsonString(payload);
+
+            try {
+                mqttGateway.sendMsgToMqtt(topic, 1, json);
+            } catch (Exception e) {
+                log.error("上传开机画面失败, topic={}, payload={}", topic, json, e);
+                throw new ServiceException("上传LOGO失败：" + e.getMessage());
+            }
+            log.info("发送上传开机画面到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY+device.getDeviceImei(),json);
+
+            recordDeviceLog(device.getId(), device.getDeviceName(), "上传开机画面", "上传开机画面", AppLoginHelper.getUserId());
+        } catch (Exception e){
+            throw new ServiceException("发送指令失败");
+        }
+    }
+
+    /**
+     * 人员登记
+     * @param bo
+     */
+    public boolean registerPersonInfo(AppPersonnelInfoBo bo) {
+        Long deviceId = bo.getDeviceId();
+        Device deviceObj = deviceMapper.selectById(deviceId);
+        if (deviceObj == null) {
+            throw new RuntimeException("请先将设备入库！！！");
+        }
+        if (isDeviceOffline(deviceObj.getDeviceImei())) {
+            throw new ServiceException("设备已断开连接：" + deviceObj.getDeviceName());
+        }
+        QueryWrapper<AppPersonnelInfo> qw = new QueryWrapper<AppPersonnelInfo>()
+                .eq("device_id", deviceId);
+        List<AppPersonnelInfoVo> appPersonnelInfoVos = appPersonnelInfoMapper.selectVoList(qw);
+
+        List<String> list = new ArrayList<>();
+        list.add(bo.getUnitName());
+        list.add(bo.getName());
+        list.add(bo.getPosition());
+        list.add(bo.getCode());
+        RedisUtils.setCacheList(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + deviceObj.getDeviceImei() + ":app_send_message_data", list);
+
+        Map<String, Object> payload = Map.of("ins_TexTrans",
+                Collections.singletonList(0));
+        String topic = MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei();
+        String json = JsonUtils.toJsonString(payload);
+
+        try {
+            mqttGateway.sendMsgToMqtt(topic, 1, json);
+        } catch (Exception e) {
+            log.error("人员信息登记失败, topic={}, payload={}", topic, json, e);
+            throw new ServiceException("人员信息登记失败：" + e.getMessage());
+        }
+        log.info("发送人员信息登记到设备消息=>topic:{},payload:{}", MqttConstants.GLOBAL_PUB_KEY + deviceObj.getDeviceImei(), bo);
+
+        recordDeviceLog(deviceId, deviceObj.getDeviceName(), "人员信息登记", JSON.toJSONString(bo), AppLoginHelper.getUserId());
+        if (ObjectUtils.length(appPersonnelInfoVos) == 0) {
+            AppPersonnelInfo appPersonnelInfo = MapstructUtils.convert(bo, AppPersonnelInfo.class);
+            return appPersonnelInfoMapper.insertOrUpdate(appPersonnelInfo);
+        } else {
+            UpdateWrapper<AppPersonnelInfo> uw = new UpdateWrapper<>();
+            uw.eq("device_id", deviceId)
+                    .set("name", bo.getName())
+                    .set("position", bo.getPosition())
+                    .set("unit_name", bo.getUnitName())
+                    .set("code", bo.getCode());
+            return appPersonnelInfoMapper.update(null, uw) > 0;
+        }
+    }
+
+    /* ---------------------------------- 私有通用方法 ---------------------------------- */
+
+    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());
+        }
+
+        Integer value = Integer.parseInt(dto.getInstructValue());
+
+        Map<String, Object> payload = Map.of(payloadKey,
+                Collections.singletonList(value));
+
+        String topic = MqttConstants.GLOBAL_PUB_KEY + device.getDeviceImei();
+        String json = JsonUtils.toJsonString(payload);
+
+        try {
+            mqttGateway.sendMsgToMqtt(topic, 1, json);
+        } catch (Exception e) {
+            log.error("发送指令失败, topic={}, payload={}", topic, json, e);
+            throw new ServiceException("发送指令失败：" + e.getMessage());
+        }
+
+        log.info("发送指令成功 => topic:{}, payload:{}", topic, json);
+        String content = resolveGradeDesc("ins_DetectGrade", value);
+        recordDeviceLog(device.getId(),
+                device.getDeviceName(),
+                deviceAction,
+                content,
+                AppLoginHelper.getUserId());
+    }
+
+    private boolean isDeviceOffline(String imei) {
+        // 原方法名语义相反，这里取反，使含义更清晰
+        return getDeviceStatus(imei);
+    }
+
+    /**
+     * 记录设备操作日志
+     * @param deviceId 设备ID
+     * @param content 日志内容
+     * @param operator 操作人
+     */
+    private void recordDeviceLog(Long deviceId,String deviceName, String deviceAction, String content, Long operator) {
+        try {
+            // 创建设备日志实体
+            com.fuyuanshen.equipment.domain.DeviceLog deviceLog = new com.fuyuanshen.equipment.domain.DeviceLog();
+            deviceLog.setDeviceId(deviceId);
+            deviceLog.setDeviceAction(deviceAction);
+            deviceLog.setContent(content);
+            deviceLog.setCreateBy(operator);
+            deviceLog.setDeviceName(deviceName);
+            deviceLog.setCreateTime(new Date());
+
+            // 插入日志记录
+            deviceLogMapper.insert(deviceLog);
+        } catch (Exception e) {
+            log.error("记录设备操作日志失败: {}", e.getMessage(), e);
+        }
+    }
+
+    private boolean getDeviceStatus(String deviceImei) {
+        String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+        return StringUtils.isBlank(deviceOnlineStatusRedisKey);
+    }
+
+}

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

@@ -1,8 +1,20 @@
 package com.fuyuanshen.web.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.DeviceAssignments;
+import com.fuyuanshen.equipment.domain.vo.WebDeviceVo;
+import com.fuyuanshen.equipment.enums.BindingStatusEnum;
 import com.fuyuanshen.equipment.mapper.DeviceAssignmentsMapper;
 import com.fuyuanshen.equipment.mapper.DeviceMapper;
 import com.fuyuanshen.web.service.WEBDeviceService;
@@ -10,6 +22,9 @@ import com.fuyuanshen.web.service.device.DeviceBizService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
 
 /**
  * @Description:
@@ -21,10 +36,14 @@ import org.springframework.stereotype.Service;
 @RequiredArgsConstructor
 public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> implements WEBDeviceService {
 
-    private final DeviceBizService appDeviceService;
-
     private final DeviceAssignmentsMapper deviceAssignmentsMapper;
 
+    private final AppDeviceBindRecordMapper appDeviceBindRecordMapper;
+    private final AppPersonnelInfoRecordsMapper infoRecordsMapper;
+
+    private final DeviceMapper deviceMapper;
+    private final AppDeviceShareMapper appDeviceShareMapper;
+
 
     /**
      * WEB端解绑设备
@@ -33,6 +52,7 @@ public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impl
      * @return
      */
     @Override
+    @Transactional
     public int webUnBindDevice(Long id, Long userId) {
         // 设备端解绑 0:设备端解绑 1:web端解绑
         int type = 1;
@@ -44,7 +64,54 @@ public class WEBDeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impl
             id = deviceAssignments.getDeviceId();
             type = 0;
         }
-        return appDeviceService.unBindDevice(id, userId, type);
+
+        QueryWrapper<AppDeviceBindRecord> deviceId = new QueryWrapper<AppDeviceBindRecord>().eq("device_id", id);
+
+        // appDeviceService.unBindDevice(id, userId, type);
+        UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
+        deviceUpdateWrapper.eq("id", id)
+                .set("binding_user_id", null)
+                .set("binding_status", BindingStatusEnum.UNBOUND.getCode())
+                .set("binding_time", null);
+        deviceMapper.update(null, deviceUpdateWrapper);
+
+        return appDeviceBindRecordMapper.delete(deviceId);
+    }
+
+
+    /**
+     * WEB端设备详情
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public WebDeviceVo getDevice(Long id) {
+        Device device = deviceMapper.selectById(id);
+        if (device != null) {
+            WebDeviceVo webDeviceVo = new WebDeviceVo();
+            BeanUtil.copyProperties(device, webDeviceVo);
+            // 查询分享用户数
+            Long count = appDeviceShareMapper.selectCount(new QueryWrapper<AppDeviceShare>().eq("device_id", id));
+            webDeviceVo.setShareUsersNumber(Math.toIntExact(count));
+            return webDeviceVo;
+        }
+        return null;
+    }
+
+
+    /**
+     * 设备用户详情
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public List<AppPersonnelInfoRecords> getDeviceUser(Long id) {
+        List<AppPersonnelInfoRecords> appPersonnelInfoRecords = infoRecordsMapper.selectList(
+                new QueryWrapper<AppPersonnelInfoRecords>().eq("device_id", id)
+                        .orderByDesc("create_time"));
+        return appPersonnelInfoRecords;
     }
 
 

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

@@ -1,3 +1,6 @@
+--- # 临时文件存储位置 避免临时文件被系统清理报错
+spring.servlet.multipart.location: /fys/server/temp
+
 --- # 监控中心配置
 spring.boot.admin.client:
   # 增加客户端开关
@@ -8,15 +11,15 @@ spring.boot.admin.client:
     metadata:
       username: ${spring.boot.admin.client.username}
       userpassword: ${spring.boot.admin.client.password}
-  username: ${monitor.username}
-  password: ${monitor.password}
+  username: @monitor.username@
+  password: @monitor.password@
 
 --- # snail-job 配置
 snail-job:
   enabled: false
   # 需要在 SnailJob 后台组管理创建对应名称的组,然后创建任务的时候选择对应的组,才能正确分派任务
   group: "fys_group"
-  # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config` 表
+  # SnailJob 接入验证令牌 详见 script/sql/ry_job.sql `sj_group_config`表
   token: "SJ_cKqBTPzCsWA3VyuCfFoccmuIEGXjr5KT"
   server:
     host: 127.0.0.1
@@ -37,7 +40,7 @@ spring:
     # 动态数据源文档 https://www.kancloud.cn/tracy5546/dynamic-datasource/content
     dynamic:
       # 性能分析插件(有性能损耗 不建议生产环境使用)
-      p6spy: true
+      p6spy: false
       # 设置默认的数据源或者数据源组,默认值即为 master
       primary: master
       # 严格模式 匹配不到数据源则报错
@@ -49,35 +52,35 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://120.79.224.186:3366/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://47.107.152.87:3306/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
-          password: 1fys@QWER..
-#        # 从库数据源
-#        slave:
-#          lazy: true
-#          type: ${spring.datasource.type}
-#          driverClassName: com.mysql.cj.jdbc.Driver
-#          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
-#          username:
-#          password:
-#        oracle:
-#          type: ${spring.datasource.type}
-#          driverClassName: oracle.jdbc.OracleDriver
-#          url: jdbc:oracle:thin:@//localhost:1521/XE
-#          username: ROOT
-#          password: root
-#        postgres:
-#          type: ${spring.datasource.type}
-#          driverClassName: org.postgresql.Driver
-#          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
-#          username: root
-#          password: root
-#        sqlserver:
-#          type: ${spring.datasource.type}
-#          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
-#          username: SA
-#          password: root
+          password: Jz_5623_cl1
+      #        # 从库数据源
+      #        slave:
+      #          lazy: true
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.mysql.cj.jdbc.Driver
+      #          url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+      #          username:
+      #          password:
+      #        oracle:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: oracle.jdbc.OracleDriver
+      #          url: jdbc:oracle:thin:@//localhost:1521/XE
+      #          username: ROOT
+      #          password: root
+      #        postgres:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: org.postgresql.Driver
+      #          url: jdbc:postgresql://localhost:5432/postgres?useUnicode=true&characterEncoding=utf8&useSSL=true&autoReconnect=true&reWriteBatchedInserts=true
+      #          username: root
+      #          password: root
+      #        sqlserver:
+      #          type: ${spring.datasource.type}
+      #          driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
+      #          url: jdbc:sqlserver://localhost:1433;DatabaseName=tempdb;SelectMethod=cursor;encrypt=false;rewriteBatchedStatements=true
+      #          username: SA
+      #          password: root
       hikari:
         # 最大连接池数量
         maxPoolSize: 20
@@ -98,13 +101,13 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: 120.79.224.186
+    host: 47.107.152.87
     # 端口，默认为6379
-    port: 26379
+    port: 6379
     # 数据库索引
-    database: 2
+    database: 1
     # redis 密码必须配置
-    password: 1fys@QWER..
+    password: re_fs_11520631
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -115,17 +118,17 @@ redisson:
   # redis key前缀
   keyPrefix:
   # 线程池数量
-  threads: 4
+  threads: 16
   # Netty线程池数量
-  nettyThreads: 8
+  nettyThreads: 32
   # 单节点配置
   singleServerConfig:
     # 客户端名称 不能用中文
     clientName: fys-Vue-Plus
     # 最小空闲连接数
-    connectionMinimumIdleSize: 8
+    connectionMinimumIdleSize: 32
     # 连接池大小
-    connectionPoolSize: 32
+    connectionPoolSize: 64
     # 连接空闲超时，单位：毫秒
     idleConnectionTimeout: 10000
     # 命令等待超时，单位：毫秒
@@ -177,12 +180,11 @@ sms:
       access-key-id: LTAI5tDGfJd4kMvrGtvyzCHz
       # 称为accessSecret有些称之为apiSecret
       access-key-secret: a4ZlVHVSYeMQHn0p1R18thA6xCdHQh
-        #模板ID 非必须配置，如果使用sendMessage的快速发送需此配置
+      #模板ID 非必须配置，如果使用sendMessage的快速发送需此配置
       template-id: SMS_324526343
-        #模板变量 上述模板的变量
+      #模板变量 上述模板的变量
       templateName: code
       signature:  深圳市富源晟科技
-#      sdk-app-id: 您的sdkAppId
     config2:
       # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: tencent
@@ -191,7 +193,6 @@ sms:
       signature: 您的短信签名
       sdk-app-id: 您的sdkAppId
 
-
 --- # 三方授权
 justauth:
   # 前端外网访问地址
@@ -206,11 +207,11 @@ justauth:
       redirect-uri: ${justauth.address}/social-callback?source=maxkey
     topiam:
       # topiam 服务器地址
-      server-url: http://127.0.0.1:1898/api/v1/authorize/y0q************spq***********8ol
+      server-url: http://127.0.0.1:1989/api/v1/authorize/y0q************spq***********8ol
       client-id: 449c4*********937************759
       client-secret: ac7***********1e0************28d
       redirect-uri: ${justauth.address}/social-callback?source=topiam
-      scopes: [openid, email, phone, profile]
+      scopes: [ openid, email, phone, profile ]
     qq:
       client-id: 10**********6
       client-secret: 1f7d08**********5b7**********29e
@@ -276,6 +277,18 @@ justauth:
       redirect-uri: ${justauth.address}/social-callback?source=gitea
 
 
+# MQTT配置
+mqtt:
+  username: admin
+  password: fys123456
+  url: tcp://47.107.152.87:1883
+  subClientId: fys_subClient
+  subTopic: worker/location/#
+  pubTopic: B/#
+  pubClientId: fys_pubClient
+  enabled: false
+
+
 # 文件存储路径
 file:
   mac:
@@ -296,13 +309,4 @@ file:
   app_avatar:
     pic: C:\eladmin\file\    #设备图片存储路径
     #ip: http://fuyuanshen.com:81/    #服务器地址
-    ip: https://fuyuanshen.com/    #服务器地址
-# MQTT配置
-mqtt:
-  username: admin
-  password: fys123456
-  url: tcp://47.107.152.87:1883
-  subClientId: fys_subClient
-  subTopic: worker/location/#
-  pubTopic: B/#
-  pubClientId: fys_pubClient
+    ip: https://fuyuanshen.com/    #服务器地址

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

@@ -52,9 +52,9 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://47.120.79.150:3306/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
+          url: jdbc:mysql://47.107.152.87:3306/fys-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&autoReconnect=true&rewriteBatchedStatements=true&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
           username: root
-          password: Jq_123456#
+          password: Jz_5623_cl1
 #        # 从库数据源
 #        slave:
 #          lazy: true
@@ -101,13 +101,13 @@ spring:
 spring.data:
   redis:
     # 地址
-    host: 47.120.79.150
+    host: 47.107.152.87
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 1
     # redis 密码必须配置
-    password: xhYc_djkl382^#780!
+    password: re_fs_11520631
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl
@@ -177,14 +177,14 @@ sms:
       # 框架定义的厂商名称标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: alibaba
       # 有些称为accessKey有些称之为apiKey，也有称为sdkKey或者appId。
-      access-key-id: LTAI5tJdDNpZootsPQ5hdELx
+      access-key-id: LTAI5tDGfJd4kMvrGtvyzCHz
       # 称为accessSecret有些称之为apiSecret
-      access-key-secret: mU4WtffcCXpHPz5tLwQpaGtLsJXONt
+      access-key-secret: a4ZlVHVSYeMQHn0p1R18thA6xCdHQh
       #模板ID 非必须配置，如果使用sendMessage的快速发送需此配置
-      template-id: SMS_322180518
+      template-id: SMS_324526343
       #模板变量 上述模板的变量
       templateName: code
-      signature:  湖北星汉研创科技
+      signature:  深圳市富源晟科技
     config2:
       # 厂商标识，标定此配置是哪个厂商，详细请看厂商标识介绍部分
       supplier: tencent
@@ -280,12 +280,13 @@ justauth:
 # MQTT配置
 mqtt:
   username: admin
-  password: #YtvpSfCNG
-  url: tcp://47.120.79.150:2883
+  password: fys123456
+  url: tcp://47.107.152.87:1883
   subClientId: fys_subClient
-  subTopic: A/#,B/#,worker/location/#
+  subTopic: A/#,worker/location/#
   pubTopic: B/#
   pubClientId: fys_pubClient
+  enabled: false
 
 
 # 文件存储路径

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

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

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

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

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

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

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

@@ -24,7 +24,7 @@ import com.fuyuanshen.app.service.IAppUserService;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 
 /**
- * APP用户信息
+ * WebApp用户信息
  *
  * @author Lion Li
  * @date 2025-06-27
@@ -32,14 +32,14 @@ import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 @Validated
 @RequiredArgsConstructor
 @RestController
-@RequestMapping("/app/user")
-public class AppUserController extends BaseController {
+@RequestMapping("/WebApp/user")
+public class WebAppUserController extends BaseController {
 
     private final IAppUserService appUserService;
 
 
     /**
-     * 查询APP用户信息列表
+     *  查询APP用户信息列表
      */
 //    @SaCheckPermission("app:user:list")
     @GetMapping("/list")
@@ -67,7 +67,7 @@ public class AppUserController extends BaseController {
     @SaCheckPermission("app:user:query")
     @GetMapping("/{userId}")
     public R<AppUserVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long userId) {
+                                @PathVariable Long userId) {
         return R.ok(appUserService.queryById(userId));
     }
 
@@ -105,4 +105,5 @@ public class AppUserController extends BaseController {
                           @PathVariable Long[] userIds) {
         return toAjax(appUserService.deleteWithValidByIds(List.of(userIds), true));
     }
+
 }

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

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

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

@@ -99,6 +99,6 @@ public class AppUser extends TenantEntity {
     /**
      * 地区
      */
-    private String region;
+//    private String region;
 
 }

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

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

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

@@ -0,0 +1,80 @@
+package com.fuyuanshen.app.domain.vo;
+
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import com.fuyuanshen.common.excel.annotation.ExcelDictFormat;
+import com.fuyuanshen.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 人员信息登记记录视图对象 app_personnel_info_records
+ *
+ * @author CYT
+ * @date 2025-08-22
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = AppPersonnelInfoRecords.class)
+public class AppPersonnelInfoRecordsVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 设备id
+     */
+    @ExcelProperty(value = "设备id")
+    private Long deviceId;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long personnelId;
+
+    /**
+     * 人员姓名
+     */
+    @ExcelProperty(value = "人员姓名")
+    private String name;
+
+    /**
+     * 职位
+     */
+    @ExcelProperty(value = "职位")
+    private String position;
+
+    /**
+     * 单位名称
+     */
+    @ExcelProperty(value = "单位名称")
+    private String unitName;
+
+    /**
+     * ID号
+     */
+    @ExcelProperty(value = "ID号")
+    private String code;
+
+    /**
+     * 发送信息
+     */
+    @ExcelProperty(value = "发送信息")
+    private String sendMsg;
+
+
+}

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

@@ -5,6 +5,8 @@ import java.util.Date;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fuyuanshen.app.domain.AppUser;
 import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
 import cn.idev.excel.annotation.ExcelProperty;
@@ -87,6 +89,8 @@ public class AppUserVo implements Serializable {
      * 密码
      */
     @ExcelProperty(value = "密码")
+    @JsonIgnore
+    @JsonProperty
     private String password;
 
     /**

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

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

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

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

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

@@ -0,0 +1,138 @@
+package com.fuyuanshen.app.service.impl;
+
+import com.fuyuanshen.common.core.utils.MapstructUtils;
+import com.fuyuanshen.common.core.utils.StringUtils;
+import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
+import com.fuyuanshen.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import com.fuyuanshen.app.domain.bo.AppPersonnelInfoRecordsBo;
+import com.fuyuanshen.app.domain.vo.AppPersonnelInfoRecordsVo;
+import com.fuyuanshen.app.domain.AppPersonnelInfoRecords;
+import com.fuyuanshen.app.mapper.AppPersonnelInfoRecordsMapper;
+import com.fuyuanshen.app.service.IAppPersonnelInfoRecordsService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 人员信息登记记录Service业务层处理
+ *
+ * @author CYT
+ * @date 2025-08-22
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class AppPersonnelInfoRecordsServiceImpl implements IAppPersonnelInfoRecordsService {
+
+    private final AppPersonnelInfoRecordsMapper baseMapper;
+
+    /**
+     * 查询人员信息登记记录
+     *
+     * @param id 主键
+     * @return 人员信息登记记录
+     */
+    @Override
+    public AppPersonnelInfoRecordsVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询人员信息登记记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 人员信息登记记录分页列表
+     */
+    @Override
+    public TableDataInfo<AppPersonnelInfoRecordsVo> queryPageList(AppPersonnelInfoRecordsBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<AppPersonnelInfoRecords> lqw = buildQueryWrapper(bo);
+        Page<AppPersonnelInfoRecordsVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的人员信息登记记录列表
+     *
+     * @param bo 查询条件
+     * @return 人员信息登记记录列表
+     */
+    @Override
+    public List<AppPersonnelInfoRecordsVo> queryList(AppPersonnelInfoRecordsBo bo) {
+        LambdaQueryWrapper<AppPersonnelInfoRecords> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<AppPersonnelInfoRecords> buildQueryWrapper(AppPersonnelInfoRecordsBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<AppPersonnelInfoRecords> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(AppPersonnelInfoRecords::getId);
+        lqw.eq(bo.getDeviceId() != null, AppPersonnelInfoRecords::getDeviceId, bo.getDeviceId());
+        lqw.eq(bo.getPersonnelId() != null, AppPersonnelInfoRecords::getPersonnelId, bo.getPersonnelId());
+        lqw.like(StringUtils.isNotBlank(bo.getName()), AppPersonnelInfoRecords::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getPosition()), AppPersonnelInfoRecords::getPosition, bo.getPosition());
+        lqw.like(StringUtils.isNotBlank(bo.getUnitName()), AppPersonnelInfoRecords::getUnitName, bo.getUnitName());
+        lqw.eq(StringUtils.isNotBlank(bo.getCode()), AppPersonnelInfoRecords::getCode, bo.getCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getSendMsg()), AppPersonnelInfoRecords::getSendMsg, bo.getSendMsg());
+        return lqw;
+    }
+
+    /**
+     * 新增人员信息登记记录
+     *
+     * @param bo 人员信息登记记录
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(AppPersonnelInfoRecordsBo bo) {
+        AppPersonnelInfoRecords add = MapstructUtils.convert(bo, AppPersonnelInfoRecords.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改人员信息登记记录
+     *
+     * @param bo 人员信息登记记录
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(AppPersonnelInfoRecordsBo bo) {
+        AppPersonnelInfoRecords update = MapstructUtils.convert(bo, AppPersonnelInfoRecords.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(AppPersonnelInfoRecords entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除人员信息登记记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

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

@@ -177,7 +177,7 @@ public class AppUserServiceImpl implements IAppUserService {
         appUserVo.setNickName(user.getNickName());
         appUserVo.setGender(user.getSex());
         appUserVo.setPhone(user.getPhonenumber());
-        appUserVo.setRegion(user.getRegion());
+//        appUserVo.setRegion(user.getRegion());
         if(user.getAvatar() != null){
             SysOssVo oss = sysOssService.getById(user.getAvatar());
             if(oss != null){
@@ -203,7 +203,7 @@ public class AppUserServiceImpl implements IAppUserService {
             updUser.setAvatar(oss.getOssId());
         }
 
-        updUser.setRegion(bo.getRegion());
+//        updUser.setRegion(bo.getRegion());
         updUser.setSex(bo.getGender());
         return baseMapper.update(updUser, new LambdaQueryWrapper<AppUser>().eq(AppUser::getUserId, appUser.getUserId()));
     }

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

@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select a.id,a.business_id,a.file_id,b.file_name,b.url fileUrl from app_business_file a left join sys_oss b on a.file_id = b.oss_id
         where 1=1
         <if test="createBy != null">
-            a.create_by = #{createBy}
+             and a.create_by = #{createBy}
         </if>
         <if test="businessId != null">
             and a.business_id = #{businessId}
@@ -19,9 +19,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="fileType != null">
             and a.file_type = #{fileType}
         </if>
-        <if test="createBy != null">
-            and a.create_by = #{createBy}
-        </if>
         order by a.create_time desc
     </select>
 </mapper>

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

@@ -12,7 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         d.device_pic,
         dt.type_name,
         dt.communication_mode,
-        dt.model_dictionary detailPageUrl,
+        dt.app_model_dictionary detailPageUrl,
         d.bluetooth_name,
         c.binding_time,
         ad.*,u.user_name otherPhonenumber
@@ -33,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         dt.type_name,
         dt.communication_mode,
         d.bluetooth_name,
-        dt.model_dictionary detailPageUrl,
+        dt.app_model_dictionary detailPageUrl,
         c.binding_time,
         ad.*,u.user_name otherPhonenumber
         from

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -57,6 +57,11 @@ public class AppDeviceVo implements Serializable {
      */
     private Date bindingTime;
 
+    /**
+     * 绑定人
+     */
+    private Date bindingBy;
+
     /**
      * 在线状态(0离线，1在线)
      */

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

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

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

@@ -0,0 +1,32 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import lombok.Data;
+
+@Data
+public class InstructionRecordVo {
+    private Long id;
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备类型
+     */
+    private String deviceType;
+
+    /**
+     * 操作模块
+     */
+    private String deviceAction;
+
+    /**
+     * 操作内容
+     */
+    private String content;
+
+    /**
+     * 操作时间
+     */
+    private String createTime;
+}

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

@@ -0,0 +1,100 @@
+package com.fuyuanshen.equipment.domain.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class WebDeviceVo implements Serializable {
+
+    private Long id;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备IMEI
+     */
+    private String deviceImei;
+
+    /**
+     * 设备MAC
+     */
+    private String deviceMac;
+
+    /**
+     * 通讯方式 0:4G;1:蓝牙
+     */
+    private Integer communicationMode;
+
+    /**
+     * 设备图片
+     */
+    private String devicePic;
+
+    /**
+     * 设备类型
+     */
+    private String typeName;
+
+    /**
+     * 蓝牙名称
+     */
+    private String bluetoothName;
+
+    /**
+     * 使用人员
+     */
+    private String personnelBy;
+
+    /**
+     * 设备状态
+     * 0 失效
+     * 1 正常
+     */
+    private Integer deviceStatus;
+
+    /**
+     * 绑定时间
+     */
+    private Date bindingTime;
+
+    /**
+     * 在线状态(0离线，1在线)
+     */
+    private Integer onlineStatus;
+
+    /**
+     * 电量 百分比
+     */
+    private String battery;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 告警状态(0解除告警，1告警)
+     */
+    private String alarmStatus;
+
+    /**
+     * 设备详情页面
+     */
+    private String detailPageUrl;
+
+    /**
+     * 分享用户数量
+     */
+    private Integer shareUsersNumber;
+
+}

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

@@ -1,8 +1,12 @@
 package com.fuyuanshen.equipment.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuyuanshen.equipment.domain.DeviceLog;
+import com.fuyuanshen.equipment.domain.dto.InstructionRecordDto;
 import com.fuyuanshen.equipment.domain.vo.DeviceLogVo;
 import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
+import com.fuyuanshen.equipment.domain.vo.InstructionRecordVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 设备日志Mapper接口
@@ -12,4 +16,5 @@ import com.fuyuanshen.common.mybatis.core.mapper.BaseMapperPlus;
  */
 public interface DeviceLogMapper extends BaseMapperPlus<DeviceLog, DeviceLogVo> {
 
+    Page<InstructionRecordVo> getInstructionRecord(Page<InstructionRecordVo> page,@Param("bo") InstructionRecordDto bo);
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fuyuanshen.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
 import com.fuyuanshen.equipment.domain.vo.AppDeviceVo;
+import com.fuyuanshen.equipment.domain.vo.WebDeviceVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -68,4 +69,6 @@ public interface DeviceMapper extends BaseMapper<Device> {
     List<Device> findByOriginalDeviceId(Long originalDeviceId);
 
     AppDeviceVo getDeviceInfo(@Param("deviceMac") String deviceMac);
+
+    Page<WebDeviceVo> queryWebDeviceList(Page<Object> build,@Param("criteria") DeviceQueryCriteria criteria);
 }

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

@@ -3,6 +3,7 @@ package com.fuyuanshen.equipment.service;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.equipment.domain.vo.DeviceGroupVo;
 import com.fuyuanshen.equipment.domain.bo.DeviceGroupBo;
+import jakarta.validation.constraints.NotEmpty;
 
 import java.util.Collection;
 import java.util.List;
@@ -56,4 +57,14 @@ public interface IDeviceGroupService {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+
+    /**
+     * 绑定设备分组
+     *
+     * @param groupId  分组id
+     * @param deviceId 设备id
+     * @return 是否绑定成功
+     */
+    Boolean bindingDevice(@NotEmpty(message = "分组id 不能为空") Long groupId, @NotEmpty(message = "设备id 不能为空") Long[] deviceId);
 }

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

@@ -1,6 +1,7 @@
 package com.fuyuanshen.equipment.service.impl;
 
 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.common.core.domain.R;
@@ -11,6 +12,8 @@ import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.common.satoken.utils.LoginHelper;
 import com.fuyuanshen.equipment.domain.Device;
 import com.fuyuanshen.equipment.domain.DeviceTypeGrants;
+import com.fuyuanshen.equipment.mapper.DeviceMapper;
+import jakarta.validation.constraints.NotEmpty;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -22,6 +25,7 @@ import com.fuyuanshen.equipment.mapper.DeviceGroupMapper;
 import com.fuyuanshen.equipment.service.IDeviceGroupService;
 
 import java.text.SimpleDateFormat;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -39,6 +43,7 @@ import java.util.stream.Collectors;
 public class DeviceGroupServiceImpl implements IDeviceGroupService {
 
     private final DeviceGroupMapper baseMapper;
+    private final DeviceMapper deviceMapper;
 
 
     /**
@@ -63,7 +68,7 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService {
     public List<DeviceGroupVo> queryList(DeviceGroupBo bo) {
         Page<Device> page = new Page<>(bo.getPageNum(), bo.getPageSize());
         // 1. 查询顶级分组（parent_id为null）
-        IPage<DeviceGroup>  rootGroups = baseMapper.selectRootGroups(bo, page);
+        IPage<DeviceGroup> rootGroups = baseMapper.selectRootGroups(bo, page);
         List<DeviceGroup> records = rootGroups.getRecords();
 
         // 2. 递归构建树形结构
@@ -169,4 +174,29 @@ public class DeviceGroupServiceImpl implements IDeviceGroupService {
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+
+    /**
+     * 绑定设备分组
+     *
+     * @param groupId  分组id
+     * @param deviceId 设备id
+     * @return 是否绑定成功
+     */
+    @Override
+    public Boolean bindingDevice(Long groupId, Long[] deviceId) {
+
+        if (deviceId != null && deviceId.length > 0) {
+            // 创建更新条件
+            UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.in("id", Arrays.asList(deviceId));
+            updateWrapper.set("group_id", groupId);
+
+            // 执行批量更新
+            deviceMapper.update(updateWrapper);
+        }
+
+        return true;
+    }
+
 }

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

@@ -106,6 +106,13 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
                 criteria.setDeviceType(deviceTypeGrant.getDeviceTypeId());
             }
         }
+
+        // 管理员
+        String username = LoginHelper.getUsername();
+        if (username.equals("admin")) {
+            criteria.setIsAdmin(true);
+        }
+
         IPage<Device> devices = deviceMapper.findAll(criteria, page);
 
         List<Device> records = devices.getRecords();

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

@@ -53,8 +53,12 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
      */
     @Override
     public TableDataInfo<DeviceType> queryAll(DeviceTypeQueryCriteria criteria, Page<DeviceType> page) {
-        criteria.setCustomerId(LoginHelper.getUserId());
-        // return
+        // 管理员
+        String username = LoginHelper.getUsername();
+        if (!username.equals("admin")) {
+            criteria.setCustomerId(LoginHelper.getUserId());
+        }
+
         IPage<DeviceType> deviceTypeIPage = deviceTypeMapper.findAll(criteria, page);
         return new TableDataInfo<DeviceType>(deviceTypeIPage.getRecords(), deviceTypeIPage.getTotal());
     }
@@ -74,8 +78,16 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
     @Override
     public List<DeviceType> queryDeviceTypes() {
         DeviceTypeQueryCriteria criteria = new DeviceTypeQueryCriteria();
-        Long userId = LoginHelper.getUserId();
-        criteria.setCustomerId(userId);
+
+        // 管理员
+        String username = LoginHelper.getUsername();
+        if (!username.equals("admin")) {
+            criteria.setCustomerId(LoginHelper.getUserId());
+
+            Long userId = LoginHelper.getUserId();
+            criteria.setCustomerId(userId);
+        }
+
         return deviceTypeMapper.findAll(criteria);
     }
 
@@ -157,8 +169,12 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
             throw new RuntimeException("设备类型名称已存在,无法修改!!!");
         }
 
-        if (!Objects.equals(deviceType.getCustomerId(), LoginHelper.getUserId())) {
-            throw new RuntimeException("无权修改该设备类型");
+        // 管理员
+        String username = LoginHelper.getUsername();
+        if (!username.equals("admin")) {
+            if (!Objects.equals(deviceType.getCustomerId(), LoginHelper.getUserId())) {
+                throw new RuntimeException("无权修改该设备类型");
+            }
         }
 
         BeanUtil.copyProperties(resources, deviceType);

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

@@ -4,4 +4,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuyuanshen.equipment.mapper.DeviceLogMapper">
 
+    <select id="getInstructionRecord" resultType="com.fuyuanshen.equipment.domain.vo.InstructionRecordVo">
+        SELECT
+        a.id,
+        a.device_name AS deviceName,
+        c.type_name deviceType,
+        a.device_action AS deviceAction,
+        a.content,
+        a.create_time AS createTime
+        FROM
+        device_log a left join device b on a.device_id = b.id
+        left join device_type c on b.device_type = c.id
+        WHERE 1 = 1
+        <if test="bo.deviceType != null">
+            AND c.id = #{bo.deviceType}
+        </if>
+        <if test="bo.deviceName != null and bo.deviceName != ''">
+            AND a.device_name like concat('%',#{bo.deviceName},'%')
+        </if>
+        <if test="bo.deviceMac != null and bo.deviceMac != ''">
+            AND b.device_mac = #{bo.deviceMac}
+        </if>
+        <if test="bo.deviceImei != null and bo.deviceImei != ''">
+            AND b.device_imei = #{bo.deviceImei}
+        </if>
+        <if test="bo.startTime != null and bo.startTime != ''">
+            AND create_time <![CDATA[>=]]> #{bo.startTime}
+        </if>
+        <if test="bo.endTime != null and bo.endTime != ''">
+            AND create_time <![CDATA[<=]]> #{bo.startTime}
+        </if>
+        ORDER BY
+        a.create_time DESC
+    </select>
 </mapper>

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

@@ -74,8 +74,11 @@
             <if test="criteria.params.beginTime != null and criteria.params.endTime != null">
                 and da.create_time between #{criteria.params.beginTime} and #{criteria.params.endTime}
             </if>
-            AND da.assignee_id = #{criteria.currentOwnerId}
-            AND dg.customer_id = #{criteria.currentOwnerId}
+            <!-- 管理员可以查看所有设备，普通用户只能查看自己的设备 -->
+            <if test="criteria.isAdmin != true">
+                AND da.assignee_id = #{criteria.currentOwnerId}
+                AND dg.customer_id = #{criteria.currentOwnerId}
+            </if>
         </where>
         ) AS ranked
         WHERE rn = 1
@@ -148,7 +151,7 @@
         dt.type_name,
         dt.communication_mode,
         d.bluetooth_name,
-        dt.model_dictionary detailPageUrl,
+        dt.app_model_dictionary detailPageUrl,
         c.binding_time
         from device d
         inner join device_type dt on d.device_type = dt.id
@@ -178,7 +181,7 @@
         d.device_pic,
         dt.type_name,
         dt.communication_mode,
-        dt.model_dictionary detailPageUrl,
+        dt.app_model_dictionary detailPageUrl,
         d.bluetooth_name
         from device d
         inner join device_type dt on d.device_type = dt.id
@@ -213,6 +216,23 @@
         WHERE original_device_id = #{originalDeviceId}
     </select>
     <select id="getDeviceInfo" resultType="com.fuyuanshen.equipment.domain.vo.AppDeviceVo">
+        select d.id,
+               d.device_name,
+               d.device_name,
+               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
+        from device d
+                 inner join device_type dt on d.device_type = dt.id
+        where d.device_mac = #{deviceMac}
+    </select>
+    <select id="queryWebDeviceList" resultType="com.fuyuanshen.equipment.domain.vo.WebDeviceVo">
         select d.id, d.device_name, d.device_name,
         d.device_name,
         d.device_mac,
@@ -222,10 +242,39 @@
         dt.type_name,
         dt.communication_mode,
         d.bluetooth_name,
-        dt.model_dictionary detailPageUrl
+        dt.pc_model_dictionary detailPageUrl,
+        ap.name personnelBy,
+        d.device_status,
+        c.binding_time
         from device d
         inner join device_type dt on d.device_type = dt.id
-        where d.device_mac = #{deviceMac}
+        inner join app_device_bind_record c on d.id = c.device_id
+        left join app_personnel_info ap on ap.device_id = d.id
+        where dt.communication_mode = 0
+        <if test="criteria.deviceType != null">
+            and d.device_type = #{criteria.deviceType}
+        </if>
+        <if test="criteria.deviceName != null and criteria.deviceName != ''">
+            and d.device_name like concat('%', #{criteria.deviceName}, '%')
+        </if>
+        <if test="criteria.deviceMac != null">
+            and d.device_mac = #{criteria.deviceMac}
+        </if>
+        <if test="criteria.deviceImei != null">
+            and d.device_imei = #{criteria.deviceImei}
+        </if>
+        <if test="criteria.deviceStatus != null">
+            and d.device_status = #{criteria.deviceStatus}
+        </if>
+        <if test="criteria.personnelBy != null and criteria.personnelBy != ''">
+            and ap.name like concat('%', #{criteria.personnelBy}, '%')
+        </if>
+        <if test="criteria.communicationMode != null">
+            and dt.communication_mode = #{criteria.communicationMode}
+        </if>
+        <if test="criteria.groupId != null">
+            and d.group_id = #{criteria.groupId}
+        </if>
     </select>
 
 </mapper>

fys-modules/fys-system/src/main/java/com/fuyuanshen/system/controller/system/SysDictDataController.java

@@ -2,6 +2,7 @@ package com.fuyuanshen.system.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.util.ObjectUtil;
+import com.fuyuanshen.common.core.constant.CacheNames;
 import com.fuyuanshen.common.log.annotation.Log;
 import com.fuyuanshen.common.web.core.BaseController;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
@@ -14,10 +15,12 @@ import com.fuyuanshen.system.domain.vo.SysDictDataVo;
 import com.fuyuanshen.system.service.ISysDictDataService;
 import com.fuyuanshen.system.service.ISysDictTypeService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import jakarta.servlet.http.HttpServletResponse;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -73,6 +76,8 @@ public class SysDictDataController extends BaseController {
      */
     @GetMapping(value = "/type/{dictType}")
     public R<List<SysDictDataVo>> dictType(@PathVariable String dictType) {
+        // 使用时先清除缓存再查询
+        dictTypeService.clearDictTypeCache(dictType);
         List<SysDictDataVo> data = dictTypeService.selectDictDataByType(dictType);
         if (ObjectUtil.isNull(data)) {
             data = new ArrayList<>();
@@ -94,6 +99,7 @@ public class SysDictDataController extends BaseController {
         return R.ok();
     }
 
+
     /**
      * 修改保存字典类型
      */
@@ -105,6 +111,7 @@ public class SysDictDataController extends BaseController {
             return R.fail("修改字典数据'" + dict.getDictValue() + "'失败，字典键值已存在");
         }
         dictDataService.updateDictData(dict);
+
         return R.ok();
     }
 

fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysDictDataService.java

@@ -73,4 +73,9 @@ public interface ISysDictDataService {
      */
     boolean checkDictDataUnique(SysDictDataBo dict);
 
+    /**
+     * 清空字典缓存
+     */
+    void clearDictTypeCache(String dictType);
+
 }

fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/ISysDictTypeService.java

@@ -92,4 +92,9 @@ public interface ISysDictTypeService {
      * @return 结果
      */
     boolean checkDictTypeUnique(SysDictTypeBo dictType);
+
+    /**
+     * 清空字典缓存
+     */
+    void clearDictTypeCache(String dictType);
 }

fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysDictDataServiceImpl.java

@@ -18,6 +18,7 @@ import com.fuyuanshen.system.domain.vo.SysDictDataVo;
 import com.fuyuanshen.system.mapper.SysDictDataMapper;
 import com.fuyuanshen.system.service.ISysDictDataService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.stereotype.Service;
 
@@ -154,4 +155,12 @@ public class SysDictDataServiceImpl implements ISysDictDataService {
         return true;
     }
 
+
+    // 清除指定dictType的缓存
+    @CacheEvict(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
+    public void clearDictTypeCache(String dictType) {
+        // 仅用于清除缓存
+    }
+
+
 }

fys-modules/fys-system/src/main/java/com/fuyuanshen/system/service/impl/SysDictTypeServiceImpl.java

@@ -28,6 +28,7 @@ import com.fuyuanshen.system.domain.vo.SysDictTypeVo;
 import com.fuyuanshen.system.mapper.SysDictDataMapper;
 import com.fuyuanshen.system.mapper.SysDictTypeMapper;
 import com.fuyuanshen.system.service.ISysDictTypeService;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.CachePut;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -294,4 +295,11 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService
         return BeanUtil.copyToList(list, DictDataDTO.class);
     }
 
+
+    // 清除指定dictType的缓存
+    @CacheEvict(cacheNames = CacheNames.SYS_DICT, key = "#dictType")
+    public void clearDictTypeCache(String dictType) {
+        // 仅用于清除缓存
+    }
+
 }

pom.xml

@@ -83,16 +83,6 @@
                 <monitor.username>fys</monitor.username>
                 <monitor.password>123456</monitor.password>
             </properties>
-
-        </profile>
-        <profile>
-            <id>prod</id>
-            <properties>
-                <profiles.active>prod</profiles.active>
-                <logging.level>warn</logging.level>
-                <monitor.username>fys</monitor.username>
-                <monitor.password>123456</monitor.password>
-            </properties>
             <activation>
                 <!-- 默认环境 -->
                 <activeByDefault>true</activeByDefault>
@@ -102,6 +92,16 @@
             <!--     <activeByDefault>true</activeByDefault> -->
             <!-- </activation> -->
         </profile>
+        <profile>
+            <id>prod</id>
+            <properties>
+                <profiles.active>prod</profiles.active>
+                <logging.level>info</logging.level>
+                <monitor.username>fys</monitor.username>
+                <monitor.password>123456</monitor.password>
+            </properties>
+
+        </profile>
         <profile>
             <id>jingquan</id>
             <properties>