From 2771e60a67bec363ad83dfde3e1a1e9259ad39a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 16 Aug 2023 11:27:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87bug=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inv/DeviceInspectTakeController.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java index 31ee8ef7d..d9d086aa9 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java +++ b/src/main/java/com/glxp/api/controller/inv/DeviceInspectTakeController.java @@ -127,5 +127,16 @@ public class DeviceInspectTakeController { return ResultVOUtils.success(); } + @GetMapping("/udiwms/inv/device/inspect/take/detail/delectDeviceInspecTakeDetail") + public BaseResponse delecttDeviceInspecTakeDetail(String id) { + + boolean falg=deviceInspectTaskDetailService.removeById(id); + if(!falg){ + return ResultVOUtils.error(999,"删除失败"); + } + return ResultVOUtils.success(); + } + + } From df219f13c451d2be4b3de01e0fad8141e2dc1dc2 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 16 Aug 2023 11:28:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=88=86=E6=94=AF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=A4=87=E4=BB=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/glxp/api/entity/sync/SocketMsgEntity.java | 2 +- src/main/java/com/glxp/api/service/sync/SocketMsgService.java | 2 +- src/main/java/com/glxp/api/service/sync/SpsWebSocketClient.java | 1 - src/main/resources/application-dev.yml | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/glxp/api/entity/sync/SocketMsgEntity.java b/src/main/java/com/glxp/api/entity/sync/SocketMsgEntity.java index bfe3e5cef..02815d74d 100644 --- a/src/main/java/com/glxp/api/entity/sync/SocketMsgEntity.java +++ b/src/main/java/com/glxp/api/entity/sync/SocketMsgEntity.java @@ -15,6 +15,6 @@ import lombok.NoArgsConstructor; public class SocketMsgEntity { private String type; - private String content; + private Object content; private String remark; } diff --git a/src/main/java/com/glxp/api/service/sync/SocketMsgService.java b/src/main/java/com/glxp/api/service/sync/SocketMsgService.java index a6b818701..22424266c 100644 --- a/src/main/java/com/glxp/api/service/sync/SocketMsgService.java +++ b/src/main/java/com/glxp/api/service/sync/SocketMsgService.java @@ -45,7 +45,7 @@ public class SocketMsgService { //发票确认 public void invoiceConfirm(SocketMsgEntity socketMsgEntity) { - String billNo = socketMsgEntity.getContent(); + String billNo = (String) socketMsgEntity.getContent(); BaseResponse baseResponse = spGetHttpClient.getOrderByBillNo(billNo); if (baseResponse != null && baseResponse.getCode() == 20000) { IoOrderEntity orderEntity = baseResponse.getData(); diff --git a/src/main/java/com/glxp/api/service/sync/SpsWebSocketClient.java b/src/main/java/com/glxp/api/service/sync/SpsWebSocketClient.java index 9ae9b5069..0824a60f5 100644 --- a/src/main/java/com/glxp/api/service/sync/SpsWebSocketClient.java +++ b/src/main/java/com/glxp/api/service/sync/SpsWebSocketClient.java @@ -11,7 +11,6 @@ import org.java_websocket.handshake.ServerHandshake; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Resource; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 2eeeaf266..8c42dfd30 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -47,6 +47,8 @@ logging: com.glxp.api.dao: debug file_path: D:/udi/udiwms/udiwmsfile/ +file_lpath: /udiwms/image/register/file/getImage +file_url: http://127.0.0.1:9991 UDI_KEY: 6b137c66-6286-46c6-8efa-c2f5dd9237df UDI_SERVER_URL: https://www.udims.com/UDI_DL_Server_test SPMS_KEY: lCOdWCBKS6Kw45wdnnqUTELXyuSKnXEs