From 85f968c63cadfe780120deb4b77b8239037d6082 Mon Sep 17 00:00:00 2001
From: 杜洪波 <1074825718@qq.com>
Date: 星期五, 27 三月 2026 10:16:28 +0800
Subject: [PATCH] 用户中心客户代码提交

---
 src/main/java/com/product/saas/controller/SaasClientController.java |   64 ++++++++++++++++++++++++++++++--
 1 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/product/saas/controller/SaasClientController.java b/src/main/java/com/product/saas/controller/SaasClientController.java
index 516a00c..8d96935 100644
--- a/src/main/java/com/product/saas/controller/SaasClientController.java
+++ b/src/main/java/com/product/saas/controller/SaasClientController.java
@@ -9,10 +9,13 @@
 import com.product.admin.config.SystemCode;
 import com.product.core.controller.support.AbstractBaseController;
 import com.product.core.entity.FieldSetEntity;
+import com.product.core.exception.BaseException;
+import com.product.core.spring.context.SpringMVCContextHolder;
 import com.product.module.sys.version.ApiVersion;
 import com.product.saas.config.SaasCode;
 import com.product.saas.config.SaasConst;
 import com.product.saas.service.SaasClientService;
+import com.product.saas.service.idel.ISaasClientService;
 import com.product.util.BaseUtil;
 
 /**
@@ -40,14 +43,17 @@
 				return error(SystemCode.SYSTEM_CPAGES_NOT_NULL.getValue(), SystemCode.SYSTEM_CPAGES_NOT_NULL.getText());
 			}
 			return OK_List(saasClientService.listClient(fse));
+		} catch (BaseException e) {
+			e.printStackTrace();
+			return error(e);
 		} catch (Exception e) {
 			e.printStackTrace();
-			return error(SaasCode.TENANT_INFO_GET_LIST_FAIL.getValue(), SaasCode.TENANT_INFO_GET_LIST_FAIL.getText() + e.getMessage());
+			return error(SaasCode.CLIENT_INFO_GET_LIST_FAIL.getValue(), SaasCode.CLIENT_INFO_GET_LIST_FAIL.getText() + e.getMessage());
 		}
 	}
 	
 	/**
-	 * 	绉熸埛鍒楄〃
+	 * 	绉熸埛璇︽儏
 	 * @param request
 	 * @return
 	 */
@@ -57,12 +63,62 @@
 		try {
 			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, SaasConst.PRODUCT_SYS_CLIENTS);
 			if(BaseUtil.strIsNull(fse.getUUID())) {
-				return error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
+				fse.setValue("uuid", SpringMVCContextHolder.getCurrentUser().getClient_uuid());
+//				return error(SystemCode.SYSTEM_FORM_COUNT.getValue(), SystemCode.SYSTEM_FORM_COUNT.getText());
 			}
 			return OK_List(saasClientService.findClient(fse.getUUID()));
+		} catch (BaseException e) {
+			e.printStackTrace();
+			return error(e);
 		} catch (Exception e) {
 			e.printStackTrace();
-			return error(SaasCode.TENANT_INFO_GET_LIST_FAIL.getValue(), SaasCode.TENANT_INFO_GET_LIST_FAIL.getText() + e.getMessage());
+			return error(SaasCode.CLIENT_INFO_GET_DETAIL_FAIL.getValue(), SaasCode.CLIENT_INFO_GET_DETAIL_FAIL.getText() + e.getMessage());
+		}
+	}
+	
+	/**
+	 *  绉熸埛淇℃伅鍙樻洿鍒楄〃
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping("/list-client-change/{version}")
+	@ApiVersion(1)
+	public String listClientChange(HttpServletRequest request) {
+		try {
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, SaasConst.PRODUCT_SYS_TENANT_CHANGE);
+			
+			return OK_List(saasClientService.listClientChange(fse));
+		} catch (BaseException e) {
+			e.printStackTrace();
+			return error(e);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return error(SaasCode.CLIENT_CHANGE_GET_LIST_FAIL.getValue(), SaasCode.CLIENT_CHANGE_GET_LIST_FAIL.getText() + e.getMessage());
+		}
+	}
+	
+	/**
+	 *  绉熸埛淇℃伅鍙樻洿杩涚▼
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping("/change-process/{version}")
+	@ApiVersion(1)
+	public String clientChangeProcess(HttpServletRequest request) {
+		try {
+			FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, SaasConst.PRODUCT_SYS_TENANT_CHANGE);
+			ISaasClientService service = (ISaasClientService)getProxyInstance(saasClientService);
+			boolean succ = service.clientChangeProcess(fse);
+			if (succ) {
+				return OK();
+			}
+			return error(SaasCode.CLIENT_CHANGE_CONFIRM_SAVEFAIL.getValue(), SaasCode.CLIENT_CHANGE_CONFIRM_SAVEFAIL.getText());
+		} catch (BaseException e) {
+			e.printStackTrace();
+			return error(e);
+		} catch (Exception e) {
+			e.printStackTrace();
+			return error(SaasCode.CLIENT_CHANGE_CONFIRM_FAIL.getValue(), SaasCode.CLIENT_CHANGE_CONFIRM_FAIL.getText() + e.getMessage());
 		}
 	}
 }

--
Gitblit v1.9.2