Merge branch 'dyf-device' into 6170

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

@@ -227,7 +227,7 @@ public class AppDeviceShareService {
             appDeviceShare.setPermission(bo.getPermission());
             appDeviceShare.setCreateBy(userId);
             return appDeviceShareMapper.insert(appDeviceShare);
-        }
+}
     }
 
     public int remove(Long[] ids) {

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

@@ -15,11 +15,14 @@ import org.springframework.messaging.MessageHandler;
 @Configuration
 @Slf4j
 public class MqttOutboundConfiguration {
+
     @Autowired
     private MqttPropertiesConfig mqttPropertiesConfig;
+
     @Autowired
     private MqttPahoClientFactory mqttPahoClientFactory;
- 
+
+
     // 消息通道
     @Bean
     public MessageChannel mqttOutboundChannel(){

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

@@ -1,6 +1,7 @@
 package com.fuyuanshen.global.mqtt.constants;
 
 public class DeviceRedisKeyConstants {
+
     public static final String DEVICE_KEY_PREFIX = "device:";
     // 设备上报状态
     public static final String DEVICE_STATUS_KEY_PREFIX = ":status";
@@ -52,4 +53,5 @@ public class DeviceRedisKeyConstants {
      * 告警信息
      */
     public static final String DEVICE_ALARM_MESSAGE_KEY_PREFIX = ":alarmMessage";
+
 }

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

@@ -36,7 +36,6 @@ public class LightingCommandTypeConstants {
      */
     public static final String SEND_MESSAGE = "Light_6";
 
-
     /**
      * 报警模式
      */

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

@@ -57,12 +57,12 @@ public class BjqAlarmRule implements MqttMessageRule {
             if (StringUtils.isNotBlank(convertValue)) {
                 // 将设备状态信息存储到Redis中
                 String deviceRedisKey = GlobalConstants.GLOBAL_REDIS_KEY + DeviceRedisKeyConstants.DEVICE_KEY_PREFIX + context.getDeviceImei() + DEVICE_ALARM_KEY_PREFIX;
-                String sendMessageIng = GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
+                String sendMessageIng = GLOBAL_REDIS_KEY + DEVICE_KEY_PREFIX + context.getDeviceImei() + ":messageSending";
                 if ("1".equals(convertValue)) {
                     RedisUtils.setCacheObject(sendMessageIng, "1", Duration.ofDays(1));
                     // 存储到Redis
                     RedisUtils.setCacheObject(deviceRedisKey, "1");
-                }else if ("0".equals(convertValue)){
+                } else if ("0".equals(convertValue)) {
                     RedisUtils.deleteObject(sendMessageIng);
                     RedisUtils.deleteObject(deviceRedisKey);
                 }

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

@@ -71,5 +71,4 @@ public class BjqLaserModeSettingsRule implements MqttMessageRule {
     }
 
 
-
 }

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

@@ -45,6 +45,7 @@ public class BjqModeRule implements MqttMessageRule {
         return LightingCommandTypeConstants.LIGHT_MODE;
     }
 
+
     @Override
     public void execute(MqttRuleContext context) {
         String functionAccess = FUNCTION_ACCESS_KEY + context.getDeviceImei();

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

@@ -1,32 +1,18 @@
 package com.fuyuanshen.global.mqtt.rule.bjq;
 
-import com.alibaba.fastjson2.JSONObject;
-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.config.MqttGateway;
-import com.fuyuanshen.global.mqtt.constants.DeviceRedisKeyConstants;
 import com.fuyuanshen.global.mqtt.constants.LightingCommandTypeConstants;
-import com.fuyuanshen.global.mqtt.constants.MqttConstants;
 import com.fuyuanshen.global.mqtt.listener.domain.FunctionAccessStatus;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
 import java.time.Duration;
-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.*;
 
 /**
  * 定位数据命令处理
@@ -55,4 +41,5 @@ public class BjqPersonnelInfoDataRule implements MqttMessageRule {
             RedisUtils.setCacheObject(functionAccess, FunctionAccessStatus.FAILED.getCode(), Duration.ofSeconds(30));
         }
     }
+
 }

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

@@ -27,11 +27,12 @@ public class MqttMessageConsumer {
 
     @Autowired
     private DeviceMapper deviceMapper;
-    
+
     // 创建两个线程池：一个用于消息获取，一个用于业务处理
     private ExecutorService messageConsumerPool = Executors.newFixedThreadPool(3);
     private ExecutorService messageProcessorPool = Executors.newFixedThreadPool(10);
 
+
     // 初始化方法，启动消息监听
     @PostConstruct
     public void start() {
@@ -130,4 +131,5 @@ public class MqttMessageConsumer {
             log.error("业务处理线程 {} 处理消息时发生错误: {}", threadName, message, e);
         }
     }
+
 }

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

@@ -22,6 +22,8 @@ public class OnlineStatusTask {
 
     @Autowired
     private DeviceMapper deviceMapper;
+
+
     // 使用cron表达式，每分钟的第0秒执行
     @Scheduled(cron = "0 */3 * * * ?")
     public void cronTask() {
@@ -37,4 +39,5 @@ public class OnlineStatusTask {
             }
         });
     }
+
 }

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

@@ -98,6 +98,7 @@ public class DeviceControlCenterController extends BaseController {
         return R.ok(appDeviceService.getDeviceInfo(deviceMac));
     }
 
+
     /**
      * 指令下发记录
      */
@@ -106,6 +107,7 @@ public class DeviceControlCenterController extends BaseController {
         return appDeviceService.getInstructionRecord(dto, pageQuery);
     }
 
+
     /**
      * 导出
      */

fys-common/fys-common-core/src/main/java/com/fuyuanshen/common/core/constant/SystemConstants.java

@@ -77,4 +77,9 @@ public interface SystemConstants {
      */
     String ROOT_DEPT_ANCESTORS = "0";
 
+    /**
+     * 菜单ID
+     */
+    public static final Long RESTRICTED_MENU_ID = 102L;
+
 }

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

@@ -79,7 +79,6 @@ public class DeviceTypeController {
     public R<DeviceType>  getCommunicationMode(@Parameter(name = "设备类型ID", required = true) Long id) {
         DeviceType communicationMode = deviceTypeService.getCommunicationMode(id);
         return R.ok(communicationMode);
-
     }
 
 }

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

@@ -44,7 +44,7 @@ public class TrackServiceController extends BaseController {
     /**
      * 查询轨迹服务列表
      */
-    @SaCheckPermission("equipment:trackService:list")
+//    @SaCheckPermission("equipment:trackService:list")
     @GetMapping("/list")
     public TableDataInfo<TrackServiceVo> list(TrackServiceBo bo, PageQuery pageQuery) {
         return trackServiceService.queryPageList(bo, pageQuery);
@@ -53,7 +53,7 @@ public class TrackServiceController extends BaseController {
     /**
      * 轨迹服务列表
      */
-    @SaCheckPermission("equipment:trackService:export")
+//    @SaCheckPermission("equipment:trackService:export")
     @Log(title = "轨迹服务", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(TrackServiceBo bo, HttpServletResponse response) {
@@ -75,7 +75,7 @@ public class TrackServiceController extends BaseController {
     /**
      * 新增轨迹服务
      */
-    @SaCheckPermission("equipment:trackService:add")
+//    @SaCheckPermission("equipment:trackService:add")
     @Log(title = "轨迹服务", businessType = BusinessType.INSERT)
     @PostMapping(value = "/add")
     public R<Void> add(@Validated(AddGroup.class) @RequestBody TrackServiceBo bo) {
@@ -85,7 +85,7 @@ public class TrackServiceController extends BaseController {
     /**
      * 修改轨迹服务
      */
-    @SaCheckPermission("equipment:trackService:edit")
+//    @SaCheckPermission("equipment:trackService:edit")
     @Log(title = "轨迹服务", businessType = BusinessType.UPDATE)
     @PostMapping(value = "/update")
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody TrackServiceBo bo) {
@@ -97,7 +97,7 @@ public class TrackServiceController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("equipment:trackService:remove")
+//    @SaCheckPermission("equipment:trackService:remove")
     @Log(title = "轨迹服务", businessType = BusinessType.DELETE)
     @DeleteMapping(value = "/delete")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")

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

@@ -224,22 +224,13 @@ public class DeviceTypeServiceImpl extends ServiceImpl<DeviceTypeMapper, DeviceT
             throw new RuntimeException("设备类型不存在");
         }
 
-
-
         if (!deviceType.getTypeName().equals(resources.getTypeName())) {
             int count = deviceMapper.countByDeviceTypeId(deviceType.getId());
             if (count > 0) {
-                throw new RuntimeException("该设备类型下已有绑定设备，无法修改设备类型名称!!!");
+                throw new RuntimeException("该设备类型下已有设备，无法修改设备类型名称!!!");
             }
         }
 
-
-        // List<Device> devices = deviceMapper.selectList(new QueryWrapper<Device>()
-        //         .eq("device_type", deviceTypeGrants.getDeviceTypeId()));
-        // if (CollectionUtil.isNotEmpty(devices)) {
-        //     throw new RuntimeException("该设备类型已绑定设备，无法修改！！！");
-        // }
-
         // 校验设备类型名称
         DeviceType dt = deviceTypeMapper.selectOne(new QueryWrapper<DeviceType>().eq("type_name", resources.getTypeName()));
         if (dt != null && !dt.getId().equals(deviceType.getId())) {

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

@@ -13,8 +13,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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
+        device_log a inner join device b on a.device_id = b.id
+        inner join device_type c on b.device_type = c.id
         WHERE 1 = 1
         <if test="bo.deviceType != null">
             AND c.id = #{bo.deviceType}

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

@@ -36,6 +36,7 @@ public class SysMenuController extends BaseController {
 
     private final ISysMenuService menuService;
 
+
     /**
      * 获取路由信息
      *
@@ -47,6 +48,7 @@ public class SysMenuController extends BaseController {
         return R.ok(menuService.buildMenus(menus));
     }
 
+
     /**
      * 获取菜单列表
      */

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

@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 菜单 业务层处理
@@ -141,10 +142,17 @@ public class SysMenuServiceImpl implements ISysMenuService {
             menus = baseMapper.selectMenuTreeAll();
         } else {
             menus = baseMapper.selectMenuTreeByUserId(userId);
+            // 如果不是超级管理员且不是租户管理员，则过滤掉受限制的菜单
+            // if (!LoginHelper.isAdmin()) {
+            menus = menus.stream()
+                    .filter(menu -> !SystemConstants.RESTRICTED_MENU_ID.equals(menu.getMenuId()))
+                    .collect(Collectors.toList());
+            // }
         }
         return getChildPerms(menus, 0);
     }
 
+
     /**
      * 根据角色ID查询菜单树信息
      *