Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码优化

Browse Source
This commit is contained in:
xy
2024-10-15 18:30:58 +08:00
parent 15b73a9337
commit 0745ad2fba
4 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
View File

@@ -102,11 +102,11 @@ public class MqttMessageHandler {
//日志记录
DeviceLogDTO logDto = new DeviceLogDTO();
try{
logDto.setUserName(RequestUtil.getUserNickname());
logDto.setLoginName(RequestUtil.getLoginName());
logDto.setUserName("运维管理员");
logDto.setLoginName("njcnyw");
} catch (Exception e) {
logDto.setUserName(RequestUtil.getUserNickname());
logDto.setLoginName(null);
logDto.setUserName("运维管理员");
logDto.setLoginName("njcnyw");
}
logDto.setOperate(nDid + "设备主题录入");
logDto.setResult(1);
@@ -164,11 +164,11 @@ public class MqttMessageHandler {
//日志记录
DeviceLogDTO logDto = new DeviceLogDTO();
try{
logDto.setUserName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName());
logDto.setUserName("运维管理员");
logDto.setLoginName("njcnyw");
} catch (Exception e) {
logDto.setUserName(RequestUtil.getUserNickname());
logDto.setLoginName(null);
logDto.setUserName("运维管理员");
logDto.setLoginName("njcnyw");
}
logDto.setOperate("收到设备"+nDid+"注册应答响应");
logDto.setResult(1);
@@ -304,11 +304,11 @@ public class MqttMessageHandler {
//日志实体
DeviceLogDTO logDto = new DeviceLogDTO();
try{
logDto.setUserName(RequestUtil.getUsername());
logDto.setLoginName(RequestUtil.getLoginName());
logDto.setUserName("运维管理员");
logDto.setLoginName("njcnyw");
} catch (Exception e) {
logDto.setUserName(RequestUtil.getUserNickname());
logDto.setLoginName(null);
logDto.setUserName("运维管理员");
logDto.setLoginName("njcnyw");
}
logDto.setResult(1);
//业务处理
@@ -518,7 +518,7 @@ public class MqttMessageHandler {
break;
case 48:
log.info("询问装置项目列表");
logDto.setUserName(RequestUtil.getUserNickname());
logDto.setUserName("运维管理员");
logDto.setOperate("监测点:" + (nDid + rspDataDto.getClDid()) + "询问项目列表");
List<RspDataDto.ProjectInfo> projectInfoList = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.ProjectInfo.class);
String key3 = AppRedisKey.PROJECT_INFO + nDid + rspDataDto.getClDid();

7
iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java
View File

@@ -20,7 +20,6 @@ import com.njcn.redis.utils.RedisUtil;
import com.njcn.user.api.AppUserFeignClient;
import com.njcn.user.api.UserFeignClient;
import com.njcn.user.pojo.po.User;
import com.njcn.web.utils.RequestUtil;
import com.njcn.zlevent.pojo.dto.NoticeUserDto;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -125,7 +124,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
private void executeMainTask(ScheduledExecutorService scheduler, String nDid, String version) {
log.info("正在执行主任务...");
DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserName(RequestUtil.getUserNickname());
logDto.setUserName("运维管理员");
logDto.setLoginName("njcnyw");
//判断mqtt
String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
@@ -252,7 +252,8 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
//日志记录
private void addLogs(NoticeUserDto noticeUserDto) {
DeviceLogDTO dto = new DeviceLogDTO();
dto.setUserName(RequestUtil.getUserNickname());
dto.setUserName("运维管理员");
dto.setLoginName("njcnyw");
dto.setOperate(noticeUserDto.getContent());
csLogsFeignClient.addUserLog(dto);
}

5
iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDataSetServiceImpl.java
View File

@@ -31,6 +31,9 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
@Override
public List<CsDataSet> getDataSetData(String modelId) {
return this.lambdaQuery().eq(CsDataSet::getPid, modelId).eq(CsDataSet::getDataType,"Stat").list();
return this.lambdaQuery()
.eq(CsDataSet::getPid, modelId)
.and(item->item.eq(CsDataSet::getDataType,"Stat").or().isNull(CsDataSet::getDataType))
.list();
}
}

5
iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java
View File

@@ -277,6 +277,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
throw new BusinessException(AccessResponseEnum.LINE_POSITION_REPEAT);
}
csLineService.saveBatch(csLinePoList);
redisUtil.saveByKeyWithExpire("accessLineInfo:" + devAccessParam.getNDid(),csLinePoList,30L);
//4.监测点拓扑图表录入关系
appLineTopologyDiagramService.saveBatch(appLineTopologyDiagramPoList);
//5.绑定装置和人的关系
@@ -513,8 +514,8 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
private DeviceLogDTO createLogDto(String operate) {
DeviceLogDTO logDto = new DeviceLogDTO();
logDto.setUserName(RequestUtil.getUserNickname());
logDto.setLoginName(RequestUtil.getUsername());
logDto.setUserName("运维管理员");
logDto.setLoginName("njcnyw");
logDto.setOperate(operate);
logDto.setResult(1);
return logDto;