From 5f11c08fb43580aa682312e011e6e2e611e9955b Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期四, 21 十二月 2023 15:52:41 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/UserVo.java | 3
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java | 4
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java | 1
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/web/com/CommandCtrl.java | 30 +++
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletCtrl.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/paymentMethod/PaymentMethodCtrl.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAop.java | 7
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java | 11
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockCtrl.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 26 ++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoPowerAspect.java | 141 ++++++++++++++
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoVo.java | 2
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoPowerAop.java | 16 +
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuUpTask.java | 2
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/ClientCtrl.java | 10
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/HttpUtils.java | 153 +++++++-------
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java | 6
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/TcpSessionCache.java | 1
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideCtrl.java | 12
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java | 69 ++----
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java | 12
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/UserVoMapper.java | 1
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java | 8
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83OpenVo.java | 1
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java | 16
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java | 22 +-
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/ClientTypeCtrl.java | 12
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java | 4
pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java | 4
32 files changed, 390 insertions(+), 204 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAop.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAop.java
index c2f143a..72b4054 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAop.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAop.java
@@ -6,11 +6,4 @@
@Target(ElementType.METHOD)
@Inherited
public @interface SsoAop {
- String value() default "" ;
- //浼樺厛绾�1(鏈�楂�)锛屽鏋滃叾鏈夊�硷紝鍒欎笉鍦ㄥ垽鏂互涓嬪彉閲忓彇鍊�
- String power() default "" ;
- //浼樺厛绾�2锛屾嫢鏈夊叏閮ㄦ潈闄愭墠鍙� , 濡傛灉鍏舵湁鍊硷紝鍒欎笉鍦ㄥ垽鏂互涓嬪彉閲忓彇鍊�
- String[] ifAllPower() default{""} ;
- //浼樺厛绾�3 , 濡傛灉鏈変竴涓潈闄愬嵆鍙� , 濡傛灉鍏舵湁鍊硷紝鍒欎笉鍦ㄥ垽鏂互涓嬪彉閲忓彇鍊�
- String[] ifAnyPower() default{""} ;
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java
index f9792d2..2619ddc 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoAspect.java
@@ -35,7 +35,7 @@
public String isDevStage ;//鏄惁涓哄紑鍙戦樁娈�
@Value("${pipIrr.sso.checkUrl}")
- public String SsoCheckUrl ;
+ public String ssoCheckUrl;
private RestTemplate restTemplate;
@@ -45,10 +45,10 @@
}
@Pointcut("@annotation(com.dy.common.aop.SsoAop)")
- public void dyPointCut() {
+ public void ssoPointCut() {
}
- @Around("dyPointCut()")
+ @Around("ssoPointCut()")
public Object execute(ProceedingJoinPoint point) throws Throwable {
if(isDevStage != null && !isDevStage.trim().equals("") && isDevStage.trim().equalsIgnoreCase("true")){
return point.proceed();
@@ -57,45 +57,34 @@
Method method = signature.getMethod();
SsoAop aop = method.getAnnotation(SsoAop.class) ;
if (Objects.nonNull(aop)){
- String power = aop.value() ;
- if(power.trim().equals("")){
- power = aop.power() ;
- }
- if(power.trim().equals("-1")){
- //涓嶈繘琛岀櫥褰曞強鏉冮檺楠岃瘉
- return point.proceed();
- }else{
- String[] allPower = aop.ifAllPower() ;
- String[] anyPower = aop.ifAnyPower() ;
- String token = UserTokenContext.get() ;
- Object rObj = this.check(token, power, allPower, anyPower);
- if(rObj != null){
- if(rObj instanceof SsoVo ssoVo){
- if(ssoVo.logined){
- if(ssoVo.hasPower){
- if(!StringUtils.isNullOrEmpty(ssoVo.dataSourceName)){
- DataSourceContext.set(ssoVo.dataSourceName);
- Object obj = point.proceed();
- DataSourceContext.remove();
- return obj ;
- }else{
- //鏃犳暟鎹簮
- return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛屾湭寰楀埌褰撳墠鐧诲綍鐢ㄦ埛鎵�灞炴満鏋勬爣绛撅紙鏁版嵁婧愬悕锛�") ;
- }
+ String token = UserTokenContext.get() ;
+ Object rObj = this.check(token);
+ if(rObj != null){
+ if(rObj instanceof SsoVo ssoVo){
+ if(ssoVo.logined){
+ if(ssoVo.hasPower){
+ if(!StringUtils.isNullOrEmpty(ssoVo.dataSourceName)){
+ DataSourceContext.set(ssoVo.dataSourceName);
+ Object obj = point.proceed();
+ DataSourceContext.remove();
+ return obj ;
}else{
- //鏃犳潈闄�
- return BaseResponseUtils.buildNoPower() ;
+ //鏃犳暟鎹簮
+ return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛屾湭寰楀埌褰撳墠鐧诲綍鐢ㄦ埛鎵�灞炴満鏋勬爣绛撅紙鏁版嵁婧愬悕锛�") ;
}
}else{
- //鏈櫥褰�
- return BaseResponseUtils.buildToLogin() ;
+ //鏃犳潈闄�
+ return BaseResponseUtils.buildNoPower() ;
}
}else{
- return rObj ;
+ //鏈櫥褰�
+ return BaseResponseUtils.buildToLogin() ;
}
}else{
- return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛宑heck鏂规硶杩斿洖null") ;
+ return rObj ;
}
+ }else{
+ return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛宑heck鏂规硶杩斿洖null") ;
}
}else{
//宸茬粡杩涘叆娉ㄨВ澶勭悊浜嗭紝杩樺緱涓嶅埌娉ㄨВ锛岃繖绉嶆儏鍐垫槸涓嶅彲鑳界殑銆�
@@ -107,18 +96,12 @@
/**
* 璋冪敤SSO绯荤粺杩涜楠岃瘉
* @param token Header涓殑鐢ㄦ埛token
- * @param power 涓�涓潈闄�
- * @param allPower 澶氫釜鏉冮檺
- * @param anyPower 澶氫釜鏉冮檺
* @return 杩斿洖瀵硅薄
*/
- private Object check(String token, String power, String[] allPower, String[] anyPower){
- if(!StringUtils.isNullOrEmpty(SsoCheckUrl)){
- String url = UriComponentsBuilder.fromUriString(SsoCheckUrl)
+ private Object check(String token){
+ if(!StringUtils.isNullOrEmpty(ssoCheckUrl)){
+ String url = UriComponentsBuilder.fromUriString(ssoCheckUrl)
.queryParam("token", token)
- .queryParam("power", power)
- .queryParam("allPower", (Object) allPower)
- .queryParam("anyPower", (Object) anyPower)
.build()
.toUriString();
// 鐢变簬鑾峰彇student鎺ュ彛鍜变滑璁剧疆浜哹asicauth锛屾墍浠ラ渶瑕佸湪璇锋眰鏃堕厤缃�
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoPowerAop.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoPowerAop.java
new file mode 100644
index 0000000..a6a1747
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoPowerAop.java
@@ -0,0 +1,16 @@
+package com.dy.common.aop;
+
+import java.lang.annotation.*;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@Inherited
+public @interface SsoPowerAop {
+ String value() default "" ;
+ //浼樺厛绾�1(鏈�楂�)锛屽鏋滃叾鏈夊�硷紝鍒欎笉鍦ㄥ垽鏂互涓嬪彉閲忓彇鍊�
+ String power() default "" ;
+ //浼樺厛绾�2锛屾嫢鏈夊叏閮ㄦ潈闄愭墠鍙� , 濡傛灉鍏舵湁鍊硷紝鍒欎笉鍦ㄥ垽鏂互涓嬪彉閲忓彇鍊�
+ String[] ifAllPower() default{""} ;
+ //浼樺厛绾�3 , 濡傛灉鏈変竴涓潈闄愬嵆鍙� , 濡傛灉鍏舵湁鍊硷紝鍒欎笉鍦ㄥ垽鏂互涓嬪彉閲忓彇鍊�
+ String[] ifAnyPower() default{""} ;
+}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoPowerAspect.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoPowerAspect.java
new file mode 100644
index 0000000..a9423ed
--- /dev/null
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoPowerAspect.java
@@ -0,0 +1,141 @@
+package com.dy.common.aop;
+
+import com.dy.common.contant.Constant;
+import com.dy.common.multiDataSource.DataSourceContext;
+import com.dy.common.webFilter.UserTokenContext;
+import com.dy.common.webUtil.BaseResponseUtils;
+import com.mysql.cj.util.StringUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.annotation.Order;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+@Slf4j
+@Aspect
+@Order(Constant.AspectOrderSsoAutho)
+@Component
+public class SsoPowerAspect {
+
+ @Value("${pipIrr.global.dev}")
+ public String isDevStage ;//鏄惁涓哄紑鍙戦樁娈�
+
+ @Value("${pipIrr.sso.checkUrl}")
+ public String SsoCheckUrl ;
+
+ private RestTemplate restTemplate;
+
+ @Autowired
+ public void setRestTemplate(RestTemplate restTemplate){
+ this.restTemplate = restTemplate ;
+ }
+
+ @Pointcut("@annotation(com.dy.common.aop.SsoPowerAop)")
+ public void ssoPowerPointCut() {
+ }
+
+ @Around("ssoPowerPointCut()")
+ public Object execute(ProceedingJoinPoint point) throws Throwable {
+ if(isDevStage != null && !isDevStage.trim().equals("") && isDevStage.trim().equalsIgnoreCase("true")){
+ return point.proceed();
+ }else{
+ MethodSignature signature = (MethodSignature) point.getSignature();
+ Method method = signature.getMethod();
+ SsoPowerAop aop = method.getAnnotation(SsoPowerAop.class) ;
+ if (Objects.nonNull(aop)){
+ String power = aop.value() ;
+ if(power.trim().equals("")){
+ power = aop.power() ;
+ }
+ if(power.trim().equals("-1")){
+ //涓嶈繘琛岀櫥褰曞強鏉冮檺楠岃瘉
+ return point.proceed();
+ }else{
+ String[] allPower = aop.ifAllPower() ;
+ String[] anyPower = aop.ifAnyPower() ;
+ String token = UserTokenContext.get() ;
+ Object rObj = this.check(token, power, allPower, anyPower);
+ if(rObj != null){
+ if(rObj instanceof SsoVo ssoVo){
+ if(ssoVo.logined){
+ if(ssoVo.hasPower){
+ if(!StringUtils.isNullOrEmpty(ssoVo.dataSourceName)){
+ DataSourceContext.set(ssoVo.dataSourceName);
+ Object obj = point.proceed();
+ DataSourceContext.remove();
+ return obj ;
+ }else{
+ //鏃犳暟鎹簮
+ return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛屾湭寰楀埌褰撳墠鐧诲綍鐢ㄦ埛鎵�灞炴満鏋勬爣绛撅紙鏁版嵁婧愬悕锛�") ;
+ }
+ }else{
+ //鏃犳潈闄�
+ return BaseResponseUtils.buildNoPower() ;
+ }
+ }else{
+ //鏈櫥褰�
+ return BaseResponseUtils.buildToLogin() ;
+ }
+ }else{
+ return rObj ;
+ }
+ }else{
+ return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛宑heck鏂规硶杩斿洖null") ;
+ }
+ }
+ }else{
+ //宸茬粡杩涘叆娉ㄨВ澶勭悊浜嗭紝杩樺緱涓嶅埌娉ㄨВ锛岃繖绉嶆儏鍐垫槸涓嶅彲鑳界殑銆�
+ return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛孌yAop娉ㄨВ涓簄ull") ;
+ }
+ }
+ }
+
+ /**
+ * 璋冪敤SSO绯荤粺杩涜楠岃瘉
+ * @param token Header涓殑鐢ㄦ埛token
+ * @param power 涓�涓潈闄�
+ * @param allPower 澶氫釜鏉冮檺
+ * @param anyPower 澶氫釜鏉冮檺
+ * @return 杩斿洖瀵硅薄
+ */
+ private Object check(String token, String power, String[] allPower, String[] anyPower){
+ if(!StringUtils.isNullOrEmpty(SsoCheckUrl)){
+ String url = UriComponentsBuilder.fromUriString(SsoCheckUrl)
+ .queryParam("token", token)
+ .queryParam("power", power)
+ .queryParam("allPower", (Object) allPower)
+ .queryParam("anyPower", (Object) anyPower)
+ .build()
+ .toUriString();
+ // 鐢变簬鑾峰彇student鎺ュ彛鍜变滑璁剧疆浜哹asicauth锛屾墍浠ラ渶瑕佸湪璇锋眰鏃堕厤缃�
+ HttpHeaders headers = new HttpHeaders();
+ HttpEntity<?> httpEntity = new HttpEntity<>(headers);
+ ResponseEntity<SsoVo> response = null;
+ try {
+ // 閫氳繃Get鏂瑰紡璋冪敤鎺ュ彛
+ response = restTemplate.exchange(url, HttpMethod.GET, httpEntity, SsoVo.class);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ assert response != null;
+ return response.getBody();
+ }else {
+ return BaseResponseUtils.buildError("鍚庣绯荤粺鍑洪敊锛屾湭寰楀埌SsoCheckUrl");
+ }
+ }
+
+}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoVo.java
index abd8353..ef32cd4 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/aop/SsoVo.java
@@ -9,6 +9,6 @@
@Builder
public class SsoVo {
public boolean logined ;
- public boolean hasPower ;
+ public boolean hasPower ;//2023-12-21 缁忓晢璁紝鐢卞墠绔壌鏉冿紝鎵�浠ユ灞炴�т笉鍐嶅簲鐢�
public String dataSourceName ;
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java
index 2449b3b..d2f7afc 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/Command.java
@@ -24,7 +24,7 @@
public String id;
/**
- * 姘磋〃鍗忚鍚嶇О锛岃繖涓彲浠ヤ负绌猴紝鍥犱负姘磋〃涓婅鏁版嵁瑙ｆ瀽鍑哄崗璁悕绉帮紝鐒跺悗绯荤粺鎶婂崗璁悕绉颁繚瀛樺湪姘磋〃鏁版嵁璁板綍涓紝浠庢鍗忚鍚嶇О灏变笉鍐嶇┖浜�
+ * RTU鍗忚鍚嶇О锛岃繖涓彲浠ヤ负绌猴紝鍥犱负RTU涓婅鏁版嵁瑙ｆ瀽鍑哄崗璁悕绉帮紝鐒跺悗绯荤粺鎶婂崗璁悕绉颁繚瀛樺湪RTU鏁版嵁璁板綍涓紝浠庢鍗忚鍚嶇О灏变笉鍐嶇┖浜�
*/
public String protocol;
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java
index 0c2fd16..5cc2092 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CodeV1_0_1.java
@@ -3,17 +3,17 @@
public class CodeV1_0_1 {
//鍔熻兘鐮佷负瀛楃涓诧紝鍗佸叚杩涘埗鏁版嵁
public static final String cd_02 = "02" ;//閬ユ祴绔欓摼璺娴�
- public static final String cd_C0 = "C0" ;//閬ユ祴绔欒嚜鎶ュ疄鏃舵暟鎹�
+ public static final String cd_71 = "71" ;//鏌ヨ闃�闂ㄧ姸鎬侊紙鏉庡ぉ璧愬埗瀹氱殑鍗忚锛屽綋鍓嶆湭瀹炵幇锛�
public static final String cd_83 = "83" ;//閬ユ祴绔欏紑鍏抽榾鑷姤
public static final String cd_84 = "84" ;//寮�闃�宸ヤ綔鎶�
- public static final String cd_71 = "71" ;//鏌ヨ闃�闂ㄧ姸鎬�
+ public static final String cd_C0 = "C0" ;//閬ユ祴绔欒嚜鎶ュ疄鏃舵暟鎹�
public static String getCodeName(String code) {
String name = (code.equals(cd_02) ? "閾捐矾妫�娴�" :
- (code.equals(cd_C0) ? "鑷姤瀹炴椂鏁版嵁" :
+ (code.equals(cd_71) ? "鏌ヨ闃�闂ㄧ姸鎬�" :
(code.equals(cd_83) ? "寮�鍏抽榾鑷姤" :
(code.equals(cd_84) ? "寮�闃�宸ヤ綔鎶�" :
- (code.equals(cd_71) ? "鏌ヨ闃�闂ㄧ姸鎬�" :
+ (code.equals(cd_C0) ? "鑷姤瀹炴椂鏁版嵁" :
""))))) ;
return name ;
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
index c1b8d7f..1538331 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/CommonV1_0_1.java
@@ -145,6 +145,7 @@
case 7 -> "绱ф�ュ叧闃�";
case 8 -> "鐢ㄦ埛杩滅▼寮�闃�";
case 9 -> "鐢ㄦ埛杩滅▼鍏抽榾";
+ case 16 -> "绠￠亾鏃犳按鑷姩鍏抽榾";
default -> "鏈煡";
};
}
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83OpenVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83OpenVo.java
index 6b8da04..fdfadb7 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83OpenVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol/p206V1_0_0/DataCd83OpenVo.java
@@ -8,6 +8,7 @@
// 寮�鍏抽榾绫诲瀷锛�
// 1銆佸埛鍗″紑闃�锛�2鍒峰崱鍏抽榾锛�3銆佷腑蹇冪珯寮�闃�锛�4銆佷腑蹇冪珯鍏抽榾锛�5銆佹瑺璐瑰叧闃�锛�
// 6銆佹祦閲忚鏁呴殰鍏抽榾锛�7銆佺揣鎬ュ叧闃�锛�8銆佺敤鎴疯繙绋嬪紑闃�锛�9銆佺敤鎴疯繙绋嬪叧闃�锛�
+ // 16锛岀敤鎴峰紑闃�鍚庣閬撳唴娌℃湁姘达紝鑷姩鍏抽榾銆傜閬撲笉鍑烘按鑷姩鍏抽榾
public Byte type ;
public Double totalAmount; //绱娴侀噺锛�5瀛楄妭BCD鐮侊紝鍙栧�艰寖鍥�0~9999999999锛屽崟浣嶄负m3銆�
public String clientNum ;//鍐滄埛缂栧彿
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/HttpUtils.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/HttpUtils.java
index 633f940..04bd793 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/HttpUtils.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/util/HttpUtils.java
@@ -1,7 +1,7 @@
package com.dy.common.util;
-import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.X509Certificate;
@@ -36,18 +36,18 @@
/**
* get
*
- * @param host
- * @param path
- * @param headers
- * @param querys
- * @return
- * @throws Exception
+ * @param host 鏈嶅姟绔疷RI
+ * @param path 璇锋眰璺緞
+ * @param headers 璇锋眰澶�
+ * @param params 璇锋眰鍙傛暟
+ * @return HttpResponse鍝嶅簲
+ * @throws Exception 寮傚父
*/
public static HttpResponse doGet(String host, String path, Map<String, String> headers,
- Map<String, String> querys) throws Exception {
+ Map<String, String> params) throws Exception{
HttpClient httpClient = wrapClient(host);
- HttpGet request = new HttpGet(buildUrl(host, path, querys));
+ HttpGet request = new HttpGet(buildUrl(host, path, params));
if(headers != null){
for (Map.Entry<String, String> e : headers.entrySet()) {
request.addHeader(e.getKey(), e.getValue());
@@ -59,29 +59,29 @@
/**
* post form
- *
- * @param host
- * @param path
- * @param headers
- * @param querys
- * @param bodys
- * @return
- * @throws Exception
+ *
+ * @param host 鏈嶅姟绔疷RI
+ * @param path 璇锋眰璺緞
+ * @param headers 璇锋眰澶�
+ * @param params 璇锋眰鍙傛暟
+ * @param bodies 璇锋眰浣�
+ * @return HttpResponse鍝嶅簲
+ * @throws Exception 寮傚父
*/
public static HttpResponse doPost(String host, String path, Map<String, String> headers,
- Map<String, String> querys, Map<String, String> bodys) throws Exception {
+ Map<String, String> params, Map<String, String> bodies) throws Exception {
HttpClient httpClient = wrapClient(host);
- HttpPost request = new HttpPost(buildUrl(host, path, querys));
+ HttpPost request = new HttpPost(buildUrl(host, path, params));
for (Map.Entry<String, String> e : headers.entrySet()) {
request.addHeader(e.getKey(), e.getValue());
}
- if (bodys != null) {
- List<NameValuePair> nameValuePairList = new ArrayList<NameValuePair>();
+ if (bodies != null) {
+ List<NameValuePair> nameValuePairList = new ArrayList<>();
- for (String key : bodys.keySet()) {
- nameValuePairList.add(new BasicNameValuePair(key, bodys.get(key)));
+ for (String key : bodies.keySet()) {
+ nameValuePairList.add(new BasicNameValuePair(key, bodies.get(key)));
}
UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(nameValuePairList, "utf-8");
formEntity.setContentType("application/x-www-form-urlencoded; charset=UTF-8");
@@ -93,20 +93,20 @@
/**
* Post String
- *
- * @param host
- * @param path
- * @param headers
- * @param querys
- * @param body
- * @return
- * @throws Exception
+ *
+ * @param host 鏈嶅姟绔疷RI
+ * @param path 璇锋眰璺緞
+ * @param headers 璇锋眰澶�
+ * @param params 璇锋眰鍙傛暟
+ * @param body 璇锋眰浣�
+ * @return HttpResponse鍝嶅簲
+ * @throws Exception 寮傚父
*/
public static HttpResponse doPost(String host, String path, Map<String, String> headers,
- Map<String, String> querys, String body) throws Exception {
+ Map<String, String> params, String body) throws Exception {
HttpClient httpClient = wrapClient(host);
- HttpPost request = new HttpPost(buildUrl(host, path, querys));
+ HttpPost request = new HttpPost(buildUrl(host, path, params));
for (Map.Entry<String, String> e : headers.entrySet()) {
request.addHeader(e.getKey(), e.getValue());
}
@@ -120,20 +120,20 @@
/**
* Post stream
- *
- * @param host
- * @param path
- * @param headers
- * @param querys
- * @param body
- * @return
- * @throws Exception
+ *
+ * @param host 鏈嶅姟绔疷RI
+ * @param path 璇锋眰璺緞
+ * @param headers 璇锋眰澶�
+ * @param params 璇锋眰鍙傛暟
+ * @param body 璇锋眰浣�
+ * @return HttpResponse鍝嶅簲
+ * @throws Exception 寮傚父
*/
public static HttpResponse doPost(String host, String path, Map<String, String> headers,
- Map<String, String> querys, byte[] body) throws Exception {
+ Map<String, String> params, byte[] body) throws Exception {
HttpClient httpClient = wrapClient(host);
- HttpPost request = new HttpPost(buildUrl(host, path, querys));
+ HttpPost request = new HttpPost(buildUrl(host, path, params));
if(headers != null){
for (Map.Entry<String, String> e : headers.entrySet()) {
request.addHeader(e.getKey(), e.getValue());
@@ -149,20 +149,20 @@
/**
* Put String
- *
- * @param host
- * @param path
- * @param headers
- * @param querys
- * @param body
- * @return
- * @throws Exception
+ *
+ * @param host 鏈嶅姟绔疷RI
+ * @param path 璇锋眰璺緞
+ * @param headers 璇锋眰澶�
+ * @param params 璇锋眰鍙傛暟
+ * @param body 璇锋眰浣�
+ * @return HttpResponse鍝嶅簲
+ * @throws Exception 寮傚父
*/
public static HttpResponse doPut(String host, String path, Map<String, String> headers,
- Map<String, String> querys, String body) throws Exception {
+ Map<String, String> params, String body) throws Exception {
HttpClient httpClient = wrapClient(host);
- HttpPut request = new HttpPut(buildUrl(host, path, querys));
+ HttpPut request = new HttpPut(buildUrl(host, path, params));
for (Map.Entry<String, String> e : headers.entrySet()) {
request.addHeader(e.getKey(), e.getValue());
}
@@ -176,20 +176,20 @@
/**
* Put stream
- *
- * @param host
- * @param path
- * @param headers
- * @param querys
- * @param body
- * @return
- * @throws Exception
+ *
+ * @param host 鏈嶅姟绔疷RI
+ * @param path 璇锋眰璺緞
+ * @param headers 璇锋眰澶�
+ * @param params 璇锋眰鍙傛暟
+ * @param body 璇锋眰浣�
+ * @return HttpResponse鍝嶅簲
+ * @throws Exception 寮傚父
*/
public static HttpResponse doPut(String host, String path, Map<String, String> headers,
- Map<String, String> querys, byte[] body) throws Exception {
+ Map<String, String> params, byte[] body) throws Exception {
HttpClient httpClient = wrapClient(host);
- HttpPut request = new HttpPut(buildUrl(host, path, querys));
+ HttpPut request = new HttpPut(buildUrl(host, path, params));
for (Map.Entry<String, String> e : headers.entrySet()) {
request.addHeader(e.getKey(), e.getValue());
}
@@ -203,19 +203,19 @@
/**
* Delete
- *
- * @param host
- * @param path
- * @param headers
- * @param querys
- * @return
- * @throws Exception
+ *
+ * @param host 鏈嶅姟绔疷RI
+ * @param path 璇锋眰璺緞
+ * @param headers 璇锋眰澶�
+ * @param params 璇锋眰鍙傛暟
+ * @return HttpResponse鍝嶅簲
+ * @throws Exception 寮傚父
*/
public static HttpResponse doDelete(String host, String path, Map<String, String> headers,
- Map<String, String> querys) throws Exception {
+ Map<String, String> params) throws Exception {
HttpClient httpClient = wrapClient(host);
- HttpDelete request = new HttpDelete(buildUrl(host, path, querys));
+ HttpDelete request = new HttpDelete(buildUrl(host, path, params));
for (Map.Entry<String, String> e : headers.entrySet()) {
request.addHeader(e.getKey(), e.getValue());
}
@@ -223,16 +223,15 @@
return httpClient.execute(request);
}
- private static String buildUrl(String host, String path, Map<String, String> querys)
- throws UnsupportedEncodingException {
+ private static String buildUrl(String host, String path, Map<String, String> params) {
StringBuilder sbUrl = new StringBuilder();
sbUrl.append(host);
if (!StringUtils.isBlank(path)) {
sbUrl.append(path);
}
- if (null != querys) {
+ if (null != params) {
StringBuilder sbQuery = new StringBuilder();
- for (Map.Entry<String, String> query : querys.entrySet()) {
+ for (Map.Entry<String, String> query : params.entrySet()) {
if (0 < sbQuery.length()) {
sbQuery.append("&");
}
@@ -243,7 +242,7 @@
sbQuery.append(query.getKey());
if (!StringUtils.isBlank(query.getValue())) {
sbQuery.append("=");
- sbQuery.append(URLEncoder.encode(query.getValue(), "utf-8"));
+ sbQuery.append(URLEncoder.encode(query.getValue(), StandardCharsets.UTF_8));
}
}
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/TcpSessionCache.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/TcpSessionCache.java
index 39577db..e23c8fd 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/TcpSessionCache.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/forTcp/TcpSessionCache.java
@@ -4,7 +4,6 @@
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.HashMap;
-import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map.Entry;
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuUpTask.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuUpTask.java
index cce0aeb..7415685 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuUpTask.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/tasks/RtuUpTask.java
@@ -74,7 +74,7 @@
//缂撳瓨session
TcpSessionCache.putNewTcpSession(rtuAddr, protocolName, session);
- log.info("RTU(鍦板潃锛�" + rtuAddr + ")涓婄嚎浜嗐��") ;
+ log.info("RTU(鍦板潃锛�" + rtuAddr + "锛屽崗璁細" + protocolName + ")涓婄嚎浜嗐��") ;
}
}
}
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/web/com/CommandCtrl.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/web/com/CommandCtrl.java
new file mode 100644
index 0000000..454c899
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/web/com/CommandCtrl.java
@@ -0,0 +1,30 @@
+package com.dy.aceMw.web.com;
+
+import com.dy.common.mw.protocol.Command;
+import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.BaseResponseUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * @Author liurunyu
+ * @Date 2023/12/21 13:58
+ * @LastEditTime 2023/12/21 13:58
+ * @Description
+ */
+@Slf4j
+@RestController
+@RequestMapping(path="com")
+@SuppressWarnings("unchecked")//java鐗堟湰瓒婇珮锛屽娉涘瀷绾︽潫瓒婁弗锛屾墍浠ラ厤缃甋uppressWarnings("unchecked")
+public class CommandCtrl {
+
+ @PostMapping(path = "send", consumes = MediaType.APPLICATION_JSON_VALUE)
+ public BaseResponse<Command> send(@RequestBody Command com) {
+ return BaseResponseUtils.buildSuccess(com);
+ }
+}
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
index afcf8ab..942eba6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/block/BlockCtrl.java
@@ -51,7 +51,7 @@
)
})
@GetMapping(path = "all")
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<BaBlock>>> all(){
try {
QueryResultVo<List<BaBlock>> res = this.sv.selectAll() ;
@@ -76,7 +76,7 @@
)
})
@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<BaBlock>>> some(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
try {
QueryResultVo<List<BaBlock>> res = this.sv.selectSome(vo) ;
@@ -101,7 +101,7 @@
)
})
@GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<BaBlock> one(@Parameter(description = "瀹炰綋id", required = true) Long id){
return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
}
@@ -121,7 +121,7 @@
)
})
@PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> save(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaBlock po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -156,7 +156,7 @@
)
})
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaBlock po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -194,7 +194,7 @@
)
})
@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> delete(@Parameter(description = "瀹炰綋id", required = true) Long id){
if(id == null){
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/ClientCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/ClientCtrl.java
index 24d5e8b..b3967ff 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/ClientCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/client/ClientCtrl.java
@@ -52,7 +52,7 @@
)
})
@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<BaClient>>> some(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
try {
QueryResultVo<List<BaClient>> res = this.sv.selectSome(vo) ;
@@ -77,7 +77,7 @@
)
})
@GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<BaClient> one(@Parameter(description = "瀹炰綋id", required = true) Long id){
return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
}
@@ -97,7 +97,7 @@
)
})
@PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> save(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaClient po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -132,7 +132,7 @@
)
})
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaClient po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -170,7 +170,7 @@
)
})
@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> delete(@Parameter(description = "瀹炰綋id", required = true) Long id){
if(id == null){
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/ClientTypeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/ClientTypeCtrl.java
index f93d252..74829e8 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/ClientTypeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/clientType/ClientTypeCtrl.java
@@ -53,7 +53,7 @@
)
})
@GetMapping(path = "all")
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<BaClientType>>> all(){
try {
QueryResultVo<List<BaClientType>> res = this.sv.selectAll() ;
@@ -78,7 +78,7 @@
)
})
@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<BaClientType>>> some(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) @Valid QueryVo vo){
try {
QueryResultVo<List<BaClientType>> res = this.sv.selectSome(vo) ;
@@ -103,7 +103,7 @@
)
})
@GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<BaClientType> one(@Parameter(description = "瀹炰綋id", required = true) Long id){
return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
}
@@ -123,7 +123,7 @@
)
})
@PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> save(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaClientType po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -158,7 +158,7 @@
)
})
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaClientType po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -196,7 +196,7 @@
)
})
@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> delete(@Parameter(description = "瀹炰綋id", required = true) Long id){
if(id == null){
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
index 5b9fafe..68d6bf0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java
@@ -21,7 +21,6 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
-import java.util.Arrays;
import java.util.List;
import java.util.Objects;
@@ -72,7 +71,7 @@
)
})
@GetMapping(path = "all")
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<List<BaDistrict>> all(){
List<BaDistrict> list = this.sv.selectAllByLevel(DistrictLevel.City.code) ;
return BaseResponseUtils.buildSuccess(list);
@@ -92,7 +91,7 @@
)
})
@GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<BaDistrict> one(@Parameter(description = "瀹炰綋id", required = true) Long id){
return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
}
@@ -112,7 +111,7 @@
)
})
@PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> save(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DistrictVo vo, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -154,7 +153,7 @@
)
})
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DistrictVo vo, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -190,7 +189,7 @@
)
})
@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> delete(@Parameter(description = "瀹炰綋id", required = true) Long id){
if(id == null){
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideCtrl.java
index c2ff506..8256285 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/divide/DivideCtrl.java
@@ -50,7 +50,7 @@
)
})
@GetMapping(path = "all")
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<BaDivide>>> all(){
try {
QueryResultVo<List<BaDivide>> res = this.sv.selectAll() ;
@@ -75,7 +75,7 @@
)
})
@GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<BaDivide> one(@Parameter(description = "瀹炰綋id", required = true) Long id){
return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
}
@@ -93,7 +93,7 @@
)
})
@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<BaDivide>>> some(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) DivideVo vo){
try {
QueryResultVo<List<BaDivide>> res = this.sv.selectSome(vo) ;
@@ -119,7 +119,7 @@
)
})
@PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> save(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaDivide po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -153,7 +153,7 @@
)
})
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaDivide po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -191,7 +191,7 @@
)
})
@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> delete(@Parameter(description = "瀹炰綋id", required = true) Long id){
if(id == null){
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
index 013d155..67f1606 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/role/RoleCtrl.java
@@ -58,7 +58,7 @@
)
})
@GetMapping(path = "all")
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<BaRole>>> all(){
try {
QueryResultVo<List<BaRole>> res = this.sv.selectAll() ;
@@ -83,7 +83,7 @@
)
})
@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<BaRole>>> some(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) @Valid QueryVo vo){
try {
QueryResultVo<List<BaRole>> res = this.sv.selectSome(vo) ;
@@ -108,7 +108,7 @@
)
})
@GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<BaRole> one(@Parameter(description = "瀹炰綋id", required = true) Long id){
return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
}
@@ -128,7 +128,7 @@
)
})
@PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> save(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaRole po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -164,7 +164,7 @@
)
})
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaRole po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -204,7 +204,7 @@
)
})
@GetMapping(path = "setPrivs", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> setPrivileges(@Parameter(description = "瀹炰綋id", required = true) Long id,
@Parameter(description = "鏉冮檺id鏁扮粍") Long[] privIds){
Long[] privIds_lg = null ;
@@ -238,7 +238,7 @@
)
})
@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> delete(@Parameter(description = "瀹炰綋id", required = true) Long id){
if(id == null){
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
@@ -268,7 +268,7 @@
})
@PostMapping(path = "addPermissions", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> permission(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaRolePermissions po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
index ffe2d73..01659c6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/user/UserCtrl.java
@@ -89,7 +89,7 @@
)
})
@PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<BaUser>>> some(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) @Valid QueryVo vo) {
try {
QueryResultVo<List<BaUser>> res = this.sv.selectSome(vo);
@@ -115,7 +115,7 @@
)
})
@GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<BaUser> one(@Parameter(description = "瀹炰綋id", required = true) String id) {
return BaseResponseUtils.buildSuccess(this.sv.selectById(Long.parseLong(id)));
}
@@ -136,7 +136,7 @@
)
})
@PostMapping(path = "save", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> save(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaUser po, @Parameter(hidden = true) BindingResult bindingResult) {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -186,7 +186,7 @@
)
})
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid BaUser po, @Parameter(hidden = true) BindingResult bindingResult) {
if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -229,7 +229,7 @@
)
})
@GetMapping(path = "changePassword", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> changePassword(@Parameter(description = "瀹炰綋id", required = true) String id,
@Parameter(description = "鏃у瘑鐮�", required = true) String oldPassword,
@Parameter(description = "鏂板瘑鐮�", required = true) String newPassword) throws Exception {
@@ -289,7 +289,7 @@
)
})
@PostMapping(path = "resetPassword", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> resetPassword(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) ResetPasswordVo vo) throws Exception {
if (vo.id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
@@ -331,7 +331,7 @@
)
})
@GetMapping(path = "resetPasswordByDefault", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> resetPasswordByDefault(@Parameter(description = "瀹炰綋id", required = true) String id) throws Exception {
if (id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
@@ -374,7 +374,7 @@
)
})
@GetMapping(path = "resetPasswordByRandom", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<String> resetPasswordByRandom(@Parameter(description = "瀹炰綋id", required = true) String id) throws Exception {
if (id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
@@ -419,7 +419,7 @@
)
})
@GetMapping(path = "setRoles", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> setRoles(@Parameter(description = "瀹炰綋id", required = true) String id,
@Parameter(description = "瑙掕壊id鏁扮粍") String[] roleIds) {
Long[] roleId_lg = null;
@@ -456,7 +456,7 @@
)
})
@GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> delete(@Parameter(description = "瀹炰綋id", required = true) String id) {
if (id == null) {
return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖");
@@ -490,7 +490,7 @@
)
})
@GetMapping("/getUserInfos/{userId}")
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<VoUserInfo>>> getUserInfos(@PathVariable("userId") Long userId) {
try {
List<VoUserInfo> res = this.sv.getUserInfos(userId);
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
index 93193ff..989cf44 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
@@ -62,7 +62,7 @@
)
})
@GetMapping(path = "/getDivides", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<VoDivide>>> getDivides(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
try {
QueryResultVo<List<VoDivide>> res = divideSv.getDivides(vo);
@@ -84,7 +84,7 @@
})
@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()//@SsoAop(power = "-1")
public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid PrDivide po, @Parameter(hidden = true) BindingResult bindingResult){
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
if(bindingResult != null && bindingResult.hasErrors()){
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
index d04a1e2..68de44c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/activeCard/ActiveCardCtrl.java
@@ -59,7 +59,7 @@
)
})
@GetMapping(path = "/getActiveCards", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<VoActiveCard>>> getActiveCards(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
try {
QueryResultVo<List<VoActiveCard>> res = activeCardSv.getActiveCards(vo);
@@ -81,7 +81,7 @@
})
@PostMapping(path = "add_active", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> add_active(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoActiveCard po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -208,7 +208,7 @@
})
@PostMapping(path = "add_reissue", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> add_reissue(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoActiveCard po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java
index d320e2a..726052e 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/cancel/CancelCtrl.java
@@ -55,7 +55,7 @@
)
})
@GetMapping(path = "/getCancels", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<VoCancel>>> getCancels(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
try {
QueryResultVo<List<VoCancel>> res = cancelSv.getCancels(vo);
@@ -77,7 +77,7 @@
})
@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoCancel po, @Parameter(hidden = true) BindingResult bindingResult){
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
if(bindingResult != null && bindingResult.hasErrors()){
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java
index a6b337b..3e51765 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/loss/LossCtrl.java
@@ -54,7 +54,7 @@
)
})
@GetMapping(path = "/getLosses", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<VoLoss>>> getLosses(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
try {
QueryResultVo<List<VoLoss>> res = lossSv.getLosses(vo);
@@ -76,7 +76,7 @@
})
@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoLoss po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/paymentMethod/PaymentMethodCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/paymentMethod/PaymentMethodCtrl.java
index 39d717a..611e44c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/paymentMethod/PaymentMethodCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/paymentMethod/PaymentMethodCtrl.java
@@ -46,7 +46,7 @@
)
})
@GetMapping(path = "/get")
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<SePaymentMethod>>> getPaymentMethods(){
try {
QueryResultVo<List<SePaymentMethod>> res = paymentMethodSv.getPaymentMethods();
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java
index 3114323..fe123c5 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/recharge/RechargeCtrl.java
@@ -48,7 +48,7 @@
)
})
@GetMapping(path = "/getRecharges", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<VoRecharge>>> get(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
try {
QueryResultVo<List<VoRecharge>> res = rechargeSv.getRecharges(vo);
@@ -70,7 +70,7 @@
})
@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoRecharge po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java
index f21dbd5..9322334 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/reversal/ReversalCtrl.java
@@ -54,7 +54,7 @@
)
})
@GetMapping(path = "/getReversals", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<VoReversal>>> getReversals(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
try {
QueryResultVo<List<VoReversal>> res = reversalSv.getReversals(vo);
@@ -76,7 +76,7 @@
})
@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoReversal po, @Parameter(hidden = true) BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockCtrl.java
index 5af9f24..a9242eb 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/unlock/UnlockCtrl.java
@@ -55,7 +55,7 @@
)
})
@GetMapping(path = "/getUnlocks", consumes = MediaType.APPLICATION_JSON_VALUE)
- @SsoAop("-1")
+ @SsoAop()
public BaseResponse<QueryResultVo<List<VoUnlock>>> getUnlocks(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
try {
QueryResultVo<List<VoUnlock>> res = unlockSv.getUnlocks(vo);
@@ -77,7 +77,7 @@
})
@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoUnlock po, @Parameter(hidden = true) BindingResult bindingResult){
DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
if(bindingResult != null && bindingResult.hasErrors()){
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletCtrl.java
index 0e6d4a6..d45bf72 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sell/src/main/java/com/dy/pipIrrSell/wallet/WalletCtrl.java
@@ -52,7 +52,7 @@
})
@PostMapping(path = "add")
@Transactional(rollbackFor = Exception.class)
- @SsoAop("-1")//@SsoAop(power = "-1")
+ @SsoAop()
//public BaseResponse<Boolean> add(@RequestBody Long clientId){
public BaseResponse<Boolean> add(@RequestParam("clientId") @NotNull(message = "鍐滄埛缂栧彿涓嶈兘涓虹┖") Long clientId){
if(clientId == null || clientId < 0) {
@@ -82,7 +82,7 @@
//})
//@PostMapping(path = "addRecharge")
//@Transactional(rollbackFor = Exception.class)
- //@SsoAop("-1")//@SsoAop(power = "-1")
+ //@SsoAop()
//public BaseResponse<Boolean> addRecharge(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid DtoWalletRecharge po, @Parameter(hidden = true) BindingResult bindingResult){
// DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
// if(bindingResult != null && bindingResult.hasErrors()){
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 2f7571a..07c5702 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
@@ -232,7 +232,27 @@
BaUser userPo = this.sv.getByUuid(token) ;
return userPo == null ? null : userPo.id ;
}
-
+ /**
+ * 姝ゆ柟娉曚緵瀛愭ā鍧楃郴缁熻皟鐢紝鎵�浠ヤ笉鍏紑鍦ˋPI鎺ュ彛涓�
+ * 鏂规硶鍔熻兘锛氶獙璇佹槸鍚﹀凡缁忕櫥褰�
+ * @param token 鐧诲綍鐢ㄦ埛token
+ * @return SsoVo
+ */
+ @Hidden
+ @GetMapping(path = "ssoCheck")
+ public SsoVo ssoCheck(String token){
+ BaUser userPo = this.sv.getByUuid(token) ;
+ SsoVo vo = new SsoVo();
+ if(userPo != null){
+ vo.dataSourceName = userPo.orgTag ;
+ vo.logined = true ;
+ vo.hasPower = true ;//榛樿鏈夋潈闄�
+ }else{
+ vo.logined = false ;
+ vo.hasPower = true ;//榛樿鏈夋潈闄�
+ }
+ return vo ;
+ }
/**
* 姝ゆ柟娉曚緵瀛愭ā鍧楃郴缁熻皟鐢紝鎵�浠ヤ笉鍏紑鍦ˋPI鎺ュ彛涓�
* 鏂规硶鍔熻兘锛氶獙璇佹槸鍚﹀凡缁忕櫥褰曪紝濡傛灉鐧诲綍浜嗭紝鍐嶉獙璇佹潈闄�
@@ -243,8 +263,8 @@
* @return SsoVo
*/
@Hidden
- @GetMapping(path = "ssoCheck")
- public SsoVo ssoCheck(String token, String privilege, String[] allPrivilege, String[] anyPrivilege){
+ @GetMapping(path = "ssoPowerCheck")
+ public SsoVo ssoPowerCheck(String token, String privilege, String[] allPrivilege, String[] anyPrivilege){
BaUser userPo = this.sv.getByUuid(token) ;
SsoVo vo = new SsoVo();
if(userPo != null){
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/UserVo.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/UserVo.java
index d4408db..4afdae6 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/UserVo.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/UserVo.java
@@ -11,6 +11,9 @@
@Builder
@Schema(name = "鐧诲綍鐢ㄦ埛鍊煎璞�")
public class UserVo {
+ @Schema(description = "鐢ㄦ埛id")
+ public String id ;//鐢ㄦ埛id
+
@Schema(description = "濮撳悕")
public String name ;//鐢ㄦ埛濮撳悕
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/UserVoMapper.java b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/UserVoMapper.java
index f90c8f3..ef6d03b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/UserVoMapper.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/UserVoMapper.java
@@ -15,6 +15,7 @@
* @param po
* @return
*/
+ @Mapping(target = "id", source = "id")
@Mapping(target = "name", source = "name")
@Mapping(target = "phone", source = "phone")
@Mapping(target = "token", ignore=true)
--
Gitblit v1.8.0