From 986de1ea52ea40a848a8e8ffe478122850bb03a2 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 13 八月 2024 09:36:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
index 3508e08..e1284e0 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java
@@ -8,6 +8,7 @@
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pmsGlobal.aop.Log;
import com.dy.pmsGlobal.pojoPlt.PltStation;
+import com.dy.pmsGlobal.util.QrCodeConstant;
import com.dy.pmsGlobal.util.QrCodeUtil;
import com.google.zxing.WriterException;
import jakarta.servlet.http.HttpServletResponse;
@@ -30,7 +31,6 @@
public class StationCtrl {
private static final String fileName = "宸ョ珯淇℃伅" ;
private static final String sheetName = "宸ョ珯淇℃伅" ;
- private static final String stationPrefix = "103" ;
private StationSv sv;
@Autowired
public StationCtrl(StationSv sv){
@@ -118,7 +118,7 @@
}
@PostMapping(path="disabled")
- @SsoPowerAop(power = "10100011")
+ @SsoPowerAop(power = "10300007")
@Log("绂佺敤鎴栧惎鐢ㄥ伐绔�")
public BaseResponse<Boolean> disabled(@RequestBody PltStation station){
int count = sv.disabled(station.id,station.disabled);
@@ -130,7 +130,7 @@
}
}
@PostMapping(path="export")
- @SsoPowerAop(power = "10300000")
+ @SsoPowerAop(power = "10300007")
@Log("瀵煎嚭宸ョ珯淇℃伅")
public void export(HttpServletResponse response){
List<Converter> list = new ArrayList<>() ;
@@ -143,7 +143,7 @@
// vo.code = "103"+station.id;
vo.lineName = station.lineName;
try {
- vo.qrCode = QrCodeUtil.genQrCode(stationPrefix+station.id);
+ vo.qrCode = QrCodeUtil.genQrCode(QrCodeConstant.TypeStation+station.id);
} catch (IOException e) {
e.printStackTrace();
} catch (WriterException e) {
--
Gitblit v1.8.0