root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

opt: 路由同步，设备监控优化

Browse Source
This commit is contained in:
yanps
2024-03-08 09:52:05 +08:00
parent 0b7945a149
commit 19615e8ca7
7 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java
View File

@@ -224,6 +224,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
IPage<Device> queryPage = PageUtil.toMybatisPage(page);
LambdaQueryWrapper<Device> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("device_type")), Device::getDevice_type, whereJson.get("device_type"));
wrapper.eq(StringUtils.isNotBlank((String) whereJson.get("region")), Device::getRegion, whereJson.get("region"));
wrapper.nested(StringUtils.isNotBlank((String) whereJson.get("blurry")), i -> i.like(Device::getDevice_code, whereJson.get("blurry")).or().like(Device::getDevice_name, whereJson.get("blurry")));
wrapper.orderByAsc(Device::getIs_config).orderByDesc(Device::getSeq_num).orderByDesc(Device::getUpdate_time);
wrapper.orderByDesc(Device::getCreate_time);
@@ -1905,11 +1906,15 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
String in_device_name = null;
String en_device_name = null;
String zh_device_name = null;
/*if(list.size() > 7){
if(list.size() > 6 && ObjectUtil.isNotEmpty(list.get(6))){
in_device_name = list.get(6).toString();
}
if(list.size() > 7 && ObjectUtil.isNotEmpty(list.get(7))){
en_device_name = list.get(7).toString();
}
if(list.size() > 8 && ObjectUtil.isNotEmpty(list.get(8))){
zh_device_name = list.get(8).toString();
}*/
}
if (StrUtil.isEmpty(device_code)) {
throw new BadRequestException(LangProcess.msg("error_checkNull", "device_code"));
@@ -1931,7 +1936,6 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
continue;
}
if(StrUtil.isEmpty(zh_device_name)){
//throw new BadRequestException(LangProcess.msg("zh_device_name_isNotNull"));
zh_device_name = StrUtil.isNotEmpty(device_name) ? device_name : device_code;
}
if(StrUtil.isEmpty(en_device_name)){
@@ -2013,7 +2017,7 @@ public class DeviceServiceImpl extends CommonServiceImpl<DeviceMapper, Device> i
@Override
public JSONArray selectDriverCodeList(String device_code) {
JSONArray ja = new JSONArray();
JSONArray ja;
DeviceDto device = this.findByCode(device_code);
String device_type = device.getDevice_type();
List<Dict> dictList = iSysDictService.getDictByName("device_type");

33
acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java
View File

@@ -69,8 +69,8 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
@Autowired
ISysParamService paramService;
Map<String, RoutePlanDto> routePlans = new HashMap();
Map<Integer, String> routeIndex = new HashMap();
Map<String, RoutePlanDto> routePlans = new HashMap<>();
Map<Integer, String> routeIndex = new HashMap<>();
Map<String, List> routeLines = new HashMap();
/**
* 用来确定设备在 路由二维数组中的坐标
@@ -335,6 +335,12 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
if (list.size() == 0) {
// wo.insert(json);
routeLineMapper.insert(entity);
RoutePlanDto routePlanDto = routePlanService.findById(entity.getRoute_plan_id());
if(ObjectUtil.isNotEmpty(routePlanDto)){
List list1 = routeLines.get(routePlanDto.getPlan_code());
RouteLineDto convert = ConvertUtil.convert(entity, RouteLineDto.class);
list1.add(convert);
}
} else {
throw new BadRequestException(LangProcess.msg("error_creat_route"));
}
@@ -405,6 +411,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
RouteLineDto dto = this.findById(routeLineId);
dto.setIs_active(ia_active);
this.update(dto);
reload();
}
@Override
@@ -531,10 +538,10 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
Object[] param = new Object[0];
Map map = new HashMap();
List<RoutePlanDto> routePlans = this.routePlanService.queryAll(map);
Iterator var2 = routePlans.iterator();
Iterator<RoutePlanDto> var2 = routePlans.iterator();
while (var2.hasNext()) {
RoutePlanDto routePlan = (RoutePlanDto) var2.next();
Map map1 = new HashMap();
RoutePlanDto routePlan = var2.next();
Map<String, String> map1 = new HashMap<String, String>();
map1.put("route_plan_id", routePlan.getPlan_uuid());
//List<Entity> allRouteLines = Db.use().query(initsql,param);
@@ -568,11 +575,11 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
routeLineDto.setWeights(entity.get("weights").toString());
return routeLineDto;
}).collect(Collectors.toList());
Iterator var = routeDaoList.iterator();
Iterator<RouteLineDto> var = routeDaoList.iterator();
List list = new ArrayList<>();
while (var.hasNext()) {
RouteLineDto routeLine = (RouteLineDto) var.next();
RouteLineDto routeLine = var.next();
if (StrUtil.equals(routePlan.getPlan_uuid(), routeLine.getRoute_plan_id())) {
list.add(routeLine);
@@ -614,7 +621,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
public List<RouteLineDto> getShortPathLines(String device_code, String next_device_code, String plan_code) {
List list = this.routeLines.get(plan_code);
List result = new ArrayList();
List<RouteLineDto> result = new ArrayList<>();
Iterator iterator = list.iterator();
while (iterator.hasNext()) {
RouteLineDto routeLineDto = (RouteLineDto) iterator.next();
@@ -630,7 +637,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
@Override
public List<RouteLineDto> getShortPathLinesByCode(String device_code, String plan_code) {
List list = this.routeLines.get(plan_code);
List result = new ArrayList();
List<RouteLineDto> result = new ArrayList<>();
Iterator iterator = list.iterator();
while (iterator.hasNext()) {
RouteLineDto routeLineDto = (RouteLineDto) iterator.next();
@@ -646,7 +653,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
@Override
public List<RouteLineDto> getPathLinesByCode(String device_code, String plan_code) {
List list = this.routeLines.get(plan_code);
List result = new ArrayList();
List<RouteLineDto> result = new ArrayList<RouteLineDto>();
Iterator iterator = list.iterator();
while (iterator.hasNext()) {
RouteLineDto routeLineDto = (RouteLineDto) iterator.next();
@@ -662,7 +669,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
@Override
public List<RouteLineDto> getSuperiorShortPathLinesByCode(String device_code, String plan_code) {
List list = this.routeLines.get(plan_code);
List result = new ArrayList();
List<RouteLineDto> result = new ArrayList<RouteLineDto>();
Iterator iterator = list.iterator();
while (iterator.hasNext()) {
RouteLineDto routeLineDto = (RouteLineDto) iterator.next();
@@ -686,7 +693,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
}
public Integer getIndex(String device_code) {
Iterator var2 = this.routeIndex.keySet().iterator();
Iterator<Integer> var2 = this.routeIndex.keySet().iterator();
Integer i;
do {
@@ -694,7 +701,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl<RouteLineMapper, Rou
throw new BadRequestException(device_code + "当前设备没有路由请检查设备配置");
}
i = (Integer) var2.next();
i = var2.next();
} while (!((String) this.routeIndex.get(i)).equals(device_code));
return i;