| src/main/java/com/product/saas/config/SaasCode.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/product/saas/config/SaasConst.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/product/saas/controller/SaasClientController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/product/saas/controller/SystemContractController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/product/saas/controller/TenantContractController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/product/saas/service/SaasClientService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/product/saas/service/TenantContractService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/product/saas/service/idel/ISaasClientService.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/product/saas/config/SaasCode.java
@@ -24,7 +24,15 @@ TENANT_APPLY_LICENSE_FILE_COPY_FAIL("ç§æ·ç³è¯·Licenseæä»¶COPY失败", 11), // ç§æ·ä¿¡æ¯ TENANT_INFO_GET_LIST_FAIL("ç§æ·ä¿¡æ¯å表æ¥è¯¢å¤±è´¥", 12), CLIENT_INFO_GET_LIST_FAIL("ç§æ·ä¿¡æ¯å表æ¥è¯¢å¤±è´¥ï¼", 12), CLIENT_INFO_GET_DETAIL_FAIL("ç§æ·ä¿¡æ¯è¯¦æ æ¥è¯¢å¤±è´¥ï¼", 13), CLIENT_CHANGE_GET_LIST_FAIL("ç§æ·åæ´å表æ¥è¯¢å¤±è´¥ï¼", 14), CLIENT_CHANGE_CONFIRM_FAIL("ç§æ·åæ´ç¡®è®¤ä¿å失败ï¼", 15), CLIENT_CHANGE_CONFIRM_SAVEFAIL("ç§æ·åæ´ç¡®è®¤ä¿å失败ï¼", 16), // ç§æ·åå CLIENT_CONTRACT_GET_LIST_FAIL("ç§æ·ååå表æ¥è¯¢å¤±è´¥ï¼", 17), CLIENT_CONTRACT_GET_FIND_FAIL("ç§æ·ååè¯¦æ æ¥è¯¢å¤±è´¥ï¼", 18), ; private String text; src/main/java/com/product/saas/config/SaasConst.java
@@ -11,6 +11,7 @@ public static final String PRODUCT_SYS_TENANT_APPLY = "product_sys_tenant_apply"; public static final String PRODUCT_SYS_CLIENTS = "product_sys_clients"; public static final String PRODUCT_SYS_CONTRACT = "product_sys_contract"; public static final String PRODUCT_SYS_TENANT_CHANGE = "product_sys_tenant_change"; //åæ®µå¸¸é } 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()); } } } src/main/java/com/product/saas/controller/SystemContractController.java
ÎļþÒÑɾ³ý src/main/java/com/product/saas/controller/TenantContractController.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,65 @@ package com.product.saas.controller; import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.product.saas.config.SaasCode; import com.product.saas.config.SaasConst; import com.product.saas.service.TenantContractService; import com.product.core.controller.support.AbstractBaseController; import com.product.core.entity.FieldSetEntity; import com.product.core.exception.BaseException; import com.product.module.sys.version.ApiVersion; import com.product.util.BaseUtil; @RequestMapping("/api/tenant-contract") @RestController public class TenantContractController extends AbstractBaseController{ @Autowired TenantContractService tenantContractService; /** * è·åååä¿¡æ¯ * @param request * @return */ @RequestMapping("/list-contract/{version}") @ApiVersion(1) public String listContract(HttpServletRequest request){ try { FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, SaasConst.PRODUCT_SYS_CONTRACT); return OK_List(tenantContractService.listContract(fse)); } catch (BaseException e) { e.printStackTrace(); return this.error(e); }catch (Exception e){ e.printStackTrace(); return error(SaasCode.CLIENT_CONTRACT_GET_LIST_FAIL.getValue(), SaasCode.CLIENT_CONTRACT_GET_LIST_FAIL.getText()+e.getMessage()); } } /** * è·åç§æ·ææ°ååä¿¡æ¯ * @param request * @return */ @RequestMapping("/find-contract/{version}") @ApiVersion(1) public String findContract(HttpServletRequest request){ try { FieldSetEntity fse = BaseUtil.getFieldSetEntity(request, SaasConst.PRODUCT_SYS_CONTRACT); return OK_List(tenantContractService.findContract(fse.getString("uuid"))); } catch (BaseException e) { e.printStackTrace(); return this.error(e); }catch (Exception e){ e.printStackTrace(); return error(SaasCode.CLIENT_CONTRACT_GET_FIND_FAIL.getValue(), SaasCode.CLIENT_CONTRACT_GET_FIND_FAIL.getText()+e.getMessage()); } } } src/main/java/com/product/saas/service/SaasClientService.java
@@ -11,7 +11,9 @@ import com.product.core.entity.FieldSetEntity; import com.product.core.service.support.AbstractBaseService; import com.product.core.spring.context.SpringMVCContextHolder; import com.product.core.transfer.Transactional; import com.product.module.sys.entity.SystemUser; import com.product.saas.service.idel.ISaasClientService; import com.product.util.BaseUtil; /** @@ -19,7 +21,7 @@ * */ @Service public class SaasClientService extends AbstractBaseService{ public class SaasClientService extends AbstractBaseService implements ISaasClientService{ @Autowired BaseDao baseDao; @@ -34,7 +36,7 @@ if (user == null) { return null; } List<Object> param = new ArrayList<>();; List<Object> param = new ArrayList<>(); StringBuilder sql = new StringBuilder(); sql.append("\n SELECT"); sql.append("\n A.uuid,A.client_name,A.client_unit_type,A.platform_admin,A.expiration_date,B.apply_status,"); @@ -46,9 +48,14 @@ sql.append("\n LEFT JOIN product_sys_users E ON E.user_id = D.user_id "); sql.append("\n WHERE A.uuid != '00000000-0000-0000-0000-000000000000' "); FieldSetEntity fsePost = user.getJobPost(); if (fsePost == null) { param.add(user.getClient_uuid()); sql.append("\n AND A.uuid = ?"); } else { if(fsePost.getString("job_post_name").contains("å¹³å°ç®¡çå")) { param.add(user.getUser_id()); sql.append("\n AND A.platform_admin = ?"); } } DataTableEntity dte = baseDao.listTable(sql.toString(), param.toArray(), fse.getInteger("pagesize"), fse.getInteger("cpage")); if (!BaseUtil.dataTableIsEmpty(dte)) { @@ -71,6 +78,94 @@ sql.append("\n LEFT JOIN product_sys_org_manager D ON D.org_level_uuid = C.uuid "); sql.append("\n LEFT JOIN product_sys_users E ON E.user_id = D.user_id "); sql.append("\n WHERE A.uuid = ? "); return baseDao.getFieldSetEntityBySQL(sql.toString(), new Object[] {uuid}, false); FieldSetEntity fseClient = baseDao.getFieldSetEntityBySQL(sql.toString(), new Object[] {uuid}, false); if(fseClient != null) { DataTableEntity dtClientChange = baseDao.listTable("product_sys_tenant_change", "client_uuid = ?", new Object[] {uuid}); fseClient.addSubDataTable(dtClientChange); } return fseClient; } /** * ç§æ·ä¿¡æ¯åæ´å表 * @param fse * @return */ public DataTableEntity listClientChange(FieldSetEntity fse) { SystemUser user = SpringMVCContextHolder.getCurrentUser(); if (user == null) { return null; } List<Object> param = new ArrayList<>(); StringBuilder sql = new StringBuilder(); sql.append("\n SELECT * FROM product_sys_tenant_change A"); sql.append("\n LEFT JOIN product_sys_clients B ON B.uuid = A.client_uuid"); FieldSetEntity fsePost = user.getJobPost(); String filter = fse.getString("filter"); if (fsePost == null) { param.add(user.getClient_uuid()); sql.append("\n WHERE client_uuid = ?"); if ("entrance".equals(filter)) { sql.append("\n AND (change_status IS NULL OR change_status = 0)"); } else { sql.append("\n AND (change_status = 1 OR change_status = 2)"); } } else { if(fsePost.getString("job_post_name").contains("å¹³å°ç®¡çå")) { param.add(user.getUser_id()); sql.append("\n WHERE B.platform_admin = ?"); if ("entrance".equals(filter)) { sql.append("\n AND change_status = 1"); } else { sql.append("\n AND change_status = 2"); } } } sql.append("\n ORDER BY created_utc_datetime"); DataTableEntity dte = baseDao.listTable(sql.toString(), param.toArray(), fse.getInteger("pagesize"), fse.getInteger("cpage")); if (!BaseUtil.dataTableIsEmpty(dte)) { baseDao.loadPromptData(dte); } return dte; } /** * 客æ·ä¿¡æ¯åæ´è¿ç¨ * @param fseChange * @return */ @Transactional public boolean clientChangeProcess(FieldSetEntity fseChange) { String changeStatus = fseChange.getString("change_status"); if (BaseUtil.strIsNull(changeStatus) || "0".equals(changeStatus)) { // ç§æ·ç®¡çåæäº¤åæ´ fseChange.setValue("change_status", 1); } else { // 管çåç¡®è®¤åæ´ String clientUUID = fseChange.getString("client_uuid"); String newClientName = fseChange.getString("new_client_name"); if (!BaseUtil.strIsNull(newClientName)) { String oldClientName = fseChange.getString("old_client_name"); // 忴客æ·åç§° baseDao.executeUpdate("UPDATE product_sys_clients SET client_name = ? WHERE uuid = ?", new Object[] {newClientName, clientUUID}); // åæ´ç»ç»æºæåç§°,å ¨ç§° baseDao.executeUpdate("UPDATE product_sys_org_levels SET org_level_name = REPLACE(org_level_name, ?, ?),org_level_all = REPLACE(org_level_all, ?, ?) WHERE org_level_all LIKE ?", new Object[] {oldClientName, newClientName, oldClientName, newClientName, "%"+oldClientName+"%"}); } String newClientAdmin = fseChange.getString("new_client_admin"); if (!BaseUtil.strIsNull(newClientAdmin)) { // String oldClientAdmin = fseChange.getString("old_client_admin"); // 廿æ§ç®¡çå // çææ°ç®¡çå } String newBusinessLicense = fseChange.getString("new_business_license"); if (!BaseUtil.strIsNull(newBusinessLicense)) { // String oldBusinessLicense = fseChange.getString("old_business_license"); // å°æ°è¥ä¸æ§ç §å½å ¥å®¢æ·ä¿¡æ¯ä¸ baseDao.executeUpdate("UPDATE product_sys_tenant_apply SET business_license = ? WHERE client_uuid = ?", new Object[] {newBusinessLicense, clientUUID}); } fseChange.setValue("change_status", 2); } return baseDao.saveFieldSetEntity(fseChange); } } src/main/java/com/product/saas/service/TenantContractService.java
ÎļþÃû´Ó src/main/java/com/product/saas/service/SystemContractService.java ÐÞ¸Ä @@ -1,6 +1,8 @@ package com.product.saas.service; import java.io.File; import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -12,17 +14,48 @@ import com.product.core.entity.FieldSetEntity; import com.product.core.exception.BaseException; import com.product.core.service.support.AbstractBaseService; import com.product.core.spring.context.SpringMVCContextHolder; import com.product.module.sys.entity.SystemUser; import com.product.saas.config.SaasCode; import com.product.saas.config.SaasConst; import com.product.util.BaseUtil; import cn.hutool.core.io.FileUtil; @Component public class SystemContractService extends AbstractBaseService{ public class TenantContractService extends AbstractBaseService{ @Autowired BaseDao baseDao; public DataTableEntity listContract(FieldSetEntity fse) { SystemUser user = SpringMVCContextHolder.getCurrentUser(); if (user == null) { return null; } List<Object> param = new ArrayList<>();; StringBuilder sql = new StringBuilder(); sql.append("\n SELECT A.*"); sql.append("\n FROM product_sys_contract A"); sql.append("\n LEFT JOIN product_sys_clients B ON B.uuid = A.client_uuid"); sql.append("\n WHERE ").append(fse.getString("filter")); FieldSetEntity fsePost = user.getJobPost(); if (fsePost == null) { param.add(user.getClient_uuid()); sql.append("\n AND A.client_uuid = ?"); } else { if(fsePost.getString("job_post_name").contains("å¹³å°ç®¡çå")) { param.add(user.getUser_id()); sql.append("\n AND B.platform_admin = ?"); } } DataTableEntity dte = baseDao.listTable(sql.toString(), param.toArray(), fse.getInteger("pagesize"), fse.getInteger("cpage")); if (!BaseUtil.dataTableIsEmpty(dte)) { baseDao.loadPromptData(dte); } return dte; } /** * è·ååå详æ (æµç¨è¯¦æ è°ç¨) * @param fse src/main/java/com/product/saas/service/idel/ISaasClientService.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,8 @@ package com.product.saas.service.idel; import com.product.core.entity.FieldSetEntity; public interface ISaasClientService { public boolean clientChangeProcess(FieldSetEntity fseChange); }