fix department error (apache#392)

* push tenant code * push department tenant code * push department tenant code * push department tenant code * code opmitization * push code * push code * fix tenant error * code review by myself * tenant support start/stop * fix department error
mayinrain · Jan 2, 2024 · ff252a1 · ff252a1
1 parent 7964c2d
commit ff252a1
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 5 deletions.
diff --git a/linkis-dist/package/db/upgrade/1.4.1_schema/mysql/linkis_ddl.sql b/linkis-dist/package/db/upgrade/1.4.1_schema/mysql/linkis_ddl.sql
@@ -50,4 +50,23 @@ CREATE TABLE `linkis_cg_tenant_department_config` (
   UNIQUE KEY `uniq_user_creator` (`creator`,`department`)
 ) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
 
-ALTER TABLE linkis_cg_tenant_label_config ADD column is_valid varchar(50) DEFAULT 'Y' COMMENT '是否有效'
+ALTER TABLE linkis_cg_tenant_label_config ADD column is_valid varchar(50) DEFAULT 'Y' COMMENT '是否有效'
+
+-- ----------------------------
+-- Table structure for linkis_org_user
+-- ----------------------------
+DROP TABLE IF EXISTS `linkis_org_user`;
+CREATE TABLE `linkis_org_user` (
+  `cluster_code` varchar(16) COMMENT '集群',
+  `user_type` varchar(64) COMMENT '用户类型',
+  `user_name` varchar(128) COMMENT '授权用户',
+  `org_id` varchar(16) COMMENT '部门ID',
+  `org_name` varchar(64) COMMENT '部门名字',
+  `queue_name` varchar(64) COMMENT '默认资源队列',
+  `db_name` varchar(64) COMMENT '默认操作数据库',
+  `interface_user` varchar(64) COMMENT '接口人',
+  `is_union_analyse` varchar(64) COMMENT '是否联合分析人',
+  `create_time` varchar(64) COMMENT '用户创建时间',
+  `user_itsm_no` varchar(64) COMMENT '用户创建单号',
+  PRIMARY KEY (`user_name`)
+) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4 COLLATE=utf8mb4_bin COMMENT ='用户部门统计INC表';
diff --git a/...c/main/java/org/apache/linkis/configuration/restful/api/TenantConfigrationRestfulApi.java b/...c/main/java/org/apache/linkis/configuration/restful/api/TenantConfigrationRestfulApi.java
@@ -279,7 +279,8 @@ private void parameterVerification(TenantVo tenantVo) throws ConfigurationExcept
       response = Message.class)
   @RequestMapping(path = "/save-department-tenant", method = RequestMethod.POST)
   public Message saveDepartmentTenant(
-      HttpServletRequest req, @RequestBody DepartmentTenantVo departmentTenantVo) {
+      HttpServletRequest req, @RequestBody DepartmentTenantVo departmentTenantVo)
+      throws ConfigurationException {
     String userName = ModuleUserUtils.getOperationUser(req, "execute saveDepartmentTenant");
     if (!Configuration.isAdmin(userName)) {
       return Message.error("Failed to save-department-tenant,msg: only administrator users to use");

diff --git a/...figuration/src/main/java/org/apache/linkis/configuration/service/TenantConfigService.java b/...figuration/src/main/java/org/apache/linkis/configuration/service/TenantConfigService.java
@@ -38,7 +38,7 @@ Map<String, Object> queryTenantList(
 
   TenantVo queryTenant(String user, String creator);
 
-  void saveDepartmentTenant(DepartmentTenantVo departmentTenantVo);
+  void saveDepartmentTenant(DepartmentTenantVo departmentTenantVo) throws ConfigurationException;
 
   Map<String, Object> queryDepartmentTenant(
       String departmentId, String creator, String tenantValue, Integer pageNow, Integer pageSize);

diff --git a/...n/src/main/java/org/apache/linkis/configuration/service/impl/TenantConfigServiceImpl.java b/...n/src/main/java/org/apache/linkis/configuration/service/impl/TenantConfigServiceImpl.java
@@ -30,6 +30,7 @@
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang.StringUtils;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -185,7 +186,11 @@ public TenantVo queryTenant(String user, String creator) {
   }
 
   @Override
-  public void saveDepartmentTenant(DepartmentTenantVo departmentTenantVo) {
+  public void saveDepartmentTenant(DepartmentTenantVo departmentTenantVo)
+      throws ConfigurationException {
+    TenantVo tenantVo = new TenantVo();
+    BeanUtils.copyProperties(departmentTenantVo, tenantVo);
+    dataProcessing(tenantVo);
     departmentTenantVo.setUpdateTime(new Date());
     if (StringUtils.isBlank(departmentTenantVo.getId())) {
       departmentTenantVo.setCreateTime(new Date());

diff --git a/...ncements/linkis-configuration/src/main/resources/mapper/common/DepartmentTenantMapper.xml b/...ncements/linkis-configuration/src/main/resources/mapper/common/DepartmentTenantMapper.xml
@@ -58,7 +58,7 @@
         from linkis_cg_tenant_department_config
         <where>
             <if test="creator != null"> creator = #{creator}</if>
-            <if test="departmentId != null">and departmentId = #{departmentId}</if>
+            <if test="departmentId != null">and department_id = #{departmentId}</if>
             <if test="tenant_value != null">and tenant_value = #{tenant_value}</if>
         </where>
     </select>