1.完成icd管理和终端类型管理
2.完成终端运维管理
This commit is contained in:
@@ -9,6 +9,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.njcn.common.pojo.enums.common.DataStateEnum;
|
||||
import com.njcn.common.pojo.exception.BusinessException;
|
||||
import com.njcn.db.constant.DbConstant;
|
||||
import com.njcn.device.pq.api.PqDevTypeClient;
|
||||
import com.njcn.device.pq.pojo.po.PqDevType;
|
||||
import com.njcn.system.enums.DicDataEnum;
|
||||
import com.njcn.system.enums.DicDataTypeEnum;
|
||||
import com.njcn.system.enums.SystemResponseEnum;
|
||||
@@ -28,6 +30,7 @@ import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Comparator;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
@@ -43,8 +46,9 @@ import java.util.stream.Collectors;
|
||||
public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> implements IDictDataService {
|
||||
|
||||
private final IConfigService iConfigService;
|
||||
|
||||
private final IDictTypeService dictTypeService;
|
||||
private final PqDevTypeClient pqDevTypeClient;
|
||||
|
||||
|
||||
@Override
|
||||
public Page<DictDataVO> listDictData(DictDataParam.DictDataQueryParam queryParam) {
|
||||
@@ -129,14 +133,34 @@ public class DictDataServiceImpl extends ServiceImpl<DictDataMapper, DictData> i
|
||||
|
||||
@Override
|
||||
public List<DictData> getDicDataByTypeName(String dictTypeName) {
|
||||
if(DicDataTypeEnum.DEV_TYPE.getName().equals(dictTypeName)){
|
||||
return getDicData();
|
||||
}
|
||||
return this.baseMapper.getDicDataByTypeName(dictTypeName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DictData> getDicDataByTypeCode(String dictTypeCode) {
|
||||
if(DicDataTypeEnum.DEV_TYPE.getCode().equals(dictTypeCode)){
|
||||
return getDicData();
|
||||
}
|
||||
return this.baseMapper.getDicDataByTypeCode(dictTypeCode);
|
||||
}
|
||||
|
||||
|
||||
public List<DictData> getDicData() {
|
||||
List<DictData> info=new ArrayList<>();
|
||||
List<PqDevType> data = pqDevTypeClient.getDevTypeList().getData();
|
||||
DictData dictData;
|
||||
for (PqDevType datum : data) {
|
||||
dictData=new DictData();
|
||||
dictData.setId(datum.getId());
|
||||
dictData.setName(datum.getName());
|
||||
info.add(dictData);
|
||||
}
|
||||
return info;
|
||||
}
|
||||
|
||||
@Override
|
||||
public DictData getDicDataByName(String dicName) {
|
||||
return this.baseMapper.getDicDataByName(dicName);
|
||||
|
||||
@@ -38,7 +38,7 @@ public class TimerTaskInitListener implements ApplicationRunner, Ordered {
|
||||
List<Timers> list = sysTimersService.list(lambdaQueryChainWrapper);
|
||||
// 添加定时任务到调度器
|
||||
for (Timers sysTimers : list) {
|
||||
timerExeService.startTimer(String.valueOf(sysTimers.getId()), sysTimers.getCron(), sysTimers.getActionClass());
|
||||
// timerExeService.startTimer(String.valueOf(sysTimers.getId()), sysTimers.getCron(), sysTimers.getActionClass());
|
||||
}
|
||||
|
||||
// 设置秒级别的启用
|
||||
|
||||
Reference in New Issue
Block a user