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

微调

Browse Source
This commit is contained in:
xuyang
2023-08-30 20:14:53 +08:00
parent 71c46b7bd9
commit 56e7cd37fd
4 changed files with 107 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/AskDataDto.java
View File

@@ -15,23 +15,23 @@ import lombok.Data;
public class AskDataDto { public class AskDataDto {
@ParamName("Cldid") @ParamName("Cldid")
private Integer clDid; private Integer Cldid;
@ParamName("DataType") @ParamName("DataType")
private Integer dataType; private Integer DataType;
@ParamName("DataAttr") @ParamName("DataAttr")
private Integer dataAttr; private Integer DataAttr;
@ParamName("Operate") @ParamName("Operate")
private Integer operate; private Integer Operate;
@ParamName("StartTime") @ParamName("StartTime")
private Integer startTime; private Integer StartTime;
@ParamName("EndTime") @ParamName("EndTime")
private Integer endTime; private Integer EndTime;
@ParamName("DataArray") @ParamName("DataArray")
private DataArrayDto dataArray; private DataArrayDto DataArray;
} }

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

@@ -1,47 +1,47 @@
package com.njcn.access.runner; //package com.njcn.access.runner;
//
import com.njcn.access.service.ICsEquipmentDeliveryService; //import com.njcn.access.service.ICsEquipmentDeliveryService;
import com.njcn.access.service.ICsTopicService; //import com.njcn.access.service.ICsTopicService;
import com.njcn.access.service.impl.CsDeviceServiceImpl; //import com.njcn.access.service.impl.CsDeviceServiceImpl;
import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; //import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments; //import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner; //import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
//
import javax.annotation.Resource; //import javax.annotation.Resource;
import java.util.List; //import java.util.List;
import java.util.Objects; //import java.util.Objects;
//
/** ///**
* 类的介绍：用来重新发起设备的接入，存在程序意外停止了，缓存失效导致无法更新装置的状态，所以需要在程序启动时发起设备的接入 // * 类的介绍：用来重新发起设备的接入，存在程序意外停止了，缓存失效导致无法更新装置的状态，所以需要在程序启动时发起设备的接入
* // *
* @author xuyang // * @author xuyang
* @version 1.0.0 // * @version 1.0.0
* @createTime 2023/8/28 13:57 // * @createTime 2023/8/28 13:57
*/ // */
@Component //@Component
@Slf4j //@Slf4j
public class AccessApplicationRunner implements ApplicationRunner { //public class AccessApplicationRunner implements ApplicationRunner {
//
@Resource // @Resource
private CsDeviceServiceImpl csDeviceService; // private CsDeviceServiceImpl csDeviceService;
//
@Resource // @Resource
private ICsTopicService csTopicService; // private ICsTopicService csTopicService;
//
@Resource // @Resource
private ICsEquipmentDeliveryService csEquipmentDeliveryService; // private ICsEquipmentDeliveryService csEquipmentDeliveryService;
//
@Override // @Override
public void run(ApplicationArguments args){ // public void run(ApplicationArguments args){
List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getAll(); // List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getAll();
list.forEach(item->{ // list.forEach(item->{
String version = csTopicService.getVersion(item.getNdid()); // String version = csTopicService.getVersion(item.getNdid());
if (!Objects.isNull(version)){ // if (!Objects.isNull(version)){
csDeviceService.devAccess(item.getNdid(),version); // csDeviceService.devAccess(item.getNdid(),version);
} // }
}); // });
} // }
//
} //}

100
iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessScheduledTask.java
View File

@@ -1,50 +1,50 @@
package com.njcn.access.runner; //package com.njcn.access.runner;
//
import com.njcn.access.service.ICsEquipmentDeliveryService; //import com.njcn.access.service.ICsEquipmentDeliveryService;
import com.njcn.access.service.ICsTopicService; //import com.njcn.access.service.ICsTopicService;
import com.njcn.access.service.impl.CsDeviceServiceImpl; //import com.njcn.access.service.impl.CsDeviceServiceImpl;
import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO; //import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
import lombok.extern.slf4j.Slf4j; //import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled; //import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; //import org.springframework.stereotype.Component;
//
import javax.annotation.Resource; //import javax.annotation.Resource;
import java.util.List; //import java.util.List;
import java.util.Objects; //import java.util.Objects;
//
/** ///**
* 类的介绍：防止设备掉线 系统未能调整，做一个定时任务，每天凌晨将所有设备重新接入 // * 类的介绍：防止设备掉线 系统未能调整，做一个定时任务，每天凌晨将所有设备重新接入
* // *
* @author xuyang // * @author xuyang
* @version 1.0.0 // * @version 1.0.0
* @createTime 2023/8/28 14:21 // * @createTime 2023/8/28 14:21
*/ // */
@Component //@Component
@Slf4j //@Slf4j
public class AccessScheduledTask { //public class AccessScheduledTask {
//
@Resource // @Resource
private CsDeviceServiceImpl csDeviceService; // private CsDeviceServiceImpl csDeviceService;
//
@Resource // @Resource
private ICsTopicService csTopicService; // private ICsTopicService csTopicService;
//
@Resource // @Resource
private ICsEquipmentDeliveryService csEquipmentDeliveryService; // private ICsEquipmentDeliveryService csEquipmentDeliveryService;
//
/** // /**
* {秒数} {分钟} {小时} {日期} {月份} {星期} {年份(可为空)} // * {秒数} {分钟} {小时} {日期} {月份} {星期} {年份(可为空)}
*/ // */
@Scheduled(cron = "0 0 0 * * ?") // @Scheduled(cron = "0 0 0 * * ?")
public void executeTask() { // public void executeTask() {
log.info("每日凌晨定时任务执行"); // log.info("每日凌晨定时任务执行");
List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getAll(); // List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getAll();
list.forEach(item->{ // list.forEach(item->{
String version = csTopicService.getVersion(item.getNdid()); // String version = csTopicService.getVersion(item.getNdid());
if (!Objects.isNull(version)){ // if (!Objects.isNull(version)){
csDeviceService.devAccess(item.getNdid(),version); // csDeviceService.devAccess(item.getNdid(),version);
} // }
}); // });
} // }
//
} //}

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

@@ -413,15 +413,16 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_6.getCode())); reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_6.getCode()));
reqAndResParam.setExpire(-1); reqAndResParam.setExpire(-1);
AskDataDto askDataDto = new AskDataDto(); AskDataDto askDataDto = new AskDataDto();
askDataDto.setClDid(-1);
askDataDto.setDataAttr(0); askDataDto.setDataAttr(0);
askDataDto.setOperate(1); askDataDto.setOperate(1);
askDataDto.setStartTime(-1); askDataDto.setStartTime(-1);
askDataDto.setEndTime(-1); askDataDto.setEndTime(-1);
if (Objects.equals(dataType,AccessEnum.SOFT_INFO.getCode())){ if (Objects.equals(dataType,AccessEnum.SOFT_INFO.getCode())){
reqAndResParam.setDid(did); askDataDto.setCldid(0);
reqAndResParam.setDid(2);
askDataDto.setDataType(1); askDataDto.setDataType(1);
} else if (Objects.equals(dataType,AccessEnum.L_DEV_INFO.getCode())){ } else if (Objects.equals(dataType,AccessEnum.L_DEV_INFO.getCode())){
askDataDto.setCldid(0);
reqAndResParam.setDid(did); reqAndResParam.setDid(did);
askDataDto.setDataType(2); askDataDto.setDataType(2);
} }