From 19615e8ca7f48e875c28075367e4ffeada04d90c Mon Sep 17 00:00:00 2001 From: yanps Date: Fri, 8 Mar 2024 09:52:05 +0800 Subject: [PATCH] =?UTF-8?q?opt:=20=E8=B7=AF=E7=94=B1=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceServiceImpl.java | 12 +++-- .../service/impl/RouteLineServiceImpl.java | 33 +++++++----- .../nladmin-ui/src/views/acs/device/index.vue | 14 +++++ .../src/views/acs/instruction/index.vue | 51 +++++++------------ .../src/views/acs/route/routeLine/index.vue | 5 +- acs2/nladmin-ui/src/views/acs/stage/index.vue | 5 +- .../src/views/system/monitor/device/index.vue | 12 +++-- 7 files changed, 72 insertions(+), 60 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java index 9a8bea095..608756d70 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device/service/impl/DeviceServiceImpl.java @@ -224,6 +224,7 @@ public class DeviceServiceImpl extends CommonServiceImpl i IPage queryPage = PageUtil.toMybatisPage(page); LambdaQueryWrapper 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 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 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 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 dictList = iSysDictService.getDictByName("device_type"); diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java index b7ff2656d..b9aff96da 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/route/service/impl/RouteLineServiceImpl.java @@ -69,8 +69,8 @@ public class RouteLineServiceImpl extends CommonServiceImpl routePlans = new HashMap(); - Map routeIndex = new HashMap(); + Map routePlans = new HashMap<>(); + Map routeIndex = new HashMap<>(); Map routeLines = new HashMap(); /** * 用来确定设备在 路由二维数组中的坐标 @@ -335,6 +335,12 @@ public class RouteLineServiceImpl extends CommonServiceImpl routePlans = this.routePlanService.queryAll(map); - Iterator var2 = routePlans.iterator(); + Iterator var2 = routePlans.iterator(); while (var2.hasNext()) { - RoutePlanDto routePlan = (RoutePlanDto) var2.next(); - Map map1 = new HashMap(); + RoutePlanDto routePlan = var2.next(); + Map map1 = new HashMap(); map1.put("route_plan_id", routePlan.getPlan_uuid()); //List allRouteLines = Db.use().query(initsql,param); @@ -568,11 +575,11 @@ public class RouteLineServiceImpl extends CommonServiceImpl 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 getShortPathLines(String device_code, String next_device_code, String plan_code) { List list = this.routeLines.get(plan_code); - List result = new ArrayList(); + List result = new ArrayList<>(); Iterator iterator = list.iterator(); while (iterator.hasNext()) { RouteLineDto routeLineDto = (RouteLineDto) iterator.next(); @@ -630,7 +637,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl getShortPathLinesByCode(String device_code, String plan_code) { List list = this.routeLines.get(plan_code); - List result = new ArrayList(); + List result = new ArrayList<>(); Iterator iterator = list.iterator(); while (iterator.hasNext()) { RouteLineDto routeLineDto = (RouteLineDto) iterator.next(); @@ -646,7 +653,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl getPathLinesByCode(String device_code, String plan_code) { List list = this.routeLines.get(plan_code); - List result = new ArrayList(); + List result = new ArrayList(); Iterator iterator = list.iterator(); while (iterator.hasNext()) { RouteLineDto routeLineDto = (RouteLineDto) iterator.next(); @@ -662,7 +669,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl getSuperiorShortPathLinesByCode(String device_code, String plan_code) { List list = this.routeLines.get(plan_code); - List result = new ArrayList(); + List result = new ArrayList(); Iterator iterator = list.iterator(); while (iterator.hasNext()) { RouteLineDto routeLineDto = (RouteLineDto) iterator.next(); @@ -686,7 +693,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl var2 = this.routeIndex.keySet().iterator(); Integer i; do { @@ -694,7 +701,7 @@ public class RouteLineServiceImpl extends CommonServiceImpl + + + + + diff --git a/acs2/nladmin-ui/src/views/acs/instruction/index.vue b/acs2/nladmin-ui/src/views/acs/instruction/index.vue index 870487e40..ffa308884 100644 --- a/acs2/nladmin-ui/src/views/acs/instruction/index.vue +++ b/acs2/nladmin-ui/src/views/acs/instruction/index.vue @@ -168,7 +168,7 @@ - + @@ -180,21 +180,11 @@ diff --git a/acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue b/acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue index 3829be9b1..985bdd70d 100644 --- a/acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue +++ b/acs2/nladmin-ui/src/views/acs/route/routeLine/index.vue @@ -51,8 +51,9 @@ - + @@ -67,7 +67,6 @@