From 45186ee1252a893bb9c4932a6a4d60d8bf9f677e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 08 十一月 2024 08:58:58 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java | 58 +++++++++++++++++++++++-----------------------------------
1 files changed, 23 insertions(+), 35 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
index d213cd9..57eeaa2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceServiceImpl.java
@@ -1,32 +1,33 @@
package com.doumee.service.business.impl;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.*;
-import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.DeviceMapper;
+import com.doumee.dao.business.PlatformBroadcastLogMapper;
import com.doumee.dao.business.model.Device;
+import com.doumee.dao.business.model.PlatformBroadcastLog;
import com.doumee.service.business.DeviceService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.doumee.service.business.impl.hksync.HkSyncPushServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 璁惧淇℃伅琛⊿ervice瀹炵幇
@@ -38,6 +39,10 @@
@Autowired
private DeviceMapper deviceMapper;
+ @Autowired
+ private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private PlatformBroadcastLogMapper platformBroadcastLogMapper;
@Override
@@ -103,6 +108,7 @@
wrapper.select(Device::getId, Device::getName, Device::getDoorName,Device::getRegionPathName, Device::getRegionName);
wrapper.eq(null != param.getType(),Device::getType,param.getType())
.eq(null !=param.getIsdeleted(),Device::getIsdeleted,param.getIsdeleted())
+ .eq(Objects.isNull(param.getIsdeleted()),Device::getIsdeleted,Constants.ZERO)
.eq(null != param.getHkStatus(),Device::getHkStatus,param.getHkStatus());
return deviceMapper.selectList(wrapper);
}
@@ -230,36 +236,18 @@
|| !Constants.equalsInteger(device.getType(),Constants.TWO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- TransparentChannelBodyRequest body = new TransparentChannelBodyRequest();
- TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
- TransparentChannelBodyParamRequest request = new TransparentChannelBodyParamRequest();
- TransparentChannelBodyRegionRequest regions = new TransparentChannelBodyRegionRequest();
- head.setAbility("cld");//鍥哄畾鍊�
- head.setTreatyType("haixuan_led_net");//鍥哄畾鍊�
- head.setDeviceIndexCode(device.getHkId());
- body.setMethod("ControlLedGereral");//鍥哄畾鍊�
- request.setIndexCode(device.getHkId());
- request.setOperationType(219);//鍥哄畾鍊�
- regions.setActionType(32);
- regions.setContent(model.getContent());
- regions.setRegionNo(1);
- regions.setRegionType(14);
- regions.setFontColor(1);
- regions.setCircleTimes(1);//寰幆娆℃暟
- regions.setFontSize(32);//
- regions.setStayTime(1);//鍗曚綅锛燂紵
- regions.setRegionLeftTopXPos(0);
- regions.setRegionLeftTopYPos(0);
- regions.setRegionRightBottomXPos(255);
- regions.setRegionRightBottomYPos(31);
- request.setRegions(new ArrayList<>());
- request.getRegions().add(regions);
- regions.setSpeed(13);
- body.setParams(request);
- BaseResponse response = HKService.transparentchannel(head,body);
- if(response == null || !StringUtils.equals(response.getCode(), HKConstants.RESPONSE_SUCCEE)){
- throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝灞忓箷鍐呭璁剧疆澶辫触"+(response!=null?response.getMsg():""));
+ if(model.getSpeed()<=0){
+ int speed = 13;
+ try {
+ speed = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.HK_PARAM,Constants.LED_CONTENT_SPEED).getCode());
+ }catch (Exception e){
+ }
+ model.setSpeed(speed);
+ }
+ PlatformBroadcastLog log = HkSyncPushServiceImpl.dealLedContentBiz(0,device.getNo(),device.getName(),model.getContent(),model.getSpeed(),1);
+ platformBroadcastLogMapper.insert(log);
+ if(log.getHkStatus() == null || !Constants.equalsInteger(log.getHkStatus(), Constants.TWO)){
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝灞忓箷鍐呭璁剧疆澶辫触"+(log!=null?log.getHkInfo():""));
}
}
-
}
--
Gitblit v1.9.3