Merge remote-tracking branch 'upstream/dyf-device'

Reviewed-on: dyf/fys-Multi-tenant#7

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

@@ -0,0 +1,56 @@
+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),
+        PIC_TRANS(102),
+        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 int staSOSGrade;
+    /**
+     * 第四键值对，剩余照明时间，0-5999，单位分钟。
+     */
+    @JsonProperty("sta_PowerTime")
+    public int staPowerTime;
+    /**
+     * 第五键值对，剩余电量百分比，0-100
+     */
+    @JsonProperty("sta_PowerPercent")
+    public int staPowerPercent;
+    /**
+     * 第六键值对, 近电预警级别, 0-无预警，1-弱预警，2-中预警，3-强预警，4-非常强预警。
+     */
+    @JsonProperty("sta_DetectResult")
+    public int staDetectResult;
+    /**
+     * 第七键值对, 静止报警状态，0-未静止报警，1-正在静止报警。
+     */
+    @JsonProperty("staShakeBit")
+    public int sta_ShakeBit;
+    /**
+     * 第八键值对, 4G信号强度，0-32，数值越大，信号越强。
+     */
+    @JsonProperty("sta_4gSinal")
+    public int sta4gSinal;
+    /**
+     * 第九键值对，IMIE卡号
+     */
+    @JsonProperty("sta_imei")
+    public int staimei;
+    /**
+     * 第十键值对，经度
+     */
+    @JsonProperty("sta_longitude")
+    public String stalongitude;
+    /**
+     * 第十一键值对，纬度
+     */
+    @JsonProperty("sta_latitude")
+    public String stalatitude;
+
+}

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

@@ -0,0 +1,16 @@
+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";
+}

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/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/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}")

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-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;
@@ -32,6 +29,13 @@ public class Device extends TenantEntity {
     @TableField(exist = false)
     private Long assignId;
 
+    /**
+     * 设备分组
+     * group_id
+     */
+    @Schema(name = "设备分组")
+    private Long groupId;
+
     /**
      * device_type
      */
@@ -143,4 +147,11 @@ public class Device extends TenantEntity {
      */
     private String subTopic;
 
+    /**
+     * 出厂日期
+     * production_date
+     */
+    @Schema(name = "出厂日期")
+    private Date productionDate;
+
 }

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

@@ -30,18 +30,21 @@ public class DeviceGroupBo extends BaseEntity {
     /**
      * 分组名称
      */
+    @Schema(name = "分组名称")
     @NotBlank(message = "分组名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String groupName;
 
     /**
      * 状态：0-禁用，1-正常
      */
+    @Schema(name = "状态：0-禁用，1-正常")
     // @NotNull(message = "状态：0-禁用，1-正常不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long status;
 
     /**
      * 父分组ID
      */
+    @Schema(name = "父分组ID")
     private Long parentId;
 
     /**

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

@@ -65,4 +65,23 @@ public class DeviceQueryCriteria extends BaseEntity {
 
     /* app绑定用户id */
     private Long bindingUserId;
+
+    /**
+     * 是否为管理员
+     */
+    @Schema(name = "是否为管理员")
+    private Boolean isAdmin = false;
+
+    /**
+     * 设备所属分组
+     */
+    @Schema(name = "设备所属分组")
+    private Long groupId;
+
+    /**
+     * 设备地区
+     */
+    @Schema(name = "设备地区")
+    private String area;
+
 }

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

@@ -35,4 +35,10 @@ public class DeviceTypeQueryCriteria extends BaseEntity implements Serializable
 
     @Schema(name = "每页数据量", example = "10")
     private Integer pageSize = 10;
+
+
+    /* 是否为管理员 */
+    private Boolean isAdmin = false;
+
+
 }

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) {
+        // 管理员
+        String username = LoginHelper.getUsername();
+        if (!username.equals("admin")) {
             criteria.setCustomerId(LoginHelper.getUserId());
-        // return
+        }
+
         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();
+
+        // 管理员
+        String username = LoginHelper.getUsername();
+        if (!username.equals("admin")) {
+            criteria.setCustomerId(LoginHelper.getUserId());
+
             Long userId = LoginHelper.getUserId();
             criteria.setCustomerId(userId);
+        }
+
         return deviceTypeMapper.findAll(criteria);
     }
 
@@ -157,9 +169,13 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
             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);
         deviceTypeMapper.updateById(deviceType);

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>
+            <!-- 管理员可以查看所有设备，普通用户只能查看自己的设备 -->
+            <if test="criteria.isAdmin != true">
                 AND da.assignee_id = #{criteria.currentOwnerId}
                 AND dg.customer_id = #{criteria.currentOwnerId}
+            </if>
         </where>
         ) AS ranked
         WHERE rn = 1
@@ -213,7 +216,9 @@
         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,
+        select d.id,
+               d.device_name,
+               d.device_name,
                d.device_name,
                d.device_mac,
                d.device_sn,