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-12-06 15:25:21 +08:00
parent 24cf6e8d56
commit eed276c9b3
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java
View File

@@ -45,7 +45,7 @@ public class AccessApplicationRunner implements ApplicationRunner {
public void run(ApplicationArguments args) { public void run(ApplicationArguments args) {
//项目启动60s后发起自动接入 //项目启动60s后发起自动接入
Runnable task = () -> { Runnable task = () -> {
log.info("系统重启,所有符合条件的装置全部接入!"); log.info("系统重启,所有符合条件的装置发起接入!");
List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getOnlineDev(); List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getOnlineDev();
if (CollUtil.isNotEmpty(list)) { if (CollUtil.isNotEmpty(list)) {
ExecutorService executor = Executors.newFixedThreadPool(10); ExecutorService executor = Executors.newFixedThreadPool(10);

2
iot-access/access-boot/src/main/java/com/njcn/access/runner/AutoAccessTimer.java
View File

@@ -83,7 +83,7 @@ public class AutoAccessTimer implements ApplicationRunner {
public void accessDev(List<CsEquipmentDeliveryPO> list) { public void accessDev(List<CsEquipmentDeliveryPO> list) {
list.forEach(item->{ list.forEach(item->{
System.out.println(Thread.currentThread().getName() + ": reboot : nDid : " + item.getNdid()); System.out.println(Thread.currentThread().getName() + ": auto : nDid : " + item.getNdid());
String version = csTopicService.getVersion(item.getNdid()); String version = csTopicService.getVersion(item.getNdid());
if (!Objects.isNull(version)){ if (!Objects.isNull(version)){
//判断设备类型 便携式设备需要特殊处理 未注册的要先注册、再接入;已注册的直接重新接入 //判断设备类型 便携式设备需要特殊处理 未注册的要先注册、再接入;已注册的直接重新接入

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

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

2
iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java
View File

@@ -208,7 +208,7 @@ public class EventServiceImpl implements IEventService {
//新项目入库 //新项目入库
WlRecord wlRecord = new WlRecord(); WlRecord wlRecord = new WlRecord();
wlRecord.setId(IdUtil.simpleUUID()); wlRecord.setId(IdUtil.simpleUUID());
wlRecord.setItemName("基础数据"); wlRecord.setItemName("在线监测");
wlRecord.setGcName(item.getPrjName()); wlRecord.setGcName(item.getPrjName());
wlRecord.setDevId(vo.getId()); wlRecord.setDevId(vo.getId());
wlRecord.setLineId(appEventMessage.getId() + item.getClDid().toString()); wlRecord.setLineId(appEventMessage.getId() + item.getClDid().toString());

2
iot-message/message-boot/src/main/java/com/njcn/message/consumer/AppAutoDataConsumer.java
View File

@@ -46,8 +46,6 @@ public class AppAutoDataConsumer extends EnhanceConsumerMessageHandler<AppAutoDa
private RocketMqLogFeignClient rocketMqLogFeignClient; private RocketMqLogFeignClient rocketMqLogFeignClient;
@Resource @Resource
private RtFeignClient rtFeignClient; private RtFeignClient rtFeignClient;
// @Resource
// private WlRecordFeignClient wlRecordFeignClient
@Override @Override
protected void handleMessage(AppAutoDataMessage appAutoDataMessage) { protected void handleMessage(AppAutoDataMessage appAutoDataMessage) {