joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

进路封锁操作，取消<进路锁闭的区段不处理>的逻辑

Browse Source
This commit is contained in:
joylink_zhangsai 2021-01-18 13:38:37 +08:00
parent 426ae9f775
commit 35409a3901
3 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/club/joylink/rtss/services/pay/wechat/WechatPayService.java
View File

@ -102,7 +102,7 @@ public class WechatPayService {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
OrderPay pay = new OrderPay(); OrderPay pay = new OrderPay();
pay.setOrderNo("2018081400001"); pay.setOrderNo("2018081400003");
pay.setDescription("标准1号线ATS现地工作站实操"); pay.setDescription("标准1号线ATS现地工作站实操");
pay.setTotalFee(1); pay.setTotalFee(1);
pay.setTimeExpire(OffsetDateTime.now().plusMinutes(10)); pay.setTimeExpire(OffsetDateTime.now().plusMinutes(10));

25
src/main/java/club/joylink/rtss/services/pay/wechat/controller/PayResultController.java
View File

@ -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);
}
}

8
src/main/java/club/joylink/rtss/simulation/cbtc/CI/service/SectionService.java
View File

@ -29,10 +29,10 @@ public class SectionService {
* @param section * @param section
*/ */
public void blockade(Section section) { public void blockade(Section section) {
if(section.isRouteLock() || section.isOverlapLock()) { // if(section.isRouteLock() || section.isOverlapLock()) {
log.info(String.format("区段[%s(%s)]进路锁闭，不能封锁", section.getName(), section.getCode())); // log.info(String.format("区段[%s(%s)]进路锁闭，不能封锁", section.getName(), section.getCode()));
return; // return;
} // }
if(!section.isBlockade()) { if(!section.isBlockade()) {
section.setBlockade(true); section.setBlockade(true);
if (!section.isCross() && !CollectionUtils.isEmpty(section.getLogicList())) { if (!section.isCross() && !CollectionUtils.isEmpty(section.getLogicList())) {