Merge remote-tracking branch 'origin/master' into test

device-api-service/src/main/java/com/xy/consumer/redis/DeviceOfflineConsumer.java

@@ -0,0 +1,30 @@
+package com.xy.consumer.redis;
+
+import com.xy.annotation.RedisTimeout;
+import com.xy.service.DeviceNetRecordServiceImpl;
+import com.xy.service.RedisTimeoutMessage;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * redis设备离线订阅
+ */
+@Slf4j
+@Service
+@AllArgsConstructor
+@RedisTimeout("device:offline")
+public class DeviceOfflineConsumer implements RedisTimeoutMessage {
+
+    private DeviceNetRecordServiceImpl deviceNetRecordService;
+
+    @Override
+    public void message(String key) {
+        long deviceId = Long.parseLong(key.split(":")[2]);
+        log.info("设备：{} 离线已超时", deviceId);
+        if(deviceId>0L){
+            // 推送离线超时消息
+            deviceNetRecordService.deviceOfflineTimeOutPushMsg(deviceId);
+        }
+    }
+}

device-api-service/src/main/java/com/xy/event/listener/DeviceNetWorkEventListener.java

@@ -7,15 +7,21 @@ import com.xy.dto.nfc.UpperDeviceStatusDTO;
 import com.xy.entity.DeviceInfo;
 import com.xy.entity.DeviceNetWorkSpi;
 import com.xy.entity.DeviceSysinfo;
+import com.xy.entity.SysDictRedis;
 import com.xy.event.DeviceEvent;
 import com.xy.service.*;
+import com.xy.utils.RedisService;
 import com.xy.utils.SpiUtils;
+import com.xy.utils.SysDictUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
 /**
  * 设备网络状态事件监听
  */
@@ -34,6 +40,8 @@ public class DeviceNetWorkEventListener {
 
     private DeviceInfoServiceImpl deviceInfoService;
 
+    private RedisService<Integer> redisService;
+
     /**
      * 上报状态
      *
@@ -76,6 +84,29 @@ public class DeviceNetWorkEventListener {
         }
     }
 
+    /**
+     * 告警消息处理
+     *
+     * @param netWorkEvent
+     */
+    @EventListener
+    public void msgHandle(DeviceEvent.NetWorkEvent netWorkEvent) {
+        String key = "device:offline:" + netWorkEvent.getValue();
+        if (netWorkEvent.getNetState() == 1) {
+            //在线
+            redisService.remove(key);
+        } else {
+            //离线
+            int minutes = 60;
+            Map<String, SysDictRedis> map = SysDictUtils.get("device_offline_time_code");
+            if (map != null) {
+                minutes = Integer.parseInt(map.get("minutes").getValue());
+            }
+            redisService.set(key, 0);
+            redisService.timeout(key, minutes, TimeUnit.MINUTES);
+        }
+    }
+
     /**
      * spi推送
      *

device-api-service/src/main/java/com/xy/service/DeviceNetRecordServiceImpl.java

@@ -1,25 +1,43 @@
 package com.xy.service;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xy.dto.DeviceNetRecordDto;
+import com.xxl.job.core.biz.model.ReturnT;
+import com.xy.device.EnumDeviceOfflineTimeOutCode;
+import com.xy.device.EnumDeviceQrCode;
+import com.xy.dto.*;
+import com.xy.dto.be.MercDto;
+import com.xy.dto.be.MercUserDeviceDto;
+import com.xy.entity.DeviceInfo;
 import com.xy.entity.DeviceNetRecord;
+import com.xy.enums.ChannelType;
+import com.xy.enums.MsgConfigId;
+import com.xy.enums.MsgType;
 import com.xy.mapper.DeviceNetRecordMapper;
-import com.xy.utils.Emptys;
-import com.xy.utils.MybatisPlusQuery;
-import com.xy.utils.PageBean;
-import com.xy.utils.R;
+import com.xy.service.be.MercFeignService;
+import com.xy.utils.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.time.LocalDateTime;
-import java.util.List;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import static com.xy.utils.Beans.copy;
 import static com.xy.utils.PlusBeans.toIPage;
@@ -33,11 +51,21 @@ import static com.xy.utils.PlusBeans.toPageBean;
  * @author lijin
  * @since 2023-01-09
  */
+@Slf4j
 @Service
-@AllArgsConstructor
+@AllArgsConstructor(onConstructor_ = @Lazy)
 @Api(tags = "机器-联网记录")
 public class DeviceNetRecordServiceImpl extends ServiceImpl<DeviceNetRecordMapper, DeviceNetRecord> implements DeviceNetRecordService {
 
+    private  DeviceInfoServiceImpl deviceInfoService;
+    private MercFeignService mercFeignService;
+    private MsgSendApiService msgSendApiService;
+    private UserInfoService userInfoService;
+    private MsgSysMonitorNoticeService msgSysMonitorNoticeService;
+
+
+
+
     @PostMapping("save")
     @ApiOperation("添加")
     public R save(@RequestBody @Validated DeviceNetRecordDto.Save save) {
@@ -79,4 +107,115 @@ public class DeviceNetRecordServiceImpl extends ServiceImpl<DeviceNetRecordMappe
         List<DeviceNetRecordDto.OffLineDeviceVo> offLineDeviceVos = baseMapper.offLineDevice(offLineDevice);
         return R.ok(offLineDeviceVos);
     }
+
+    /**
+     * 设备离线超时推送消息
+     * @param deviceId
+     */
+    public void deviceOfflineTimeOutPushMsg(Long deviceId) {
+        log.info("设备{}离线超时推送消息--->>>", deviceId);
+        DeviceInfo deviceInfo = deviceInfoService.getById(deviceId);
+            if (deviceInfo == null) {
+                throw new RuntimeException("设备信息未找到，deviceId: " + deviceId);
+            }
+        String value = SysDictUtils.getValue(EnumDeviceOfflineTimeOutCode.Code.CODE.getCode(), EnumDeviceOfflineTimeOutCode.MINUTES.getCode(), String.class);
+            Long mercId = deviceInfo.getMercId();
+
+            MercDto.Vo merc = R.feignCheckData(mercFeignService.obj(new MercDto.ListDTO().setId(mercId)));
+            if (merc == null) {
+                throw new RuntimeException("商户信息未找到，mercId: " + mercId);
+            }
+
+            String mercCode = merc.getMercCode();
+            Long configId = MercAuthUtils.sendMsgToCM(mercCode) ? MsgConfigId.CM_DEVICE_EXCEPTION.getId() : MsgConfigId.DEVICE_EXCEPTION.getId();
+            MsgConfigDto.Vo msgConfig = R.feignCheckData(msgSendApiService.getMsgConfig(new MsgConfigDto.Vo().setId(configId)));
+            if (msgConfig == null) {
+                throw new RuntimeException("消息配置未找到，configId: " + configId);
+            }
+
+            List<MsgConfigTestDto.BizParam> bizParams = R.feignCheckData(msgSendApiService.getBizParamByMsgConfig(new MsgConfigTestDto.MsgConfig().setConfigId(configId)));
+            if (CollUtil.isEmpty(bizParams)) {
+                throw new RuntimeException("业务参数未找到，configId: " + configId);
+            }
+
+            List<MsgConfigTestDto.BizData> bizDataList = BeanUtil.copyToList(bizParams, MsgConfigTestDto.BizData.class);
+            List<MsgConfigTestDto.BizData> sendList = new ArrayList<>();
+
+            String deviceName = StrUtil.isEmpty(deviceInfo.getDeviceName()) ? String.valueOf(deviceId) : deviceInfo.getDeviceName() + "(" + deviceId + ")";
+            Long userInfoId = merc.getUserInfoId();
+            List<Long> userInfoIdList = new ArrayList<>();
+            userInfoIdList.add(userInfoId);
+
+            List<MercUserDeviceDto.Vo> mercUserDevices = R.feignCheckData(mercFeignService.mercDeviceUsers(new MercUserDeviceDto.Vo().setMercId(mercId).setDeviceId(deviceId)));
+            if (CollUtil.isNotEmpty(mercUserDevices)) {
+                mercUserDevices.forEach(mud -> {
+                    if (Objects.equals(deviceId, mud.getDeviceId())) {
+                        userInfoIdList.add(mud.getUserId());
+                    }
+                });
+            }
+
+            LocalDateTime createTime = LocalDateTime.now();
+            StringBuilder sbMsg = StrUtil.builder()
+                    .append("设备【").append(deviceName).append("】发生故障：设备已离线超过").append(value).append("分钟，发生时间：")
+                    .append(DateUtil.format(createTime, DatePattern.NORM_DATETIME_PATTERN));
+
+            List<UserInfoDto.Vo> userInfoList = R.feignCheckData(userInfoService.list(new UserInfoDto.SelectListDto().setUserIds(userInfoIdList)));
+            if (CollUtil.isNotEmpty(userInfoList)) {
+                userInfoList.forEach(u -> {
+                    String name = u.getName();
+                    // 系统消息
+                    MsgSysMonitorNoticeDto.Save msgSys = new MsgSysMonitorNoticeDto.Save();
+                    msgSys.setUserId(u.getAuthorizeUserId())
+                            .setMsgType(MsgType.TYPE6.getCode())
+                            .setContent(sbMsg.toString())
+                            .setPubTime(LocalDateTime.now())
+                            .setPubState(2)
+                            .setSendTargets(name)
+                            .setPriority(msgConfig.getPriority())
+                            .setTitle("故障提醒")
+                            .setEventCode("D011")
+                            .setPubUserId(-1)
+                            .setTitle(MsgType.TYPE6.getDescription());
+                    msgSysMonitorNoticeService.save(msgSys);
+                });
+
+                for (MsgConfigTestDto.BizData b : bizDataList) {
+                    if (ChannelType.OFFICIAL_ACCOUNT.getCode().equals(Integer.valueOf(b.getChannelType()))) {
+                        Set<String> mpOpenIds = userInfoList.stream()
+                                .filter(u -> ObjectUtil.isNotEmpty(u.getMpOpenid()))
+                                .map(UserInfoDto.Vo::getMpOpenid)
+                                .collect(Collectors.toSet());
+                        if (CollUtil.isEmpty(mpOpenIds)) {
+                            continue;
+                        }
+
+                        String msg = "设备已离线超过" + value + "分钟,请及时检查设备状态";
+                        Map<String, Object> params = MapUtil.newHashMap();
+                        if (MercAuthUtils.sendMsgToCM(mercCode)) {
+                            params.put("character_string2", deviceId);
+                            params.put("thing6", msg);
+                            params.put("time8", DateUtil.format(createTime, DatePattern.NORM_DATETIME_PATTERN));
+                        } else {
+                            params.put("keyword1", deviceName);
+                            params.put("keyword2", msg);
+                            params.put("keyword3", DateUtil.format(createTime, DatePattern.NORM_DATETIME_PATTERN));
+                        }
+
+                        // 商户管理员发
+                        b.setReceivers(mpOpenIds);
+                        b.setTemplateParams(params);
+                        sendList.add(b);
+                    }
+                }
+            }
+
+            // 是否可推送条件
+            if (CollUtil.isNotEmpty(sendList)) {
+                msgSendApiService.sendByMsgConfig(new MsgConfigTestDto.SendByMsgConfig().setConfigId(configId).setBizDataList(sendList));
+            }
+
+    }
+
+
 }

device-start/src/main/resources/bootstrap-eprod.yml

@@ -1,3 +1,7 @@
+spring:
+  redis:
+    take: true
+
 #微服务相关配置
 cloud:
   center:

device-start/src/main/resources/bootstrap-eprod2.yml

@@ -1,3 +1,7 @@
+spring:
+  redis:
+    take: true
+
 server:
   port: 8051
 

device-start/src/main/resources/bootstrap-prod.yml

@@ -1,3 +1,7 @@
+spring:
+  redis:
+    take: true
+
 #微服务相关配置
 cloud:
   center:

device-start/src/main/resources/bootstrap-prod2.yml

@@ -1,3 +1,7 @@
+spring:
+  redis:
+    take: true
+
 server:
   port: 8051
 

device-start/src/main/resources/bootstrap-uat.yml

@@ -1,3 +1,7 @@
+spring:
+  redis:
+    take: true
+
 #微服务相关配置
 cloud:
   service: