From 0aff5bb92375038af4d634c7fbe1459b979b45a3 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 27 十一月 2023 20:01:37 +0800
Subject: [PATCH] 修改枚举类型转json问题
---
/dev/null | 0
pipIrr-platform/pipIrr-web/pipIrr-web-base/src/main/java/com/dy/pipIrrBase/district/DistrictCtrl.java | 2 +-
pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 2 +-
pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiResponseVo.java | 37 ++++++++++++++++++++-----------------
pipIrr-platform/pipIrr-mw/pom.xml | 1 +
5 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiResponseVo.java b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiResponseVo.java
index c076cea..853f77d 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiResponseVo.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mwTest-server/src/main/java/com/dy/testServer/forRmi/RmiResponseVo.java
@@ -14,8 +14,8 @@
/**
* 瀵硅薄杞垚json
- * @return
- * @throws Exception
+ * @return json
+ * @throws Exception 寮傚父
*/
public String toJson()throws Exception{
try{
@@ -29,8 +29,8 @@
* json杞垚瀵硅薄
* @param json
* @param clazz
- * @return
- * @throws Exception
+ * @return 瀵硅薄
+ * @throws Exception 寮傚父
*/
public static RmiResponseVo jsonToObject(String json, Class<?> clazz)throws Exception{
try{
@@ -44,22 +44,26 @@
}
}
+ public boolean isSuccess() {
+ return success;
+ }
+
+ public void setSuccess(boolean success) {
+ this.success = success;
+ }
+
+ public String getErrorInfo() {
+ return errorInfo;
+ }
+
+ public void setErrorInfo(String errorInfo) {
+ this.errorInfo = errorInfo;
+ }
+
public String getCode() {
return code;
}
- public boolean isSuccess() {
- return success;
- }
- public void setSuccess(boolean success) {
- this.success = success;
- }
- public String getErrorInfo() {
- return errorInfo;
- }
- public void setErrorInfo(String errorInfo) {
- this.errorInfo = errorInfo;
- }
public void setCode(String code) {
this.code = code;
}
@@ -71,5 +75,4 @@
public void setObj(Object obj) {
this.obj = obj;
}
-
}
diff --git a/pipIrr-platform/pipIrr-mw/pom.xml b/pipIrr-platform/pipIrr-mw/pom.xml
index 57010d3..9ce1ec9 100644
--- a/pipIrr-platform/pipIrr-mw/pom.xml
+++ b/pipIrr-platform/pipIrr-mw/pom.xml
@@ -17,6 +17,7 @@
<modules>
<module>pipIrr-mw-accept</module>
<module>pipIrr-mwTest-server</module>
+ <module>pipIrr-mwTest-client</module>
</modules>
<dependencies>
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 fd580ed..5b9fafe 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
@@ -55,7 +55,7 @@
@GetMapping(path = "allLevel")
public BaseResponse<List<DistrictLevel>> allDistrictLevels(){
//List<DistrictLevel> list = Arrays.asList(DistrictLevel.City, DistrictLevel.County, DistrictLevel.Town, DistrictLevel.Village) ;
- return BaseResponseUtils.buildSuccess(DistrictLevel.ObjMap);
+ return BaseResponseUtils.buildSuccess(DistrictLevel.LevelList);
}
/**
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 e90a82b..2f7571a 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
@@ -73,7 +73,7 @@
@GetMapping(path = "allOrg")
public BaseResponse<List<Org>> allOrg(){
//List<Org> list = Arrays.asList(Org.Ym, Org.Pj) ;
- return BaseResponseUtils.buildSuccess(Org.ObjMap);
+ return BaseResponseUtils.buildSuccess(Org.OrgList);
}
/**
diff --git "a/pipIrr-platform/\346\226\207\346\241\243/~$pIrr\346\216\245\345\217\243.docx" "b/pipIrr-platform/\346\226\207\346\241\243/~$pIrr\346\216\245\345\217\243.docx"
deleted file mode 100644
index 3e3ec77..0000000
--- "a/pipIrr-platform/\346\226\207\346\241\243/~$pIrr\346\216\245\345\217\243.docx"
+++ /dev/null
Binary files differ
--
Gitblit v1.8.0