修改离线消息

device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java

@@ -36,10 +36,7 @@ import com.mortals.xhx.common.model.MessageHeader;
 import com.mortals.xhx.common.pdu.DeviceReq;
 import com.mortals.xhx.common.pdu.RespData;
 import com.mortals.xhx.common.pdu.site.SitePdu;
-import com.mortals.xhx.common.utils.BeanUtil;
-import com.mortals.xhx.common.utils.DownMsgTask;
-import com.mortals.xhx.common.utils.EncryptUtil;
-import com.mortals.xhx.common.utils.SendTaskThreadPool;
+import com.mortals.xhx.common.utils.*;
 import com.mortals.xhx.feign.site.ISiteFeign;
 import com.mortals.xhx.module.device.model.DeviceEntity;
 import com.mortals.xhx.module.device.model.DeviceModuleDistributeEntity;
@@ -246,17 +243,17 @@ public class DeviceApiController {
             deviceEntity.setDeviceStatus(DeviceStatusEnum.在线.getValue());
             deviceEntity.setDeviceVersion(req.getDeviceVersion() == null ? "" : req.getDeviceVersion());
 
-/*            if(deviceEntity.getDeviceStatus()== DeviceStatusEnum.离线.getValue()){
+   /*         if(deviceEntity.getDeviceStatus()== DeviceStatusEnum.离线.getValue()){
                 DeviceEntity entity = new DeviceEntity();
                 entity.setId(deviceEntity.getId());
                 entity.setOnlineTime(new Date());
                 entity.setDeviceStatus(DeviceStatusEnum.在线.getValue());
                 cacheService.lpush(RedisKey.KEY_DEVICE_THIRDPARTY_QUEUE, entity);
             }*/
-           // deviceService.getDeviceDao().update(deviceEntity);
+            deviceService.getDeviceDao().update(deviceEntity);
             rsp.setData(deviceResp);
-/*            SendThirdPartyTask sendThirdPartyTask = new SendThirdPartyTask(deviceEntity, productEntity, platformEntity, deviceService);
-            sendTaskThreadPool.execute(sendThirdPartyTask);*/
+            SendThirdPartyTask sendThirdPartyTask = new SendThirdPartyTask(deviceEntity, productEntity, platformEntity, deviceService);
+            sendTaskThreadPool.execute(sendThirdPartyTask);
         } catch (AppException e) {
             //log.error("接收数据失败", e);
             rsp.setCode(e.getCode());
@@ -859,12 +856,10 @@ public class DeviceApiController {
         if (!ObjectUtils.isEmpty(deviceEntity)) {
             throw new AppException(DEVICE_CODE_IS_EXIST, DEVICE_CODE_IS_EXIST_CONTENT);
         }
-
         ProductEntity productEntity = productService.selectOne(new ProductQuery().productCode(req.getProductCode()));
         if (ObjectUtils.isEmpty(productEntity)) {
             throw new AppException(PRODUCT_IS_EMPTY, PRODUCT_IS_EMPTY_CONTENT);
         }
-
         PlatformEntity platformEntity = platformService.getCache(productEntity.getPlatformId().toString());
         if (ObjectUtils.isEmpty(platformEntity)) {
             throw new AppException(PLATFORM_IS_EMPTY, PLATFORM_IS_EMPTY_CONTENT);
@@ -904,8 +899,8 @@ public class DeviceApiController {
         if (ObjectUtils.isEmpty(deviceEntity)) {
             throw new AppException(DEVICE_CODE_IS_EMPTY, DEVICE_CODE_IS_EMPTY_CONTENT);
         }
-        ProductEntity productEntity =productService.getExtCache(req.getProductCode());
-       // ProductEntity productEntity = productService.selectOne(new ProductQuery().productCode(req.getProductCode()));
+
+        ProductEntity productEntity = productService.selectOne(new ProductQuery().productCode(req.getProductCode()));
         if (ObjectUtils.isEmpty(productEntity)) {
             throw new AppException(PRODUCT_IS_EMPTY, PRODUCT_IS_EMPTY_CONTENT);
         }
@@ -1040,15 +1035,7 @@ public class DeviceApiController {
         String scheme = serverInfo.getScheme();
         String homeUrl = "";
         //根据站点与资源部署来生成homeurl
-
-/*
-        List<DeviceModuleDistributeEntity> cacheList = deviceModuleDistributeService.getCacheList();
-        Map<String, List<DeviceModuleDistributeEntity>> collect = cacheList.stream().collect(Collectors.groupingBy(x -> x.getSiteId() + "#" + x.getProductId()));
-        List<DeviceModuleDistributeEntity> list = collect.getOrDefault(deviceEntity.getSiteId() + "#" + productEntity.getId(), new ArrayList<>());
-        DeviceModuleDistributeEntity deviceModuleDistributeEntity = list.stream().filter(f -> f.getSelected() == YesNoEnum.YES.getValue()).findFirst().orElseGet(() -> null);
-*/
-
-       DeviceModuleDistributeQuery query = new DeviceModuleDistributeQuery();
+        DeviceModuleDistributeQuery query = new DeviceModuleDistributeQuery();
         query.setSiteId(deviceEntity.getSiteId());
         query.setProductId(productEntity.getId());
         query.setSelected(YesNoEnum.YES.getValue());
@@ -1060,8 +1047,6 @@ public class DeviceApiController {
             query.setProductId(productEntity.getId());
             query.setSelected(YesNoEnum.NO.getValue());
             deviceModuleDistributeEntity = deviceModuleDistributeService.selectOne(query);
-            //deviceModuleDistributeEntity = list.stream().filter(f -> f.getSelected() == YesNoEnum.NO.getValue()).findFirst().orElseGet(() -> null);
-
             if (!ObjectUtils.isEmpty(deviceModuleDistributeEntity)) {
                 //deviceModuleDistributeService.active(deviceModuleDistributeEntity, null);
                 homeUrl = String.format("/homeDeviceUrl/%s/%s/%s", deviceModuleDistributeEntity.getSiteId(), deviceModuleDistributeEntity.getProductCode(), deviceModuleDistributeEntity.getImageResolutionValue());