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

fix:设备异常优化

Browse Source
This commit is contained in:
zhouz
2025-08-26 13:41:31 +08:00
parent d0df9f415f
commit 867d6ddf4c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java
View File

@@ -341,7 +341,7 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
//查询当前人员对应的设备是多少
JSONArray b1_rows = WQLObject.getWQLObject("em_bi_monitordevice").query(query_sql + "AND product_area = 'B1'").getResultJSONArray(0);
JSONArray b1_rows = WQLObject.getWQLObject("em_bi_monitordevice").query(query_sql + "AND product_area = 'B1' AND is_crux = '1'").getResultJSONArray(0);
List<String> b1List = new ArrayList<>();
for (int i = 0; i < b1_rows.size(); i++) {
JSONObject row = b1_rows.getJSONObject(i);
@@ -352,7 +352,7 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
// 调用acs接口获取设备
JSONArray b1_data = result.getJSONArray("data");
JSONArray blk_rows = WQLObject.getWQLObject("em_bi_monitordevice").query(query_sql + "AND product_area = 'BLK'").getResultJSONArray(0);
JSONArray blk_rows = WQLObject.getWQLObject("em_bi_monitordevice").query(query_sql + "AND product_area = 'BLK' AND is_crux = '1'").getResultJSONArray(0);
List<String> blkList = new ArrayList<>();
for (int i = 0; i < blk_rows.size(); i++) {
JSONObject row = blk_rows.getJSONObject(i);
@@ -389,7 +389,7 @@ public class FaultDeviceServiceImpl implements FaultDeviceService {
}
}
//查询内包间套轴对接位的异常
if (inArea.contains("NBJ")) {
if (inArea.contains("NBJ") && (StrUtil.isEmpty(region_code) || region_code.equals("NBJ")) ) {
IBstIvtCutpointivtService bean2 = SpringContextHolder.getBean(IBstIvtCutpointivtService.class);
List<BstIvtCutpointivt> list = bean2.list(new LambdaQueryWrapper<BstIvtCutpointivt>()
.eq(BstIvtCutpointivt::getPoint_type, "1")