Merge remote-tracking branch 'origin/6170' into 6170

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

@@ -5,6 +5,7 @@ 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.exception.ServiceException;
 import com.fuyuanshen.common.core.validate.AddGroup;
 import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessAnnotation;
 import com.fuyuanshen.common.ratelimiter.annotation.FunctionAccessBatcAnnotation;
@@ -17,6 +18,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  * BJQ6170设备控制类
  */
@@ -82,6 +85,8 @@ public class AppDeviceBJQController extends BaseController {
         return R.ok();
     }
 
+
+
     /**
      * 灯光模式
      * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）

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

@@ -3,6 +3,8 @@ package com.fuyuanshen.app.domain.dto;
 import lombok.Data;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 @Data
 public class AppDeviceLogoUploadDto {
 
@@ -14,5 +16,13 @@ public class AppDeviceLogoUploadDto {
      */
     private MultipartFile file;
 
+//    /**
+//     *  文件
+//     */
+//    private List<MultipartFile> files;
+
+
+    private List<Long> deviceIds;
+
     private Integer chunkSize;
 }

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

@@ -65,13 +65,22 @@ public class RedisKeyExpirationListener implements MessageListener {
                 if (lockInfo != null) {
                     try {
                         String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ message + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
+//                        String deviceOnlineStatusRedis = RedisUtils.getCacheObject(deviceOnlineStatusRedisKey);
+//                        if(StringUtils.isBlank(deviceOnlineStatusRedis)){
+//                            UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
+//                            deviceUpdateWrapper.eq("device_imei", element);
+//                            deviceUpdateWrapper.set("online_status", 0);
+//                            deviceMapper.update(deviceUpdateWrapper);
+//                        }else{
+//                            RedisUtils.deleteObject(deviceOnlineStatusRedisKey);
+//                        }
+
+                        UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
+                        deviceUpdateWrapper.eq("device_imei", element);
+                        deviceUpdateWrapper.set("online_status", 0);
+                        deviceMapper.update(deviceUpdateWrapper);
                         String deviceOnlineStatusRedis = RedisUtils.getCacheObject(deviceOnlineStatusRedisKey);
-                        if(StringUtils.isBlank(deviceOnlineStatusRedis)){
+                        if(StringUtils.isNotBlank(deviceOnlineStatusRedis)){
-                            UpdateWrapper<Device> deviceUpdateWrapper = new UpdateWrapper<>();
-                            deviceUpdateWrapper.eq("device_imei", element);
-                            deviceUpdateWrapper.set("online_status", 0);
-                            deviceMapper.update(deviceUpdateWrapper);
-                        }else{
                             RedisUtils.deleteObject(deviceOnlineStatusRedisKey);
                         }
                     } finally {

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

@@ -56,7 +56,7 @@ public class ReceiverMessageHandler implements MessageHandler {
             RedisUtils.offerDeduplicated(queueKey,dedupKey,deviceImei, Duration.ofHours(24));
             //在线状态
             String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
-            RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(303));
+            RedisUtils.setCacheObject(deviceOnlineStatusRedisKey, "1", Duration.ofSeconds(360));
         }
 
 

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

@@ -106,16 +106,22 @@ public class MqttMessageConsumer {
 //                        .set("online_status", 1);
 //                deviceMapper.update(updateWrapper);
 //            }
-            QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+//            QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("device_imei", message);
+//            queryWrapper.eq("device_imei", message);
-            queryWrapper.eq("online_status", 1);
+//            queryWrapper.eq("online_status", 1);
-            Long count = deviceMapper.selectCount(queryWrapper);
+//            Long count = deviceMapper.selectCount(queryWrapper);
-            if(count == 0){
+//            if(count == 0){
-                UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+//                UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
-                updateWrapper.eq("device_imei", message)
+//                updateWrapper.eq("device_imei", message)
-                        .set("online_status", 1);
+//                        .eq("online_status", 0)
-                deviceMapper.update(updateWrapper);
+//                        .set("online_status", 1);
-            }
+//                deviceMapper.update(updateWrapper);
+//            }
+            UpdateWrapper<Device> updateWrapper = new UpdateWrapper<>();
+            updateWrapper.eq("device_imei", message)
+                    .eq("online_status", 0)
+                    .set("online_status", 1);
+            int update = deviceMapper.update(updateWrapper);
             // 模拟业务处理耗时
 //            Thread.sleep(200);
             

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

@@ -82,6 +82,22 @@ public class DeviceBJQController extends BaseController {
         return R.ok();
     }
 
+    /**
+     * 批量上传设备logo图片
+     */
+    @PostMapping("/batchUploadLogo")
+    @FunctionAccessAnnotation("batchUploadLogo")
+    public R<Void> batchUploadLogo(@Validated @ModelAttribute AppDeviceLogoUploadDto bo) {
+
+        MultipartFile file = bo.getFile();
+        if(file.getSize()>1024*1024*2){
+            return R.warn("图片不能大于2M");
+        }
+        appDeviceService.batchUploadLogo(bo);
+
+        return R.ok();
+    }
+
     /**
      * 灯光模式
      * 0（关灯），1（强光模式），2（弱光模式）,  3（爆闪模式）,   4（泛光模式）

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

@@ -15,6 +15,7 @@ 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.domain.R;
 import com.fuyuanshen.common.core.exception.ServiceException;
 import com.fuyuanshen.common.core.utils.*;
 import com.fuyuanshen.common.redis.utils.RedisUtils;
@@ -172,10 +173,13 @@ public class DeviceBJQBizService {
         }
         //设备在线状态
         String onlineStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei()+ DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX);
-        if(StringUtils.isNotBlank(onlineStatus)){
+        //设备在线状态
-            vo.setOnlineStatus(1);
+       if("1".equals(onlineStatus)){
+           vo.setOnlineStatus(1);
+        }else if("2".equals(onlineStatus)){
+           vo.setOnlineStatus(2);
         }else{
-            vo.setOnlineStatus(0);
+           vo.setOnlineStatus(0);
         }
         String deviceStatus = RedisUtils.getCacheObject(GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX + device.getDeviceImei() + DeviceRedisKeyConstants.DEVICE_STATUS_KEY_PREFIX);
         // 获取电量
@@ -334,7 +338,10 @@ public class DeviceBJQBizService {
                 throw new ServiceException("设备不存在");
             }
             if(getDeviceStatus(device.getDeviceImei())){
-                throw new ServiceException(device.getDeviceName()+",设备已断开连接");
+//                throw new ServiceException(device.getDeviceName()+",设备已断开连接");
+                log.info(device.getDeviceName()+",设备已断开连接");
+                recordDeviceLog(device.getId(), device.getDeviceName(), "上传开机画面", device.getDeviceName()+",设备已断开连接", AppLoginHelper.getUserId());
+                return;
             }
             MultipartFile file = bo.getFile();
 
@@ -546,4 +553,19 @@ public class DeviceBJQBizService {
         String deviceOnlineStatusRedisKey = GlobalConstants.GLOBAL_REDIS_KEY+ DEVICE_KEY_PREFIX+ deviceImei + DeviceRedisKeyConstants.DEVICE_ONLINE_STATUS_KEY_PREFIX ;
         return RedisUtils.getCacheObject(deviceOnlineStatusRedisKey) == null;
     }
+
+    public void batchUploadLogo(AppDeviceLogoUploadDto bo) {
+
+        List<Long> deviceIds = bo.getDeviceIds();
+        MultipartFile file = bo.getFile();
+        if (deviceIds == null || deviceIds.isEmpty()) {
+            throw new ServiceException("请选择设备");
+        }
+        for (Long deviceId : deviceIds) {
+            AppDeviceLogoUploadDto dto = new AppDeviceLogoUploadDto();
+            dto.setDeviceId(deviceId);
+            dto.setFile(file);
+            uploadDeviceLogo(dto);
+        }
+    }
 }

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

@@ -58,6 +58,13 @@ public class WebDeviceVo implements Serializable {
      */
     private Integer deviceStatus;
 
+
+    /**绑定状态
+     * 0 未绑定
+     * 1 已绑定
+     */
+    private Integer bindingStatus;
+
     /**
      * 绑定时间
      */

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

@@ -252,12 +252,13 @@
         dt.pc_model_dictionary detailPageUrl,
         ap.name personnelBy,
         d.device_status,
+        d.binding_status,
         d.online_status,
         c.binding_time,
         ROW_NUMBER() OVER (PARTITION BY d.id ORDER BY c.binding_time) AS row_num
         from device d
         inner join device_type dt on d.device_type = dt.id
-        inner join app_device_bind_record c on d.id = c.device_id
+        left 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 in (0, 2) ) a where a.row_num = 1
         <if test="criteria.deviceType != null">