From 3e9551ddc361ab4e70b2da9438b8e888f1f78c2b Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Mon, 25 Aug 2025 09:33:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=BC=82=E5=B8=B8=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../master/rest/FaultDeviceController.java | 2 +- .../service/impl/FaultDeviceServiceImpl.java | 54 ++- .../st/service/UserDeviceService.java | 2 + .../service/impl/UserDeviceServiceImpl.java | 1 + .../java/org/nl/wms/basedata/st/wql/stivt.xls | Bin 299008 -> 300032 bytes .../wms/ext/acs/service/WmsToAcsService.java | 3 + .../acs/service/impl/WmsToAcsServiceImpl.java | 44 +++ .../wms/basedata/product/userDevice/index.vue | 324 ++++++++++++++++++ .../basedata/product/userDevice/userDevice.js | 43 +++ 9 files changed, 470 insertions(+), 3 deletions(-) create mode 100644 lms/nladmin-ui/src/views/wms/basedata/product/userDevice/index.vue create mode 100644 lms/nladmin-ui/src/views/wms/basedata/product/userDevice/userDevice.js diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/FaultDeviceController.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/FaultDeviceController.java index eb3b0d7c9..bcb7af5e1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/FaultDeviceController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/rest/FaultDeviceController.java @@ -36,7 +36,7 @@ public class FaultDeviceController { } @GetMapping("/deviceCharge") - @Log("查询说有设备故障") + @Log("查询所有设备故障") public ResponseEntity queryDeviceAll(@RequestParam Map whereJson, Pageable page) { return new ResponseEntity<>(faultDeviceService.queryDeviceAll(whereJson, page), HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java index e400cfff2..24551819a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/master/service/impl/FaultDeviceServiceImpl.java @@ -9,8 +9,11 @@ import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.bst.ivt.cutpointivt.service.IBstIvtCutpointivtService; +import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; import org.nl.common.utils.SecurityUtils; import org.nl.modules.common.exception.BadRequestException; import org.nl.modules.wql.WQL; @@ -19,11 +22,14 @@ import org.nl.modules.wql.util.SpringContextHolder; import org.nl.modules.wql.util.WqlUtil; import org.nl.wms.basedata.master.service.FaultDeviceService; import org.nl.wms.basedata.master.service.dto.CustomerbaseDto; +import org.nl.wms.basedata.st.service.UserDeviceService; import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import javax.swing.*; +import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -67,8 +73,8 @@ public class FaultDeviceServiceImpl implements FaultDeviceService { JSONObject param = new JSONObject(); if (ObjectUtil.isNotEmpty(device_code)) { JSONObject device_jo = WQLObject.getWQLObject("EM_BI_MonitorDevice").query("device_code = '" + device_code + "'").uniqueResult(0); - if (ObjectUtil.isEmpty(device_jo)){ - throw new BadRequestException("未查询到设备号为["+device_code+"]的设备信息！"); + if (ObjectUtil.isEmpty(device_jo)) { + throw new BadRequestException("未查询到设备号为[" + device_code + "]的设备信息！"); } param.put("device_code", device_code); param.put("product_area", device_jo.getString("product_area")); @@ -318,4 +324,48 @@ public class FaultDeviceServiceImpl implements FaultDeviceService { } } } + + public Map getAllerrorDevice(Map whereJson, Pageable page) { + String device_code = MapUtil.getStr(whereJson, "device_code"); + String region_code = MapUtil.getStr(whereJson, "region_code"); + + UserDeviceService userDeviceService = SpringContextHolder.getBean(UserDeviceService.class); + + String inArea = userDeviceService.getInArea(); + + //查询当前人员对应的设备是多少 + JSONArray device_rows = WQLObject.getWQLObject("em_bi_monitordevice").query("region_code in " + inArea + "").getResultJSONArray(0); + List deviceList = new ArrayList<>(); + for (int i = 0; i < device_rows.size(); i++) { + JSONObject row = device_rows.getJSONObject(i); + deviceList.add(row.getString("device_code")); + } + + // 调用acs接口获取设备 + JSONObject result = SpringContextHolder.getBean(WmsToAcsServiceImpl.class).getDeviceErrorInfo(deviceList); + JSONArray data = result.getJSONArray("data"); + + //查询内包间套轴对接位的异常 + if (inArea.contains("NBJ")) { + IBstIvtCutpointivtService bean = SpringContextHolder.getBean(IBstIvtCutpointivtService.class); + List list = bean.list(new LambdaQueryWrapper() + .eq(BstIvtCutpointivt::getPoint_type, "1") + .eq(BstIvtCutpointivt::getIs_used, "1") + .ne(BstIvtCutpointivt::getRemark, "") + .isNotNull(BstIvtCutpointivt::getRemark) + .eq(BstIvtCutpointivt::getPoint_status, "2")); + list.stream().forEach(a -> { + JSONObject row = new JSONObject(); + row.put("device_code", a.getPoint_code()); + row.put("device_name", a.getPoint_code()); + row.put("error_code", ""); + row.put("error_message", a.getRemark()); + data.add(row); + }); + } + + JSONObject json = new JSONObject(); + json.put("content", data); + return json; + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/UserDeviceService.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/UserDeviceService.java index 4a13ef559..14a119f73 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/UserDeviceService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/UserDeviceService.java @@ -22,4 +22,6 @@ public interface UserDeviceService { */ void save(JSONObject whereJson); + String getInArea(); + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserDeviceServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserDeviceServiceImpl.java index 94a613a47..d48300896 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserDeviceServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/UserDeviceServiceImpl.java @@ -52,6 +52,7 @@ public class UserDeviceServiceImpl implements UserDeviceService { } } + @Override public String getInArea() { String currentUserId = SecurityUtils.getCurrentUserId().toString(); WQLObject userdeviceTab = WQLObject.getWQLObject("st_ivt_userdevice"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls index 7451b9b98a9769fbd2737b8421937f292e1320a3..bf82ee93185ab439308c53116d9570d317b91a34 100644 GIT binary patch delta 24330 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∋UPU!n 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 GKmHH8o-c0z delta 23695 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 Py)l$xdXF!gR^|TzQL%UK diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java index 340e21ff8..6dedd2a04 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/WmsToAcsService.java @@ -3,6 +3,7 @@ package org.nl.wms.ext.acs.service; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import java.util.List; import java.util.Map; /** @@ -153,4 +154,6 @@ public interface WmsToAcsService { * @return JSONObject */ JSONObject queryBoxWeigh(JSONObject jo); + + JSONObject getDeviceErrorInfo(List list); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java index 902edad25..6b5341c6f 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToAcsServiceImpl.java @@ -16,6 +16,7 @@ import org.nl.wms.sch.tasks.URLEnum; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; +import java.util.List; import java.util.Map; @Service @@ -517,4 +518,47 @@ public class WmsToAcsServiceImpl implements WmsToAcsService { } return result; } + + @Override + public JSONObject getDeviceErrorInfo(List list) { + String api = "api/wms/getDeviceErrorInfo"; + //判断是否连接ACS系统 + String isConnect = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("is_connect_acs").getValue(); + JSONObject result = new JSONObject(); + if (StrUtil.equals("0", isConnect)) { + result.put("status", HttpStatus.OK.value()); + result.put("message", "查询失败，未连接ACS!"); + result.put("data", new JSONArray()); + return result; + } + + String product_area = "LK"; + + String acs_url = URLEnum.find(product_area); + if (StrUtil.isEmpty(acs_url)) { + log.info(product_area); + throw new BadRequestException("未查询到区域对应的acs地址！"); + } + + String url = acs_url + api; + try { + String resultMsg = HttpRequest.post(url) + .body(String.valueOf(list)) + .execute().body(); + result = JSONObject.parseObject(resultMsg); + + } catch (Exception e) { + String msg = e.getMessage(); + //网络不通 + System.out.println(msg); + result.put("status", HttpStatus.BAD_REQUEST); + result.put("message", "网络不通,操作失败!"); + result.put("data", new JSONArray()); + } + //acs抛异常这里 + if (!StrUtil.equals(result.getString("status"), "200")) { + throw new BadRequestException("操作失败：" + result.getString("message")); + } + return result; + } } diff --git a/lms/nladmin-ui/src/views/wms/basedata/product/userDevice/index.vue b/lms/nladmin-ui/src/views/wms/basedata/product/userDevice/index.vue new file mode 100644 index 000000000..e87e2163f --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/basedata/product/userDevice/index.vue @@ -0,0 +1,324 @@ + + + + + + + diff --git a/lms/nladmin-ui/src/views/wms/basedata/product/userDevice/userDevice.js b/lms/nladmin-ui/src/views/wms/basedata/product/userDevice/userDevice.js new file mode 100644 index 000000000..7849b60e5 --- /dev/null +++ b/lms/nladmin-ui/src/views/wms/basedata/product/userDevice/userDevice.js @@ -0,0 +1,43 @@ +import request from '@/utils/request' + +export function queryStor(data) { + return request({ + url: '/api/userDevice/queryStor', + method: 'post', + data + }) +} + +export function queryuserDevice(data) { + return request({ + url: '/api/userDevice/queryUserDevice', + method: 'post', + data + }) +} + +export function save(data) { + return request({ + url: '/api/userDevice/save', + method: 'post', + data + }) +} + +export function getuserDevice(data) { + return request({ + url: '/api/userDevice/getuserDevice', + method: 'post', + data + }) +} + +export function getSect(data) { + return request({ + url: '/api/userDevice/getSect', + method: 'post', + data + }) +} + +export default { queryuserDevice, queryStor, save, getuserDevice, getSect }