From aec4636e4fb430055feb66751da0e6c05bb864df Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期三, 30 四月 2025 16:25:30 +0800
Subject: [PATCH] fix(irrigatePlan): 修复终止灌溉计划时长设置错误- 将终止计划的默认时长从 9999 修改为 0 - 此修改确保在终止灌溉计划时，不会出现时长设置过长的问题
---
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 34 +++++++++++-----------------------
1 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
index 1bbfa52..f475e27 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -116,43 +116,31 @@
//鎶婄粍缁囧崟浣嶆爣绛句綔涓烘暟鎹簮鍚嶇О
DataSourceContext.set(vo.orgTag);
- String token = Optional.ofNullable(vo.getToken()).orElse("");
- String code = Optional.ofNullable(vo.getCode()).orElse("");
-
-
-
-
-
- if(token.length() > 0 && code.length() > 0) {
+ if(vo.token != null && vo.token.trim().length() > 0) {
// 浠巗ession涓幏鍙栭獙璇佺爜
//HttpSession session = (HttpSession) request.getSession();
//String localCode = session.getAttribute(token).toString();
-
- Map map = sv.getCodeByToken(token);
+ // 浠庢暟鎹簱鑾峰彇楠岃瘉鐮�
+ Map map = sv.getCodeByToken(vo.token);
Long expiration = Long.parseLong(map.get("expiration").toString());
Long currentTimestamp = System.currentTimeMillis();
if(currentTimestamp > expiration) {
return BaseResponseUtils.buildErrorMsg("楠岃瘉鐮佸凡瓒呮椂");
}
-
- // 浠庢暟鎹簱鑾峰彇楠岃瘉鐮�
String localCode = map.get("code").toString();
- if(!code.equals(localCode)) {
+ if(!vo.code.equals(localCode)) {
return BaseResponseUtils.buildErrorMsg("楠岃瘉鐮侀敊璇�");
}
}
- //寰楀埌鎵�鏈夌敤鎴疯处鍙�
- List<String> phones = sv.getPhones();
- if(!phones.contains(vo.phone)){
+ if(!sv.existPhone(vo.phone)){
return BaseResponseUtils.buildErrorMsg("璐﹀彿涓嶅瓨鍦�");
}
- String uuid ;
- BaUser userPo ;
+ String uuid4Token = null;
+ BaUser userPo = null ;
try {
- //Boolean flag = cacheManager.getCacheNames().isEmpty() ;
- uuid = UUID.randomUUID().toString();
+ uuid4Token = UUID.randomUUID().toString();
if(!StringUtils.isNullOrEmpty(vo.password)){
/*
濡傛灉鍓嶇杩涜浜哹ase64鍔犲瘑
@@ -160,7 +148,7 @@
*/
vo.password = MD5.encrypt(vo.password) ;
}
- userPo = this.sv.loginWithMapperXml(uuid, vo.phone, vo.password);
+ userPo = this.sv.loginWithMapperXml(uuid4Token, vo.phone, vo.password);
} catch (Exception e) {
log.error("鐢ㄦ埛鐧诲綍寮傚父", e);
return BaseResponseUtils.buildException(e.getMessage()) ;
@@ -168,10 +156,10 @@
if(userPo != null){
UserVo uVo = UserVoMapper.INSTANCT.po2vo(userPo);
- uVo.token = uuid ;
+ uVo.token = uuid4Token ;
return BaseResponseUtils.buildSuccess(uVo);
}else{
- return BaseResponseUtils.buildErrorMsg("瀵嗙爜閿欒");
+ return BaseResponseUtils.buildErrorMsg("鐧诲綍澶辫触");
}
}
--
Gitblit v1.8.0