From 35409a39013b5e7598f5817a0ddf08c54f4d80a3 Mon Sep 17 00:00:00 2001
From: joylink_zhangsai <1021828630@qq.com>
Date: Mon, 18 Jan 2021 13:38:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E8=B7=AF=E5=B0=81=E9=94=81=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=EF=BC=8C=E5=8F=96=E6=B6=88<=E8=BF=9B=E8=B7=AF?=
 =?UTF-8?q?=E9=94=81=E9=97=AD=E7=9A=84=E5=8C=BA=E6=AE=B5=E4=B8=8D=E5=A4=84?=
 =?UTF-8?q?=E7=90=86>=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../services/pay/wechat/WechatPayService.java |  2 +-
 .../controller/PayResultController.java       | 25 -------------------
 .../cbtc/CI/service/SectionService.java       |  8 +++---
 3 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 src/main/java/club/joylink/rtss/services/pay/wechat/controller/PayResultController.java

diff --git a/src/main/java/club/joylink/rtss/services/pay/wechat/WechatPayService.java b/src/main/java/club/joylink/rtss/services/pay/wechat/WechatPayService.java
index 786966203..9341da142 100644
--- a/src/main/java/club/joylink/rtss/services/pay/wechat/WechatPayService.java
+++ b/src/main/java/club/joylink/rtss/services/pay/wechat/WechatPayService.java
@@ -102,7 +102,7 @@ public class WechatPayService {
 
     public static void main(String[] args) throws Exception {
         OrderPay pay = new OrderPay();
-        pay.setOrderNo("2018081400001");
+        pay.setOrderNo("2018081400003");
         pay.setDescription("标准1号线ATS现地工作站实操");
         pay.setTotalFee(1);
         pay.setTimeExpire(OffsetDateTime.now().plusMinutes(10));
diff --git a/src/main/java/club/joylink/rtss/services/pay/wechat/controller/PayResultController.java b/src/main/java/club/joylink/rtss/services/pay/wechat/controller/PayResultController.java
deleted file mode 100644
index 82ffcf783..000000000
--- a/src/main/java/club/joylink/rtss/services/pay/wechat/controller/PayResultController.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package club.joylink.rtss.services.pay.wechat.controller;
-
-import club.joylink.rtss.services.pay.wechat.WechatPayService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("/api/wechatpay")
-@Slf4j
-public class PayResultController {
-
-    @Autowired
-    private WechatPayService wechatPayService;
-
-    @RequestMapping(path="/receive", method= {RequestMethod.POST})
-    public String receive(@RequestBody String data) {
-        log.info("支付结果通知：" + data);
-        return this.wechatPayService.receive(data);
-    }
-
-}
diff --git a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/SectionService.java b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/SectionService.java
index 6bdde37ee..23f431ba1 100644
--- a/src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/SectionService.java
+++ b/src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/SectionService.java
@@ -29,10 +29,10 @@ public class SectionService {
      * @param section
      */
     public void blockade(Section section) {
-        if(section.isRouteLock() || section.isOverlapLock()) {
-            log.info(String.format("区段[%s(%s)]进路锁闭，不能封锁", section.getName(), section.getCode()));
-            return;
-        }
+//        if(section.isRouteLock() || section.isOverlapLock()) {
+//            log.info(String.format("区段[%s(%s)]进路锁闭，不能封锁", section.getName(), section.getCode()));
+//            return;
+//        }
         if(!section.isBlockade()) {
             section.setBlockade(true);
             if (!section.isCross() && !CollectionUtils.isEmpty(section.getLogicList())) {