From cf48730d090ba2c087c8e3a22cc8684d342b71db Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Fri, 5 May 2023 16:51:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=8C=97=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/item/controller/PushToCityGridController.java  | 7 ++-----
 .../item/service/impl/PushToCityGridServiceImpl.java       | 7 ++++++-
 .../epdc-module/epdc-message/epdc-message-server/pom.xml   | 2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java
index a173f6776..6f6fa9607 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/PushToCityGridController.java
@@ -5,10 +5,7 @@ import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
 import com.elink.esua.epdc.dto.item.form.GetAbnormalDataFormDTO;
 import com.elink.esua.epdc.modules.item.service.PushToCityGridService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 @RestController
 @RequestMapping("PushToCity")
@@ -104,7 +101,7 @@ public class PushToCityGridController {
      * @Author: lichao
      * @Date: 2023/5/4 14:14
      */
-    @PostMapping("receive")
+    @GetMapping("receive")
     public Result receive(String processId) {
         pushToCityGridService.receive(processId);
         return new Result();
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
index f85370072..7172fb9fc 100644
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java
@@ -1425,6 +1425,9 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         if (item == null) {
             return;
         }
+        if (item.getState() == 1111){
+            return;
+        }
 
         ReceiveResultDTO dto = new ReceiveResultDTO();
         dto.setSqid(getSqid(item.getItemId()));
@@ -1452,8 +1455,10 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
 
         saveLog(item.getItemId(), item.getId(), "响应接收", PushToCityGridConstant.RECEIVE, JSONObject.toJSONString(dto), result);
 
+        item.setState(1111);
+        itemHandleProcessDao.updateById(item);
 
-        }
+    }
 
     private void extracted(List<String> sqIdList, Integer itemState) {
         //50个一组
diff --git a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
index 721d7486a..efe319e46 100644
--- a/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-message/epdc-message-server/pom.xml
@@ -217,7 +217,7 @@
                 <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
                 <!-- nacos -->
                 <nacos.register-enabled>true</nacos.register-enabled>
-                <nacos.server-addr>172.16.0.53:8848</nacos.server-addr>
+                <nacos.server-addr>192.168.203.32:8848</nacos.server-addr>
                 <nacos.ip></nacos.ip>
                 <nacos.namespace></nacos.namespace>
             </properties>